Urgent please fix

.env

@@ -0,0 +1,36 @@
+## these environment variables are passed to containers via docker-compose
+## copy this to your plugin root directory and rename as .env
+## changing the environment variables will require a rebuild of docker containers
+
+## project name used by docker & plugin folder name
+PROJECT_NAME=woocommerce-pos
+
+## default development settings
+PHP_VERSION=5.6
+# MYSQL_VERSION=8.0
+# WP_VERSION=latest
+# WC_VERSION=https://github.com/woocommerce/woocommerce/releases/download/3.5.0-rc.2/woocommerce.zip
+# WP_MULTISITE=0
+
+## wordpress settings
+# WP_USER=admin
+# WP_PASSWORD=password
+# WP_EMAIL=example@example.com
+# WP_TITLE=Localhost
+# WP_URL=localhost
+
+## external ports
+# LOCALHOST_HTTP_PORT=80
+# LOCALHOST_HTTPS_PORT=443
+# LOCALHOST_MYSQL_PORT=3306
+# LOCALHOST_PHP_PORT=9001
+# XDEBUG_REMOTE_PORT=9000
+
+## mysql
+# MYSQL_ROOT_PASSWORD=wordpress
+# DB_NAME=wordpress
+# DB_HOST=db-mysql57:3306
+# DB_PASSWORD=wordpress
+
+# directory for wp cli packages
+# WP_CLI_PACKAGES_DIR=/var/www/html

.gitignore

@@ -19,3 +19,6 @@ assets/js/vendor.bundle.js
 assets/js/products.min.js
 coverage
 assets/js/templates.js
+.data
+.html
+.DS_Store

.gitmodules

@@ -1,21 +1,3 @@
-[submodule "assets/js/src/lib/config/obscura/filtered"]
-	path = assets/js/src/lib/config/obscura/filtered
-	url = https://github.com/kilbot/backbone-filtered-collection.git
-[submodule "assets/js/src/lib/config/obscura/sorted"]
-	path = assets/js/src/lib/config/obscura/sorted
-	url = https://github.com/kilbot/backbone-sorted-collection.git
-[submodule "assets/js/src/lib/config/obscura/paginated"]
-	path = assets/js/src/lib/config/obscura/paginated
-	url = https://github.com/kilbot/backbone-paginated-collection.git
-[submodule "assets/js/src/lib/config/obscura/query"]
-	path = assets/js/src/lib/config/obscura/query
-	url = https://github.com/kilbot/backbone-query.git
-[submodule "assets/js/src/lib/config/deep-model"]
-	path = assets/js/src/lib/config/deep-model
-	url = https://github.com/kilbot/backbone-deep-model.git
-[submodule "assets/js/src/lib/config/idb"]
-	path = assets/js/src/lib/config/idb
-	url = https://github.com/kilbot/backbone-idb.git
 [submodule "styleguide"]
 	path = styleguide
 	url = https://github.com/kilbot/WooCommerce-POS-StyleGuide.git

.travis.yml

@@ -1,75 +1,54 @@
-language: php
+sudo: required
 
-php:
-  - 5.4
+language: node_js
 
-addons:
-  hosts:
-    - woopos.dev
+node_js:
+  - "node"
+
+services:
+  - docker
 
 env:
-  - WP_VERSION=latest WP_MULTISITE=0
-  #    - WP_VERSION=latest WP_MULTISITE=1
-  #    - WP_VERSION=3.8 WP_MULTISITE=0
-  #    - WP_VERSION=3.8 WP_MULTISITE=1
+  matrix:
+    - PHP_VERSION=php54 WC_VERSION=latest WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php55 WC_VERSION=latest WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php56 WC_VERSION=latest WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php70 WC_VERSION=latest WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php54 WC_VERSION=2.6.14 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php55 WC_VERSION=2.6.14 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php56 WC_VERSION=2.6.14 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php70 WC_VERSION=2.6.14 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php54 WC_VERSION=2.5.5 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php55 WC_VERSION=2.5.5 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php56 WC_VERSION=2.5.5 WP_VERSION=latest WP_MULTISITE=0
+    - PHP_VERSION=php70 WC_VERSION=2.5.5 WP_VERSION=latest WP_MULTISITE=0
 
 before_install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable
-  - git submodule update --init --recursive
+  - sudo apt-get update -qq
+  - sudo apt-get install docker-ce --no-install-recommends -y -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew"
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin/
+  - docker-compose -v
+  - docker -v
 
 install:
-  # php libraries
-  - composer require satooshi/php-coveralls:~0.6.1@stable
-  - composer require guzzlehttp/guzzle:~5
-  - composer require 10up/wp_mock:dev-master
-  # install wordpress & woocommerce & test theme
-  - bash tests/unit/php/bin/install-travis-wp-tests.sh woopos_tests root '' localhost $WP_VERSION
-  - mkdir /tmp/wordpress/wp-content/plugins/woocommerce-pos/
-  - mv * .[^.]* /tmp/wordpress/wp-content/plugins/woocommerce-pos/
-  - mv /tmp/wordpress/* ./
-  - git clone https://github.com/kilbot/WooCommerce-POS-Test-Theme.git wp-content/themes/WooCommerce-POS-Test-Theme
-  - git clone https://github.com/kilbot/WooCommerce-POS-Test-Plugin.git wp-content/plugins/woocommerce-pos-test
-  # apache
-  - sudo apt-get update
-  - sudo apt-get install apache2 libapache2-mod-fastcgi
-  # enable php-fpm
-  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-  - sudo a2enmod rewrite actions fastcgi alias
-  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-  # configure apache virtual hosts
-  - sudo cp -f ./wp-content/plugins/woocommerce-pos/tests/integration/php/bin/travis-ci-apache /etc/apache2/sites-available/default
-  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-  - sudo service apache2 restart
+  - npm install && node_modules/.bin/grunt build --force
+  - npm run start:${PHP_VERSION}
 
 before_script:
-  # wp-cli
-  - curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-  - chmod +x wp-cli.phar
-  - sudo mv wp-cli.phar /usr/local/bin/wp
-  - wp --info
-  - wp core config --dbname=woopos_tests --dbuser=root
-  - wp core install --url=woopos.dev --title=WooCommercePOS --admin_user=admin --admin_password=password --admin_email=support@woopos.com.au
-  - wp rewrite structure '/%year%/%monthnum%/%postname%'
-  - wp plugin activate woocommerce-pos
-  - wp plugin activate woocommerce-pos-test
-  - wp plugin install woocommerce --activate
-  - wp plugin install wordpress-importer --activate
-  - wp import wp-content/plugins/woocommerce/dummy-data/dummy-data.xml --authors=create
-  - wp option update woocommerce_api_enabled yes
-  - cp wp-content/plugins/woocommerce-pos/tests/integration/php/bin/wp-cli.yml ./
-  - wp rewrite flush --hard
-  # grunt-cli
-  - cd wp-content/plugins/woocommerce-pos/
-  - npm install -g grunt-cli
-  - npm install
+  - sleep 60
+  - docker exec woocommerce-pos-app-${PHP_VERSION} wp core version --allow-root
+  - docker exec woocommerce-pos-app-${PHP_VERSION} wp plugin list --allow-root --status=active
 
-script:
-  - grunt test
-  - phpunit -c phpunit.xml.dist
-  - phpunit -c phpunit.int.xml
-  #    - ./node_modules/.bin/pioneer
+  ## download test theme and activate
+  - docker exec woocommerce-pos-app-${PHP_VERSION} wp theme install https://github.com/kilbot/WooCommerce-POS-Test-Theme/archive/master.zip --allow-root --activate
 
-after_script:
-  - php vendor/bin/coveralls -v
-  - grunt coverage
+  ## turn off WP_DEBUG to prevent depreciation notices
+#  - docker exec woocommerce-pos-app-${PHP_VERSION} sed -i "s/'WP_DEBUG', true/'WP_DEBUG', false/g" wp-config.php
+
+script:
+  - npm run unit-test:js
+  - npm run unit-test:${PHP_VERSION}
+  - npm run integration-test:${PHP_VERSION}

.wp-env.json

@@ -0,0 +1,20 @@
+{
+  "core": null,
+  "phpVersion": null,
+  "plugins": [
+    ".",
+    "https://downloads.wordpress.org/plugin/woocommerce.zip"
+  ],
+  "config": {
+    "WP_DEBUG": true,
+    "SCRIPT_DEBUG": true,
+    "WP_PHP_BINARY": "php",
+    "WP_TESTS_EMAIL": "admin@example.org",
+    "WP_TESTS_TITLE": "Test Blog",
+    "WP_TESTS_DOMAIN": "http://localhost",
+    "WP_SITEURL": "http://localhost",
+    "WP_HOME": "http://localhost"
+  },
+  "mappings": {
+  }
+}

Gruntfile.js

@@ -6,6 +6,8 @@ module.exports = function(grunt) {
 
   var pkg = grunt.file.readJSON('package.json');
 
+  var path = require('path');
+
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
@@ -32,7 +34,7 @@ module.exports = function(grunt) {
         '!locales.json',
         '!phpunit.xml',
         '!phpunit.xml.dist',
-        '!phpunit.int.xml',
+        '!phpunit.xml',
         '!pioneer.json',
         '!<%= app.css.src %>/**',
         '!<%= app.js.src %>/**',
@@ -155,7 +157,7 @@ module.exports = function(grunt) {
             radio: 'backbone.radio',
             underscore: 'lodash'
           },
-          modulesDirectories: ['node_modules', './<%= app.js.src %>']
+          modules: ['node_modules', './<%= app.js.src %>']
         },
         externals: {
           jquery: 'jQuery',
@@ -172,22 +174,20 @@ module.exports = function(grunt) {
           select2: 'select2',
           'idb-wrapper': 'IDBStore'
         },
-        cache: true,
-        watch: true
+        cache: true
       },
       dev: {
         output: {
-          path: './<%= app.js.build %>/',
+          path: path.resolve(__dirname, '<%= app.js.build %>/'),
           filename: '[name].build.js',
           pathinfo: true,
           library: 'POS'
         },
-        devtool: 'eval-source-map',
-        debug: true
+        devtool: 'eval-source-map'
       },
       deploy: {
         output: {
-          path: './<%= app.js.build %>/',
+          path: path.resolve(__dirname, '<%= app.js.build %>'),
           filename: '[name].build.js',
           library: 'POS'
         }
@@ -241,12 +241,16 @@ module.exports = function(grunt) {
         options: {
           potFilename: 'woocommerce-pos.pot',
           exclude: [
+            '.html',
             'styleguide',
             'includes/admin/.*',
             'includes/products/.*',
             'includes/class-wc-pos-activator.php',
             'includes/class-wc-pos-deactivator.php'
           ],
+          // include: [
+          //   './*'
+          // ],
           processPot: function( pot ) {
             var translation,
               excluded_meta = [
@@ -276,6 +280,7 @@ module.exports = function(grunt) {
         options: {
           potFilename: 'woocommerce-pos-admin.pot',
           exclude: [
+            '.html',
             'styleguide'
           ],
           include: [
@@ -436,8 +441,11 @@ module.exports = function(grunt) {
   // test
   grunt.registerTask('test', 'Run unit tests', ['symlink', 'simplemocha']);
 
+  // build
+  grunt.registerTask('build', 'Build projects', ['compass', 'cssmin', 'jshint', 'test', 'webpack:dev', 'uglify']);
+
   // dev
-  grunt.registerTask('dev', 'Development build', ['compass', 'cssmin', 'jshint', 'test', 'webpack:dev', 'uglify', 'watch']);
+  grunt.registerTask('dev', 'Development build', ['build', 'watch']);
 
   // deploy
   grunt.registerTask('deploy', 'Production build', ['test', 'makepot', 'webpack:deploy', 'js_locales', 'uglify', 'copy', 'compress', 'clean']);

assets/css/src/scss/partials/_icons.scss

@@ -199,7 +199,7 @@ icon {
       .#{current-module()}-#{nth($icon, 1)} {
         &:before {
           content: unquote($withslash);
-          color: "#{nth($icon, 3)}";
+          color: #{nth($icon, 3)};
         }
       }
 

assets/css/src/scss/partials/_list.scss

@@ -46,13 +46,13 @@ list {
 
     .#{current-module()} {
 
-      ul {
+      > div > ul, > ul {
         width: 100%;
         margin: 0;
         padding: 0;
         list-style: none;
 
-        li {
+        > li {
           border-bottom: 1px solid $list-border-color;
 
           &:last-of-type {
@@ -81,9 +81,15 @@ list {
     // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
     .#{current-module()}-striped {
-      li:nth-of-type(odd) {
-        background-color: $list-alternate-bg-color;
+
+      > div > ul, > ul {
+
+        > li:nth-of-type(odd) {
+          background-color: $list-alternate-bg-color;
+        }
+
       }
+
     }
 
 

assets/css/src/scss/partials/_products.scss

@@ -71,6 +71,21 @@ products {
         small {
           display: block;
         }
+
+        ul.variations, ul.variant {
+          list-style: none;
+          padding: 0;
+          margin: 0;
+          font-size: $font-size-sm;
+          strong {
+            font-weight: 600;
+          }
+          a.active {
+            color: $text-color;
+            text-decoration: none;
+            cursor: default;
+          }
+        }
       }
 
       .price {

assets/css/src/scss/partials/admin/_settings.scss

@@ -28,6 +28,8 @@ settings {
           font-size: 15px;
           line-height: 24px;
           border-bottom: 1px solid #ccc;
+          margin-bottom: -1px;
+
           &.active {
             color: #000;
             background: #f1f1f1;