From c45ec2495926632551ed7794125b9d356298126e Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 29 Oct 2015 22:41:06 +0800 Subject: [PATCH 001/169] fix admin settings --- includes/admin/class-wc-pos-settings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index e77a3aab..1bfdc694 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -109,10 +109,12 @@ public function enqueue_admin_scripts() { // deregister scripts wp_deregister_script( 'underscore' ); wp_deregister_script( 'select2' ); + wp_deregister_script( 'backbone' ); // register $external_libs = WC_POS_Template::get_external_js_libraries(); wp_register_script( 'underscore', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); + wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'underscore' ), null, true ); wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'underscore' ), null, true ); wp_register_script( 'marionette', $external_libs[ 'marionette' ], array( 'jquery', 'backbone', 'underscore' ), null, true ); wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); From ce1d988ec43aff3825b6b2cf406327ba2ad2f7ca Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Tue, 10 Nov 2015 12:05:39 +0800 Subject: [PATCH 002/169] fix: bug causing issue with some variations, e.g.: 000, 00 and 0 --- includes/api/class-wc-pos-products.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/api/class-wc-pos-products.php b/includes/api/class-wc-pos-products.php index 9d8ffaee..fb3517e2 100644 --- a/includes/api/class-wc-pos-products.php +++ b/includes/api/class-wc-pos-products.php @@ -191,7 +191,7 @@ private function get_variation_option( $product, $attribute, $option ){ if ( $attribute['is_taxonomy'] ) { $terms = wp_get_post_terms( $product->parent->id, $attribute['name'] ); if( !is_wp_error($terms) ) : foreach( $terms as $term ) : - if( $option == $term->slug ) $name = $term->name; + if( $option === $term->slug ) $name = $term->name; endforeach; endif; // piped attributes From 95401fe033af25a86ade4de34df71b6ea4de3957 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 13 Nov 2015 20:00:10 +0800 Subject: [PATCH 003/169] Fix: display of print receipt path in settings --- assets/js/src/apps/print/receipt/route.js | 11 +++-- includes/admin/settings/views/tools.php | 5 +- includes/api/class-wc-pos-orders.php | 59 ++++++++++++++--------- includes/class-wc-pos-template.php | 23 ++++++--- includes/gateways/class-wc-pos-cash.php | 5 +- readme.txt | 15 ++++-- 6 files changed, 76 insertions(+), 42 deletions(-) diff --git a/assets/js/src/apps/print/receipt/route.js b/assets/js/src/apps/print/receipt/route.js index c4e075a7..0a501481 100644 --- a/assets/js/src/apps/print/receipt/route.js +++ b/assets/js/src/apps/print/receipt/route.js @@ -14,9 +14,14 @@ var ReceiptRoute = Route.extend({ }, fetch: function() { - if (this.collection.length === 0) { - return this.collection.fetch({ remote: true }); - } + return this.collection.fetch({ + remote: true, + data: { + filter: { + limit: 1 + } + } + }); }, render: function() { diff --git a/includes/admin/settings/views/tools.php b/includes/admin/settings/views/tools.php index d35e8de1..8095c961 100644 --- a/includes/admin/settings/views/tools.php +++ b/includes/admin/settings/views/tools.php @@ -35,7 +35,10 @@ class="button" - Template path: %s', 'woocommerce-pos' ), ''. WC_POS_Template::locate_template_file('print/tmpl-receipt.php') .'' ); ?> + Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); + ?> diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index 84e927a4..1f6b144f 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -527,8 +527,7 @@ public function payment_complete( $order_id ) { public function order_response( $order_data, $order, $fields, $server ) { // add cashier data - $cashier_details = isset( $order_data['cashier'] ) ? $order_data['cashier'] : array(); - $order_data['cashier'] = $this->add_cashier_details( $order, $cashier_details ); + $order_data['cashier'] = $this->add_cashier_details( $order ); // add pos payment info $payment_details = isset( $order_data['payment_details'] ) ? $order_data['payment_details'] : array(); @@ -569,36 +568,48 @@ public function order_response( $order_data, $order, $fields, $server ) { /** * @param $order - * @param array $cashier * @return array */ - private function add_cashier_details( $order, array $cashier = array() ){ - $cashier['id'] = get_post_meta( $order->id, '_pos_user', true); - $first_name = get_post_meta( $order->id, '_pos_user_first_name', true); - $last_name = get_post_meta( $order->id, '_pos_user_last_name', true); - if( !$first_name && !$last_name ) { - $user_info = get_userdata( $cashier['id'] ); - $first_name = $user_info->first_name; - $last_name = $user_info->last_name; - } - $cashier['first_name'] = $first_name; - $cashier['last_name'] = $last_name; - return apply_filters( 'woocommerce_pos_order_response_cashier', $cashier, $order ); - } + private function add_cashier_details( $order ) { + + if ( !$cashier_id = get_post_meta( $order->id, '_pos_user', true ) ) { + return; + } + + $first_name = get_post_meta( $order->id, '_pos_user_first_name', true ); + $last_name = get_post_meta( $order->id, '_pos_user_last_name', true ); + if ( !$first_name && !$last_name && $user_info = get_userdata( $cashier_id ) ) { + $first_name = $user_info->first_name; + $last_name = $user_info->last_name; + } + + $cashier = array( + 'id' => $cashier_id, + 'first_name' => $first_name, + 'last_name' => $last_name + ); + + return apply_filters( 'woocommerce_pos_order_response_cashier', $cashier, $order ); + + } /** * @param $order - * @param array $payment + * @param array $payment_details * @return array */ - private function add_payment_details( $order, array $payment = array() ){ - $payment['result'] = get_post_meta( $order->id, '_pos_payment_result', true ); - $payment['message'] = get_post_meta( $order->id, '_pos_payment_message', true ); - $payment['redirect'] = get_post_meta( $order->id, '_pos_payment_redirect', true ); - if( isset( $payment['method_id'] ) && $payment['method_id'] == 'pos_cash' ){ - $payment = WC_POS_Gateways_Cash::payment_details( $payment, $order ); + private function add_payment_details( $order, array $payment_details ){ + + $payment_details['result'] = get_post_meta( $order->id, '_pos_payment_result', true ); + $payment_details['message'] = get_post_meta( $order->id, '_pos_payment_message', true ); + $payment_details['redirect'] = get_post_meta( $order->id, '_pos_payment_redirect', true ); + + if( isset( $payment_details['method_id'] ) && $payment_details['method_id'] == 'pos_cash' ){ + $payment_details['method_pos_cash'] = WC_POS_Gateways_Cash::payment_details( $order ); } - return apply_filters( 'woocommerce_pos_order_response_payment_details', $payment, $order ); + + return apply_filters( 'woocommerce_pos_order_response_payment_details', $payment_details, $order ); + } /** diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index f02f5e53..ca08fb03 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -296,17 +296,20 @@ static public function locate_default_template_files( $partials_dir = '' ) { if ( empty( $partials_dir ) ) $partials_dir = self::get_template_dir(); - $iterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator( $partials_dir ), + $Directory = new RecursiveDirectoryIterator( $partials_dir ); + + $Iterator = new RecursiveIteratorIterator( + $Directory, RecursiveIteratorIterator::SELF_FIRST ); - $regex = new RegexIterator( - $iterator, '/^.+tmpl-[a-z-]+\.php$/i', + $Regex = new RegexIterator( + $Iterator, + '/^.+tmpl-[a-z-]+\.php$/i', RecursiveRegexIterator::GET_MATCH ); - $paths = array_keys( iterator_to_array( $regex ) ); + $paths = array_keys( iterator_to_array( $Regex ) ); $templates = array(); foreach ( $paths as $path ) { @@ -352,7 +355,7 @@ static public function locate_template_file( $default_path = '' ) { * @return string */ static public function get_template_dir() { - return realpath( WC_POS_PLUGIN_PATH . 'includes/views' ); + return WC_POS_PLUGIN_PATH . 'includes/views'; } /** @@ -448,4 +451,12 @@ public function templates_payload() { return apply_filters( 'woocommerce_pos_templates', $templates ); } + /** + * Returns path of print receipt template + */ + static public function locate_print_receipt_template() { + $receipt_path = self::locate_template_file( WC_POS_PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); + return apply_filters( 'woocommerce_pos_print_receipt_path', $receipt_path ); + } + } \ No newline at end of file diff --git a/includes/gateways/class-wc-pos-cash.php b/includes/gateways/class-wc-pos-cash.php index 87eaa8f7..11d85f4e 100644 --- a/includes/gateways/class-wc-pos-cash.php +++ b/includes/gateways/class-wc-pos-cash.php @@ -97,12 +97,11 @@ public function calculate_change( $order_id ) { echo $message; } - static public function payment_details( $payment_details, $order ) { - $payment_details['method_pos_cash'] = array( + static public function payment_details( $order ) { + return array( 'tendered' => get_post_meta( $order->id, '_pos_cash_amount_tendered', true ), 'change' => get_post_meta( $order->id, '_pos_cash_change', true ) ); - return $payment_details; } } \ No newline at end of file diff --git a/readme.txt b/readme.txt index c74e4f32..31d83863 100644 --- a/readme.txt +++ b/readme.txt @@ -79,7 +79,12 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c == Changelog == -= 0.4.5 - 2015/10/** = += 0.4.6 - 2015/11/** = +* Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6 +* Fix: issue with some product variation names, e.g.: 000, 00 and 0 +* Fix: display of print receipt path in settings + += 0.4.5 - 2015/10/28 = * Important: WooCommerce POS now requires PHP 5.4 or higher * Important: WooCommerce POS now requires WooCommerce 2.3.7 or higher * Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.5 @@ -167,10 +172,10 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c == Upgrade Notice == += 0.4.6 = +* Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6. + = 0.4.5 = * WooCommerce POS now requires PHP 5.4 or higher. * WooCommerce POS now requires WooCommerce 2.3.7 or higher. -* Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.5. - -= 0.4.4 = -* Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.4. \ No newline at end of file +* Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.5. \ No newline at end of file From 91eea863c8b44347e13b57add0babe08bf540245 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 13 Nov 2015 21:54:25 +0800 Subject: [PATCH 004/169] Fix: POS not showing for some users --- includes/class-wc-pos-ajax.php | 2 ++ includes/class-wc-pos-template.php | 19 +++++++++++++------ readme.txt | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/includes/class-wc-pos-ajax.php b/includes/class-wc-pos-ajax.php index 72ebe67b..41401292 100644 --- a/includes/class-wc-pos-ajax.php +++ b/includes/class-wc-pos-ajax.php @@ -121,8 +121,10 @@ public function email_receipt() { */ public function send_support_email() { $headers[] = 'From: '. $_POST['name'] .' <'. $_POST['email'] .'>'; + $headers[] = 'Reply-To: '. $_POST['name'] .' <'. $_POST['email'] .'>'; $message = $_POST['message'] . "\n\n" . $_POST['status']; $support = apply_filters( 'woocommerce_pos_support_email', 'support@woopos.com.au' ); + if( wp_mail( $support, 'WooCommerce POS Support', $message, $headers ) ) { $response = array( 'result' => 'success', diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index ca08fb03..04ebbc72 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -367,18 +367,25 @@ static public function create_templates_array( $partials_dir = '' ) { foreach ( self::locate_template_files( $partials_dir ) as $slug => $file ) { $keys = explode( substr( $slug, 0, 1 ), substr( $slug, 1 ) ); - $template = array_reduce( array_reverse( $keys ), function ( $result, $key ) { - if ( is_string( $result ) ) - $key = preg_replace( '/^tmpl-/i', '', $key ); - - return array( $key => $result ); - }, self::template_output( $file ) ); + $template = array_reduce( array_reverse( $keys ), 'self::reduce_templates_array', self::template_output( $file ) ); $templates = array_merge_recursive( $templates, $template ); } return $templates; } + + /** + * @param $result + * @param $key + * @return array + */ + static private function reduce_templates_array( $result, $key ) { + if ( is_string( $result ) ) + $key = preg_replace( '/^tmpl-/i', '', $key ); + return array( $key => $result ); + } + /** * Output template partial as string * diff --git a/readme.txt b/readme.txt index 31d83863..55cd6211 100644 --- a/readme.txt +++ b/readme.txt @@ -81,8 +81,10 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c = 0.4.6 - 2015/11/** = * Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6 +* Fix: POS not showing for some users * Fix: issue with some product variation names, e.g.: 000, 00 and 0 * Fix: display of print receipt path in settings +* Tweak: Add Reply-To header to support emails = 0.4.5 - 2015/10/28 = * Important: WooCommerce POS now requires PHP 5.4 or higher From 3fc7ebd86e2a3e198448189ac2fa01490af41dd4 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 13 Nov 2015 22:03:38 +0800 Subject: [PATCH 005/169] Tweak: remove hard dependence for unique customer email --- assets/js/src/entities/customers/collection.js | 5 +---- assets/js/src/lib/config/idb-collection.js | 5 ++--- readme.txt | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/assets/js/src/entities/customers/collection.js b/assets/js/src/entities/customers/collection.js index d0571d09..fc1dbed6 100644 --- a/assets/js/src/entities/customers/collection.js +++ b/assets/js/src/entities/customers/collection.js @@ -7,10 +7,7 @@ module.exports = DualCollection.extend({ name: 'customers', indexes: [ {name: 'local_id', keyPath: 'local_id', unique: true}, - {name: 'id', keyPath: 'id', unique: true}, - {name: 'status', keyPath: 'status', unique: false}, - {name: 'email', keyPath: 'email', unique: true}, - {name: 'username', keyPath: 'username', unique: true} + {name: 'id', keyPath: 'id', unique: true} ], initialize: function(){ diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index e7034676..2bd75f1d 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -11,13 +11,12 @@ var Radio = require('backbone.radio'); module.exports = app.prototype.IndexedDBCollection = Collection.extend({ name : 'store', storePrefix : 'wc_pos_', - dbVersion : 4005, + dbVersion : 4006, keyPath : 'local_id', autoIncrement : true, indexes : [ {name: 'local_id', keyPath: 'local_id', unique: true}, - {name: 'id', keyPath: 'id', unique: true}, - {name: 'status', keyPath: 'status', unique: false} + {name: 'id', keyPath: 'id', unique: true} ], constructor: function() { diff --git a/readme.txt b/readme.txt index 55cd6211..14fd2f16 100644 --- a/readme.txt +++ b/readme.txt @@ -85,6 +85,7 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c * Fix: issue with some product variation names, e.g.: 000, 00 and 0 * Fix: display of print receipt path in settings * Tweak: Add Reply-To header to support emails +* Tweak: remove hard dependence for unique customer email = 0.4.5 - 2015/10/28 = * Important: WooCommerce POS now requires PHP 5.4 or higher From 45369249169332fdee1a49fa690cdbfd222093e0 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 2 Dec 2015 22:28:21 +0800 Subject: [PATCH 006/169] remove Bootstrap modals --- Gruntfile.js | 21 +- assets/css/src/scss/partials/_images.scss | 5 + assets/css/src/scss/partials/_main.scss | 2 +- assets/css/src/scss/partials/_modal.scss | 312 +++++------------- assets/css/src/scss/pos.scss | 1 + assets/js/src/app.js | 5 +- assets/js/src/apps/app/layout-view.js | 6 +- assets/js/src/apps/header/service.js | 11 +- .../src/apps/header/views/modals/browser.js | 7 +- .../js/src/apps/header/views/modals/help.js | 4 +- assets/js/src/apps/pos/cart/route.js | 2 +- .../apps/pos/receipt/views/modals/email.js | 7 +- .../checkout/modals/gateway-settings.js | 9 - assets/js/src/apps/settings/checkout/route.js | 29 +- .../tools/modal/translation-update.js | 4 +- assets/js/src/apps/settings/tools/route.js | 7 +- .../js/src/lib/components/buttons/behavior.js | 6 +- assets/js/src/lib/components/buttons/view.js | 4 +- .../modal/{views/error.hbs => body.hbs} | 4 +- assets/js/src/lib/components/modal/body.js | 28 ++ assets/js/src/lib/components/modal/header.hbs | 6 + .../components/modal/{views => }/header.js | 25 +- assets/js/src/lib/components/modal/layout.js | 91 +++++ assets/js/src/lib/components/modal/modal.hbs | 3 + assets/js/src/lib/components/modal/service.js | 184 +++++------ .../src/lib/components/modal/views/alert.js | 47 --- .../src/lib/components/modal/views/header.hbs | 6 - .../src/lib/components/modal/views/layout.js | 136 -------- .../src/lib/components/modal/views/modal.hbs | 7 - assets/js/src/lib/config/application.js | 1 + assets/js/src/lib/config/idb-collection.js | 39 ++- includes/class-wc-pos-i18n.php | 3 +- includes/class-wc-pos-template.php | 12 +- includes/views/modals/browser.php | 2 +- package.json | 43 ++- woocommerce-pos.php | 4 +- 36 files changed, 432 insertions(+), 651 deletions(-) create mode 100644 assets/css/src/scss/partials/_images.scss rename assets/js/src/lib/components/modal/{views/error.hbs => body.hbs} (64%) create mode 100644 assets/js/src/lib/components/modal/body.js create mode 100644 assets/js/src/lib/components/modal/header.hbs rename assets/js/src/lib/components/modal/{views => }/header.js (60%) create mode 100644 assets/js/src/lib/components/modal/layout.js create mode 100644 assets/js/src/lib/components/modal/modal.hbs delete mode 100644 assets/js/src/lib/components/modal/views/alert.js delete mode 100644 assets/js/src/lib/components/modal/views/header.hbs delete mode 100644 assets/js/src/lib/components/modal/views/layout.js delete mode 100644 assets/js/src/lib/components/modal/views/modal.hbs diff --git a/Gruntfile.js b/Gruntfile.js index cfe4abd0..7704a626 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -170,7 +170,7 @@ module.exports = function(grunt) { accounting: 'accounting', moment: 'moment', select2: 'select2', - 'idb-wrapper': 'IDBStore' + //'idb-wrapper': 'IDBStore' }, cache: true, watch: true @@ -206,25 +206,6 @@ module.exports = function(grunt) { 'assets/js/app.min.js': 'assets/js/app.build.js', 'assets/js/admin.min.js': 'assets/js/admin.build.js' } - }, - // not used in production - // only provided as a convenience if internet is unavailable - vendor: { - files: { - 'assets/js/vendor.bundle.js': [ - 'node_modules/jquery/dist/jquery.js', - 'node_modules/lodash/index.js', - 'node_modules/backbone/backbone.js', - 'node_modules/backbone.radio/build/backbone.radio.js', - 'node_modules/backbone.marionette/lib/backbone.marionette.js', - 'node_modules/handlebars/dist/handlebars.js', - //'node_modules/idb-wrapper/idbstore.js', - 'node_modules/select2/select2.js', - 'node_modules/moment/moment.js', - 'node_modules/accounting/accounting.js', - 'node_modules/jquery-color/jquery.color.js' - ] - } } }, diff --git a/assets/css/src/scss/partials/_images.scss b/assets/css/src/scss/partials/_images.scss new file mode 100644 index 00000000..f69af45c --- /dev/null +++ b/assets/css/src/scss/partials/_images.scss @@ -0,0 +1,5 @@ +.responsive img { + max-width: 100% !important; + height: auto; + display: block; +} \ No newline at end of file diff --git a/assets/css/src/scss/partials/_main.scss b/assets/css/src/scss/partials/_main.scss index 206a0643..d257d7e6 100644 --- a/assets/css/src/scss/partials/_main.scss +++ b/assets/css/src/scss/partials/_main.scss @@ -41,7 +41,7 @@ main { padding: $section-padding-y $section-padding-x; } - > div { + > div:not(.loading) { @include display-flex; height: 100%; diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index b1c3c3cd..5b1ad9b4 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -1,23 +1,25 @@ -$zindex-modal-bg : 1040; -$zindex-modal : 1050; +$zindex-modal : 1040; +$modal-fade-in-name : namespace('modal-fade-in'); +$modal-fade-out-name : namespace('modal-fade-out'); -$modal-inner-padding : 15px !default; +$modal-header-border-color : #e5e5e5 !default; +$modal-footer-border-color : $modal-header-border-color !default; + +$modal-content-bg : #fff !default; +$modal-content-border-color : rgba(0,0,0,.2) !default; +$modal-border-radius : $border-radius-base; + +$modal-padding-y : $padding-base-vertical; +$modal-padding-x : $padding-base-horizontal; $modal-title-padding-y : $padding-base-vertical; $modal-title-padding-x : $padding-base-horizontal; $modal-title-line-height : $line-height-base !default; - $modal-close-padding-y : $padding-base-vertical; $modal-close-padding-x : $padding-base-horizontal; -$modal-content-bg : #fff !default; -$modal-content-border-color : rgba(0,0,0,.2) !default; -$modal-border-radius : 0; - -$modal-backdrop-bg : #000 !default; -$modal-backdrop-opacity : .5 !default; -$modal-header-border-color : #e5e5e5 !default; -$modal-footer-border-color : $modal-header-border-color !default; +$modal-footer-padding-y : $padding-base-vertical; +$modal-footer-padding-x : $padding-base-horizontal; $modal-body-padding-y : $padding-base-vertical; $modal-body-padding-x : $padding-base-horizontal; @@ -29,6 +31,8 @@ $modal-lg : 900px !default; $modal-md : 600px !default; $modal-sm : 300px !default; +$raw-bg : $input-bg; +$raw-border-color : $modal-header-border-color; /** * @name Modal @@ -36,106 +40,77 @@ $modal-sm : 300px !default; * @state .error - Error Modal * * @markup -
-
+
+

Modal title

-
-

One fine body…

+
+

One fine body…

+
-

Status message

- - +
+

Status message

+ + +
*/ -// .modal-open - body class for killing the scroll -// .modal - container to scroll within -// .modal-dialog - positioning shell for the actual modal -// .modal-content - actual modal w/ bg and corners and shit - modal { @at-root { .#{current-module()} { position: fixed; + overflow: auto; + -webkit-overflow-scrolling: touch; + z-index: $zindex-modal; top: 0; right: 0; bottom: 0; left: 0; - z-index: $zindex-modal; - display: none; - overflow: hidden; - // Prevent Chrome on Windows from adding a focus outline. For details, see - // https://github.com/twbs/bootstrap/pull/10951. - outline: 0; - -webkit-overflow-scrolling: touch; - - // When fading in the modal, animate it to slide down - &.fade .#{namespace('modal')}-dialog { - transition: transform .3s ease-out; - transform: translate(0, -25%); - } - &.in .#{namespace('modal')}-dialog { transform: translate(0, 0); } - } - - // Kill the scroll on the body - .#{current-module()}-open { - overflow: hidden; + padding: $modal-padding-y * 3 $modal-padding-x; } - // Container that the modal scrolls within - .#{current-module()}-open .#{current-module()} { - overflow-x: hidden; - overflow-y: auto; - } + // overlay + .#{current-module()}-overlay { + @include animation($modal-fade-in-name 0.5s); + position: fixed; + background: rgba(0, 0, 0, .4); + top: 0; + right: 0; + bottom: 0; + left: 0; - // Shell div to position the modal with bottom padding - .#{current-module()}-dialog { - position: relative; - width: auto; - margin: 10px 0; - padding: 0 10px; + &.vex.vex-closing { + @include animation($modal-fade-out-name 0.5s); + } } - // Actual modal + // Content - The Modal .#{current-module()}-content { + @include animation($modal-fade-in-name 0.5s); position: relative; background-color: $modal-content-bg; background-clip: padding-box; border: 1px solid $modal-content-border-color; border-radius: $modal-border-radius; @include box-shadow(0 3px 9px rgba(0,0,0,.5)); + margin: 0 auto; // Remove focus outline from opened modal outline: 0; } - // Modal background - // @todo: bootstrap needs prefix for components? - .modal-backdrop, .#{current-module()}-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: $zindex-modal-bg; - background-color: $modal-backdrop-bg; - - // Fade for backdrop - &.fade { opacity: 0; } - &.in { opacity: $modal-backdrop-opacity; } - } - // Modal header // Top section of the modal w/ title and dismiss .#{current-module()}-header { @@ -145,10 +120,23 @@ modal { @include display-flex; } + /** + * Error modal + */ + .error & { + background: nth($paletteRed, 8); + border-color: lighten(nth($paletteRed, 8), 5%); + color: $inverse-text-color; + + .#{namespace('btn')} { + @include button-variant($inverse-text-color, nth($paletteRed, 8), lighten(nth($paletteRed, 8), 5%)); + } + } + } // Close icon - .#{current-module()}-header .close { + .#{current-module()}-header .#{namespace('btn')} { @include flex(0 1 auto); border-width: 0; border-left-width: 1px; @@ -177,6 +165,15 @@ modal { position: relative; padding: $modal-body-padding-y $modal-body-padding-x; @include clearfix(); + + .raw-output { + width: 100%; + max-height: 200px; + overflow: scroll; + font-family: monospace; + background: $raw-bg; + border: 1px solid $raw-border-color; + } } // Footer (for actions) @@ -208,161 +205,32 @@ modal { } } - // Measure scrollbar width for padding body during modal show/hide - .#{current-module()}-scrollbar-measure { - position: absolute; - top: -9999px; - width: 50px; - height: 50px; - overflow: scroll; - } - - /** - * Error modal - */ - - .#{current-module()}-header { - .error & { - background: nth($paletteRed, 8); - border-color: lighten(nth($paletteRed, 8), 5%); - color: $inverse-text-color; + // modal sizes + @include media-breakpoint-up(sm) { + .#{current-module()}-content { + max-width: $modal-md; + } - .#{namespace('btn')} { - @include button-variant($inverse-text-color, nth($paletteRed, 8), lighten(nth($paletteRed, 8), 5%)); - } + .modal-sm .#{current-module()}-content { + max-width: $modal-sm; } } - .#{current-module()}-body { - .error & { - .raw-output { - width: 100%; - max-height: 200px; - overflow: scroll; - } + @include media-breakpoint-up(md) { + .modal-lg .#{current-module()}-content { + max-width: $modal-lg; } } + // keyframes + @include keyframes($modal-fade-in-name) { + 0% { opacity: 0; } + 100% { opacity: 1; } + } + @include keyframes($modal-fade-out-name) { + 0% { opacity: 1; } + 100% { opacity: 0; } + } } -} - - - - -// Scale up the modal -@include media-breakpoint-up(sm) { - // Automatically set modal's width for larger viewports - .modal-dialog { - max-width: $modal-md; - margin: 30px auto; - } - .modal-content { - @include box-shadow(0 5px 15px rgba(0,0,0,.5)); - } - - // Modal sizes - .modal-sm { max-width: $modal-sm; } -} - -@include media-breakpoint-up(md) { - .modal-lg { max-width: $modal-lg; } -} - -//#wc-pos-modal, #modal { -// .modal-content { -// @include border-radius(0); -// } -// .modal-header { -// padding: 0; -// position: relative; -// background-color: #fcfcfc; -// height: 50px; -// h1 { -// padding: 0 16px; -// font-size: 22px; -// line-height: 50px; -// margin: 0; -// } -// i { -// position: absolute; -// top: 0; -// right: 0; -// cursor: pointer; -// color: #777; -// height: 50px; -// width: 50px; -// text-align: center; -// border-left: 1px solid #ddd; -// line-height: 50px; -// background: transparent; -// @include transition-property(all); -// @include transition-duration(.1s); -// @include transition-timing-function(ease-in-out); -// &:hover { -// color: #000; -// border-color: #ccc; -// background: #ddd; -// outline: 0; -// } -// } -// } -// .modal-body { -// @include clearfix; -// -// // wp-admin -// i.spinner { -// display: inline-block; -// float: none; -// margin: 0; -// visibility: visible; -// } -// } -// .modal-footer { -// padding: 0px; -// > div { -// padding: 11px; -// p.message { -// display: inline-block; -// margin: 0 10px 0 0; -// text-align: right; -// line-height: 20px; -// i { -// margin-right: 5px; -// vertical-align: middle; -// } -// &.success { -// color: $state-success-text; -// } -// &.error { -// color: $state-danger-text; -// } -// } -// } -// } -// -// // error alert -// .error { -// .modal-header{ -// background: nth( $paletteRed, 8 ); -// border-color: lighten( nth( $paletteRed, 8 ), 5% ); -// color: $inverse-text-color; -// i { -// color: $inverse-text-color; -// border-color: lighten( nth( $paletteRed, 8 ), 5% ); -// &:hover { -// color: $inverse-text-color; -// background: nth( $paletteRed, 7 ); -// outline: 0; -// } -// } -// } -// .modal-body { -// .raw-output { -// width: 100%; -// max-height: 200px; -// overflow: scroll; -// } -// } -// } -//} \ No newline at end of file +} \ No newline at end of file diff --git a/assets/css/src/scss/pos.scss b/assets/css/src/scss/pos.scss index 6b6f7578..c730940a 100644 --- a/assets/css/src/scss/pos.scss +++ b/assets/css/src/scss/pos.scss @@ -23,6 +23,7 @@ @import "partials/forms"; @import "partials/icons"; @import "partials/input-group"; +@import "partials/images"; @import "partials/list"; @import "partials/loading"; @import "partials/modal"; diff --git a/assets/js/src/app.js b/assets/js/src/app.js index 52906793..f6628e8d 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -56,10 +56,7 @@ app.printApp = new PrintRouter({ container: app.layout.getRegion('main') }); -app.modalService = new ModalService({ - container: app.layout.getRegion('modal') -}); - +app.modalService = new ModalService(); app.popoverService = new PopoverService(); app.printService = new PrintService(); app.tabsService = new TabsService(); diff --git a/assets/js/src/apps/app/layout-view.js b/assets/js/src/apps/app/layout-view.js index f5badd29..f397b06d 100644 --- a/assets/js/src/apps/app/layout-view.js +++ b/assets/js/src/apps/app/layout-view.js @@ -11,16 +11,14 @@ module.exports = LayoutView.extend({ '' + '' + '
' + - '
' + - ''; + '
'; }, regions: { header: '#header', menu : '#menu', tabs : '#tabs', - main : '#main', - modal : '#modal' + main : '#main' }, initialize: function(){ diff --git a/assets/js/src/apps/header/service.js b/assets/js/src/apps/header/service.js index 5578c0b1..b2edee6f 100644 --- a/assets/js/src/apps/header/service.js +++ b/assets/js/src/apps/header/service.js @@ -3,7 +3,6 @@ var TitleBar = require('./views/title-bar'); var Menu = require('./views/menu'); var App = require('lib/config/application'); var Radio = require('backbone.radio'); -var routerChannel = Radio.channel('router'); var BrowserModal = require('./views/modals/browser'); var _ = require('lodash'); var Modernizr = global['Modernizr']; @@ -16,10 +15,6 @@ var Service = Service.extend({ this.header = options.headerContainer; this.menu = options.menuContainer; - this.listenToOnce(routerChannel, { - 'route': this.browserCheck - }); - this.channel.reply({ 'update:title': this.updateTitle }, this); @@ -28,6 +23,7 @@ var Service = Service.extend({ onStart: function(){ this.showTitleBar(); this.showMenu(); + this.browserCheck(); }, showTitleBar: function(){ @@ -51,13 +47,12 @@ var Service = Service.extend({ }, browserCheck: function(){ - // smil targets all IE: http://caniuse.com/#feat=svg-smil - var props = ['flexbox', 'indexeddb', 'smil'], + var props = ['flexbox', 'indexeddb'], pass = _.every(props, function(prop){ return Modernizr[prop]; }); if(!pass){ var view = new BrowserModal(); - Radio.request('modal', 'open', view); + Radio.request('modal', 'error', view); } }, diff --git a/assets/js/src/apps/header/views/modals/browser.js b/assets/js/src/apps/header/views/modals/browser.js index e6a6c2a2..e1e08a40 100644 --- a/assets/js/src/apps/header/views/modals/browser.js +++ b/assets/js/src/apps/header/views/modals/browser.js @@ -28,17 +28,14 @@ var View = ItemView.extend({ 'action' : 'wc_pos_get_modal', 'template': 'browser' }).always(function(template){ - self.update(template); + self.$el.html(template); }); this.modal.header = { title: polyglot.t('messages.browser') }; - }, - - update: function(template){ - this.$el.html(template); } + }); module.exports = View; diff --git a/assets/js/src/apps/header/views/modals/help.js b/assets/js/src/apps/header/views/modals/help.js index c79150c1..d1dfa461 100644 --- a/assets/js/src/apps/header/views/modals/help.js +++ b/assets/js/src/apps/header/views/modals/help.js @@ -17,9 +17,7 @@ var View = ItemView.extend({ header: { title: polyglot.t('titles.hotkeys') }, - footer: { - show: false - } + footer: false }; }, diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 95776766..76041044 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -134,7 +134,7 @@ var CartRoute = Route.extend({ }); this.listenTo(view, { - 'action:void': function(btn, view){ + 'action:void': function(){ view.triggerMethod('disableButtons'); this.layout.getRegion('list').currentView.voidCart( this.order ); }, diff --git a/assets/js/src/apps/pos/receipt/views/modals/email.js b/assets/js/src/apps/pos/receipt/views/modals/email.js index 23fdd5a3..a6175c67 100644 --- a/assets/js/src/apps/pos/receipt/views/modals/email.js +++ b/assets/js/src/apps/pos/receipt/views/modals/email.js @@ -8,10 +8,8 @@ var View = ItemView.extend({ template: hbs.compile(Tmpl), - viewOptions: ['email'], - initialize: function(options){ - this.mergeOptions(options, this.viewOptions); + this.mergeOptions(options, ['email']); this.modal = { header: { title: polyglot.t('titles.email-receipt') @@ -35,10 +33,9 @@ var View = ItemView.extend({ }, templateHelpers: function(){ - var data = { + return { email: this.email }; - return data; }, getEmail: function(){ diff --git a/assets/js/src/apps/settings/checkout/modals/gateway-settings.js b/assets/js/src/apps/settings/checkout/modals/gateway-settings.js index 2b1c1a93..35cbf294 100644 --- a/assets/js/src/apps/settings/checkout/modals/gateway-settings.js +++ b/assets/js/src/apps/settings/checkout/modals/gateway-settings.js @@ -1,7 +1,6 @@ var FormView = require('lib/config/form-view'); var $ = require('jquery'); var Tooltip = require('lib/behaviors/tooltip'); -var Radio = require('backbone.radio'); module.exports = FormView.extend({ @@ -37,14 +36,6 @@ module.exports = FormView.extend({ } }, - modelEvents: { - 'change:title': function(modal, value){ - var update = {}; - update.header = { title: value }; - Radio.request('modal', 'update', update); - } - }, - onRender: function(){ var self = this; this.$('input, select, textarea').each(function(){ diff --git a/assets/js/src/apps/settings/checkout/route.js b/assets/js/src/apps/settings/checkout/route.js index a287227d..8aa1ad5e 100644 --- a/assets/js/src/apps/settings/checkout/route.js +++ b/assets/js/src/apps/settings/checkout/route.js @@ -26,29 +26,34 @@ var SettingsRoute = Route.extend({ this.container.show(view); }, - openModal: function(id, view){ + openModal: function(id, v){ var model = this.model.collection.add({ id: 'gateway_' + id }); if(!model.get('title')){ - this.initModalData(model, view); + this.initModalData(model, v); } - var modal = new GatewaySettingsModal({ - tmpl: view.modalTmpl, + var view = new GatewaySettingsModal({ + tmpl: v.modalTmpl, model: model }); - var self = this; - Radio.request('modal', 'open', modal) - .then(function(args){ - var buttons = args.view.getButtons(); - self.listenTo(buttons, 'action:save', function(btn){ - model.save([], { buttons: btn }); - }); - }); + var modal = Radio.request('modal', 'open', view); + this.listenTo( modal.currentView, { + 'childview:action:save': function( view, btn ){ + model.save([], { buttons: btn }); + } + }); + + this.listenTo( model, { + 'change:title': function( model, value ){ + modal.currentView.getRegion('headerRegion') + .currentView.updateTitle(value); + } + }); }, initModalData: function(model, view){ diff --git a/assets/js/src/apps/settings/tools/modal/translation-update.js b/assets/js/src/apps/settings/tools/modal/translation-update.js index c6b8e18b..34626102 100644 --- a/assets/js/src/apps/settings/tools/modal/translation-update.js +++ b/assets/js/src/apps/settings/tools/modal/translation-update.js @@ -37,9 +37,7 @@ module.exports = ItemView.extend({ if( e.data === 'complete' ){ this.close(); view.ui.loading.hide(); - Radio.request('modal', 'update', { footer: { - show: true - }}); + view.triggerMethod('update:complete'); } else { view.ui.loading.before('

' + e.data + '

'); } diff --git a/assets/js/src/apps/settings/tools/route.js b/assets/js/src/apps/settings/tools/route.js index 9f6f2d85..b7ebeb5e 100644 --- a/assets/js/src/apps/settings/tools/route.js +++ b/assets/js/src/apps/settings/tools/route.js @@ -29,7 +29,12 @@ var Tools = Route.extend({ var view = new TranslationModal({ title: title }); - Radio.request('modal', 'open', view); + + var modal = Radio.request('modal', 'open', view); + + this.listenTo( view, 'update:complete', function(){ + modal.currentView.getRegion('footerRegion').$el.show(); + }); }, openDataDeleteModal: function(args){ diff --git a/assets/js/src/lib/components/buttons/behavior.js b/assets/js/src/lib/components/buttons/behavior.js index 545cb96b..03405156 100644 --- a/assets/js/src/lib/components/buttons/behavior.js +++ b/assets/js/src/lib/components/buttons/behavior.js @@ -31,14 +31,16 @@ var Buttons = Behavior.extend({ action: function(e){ e.preventDefault(); var action = $(e.target).data('action'); - this.view.trigger('action:' + action, $(e.target), this.view, action ); + this.view.triggerMethod('action:' + action, $(e.target), action); + //this.view.trigger('action:' + action, $(e.target), this.view, action ); }, toggle: function(e){ e.preventDefault(); this.enable().disable($(e.target)); var toggle = $(e.target).data('toggle'); - this.view.trigger('toggle:' + toggle, $(e.target), this.view, toggle); + this.view.triggerMethod('toggle:' + toggle, $(e.target), toggle); + //this.view.trigger('toggle:' + toggle, $(e.target), this.view, toggle); }, enable: function(btn){ diff --git a/assets/js/src/lib/components/buttons/view.js b/assets/js/src/lib/components/buttons/view.js index ff8778f6..78d0ad85 100644 --- a/assets/js/src/lib/components/buttons/view.js +++ b/assets/js/src/lib/components/buttons/view.js @@ -7,8 +7,6 @@ var ButtonsBehavior = require('./behavior'); module.exports = ItemView.extend({ - viewOptions: ['buttons'], - buttons: [{ action: 'save', className: 'btn-primary' @@ -17,7 +15,7 @@ module.exports = ItemView.extend({ template: hbs.compile(tmpl), initialize: function(options){ - this.mergeOptions(options, this.viewOptions); + this.mergeOptions(options, ['buttons']); }, templateHelpers: function(){ diff --git a/assets/js/src/lib/components/modal/views/error.hbs b/assets/js/src/lib/components/modal/body.hbs similarity index 64% rename from assets/js/src/lib/components/modal/views/error.hbs rename to assets/js/src/lib/components/modal/body.hbs index 2a84ac94..45a536bc 100644 --- a/assets/js/src/lib/components/modal/views/error.hbs +++ b/assets/js/src/lib/components/modal/body.hbs @@ -1,9 +1,9 @@

- {{message}} + {{{message}}} {{#if raw}} {{/if}}

{{#if raw}} -

+ {{/if}} \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/body.js b/assets/js/src/lib/components/modal/body.js new file mode 100644 index 00000000..423359ec --- /dev/null +++ b/assets/js/src/lib/components/modal/body.js @@ -0,0 +1,28 @@ +var ItemView = require('lib/config/item-view'); +var hbs = require('handlebars'); +var Tmpl = require('./body.hbs'); +//var _ = require('lodash'); +//var polyglot = require('lib/utilities/polyglot'); + +module.exports = ItemView.extend({ + template: hbs.compile(Tmpl), + + templateHelpers: function(){ + return this.options; + }, + + ui: { + raw: '*[data-action="raw"]', + output: '.raw-output' + }, + + events: { + 'click @ui.raw': 'toggleRaw' + }, + + toggleRaw: function(e){ + e.preventDefault(); + this.ui.output.toggle(); + } + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/header.hbs b/assets/js/src/lib/components/modal/header.hbs new file mode 100644 index 00000000..7c880a79 --- /dev/null +++ b/assets/js/src/lib/components/modal/header.hbs @@ -0,0 +1,6 @@ +

+ {{{title}}} +

+ + + \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/views/header.js b/assets/js/src/lib/components/modal/header.js similarity index 60% rename from assets/js/src/lib/components/modal/views/header.js rename to assets/js/src/lib/components/modal/header.js index 1388d77b..4ffeba57 100644 --- a/assets/js/src/lib/components/modal/views/header.js +++ b/assets/js/src/lib/components/modal/header.js @@ -8,21 +8,28 @@ module.exports = ItemView.extend({ template: hbs.compile(Tmpl), initialize: function(options){ - options = options || {}; - var defaults = { + _.defaults(options, { title: polyglot.t('messages.loading'), close: polyglot.t('buttons.close') - }; - this.data = _.defaults(options, defaults); + }); }, templateHelpers: function(){ - this.data.iconPrefix = window.adminpage ? 'wc_pos-icon' : 'icon'; - return this.data; + return this.options; }, - onUpdate: function(options){ - _.extend(this.data, options); - this.render(); + ui: { + close: '[data-action="close"]', + title: 'h4' + }, + + triggers: { + 'click @ui.close': 'action:close' + }, + + // helper method to update title + updateTitle: function( value ){ + this.ui.title.text( value ); } + }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/layout.js b/assets/js/src/lib/components/modal/layout.js new file mode 100644 index 00000000..8dc0c41f --- /dev/null +++ b/assets/js/src/lib/components/modal/layout.js @@ -0,0 +1,91 @@ +var LayoutView = require('lib/config/layout-view'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); +var Header = require('./header'); +var Body = require('./body'); +var Tmpl = require('./modal.hbs'); +var hbs = require('handlebars'); + +var defaultModal = { + header: { + title: '' + }, + footer: { + buttons: [ + { + type: 'message' + },{ + action: 'save', + icon: 'prepend', + className: 'btn-primary' + } + ] + } +}; + +module.exports = LayoutView.extend({ + + template: hbs.compile(Tmpl), + + initialize: function( options ){ + options = _.defaults( options, { + header: _.get(options, ['view', 'modal', 'header'], defaultModal.header), + footer: _.get(options, ['view', 'modal', 'footer'], defaultModal.footer) + }); + this.mergeOptions( options, ['header', 'footer', 'view'] ); + }, + + childEvents: { + 'action:close' : function(){ + Radio.request( 'modal', 'close', this.el.id ); + } + }, + + templateHelpers: function(){ + return { + header: !!this.header, + footer: !!this.footer + }; + }, + + onShow: function(){ + if( this.header ){ this.showHeader( this.header ); } + this.showBody(); + if( this.footer ){ this.showFooter( this.footer ); } + }, + + showHeader: function( options ){ + var container = this.$('[class$="modal-header"]'); + if( container.length === 0 ){ + return; + } + + var region = this.addRegion( 'headerRegion', container ); + var view = new Header( options ); + region.show( view ); + }, + + showBody: function(){ + var container = this.$('[class$="modal-body"]'); + if( container.length === 0 ){ + return; + } + + var region = this.addRegion( 'bodyRegion', container ); + var view = this.view || new Body(this.options); + region.show( view ); + }, + + showFooter: function( options ){ + options = options || {}; + var container = this.$('[class$="modal-footer"]'); + + if( container.length && options.buttons ){ + var region = this.addRegion( 'footerRegion', container ); + var view = Radio.request('buttons', 'view', options); + region.$el.toggle( options.show !== false ); + region.show( view ); + } + } + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/modal.hbs b/assets/js/src/lib/components/modal/modal.hbs new file mode 100644 index 00000000..d81a9c3e --- /dev/null +++ b/assets/js/src/lib/components/modal/modal.hbs @@ -0,0 +1,3 @@ +{{#if header}}
{{/if}} +
+{{#if footer}}
{{/if}} \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 71176663..90eaa46a 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -1,138 +1,120 @@ var Service = require('lib/config/service'); -var Backbone = require('backbone'); -var LayoutView = require('./views/layout'); -var AlertView = require('./views/alert'); -var $ = require('jquery'); +var Modal = require('vex-js'); +var App = require('lib/config/application'); +var prefix = App.prototype.namespace('modal'); var _ = require('lodash'); +var Layout = require('./layout.js'); +var bb = require('backbone'); +var mn = require('backbone.marionette'); var globalChannel = require('backbone.radio').channel('global'); +// css classes +Modal.baseClassNames = { + vex : prefix, + content : prefix + '-content', + overlay : prefix + '-overlay', + close : prefix + '-close', + closing : prefix + '-closing', + open : prefix + '-open' +}; + module.exports = Service.extend({ channelName: 'modal', - initialize: function(options){ - this.container = options.container; - this.start(); - }, - - onStart: function(){ + initialize: function(){ this.channel.reply({ - 'open' : this.open, - 'close' : this.close, - 'alert' : this.alert, - 'confirm' : this.confirm, - 'prompt' : this.prompt + open : this.open, + close : this.close, + error : this.error }, this); - this.layout = new LayoutView(); - this.container.show(this.layout); - - this.channel.reply({ - 'update': this.layout.update - }, this.layout); - + // global error messages globalChannel.on({ 'error' : this.error }, this); + }, + + open: function(options){ + options = this.parseOptions( options ); + + options = _.extend( { + showCloseButton : false, + overlayClosesOnClick : false + }, options ); - this.listenTo(Backbone.history, { - 'route' : this.onRoute - }); + var modal = Modal.open( options ); + var region = new mn.Region({ el: modal }); + options.className = undefined; // note className leaks into Layout View + return region.show( new Layout( options ) ); }, - onStop: function(){ - delete this.layout; - this.container.reset(); - this.channel.reset(); + close: function( id ){ + id = parseInt( id, 10 ); + return Modal.close( id ); }, - onRoute: function(){ - if (this.fragment !== Backbone.history.fragment) { - this.close(); - } + alert: function(){ + }, - //alert: function(options){ - // var deferred = $.Deferred(); - // var view = new AlertView(options); - // - // view.on({ - // 'confirm' : deferred.resolve, - // 'cancel' : deferred.resolve - // }); - // - // return deferred; - //}, - // - //confirm: function(options){ - // var deferred = $.Deferred(); - // var view = new ConfirmView(options); - // - // view.on({ - // 'confirm' : deferred.resolve, - // 'cancel' : deferred.reject - // }); - // - // return deferred; - //}, - // - //prompt: function(options){ - // var deferred = $.Deferred(); - // var view = new PromptView(options); - // - // view.on({ - // 'submit' : deferred.resolve, - // 'cancel' : deferred.reject - // }); - // - // return deferred; - //}, - - open: function(view){ - var self = this; - this.fragment = Backbone.history.fragment; - return this.close().then(function() { - self.isOpen = true; - return self.layout.open(view); - }); + confirm: function(){ + }, - close: function(){ - if (this.isOpen) { - this.isOpen = false; - return this.layout.close(); - } else { - return $.Deferred().resolve(); - } + prompt: function(){ + }, - error: function(options){ - options = options || {}; + error: function( options ){ + options = _.extend( { + className : 'error', + footer : { + buttons: [ + { + action: 'close' + } + ] + } + }, this.parseOptions( options ) ); + return this.open( options ); + }, - if(options.jqXHR){ - this.parseXHR(options); - } + parseOptions: function( options ){ + + // simple message + if( _.isString(options) ){ + options = { message: options }; - var view = new AlertView({ - className : 'error', - title : options.status, - message : options.message, - raw : options.raw - }); + // backbone view + } else if( options instanceof bb.View ) { + options = {view: options}; - this.open(view); + // ajaxError + } else if( _.isObject( options ) && options.jqXHR ){ + options = this.parseXHR( options ); + } + + return options; }, parseXHR: function(options){ - if( _.isObject(options.thrownError) ){ - options.status = options.thrownError.name; - options.message = options.thrownError.message; + var title, message; + if( options.thrownError ){ + title = options.thrownError.name; + message = options.thrownError.message; } else { - options.status = options.jqXHR.statusText; + title = options.jqXHR.statusText; if( options.jqXHR.responseJSON && options.jqXHR.responseJSON.errors[0] ){ - options.message = options.jqXHR.responseJSON.errors[0].message; + message = options.jqXHR.responseJSON.errors[0].message; } } - options.raw = options.jqXHR.responseText; + return { + header: { + title: title + }, + message: message, + raw: options.jqXHR.responseText + } } }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/views/alert.js b/assets/js/src/lib/components/modal/views/alert.js deleted file mode 100644 index f506fe1b..00000000 --- a/assets/js/src/lib/components/modal/views/alert.js +++ /dev/null @@ -1,47 +0,0 @@ -var View = require('lib/config/item-view'); -var hbs = require('handlebars'); -var Tmpl = require('./error.hbs'); - -module.exports = View.extend({ - template: hbs.compile(Tmpl), - - initialize: function(options){ - options = options || {}; - this.message = options.message; - this.raw = options.raw; - - this.modal = { - className: options.className, - header: { - title: options.title - }, - footer: { - buttons: [{ - action: 'close' - }] - } - }; - }, - - templateHelpers: function(){ - var data = {}; - data.message = this.message; - data.raw = this.raw; - return data; - }, - - ui: { - raw: '*[data-action="raw"]', - output: '.raw-output' - }, - - events: { - 'click @ui.raw': 'toggleRaw' - }, - - toggleRaw: function(e){ - e.preventDefault(); - this.ui.output.toggle(); - } - -}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/views/header.hbs b/assets/js/src/lib/components/modal/views/header.hbs deleted file mode 100644 index 327c2046..00000000 --- a/assets/js/src/lib/components/modal/views/header.hbs +++ /dev/null @@ -1,6 +0,0 @@ -

- {{{title}}} -

- - - \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/views/layout.js b/assets/js/src/lib/components/modal/views/layout.js deleted file mode 100644 index ee98c07f..00000000 --- a/assets/js/src/lib/components/modal/views/layout.js +++ /dev/null @@ -1,136 +0,0 @@ -var LayoutView = require('lib/config/layout-view'); -var Header = require('./header'); -var _ = require('lodash'); -var $ = require('jquery'); -var hbs = require('handlebars'); -var Tmpl = require('./modal.hbs'); -var Radio = require('backbone.radio'); -var debug = require('debug')('modalLayout'); -var App = require('lib/config/application'); -require('bootstrap/dist/js/umd/modal'); - -module.exports = LayoutView.extend({ - template: hbs.compile(Tmpl), - - // if wp-admin, add css prefix - className: function(){ - return App.prototype.namespace('modal'); - }, - - attributes: { - 'tabindex' : -1, - 'role' : 'dialog' - }, - - buttons: [ - { - type: 'message' - },{ - action: 'save', - icon: 'prepend', - className: 'btn-primary' - } - ], - - regions: { - header : '.modal-header', - content : '.modal-body', - footer : '.modal-footer' - }, - - initialize: function () { - this.$el.modal({ show: false, backdrop: 'static' }); - }, - - events: { - 'click [data-action="close"]' : function(e){ - e.preventDefault(); - Radio.request('modal', 'close'); - } - }, - - triggers: { - 'show.bs.modal' : { preventDefault: false, event: 'before:open' }, - 'shown.bs.modal' : { preventDefault: false, event: 'open' }, - 'hide.bs.modal' : { preventDefault: false, event: 'before:close' }, - 'hidden.bs.modal' : { preventDefault: false, event: 'close' } - }, - - open: function(view){ - var deferred = $.Deferred(); - this.once('open', deferred.resolve); - this.setup(view); - this.content.show(view); - this.$el.modal('show'); - return deferred; - }, - - close: function() { - var deferred = $.Deferred(); - this.once('close', function() { - this.tearDown(); - deferred.resolve(); - }); - this.$el.modal('hide'); - return deferred; - }, - - setup: function(view){ - var attributes = view.modal || {}; - - _.defaults(attributes, { - header: {}, - footer: {} - }); - - _.each(attributes, function(attr, key){ - var method = $.camelCase('modal-' + key); - if(this[method]){ - this[method](attr); - } else { - debug('no method matching ' + method); - } - }, this); - }, - - tearDown: function(){ - this.header.empty(); - this.content.empty(); - this.footer.empty(); - this.$('.modal-dialog').removeClass().addClass('modal-dialog'); - }, - - update: function(options){ - options = options || {}; - _.each(options, function(attr, key){ - this[key].currentView.triggerMethod('Update', attr); - }, this); - }, - - modalHeader: function(options){ - var view = new Header(options); - this.header.show(view); - }, - - modalFooter: function(options){ - options.buttons = options.buttons || this.buttons; - var view = Radio.request('buttons', 'view', options); - this.footer.show(view); - }, - - modalTitle: function(title){ - //title = title || this.$('.modal-header h1').data('title'); - this.$('.modal-header h1').html(title); - }, - - modalClassName: function(className){ - if(className){ - this.$('.modal-dialog').addClass(className); - } - }, - - getButtons: function(){ - return this.getRegion('footer').currentView; - } - -}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/views/modal.hbs b/assets/js/src/lib/components/modal/views/modal.hbs deleted file mode 100644 index 0cd26765..00000000 --- a/assets/js/src/lib/components/modal/views/modal.hbs +++ /dev/null @@ -1,7 +0,0 @@ -
-
-
-
-
-
-
\ No newline at end of file diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index 11437107..878954fb 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -49,6 +49,7 @@ module.exports = Mn.Application.extend({ // bootstrap accounting settings accounting.settings = this.options.accounting; + }, /** diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index 2bd75f1d..16ee5e05 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -7,6 +7,32 @@ var Collection = require('./collection'); var app = require('./application'); var IndexedDB = require('./idb/src/idb'); var Radio = require('backbone.radio'); +var polyglot = require('lib/utilities/polyglot'); +var _ = require('lodash'); + +var parseError = function( error ){ + + // errors thrown by idb-wrapper + if( error instanceof Error ){ + return { + header: { + title: 'IDBError' + }, + message: error.message + }; + } + + // errors thrown by indexedDB + var err = _.get(error, ['target', 'error']); + if( err instanceof window.DOMError ){ + return { + header: { + title: err.title + }, + message: err.message + }; + } +}; module.exports = app.prototype.IndexedDBCollection = Collection.extend({ name : 'store', @@ -30,10 +56,8 @@ module.exports = app.prototype.IndexedDBCollection = Collection.extend({ autoIncrement : this.autoIncrement, indexes : this.indexes, defaultErrorHandler : function(error){ - Radio.trigger('global', 'error', { - status: error.target.error.name, - message: error.target.error.message - }); + var result = parseError(error); + Radio.trigger('global', 'error', result); } }; @@ -42,10 +66,9 @@ module.exports = app.prototype.IndexedDBCollection = Collection.extend({ this.db.open() // error opening db .fail(function(error){ - Radio.trigger('global', 'error', { - status : 'indexedDB error', - message : error - }); + var result = parseError(error); + result.message += ' ' + polyglot.t('messages.private-browsing'); + Radio.trigger('global', 'error', result); }); }, diff --git a/includes/class-wc-pos-i18n.php b/includes/class-wc-pos-i18n.php index 7f99b267..d84af3e2 100755 --- a/includes/class-wc-pos-i18n.php +++ b/includes/class-wc-pos-i18n.php @@ -393,7 +393,8 @@ static public function payload() { 'cart-empty' => __( 'Your cart is currently empty.', 'woocommerce' ), 'no-gateway' => __( 'No payment gateways enabled.', 'woocommerce-pos' ), /* translators: woocommerce */ - 'no-customer' => __( 'Customer not found', 'woocommerce' ) + 'no-customer' => __( 'Customer not found', 'woocommerce' ), + 'private-browsing' => sprintf( __( 'WooCommerce POS will not work in Private Mode, please disable Private Browsing.', 'woocommerce-pos' ), 'https://wikipedia.org/wiki/Privacy_mode' ), ), 'plural' => array( 'records' => _x( 'record |||| records', 'eg: 23 records', 'woocommerce-pos' ), diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index 04ebbc72..1de05ddd 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -27,9 +27,9 @@ class WC_POS_Template { 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.min.js', - 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.3/backbone.marionette.min.js', - 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.3/handlebars.min.js', - 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.0/idbstore.min.js', + 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.min.js', + 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js', +// 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.min.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', @@ -39,9 +39,9 @@ class WC_POS_Template { 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.js', - 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.3/backbone.marionette.js', - 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.3/handlebars.js', - 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.0/idbstore.min.js', + 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.js', + 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js', +// 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.js', diff --git a/includes/views/modals/browser.php b/includes/views/modals/browser.php index 6e02e537..a0190d18 100644 --- a/includes/views/modals/browser.php +++ b/includes/views/modals/browser.php @@ -2,7 +2,7 @@ update your browser, we recommend either Chrome or Firefox.'); ?>

-
Browser Compatibility Chart
+
Browser Compatibility Chart

support@woopos.com.au'); ?>

\ No newline at end of file diff --git a/package.json b/package.json index 8fa34c1a..e8e225d3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "woocommerce-pos", "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", - "version": "0.4.5", + "version": "0.4.6-beta", "scripts": { "test": "grunt test", "dev": "grunt dev", @@ -30,61 +30,60 @@ "backbone": "^1.2.3", "backbone-collection-proxy": "^0.2.5", "backbone-validation": "^0.11.5", - "backbone.marionette": "^2.4.3", + "backbone.marionette": "^2.4.4", "backbone.radio": "^1.0.2", "backbone.stickit": "^0.9.2", - "bootstrap": "twbs/bootstrap#v4-dev", "combokeys": "^2.4.3", "debug": "^2.2.0", - "handlebars": "^4.0.3", - "idb-wrapper": "^1.6.0", + "handlebars": "^4.0.5", + "idb-wrapper": "kilbot/IDBWrapper", "jquery": "^2.1.4", "jquery-color": "^1.0.0", "lodash": "^3.10.1", "moment": "^2.10.6", - "node-polyglot": "^0.4.3", + "node-polyglot": "^0.4.4", "normalize.css": "^3.0.3", "select2": "^4.0.0", "tether": "^1.1.1", - "tether-drop": "^1.3.1" + "tether-drop": "^1.4.1" }, "devDependencies": { - "chai": "^3.3.0", + "chai": "^3.4.1", "chai-as-promised": "^5.1.0", - "chai-backbone": "^0.9.2", + "chai-backbone": "^0.9.4", "chai-jquery": "^2.0.0", "coveralls": "^2.11.4", "exports-loader": "^0.6.2", "grunt": "^0.4.5", - "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-clean": "^0.7.0", "grunt-contrib-compass": "^1.0.4", - "grunt-contrib-compress": "^0.13.0", - "grunt-contrib-copy": "^0.8.1", + "grunt-contrib-compress": "^0.14.0", + "grunt-contrib-copy": "^0.8.2", "grunt-contrib-cssmin": "^0.14.0", "grunt-contrib-jshint": "^0.11.3", "grunt-contrib-symlink": "^0.3.0", - "grunt-contrib-uglify": "^0.9.2", + "grunt-contrib-uglify": "^0.11.0", "grunt-contrib-watch": "^0.6.1", "grunt-mocha-istanbul": "^3.0.1", "grunt-phpunit": "^0.3.6", "grunt-simple-mocha": "^0.4.0", "grunt-webpack": "^1.0.11", "grunt-wp-i18n": "^0.5.3", - "imports-loader": "^0.6.3", - "istanbul": "^0.3.22", - "jsdom": "^6.5.1", - "jshint-stylish": "^2.0.1", + "imports-loader": "^0.6.5", + "istanbul": "^0.4.1", + "jsdom": "^7.1.0", + "jshint-stylish": "^2.1.0", "load-grunt-tasks": "^3.3.0", - "mocha": "^2.3.3", + "mocha": "^2.3.4", "node-localstorage": "^0.6.0", "pioneer": "^0.11.7", "proxyquire": "^1.7.3", "raw-loader": "^0.5.1", - "selenium-webdriver": "^2.47.0", - "sinon": "^1.17.1", + "selenium-webdriver": "^2.48.2", + "sinon": "^1.17.2", "sinon-as-promised": "^4.0.0", "sinon-chai": "^2.8.0", - "webpack": "^1.12.2", - "webpack-dev-server": "^1.12.0" + "webpack": "^1.12.9", + "webpack-dev-server": "^1.14.0" } } diff --git a/woocommerce-pos.php b/woocommerce-pos.php index 29c49f60..ccac1ff9 100644 --- a/woocommerce-pos.php +++ b/woocommerce-pos.php @@ -4,7 +4,7 @@ * Plugin Name: WooCommerce POS * Plugin URI: https://wordpress.org/plugins/woocommerce-pos/ * Description: A simple front-end for taking WooCommerce orders at the Point of Sale. Requires WooCommerce. - * Version: 0.4.5 + * Version: 0.4.6-beta * Author: kilbot * Author URI: http://woopos.com.au * Text Domain: woocommerce-pos @@ -26,7 +26,7 @@ /** * Define plugin constants. */ -define( 'WC_POS_VERSION', '0.4.5' ); +define( 'WC_POS_VERSION', '0.4.6-beta' ); define( 'WC_POS_PLUGIN_NAME', 'woocommerce-pos' ); define( 'WC_POS_PLUGIN_FILE', plugin_basename( __FILE__ ) ); // 'woocommerce-pos/woocommerce-pos.php' define( 'WC_POS_PLUGIN_PATH', trailingslashit( plugin_dir_path( __FILE__ ) ) ); From 5d409a106cce99cf24abb8a4fd6b8ec3e9043654 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 3 Dec 2015 16:05:59 +0800 Subject: [PATCH 007/169] improved error messages --- assets/js/src/lib/components/modal/service.js | 97 ++++++++++++++----- assets/js/src/lib/config/sync.js | 31 ++++-- package.json | 2 +- 3 files changed, 97 insertions(+), 33 deletions(-) diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 90eaa46a..9f70cf98 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -7,6 +7,7 @@ var Layout = require('./layout.js'); var bb = require('backbone'); var mn = require('backbone.marionette'); var globalChannel = require('backbone.radio').channel('global'); +var JSON = window.JSON; // css classes Modal.baseClassNames = { @@ -18,6 +19,34 @@ Modal.baseClassNames = { open : prefix + '-open' }; +/* jshint -W071, -W074 */ +var parseXHR = function(xhr, statusText, thrownError) { + thrownError = thrownError || {}; + var options = { header: {} }; + + // header + if( _.isString(thrownError) ){ + options.header.title = thrownError; + } else { + options.header.title = (thrownError.title || statusText); + } + + // message + options.message = thrownError.message || _.get( + xhr, + ['responseJSON', 'errors', 0, 'message'], + JSON.stringify(xhr.responseText) + ); + + // raw output + if (options.message !== xhr.responseText) { + options.raw = xhr.responseText; + } + + return options; +}; +/* jshint +W071, +W074 */ + module.exports = Service.extend({ channelName: 'modal', @@ -79,42 +108,64 @@ module.exports = Service.extend({ return this.open( options ); }, - parseOptions: function( options ){ + /* jshint -W074 */ + parseOptions: function( options ) { // simple message - if( _.isString(options) ){ - options = { message: options }; + if ( _.isString(options) ) { + options = {message: options}; + } // backbone view - } else if( options instanceof bb.View ) { + else if (options instanceof bb.View) { options = {view: options}; + } + + // errors thrown by idb-wrapper + else if (options instanceof Error) { + options = { + header: { + title: 'IDBError' + }, + message: options.message + }; + } - // ajaxError - } else if( _.isObject( options ) && options.jqXHR ){ - options = this.parseXHR( options ); + // other objects + else if ( _.isObject(options) ) { + options = this._parseObject(options); } return options; }, + /* jshint +W074 */ + + _parseObject: function(options){ + var err = _.get(options, ['target', 'error']); + + // errors thrown by indexedDB + if (err instanceof window.DOMError) { + options = { + header: { + title: err.title + }, + message: err.message + }; + } - parseXHR: function(options){ - var title, message; - if( options.thrownError ){ - title = options.thrownError.name; - message = options.thrownError.message; - } else { - title = options.jqXHR.statusText; - if( options.jqXHR.responseJSON && options.jqXHR.responseJSON.errors[0] ){ - message = options.jqXHR.responseJSON.errors[0].message; - } + // backbone sync error + else if (options.xhr) { + options = parseXHR( + options.xhr, options.statusText, options.thrownError + ); } - return { - header: { - title: title - }, - message: message, - raw: options.jqXHR.responseText + + // raw jqXHR + else if (options.readyState) { + options = parseXHR(options); } + + return options; } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/sync.js b/assets/js/src/lib/config/sync.js index 5fadc099..02fa0d1c 100644 --- a/assets/js/src/lib/config/sync.js +++ b/assets/js/src/lib/config/sync.js @@ -24,19 +24,32 @@ bb.$.ajaxSetup({ beforeSend: function(xhr){ xhr.setRequestHeader('X-WC-POS', 1); }, - timeout: 50000 // 50 seconds -}); - -// global ajax error handler -bb.$( document ).ajaxError(function( event, jqXHR, ajaxSettings, thrownError ) { - Radio.trigger('global', 'error', { - jqXHR : jqXHR, - thrownError : thrownError - }); + // remove comments, eg: WP Super Cache + //dataFilter: function(data, type){ + // if( type === 'json' ){ + // return data.replace(//g, ''); + // } + // return data; + //}, + timeout: 50000 // 50 seconds, }); // override Backbone.sync bb.sync = function(method, entity, options) { + + // wrap sync errors, kick to error modal + var onError = options.error; + options.error = function( xhr, textStatus, errorThrown ){ + Radio.trigger('global', 'error', { + xhr: xhr, + statusText: textStatus, + thrownError: errorThrown + }); + if(onError) { + onError.call(options.context, xhr, textStatus, errorThrown); + } + }; + // idb if(!options.remote && (entity.db || (entity.collection && entity.collection.db))){ diff --git a/package.json b/package.json index e8e225d3..394d3a97 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "jquery-color": "^1.0.0", "lodash": "^3.10.1", "moment": "^2.10.6", - "node-polyglot": "^0.4.4", + "node-polyglot": "^1.0.0", "normalize.css": "^3.0.3", "select2": "^4.0.0", "tether": "^1.1.1", From 589bc17fcbcc80d348e1f97083d3bb30f2a3d42c Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 5 Dec 2015 22:00:46 +0800 Subject: [PATCH 008/169] move global modals --- assets/js/src/admin.js | 25 +++++----- assets/js/src/app.js | 49 ++++++++++--------- assets/js/src/apps/admin/application.js | 35 ++----------- assets/js/src/apps/app/application.js | 27 ++++++---- assets/js/src/apps/app/layout-view.js | 28 +++++++++++ .../{header/views => app}/modals/browser.js | 0 .../apps/{header/views => app}/modals/help.js | 0 assets/js/src/apps/header/service.js | 15 ------ assets/js/src/apps/header/views/title-bar.js | 14 ------ assets/js/src/apps/settings/router.js | 8 +++ assets/js/src/entities/gateways/collection.js | 13 +++++ assets/js/src/entities/orders/model.js | 6 --- assets/js/src/entities/service.js | 21 +++----- assets/js/src/entities/settings/collection.js | 17 ++++++- assets/js/src/lib/components/modal/service.js | 7 ++- assets/js/src/lib/config/application.js | 25 ++-------- assets/js/src/lib/config/idb-collection.js | 6 +-- assets/js/src/lib/config/router.js | 1 + .../js/src/lib/utilities/stickit-handlers.js | 14 ++++++ includes/admin/class-wc-pos-settings.php | 20 +++++++- includes/class-wc-pos-template.php | 2 +- package.json | 2 +- .../unit/js/spec/apps/app/application.spec.js | 4 -- tests/unit/js/spec/entities/service.js | 47 +++++++++--------- 24 files changed, 202 insertions(+), 184 deletions(-) rename assets/js/src/apps/{header/views => app}/modals/browser.js (100%) rename assets/js/src/apps/{header/views => app}/modals/help.js (100%) diff --git a/assets/js/src/admin.js b/assets/js/src/admin.js index afe3364e..6e49d84a 100644 --- a/assets/js/src/admin.js +++ b/assets/js/src/admin.js @@ -1,4 +1,5 @@ var Application = require('apps/admin/application'); +var _ = require('lodash'); /** * Services @@ -26,21 +27,21 @@ var app = new Application(); /** * ... add SubApps and Services */ -app.entities = new EntitiesService({ - app: app -}); - -app.settingsApp = new SettingsRouter({ - container: app.layout.getRegion('main') -}); +app.on('before:start', function(options) { + + // attach services to global App + _.extend(this, { + entitiesService : new EntitiesService(options), + settingsApp : new SettingsRouter({ + container : this.layout.getRegion('main') + }), + modalService : new ModalService(), + tabsService : new TabsService(), + buttonsService : new ButtonsService() + }); -app.modalApp = new ModalService({ - container: app.layout.getRegion('modal') }); -app.tabsService = new TabsService(); -app.buttonsService = new ButtonsService(); - /** * Attach app to window for third party plugins */ diff --git a/assets/js/src/app.js b/assets/js/src/app.js index f6628e8d..ceec3f19 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -1,4 +1,5 @@ var Application = require('apps/app/application'); +var _ = require('lodash'); // sync config require('lib/config/sync'); @@ -35,34 +36,34 @@ var app = new Application(); /** * ... add SubApps and Services */ -app.entitiesService = new EntitiesService({ - app: app -}); - -app.headerService = new HeaderService({ - headerContainer : app.layout.getRegion('header'), - menuContainer : app.layout.getRegion('menu') -}); +app.on('before:start', function(options){ -app.posApp = new POSRouter({ - container: app.layout.getRegion('main') -}); + // attach services to global App + _.extend( this, { + entitiesService : new EntitiesService(options), + headerService : new HeaderService({ + headerContainer : this.layout.getRegion('header'), + menuContainer : this.layout.getRegion('menu') + }), + posApp : new POSRouter({ + container : this.layout.getRegion('main') + }), + supportApp : new SupportRouter({ + container : this.layout.getRegion('main') + }), + printApp : new PrintRouter({ + container : this.layout.getRegion('main') + }), + modalService : new ModalService(), + popoverService : new PopoverService(), + printService : new PrintService(), + tabsService : new TabsService(), + buttonsService : new ButtonsService(), + numpadService : new NumpadService() + } ); -app.supportApp = new SupportRouter({ - container: app.layout.getRegion('main') }); -app.printApp = new PrintRouter({ - container: app.layout.getRegion('main') -}); - -app.modalService = new ModalService(); -app.popoverService = new PopoverService(); -app.printService = new PrintService(); -app.tabsService = new TabsService(); -app.buttonsService = new ButtonsService(); -app.numpadService = new NumpadService(); - /** * Attach app to window for third party plugins */ diff --git a/assets/js/src/apps/admin/application.js b/assets/js/src/apps/admin/application.js index 780d2891..c3d4bf49 100644 --- a/assets/js/src/apps/admin/application.js +++ b/assets/js/src/apps/admin/application.js @@ -1,6 +1,6 @@ var Application = require('lib/config/application'); var bb = require('backbone'); -var _ = require('lodash'); +//var _ = require('lodash'); var LayoutView = require('./layout-view'); var debug = require('debug')('admin'); var Radio = require('backbone.radio'); @@ -9,11 +9,6 @@ var routerChannel = Radio.channel('router'); module.exports = Application.extend({ initialize: function() { - - // init Root LayoutView - this.layout = new LayoutView(); - this.layout.render(); - this.listenTo(routerChannel, { 'before:enter:route' : this.onBeforeEnterRoute, 'enter:route' : this.onEnterRoute, @@ -21,32 +16,12 @@ module.exports = Application.extend({ }); }, - /** - * Set up application with start params - */ - onBeforeStart: function(options){ - options = options || {}; - + onBeforeStart: function(){ debug( 'starting WooCommerce POS admin app' ); - // get settings tabs - this.settingsApp.tabsArray = _.map(options.settings, function(setting){ - return _.pick(setting, ['id', 'label']); - }); - - // get settings data - var data = _.map(options.settings, function(setting){ - _.set(setting, ['data', 'id'], setting.id); - return setting.data; - }); - - // init settings - var settings = Radio.request('entities', 'get', { - type: 'collection', - name: 'settings' - }); - - settings.add( data ); + // init Root LayoutView + this.layout = new LayoutView(); + this.layout.render(); }, onStart: function(){ diff --git a/assets/js/src/apps/app/application.js b/assets/js/src/apps/app/application.js index 646b8533..f96f87c8 100644 --- a/assets/js/src/apps/app/application.js +++ b/assets/js/src/apps/app/application.js @@ -2,28 +2,37 @@ var Application = require('lib/config/application'); var bb = require('backbone'); var LayoutView = require('./layout-view'); var debug = require('debug')('app'); +var BrowserModal = require('./modals/browser'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); +var Modernizr = global['Modernizr']; module.exports = Application.extend({ - initialize: function() { + onBeforeStart: function(){ + debug( 'starting WooCommerce POS app' ); + // init Root LayoutView this.layout = new LayoutView(); this.layout.render(); }, - /** - * Set up application with start params - */ - onBeforeStart: function(){ - // debugging - debug( 'starting WooCommerce POS app' ); + onStart: function(){ + // check browser + if( ! this.browserCheck() ){ + return Radio.request('modal', 'error', new BrowserModal()); + } // start header service this.headerService.start(); - }, - onStart: function(){ + // start router bb.history.start(); + }, + + browserCheck: function(){ + var props = ['flexbox', 'indexeddb']; + return _.every(props, function(prop){ return Modernizr[prop]; }); } }); \ No newline at end of file diff --git a/assets/js/src/apps/app/layout-view.js b/assets/js/src/apps/app/layout-view.js index f397b06d..dcbb5b0e 100644 --- a/assets/js/src/apps/app/layout-view.js +++ b/assets/js/src/apps/app/layout-view.js @@ -1,7 +1,10 @@ var LayoutView = require('lib/config/layout-view'); var $ = require('jquery'); +var _ = require('lodash'); var Radio = require('backbone.radio'); var globalChannel = Radio.channel('global'); +var HelpModal = require('./modals/help'); +var Combokeys = require('combokeys'); module.exports = LayoutView.extend({ el: '#page', @@ -21,6 +24,10 @@ module.exports = LayoutView.extend({ main : '#main' }, + keyEvents: { + 'help': 'showHelpModal' + }, + initialize: function(){ this.getRegion('main').on('show', this.setup, this); globalChannel.on('tab:label', this.updateTabLabel, this); @@ -34,6 +41,22 @@ module.exports = LayoutView.extend({ this.$el.removeClass('two-column'); this.getRegion('tabs').empty(); } + + var hotkeys = Radio.request('entities', 'get', { + type: 'option', + name: 'hotkeys' + }) || {}; + + var combokeys = new Combokeys(document.documentElement); + _.each( this.keyEvents, function(callback, id) { + var trigger = hotkeys[id]; + if ( !_.isFunction(callback) ) { + callback = this[callback]; + } + combokeys.bind(trigger.key, function(e, combo){ + callback.call(this, e, combo); + }); + }, this); }, showTabs: function(){ @@ -54,6 +77,11 @@ module.exports = LayoutView.extend({ updateTabLabel: function(options){ this.getRegion('main').tabs.setLabel(options); + }, + + showHelpModal: function() { + var view = new HelpModal(); + Radio.request('modal', 'open', view); } }); \ No newline at end of file diff --git a/assets/js/src/apps/header/views/modals/browser.js b/assets/js/src/apps/app/modals/browser.js similarity index 100% rename from assets/js/src/apps/header/views/modals/browser.js rename to assets/js/src/apps/app/modals/browser.js diff --git a/assets/js/src/apps/header/views/modals/help.js b/assets/js/src/apps/app/modals/help.js similarity index 100% rename from assets/js/src/apps/header/views/modals/help.js rename to assets/js/src/apps/app/modals/help.js diff --git a/assets/js/src/apps/header/service.js b/assets/js/src/apps/header/service.js index b2edee6f..a4204bdf 100644 --- a/assets/js/src/apps/header/service.js +++ b/assets/js/src/apps/header/service.js @@ -2,10 +2,6 @@ var Service = require('lib/config/service'); var TitleBar = require('./views/title-bar'); var Menu = require('./views/menu'); var App = require('lib/config/application'); -var Radio = require('backbone.radio'); -var BrowserModal = require('./views/modals/browser'); -var _ = require('lodash'); -var Modernizr = global['Modernizr']; var Service = Service.extend({ channelName: 'header', @@ -23,7 +19,6 @@ var Service = Service.extend({ onStart: function(){ this.showTitleBar(); this.showMenu(); - this.browserCheck(); }, showTitleBar: function(){ @@ -46,16 +41,6 @@ var Service = Service.extend({ this.menu.show(view); }, - browserCheck: function(){ - var props = ['flexbox', 'indexeddb'], - pass = _.every(props, function(prop){ return Modernizr[prop]; }); - - if(!pass){ - var view = new BrowserModal(); - Radio.request('modal', 'error', view); - } - }, - onStop: function(){ this.channel.reset(); } diff --git a/assets/js/src/apps/header/views/title-bar.js b/assets/js/src/apps/header/views/title-bar.js index a933ceee..1067afde 100644 --- a/assets/js/src/apps/header/views/title-bar.js +++ b/assets/js/src/apps/header/views/title-bar.js @@ -1,9 +1,7 @@ var ItemView = require('lib/config/item-view'); var App = require('lib/config/application'); -var HotKeys = require('lib/behaviors/hotkeys'); var Dropdown = require('lib/behaviors/dropdown'); var Radio = require('backbone.radio'); -var HelpModal = require('./modals/help'); var View = ItemView.extend({ template: 'header', @@ -30,14 +28,7 @@ var View = ItemView.extend({ 'click @ui.menu': 'openMenu' }, - keyEvents: { - 'help': 'showHelpModal' - }, - behaviors: { - HotKeys: { - behaviorClass: HotKeys - }, Dropdown: { behaviorClass: Dropdown, position: 'bottom right' @@ -56,11 +47,6 @@ var View = ItemView.extend({ openMenu: function(e){ e.preventDefault(); Radio.request('header', 'open:menu'); - }, - - showHelpModal: function() { - var view = new HelpModal(); - Radio.request('modal', 'open', view); } }); diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index 2671641e..104e315d 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -18,6 +18,14 @@ var SettingsRouter = Router.extend({ type: 'collection', name: 'settings' }); + var settings = Radio.request('entities', 'get', { + type: 'option', + name: 'settings', + root: true + }); + this.tabsArray = _.map(settings, function(setting){ + return _.pick(setting, ['id', 'label']); + }); }, onBeforeEnter: function() { diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index 3e124bbc..74727124 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -1,9 +1,22 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); module.exports = Collection.extend({ model: Model, + constructor: function(models, options) { + models = Radio.request('entities', 'get', { + type: 'option', + name: 'gateways' + }); + if( _(models).pluck('active').compact().isEmpty() ){ + models[0].active = true; + } + return Collection.prototype.constructor.call(this, models, options); + }, + initialize: function() { this._isNew = false; this.on( 'change:active', this.onChangeActive ); diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index bbf29432..1207dd27 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -139,12 +139,6 @@ var Model = DualModel.extend({ type : 'collection', name : 'gateways' }); - - var gateways = Radio.request('entities', 'get', { - type: 'option', - name: 'gateways' - }); - this.gateways.add(gateways); }, /** diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index 92fcac3b..f4f05ea4 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -4,8 +4,7 @@ var Orders = require('./orders/collection'); var Cart = require('./cart/collection'); var Customers = require('./customers/collection'); var Coupons = require('./coupons/collection'); -var Settings = require('./settings/model'); -var SettingsCollection = require('./settings/collection'); +var Settings = require('./settings/collection'); var Gateways = require('./gateways/collection'); var FilteredCollection = require('lib/config/obscura'); var debug = require('debug')('entities'); @@ -31,7 +30,7 @@ var EntitiesService = Service.extend({ customers : Customers, coupons : Coupons, gateways : Gateways, - settings : SettingsCollection + settings : Settings }, getMethods: { @@ -39,7 +38,6 @@ var EntitiesService = Service.extend({ model : 'getModel', filtered : 'getFiltered', option : 'getOption', - settings : 'getSettings', localStorage: 'getLocalStorage' }, @@ -118,19 +116,12 @@ var EntitiesService = Service.extend({ /** * return an option set during app.start(options) + * todo: refactor, remove 'root' option special case + * have getParam & getOption? or move params to root? */ getOption: function(options){ - return this.app.getOption(options.name); - }, - - /** - * settings are App options that can be changed by the user - * eg: HotKeys are bootstrapped as start options, but also - * can be updated through the POS - */ - getSettings: function(options){ - var option = this.app.getOption(options.name); - return new Settings(option); + var path = options.root ? options.name : ['params', options.name]; + return _.get( this.options, path ); }, setFilter: function(options){ diff --git a/assets/js/src/entities/settings/collection.js b/assets/js/src/entities/settings/collection.js index 3c375098..8569fd02 100644 --- a/assets/js/src/entities/settings/collection.js +++ b/assets/js/src/entities/settings/collection.js @@ -1,6 +1,21 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); module.exports = Collection.extend({ - model: Model + model: Model, + + constructor: function(models, options) { + var settings = Radio.request('entities', 'get', { + type: 'option', + name: 'settings', + root: true + }); + models = _.map(settings, function(setting){ + _.set(setting, ['data', 'id'], setting.id); + return setting.data; + }); + return Collection.prototype.constructor.call(this, models, options); + } }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 9f70cf98..8d398ce0 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -110,7 +110,6 @@ module.exports = Service.extend({ /* jshint -W074 */ parseOptions: function( options ) { - // simple message if ( _.isString(options) ) { options = {message: options}; @@ -122,7 +121,7 @@ module.exports = Service.extend({ } // errors thrown by idb-wrapper - else if (options instanceof Error) { + else if (window.Error && options instanceof window.Error) { options = { header: { title: 'IDBError' @@ -144,10 +143,10 @@ module.exports = Service.extend({ var err = _.get(options, ['target', 'error']); // errors thrown by indexedDB - if (err instanceof window.DOMError) { + if (window.DOMError && err instanceof window.DOMError) { options = { header: { - title: err.title + title: err.name }, message: err.message }; diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index 878954fb..9c4b8fd3 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -30,26 +30,11 @@ module.exports = Mn.Application.extend({ }, _initOptions: function( payload ){ - payload = payload || {}; - - // templates - hbs.Templates = payload.templates || {}; - - // polyglot - polyglot.extend( payload.i18n ); - - // options - this.options = payload.params || {}; - - // debug - this._initDebug( this.options.debug ); - - // emulateHTTP - bb.emulateHTTP = this.options.emulateHTTP === true; - - // bootstrap accounting settings - accounting.settings = this.options.accounting; - + hbs.Templates = _.get( payload, 'templates', {} ); + polyglot.extend( _.get( payload, 'i18n' ) ); + this._initDebug( _.get( payload, ['params', 'debug'] ) ); + bb.emulateHTTP = _.get( payload, ['params', 'emulateHTTP'], false ); + accounting.settings = _.get( payload, ['params', 'accounting'] ); }, /** diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index 16ee5e05..c148a0b3 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -13,7 +13,7 @@ var _ = require('lodash'); var parseError = function( error ){ // errors thrown by idb-wrapper - if( error instanceof Error ){ + if( window.Error && error instanceof window.Error ){ return { header: { title: 'IDBError' @@ -24,10 +24,10 @@ var parseError = function( error ){ // errors thrown by indexedDB var err = _.get(error, ['target', 'error']); - if( err instanceof window.DOMError ){ + if( window.DOMError && err instanceof window.DOMError ){ return { header: { - title: err.title + title: err.name }, message: err.message }; diff --git a/assets/js/src/lib/config/router.js b/assets/js/src/lib/config/router.js index c480adc1..70de9bac 100644 --- a/assets/js/src/lib/config/router.js +++ b/assets/js/src/lib/config/router.js @@ -6,6 +6,7 @@ var Route = require('./route'); var app = require('./application'); module.exports = app.prototype.Router = Mn.AppRouter.extend({ + constructor: function() { this.channel = bb.Radio.channel('router'); this.on('all', this._onRouterEvent); diff --git a/assets/js/src/lib/utilities/stickit-handlers.js b/assets/js/src/lib/utilities/stickit-handlers.js index 7bbeb52e..5ba897cc 100644 --- a/assets/js/src/lib/utilities/stickit-handlers.js +++ b/assets/js/src/lib/utilities/stickit-handlers.js @@ -11,6 +11,20 @@ bb.Stickit.addHandler({ } }); +/** + * Default select value + * - selects require a change event to update + * - this can cause problems with gateways, eg: month 01 + */ +bb.Stickit.addHandler({ + selector: 'select', + initialize: function($el, model, opt){ + if( model.get(opt.observe) === undefined ){ + model.set(opt.observe, $el.val()); + } + } +}); + /** * Select2 */ diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index 1bfdc694..68feb7b8 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -106,6 +106,22 @@ public function enqueue_admin_styles() { */ public function enqueue_admin_scripts() { + // +// global $wp_scripts; +// $wp_scripts->queue = array(); + // or + +// function pm_remove_all_scripts() { +// global $wp_scripts; +// $wp_scripts->queue = array(); +// } +// add_action('wp_print_scripts', 'pm_remove_all_scripts', 100); +// function pm_remove_all_styles() { +// global $wp_styles; +// $wp_styles->queue = array(); +// } +// add_action('wp_print_styles', 'pm_remove_all_styles', 100); + // deregister scripts wp_deregister_script( 'underscore' ); wp_deregister_script( 'select2' ); @@ -121,7 +137,7 @@ public function enqueue_admin_scripts() { wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js', array( 'jquery' ), null, true ); - wp_register_script( 'idb-wrapper', $external_libs[ 'idb-wrapper' ], false, null, true ); +// wp_register_script( 'idb-wrapper', $external_libs[ 'idb-wrapper' ], false, null, true ); // enqueue wp_enqueue_script( 'jquery-ui-sortable' ); @@ -131,7 +147,7 @@ public function enqueue_admin_scripts() { wp_enqueue_script( WC_POS_PLUGIN_NAME . '-admin-app', WC_POS_PLUGIN_URL . 'assets/js/admin.' . $build . '.js', - array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2', 'idb-wrapper' ), + array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), WC_POS_VERSION, true ); diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index 1de05ddd..daae9434 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -53,9 +53,9 @@ class WC_POS_Template { */ public function __construct() { + // todo: make params = payload if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { add_action( 'wp_ajax_wc_pos_payload', array( $this, 'payload' ) ); - return; } diff --git a/package.json b/package.json index 394d3a97..3f569e1d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "backbone.marionette": "^2.4.4", "backbone.radio": "^1.0.2", "backbone.stickit": "^0.9.2", - "combokeys": "^2.4.3", + "combokeys": "^2.4.4", "debug": "^2.2.0", "handlebars": "^4.0.5", "idb-wrapper": "kilbot/IDBWrapper", diff --git a/tests/unit/js/spec/apps/app/application.spec.js b/tests/unit/js/spec/apps/app/application.spec.js index 3bc2d3ba..b7298fbb 100644 --- a/tests/unit/js/spec/apps/app/application.spec.js +++ b/tests/unit/js/spec/apps/app/application.spec.js @@ -16,10 +16,6 @@ describe('apps/app/application.js', function() { beforeEach(function() { this.module.initialize(); }); - - it('should create a layout', function() { - expect(this.LayoutView).to.have.been.calledWithNew; - }); }); }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/service.js b/tests/unit/js/spec/entities/service.js index 3ba4035a..a6f5f265 100644 --- a/tests/unit/js/spec/entities/service.js +++ b/tests/unit/js/spec/entities/service.js @@ -83,24 +83,25 @@ describe('entities/service.js', function () { // expect(filtered).to.be.instanceof(Filtered); //}); - it('should return an app option using { type: "option" }', function(){ - this.module.app = new Marionette.Application({ foo: 'bar' }); - var foo = this.module.channel.request('get', { - type: 'option', - name: 'foo' - }); - expect(foo).to.equal('bar'); - }); + //it('should return an app option using { type: "option" }', function(){ + // this.module.app = new Marionette.Application({ foo: 'bar' }); + // var foo = this.module.channel.request('get', { + // type: 'option', + // name: 'foo', + // root: true + // }); + // expect(foo).to.equal('bar'); + //}); - it('should return a settings Model using { type: "settings" }', function(){ - this.module.app = new Marionette.Application({ foo: { user: 'setting' } }); - var foo = this.module.channel.request('get', { - type: 'settings', - name: 'foo' - }); - expect(foo).to.be.instanceof(Backbone.Model); - expect(foo.get('user')).equals('setting'); - }); + //it('should return a settings Model using { type: "settings" }', function(){ + // this.module.app = new Marionette.Application({ foo: { user: 'setting' } }); + // var foo = this.module.channel.request('get', { + // type: 'settings', + // name: 'foo' + // }); + // expect(foo).to.be.instanceof(Backbone.Model); + // expect(foo.get('user')).equals('setting'); + //}); it('should be able to get/set string data in localStorage', function() { this.module.channel.request('set', { @@ -187,12 +188,12 @@ describe('entities/service.js', function () { expect(test).to.be.undefined; }); - it('should return all collections', function(){ - this.module.should.respondTo('getAllCollections'); - var keys1 = Object.keys( this.module.getAllCollections() ); - var keys2 = Object.keys( this.module.collections ); - keys1.should.eql(keys2); - }); + //it('should return all collections', function(){ + // this.module.should.respondTo('getAllCollections'); + // var keys1 = Object.keys( this.module.getAllCollections() ); + // var keys2 = Object.keys( this.module.collections ); + // keys1.should.eql(keys2); + //}); it('should return IDB Collections', function(){ this.module.should.respondTo('idbCollections'); From 925b2a76374b595e151de4b7ab79bb6110b64f44 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sun, 6 Dec 2015 21:35:15 +0800 Subject: [PATCH 009/169] refactor POS params --- assets/js/src/app.js | 38 +++-- assets/js/src/entities/gateways/collection.js | 4 +- assets/js/src/entities/service.js | 5 +- assets/js/src/lib/components/modal/service.js | 4 +- assets/js/src/lib/config/application.js | 37 +++-- includes/admin/class-wc-pos-gateways.php | 2 +- includes/admin/class-wc-pos-settings.php | 22 ++- .../admin/settings/class-wc-pos-checkout.php | 7 - includes/{ => ajax}/class-wc-pos-params.php | 96 ++++++------ includes/{ => ajax}/class-wc-pos-settings.php | 53 ++----- includes/class-wc-pos-activator.php | 4 +- includes/class-wc-pos-admin.php | 1 + includes/class-wc-pos-ajax.php | 74 ++++++--- includes/class-wc-pos-gateways.php | 145 +++++++++++++++++- includes/class-wc-pos-i18n.php | 2 +- includes/class-wc-pos-template.php | 117 +------------- includes/class-wc-pos.php | 13 +- includes/wc-pos-functions.php | 2 +- 18 files changed, 339 insertions(+), 287 deletions(-) rename includes/{ => ajax}/class-wc-pos-params.php (73%) rename includes/{ => ajax}/class-wc-pos-settings.php (78%) diff --git a/assets/js/src/app.js b/assets/js/src/app.js index ceec3f19..bf7487a2 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -1,12 +1,4 @@ var Application = require('apps/app/application'); -var _ = require('lodash'); - -// sync config -require('lib/config/sync'); - -/** - * Services - */ var EntitiesService = require('entities/service'); var HeaderService = require('apps/header/service'); var ModalService = require('lib/components/modal/service'); @@ -15,13 +7,13 @@ var PrintService = require('lib/components/print/service'); var TabsService = require('lib/components/tabs/service'); var ButtonsService = require('lib/components/buttons/service'); var NumpadService = require('lib/components/numpad/service'); - -/** - * SubApps - */ var POSRouter = require('apps/pos/router'); var SupportRouter = require('apps/support/router'); var PrintRouter = require('apps/print/router'); +var _ = require('lodash'); + +// sync config +require('lib/config/sync'); /** * bootstrap Handlebars Helpers @@ -34,7 +26,19 @@ require('lib/utilities/handlebars-helpers'); var app = new Application(); /** - * ... add SubApps and Services + * ... add Services + */ +_.extend( app, { + modalService : new ModalService(), + buttonsService : new ButtonsService(), + popoverService : new PopoverService(), + printService : new PrintService(), + tabsService : new TabsService(), + numpadService : new NumpadService() +} ); + +/** + * ... add Services which require layout and params */ app.on('before:start', function(options){ @@ -53,13 +57,7 @@ app.on('before:start', function(options){ }), printApp : new PrintRouter({ container : this.layout.getRegion('main') - }), - modalService : new ModalService(), - popoverService : new PopoverService(), - printService : new PrintService(), - tabsService : new TabsService(), - buttonsService : new ButtonsService(), - numpadService : new NumpadService() + }) } ); }); diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index 74727124..a14ed696 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -10,8 +10,8 @@ module.exports = Collection.extend({ models = Radio.request('entities', 'get', { type: 'option', name: 'gateways' - }); - if( _(models).pluck('active').compact().isEmpty() ){ + }) || []; + if( models.length > 0 && _(models).pluck('active').compact().isEmpty() ){ models[0].active = true; } return Collection.prototype.constructor.call(this, models, options); diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index f4f05ea4..e72af211 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -116,12 +116,9 @@ var EntitiesService = Service.extend({ /** * return an option set during app.start(options) - * todo: refactor, remove 'root' option special case - * have getParam & getOption? or move params to root? */ getOption: function(options){ - var path = options.root ? options.name : ['params', options.name]; - return _.get( this.options, path ); + return _.get( this.options, options.name ); }, setFilter: function(options){ diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 8d398ce0..8c6613cb 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -120,11 +120,11 @@ module.exports = Service.extend({ options = {view: options}; } - // errors thrown by idb-wrapper + // errors thrown by idb-wrapper, handlebars else if (window.Error && options instanceof window.Error) { options = { header: { - title: 'IDBError' + title: options.name || 'Error' }, message: options.message }; diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index 9c4b8fd3..31eb06a4 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -29,29 +29,35 @@ module.exports = Mn.Application.extend({ ); }, - _initOptions: function( payload ){ - hbs.Templates = _.get( payload, 'templates', {} ); - polyglot.extend( _.get( payload, 'i18n' ) ); - this._initDebug( _.get( payload, ['params', 'debug'] ) ); - bb.emulateHTTP = _.get( payload, ['params', 'emulateHTTP'], false ); - accounting.settings = _.get( payload, ['params', 'accounting'] ); + _initOptions: function( params ){ + params = params || {}; + accounting.settings = params.accounting; + bb.emulateHTTP = params.emulateHTTP || false; + hbs.Templates = params.templates || {}; + polyglot.extend( params.i18n ); + this._initDebug( params.debug ); }, /** - * todo: handle errors * @param options */ start: function( options ){ var self = this; $.getJSON( options.ajaxurl, { - action: options.action || 'wc_pos_payload', + action: options.action || 'wc_pos_params', security: options.nonce - }, function( payload ){ - self._initOptions( payload ); - Mn.Application.prototype.start.call(self, payload); + }, function( params ){ + self._initOptions( params ); + Mn.Application.prototype.start.call(self, params); } - ); + ).fail(function(xhr, statusText, thrownError){ + Radio.request('modal', 'error', { + xhr: xhr, + statusText: statusText, + thrownError: thrownError + }); + }); }, set: function( path, value ){ @@ -79,5 +85,10 @@ Mn.TemplateCache.prototype.loadTemplate = function(templateId){ }; Mn.TemplateCache.prototype.compileTemplate = function(rawTemplate) { - return hbs.compile(rawTemplate); + try { + return hbs.compile(rawTemplate); + } catch(e) { + Radio.request('modal', 'error', e); + throw e; + } }; \ No newline at end of file diff --git a/includes/admin/class-wc-pos-gateways.php b/includes/admin/class-wc-pos-gateways.php index d8d404cd..a9c92948 100644 --- a/includes/admin/class-wc-pos-gateways.php +++ b/includes/admin/class-wc-pos-gateways.php @@ -9,7 +9,7 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Gateways extends WC_POS_Gateways { +class WC_POS_Admin_Gateways { public function __construct() { add_filter( 'woocommerce_payment_gateways_setting_columns', array( $this, 'woocommerce_payment_gateways_setting_columns' ), 10, 1 ); diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index 68feb7b8..43debdfa 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -17,6 +17,18 @@ class WC_POS_Admin_Settings { /* @var string The settings screen id */ static public $screen_id; + /** + * @var array settings handlers + */ + static public $handlers = array( + 'general' => 'WC_POS_Admin_Settings_General', + 'checkout' => 'WC_POS_Admin_Settings_Checkout', + 'hotkeys' => 'WC_POS_Admin_Settings_HotKeys', + 'access' => 'WC_POS_Admin_Settings_Access', + 'tools' => 'WC_POS_Admin_Settings_Tools', + 'status' => 'WC_POS_Admin_Settings_Status' + ); + /** * Constructor */ @@ -64,6 +76,14 @@ public function display_settings_page() { include 'views/settings.php'; } + /** + * Returns array of settings classes + * @return mixed|void + */ + static public function handlers(){ + return apply_filters( 'woocommerce_pos_admin_settings_handlers', self::$handlers); + } + /** * Delete settings in WP options table * @@ -177,7 +197,7 @@ public function enqueue_admin_scripts() { */ public function admin_inline_js() { $options = array( - 'action' => 'wc_pos_admin_settings_payload', + 'action' => 'wc_pos_admin_settings_params', 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ), 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ) ); diff --git a/includes/admin/settings/class-wc-pos-checkout.php b/includes/admin/settings/class-wc-pos-checkout.php index afc31194..7e00a1f4 100644 --- a/includes/admin/settings/class-wc-pos-checkout.php +++ b/includes/admin/settings/class-wc-pos-checkout.php @@ -43,13 +43,6 @@ public function load_gateways() { $gateways = WC_Payment_Gateways::instance()->payment_gateways; } - // some poorly written plugins will init WC_Payment_Gateways before WP init - // check to see if POS Cash Gateway is present, if not: re-init WC_Payment_Gateways - if( ! in_array( 'WC_POS_Gateways_Cash', array_map( 'get_class', $gateways ) ) ){ - WC_Payment_Gateways::instance()->init(); - $gateways = WC_Payment_Gateways::instance()->payment_gateways; - } - // reorder $i = count($gateways); foreach( $gateways as $gateway ) { diff --git a/includes/class-wc-pos-params.php b/includes/ajax/class-wc-pos-params.php similarity index 73% rename from includes/class-wc-pos-params.php rename to includes/ajax/class-wc-pos-params.php index 0c72f6e5..9919e385 100644 --- a/includes/class-wc-pos-params.php +++ b/includes/ajax/class-wc-pos-params.php @@ -8,59 +8,69 @@ * @link http://www.woopos.com.au */ -class WC_POS_Params { +class WC_POS_AJAX_Params { /** - * Constructor + * */ - public function __construct() { - - // this should only be init after woocommerce_init - global $wp_actions; - if( ! isset($wp_actions['woocommerce_init']) ){ - return; - } - - // common params - $this->accounting = $this->accounting(); - $this->ajaxurl = admin_url( 'admin-ajax.php', 'relative' ); - $this->customers = $this->customers(); - $this->debug = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG; - $this->nonce = wp_create_nonce( WC_POS_PLUGIN_NAME ); - $this->wc_api = get_woocommerce_api_url( '' ); - $this->emulateHTTP = get_option( 'woocommerce_pos_emulateHTTP' ) === '1'; - $this->idbVersion = WC_POS_Settings::get_idb_version(); + public function params(){ + $params = apply_filters( 'woocommerce_pos_params', $this->common_params() + $this->frontend_params(), $this ); + return WC_POS_AJAX::response( $params ); + } - // frontend params - if( is_pos() ) { - $this->auto_print = wc_pos_get_option( 'checkout', 'auto_print_receipt' ); - $this->denominations = WC_POS_i18n::currency_denominations(); - $this->discount_keys = wc_pos_get_option( 'general', 'discount_quick_keys' ); - $this->hotkeys = wc_pos_get_option( 'hotkeys', 'hotkeys' ); - $this->menu = $this->menu(); - $this->shipping = $this->shipping_labels(); - $this->store = array( 'name' => get_bloginfo( 'name' ) ); - $this->tabs = $this->product_tabs(); - $this->tax = $this->tax(); - $this->tax_classes = WC_POS_Tax::tax_classes(); - $this->tax_rates = WC_POS_Tax::tax_rates(); - $this->user = $this->user(); - } + /** + * + */ + public function admin_settings_params(){ + $params = apply_filters( 'woocommerce_pos_admin_settings_params', $this->common_params() + $this->admin_params(), $this ); + return WC_POS_AJAX::response( $params ); + } - // admin params - if( is_admin() ) { - $this->search_customers_nonce = wp_create_nonce( 'search-customers' ); - } + /** + * + */ + private function common_params(){ + return array( + 'accounting' => $this->accounting(), + 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ), + 'customers' => $this->customers(), + 'debug' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG, + 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ), + 'wc_api' => get_woocommerce_api_url( '' ), + 'emulateHTTP' => get_option( 'woocommerce_pos_emulateHTTP' ) === '1', + 'idbVersion' => WC_POS_AJAX_Settings::get_idb_version(), + 'i18n' => WC_POS_i18n::params() + ); + } + /** + * + */ + private function frontend_params(){ + return array( + 'auto_print' => wc_pos_get_option( 'checkout', 'auto_print_receipt' ), + 'denominations' => WC_POS_i18n::currency_denominations(), + 'discount_keys' => wc_pos_get_option( 'general', 'discount_quick_keys' ), + 'hotkeys' => wc_pos_get_option( 'hotkeys', 'hotkeys' ), + 'menu' => $this->menu(), + 'shipping' => $this->shipping_labels(), + 'store' => array( 'name' => get_bloginfo( 'name' ) ), + 'tabs' => $this->product_tabs(), + 'tax' => $this->tax(), + 'tax_classes' => WC_POS_Tax::tax_classes(), + 'tax_rates' => WC_POS_Tax::tax_rates(), + 'user' => $this->user(), + 'templates' => WC_POS_Template::templates_payload() + ); } /** - * Params payload for - * Converts class properties to array - * @return array + * */ - public function payload() { - return apply_filters( 'woocommerce_pos_params', get_object_vars( $this ), $this ); + private function admin_params(){ + return array( + 'search_customers_nonce' => wp_create_nonce( 'search-customers' ) + ); } /** diff --git a/includes/class-wc-pos-settings.php b/includes/ajax/class-wc-pos-settings.php similarity index 78% rename from includes/class-wc-pos-settings.php rename to includes/ajax/class-wc-pos-settings.php index 2c7dcce8..51fbaa51 100644 --- a/includes/class-wc-pos-settings.php +++ b/includes/ajax/class-wc-pos-settings.php @@ -8,61 +8,32 @@ * @link http://www.woopos.com.au */ -class WC_POS_Settings { +class WC_POS_AJAX_Settings { /* @var string The db prefix for WP Options table */ const DB_PREFIX = 'woocommerce_pos_'; - /* @var WC_POS_Params instance */ - private $params; - /* @var array */ private $settings; - /** - * @var array settings handlers - */ - static public $handlers = array( - 'general' => 'WC_POS_Admin_Settings_General', - 'checkout' => 'WC_POS_Admin_Settings_Checkout', - 'hotkeys' => 'WC_POS_Admin_Settings_HotKeys', - 'access' => 'WC_POS_Admin_Settings_Access', - 'tools' => 'WC_POS_Admin_Settings_Tools', - 'status' => 'WC_POS_Admin_Settings_Status' - ); - /** * */ public function __construct() { - add_action( 'wp_ajax_wc_pos_admin_settings_payload', array( $this, 'payload') ); add_action( 'wp_ajax_wc_pos_admin_settings', array( $this, 'admin_settings') ); - } - - /** - * Returns array of settings classes - * @return mixed|void - */ - static public function handlers(){ - return apply_filters( 'woocommerce_pos_settings_handlers', self::$handlers); + add_filter( 'woocommerce_pos_admin_settings_params', array( $this, 'params') ); } /** * AJAX payload + * + * @param array $params + * @return array */ - public function payload(){ - WC_POS_Server::check_ajax_referer(); - - $this->params = new WC_POS_Params(); - - $payload = array( - 'templates' => $this->templates_payload(), - 'settings' => $this->settings, - 'params' => $this->params->payload(), - 'i18n' => WC_POS_i18n::payload() - ); - - WC_POS_Server::response( $payload ); + public function params( array $params ){ + $params['templates'] = $this->templates_payload(); + $params['settings'] = $this->settings; + return $params; } /** @@ -71,7 +42,7 @@ public function payload(){ */ public function templates_payload(){ $templates = array(); - foreach(self::handlers() as $key => $handler){ + foreach(WC_POS_Admin_Settings::handlers() as $key => $handler){ $settings = $handler::get_instance(); ob_start(); $settings->output(); @@ -126,7 +97,7 @@ static public function bump_idb_version(){ * @return bool */ static public function get_option( $id, $key = false ){ - $handlers = (array) self::handlers(); + $handlers = (array) WC_POS_Admin_Settings::handlers(); if( !array_key_exists( $id, $handlers ) ) return false; @@ -179,7 +150,7 @@ private function process_admin_settings(){ // else, find handler by id } else { - $handlers = (array) self::handlers(); + $handlers = (array) WC_POS_Admin_Settings::handlers(); if(!isset($handlers[$id])) return new WP_Error( 'woocommerce_pos_settings_error', diff --git a/includes/class-wc-pos-activator.php b/includes/class-wc-pos-activator.php index eaa2124c..2679ab61 100644 --- a/includes/class-wc-pos-activator.php +++ b/includes/class-wc-pos-activator.php @@ -152,9 +152,9 @@ private function add_pos_capability(){ * Check version number, runs every admin page load */ private function version_check(){ - $old = WC_POS_Settings::get_db_version(); + $old = WC_POS_AJAX_Settings::get_db_version(); if( version_compare( $old, WC_POS_VERSION, '<' ) ){ - WC_POS_Settings::bump_versions(); + WC_POS_AJAX_Settings::bump_versions(); $this->db_upgrade( $old, WC_POS_VERSION ); } } diff --git a/includes/class-wc-pos-admin.php b/includes/class-wc-pos-admin.php index 21ec3e1f..c9aecb64 100644 --- a/includes/class-wc-pos-admin.php +++ b/includes/class-wc-pos-admin.php @@ -25,6 +25,7 @@ public function __construct() { public function init() { new WC_POS_Admin_Menu(); new WC_POS_Admin_Settings(); + new WC_POS_Admin_Gateways(); } /** diff --git a/includes/class-wc-pos-ajax.php b/includes/class-wc-pos-ajax.php index 41401292..dae8a430 100644 --- a/includes/class-wc-pos-ajax.php +++ b/includes/class-wc-pos-ajax.php @@ -18,16 +18,19 @@ class WC_POS_AJAX { */ public function __construct() { + // subclasses + $params = new WC_POS_AJAX_Params(); + new WC_POS_AJAX_Settings(); + $ajax_events = array( 'get_all_ids' => 'WC_POS_API', 'get_modal' => $this, - 'get_print_template' => $this, -// 'set_product_visibilty' => $this, 'email_receipt' => $this, 'send_support_email' => $this, 'test_http_methods' => $this, -// 'system_status' => $this, 'toggle_legacy_server' => 'WC_POS_Status', + 'params' => $params, + 'admin_settings_params' => $params ); foreach ( $ajax_events as $ajax_event => $class ) { @@ -39,24 +42,16 @@ public function __construct() { } + /** + * + */ public function get_modal() { if( isset( $_REQUEST['data']) ) extract( $_REQUEST['data'] ); include_once( dirname(__FILE__) . '/views/modals/' . $_REQUEST['template'] . '.php' ); - die(); - } - - public function get_print_template() { - - // check for custom template - $template_path_theme = '/woocommerce-pos/'; - $template_path_plugin = WC_POS()->plugin_path. 'public/views/print/'; - - wc_get_template( $_REQUEST['template'] . '.php', null, $template_path_theme, $template_path_plugin ); - - die(); + wp_die(); } /** @@ -113,7 +108,7 @@ public function email_receipt() { 'message' => __( 'There was an error sending the email', 'woocommerce-pos') ); } - WC_POS_Server::response($response); + self::response($response); } /** @@ -137,14 +132,14 @@ public function send_support_email() { ); } - WC_POS_Server::response($response); + self::response($response); } /** * Returns payload for any request for testing */ public function test_http_methods(){ - WC_POS_Server::response( array( + self::response( array( 'method' => strtolower($_SERVER['REQUEST_METHOD']), 'payload' => WC_POS_Server::get_raw_data() )); @@ -155,7 +150,7 @@ public function test_http_methods(){ */ public function system_status(){ $status = new WC_POS_Status(); - WC_POS_Server::response( $status->output() ); + self::response( $status->output() ); } /** @@ -169,8 +164,47 @@ public function check_ajax_referer(){ __( 'Invalid security nonce', 'woocommerce-pos' ), array( 'status' => 401 ) ); - WC_POS_Server::response($result); + self::response($result); + } + } + + /** + * The below functions closely resemble output from the WC REST API + * This keeps response handling in the POS somewhat consistent + * between API and AJAX calls + * + * Output the result + * @param $result + */ + static public function response($result){ + + header( 'Content-Type: application/json; charset=utf-8' ); + + if (is_wp_error($result)) { + $data = $result->get_error_data(); + if ( is_array( $data ) && isset( $data['status'] ) ) { + status_header( $data['status'] ); + } + $result = self::error_to_array( $result ); + } + + echo json_encode( $result ); + wp_die(); + } + + /** + * Convert wp_error to array + * @param $error + * @return array + */ + static private function error_to_array( $error ) { + $errors = array(); + foreach ( (array) $error->errors as $code => $messages ) { + foreach ( (array) $messages as $message ) { + $errors[] = array( 'code' => $code, 'message' => $message ); + } } + return array( 'errors' => $errors ); } } \ No newline at end of file diff --git a/includes/class-wc-pos-gateways.php b/includes/class-wc-pos-gateways.php index d4cd7e7e..4fa55350 100644 --- a/includes/class-wc-pos-gateways.php +++ b/includes/class-wc-pos-gateways.php @@ -11,23 +11,33 @@ class WC_POS_Gateways { + protected static $instance; + + private $enabled_gateways; + /** * Constructor */ public function __construct() { - $this->init(); add_action( 'woocommerce_payment_gateways', array( $this, 'payment_gateways' ) ); add_action( 'woocommerce_pos_load_gateway', array( $this, 'load_gateway' ) ); + add_filter( 'woocommerce_pos_templates', array( $this, 'templates' ) ); + add_filter( 'woocommerce_pos_params', array( $this, 'params' ) ); + + static::$instance = $this; } /** - * Sub classes + * Returns the Singleton instance of this class. + * - late static binding requires PHP 5.3+ + * @return Singleton */ - private function init(){ - // admin only - if (is_admin() && (!defined('DOING_AJAX') || !DOING_AJAX)) { - new WC_POS_Admin_Gateways(); + public static function get_instance() { + $class = get_called_class(); + if (null === static::$instance) { + static::$instance = new $class(); } + return static::$instance; } /** @@ -60,4 +70,127 @@ public function load_gateway( WC_Payment_Gateway $gateway ) { return $gateway; } + /** + * + */ + public function get_enabled_gateways(){ + if (null === $this->enabled_gateways) { + $settings = WC_POS_Admin_Settings_Checkout::get_instance(); + $this->enabled_gateways = $settings->load_enabled_gateways(); + } + return $this->enabled_gateways; + } + + /** + * @param array $templates + * @return array + */ + public function templates( array $templates ) { + $gateways = $this->get_enabled_gateways(); + + if ( $gateways ): foreach ( $gateways as $gateway ): + $templates[ 'pos' ][ 'checkout' ][ 'gateways' ][ $gateway->id ] = $this->sanitize_payment_fields( $gateway ); + endforeach; endif; + + return $templates; + } + + /** + * @param array $params + * @return array + */ + public function params( array $params ){ + $gateways = $this->get_enabled_gateways(); + + if ( $gateways ): foreach ( $gateways as $gateway ): + $params[ 'gateways' ][] = array( + 'method_id' => $gateway->id, + 'method_title' => esc_html( $gateway->get_title() ), + 'icon' => $this->sanitize_icon( $gateway ), + 'active' => $gateway->default + ); + endforeach; endif; + + return $params; + } + + /** + * Sanitize payment icon + * - some gateways include junk in icon property, eg: paypal link + * + * @param WC_Payment_Gateway $gateway + * @return string + */ + private function sanitize_icon( WC_Payment_Gateway $gateway ) { + $icon = $gateway->show_icon ? $gateway->get_icon() : ''; + if ( $icon !== '' ) { + // simple preg_match + preg_match( '/< *img[^>]*src *= *["\']?([^"\']*)/i', $icon, $src ); + $icon = $src[ 1 ]; + } + + return $icon; + } + + /** + * Sanitize payment fields + * - some gateways include js in their payment fields + * + * @param WC_Payment_Gateway $gateway + * @return mixed|string + */ + private function sanitize_payment_fields( WC_Payment_Gateway $gateway ) { + $html = ''; + if ( $gateway->has_fields() || $gateway->get_description() ) { + + ob_start(); + $gateway->payment_fields(); + $html = ob_get_contents(); + ob_end_clean(); + + // remove script tags + $html = $this->removeDomNodes( $html, '//script' ); + } + + return $this->trim_html_string( $html );; + } + + /** + * Removes dom nodes, eg: '; } - /** - * Sanitize payment icon - * - some gateways include junk in icon property, eg: paypal link - * - * @param WC_Payment_Gateway $gateway - * @return string - */ - protected function sanitize_icon( WC_Payment_Gateway $gateway ) { - $icon = $gateway->show_icon ? $gateway->get_icon() : ''; - if ( $icon !== '' ) { - // simple preg_match - preg_match( '/< *img[^>]*src *= *["\']?([^"\']*)/i', $icon, $src ); - $icon = $src[ 1 ]; - } - - return $icon; - } - - /** - * Sanitize payment fields - * - some gateways include js in their payment fields - * - * @param WC_Payment_Gateway $gateway - * @return mixed|string - */ - protected function sanitize_payment_fields( WC_Payment_Gateway $gateway ) { - $html = ''; - if ( $gateway->has_fields() || $gateway->get_description() ) { - - ob_start(); - $gateway->payment_fields(); - $html = ob_get_contents(); - ob_end_clean(); - - // remove script tags - $html = $this->removeDomNodes( $html, '//script' ); - } - - return self::trim_html_string( $html );; - } - - /** - * Removes dom nodes, eg: '; + } + + /** + * Start the Admin App + */ + public function print_footer_scripts() { + $options = array( 'wc_api' => get_woocommerce_api_url(null) ); + echo ''; + } + + /** + * @return int + */ + static public function get_db_version(){ + return get_option( self::DB_PREFIX . 'db_version', 0 ); + } + + /** + * updates db to new version number + * bumps the idb version number + */ + static public function bump_versions(){ + self::update_option( self::DB_PREFIX . 'db_version', WC_POS_VERSION ); + self::bump_idb_version(); + } + + /* + * + */ + static public function get_idb_version(){ + $version = (int) get_option( self::DB_PREFIX . 'idb_version', 0 ); + return $version ? $version : self::bump_idb_version(); + } + + /* + * + */ + static public function bump_idb_version(){ + $version = (int) get_option( self::DB_PREFIX . 'idb_version', 0 ) + 1; + if( self::update_option( self::DB_PREFIX . 'idb_version', $version ) ){ + return $version; + } + } + + /** + * @param $id + * @param $key + * @return bool + */ + static public function get_option( $id, $key = false ){ + $handlers = (array) WC_POS_Admin_Settings::handlers(); + if( !array_key_exists( $id, $handlers ) ) + return false; + + $settings = $handlers[$id]::get_instance(); + return $settings->get( $key ); + } + + /** + * Add or update a WordPress option. + * The option will _not_ auto-load by default. + * + * @param string $name + * @param mixed $value + * @param string $autoload + * @return bool + */ + static public function update_option( $name, $value, $autoload = 'no' ) { + $success = add_option( $name, $value, '', $autoload ); + return $success ? $success : update_option( $name, $value ); + } + +} \ No newline at end of file diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index 43debdfa..6f5390ea 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -1,7 +1,7 @@ 'WC_POS_Admin_Settings_General', 'checkout' => 'WC_POS_Admin_Settings_Checkout', + 'receipts' => 'WC_POS_Admin_Settings_Receipts', 'hotkeys' => 'WC_POS_Admin_Settings_HotKeys', - 'access' => 'WC_POS_Admin_Settings_Access', - 'tools' => 'WC_POS_Admin_Settings_Tools', - 'status' => 'WC_POS_Admin_Settings_Status' + 'access' => 'WC_POS_Admin_Settings_Access' ); - /** - * Constructor - */ - public function __construct() { - add_action( 'admin_menu', array( $this, 'admin_menu' ) ); - add_action( 'current_screen', array( $this, 'conditional_init' ) ); - } - /** * Add Settings page to admin menu */ public function admin_menu() { - self::$screen_id = add_submenu_page( + $this->screen_id = add_submenu_page( WC_POS_PLUGIN_NAME, /* translators: wordpress */ __( 'Settings' ), @@ -53,22 +41,6 @@ public function admin_menu() { ); } - /** - * - * - * @param $current_screen - */ - public function conditional_init( $current_screen ) { - if ( $current_screen->id == self::$screen_id ) { - - // Enqueue scripts for the settings page - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) ); - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 99 ); - add_action( 'admin_print_footer_scripts', array( $this, 'admin_inline_js' ) ); - - } - } - /** * Output the settings pages */ @@ -84,63 +56,12 @@ static public function handlers(){ return apply_filters( 'woocommerce_pos_admin_settings_handlers', self::$handlers); } - /** - * Delete settings in WP options table - * - * @param $id - * @return bool - */ - static function delete_settings( $id ) { - return delete_option( self::DB_PREFIX . $id ); - } - - /** - * Delete all settings in WP options table - */ - static function delete_all_settings() { - global $wpdb; - $wpdb->query( - $wpdb->prepare( " - DELETE FROM {$wpdb->options} - WHERE option_name - LIKE '%s'", - self::DB_PREFIX . '%' - ) - ); - } - - /** - * Settings styles - */ - public function enqueue_admin_styles() { - wp_enqueue_style( - WC_POS_PLUGIN_NAME . '-admin', - WC_POS_PLUGIN_URL . 'assets/css/admin.min.css', - null, - WC_POS_VERSION - ); - } - /** * Settings scripts */ public function enqueue_admin_scripts() { - - // -// global $wp_scripts; -// $wp_scripts->queue = array(); - // or - -// function pm_remove_all_scripts() { -// global $wp_scripts; -// $wp_scripts->queue = array(); -// } -// add_action('wp_print_scripts', 'pm_remove_all_scripts', 100); -// function pm_remove_all_styles() { -// global $wp_styles; -// $wp_styles->queue = array(); -// } -// add_action('wp_print_styles', 'pm_remove_all_styles', 100); + global $wp_scripts; + $wp_scripts->queue = array(); // deregister scripts wp_deregister_script( 'underscore' ); @@ -149,10 +70,10 @@ public function enqueue_admin_scripts() { // register $external_libs = WC_POS_Template::get_external_js_libraries(); - wp_register_script( 'underscore', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); - wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'underscore' ), null, true ); - wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'underscore' ), null, true ); - wp_register_script( 'marionette', $external_libs[ 'marionette' ], array( 'jquery', 'backbone', 'underscore' ), null, true ); + wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); + wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); + wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); + wp_register_script( 'marionette', $external_libs[ 'marionette' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); @@ -165,8 +86,8 @@ public function enqueue_admin_scripts() { $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-admin-app', - WC_POS_PLUGIN_URL . 'assets/js/admin.' . $build . '.js', + WC_POS_PLUGIN_NAME . '-admin-settings-app', + WC_POS_PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), WC_POS_VERSION, true @@ -185,23 +106,11 @@ public function enqueue_admin_scripts() { wp_enqueue_script( WC_POS_PLUGIN_NAME . '-js-locale', $scripts[ 'locale' ], - array( WC_POS_PLUGIN_NAME . '-admin-app' ), + array( WC_POS_PLUGIN_NAME . '-admin-settings-app' ), WC_POS_VERSION, true ); } } - /** - * Start the Settings App - */ - public function admin_inline_js() { - $options = array( - 'action' => 'wc_pos_admin_settings_params', - 'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ), - 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ) - ); - echo ''; - } - } \ No newline at end of file diff --git a/includes/admin/class-wc-pos-status.php b/includes/admin/class-wc-pos-status.php new file mode 100644 index 00000000..a99d16a2 --- /dev/null +++ b/includes/admin/class-wc-pos-status.php @@ -0,0 +1,106 @@ + + * @link http://www.woopos.com.au + */ + +class WC_POS_Admin_Status extends WC_POS_Admin_Abstract { + + /* @var string JS var with page id, used for API requests */ + public $wc_pos_adminpage = 'admin_system_status'; + + /** + * @var array settings handlers + */ + static public $handlers = array( + 'tools' => 'WC_POS_Admin_Settings_Tools', + 'status' => 'WC_POS_Admin_Settings_Status' + ); + + /** + * Add Settings page to admin menu + */ + public function admin_menu() { + $this->screen_id = add_submenu_page( + WC_POS_PLUGIN_NAME, + /* translators: woocommerce */ + __( 'System Status', 'woocommerce' ), + /* translators: woocommerce */ + __( 'System Status', 'woocommerce' ), + 'manage_woocommerce_pos', + 'wc_pos_system_status', + array( $this, 'display_system_status_page' ) + ); + } + + /** + * Output the settings pages + */ + public function display_system_status_page() { + include 'views/settings.php'; + } + + /** + * Returns array of settings classes + * @return mixed|void + */ + static public function handlers(){ + return apply_filters( 'woocommerce_pos_admin_system_status_handlers', self::$handlers); + } + + /** + * Settings scripts + */ + public function enqueue_admin_scripts() { + + // + global $wp_scripts; + $wp_scripts->queue = array(); + + // deregister scripts + wp_deregister_script( 'underscore' ); + wp_deregister_script( 'select2' ); + wp_deregister_script( 'backbone' ); + + // register + $external_libs = WC_POS_Template::get_external_js_libraries(); + wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); + wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); + wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); + wp_register_script( 'marionette', $external_libs[ 'marionette' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); + wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); + wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); + wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); + wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js', array( 'jquery' ), null, true ); + + // enqueue + wp_enqueue_script( 'jquery-ui-sortable' ); + + $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; + + wp_enqueue_script( + WC_POS_PLUGIN_NAME . '-admin-system-status-app', + WC_POS_PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', + array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), + WC_POS_VERSION, + true + ); + + $scripts = apply_filters( 'woocommerce_pos_admin_enqueue_scripts', array() ); + if ( isset( $scripts[ 'locale' ] ) ) { + wp_enqueue_script( + WC_POS_PLUGIN_NAME . '-js-locale', + $scripts[ 'locale' ], + array( WC_POS_PLUGIN_NAME . '-admin-system-status-app' ), + WC_POS_VERSION, + true + ); + } + } + +} \ No newline at end of file diff --git a/includes/admin/settings/class-wc-pos-abstract.php b/includes/admin/settings/class-wc-pos-abstract.php index 017194be..7b0687b1 100644 --- a/includes/admin/settings/class-wc-pos-abstract.php +++ b/includes/admin/settings/class-wc-pos-abstract.php @@ -37,7 +37,16 @@ protected function __wakeup() {} */ public function output(){ include 'views/' . $this->id . '.php'; - do_action( 'woocommerce_pos_' . $this->id . '_settings_after_output', $this ); + } + + /** + * Catch output and format + */ + public function get_template(){ + ob_start(); + $this->output(); + $template = wc_pos_trim_html_string( ob_get_clean() ); + return apply_filters( 'woocommerce_pos_' . $this->id . '_settings_template', $template, $this ); } /** diff --git a/includes/admin/settings/class-wc-pos-receipts.php b/includes/admin/settings/class-wc-pos-receipts.php new file mode 100644 index 00000000..3028eb89 --- /dev/null +++ b/includes/admin/settings/class-wc-pos-receipts.php @@ -0,0 +1,28 @@ + + * @link http://www.woopos.com.au + */ + +class WC_POS_Admin_Settings_Receipts extends WC_POS_Admin_Settings_Abstract { + + protected static $instance; + + /** + * Each settings tab requires an id and label + */ + public function __construct() { + $this->id = 'receipts'; + $this->label = __( 'Receipts', 'woocommerce-pos' ); + + $this->defaults = array( + 'print_method' => 'html' + ); + } + +} \ No newline at end of file diff --git a/includes/admin/settings/views/receipts.php b/includes/admin/settings/views/receipts.php new file mode 100644 index 00000000..0900fe72 --- /dev/null +++ b/includes/admin/settings/views/receipts.php @@ -0,0 +1,36 @@ + + +

+ + + + + + + + + + + + + +
+ + + + +
+ + + + +
\ No newline at end of file diff --git a/includes/admin/settings/views/tools.php b/includes/admin/settings/views/tools.php index 8095c961..34281065 100644 --- a/includes/admin/settings/views/tools.php +++ b/includes/admin/settings/views/tools.php @@ -36,7 +36,8 @@ class="button" Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); ?> diff --git a/includes/ajax/class-wc-pos-settings.php b/includes/ajax/class-wc-pos-settings.php deleted file mode 100644 index 51fbaa51..00000000 --- a/includes/ajax/class-wc-pos-settings.php +++ /dev/null @@ -1,199 +0,0 @@ - - * @link http://www.woopos.com.au - */ - -class WC_POS_AJAX_Settings { - - /* @var string The db prefix for WP Options table */ - const DB_PREFIX = 'woocommerce_pos_'; - - /* @var array */ - private $settings; - - /** - * - */ - public function __construct() { - add_action( 'wp_ajax_wc_pos_admin_settings', array( $this, 'admin_settings') ); - add_filter( 'woocommerce_pos_admin_settings_params', array( $this, 'params') ); - } - - /** - * AJAX payload - * - * @param array $params - * @return array - */ - public function params( array $params ){ - $params['templates'] = $this->templates_payload(); - $params['settings'] = $this->settings; - return $params; - } - - /** - * Templates payload - * @return array - */ - public function templates_payload(){ - $templates = array(); - foreach(WC_POS_Admin_Settings::handlers() as $key => $handler){ - $settings = $handler::get_instance(); - ob_start(); - $settings->output(); - $template = ob_get_clean(); - $templates[ $key ] = preg_replace('/^\s+|\n|\r|\s+$/m', '', $template); - $this->settings[] = array( - 'id' => $settings->id, - 'label' => $settings->label, - 'data' => $settings->get() - ); - } - return apply_filters( 'woocommerce_pos_admin_settings_templates', $templates ); - } - - /** - * @return int - */ - static public function get_db_version(){ - return get_option( self::DB_PREFIX . 'db_version', 0 ); - } - - /** - * updates db to new version number - * bumps the idb version number - */ - static public function bump_versions(){ - self::update_option( self::DB_PREFIX . 'db_version', WC_POS_VERSION ); - self::bump_idb_version(); - } - - /* - * - */ - static public function get_idb_version(){ - $version = (int) get_option( self::DB_PREFIX . 'idb_version', 0 ); - return $version ? $version : self::bump_idb_version(); - } - - /* - * - */ - static public function bump_idb_version(){ - $version = (int) get_option( self::DB_PREFIX . 'idb_version', 0 ) + 1; - if( self::update_option( self::DB_PREFIX . 'idb_version', $version ) ){ - return $version; - } - } - - /** - * @param $id - * @param $key - * @return bool - */ - static public function get_option( $id, $key = false ){ - $handlers = (array) WC_POS_Admin_Settings::handlers(); - if( !array_key_exists( $id, $handlers ) ) - return false; - - $settings = $handlers[$id]::get_instance(); - return $settings->get( $key ); - } - - /** - * Add or update a WordPress option. - * The option will _not_ auto-load by default. - * - * @param string $name - * @param mixed $value - * @param string $autoload - * @return bool - */ - static public function update_option( $name, $value, $autoload = 'no' ) { - $success = add_option( $name, $value, '', $autoload ); - return $success ? $success : update_option( $name, $value ); - } - - /** - * POS Settings stored in options table - */ - public function admin_settings() { - WC_POS_Server::check_ajax_referer(); - $result = $this->process_admin_settings(); - WC_POS_Server::response($result); - } - - /** - * @return array|bool|mixed|void|WP_Error - */ - private function process_admin_settings(){ - // validate - if(!isset($_GET['id'])) - return new WP_Error( - 'woocommerce_pos_settings_error', - __( 'There is no settings id', 'woocommerce-pos' ), - array( 'status' => 400 ) - ); - - $id = $_GET['id']; - $data = WC_POS_Server::get_raw_data(); - - // special case: gateway_ - $gateway_id = preg_replace( '/^gateway_/', '', strtolower( $id ), 1, $count ); - if($count){ - $handler = new WC_POS_Admin_Settings_Gateways($gateway_id); - - // else, find handler by id - } else { - $handlers = (array) WC_POS_Admin_Settings::handlers(); - if(!isset($handlers[$id])) - return new WP_Error( - 'woocommerce_pos_settings_error', - sprintf( __( 'No handler found for %s settings', 'woocommerce-pos' ), $_GET['id']), - array( 'status' => 400 ) - ); - $handler = new $handlers[$id](); - } - - // Compatibility for clients that can't use PUT/PATCH/DELETE - $method = strtoupper($_SERVER['REQUEST_METHOD']); - if ( isset( $_GET['_method'] ) ) { - $method = strtoupper( $_GET['_method'] ); - } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) { - $method = strtoupper( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ); - } - - // bump IDB version - if( isset( $data['bump_idb_version'] ) && $data['bump_idb_version'] ){ - self::bump_idb_version(); - unset( $data['bump_idb_version'] ); - } - - // get - if( $method === 'GET' ) { - return $handler->get(); - } - - // set - if( $method === 'POST' || $method === 'PUT' ) { - return $handler->set($data); - } - - // delete - if( $method === 'DELETE' ) { - return $handler->delete($data); - } - - return new WP_Error( - 'woocommerce_pos_cannot_'.$method.'_'.$id, - __( 'Settings error', 'woocommerce-pos' ), - array( 'status' => 405 ) - ); - } - -} \ No newline at end of file diff --git a/includes/api/class-wc-pos-abstract.php b/includes/api/class-wc-pos-abstract.php deleted file mode 100644 index 396d2f54..00000000 --- a/includes/api/class-wc-pos-abstract.php +++ /dev/null @@ -1,65 +0,0 @@ - - * @link http://www.woopos.com.au - */ - -abstract class WC_POS_API_Abstract { - -// /** -// * @return string -// */ -// protected function get_raw_data() { -// global $HTTP_RAW_POST_DATA; -// if ( !isset( $HTTP_RAW_POST_DATA ) ) { -// $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' ); -// } -// return $HTTP_RAW_POST_DATA; -// } -// -// /** -// * @return array|mixed -// */ -// protected function get_data(){ -// $data = json_decode(trim($this->get_raw_data()), true); -// // remove status -// if(is_array($data) && array_key_exists('status', $data)){ -// unset($data['status']); -// } -// return $data; -// } - - /** - * @param $updated_at_min - */ - protected function get_ids($updated_at_min){} - - - /** - * Parse an RFC3339 datetime into a MySQl datetime - * mirrors woocommerce/includes/api/class-wc-api-server.php - * - * @param $datetime - * @return string - */ - protected function parse_datetime( $datetime ) { - // Strip millisecond precision (a full stop followed by one or more digits) - if ( strpos( $datetime, '.' ) !== false ) { - $datetime = preg_replace( '/\.\d+/', '', $datetime ); - } - // default timezone to UTC - $datetime = preg_replace( '/[+-]\d+:+\d+$/', '+00:00', $datetime ); - try { - $datetime = new DateTime( $datetime, new DateTimeZone( 'UTC' ) ); - } catch ( Exception $e ) { - $datetime = new DateTime( '@0' ); - } - return $datetime->format( 'Y-m-d H:i:s' ); - } - -} \ No newline at end of file diff --git a/includes/api/class-wc-pos-coupons.php b/includes/api/class-wc-pos-coupons.php index b0d6dec3..d39a98e5 100644 --- a/includes/api/class-wc-pos-coupons.php +++ b/includes/api/class-wc-pos-coupons.php @@ -10,31 +10,60 @@ * @link http://www.woopos.com.au */ -class WC_POS_API_Coupons extends WC_POS_API_Abstract { +if ( ! defined( 'ABSPATH' ) ) { + exit; // Exit if accessed directly +} + +class WC_POS_API_Coupons extends WC_API_Coupons { /** - * Returns array of all coupon ids - * @param $updated_at_min + * Add special case for all coupon ids + * + * @param null $fields + * @param array $filter + * @param int $page * @return array */ - public function get_ids($updated_at_min){ + public function get_coupons( $fields = null, $filter = array(), $page = 1 ) { + if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ + return array( 'coupons' => $this->get_all_ids( $filter ) ); + } + return parent::get_coupons( $fields, $filter, $page ); + } + + /** + * Returns array of all coupon ids + * + * @param array $filter + * @return array|void + */ + private function get_all_ids( $filter = array() ) { $args = array( - 'post_type' => array('shop_coupon'), - 'post_status' => array('publish'), - 'posts_per_page'=> -1, - 'fields' => 'ids' + 'post_type' => array( 'shop_coupon' ), + 'post_status' => array( 'publish' ), + 'posts_per_page' => -1, + 'fields' => 'ids' ); - if($updated_at_min){ - $args['date_query'][] = array( + if ( isset( $filter[ 'updated_at_min' ] ) ) { + $args[ 'date_query' ][] = array( 'column' => 'post_modified_gmt', - 'after' => $updated_at_min, + 'after' => $filter[ 'updated_at_min' ], 'inclusive' => false ); } $query = new WP_Query( $args ); - return array_map( 'intval', $query->posts ); + return array_map( array( $this, 'format_id' ), $query->posts ); + } + + + /** + * @param $id + * @return array + */ + private function format_id( $id ) { + return array( 'id' => $id ); } } \ No newline at end of file diff --git a/includes/api/class-wc-pos-customers.php b/includes/api/class-wc-pos-customers.php index 72c5fac6..0e3c42c1 100644 --- a/includes/api/class-wc-pos-customers.php +++ b/includes/api/class-wc-pos-customers.php @@ -10,23 +10,59 @@ * @link http://www.woopos.com.au */ -class WC_POS_API_Customers extends WC_POS_API_Abstract { +if ( ! defined( 'ABSPATH' ) ) { + exit; // Exit if accessed directly +} + +class WC_POS_API_Customers extends WC_API_Customers { + + + /** + * Get Customers + * + * @param null $fields + * @param array $filter + * @param int $page + * @return array + */ + public function get_customers( $fields = null, $filter = array(), $page = 1 ) { + + // add query actions + add_action( 'pre_get_users', array( $this, 'wc_pos_api_pre_get_users' ) ); + add_action( 'pre_user_query', array( $this, 'wc_pos_api_pre_user_query' ) ); + + // special case for all customer ids + if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ + return array( 'customers' => $this->wc_pos_api_get_all_ids( $filter ) ); + } + + // resume parent + return parent::get_customers( $fields, $filter, $page ); + + } + /** - * Constructor + * - add `updated_at` to customer data + * + * @param int $id + * @param null $fields + * @return array */ - public function __construct() { - add_action( 'pre_get_users', array( $this, 'pre_get_users' ) ); - add_action( 'pre_user_query', array( $this, 'pre_user_query' ) ); - add_filter( 'woocommerce_api_customer_response', array( $this, 'customer_response' ), 10, 4 ); + public function get_customer( $id, $fields = null ){ + $data = parent::get_customer( $id, $fields ); + $timestamp = get_user_meta( $id , '_user_modified_gmt', true); + $data['customer']['updated_at'] = $this->server->format_datetime( $timestamp ); + return $data; } + /** * Removes the role='customer' restraint * todo: add this option to settings * @param $wp_user_query */ - public function pre_get_users( $wp_user_query ) { + public function wc_pos_api_pre_get_users( $wp_user_query ) { $wp_user_query->query_vars[ 'role' ] = ''; @@ -47,23 +83,26 @@ public function pre_get_users( $wp_user_query ) { } /** + * + * * @param $wp_user_query */ - public function pre_user_query( $wp_user_query ) { + public function wc_pos_api_pre_user_query( $wp_user_query ) { // customer search - $term = $wp_user_query->query_vars['search']; - if (!empty($term)){ - $this->customer_search($term, $wp_user_query); + $term = $wp_user_query->query_vars[ 'search' ]; + if ( !empty( $term ) ) { + $this->wc_pos_api_customer_search( $term, $wp_user_query ); } } /** - * Extends customer search + * Extends customer search, allows more fields + * * @param $term * @param $wp_user_query */ - private function customer_search($term, $wp_user_query){ + private function wc_pos_api_customer_search($term, $wp_user_query){ global $wpdb; // search usermeta table @@ -99,38 +138,33 @@ private function customer_search($term, $wp_user_query){ /** * Returns array of all user ids - * @param $updated_at_min - * @return array + * + * @param array $filter + * @return array|void */ - public function get_ids($updated_at_min){ + private function wc_pos_api_get_all_ids( $filter = array() ){ $args = array( - 'fields' => 'ID' + 'fields' => 'ID', + 'orderby' => 'ID' ); - if($updated_at_min){ + if( isset( $filter['updated_at_min'] ) ){ $args['meta_key'] = '_user_modified_gmt'; - $args['meta_value'] = $this->parse_datetime( $updated_at_min ); + $args['meta_value'] = $this->server->parse_datetime( $filter['updated_at_min'] ); $args['meta_compare'] = '>'; } $query = new WP_User_Query( $args ); - return array_map( 'intval', $query->results ); + return array_map( array( $this, 'wc_pos_api_format_id' ), $query->results ); } /** - * - add `updated_at` to customer data - * - * @param $customer_data - * @param $customer - * @param $fields - * @param $server - * @return mixed + * @param $id + * @return array */ - public function customer_response($customer_data, $customer, $fields, $server){ - $timestamp = get_user_meta($customer->ID, '_user_modified_gmt', true); - $customer_data['updated_at'] = $server->format_datetime( $timestamp ); - return $customer_data; + private function wc_pos_api_format_id( $id ) { + return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-gateways.php b/includes/api/class-wc-pos-gateways.php new file mode 100644 index 00000000..e5b7e7cd --- /dev/null +++ b/includes/api/class-wc-pos-gateways.php @@ -0,0 +1,137 @@ + + * @link http://www.woopos.com.au + */ + +if ( ! defined( 'ABSPATH' ) ) { + exit; // Exit if accessed directly +} + +class WC_POS_API_Gateways extends WC_API_Resource { + + protected $base = '/pos/gateways'; + + /** + * Register routes for POS Params + * + * GET /pos + * + * @param array $routes + * @return array + */ + public function register_routes( array $routes ) { + + # GET /pos/params + $routes[ $this->base ] = array( + array( array( $this, 'get_gateways' ), WC_API_Server::READABLE ) + ); + + return $routes; + + } + + /** + * @param null $wc_pos_admin + * @return array + */ + public function get_gateways( $wc_pos_admin = null ){ + if( $wc_pos_admin ){ + return; + } + + $settings = WC_POS_Admin_Settings_Checkout::get_instance(); + $gateways = $settings->load_enabled_gateways(); + $payload = array(); + + if ( $gateways ): foreach ( $gateways as $gateway ): + $payload[] = array( + 'method_id' => $gateway->id, + 'method_title' => esc_html( $gateway->get_title() ), + 'icon' => $this->sanitize_icon( $gateway ), + 'active' => $gateway->default, + 'payment_fields' => $this->sanitize_payment_fields( $gateway ) + ); + endforeach; endif; + + return $payload; + } + + /** + * Sanitize payment icon + * - some gateways include junk in icon property, eg: paypal link + * + * @param WC_Payment_Gateway $gateway + * @return string + */ + private function sanitize_icon( WC_Payment_Gateway $gateway ) { + $icon = $gateway->show_icon ? $gateway->get_icon() : ''; + if ( $icon !== '' ) { + // simple preg_match + preg_match( '/< *img[^>]*src *= *["\']?([^"\']*)/i', $icon, $src ); + $icon = $src[ 1 ]; + } + + return $icon; + } + + /** + * Sanitize payment fields + * - some gateways include js in their payment fields + * + * @param WC_Payment_Gateway $gateway + * @return mixed|string + */ + private function sanitize_payment_fields( WC_Payment_Gateway $gateway ) { + $html = ''; + if ( $gateway->has_fields() || $gateway->get_description() ) { + + ob_start(); + $gateway->payment_fields(); + $html = ob_get_contents(); + ob_end_clean(); + + // remove script tags + $html = $this->removeDomNodes( $html, '//script' ); + } + + return wc_pos_trim_html_string( $html );; + } + + /** + * Removes dom nodes, eg: '; } - /** - * Returns an assoc array of all default tmpl-*.php paths - * - uses SPL iterators - * - * @param $partials_dir - * @return array - */ - static public function locate_default_template_files( $partials_dir = '' ) { - if ( empty( $partials_dir ) ) - $partials_dir = self::get_template_dir(); - - $Directory = new RecursiveDirectoryIterator( $partials_dir ); - - $Iterator = new RecursiveIteratorIterator( - $Directory, - RecursiveIteratorIterator::SELF_FIRST - ); - - $Regex = new RegexIterator( - $Iterator, - '/^.+tmpl-[a-z-]+\.php$/i', - RecursiveRegexIterator::GET_MATCH - ); - - $paths = array_keys( iterator_to_array( $Regex ) ); - $templates = array(); - - foreach ( $paths as $path ) { - $slug = str_replace( array( $partials_dir, '.php' ), '', $path ); - $templates[ $slug ] = $path; - }; - - return $templates; - } - - /** - * Returns an array of template paths - * - * @param $partials_dir - * @return array - */ - static public function locate_template_files( $partials_dir = '' ) { - $files = array(); - foreach ( self::locate_default_template_files( $partials_dir ) as $slug => $path ) { - $files[ $slug ] = self::locate_template_file( $path ); - }; - - return $files; - } - - /** - * Locate a single template partial - * - * @param string $default_path - * @return string - */ - static public function locate_template_file( $default_path = '' ) { - $custom_path1 = str_replace( self::get_template_dir(), 'woocommerce-pos', $default_path ); - $custom_path2 = str_replace( 'tmpl-', '', $custom_path1 ); - $custom = locate_template( array( $custom_path1, $custom_path2 ) ); - - return $custom ? $custom : $default_path; - } - - /** - * Returns the partials directory - * - * @return string - */ - static public function get_template_dir() { - return WC_POS_PLUGIN_PATH . 'includes/views'; - } - - /** - * @param $partials_dir - * @return array - */ - static public function create_templates_array( $partials_dir = '' ) { - $templates = array(); - - foreach ( self::locate_template_files( $partials_dir ) as $slug => $file ) { - $keys = explode( substr( $slug, 0, 1 ), substr( $slug, 1 ) ); - $template = array_reduce( array_reverse( $keys ), 'self::reduce_templates_array', self::template_output( $file ) ); - $templates = array_merge_recursive( $templates, $template ); - } - - return $templates; - } - - - /** - * @param $result - * @param $key - * @return array - */ - static private function reduce_templates_array( $result, $key ) { - if ( is_string( $result ) ) - $key = preg_replace( '/^tmpl-/i', '', $key ); - return array( $key => $result ); - } - - /** - * Output template partial as string - * - * @param $file - * @return string - */ - static public function template_output( $file ) { - ob_start(); - include $file; - $template = ob_get_clean(); - - return self::trim_html_string( $template ); - } - - /** - * Remove newlines and code spacing - * - * @param $str - * @return mixed - */ - static private function trim_html_string( $str ) { - return preg_replace( '/^\s+|\n|\r|\s+$/m', '', $str ); - } - - /** - * @return mixed|void - */ - static public function templates_payload() { - $templates = self::create_templates_array(); - return apply_filters( 'woocommerce_pos_templates', $templates ); - } - - /** - * Returns path of print receipt template - */ - static public function locate_print_receipt_template() { - $receipt_path = self::locate_template_file( WC_POS_PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); - return apply_filters( 'woocommerce_pos_print_receipt_path', $receipt_path ); - } - } \ No newline at end of file diff --git a/includes/class-wc-pos.php b/includes/class-wc-pos.php index 2507c226..f39b06a3 100644 --- a/includes/class-wc-pos.php +++ b/includes/class-wc-pos.php @@ -21,8 +21,11 @@ public function __construct() { spl_autoload_register( array( $this, 'autoload' ) ); } + // global helper functions + require_once WC_POS_PLUGIN_PATH . 'includes/wc-pos-functions.php'; + add_action( 'init', array( $this, 'init' ) ); - add_action( 'woocommerce_api_loaded', array( $this, 'load_woocommerce_api_patches') ); + add_action( 'woocommerce_api_loaded', array( $this, 'load_woocommerce_pos_api') ); do_action( 'woocommerce_pos_loaded' ); } @@ -52,37 +55,46 @@ private function autoload( $class ) { */ public function init() { - // global helper functions - require_once WC_POS_PLUGIN_PATH . 'includes/wc-pos-functions.php'; - // common classes new WC_POS_i18n(); new WC_POS_Gateways(); new WC_POS_Products(); new WC_POS_Customers(); - // frontend classes - if( !is_admin() ){ - new WC_POS_Template(); - } - - // ajax only - elseif( defined('DOING_AJAX') && DOING_AJAX ){ - new WC_POS_AJAX(); + // admin only + if( is_admin() && !(defined('DOING_AJAX') && DOING_AJAX) ){ + new WC_POS_Admin(); } - // admin only + // frontend only else { - new WC_POS_Admin(); + new WC_POS_Template(); } + // load integrations + $this->integrations(); + } /** - * + * Loads the POS API and patches to the WC REST API + */ + public function load_woocommerce_pos_api(){ + if( is_pos() ){ + new WC_POS_API(); + } + } + + /** + * Loads POS integrations with third party plugins */ - public function load_woocommerce_api_patches(){ - new WC_POS_API(); + private function integrations(){ + + // WooCommerce Bookings - http://www.woothemes.com/products/woocommerce-bookings/ + if( class_exists( 'WC-Bookings' ) ){ + new WC_POS_Integrations_Bookings(); + } + } } \ No newline at end of file diff --git a/includes/gateways/class-wc-pos-card.php b/includes/gateways/class-wc-pos-card.php index e4948b3f..a928328f 100644 --- a/includes/gateways/class-wc-pos-card.php +++ b/includes/gateways/class-wc-pos-card.php @@ -70,7 +70,7 @@ public function process_payment( $order_id ) { $order = new WC_Order( $order_id ); // update pos_cash data - $data = WC_POS_Server::get_raw_data(); + $data = WC_POS_API::get_raw_data(); $cashback = isset( $data['payment_details']['pos-cashback'] ) ? wc_format_decimal( $data['payment_details']['pos-cashback'] ) : 0 ; if( $cashback !== 0 ) { diff --git a/includes/gateways/class-wc-pos-cash.php b/includes/gateways/class-wc-pos-cash.php index 11d85f4e..af6c6f12 100644 --- a/includes/gateways/class-wc-pos-cash.php +++ b/includes/gateways/class-wc-pos-cash.php @@ -66,7 +66,7 @@ public function process_payment( $order_id ) { $order = new WC_Order( $order_id ); // update pos_cash data - $data = WC_POS_Server::get_raw_data(); + $data = WC_POS_API::get_raw_data(); $tendered = isset( $data['payment_details']['pos-cash-tendered'] ) ? wc_format_decimal( $data['payment_details']['pos-cash-tendered'] ) : 0 ; $change = isset( $data['payment_details']['pos-cash-change'] ) ? wc_format_decimal( $data['payment_details']['pos-cash-change'] ) : 0 ; update_post_meta( $order_id, '_pos_cash_amount_tendered', $tendered ); diff --git a/includes/integrations/class-wc-pos-bookings.php b/includes/integrations/class-wc-pos-bookings.php new file mode 100644 index 00000000..0c217de9 --- /dev/null +++ b/includes/integrations/class-wc-pos-bookings.php @@ -0,0 +1,25 @@ + + * @link http://www.woopos.com.au + */ + +if ( ! defined( 'ABSPATH' ) ) { + exit; // Exit if accessed directly +} + +class WC_POS_Integrations_Bookings { + + /** + * Constructor + */ + public function __construct() { + + } + +} \ No newline at end of file diff --git a/includes/views/template.php b/includes/views/main.php similarity index 93% rename from includes/views/template.php rename to includes/views/main.php index 7b9d00f5..0999ab53 100644 --- a/includes/views/template.php +++ b/includes/views/main.php @@ -42,12 +42,7 @@ - admin_url( 'admin-ajax.php', 'relative' ), - 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ) - ); -?> + get_woocommerce_api_url(null) ); ?> diff --git a/includes/views/pos/cart/tmpl-totals.php b/includes/views/pos/cart/tmpl-totals.php index 8a64b6dd..34a61810 100644 --- a/includes/views/pos/cart/tmpl-totals.php +++ b/includes/views/pos/cart/tmpl-totals.php @@ -1,5 +1,5 @@
  • -
    :
    +
    :
    {{{money subtotal}}}
    • diff --git a/includes/views/pos/products/tmpl-product.php b/includes/views/pos/products/tmpl-product.php index f9d61dbc..eb777e70 100644 --- a/includes/views/pos/products/tmpl-product.php +++ b/includes/views/pos/products/tmpl-product.php @@ -18,8 +18,8 @@
    {{#list options ', '}}{{this}}{{/list}}
    {{/each}}
    - - + +
    {{/with}} diff --git a/includes/views/support/tmpl-form.php b/includes/views/support/tmpl-form.php index 5ba88572..7f1a673c 100644 --- a/includes/views/support/tmpl-form.php +++ b/includes/views/support/tmpl-form.php @@ -1,20 +1,10 @@ -
  • :
    -
    first_name != '' || $current_user->last_name != '' ){ - echo $current_user->first_name .' '. $current_user->last_name; - } else { - echo $current_user->display_name; - } - ?>
    +
  • :
    -
    user_email ?>
    +
  • :
    @@ -23,11 +13,11 @@
  • - +
    • \ No newline at end of file diff --git a/includes/wc-pos-functions.php b/includes/wc-pos-functions.php index 3eed1994..a7a56ebe 100644 --- a/includes/wc-pos-functions.php +++ b/includes/wc-pos-functions.php @@ -56,6 +56,22 @@ function is_pos( $type = false ) { } /** + * + */ +function is_pos_admin() { + if ( function_exists( 'getallheaders' ) + && $headers = getallheaders() + && isset( $headers['X-WC-POS-ADMIN'] ) + ) { + return $headers['X-WC-POS-ADMIN']; + } elseif ( isset( $_SERVER[ 'HTTP_X_WC_POS_ADMIN' ] ) ) { + return $_SERVER[ 'HTTP_X_WC_POS_ADMIN' ]; + } + + return false; +} + + /** * Add or update a WordPress option. * The option will _not_ auto-load by default. * @@ -123,4 +139,14 @@ function wc_pos_get_option( $id, $key = false ){ $settings = $handlers[$id]::get_instance(); return $settings->get( $key ); -} \ No newline at end of file +} + +/** + * Remove newlines and code spacing + * + * @param $str + * @return mixed + */ +function wc_pos_trim_html_string( $str ) { + return preg_replace( '/^\s+|\n|\r|\s+$/m', '', $str ); +} diff --git a/languages/woocommerce-pos.pot b/languages/woocommerce-pos.pot index 340b7841..43ee6de6 100644 --- a/languages/woocommerce-pos.pot +++ b/languages/woocommerce-pos.pot @@ -2,10 +2,10 @@ # This file is distributed under the GPL-2.0+. msgid "" msgstr "" -"Project-Id-Version: WooCommerce POS 0.4.5\n" +"Project-Id-Version: WooCommerce POS 0.4.6-beta\n" "Report-Msgid-Bugs-To: " "https://github.com/kilbot/WooCommerce-POS-Language-Packs/issues\n" -"POT-Creation-Date: 2015-10-29 13:23:18+00:00\n" +"POT-Creation-Date: 2015-12-18 01:35:18+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -14,112 +14,378 @@ msgstr "" "Language-Team: Team Name \n" "X-Generator: grunt-wp-i18n 0.5.3\n" -#: includes/api/class-wc-pos-orders.php:471 -msgid "There was an error processing the payment" +#: includes/admin/class-wc-pos-gateways.php:31 +msgid "Online Store" msgstr "" -#: includes/api/class-wc-pos-orders.php:497 -msgid "You are now being redirected offsite to complete the payment. " +#: includes/admin/class-wc-pos-gateways.php:32 +#: includes/admin/class-wc-pos-menu.php:34 +#: includes/admin/class-wc-pos-menu.php:35 +#: includes/admin/class-wc-pos-orders.php:94 +#: includes/admin/views/order-details.php:5 +#: includes/api/class-wc-pos-params.php:259 +msgid "POS" msgstr "" -#: includes/api/class-wc-pos-orders.php:498 -msgid "Click here if you are not redirected automatically. " +#: includes/admin/class-wc-pos-menu.php:44 +#: includes/admin/class-wc-pos-menu.php:45 +msgid "View POS" msgstr "" -#: includes/api/class-wc-pos-orders.php:512 -msgid "POS Transaction completed." +#: includes/admin/class-wc-pos-menu.php:53 +#: includes/admin/settings/views/checkout.php:101 +msgid "Upgrade to Pro" msgstr "" -#: includes/class-wc-pos-ajax.php:105 includes/class-wc-pos-ajax.php:129 -msgid "Email sent" +#: includes/admin/class-wc-pos-orders.php:95 +#: includes/admin/views/order-details.php:4 +msgid "Online" msgstr "" -#: includes/class-wc-pos-ajax.php:113 includes/class-wc-pos-ajax.php:134 -msgid "There was an error sending the email" +#: includes/admin/class-wc-pos-plugins.php:26 +#: includes/admin/class-wc-pos-settings.php:34 +#: includes/admin/class-wc-pos-settings.php:36 +#: includes/admin/settings/views/checkout.php:76 +#: includes/admin/settings/views/checkout.php:106 +#: includes/admin/settings/views/checkout.php:111 +#. translators: wordpress +#. translators: woocommerce +msgid "Settings" msgstr "" -#: includes/class-wc-pos-ajax.php:167 includes/class-wc-pos-server.php:46 -msgid "Invalid security nonce" +#: includes/admin/settings/class-wc-pos-access.php:25 +msgid "POS Access" msgstr "" -#: includes/class-wc-pos-api.php:49 -msgid "User not authorized to access WooCommerce POS" +#: includes/admin/settings/class-wc-pos-hotkeys.php:42 +msgid "Help screen" +msgstr "" + +#: includes/admin/settings/class-wc-pos-hotkeys.php:43 +msgid "Barcode search" +msgstr "" + +#: includes/admin/settings/class-wc-pos-hotkeys.php:45 +msgid "New order" +msgstr "" + +#: includes/admin/settings/class-wc-pos-hotkeys.php:46 +msgid "Sync with server" +msgstr "" + +#: includes/admin/settings/views/access.php:7 +msgid "Grant POS Access" +msgstr "" + +#: includes/admin/settings/views/access.php:10 +msgid "" +"By default, access to the POS is limited to Administrator and Shop Manager " +"roles." +msgstr "" + +#: includes/admin/settings/views/access.php:11 +msgid "" +"It is recommended that you do not change the default " +"settings unless you are fully aware of the consequences." +msgstr "" + +#: includes/admin/settings/views/access.php:12 +#: includes/admin/settings/views/checkout.php:60 +#: includes/admin/settings/views/hotkeys.php:6 +msgid "" +"For more information please visit %1$s" +msgstr "" + +#: includes/admin/settings/views/checkout.php:13 +msgid "Completed Order Status" +msgstr "" + +#: includes/admin/settings/views/checkout.php:14 +msgid "Change the default order status for POS sales" +msgstr "" + +#: includes/admin/settings/views/checkout.php:27 +msgid "Order Emails" +msgstr "" + +#: includes/admin/settings/views/checkout.php:28 +msgid "Send WooCommerce notification emails for POS orders" +msgstr "" + +#: includes/admin/settings/views/checkout.php:32 +msgid "Enable admin emails" +msgstr "" + +#: includes/admin/settings/views/checkout.php:35 +msgid "Enable customer emails" +msgstr "" + +#: includes/admin/settings/views/checkout.php:41 +msgid "Receipt Printing" +msgstr "" + +#: includes/admin/settings/views/checkout.php:45 +msgid "Automatically print receipt after checkout" +msgstr "" + +#: includes/admin/settings/views/checkout.php:54 +msgid "" +"Installed gateways are listed below. Drag and drop gateways to control " +"their display order at the Point of Sale. " +msgstr "" + +#: includes/admin/settings/views/checkout.php:55 +msgid "" +"Payment Gateways enabled here will be available at the Point of Sale. " +"Payment Gateways enabled on the settings page will be available in your " +"Online Store. " +msgstr "" + +#: includes/admin/settings/views/checkout.php:59 +msgid "" +"It is your responsibility to ensure the security of your customer's " +"information. Transmitting credit card or other sensitive information should " +"only be done using a secure connnection." +msgstr "" + +#: includes/admin/settings/views/checkout.php:65 +msgid "Gateway Display" +msgstr "" + +#: includes/admin/settings/views/checkout.php:73 +msgid "Online Status" +msgstr "" + +#: includes/admin/settings/views/checkout.php:74 +msgid "POS Status" +msgstr "" + +#: includes/admin/settings/views/checkout.php:75 +msgid "POS Settings" +msgstr "" + +#: includes/admin/settings/views/checkout.php:126 +msgid "Payment method title." +msgstr "" + +#: includes/admin/settings/views/checkout.php:133 +msgid "Payment method description that will be shown in the POS." +msgstr "" + +#: includes/admin/settings/views/checkout.php:139 +msgid "Icon" +msgstr "" + +#: includes/admin/settings/views/general.php:13 +msgid "Product Visibility" +msgstr "" + +#: includes/admin/settings/views/general.php:17 +msgid "Enable POS Only products" +msgstr "" + +#: includes/admin/settings/views/general.php:23 +msgid "Allow Decimal Quantity" +msgstr "" + +#: includes/admin/settings/views/general.php:24 +msgid "Allows items to have decimal values in the quantity field, eg: 0.25" +msgstr "" + +#: includes/admin/settings/views/general.php:34 +msgid "Default POS Customer" +msgstr "" + +#: includes/admin/settings/views/general.php:35 +msgid "The default customer for POS orders, eg: Guest or create a new customer." +msgstr "" + +#: includes/admin/settings/views/general.php:46 +msgid "Discount Quick Keys" +msgstr "" + +#: includes/admin/settings/views/general.php:47 +msgid "Configure discount keys for quick numpad entry" +msgstr "" + +#: includes/admin/settings/views/hotkeys.php:1 +msgid "Keyboard Shortcuts" +msgstr "" + +#: includes/admin/settings/views/hotkeys.php:4 +msgid "" +"You can trigger certain events in WooCommerce POS using keyboard shortcuts " +"(HotKeys)." +msgstr "" + +#: includes/admin/settings/views/hotkeys.php:5 +msgid "" +"HotKeys can also be used as a prefix for your barcode scanner or card " +"reader." +msgstr "" + +#: includes/admin/settings/views/tools.php:33 +msgid "Receipt Template" +msgstr "" + +#: includes/admin/settings/views/tools.php:36 +msgid "View Sample Receipt" +msgstr "" + +#: includes/admin/settings/views/tools.php:41 +msgid "Template path: %s" +msgstr "" + +#: includes/admin/settings/views/tools.php:47 +msgid "Legacy Server Support" +msgstr "" + +#: includes/admin/settings/views/tools.php:53 +msgid "Emulate RESTful HTTP methods to support legacy servers." +msgstr "" + +#: includes/admin/settings/views/tools.php:58 +msgid "Local Data" +msgstr "" + +#: includes/admin/settings/views/tools.php:63 +msgid "Clear Local Data" +msgstr "" + +#: includes/admin/settings/views/tools.php:66 +msgid "Clear All Local Data" +msgstr "" + +#: includes/admin/views/order-details.php:2 +msgid "Order type" +msgstr "" + +#: includes/admin/views/settings.php:13 +msgid "" +"There has been an error loading the settings, please contact support" msgstr "" -#: includes/class-wc-pos-i18n.php:332 +#: includes/api/class-wc-pos-i18n.php:69 msgid "To Pay" msgstr "" -#: includes/class-wc-pos-i18n.php:333 +#: includes/api/class-wc-pos-i18n.php:70 msgid "Paid" msgstr "" -#: includes/class-wc-pos-i18n.php:334 +#: includes/api/class-wc-pos-i18n.php:71 msgid "Unpaid" msgstr "" -#: includes/class-wc-pos-i18n.php:335 +#: includes/api/class-wc-pos-i18n.php:72 msgid "Email Receipt" msgstr "" -#: includes/class-wc-pos-i18n.php:338 +#: includes/api/class-wc-pos-i18n.php:75 msgid "Support Form" msgstr "" -#: includes/class-wc-pos-i18n.php:352 includes/views/print/tmpl-receipt.php:142 -#: includes/views/support/tmpl-form.php:16 +#: includes/api/class-wc-pos-i18n.php:89 +#: includes/views/print/tmpl-receipt.php:142 +#: includes/views/support/tmpl-form.php:6 #. translators: wordpress #. translators: woocommerce #. translators: wordpress msgid "Email" msgstr "" -#: includes/class-wc-pos-i18n.php:361 +#: includes/api/class-wc-pos-i18n.php:98 msgid "Process Payment" msgstr "" -#: includes/class-wc-pos-i18n.php:366 +#: includes/api/class-wc-pos-i18n.php:103 msgid "Return to Sale" msgstr "" -#: includes/class-wc-pos-i18n.php:369 +#: includes/api/class-wc-pos-i18n.php:106 msgid "Send" msgstr "" -#: includes/class-wc-pos-i18n.php:372 +#: includes/api/class-wc-pos-i18n.php:109 msgid "Void" msgstr "" -#: includes/class-wc-pos-i18n.php:377 +#: includes/api/class-wc-pos-i18n.php:114 msgid "Enable legacy server support" msgstr "" -#: includes/class-wc-pos-i18n.php:388 +#: includes/api/class-wc-pos-i18n.php:124 msgid "Your browser is not supported!" msgstr "" -#: includes/class-wc-pos-i18n.php:389 +#: includes/api/class-wc-pos-i18n.php:125 msgid "Unable to use RESTful HTTP methods" msgstr "" -#: includes/class-wc-pos-i18n.php:394 +#: includes/api/class-wc-pos-i18n.php:130 msgid "No payment gateways enabled." msgstr "" -#: includes/class-wc-pos-params.php:226 -msgid "POS" +#: includes/api/class-wc-pos-i18n.php:133 +msgid "" +"WooCommerce POS will not work in Private Mode, please " +"disable Private Browsing." +msgstr "" + +#: includes/api/class-wc-pos-orders.php:475 +msgid "There was an error processing the payment" +msgstr "" + +#: includes/api/class-wc-pos-orders.php:501 +msgid "You are now being redirected offsite to complete the payment. " msgstr "" -#: includes/class-wc-pos-settings.php:168 +#: includes/api/class-wc-pos-orders.php:502 +msgid "Click here if you are not redirected automatically. " +msgstr "" + +#: includes/api/class-wc-pos-orders.php:516 +msgid "POS Transaction completed." +msgstr "" + +#: includes/api/class-wc-pos-orders.php:846 +#: includes/api/class-wc-pos-support.php:65 +msgid "Email sent" +msgstr "" + +#: includes/api/class-wc-pos-orders.php:852 +#: includes/api/class-wc-pos-support.php:71 +msgid "There was an error sending the email" +msgstr "" + +#: includes/api/class-wc-pos-settings.php:132 msgid "There is no settings id" msgstr "" -#: includes/class-wc-pos-settings.php:186 +#: includes/api/class-wc-pos-settings.php:152 msgid "No handler found for %s settings" msgstr "" -#: includes/class-wc-pos-settings.php:223 -msgid "Settings error" +#: includes/class-wc-pos-activator.php:188 +msgid "" +"WooCommerce POS requires WooCommerce %s or " +"higher. Please install and activate WooCommerce" +msgstr "" + +#: includes/class-wc-pos-activator.php:207 +msgid "" +"WooCommerce POS requires PHP %s or higher. Read more " +"information about how you can update" +msgstr "" + +#: includes/class-wc-pos-api.php:107 +msgid "User not authorized to access WooCommerce POS" +msgstr "" + +#: includes/class-wc-pos-server.php:46 +msgid "Invalid security nonce" msgstr "" #: includes/class-wc-pos-status.php:28 @@ -178,6 +444,25 @@ msgstr "" msgid "Amount Tendered" msgstr "" +#: includes/products/class-wc-pos-visibility.php:23 +msgid "POS & Online" +msgstr "" + +#: includes/products/class-wc-pos-visibility.php:24 +#: includes/products/class-wc-pos-visibility.php:87 +msgid "POS Only" +msgstr "" + +#: includes/products/class-wc-pos-visibility.php:25 +#: includes/products/class-wc-pos-visibility.php:88 +msgid "Online Only" +msgstr "" + +#: includes/products/views/post-metabox-visibility-select.php:11 +#: includes/products/views/quick-edit-visibility-select.php:14 +msgid "POS visibility" +msgstr "" + #: includes/views/modals/browser.php:2 msgid "Sorry, it seems your browser is not supported by WooCommerce POS. " msgstr "" @@ -219,11 +504,11 @@ msgstr "" msgid "Payment Method" msgstr "" -#: includes/views/support/tmpl-form.php:21 +#: includes/views/support/tmpl-form.php:11 msgid "Describe your problem here ..." msgstr "" -#: includes/views/support/tmpl-form.php:28 +#: includes/views/support/tmpl-form.php:18 msgid "Append POS system report" msgstr "" @@ -250,49 +535,65 @@ msgid "" "href=\"http://wordpress.org/plugins/woocommerce/\">WooCommerce." msgstr "" -#: includes/class-wc-pos-i18n.php:310 -msgctxt "system status: browser capabilities" -msgid "Browser" +#: includes/admin/class-wc-pos-permalink.php:30 +msgctxt "Permalink setting, eg: /pos" +msgid "POS base" msgstr "" -#: includes/class-wc-pos-i18n.php:321 +#: includes/admin/settings/class-wc-pos-hotkeys.php:22 +#: includes/api/class-wc-pos-i18n.php:58 msgctxt "keyboard shortcuts" msgid "HotKeys" msgstr "" -#: includes/class-wc-pos-i18n.php:336 +#: includes/admin/settings/views/checkout.php:143 +msgctxt "POS checkout settings" +msgid "Show payment gateway icon." +msgstr "" + +#: includes/admin/settings/views/general.php:40 +msgctxt "Default customer setting" +msgid "Use cashier account" +msgstr "" + +#: includes/api/class-wc-pos-i18n.php:47 +msgctxt "system status: browser capabilities" +msgid "Browser" +msgstr "" + +#: includes/api/class-wc-pos-i18n.php:73 msgctxt "order status, ie: open order in cart" msgid "Open" msgstr "" -#: includes/class-wc-pos-i18n.php:337 +#: includes/api/class-wc-pos-i18n.php:74 #: includes/gateways/class-wc-pos-cash.php:93 #: includes/views/print/tmpl-receipt.php:250 msgctxt "Money returned from cash sale" msgid "Change" msgstr "" -#: includes/class-wc-pos-i18n.php:345 +#: includes/api/class-wc-pos-i18n.php:82 msgctxt "system status: delete local records" msgid "Clear" msgstr "" -#: includes/class-wc-pos-i18n.php:364 +#: includes/api/class-wc-pos-i18n.php:101 msgctxt "restore default settings" msgid "Restore defaults" msgstr "" -#: includes/class-wc-pos-i18n.php:365 +#: includes/api/class-wc-pos-i18n.php:102 msgctxt "Numpad return key" msgid "return" msgstr "" -#: includes/class-wc-pos-i18n.php:399 +#: includes/api/class-wc-pos-i18n.php:136 msgctxt "eg: 23 records" msgid "record |||| records" msgstr "" -#: includes/class-wc-pos-params.php:84 +#: includes/api/class-wc-pos-params.php:113 msgctxt "Product tab: 'On Sale' products" msgid "On Sale" msgstr "" From 4b4ae1f7d3209164677c8d7bcc003e80a5065390 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 7 Jan 2016 11:10:46 +0800 Subject: [PATCH 011/169] add Customer settings --- .gitignore | 2 - .travis.yml | 2 +- assets/css/src/scss/partials/_loading.scss | 24 +- .../src/scss/partials/admin/_settings.scss | 14 +- assets/js/src/admin-settings.js | 13 +- assets/js/src/admin-system-status.js | 49 +++ assets/js/src/app.js | 9 +- .../js/src/apps/settings/customers/route.js | 30 ++ assets/js/src/apps/settings/customers/view.js | 50 ++++ assets/js/src/apps/settings/general/route.js | 2 +- assets/js/src/apps/settings/general/view.js | 33 --- .../apps/settings/receipts/preview/route.js | 36 +++ .../apps/settings/receipts/preview/view.js | 21 ++ assets/js/src/apps/settings/receipts/route.js | 37 ++- assets/js/src/apps/settings/receipts/view.js | 9 + assets/js/src/apps/settings/router.js | 22 +- assets/js/src/lib/components/tabs/service.js | 2 +- includes/admin/class-wc-pos-settings.php | 3 +- .../admin/settings/class-wc-pos-customers.php | 32 ++ includes/admin/settings/views/customers.php | 43 +++ includes/admin/settings/views/general.php | 12 - includes/admin/settings/views/receipts.php | 23 +- includes/admin/settings/views/tools.php | 14 - includes/api/class-wc-pos-coupons.php | 8 +- includes/api/class-wc-pos-i18n.php | 279 ++++++++++++------ includes/api/class-wc-pos-orders.php | 6 +- includes/api/class-wc-pos-params.php | 4 +- includes/views/main.php | 2 +- includes/wc-pos-functions.php | 10 +- 29 files changed, 583 insertions(+), 208 deletions(-) create mode 100644 assets/js/src/admin-system-status.js create mode 100644 assets/js/src/apps/settings/customers/route.js create mode 100644 assets/js/src/apps/settings/customers/view.js create mode 100644 assets/js/src/apps/settings/receipts/preview/route.js create mode 100644 assets/js/src/apps/settings/receipts/preview/view.js create mode 100644 includes/admin/settings/class-wc-pos-customers.php create mode 100644 includes/admin/settings/views/customers.php diff --git a/.gitignore b/.gitignore index 6949b8b6..a10515c2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,4 @@ assets/js/admin-settings.min.js assets/js/admin-system-status.build.js -assets/js/src/admin-system-status.js - assets/js/admin-system-status.min.js diff --git a/.travis.yml b/.travis.yml index 95bc8eba..d83bbfe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ install: - sudo apt-get install apache2 # 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 + - sudo a2enmod rewrite actions - 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 diff --git a/assets/css/src/scss/partials/_loading.scss b/assets/css/src/scss/partials/_loading.scss index 9a6dbedc..47bd39b1 100644 --- a/assets/css/src/scss/partials/_loading.scss +++ b/assets/css/src/scss/partials/_loading.scss @@ -26,8 +26,22 @@ loading { } } -//.module .loading { -// p { -// background: white; -// } -//} \ No newline at end of file +/** + * special case loading page + */ +$pulse-name : namespace('pulse'); + +@include keyframes($pulse-name) { + 0% { @include scale(0.9); } + 50% { @include scale(1); } + 100% { @include scale(0.9); } +} + +#page > i.icon-pos { + font-size: 40em; + font-size: 40vw; + color: nth( $primaryPalette, 10 ); + width: 100%; + text-align: center; + @include animation($pulse-name 20s infinite linear); +} diff --git a/assets/css/src/scss/partials/admin/_settings.scss b/assets/css/src/scss/partials/admin/_settings.scss index 4aa406b7..301353d3 100644 --- a/assets/css/src/scss/partials/admin/_settings.scss +++ b/assets/css/src/scss/partials/admin/_settings.scss @@ -19,15 +19,15 @@ settings { .nav-tab-wrapper { border-bottom: 1px solid $settings-border-color; - padding: 9px 15px 0 0; - line-height: inherit; + //padding: 9px 15px 0 0; + //line-height: inherit; } - .nav-tab { - &:hover, &:active, &:focus { - outline: 0; - } - } + //.nav-tab { + // &:hover, &:active, &:focus { + // outline: 0; + // } + //} } diff --git a/assets/js/src/admin-settings.js b/assets/js/src/admin-settings.js index 6e49d84a..8c43845b 100644 --- a/assets/js/src/admin-settings.js +++ b/assets/js/src/admin-settings.js @@ -22,10 +22,14 @@ require('lib/utilities/handlebars-helpers'); /** * Create the app */ -var app = new Application(); +var app = new Application({ + modalService : new ModalService(), + tabsService : new TabsService(), + buttonsService : new ButtonsService() +}); /** - * ... add SubApps and Services + * ... add Services which require layout and params */ app.on('before:start', function(options) { @@ -34,10 +38,7 @@ app.on('before:start', function(options) { entitiesService : new EntitiesService(options), settingsApp : new SettingsRouter({ container : this.layout.getRegion('main') - }), - modalService : new ModalService(), - tabsService : new TabsService(), - buttonsService : new ButtonsService() + }) }); }); diff --git a/assets/js/src/admin-system-status.js b/assets/js/src/admin-system-status.js new file mode 100644 index 00000000..49ecdce5 --- /dev/null +++ b/assets/js/src/admin-system-status.js @@ -0,0 +1,49 @@ +var Application = require('apps/admin/application'); +var _ = require('lodash'); + +/** + * Services + */ +var EntitiesService = require('entities/service'); +var ModalService = require('lib/components/modal/service'); +var TabsService = require('lib/components/tabs/service'); +var ButtonsService = require('lib/components/buttons/service'); + +/** + * SubApps + */ +var StatusRouter = require('apps/status/router'); + +/** + * bootstrap Handlebars Helpers + */ +require('lib/utilities/handlebars-helpers'); + +/** + * Create the app + */ +var app = new Application({ + modalService : new ModalService(), + tabsService : new TabsService(), + buttonsService : new ButtonsService() +}); + +/** + * ... add SubApps and Services + */ +app.on('before:start', function(options) { + + // attach services to global App + _.extend(this, { + entitiesService : new EntitiesService(options), + statusApp : new StatusRouter({ + container : this.layout.getRegion('main') + }) + }); + +}); + +/** + * Attach app to window for third party plugins + */ +module.exports = app; \ No newline at end of file diff --git a/assets/js/src/app.js b/assets/js/src/app.js index 22294f11..c6b49901 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -20,19 +20,14 @@ require('lib/utilities/handlebars-helpers'); /** * Create the app ... */ -var app = new Application(); - -/** - * ... add Services - */ -_.extend( app, { +var app = new Application({ modalService : new ModalService(), buttonsService : new ButtonsService(), popoverService : new PopoverService(), printService : new PrintService(), tabsService : new TabsService(), numpadService : new NumpadService() -} ); +}); /** * ... add Services which require layout and params diff --git a/assets/js/src/apps/settings/customers/route.js b/assets/js/src/apps/settings/customers/route.js new file mode 100644 index 00000000..2a966977 --- /dev/null +++ b/assets/js/src/apps/settings/customers/route.js @@ -0,0 +1,30 @@ +var Route = require('lib/config/route'); +var App = require('lib/config/application'); +var View = require('./view'); + +var Customers = Route.extend({ + + initialize: function( options ) { + options = options || {}; + this.container = options.container; + this.model = options.model; + }, + + fetch: function() { + if(this.model.isNew()){ + return this.model.fetch(); + } + }, + + render: function() { + var view = new View({ + model: this.model, + template: this.model.template + }); + this.container.show(view); + } + +}); + +module.exports = Customers; +App.prototype.set('SettingsApp.Customers.Route', Customers); \ No newline at end of file diff --git a/assets/js/src/apps/settings/customers/view.js b/assets/js/src/apps/settings/customers/view.js new file mode 100644 index 00000000..d62a61f7 --- /dev/null +++ b/assets/js/src/apps/settings/customers/view.js @@ -0,0 +1,50 @@ +var SettingsView = require('lib/config/settings-view'); +var $ = require('jquery'); +var App = require('lib/config/application'); +var CustomerSelect = require('lib/behaviors/customer-select'); +var Tooltip = require('lib/behaviors/tooltip'); + + +var View = SettingsView.extend({ + + behaviors: { + Tooltip: { + behaviorClass: Tooltip + }, + CustomerSelect: { + behaviorClass: CustomerSelect + } + }, + + modelEvents: { + 'change:id': 'render', + 'change:logged_in_user': function(model, toggle){ + this.ui.customerSelect.prop('disabled', toggle); + } + }, + + ui: { + customerSelect: 'select[data-select="customer"]' + }, + + onRender: function(){ + var self = this; + + // bind ordinary elements + this.$('input, select, textarea').each(function(){ + var name = $(this).attr('name'); + if(name){ + self.addBinding(null, '*[name="' + name + '"]', name); + } + }); + + // disable customer select if logged_in_user checked + if( this.model.get('logged_in_user') ){ + this.ui.customerSelect.prop('disabled', true); + } + } + +}); + +module.exports = View; +App.prototype.set('SettingsApp.Customers.View'); \ No newline at end of file diff --git a/assets/js/src/apps/settings/general/route.js b/assets/js/src/apps/settings/general/route.js index da7d781d..2b1e7d3e 100644 --- a/assets/js/src/apps/settings/general/route.js +++ b/assets/js/src/apps/settings/general/route.js @@ -27,4 +27,4 @@ var General = Route.extend({ }); module.exports = General; -App.prototype.set('SettingsApp.Receipts.Route', General); \ No newline at end of file +App.prototype.set('SettingsApp.General.Route', General); \ No newline at end of file diff --git a/assets/js/src/apps/settings/general/view.js b/assets/js/src/apps/settings/general/view.js index aca1b58c..6ac1a56c 100644 --- a/assets/js/src/apps/settings/general/view.js +++ b/assets/js/src/apps/settings/general/view.js @@ -1,7 +1,5 @@ var SettingsView = require('lib/config/settings-view'); -var $ = require('jquery'); var App = require('lib/config/application'); -var CustomerSelect = require('lib/behaviors/customer-select'); var Tooltip = require('lib/behaviors/tooltip'); var View = SettingsView.extend({ @@ -9,9 +7,6 @@ var View = SettingsView.extend({ behaviors: { Tooltip: { behaviorClass: Tooltip - }, - CustomerSelect: { - behaviorClass: CustomerSelect } }, @@ -19,34 +14,6 @@ var View = SettingsView.extend({ 'discount_quick_keys': { maximumSelectionLength: 4 } - }, - - modelEvents: { - 'change:id': 'render', - 'change:logged_in_user': function(model, toggle){ - this.ui.customerSelect.prop('disabled', toggle); - } - }, - - ui: { - customerSelect: 'select[data-select="customer"]' - }, - - onRender: function(){ - var self = this; - - // bind ordinary elements - this.$('input, select, textarea').each(function(){ - var name = $(this).attr('name'); - if(name){ - self.addBinding(null, '*[name="' + name + '"]', name); - } - }); - - // disable customer select if logged_in_user checked - if( this.model.get('logged_in_user') ){ - this.ui.customerSelect.prop('disabled', true); - } } }); diff --git a/assets/js/src/apps/settings/receipts/preview/route.js b/assets/js/src/apps/settings/receipts/preview/route.js new file mode 100644 index 00000000..0a501481 --- /dev/null +++ b/assets/js/src/apps/settings/receipts/preview/route.js @@ -0,0 +1,36 @@ +var Route = require('lib/config/route'); +var Radio = require('backbone.radio'); +var View = require('./view'); + +var ReceiptRoute = Route.extend({ + + initialize: function( options ) { + options = options || {}; + this.container = options.container; + this.collection = Radio.request('entities', 'get', { + name: 'orders', + type: 'collection' + }); + }, + + fetch: function() { + return this.collection.fetch({ + remote: true, + data: { + filter: { + limit: 1 + } + } + }); + }, + + render: function() { + var view = new View({ + model: this.collection.at(0) + }); + this.container.show(view); + } + +}); + +module.exports = ReceiptRoute; \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/preview/view.js b/assets/js/src/apps/settings/receipts/preview/view.js new file mode 100644 index 00000000..ca5b1f8a --- /dev/null +++ b/assets/js/src/apps/settings/receipts/preview/view.js @@ -0,0 +1,21 @@ +var ReceiptView = require('lib/config/receipt-view'); +var hbs = require('handlebars'); + +module.exports = ReceiptView.extend({ + + tagName: 'iframe', + + template: function(){}, + + onShow: function(){ + var template = hbs.compile( hbs.Templates.print.receipt ) ; + this.window = this.el.contentWindow; + this.window.document.write(template( this.data )); + }, + + print: function(){ + this.window.focus(); // required for IE + this.window.print(); + } + +}); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/route.js b/assets/js/src/apps/settings/receipts/route.js index 2b1e7d3e..0a5a9b94 100644 --- a/assets/js/src/apps/settings/receipts/route.js +++ b/assets/js/src/apps/settings/receipts/route.js @@ -1,8 +1,11 @@ var Route = require('lib/config/route'); var App = require('lib/config/application'); var View = require('./view'); +var _ = require('lodash'); +var Mn = require('backbone.marionette'); +var ReceiptRoute = require('./preview/route'); -var General = Route.extend({ +var Receipts = Route.extend({ initialize: function( options ) { options = options || {}; @@ -21,10 +24,38 @@ var General = Route.extend({ model: this.model, template: this.model.template }); + + this.listenTo( view, 'toggle:preview', this.togglePreview ); + this.container.show(view); + }, + + togglePreview: function( args ) { + var previewArea = _.get(args, ['view', 'ui', 'previewArea']); + + if( ! previewArea ){ + return; + } + + if( ! this.rm ) { + this.initPreview( previewArea ); + } + + previewArea.slideToggle(); + }, + + initPreview: function( previewArea ){ + this.rm = new Mn.RegionManager(); + var region = this.rm.addRegion('preview', previewArea); + + var route = new ReceiptRoute({ + container: region + }); + + route.enter(); } }); -module.exports = General; -App.prototype.set('SettingsApp.General.Route', General); \ No newline at end of file +module.exports = Receipts; +App.prototype.set('SettingsApp.Receipts.Route', Receipts); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/view.js b/assets/js/src/apps/settings/receipts/view.js index 7e4e2a2e..c1d68faf 100644 --- a/assets/js/src/apps/settings/receipts/view.js +++ b/assets/js/src/apps/settings/receipts/view.js @@ -3,6 +3,15 @@ var App = require('lib/config/application'); var View = SettingsView.extend({ + ui: { + 'previewBtn' : '[data-action="preview-receipt"]', + 'previewArea' : '#receipt-preview' + }, + + triggers: { + 'click @ui.previewBtn': 'toggle:preview' + } + }); module.exports = View; diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index eed14b61..4bc243de 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -27,12 +27,13 @@ var SettingsRouter = Router.extend({ }, routes: { - '' : 'showGeneral', - 'general' : 'showGeneral', - 'checkout': 'showCheckout', - 'receipts': 'showReceipts', - 'hotkeys' : 'showHotkeys', - 'access' : 'showAccess' + '' : 'showGeneral', + 'general' : 'showGeneral', + 'customers' : 'showCustomers', + 'checkout' : 'showCheckout', + 'receipts' : 'showReceipts', + 'hotkeys' : 'showHotkeys', + 'access' : 'showAccess' }, onBeforeRoute: function() { @@ -66,6 +67,15 @@ var SettingsRouter = Router.extend({ }); }, + showCustomers: function(){ + var model = this.collection.get('customers'); + this.showFooter({model: model}); + return new Checkout({ + container : this.layout.getRegion('settings'), + model: model + }); + }, + showCheckout: function(){ var model = this.collection.get('checkout'); this.showFooter({model: model}); diff --git a/assets/js/src/lib/components/tabs/service.js b/assets/js/src/lib/components/tabs/service.js index 2823ed46..5b0bdb2e 100644 --- a/assets/js/src/lib/components/tabs/service.js +++ b/assets/js/src/lib/components/tabs/service.js @@ -22,7 +22,7 @@ module.exports = Service.extend({ if( options.adminTabs ){ _.defaults( options, { tagName: 'div', - className: 'tabs nav-tab-wrapper', + className: 'nav-tab-wrapper', childViewOptions: function(){ return { tagName: 'a', diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index 6f5390ea..3a72b44e 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -19,6 +19,7 @@ class WC_POS_Admin_Settings extends WC_POS_Admin_Abstract { */ static public $handlers = array( 'general' => 'WC_POS_Admin_Settings_General', + 'customers' => 'WC_POS_Admin_Settings_Customers', 'checkout' => 'WC_POS_Admin_Settings_Checkout', 'receipts' => 'WC_POS_Admin_Settings_Receipts', 'hotkeys' => 'WC_POS_Admin_Settings_HotKeys', @@ -53,7 +54,7 @@ public function display_settings_page() { * @return mixed|void */ static public function handlers(){ - return apply_filters( 'woocommerce_pos_admin_settings_handlers', self::$handlers); + return apply_filters( 'woocommerce_pos_admin_settings_handlers', self::$handlers ); } /** diff --git a/includes/admin/settings/class-wc-pos-customers.php b/includes/admin/settings/class-wc-pos-customers.php new file mode 100644 index 00000000..e99ba4d2 --- /dev/null +++ b/includes/admin/settings/class-wc-pos-customers.php @@ -0,0 +1,32 @@ + + * @link http://www.woopos.com.au + */ + + +class WC_POS_Admin_Settings_Customers extends WC_POS_Admin_Settings_Abstract { + + protected static $instance; + + public function __construct() { + $this->id = 'customers'; + $this->label = /* translators: woocommerce */ __( 'Customers', 'woocommerce' ); + + $this->defaults = array( + 'customer_roles' => 'all' + ); + } + + /** + * include relative to this file + */ + public function output() { + include 'views/customers.php'; + } + +} \ No newline at end of file diff --git a/includes/admin/settings/views/customers.php b/includes/admin/settings/views/customers.php new file mode 100644 index 00000000..14c06d59 --- /dev/null +++ b/includes/admin/settings/views/customers.php @@ -0,0 +1,43 @@ + + +

    + + + + + + + + + + + + + +
    + + + +   + + +
    + + + + +
    \ No newline at end of file diff --git a/includes/admin/settings/views/general.php b/includes/admin/settings/views/general.php index 878d821b..d8d0a678 100644 --- a/includes/admin/settings/views/general.php +++ b/includes/admin/settings/views/general.php @@ -29,18 +29,6 @@ - - - - - - -   - - - - - diff --git a/includes/admin/settings/views/receipts.php b/includes/admin/settings/views/receipts.php index 0900fe72..58624b29 100644 --- a/includes/admin/settings/views/receipts.php +++ b/includes/admin/settings/views/receipts.php @@ -4,7 +4,7 @@ */ ?> -

    +

    @@ -33,4 +33,25 @@ + + + + + + + + +
    + + +

    + Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); + ?> +

    + + + +
    \ No newline at end of file diff --git a/includes/admin/settings/views/tools.php b/includes/admin/settings/views/tools.php index 34281065..9d75390e 100644 --- a/includes/admin/settings/views/tools.php +++ b/includes/admin/settings/views/tools.php @@ -29,20 +29,6 @@ class="button" - - - - - - - Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); - ?> - - - diff --git a/includes/api/class-wc-pos-coupons.php b/includes/api/class-wc-pos-coupons.php index d39a98e5..f6681454 100644 --- a/includes/api/class-wc-pos-coupons.php +++ b/includes/api/class-wc-pos-coupons.php @@ -26,7 +26,7 @@ class WC_POS_API_Coupons extends WC_API_Coupons { */ public function get_coupons( $fields = null, $filter = array(), $page = 1 ) { if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ - return array( 'coupons' => $this->get_all_ids( $filter ) ); + return array( 'coupons' => $this->wc_pos_api_get_all_ids( $filter ) ); } return parent::get_coupons( $fields, $filter, $page ); } @@ -37,7 +37,7 @@ public function get_coupons( $fields = null, $filter = array(), $page = 1 ) { * @param array $filter * @return array|void */ - private function get_all_ids( $filter = array() ) { + private function wc_pos_api_get_all_ids( $filter = array() ) { $args = array( 'post_type' => array( 'shop_coupon' ), 'post_status' => array( 'publish' ), @@ -54,7 +54,7 @@ private function get_all_ids( $filter = array() ) { } $query = new WP_Query( $args ); - return array_map( array( $this, 'format_id' ), $query->posts ); + return array_map( array( $this, 'wc_pos_api_format_id' ), $query->posts ); } @@ -62,7 +62,7 @@ private function get_all_ids( $filter = array() ) { * @param $id * @return array */ - private function format_id( $id ) { + private function wc_pos_api_format_id( $id ) { return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-i18n.php b/includes/api/class-wc-pos-i18n.php index 9ba9ebc3..569b8e58 100644 --- a/includes/api/class-wc-pos-i18n.php +++ b/includes/api/class-wc-pos-i18n.php @@ -27,7 +27,7 @@ class WC_POS_API_i18n extends WC_API_Resource { */ public function register_routes( array $routes ) { - # GET /pos/params + # GET /pos/i18n $routes[ $this->base ] = array( array( array( $this, 'get_translations' ), WC_API_Server::READABLE ) ); @@ -37,105 +37,198 @@ public function register_routes( array $routes ) { } /** - * @todo common, frontend and admin translations * @return array */ public function get_translations(){ return apply_filters( 'woocommerce_pos_i18n', array( - 'titles' => array( - 'browser' => _x( 'Browser', 'system status: browser capabilities', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'cart' => __( 'Cart', 'woocommerce' ), - /* translators: woocommerce */ - 'checkout' => __( 'Checkout', 'woocommerce' ), - /* translators: woocommerce */ - 'coupons' => __( 'Coupons', 'woocommerce' ), - /* translators: woocommerce */ - 'customers' => __( 'Customers', 'woocommerce' ), - /* translators: woocommerce */ - 'fee' => __( 'Fee', 'woocommerce' ), - 'hotkeys' => _x( 'HotKeys', 'keyboard shortcuts', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'order' => __( 'Order', 'woocommerce' ), - /* translators: woocommerce */ - 'orders' => __( 'Orders', 'woocommerce' ), - /* translators: woocommerce */ - 'products' => __( 'Products', 'woocommerce' ), - 'receipt' => __( 'Receipt', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'shipping' => __( 'Shipping', 'woocommerce' ), - 'to-pay' => __( 'To Pay', 'woocommerce-pos' ), - 'paid' => __( 'Paid', 'woocommerce-pos' ), - 'unpaid' => __( 'Unpaid', 'woocommerce-pos' ), - 'email-receipt' => __( 'Email Receipt', 'woocommerce-pos' ), - 'open' => _x( 'Open', 'order status, ie: open order in cart', 'woocommerce-pos' ), - 'change' => _x( 'Change', 'Money returned from cash sale', 'woocommerce-pos' ), - 'support-form' => __( 'Support Form', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'system-status' => __( 'System Status', 'woocommerce' ), - ), - 'buttons' => array( - /* translators: woocommerce */ - 'checkout' => __( 'Checkout', 'woocommerce' ), - 'clear' => _x( 'Clear', 'system status: delete local records', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'close' => __( 'Close' ), - /* translators: woocommerce */ - 'coupon' => __( 'Coupon', 'woocommerce' ), - 'discount' => __( 'Discount', 'woocommerce-pos' ), - /* translators: wordpress */ - 'email' => __( 'Email' ), - /* translators: woocommerce */ - 'fee' => __( 'Fee', 'woocommerce' ), - /* translators: woocommerce */ - 'new-order' => __( 'New Order', 'woocommerce' ), - /* translators: woocommerce */ - 'note' => __( 'Note', 'woocommerce' ), - /* translators: wordpress */ - 'print' => __( 'Print' ), - 'process-payment' => __( 'Process Payment', 'woocommerce-pos' ), - /* translators: wordpress */ - 'refresh' => __( 'Refresh' ), - 'restore' => _x( 'Restore defaults', 'restore default settings', 'woocommerce-pos' ), - 'return' => _x( 'return', 'Numpad return key', 'woocommerce-pos' ), - 'return-to-sale' => __( 'Return to Sale', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'save' => __( 'Save Changes', 'woocommerce' ), - 'send' => __( 'Send', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'shipping' => __( 'Shipping', 'woocommerce' ), - 'void' => __( 'Void', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'expand-all' => __( 'Expand all', 'woocommerce' ), - /* translators: woocommerce */ - 'close-all' => __( 'Close all', 'woocommerce' ), - 'legacy' => __( 'Enable legacy server support', 'woocommerce-pos' ), - ), - 'messages' => array( - /* translators: woocommerce */ - 'choose' => __( 'Choose an option', 'woocommerce' ), - /* translators: woocommerce */ - 'error' => __( 'Sorry, there has been an error.', 'woocommerce' ), - 'loading' => __( 'Loading ...', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'success' => __( 'Your changes have been saved.', 'woocommerce' ), - 'browser' => __( 'Your browser is not supported!', 'woocommerce-pos' ), - 'legacy' => __( 'Unable to use RESTful HTTP methods', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'no-products' => __( 'No Products found', 'woocommerce' ), - /* translators: woocommerce */ - 'cart-empty' => __( 'Your cart is currently empty.', 'woocommerce' ), - 'no-gateway' => __( 'No payment gateways enabled.', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'no-customer' => __( 'Customer not found', 'woocommerce' ), - 'private-browsing' => sprintf( __( 'WooCommerce POS will not work in Private Mode, please disable Private Browsing.', 'woocommerce-pos' ), 'https://wikipedia.org/wiki/Privacy_mode' ), - ), - 'plural' => array( - 'records' => _x( 'record |||| records', 'eg: 23 records', 'woocommerce-pos' ), - ) + 'titles' => $this->titles(), + 'buttons' => $this->buttons(), + 'messages' => $this->messages(), + 'plural' => $this->plural() ) ); } + /** + * @return array + */ + private function titles(){ + $titles = is_pos_admin() ? $this->admin_titles() : $this->frontend_titles(); + return $titles + $this->common_titles(); + } + + /** + * @return array + */ + private function buttons(){ + $buttons = is_pos_admin() ? $this->admin_buttons() : $this->frontend_buttons(); + return $buttons + $this->common_buttons(); + } + + /** + * @return array + */ + private function messages(){ + $messages = is_pos_admin() ? $this->admin_messages() : $this->frontend_messages(); + return $messages + $this->common_messages(); + } + + /** + * @return array + */ + private function plural(){ + if( !is_pos_admin() ){ + return array( + 'records' => _x( 'record |||| records', 'eg: 23 records', 'woocommerce-pos' ), + ); + } + } + + /** + * @return array + */ + private function common_titles(){ + return array(); + } + + /** + * @return array + */ + private function admin_titles(){ + return array(); + } + + /** + * @return array + */ + private function frontend_titles(){ + return array( + 'browser' => _x( 'Browser', 'system status: browser capabilities', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'cart' => __( 'Cart', 'woocommerce' ), + /* translators: woocommerce */ + 'checkout' => __( 'Checkout', 'woocommerce' ), + /* translators: woocommerce */ + 'coupons' => __( 'Coupons', 'woocommerce' ), + /* translators: woocommerce */ + 'customers' => __( 'Customers', 'woocommerce' ), + /* translators: woocommerce */ + 'fee' => __( 'Fee', 'woocommerce' ), + 'hotkeys' => _x( 'HotKeys', 'keyboard shortcuts', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'order' => __( 'Order', 'woocommerce' ), + /* translators: woocommerce */ + 'orders' => __( 'Orders', 'woocommerce' ), + /* translators: woocommerce */ + 'products' => __( 'Products', 'woocommerce' ), + 'receipt' => __( 'Receipt', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'shipping' => __( 'Shipping', 'woocommerce' ), + 'to-pay' => __( 'To Pay', 'woocommerce-pos' ), + 'paid' => __( 'Paid', 'woocommerce-pos' ), + 'unpaid' => __( 'Unpaid', 'woocommerce-pos' ), + 'email-receipt' => __( 'Email Receipt', 'woocommerce-pos' ), + 'open' => _x( 'Open', 'order status, ie: open order in cart', 'woocommerce-pos' ), + 'change' => _x( 'Change', 'Money returned from cash sale', 'woocommerce-pos' ), + 'support-form' => __( 'Support Form', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'system-status' => __( 'System Status', 'woocommerce' ), + ); + } + + /** + * @return array + */ + private function common_buttons(){ + return array( + /* translators: woocommerce */ + 'save' => __( 'Save Changes', 'woocommerce' ), + /* translators: woocommerce */ + 'close' => __( 'Close' ), + ); + } + + /** + * @return array + */ + private function admin_buttons(){ + return array( + 'restore' => _x( 'Restore defaults', 'restore default settings', 'woocommerce-pos' ), + ); + } + + /** + * @return array + */ + private function frontend_buttons(){ + return array( + /* translators: woocommerce */ + 'checkout' => __( 'Checkout', 'woocommerce' ), + 'clear' => _x( 'Clear', 'system status: delete local records', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'coupon' => __( 'Coupon', 'woocommerce' ), + 'discount' => __( 'Discount', 'woocommerce-pos' ), + /* translators: wordpress */ + 'email' => __( 'Email' ), + /* translators: woocommerce */ + 'fee' => __( 'Fee', 'woocommerce' ), + /* translators: woocommerce */ + 'new-order' => __( 'New Order', 'woocommerce' ), + /* translators: woocommerce */ + 'note' => __( 'Note', 'woocommerce' ), + /* translators: wordpress */ + 'print' => __( 'Print' ), + 'process-payment' => __( 'Process Payment', 'woocommerce-pos' ), + /* translators: wordpress */ + 'refresh' => __( 'Refresh' ), + 'return' => _x( 'return', 'Numpad return key', 'woocommerce-pos' ), + 'return-to-sale' => __( 'Return to Sale', 'woocommerce-pos' ), + 'send' => __( 'Send', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'shipping' => __( 'Shipping', 'woocommerce' ), + 'void' => __( 'Void', 'woocommerce-pos' ), + ); + } + + /** + * @return array + */ + private function common_messages(){ + return array( + /* translators: woocommerce */ + 'choose' => __( 'Choose an option', 'woocommerce' ), + /* translators: woocommerce */ + 'error' => __( 'Sorry, there has been an error.', 'woocommerce' ), + 'loading' => __( 'Loading ...', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'success' => __( 'Your changes have been saved.', 'woocommerce' ), + ); + } + + /** + * @return array + */ + private function admin_messages(){ + return array(); + } + + /** + * @return array + */ + private function frontend_messages(){ + return array( + 'browser' => __( 'Your browser is not supported!', 'woocommerce-pos' ), + 'legacy' => __( 'Unable to use RESTful HTTP methods', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'no-products' => __( 'No Products found', 'woocommerce' ), + /* translators: woocommerce */ + 'cart-empty' => __( 'Your cart is currently empty.', 'woocommerce' ), + 'no-gateway' => __( 'No payment gateways enabled.', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'no-customer' => __( 'Customer not found', 'woocommerce' ), + 'private-browsing' => sprintf( __( 'WooCommerce POS will not work in Private Mode, please disable Private Browsing.', 'woocommerce-pos' ), 'https://wikipedia.org/wiki/Privacy_mode' ), + ); + } + } \ No newline at end of file diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index 221b6df9..435a4261 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -725,7 +725,7 @@ private function wc_pos_api_filter_qty($line_items){ * @param array $filter * @return array|void */ - private function get_all_ids( $filter = array() ){ + private function wc_pos_api_get_all_ids( $filter = array() ){ $args = array( 'post_type' => array('shop_order'), 'post_status' => array('any'), @@ -742,7 +742,7 @@ private function get_all_ids( $filter = array() ){ } $query = new WP_Query( $args ); - return array_map( array( $this, 'format_id' ), $query->posts ); + return array_map( array( $this, 'wc_pos_api_format_id' ), $query->posts ); } @@ -750,7 +750,7 @@ private function get_all_ids( $filter = array() ){ * @param $id * @return array */ - private function format_id( $id ){ + private function wc_pos_api_format_id( $id ){ return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-params.php b/includes/api/class-wc-pos-params.php index da4cee84..99ea75dd 100644 --- a/includes/api/class-wc-pos-params.php +++ b/includes/api/class-wc-pos-params.php @@ -57,7 +57,6 @@ private function common_params(){ 'accounting' => $this->accounting(), 'customers' => $this->customers(), 'debug' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG, - 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ), 'emulateHTTP' => get_option( 'woocommerce_pos_emulateHTTP' ) === '1', 'idbVersion' => WC_POS_Admin_Settings::get_idb_version() ); @@ -88,7 +87,8 @@ private function frontend_params(){ */ private function admin_params(){ return array( - 'search_customers_nonce' => wp_create_nonce( 'search-customers' ) + 'search_customers_nonce' => wp_create_nonce( 'search-customers' ), + 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ), ); } diff --git a/includes/views/main.php b/includes/views/main.php index 0999ab53..b925ac67 100644 --- a/includes/views/main.php +++ b/includes/views/main.php @@ -38,7 +38,7 @@ -
    +
    diff --git a/includes/wc-pos-functions.php b/includes/wc-pos-functions.php index a7a56ebe..a3ced527 100644 --- a/includes/wc-pos-functions.php +++ b/includes/wc-pos-functions.php @@ -42,12 +42,12 @@ function is_pos( $type = false ) { // test for WC REST API requests, ie: matched request header if( $type == 'ajax' || !$type ) { - if ( function_exists( 'getallheaders' ) - && is_array( getallheaders() ) - && array_key_exists( 'X-WC-POS', getallheaders() ) - ) { + // check server global first + if( isset( $_SERVER['HTTP_X_WC_POS'] ) && $_SERVER['HTTP_X_WC_POS'] == 1 ){ return true; - } elseif ( isset( $_SERVER['HTTP_X_WC_POS'] ) && $_SERVER['HTTP_X_WC_POS'] == 1 ) { + } + // backup check getallheaders() - can cause problems + if ( function_exists( 'getallheaders' ) && is_array( getallheaders() ) && array_key_exists( 'X-WC-POS', getallheaders() ) ) { return true; } } From 8b597f7df51558279ecd4cf540d63e44c982bdfa Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 9 Jan 2016 14:32:48 +0800 Subject: [PATCH 012/169] add Receipt settings --- assets/css/src/scss/admin.scss | 3 +- assets/css/src/scss/partials/_panel.scss | 3 +- .../src/scss/partials/admin/_settings.scss | 39 ++++++ .../partials/admin/settings/_receipts.scss | 32 +++++ .../js/src/apps/settings/customers/route.js | 5 +- assets/js/src/apps/settings/general/route.js | 5 +- .../src/apps/settings/receipts/layout-view.js | 25 ++++ .../receipts/{preview => options}/route.js | 19 +-- .../apps/settings/receipts/options/view.js | 9 ++ assets/js/src/apps/settings/receipts/route.js | 116 +++++++++++++----- .../settings/receipts/template/actions.js | 18 +++ .../settings/receipts/template/layout-view.js | 21 ++++ .../{preview/view.js => template/preview.js} | 7 +- .../apps/settings/receipts/template/route.js | 85 +++++++++++++ assets/js/src/apps/settings/receipts/view.js | 18 --- assets/js/src/apps/settings/router.js | 7 ++ assets/js/src/entities/settings/collection.js | 17 ++- assets/js/src/entities/settings/model.js | 6 + .../components/tabs/entities/collection.js | 13 +- assets/js/src/lib/components/tabs/service.js | 12 ++ .../js/src/lib/components/tabs/views/tab.js | 5 + assets/js/src/lib/config/settings-view.js | 17 +-- assets/js/src/lib/config/template-cache.js | 16 +-- .../admin/settings/class-wc-pos-abstract.php | 53 +++++++- .../admin/settings/class-wc-pos-customers.php | 7 -- .../admin/settings/class-wc-pos-receipts.php | 5 +- .../settings/receipt/class-wc-pos-options.php | 28 +++++ .../receipt/class-wc-pos-template.php | 24 ++++ .../{receipts.php => receipt_options.php} | 36 ++---- .../admin/settings/views/receipt_template.php | 32 +++++ includes/api/class-wc-pos-gateways.php | 10 +- includes/api/class-wc-pos-products.php | 7 +- includes/api/class-wc-pos-settings.php | 46 ++++--- includes/api/class-wc-pos-templates.php | 20 ++- includes/class-wc-pos-i18n.php | 9 +- tests/unit/php/bootstrap.php | 4 + .../php/spec/admin/settings/test-access.php | 65 ---------- .../php/spec/admin/settings/test-checkout.php | 7 -- tests/unit/php/spec/admin/test-settings.php | 56 ++++++--- tests/unit/php/spec/api/test-products.php | 35 ++++-- tests/unit/php/spec/api/test-settings.php | 41 +++++++ .../php/spec/{ => api}/test-templates.php | 10 +- tests/unit/php/spec/test-settings.php | 51 -------- 43 files changed, 700 insertions(+), 344 deletions(-) create mode 100644 assets/css/src/scss/partials/admin/settings/_receipts.scss create mode 100644 assets/js/src/apps/settings/receipts/layout-view.js rename assets/js/src/apps/settings/receipts/{preview => options}/route.js (50%) create mode 100644 assets/js/src/apps/settings/receipts/options/view.js create mode 100644 assets/js/src/apps/settings/receipts/template/actions.js create mode 100644 assets/js/src/apps/settings/receipts/template/layout-view.js rename assets/js/src/apps/settings/receipts/{preview/view.js => template/preview.js} (65%) create mode 100644 assets/js/src/apps/settings/receipts/template/route.js delete mode 100644 assets/js/src/apps/settings/receipts/view.js create mode 100644 includes/admin/settings/receipt/class-wc-pos-options.php create mode 100644 includes/admin/settings/receipt/class-wc-pos-template.php rename includes/admin/settings/views/{receipts.php => receipt_options.php} (50%) create mode 100644 includes/admin/settings/views/receipt_template.php delete mode 100644 tests/unit/php/spec/admin/settings/test-access.php delete mode 100644 tests/unit/php/spec/admin/settings/test-checkout.php create mode 100644 tests/unit/php/spec/api/test-settings.php rename tests/unit/php/spec/{ => api}/test-templates.php (85%) delete mode 100644 tests/unit/php/spec/test-settings.php diff --git a/assets/css/src/scss/admin.scss b/assets/css/src/scss/admin.scss index 45d4fb12..46e1d73a 100644 --- a/assets/css/src/scss/admin.scss +++ b/assets/css/src/scss/admin.scss @@ -25,4 +25,5 @@ @import "partials/admin/settings/checkout"; @import "partials/admin/settings/access"; @import "partials/admin/settings/tools"; -@import "partials/admin/settings/hotkeys"; \ No newline at end of file +@import "partials/admin/settings/hotkeys"; +@import "partials/admin/settings/receipts"; \ No newline at end of file diff --git a/assets/css/src/scss/partials/_panel.scss b/assets/css/src/scss/partials/_panel.scss index 0a88d110..46963c0b 100644 --- a/assets/css/src/scss/partials/_panel.scss +++ b/assets/css/src/scss/partials/_panel.scss @@ -73,8 +73,9 @@ panel { // Body .#{current-module()}-body { - overflow: auto; background: $panel-bg; + overflow-y: auto; + -webkit-overflow-scrolling: touch; } /** diff --git a/assets/css/src/scss/partials/admin/_settings.scss b/assets/css/src/scss/partials/admin/_settings.scss index 301353d3..0fd11288 100644 --- a/assets/css/src/scss/partials/admin/_settings.scss +++ b/assets/css/src/scss/partials/admin/_settings.scss @@ -52,5 +52,44 @@ settings { } } + /** + * sub tabs + */ + ##{current-module()}-section-tabs { + + ul { + list-style: none; + margin: 16px 0 0; + padding: 0; + font-size: 13px; + color: #666; + + li { + color: #0073aa; + display: inline-block; + cursor: pointer; + padding-right: 8px; + line-height: 1; + + &:hover { + color: #00a0d2; + } + + &.wc_pos-sub-nav-tab-active { + color: #000; + font-weight: 600; + cursor: default; + } + + &:not(:first-of-type) { + border-left: 1px solid #666; + padding-left: 8px; + } + } + + } + + } + } } \ No newline at end of file diff --git a/assets/css/src/scss/partials/admin/settings/_receipts.scss b/assets/css/src/scss/partials/admin/settings/_receipts.scss new file mode 100644 index 00000000..928edb4b --- /dev/null +++ b/assets/css/src/scss/partials/admin/settings/_receipts.scss @@ -0,0 +1,32 @@ +settings { + @at-root { + + ##{current-module()}-receipts { + + } + + } +} + +/** + * Receipts sections + */ +receipt { + @at-root { + + ##{current-module()}-template-preview { + + padding: 8px; + border: 1px solid #dcdcdc; + margin: 16px 0; + + iframe { + width: 100%; + height: 600px; + background: #fff; + } + + } + + } +} \ No newline at end of file diff --git a/assets/js/src/apps/settings/customers/route.js b/assets/js/src/apps/settings/customers/route.js index 2a966977..2045a456 100644 --- a/assets/js/src/apps/settings/customers/route.js +++ b/assets/js/src/apps/settings/customers/route.js @@ -17,10 +17,7 @@ var Customers = Route.extend({ }, render: function() { - var view = new View({ - model: this.model, - template: this.model.template - }); + var view = new View({ model: this.model }); this.container.show(view); } diff --git a/assets/js/src/apps/settings/general/route.js b/assets/js/src/apps/settings/general/route.js index 2b1e7d3e..baea072d 100644 --- a/assets/js/src/apps/settings/general/route.js +++ b/assets/js/src/apps/settings/general/route.js @@ -17,10 +17,7 @@ var General = Route.extend({ }, render: function() { - var view = new View({ - model: this.model, - template: this.model.template - }); + var view = new View({ model: this.model }); this.container.show(view); } diff --git a/assets/js/src/apps/settings/receipts/layout-view.js b/assets/js/src/apps/settings/receipts/layout-view.js new file mode 100644 index 00000000..356a5ada --- /dev/null +++ b/assets/js/src/apps/settings/receipts/layout-view.js @@ -0,0 +1,25 @@ +var LayoutView = require('lib/config/layout-view'); +var App = require('lib/config/application'); + +var View = LayoutView.extend({ + + template: function(){ + return '' + + '
    ' + + '
    ' + + ''; + }, + + regions: { + tabs : '#wc_pos-settings-section-tabs', + section : '#wc_pos-settings-section' + }, + + attributes: { + id: 'wc_pos-settings-receipts' + } + +}); + +module.exports = View; +App.prototype.set('SettingsApp.Receipts.View', View); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/preview/route.js b/assets/js/src/apps/settings/receipts/options/route.js similarity index 50% rename from assets/js/src/apps/settings/receipts/preview/route.js rename to assets/js/src/apps/settings/receipts/options/route.js index 0a501481..374f5f1a 100644 --- a/assets/js/src/apps/settings/receipts/preview/route.js +++ b/assets/js/src/apps/settings/receipts/options/route.js @@ -1,5 +1,4 @@ var Route = require('lib/config/route'); -var Radio = require('backbone.radio'); var View = require('./view'); var ReceiptRoute = Route.extend({ @@ -7,26 +6,12 @@ var ReceiptRoute = Route.extend({ initialize: function( options ) { options = options || {}; this.container = options.container; - this.collection = Radio.request('entities', 'get', { - name: 'orders', - type: 'collection' - }); - }, - - fetch: function() { - return this.collection.fetch({ - remote: true, - data: { - filter: { - limit: 1 - } - } - }); + this.model = options.model; }, render: function() { var view = new View({ - model: this.collection.at(0) + model: this.model }); this.container.show(view); } diff --git a/assets/js/src/apps/settings/receipts/options/view.js b/assets/js/src/apps/settings/receipts/options/view.js new file mode 100644 index 00000000..ede5b062 --- /dev/null +++ b/assets/js/src/apps/settings/receipts/options/view.js @@ -0,0 +1,9 @@ +var SettingsView = require('lib/config/settings-view'); +var App = require('lib/config/application'); + +var View = SettingsView.extend({ + +}); + +module.exports = View; +App.prototype.set('SettingsApp.Receipt.Options.View'); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/route.js b/assets/js/src/apps/settings/receipts/route.js index 0a5a9b94..528fc7ad 100644 --- a/assets/js/src/apps/settings/receipts/route.js +++ b/assets/js/src/apps/settings/receipts/route.js @@ -1,9 +1,17 @@ var Route = require('lib/config/route'); var App = require('lib/config/application'); -var View = require('./view'); +var LayoutView = require('./layout-view'); var _ = require('lodash'); -var Mn = require('backbone.marionette'); -var ReceiptRoute = require('./preview/route'); +var Radio = require('backbone.radio'); +var ReceiptOptionsRoute = require('./options/route'); +var ReceiptTemplateRoute = require('./template/route'); +var bb = require('backbone'); + +// map setting is to route +var hashMap = { + receipt_options: 'receipts/options', + receipt_template: 'receipts/template' +}; var Receipts = Route.extend({ @@ -11,50 +19,100 @@ var Receipts = Route.extend({ options = options || {}; this.container = options.container; this.model = options.model; - }, + this.collection = this.model.collection; - fetch: function() { - if(this.model && this.model.isNew()){ - return this.model.fetch(); - } + var models = this.collection.parseSettings( this.model.sections ); + this.collection.add( models ); }, - render: function() { - var view = new View({ - model: this.model, - template: this.model.template + render: function( section ) { + this.layout = new LayoutView({ model: this.model }); + this.listenTo( this.layout, 'show', function(){ + this.showSectionTabs(); + this.showSections( section ); }); - - this.listenTo( view, 'toggle:preview', this.togglePreview ); - - this.container.show(view); + this.container.show(this.layout); }, - togglePreview: function( args ) { - var previewArea = _.get(args, ['view', 'ui', 'previewArea']); + showSectionTabs: function(){ + var view = Radio.request('tabs', 'view', { + tabs: _.map( this.model.sections, + _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) + ), + adminSubTabs: true + }); - if( ! previewArea ){ - return; + // check hash and set tab active + var activeTab = view.collection.get( + _.invert( hashMap )[ bb.history.getHash() ] + ); + if( activeTab ){ + activeTab.set({ active: true }); + } else { + view.collection.at(0).set({ active: true }); } - if( ! this.rm ) { - this.initPreview( previewArea ); - } + this.listenTo(view.collection, 'change:active', function(model, active){ + if(active){ + this.navigate(hashMap[model.id], { + trigger: true + }); + } + }); - previewArea.slideToggle(); + this.layout.getRegion('tabs').show(view); }, - initPreview: function( previewArea ){ - this.rm = new Mn.RegionManager(); - var region = this.rm.addRegion('preview', previewArea); + showSections: function( section ){ + if( section === 'template' ){ + return this.showReceiptTemplate(); + } + return this.showReceiptOptions(); + }, - var route = new ReceiptRoute({ - container: region + showReceiptOptions: function(){ + var model = this.collection.get('receipt_options'); + var route = new ReceiptOptionsRoute({ + container : this.layout.getRegion('section'), + model: model }); + route.enter(); + }, + showReceiptTemplate: function(){ + var model = this.collection.get('receipt_template'); + var route = new ReceiptTemplateRoute({ + container : this.layout.getRegion('section'), + model: model + }); route.enter(); } + //togglePreview: function( args ) { + // var previewArea = _.get(args, ['view', 'ui', 'previewArea']); + // + // if( ! previewArea ){ + // return; + // } + // + // if( ! this.rm ) { + // this.initPreview( previewArea ); + // } + // + // previewArea.slideToggle(); + //}, + // + //initPreview: function( previewArea ){ + // this.rm = new Mn.RegionManager(); + // var region = this.rm.addRegion('preview', previewArea); + // + // var route = new ReceiptRoute({ + // container: region + // }); + // + // route.enter(); + //} + }); module.exports = Receipts; diff --git a/assets/js/src/apps/settings/receipts/template/actions.js b/assets/js/src/apps/settings/receipts/template/actions.js new file mode 100644 index 00000000..d24c5edf --- /dev/null +++ b/assets/js/src/apps/settings/receipts/template/actions.js @@ -0,0 +1,18 @@ +var View = require('lib/config/item-view'); + +var Actions = View.extend({ + template: function(){ + return 'Print'; + }, + + ui: { + print: '[data-action="print"]' + }, + + triggers: { + 'click @ui.print': 'print' + } + +}); + +module.exports = Actions; \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/template/layout-view.js b/assets/js/src/apps/settings/receipts/template/layout-view.js new file mode 100644 index 00000000..a483d7d3 --- /dev/null +++ b/assets/js/src/apps/settings/receipts/template/layout-view.js @@ -0,0 +1,21 @@ +var LayoutView = require('lib/config/layout-view'); +var App = require('lib/config/application'); + +var View = LayoutView.extend({ + + template: function(){ + return '' + + '
    ' + + '
    ' + + ''; + }, + + regions: { + preview : '#wc_pos-receipt-template-preview', + actions : '#wc_pos-receipt-template-actions' + } + +}); + +module.exports = View; +App.prototype.set('SettingsApp.Receipts.Template.View', View); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/preview/view.js b/assets/js/src/apps/settings/receipts/template/preview.js similarity index 65% rename from assets/js/src/apps/settings/receipts/preview/view.js rename to assets/js/src/apps/settings/receipts/template/preview.js index ca5b1f8a..eaa36cc8 100644 --- a/assets/js/src/apps/settings/receipts/preview/view.js +++ b/assets/js/src/apps/settings/receipts/template/preview.js @@ -8,14 +8,9 @@ module.exports = ReceiptView.extend({ template: function(){}, onShow: function(){ - var template = hbs.compile( hbs.Templates.print.receipt ) ; + var template = hbs.compile( this.options.receipt_template ) ; this.window = this.el.contentWindow; this.window.document.write(template( this.data )); - }, - - print: function(){ - this.window.focus(); // required for IE - this.window.print(); } }); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/template/route.js b/assets/js/src/apps/settings/receipts/template/route.js new file mode 100644 index 00000000..5b30e1fc --- /dev/null +++ b/assets/js/src/apps/settings/receipts/template/route.js @@ -0,0 +1,85 @@ +var Route = require('lib/config/route'); +var Radio = require('backbone.radio'); +var LayoutView = require('./layout-view'); +var ReceiptPreview = require('./preview'); +var ReceiptAction = require('./actions'); +var App = require('lib/config/application'); +var $ = require('jquery'); + +var ReceiptRoute = Route.extend({ + + initialize: function( options ) { + options = options || {}; + this.container = options.container; + this.model = options.model; + + this.collection = Radio.request('entities', 'get', { + name: 'orders', + type: 'collection' + }); + }, + + fetch: function() { + return $.when( this.fetchOrder(), this.fetchTemplate() ); + }, + + fetchOrder: function(){ + return this.collection.fetch({ + remote: true, + data: { + filter: { + limit: 1 + } + } + }); + }, + + fetchTemplate: function(){ + var self = this; + var wc_api = Radio.request('entities', 'get', { + type: 'option', + name: 'wc_api' + }); + + return App.prototype.getJSON( wc_api + 'pos/templates/receipt') + .done( function( data ) { + self.template = data; + }); + }, + + render: function() { + this.layout = new LayoutView({ + model: this.model + }); + this.listenTo( this.layout, 'show', this.showReceiptTemplate ); + this.container.show(this.layout); + }, + + showReceiptTemplate: function(){ + this.showReceiptTemplatePreview(); + this.showReceiptTemplateActions(); + }, + + showReceiptTemplatePreview: function(){ + var view = new ReceiptPreview({ + model: this.collection.at(0), + receipt_template: this.template + }); + this.layout.getRegion('preview').show(view); + }, + + showReceiptTemplateActions: function(){ + var view = new ReceiptAction(); + + this.listenTo( view, 'print', this.print ); + + this.layout.getRegion('actions').show(view); + }, + + print: function(){ + this.layout.getRegion('preview').currentView.el.contentWindow.print(); + } + +}); + +module.exports = ReceiptRoute; \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/view.js b/assets/js/src/apps/settings/receipts/view.js deleted file mode 100644 index c1d68faf..00000000 --- a/assets/js/src/apps/settings/receipts/view.js +++ /dev/null @@ -1,18 +0,0 @@ -var SettingsView = require('lib/config/settings-view'); -var App = require('lib/config/application'); - -var View = SettingsView.extend({ - - ui: { - 'previewBtn' : '[data-action="preview-receipt"]', - 'previewArea' : '#receipt-preview' - }, - - triggers: { - 'click @ui.previewBtn': 'toggle:preview' - } - -}); - -module.exports = View; -App.prototype.set('SettingsApp.Receipts.View', View); \ No newline at end of file diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index 4bc243de..909fc7c8 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -32,6 +32,7 @@ var SettingsRouter = Router.extend({ 'customers' : 'showCustomers', 'checkout' : 'showCheckout', 'receipts' : 'showReceipts', + 'receipts/:section' : 'showReceipts', 'hotkeys' : 'showHotkeys', 'access' : 'showAccess' }, @@ -47,6 +48,12 @@ var SettingsRouter = Router.extend({ adminTabs: true }); + // check hash and set tab active + var activeTab = view.collection.get( bb.history.getHash().split('/')[0] ); + if( activeTab ){ + activeTab.set({ active: true }, { silent: true }); + } + this.listenTo(view.collection, 'change:active', function(model, active){ if(active){ this.navigate(model.id, { diff --git a/assets/js/src/entities/settings/collection.js b/assets/js/src/entities/settings/collection.js index fd505e0c..4777b2ee 100644 --- a/assets/js/src/entities/settings/collection.js +++ b/assets/js/src/entities/settings/collection.js @@ -21,16 +21,21 @@ module.exports = Collection.extend({ }); // tack on tabsArray, @todo find a better way - this.tabsArray = []; + this.tabsArray = _.map( settings, + _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) + ); - models = _.map(settings, function(setting){ + models = this.parseSettings( settings ); + + return Collection.prototype.constructor.call(this, models, options); + }, + + parseSettings: function(settings){ + return _.map(settings, function(setting){ var attrs = setting.data || {}; attrs.id = setting.id; - this.tabsArray.push({ id: setting.id, label: setting.label }); - return attrs; + return new Model( attrs, setting ); }, this); - - return Collection.prototype.constructor.call(this, models, options); } }); \ No newline at end of file diff --git a/assets/js/src/entities/settings/model.js b/assets/js/src/entities/settings/model.js index 8565a322..234f1a0e 100644 --- a/assets/js/src/entities/settings/model.js +++ b/assets/js/src/entities/settings/model.js @@ -4,6 +4,12 @@ var DeepModel = require('lib/config/deep-model'); module.exports = DeepModel.extend({ + initialize: function( attrs, options ){ + options = options || {}; + this.template = options.template; + this.sections = options.sections; + } + //updateButtonState: function(options){ // var success = options.success, // error = options.error, diff --git a/assets/js/src/lib/components/tabs/entities/collection.js b/assets/js/src/lib/components/tabs/entities/collection.js index b38a0756..8ffa514d 100644 --- a/assets/js/src/lib/components/tabs/entities/collection.js +++ b/assets/js/src/lib/components/tabs/entities/collection.js @@ -1,6 +1,5 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); -var bb = require('backbone'); var TabsCollection = Collection.extend({ model: Model, @@ -21,17 +20,9 @@ var TabsCollection = Collection.extend({ }, ensureActiveTab: function() { - var activeTabs = this.where({'active': true}); + var activeTabs = this.where({ 'active': true }); if( this.length > 0 && activeTabs.length === 0 ) { - // check hash - var tab = this.get( bb.history.getHash() ); - if( tab ){ - tab.set({active: true}); - } - // else set first active - else { - this.at(0).set({active: true}); - } + this.at(0).set({ active: true }); } } diff --git a/assets/js/src/lib/components/tabs/service.js b/assets/js/src/lib/components/tabs/service.js index 5b0bdb2e..9561a2c1 100644 --- a/assets/js/src/lib/components/tabs/service.js +++ b/assets/js/src/lib/components/tabs/service.js @@ -38,6 +38,18 @@ module.exports = Service.extend({ }); } + if( options.adminSubTabs ){ + _.defaults( options, { + className: 'wc_pos-sub-nav-tab-wrapper', + childViewOptions: function(){ + return { + className: 'wc_pos-sub-nav-tab', + activeClassName: 'wc_pos-sub-nav-tab-active' + }; + } + }); + } + return new TabsView( options ); } diff --git a/assets/js/src/lib/components/tabs/views/tab.js b/assets/js/src/lib/components/tabs/views/tab.js index c5609411..b794181a 100644 --- a/assets/js/src/lib/components/tabs/views/tab.js +++ b/assets/js/src/lib/components/tabs/views/tab.js @@ -12,6 +12,11 @@ var View = ItemView.extend({ initialize: function( options ){ this.mergeOptions( options, ['activeClassName'] ); + + // add active className + if( this.model.get('active') ){ + this.$el.addClass( this.activeClassName ); + } }, modelEvents: { diff --git a/assets/js/src/lib/config/settings-view.js b/assets/js/src/lib/config/settings-view.js index f5821617..d0d70c08 100644 --- a/assets/js/src/lib/config/settings-view.js +++ b/assets/js/src/lib/config/settings-view.js @@ -1,21 +1,22 @@ var FormView = require('./form-view'); var app = require('./application'); var $ = require('jquery'); -var _ = require('lodash'); var Tooltip = require('lib/behaviors/tooltip'); +var hbs = require('handlebars'); module.exports = app.prototype.SettingsView = FormView.extend({ - constructor: function(options) { - var id = _.get( options, ['model', 'id'] ); - this.template = 'settings.' + id; - - this.attributes = { - id: 'wc_pos-settings-' + id + attributes: function(){ + return { + id : 'wc_pos-settings-' + this.model.id }; + }, - return FormView.prototype.constructor.apply(this, arguments); + constructor: function() { + // setup model first + FormView.prototype.constructor.apply(this, arguments); + this.template = hbs.compile( this.model.template ); }, behaviors: { diff --git a/assets/js/src/lib/config/template-cache.js b/assets/js/src/lib/config/template-cache.js index 5438d9c3..eedf1cc5 100644 --- a/assets/js/src/lib/config/template-cache.js +++ b/assets/js/src/lib/config/template-cache.js @@ -25,18 +25,18 @@ Mn.TemplateCache.prototype.compileTemplate = function(rawTemplate) { */ module.exports = function( data ){ data = data || {}; - var settings = _.get(data, ['params', 'settings']), - gateways = _.get(data, ['params', 'gateways']); + //var settings = _.get(data, ['params', 'settings']); + var gateways = _.get(data, ['params', 'gateways']); // extend template var above _.extend( templates, data.templates ); - if( settings ){ - templates.settings = _.reduce( settings, function( result, setting ){ - result[setting.id] = setting.template; - return result; - }, {} ); - } + //if( settings ){ + // templates.settings = _.reduce( settings, function( result, setting ){ + // result[setting.id] = setting.template; + // return result; + // }, {} ); + //} if( gateways ){ templates.settings = _.reduce( gateways, function( result, gateway ){ diff --git a/includes/admin/settings/class-wc-pos-abstract.php b/includes/admin/settings/class-wc-pos-abstract.php index 7b0687b1..225c579a 100644 --- a/includes/admin/settings/class-wc-pos-abstract.php +++ b/includes/admin/settings/class-wc-pos-abstract.php @@ -12,31 +12,58 @@ class WC_POS_Admin_Settings_Abstract { protected static $instance; + protected $defaults; + public $current_user_authorized = true; + protected $section_handlers = array(); + /** * Returns the Singleton instance of this class. * - late static binding requires PHP 5.3+ + * * @return Singleton */ public static function get_instance() { $class = get_called_class(); - if (null === static::$instance) { + if ( null === static::$instance ) { static::$instance = new $class(); } + return static::$instance; } - protected function __construct() {} - protected function __clone() {} - protected function __wakeup() {} + protected function __construct() { + } + + protected function __clone() { + } + + protected function __wakeup() { + } + + /** + * @return array + */ + public function get_payload() { + return array( + 'id' => $this->id, + 'label' => $this->label, + 'data' => $this->get(), + 'template' => $this->get_template(), + 'sections' => $this->get_sections() + ); + } /** * Output the view file */ - public function output(){ - include 'views/' . $this->id . '.php'; + public function output() { + $file = dirname(__FILE__) . '/views/' . $this->id . '.php'; + if ( is_readable( $file ) ) { + include $file; + } } /** @@ -103,4 +130,18 @@ public function getJSON(){ return $data ? json_encode( $data ) : false; } + /** + * + */ + public function get_sections(){ + $sections = array(); + + foreach( $this->section_handlers as $class ){ + $handler = $class::get_instance(); + $sections[] = $handler->get_payload(); + } + + return $sections; + } + } \ No newline at end of file diff --git a/includes/admin/settings/class-wc-pos-customers.php b/includes/admin/settings/class-wc-pos-customers.php index e99ba4d2..76ec0380 100644 --- a/includes/admin/settings/class-wc-pos-customers.php +++ b/includes/admin/settings/class-wc-pos-customers.php @@ -22,11 +22,4 @@ public function __construct() { ); } - /** - * include relative to this file - */ - public function output() { - include 'views/customers.php'; - } - } \ No newline at end of file diff --git a/includes/admin/settings/class-wc-pos-receipts.php b/includes/admin/settings/class-wc-pos-receipts.php index 3028eb89..7b12e608 100644 --- a/includes/admin/settings/class-wc-pos-receipts.php +++ b/includes/admin/settings/class-wc-pos-receipts.php @@ -20,8 +20,9 @@ public function __construct() { $this->id = 'receipts'; $this->label = __( 'Receipts', 'woocommerce-pos' ); - $this->defaults = array( - 'print_method' => 'html' + $this->section_handlers = array( + 'WC_POS_Admin_Settings_Receipt_Options', + 'WC_POS_Admin_Settings_Receipt_Template' ); } diff --git a/includes/admin/settings/receipt/class-wc-pos-options.php b/includes/admin/settings/receipt/class-wc-pos-options.php new file mode 100644 index 00000000..be4a1949 --- /dev/null +++ b/includes/admin/settings/receipt/class-wc-pos-options.php @@ -0,0 +1,28 @@ + + * @link http://www.woopos.com.au + */ + + class WC_POS_Admin_Settings_Receipt_Options extends WC_POS_Admin_Settings_Abstract { + + protected static $instance; + + /** + * @param + */ + public function __construct() { + $this->id = 'receipt_options'; + $this->label = __( 'Receipt Options', 'woocommerce-pos' ); + + $this->defaults = array( + 'print_method' => 'html' + ); + } + + } \ No newline at end of file diff --git a/includes/admin/settings/receipt/class-wc-pos-template.php b/includes/admin/settings/receipt/class-wc-pos-template.php new file mode 100644 index 00000000..9a084118 --- /dev/null +++ b/includes/admin/settings/receipt/class-wc-pos-template.php @@ -0,0 +1,24 @@ + + * @link http://www.woopos.com.au + */ + + class WC_POS_Admin_Settings_Receipt_Template extends WC_POS_Admin_Settings_Abstract { + + protected static $instance; + + /** + * @param + */ + public function __construct() { + $this->id = 'receipt_template'; + $this->label = __( 'Receipt Template', 'woocommerce-pos' ); + } + + } \ No newline at end of file diff --git a/includes/admin/settings/views/receipts.php b/includes/admin/settings/views/receipt_options.php similarity index 50% rename from includes/admin/settings/views/receipts.php rename to includes/admin/settings/views/receipt_options.php index 58624b29..da8cb14a 100644 --- a/includes/admin/settings/views/receipts.php +++ b/includes/admin/settings/views/receipt_options.php @@ -20,38 +20,26 @@ - + - - - - - - - -

    - Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); - ?> + %1$s', 'woocommerce-pos' ), 'http://woopos.com.au/docs/receipts/print-method' ); ?>

    - - - - - - - - \ No newline at end of file diff --git a/includes/admin/settings/views/receipt_template.php b/includes/admin/settings/views/receipt_template.php new file mode 100644 index 00000000..d52c8341 --- /dev/null +++ b/includes/admin/settings/views/receipt_template.php @@ -0,0 +1,32 @@ + + +

    + + + + + + + + + + + + +
    + + +

    + Template path: %s', 'woocommerce-pos' ), ''. $template_path .'' ); + ?> +

    + + + +
    \ No newline at end of file diff --git a/includes/api/class-wc-pos-gateways.php b/includes/api/class-wc-pos-gateways.php index e5b7e7cd..71e7fbd7 100644 --- a/includes/api/class-wc-pos-gateways.php +++ b/includes/api/class-wc-pos-gateways.php @@ -100,7 +100,7 @@ private function sanitize_payment_fields( WC_Payment_Gateway $gateway ) { $html = $this->removeDomNodes( $html, '//script' ); } - return wc_pos_trim_html_string( $html );; + return wc_pos_trim_html_string( $html ); } /** @@ -115,14 +115,16 @@ private function removeDomNodes( $html, $xpathString ) { return preg_replace('//im', '', $html); } - $dom = new DOMDocument; + $dom = new DOMDocument(); // Libxml constants not available on all servers (Libxml < 2.7.8) // $html->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); - $dom->loadHtml( '
    ' . $html . '
    ' ); + $dom->loadHtml( '' . '
    ' . $html . '
    ' ); # remove removeChild( $dom->doctype ); - # remove + # remove + $dom->removeChild( $dom->firstChild ); + # $dom->replaceChild( $dom->firstChild->firstChild->firstChild, $dom->firstChild ); // remove the required node diff --git a/includes/api/class-wc-pos-products.php b/includes/api/class-wc-pos-products.php index 2e40fa48..790d2eab 100644 --- a/includes/api/class-wc-pos-products.php +++ b/includes/api/class-wc-pos-products.php @@ -254,11 +254,10 @@ private function wc_pos_api_get_variation_option( $product, $attribute, $option * @return array */ private function wc_pos_api_filter_response_data( array $data, $product ){ - $id = isset( $data['id'] ) ? $data['id'] : ''; - $barcode = get_post_meta( $id, $this->barcode_meta_key, true ); + $barcode = get_post_meta( $product->id, $this->barcode_meta_key, true ); - $data['featured_src'] = $this->wc_pos_api_get_thumbnail( $id ); - $data['barcode'] = apply_filters( 'woocommerce_pos_product_barcode', $barcode, $id ); + $data['featured_src'] = $this->wc_pos_api_get_thumbnail( $product->id ); + $data['barcode'] = apply_filters( 'woocommerce_pos_product_barcode', $barcode, $product->id ); // allow decimal stock quantities, fixed in WC 2.4 if( version_compare( WC()->version, '2.4', '<' ) ){ diff --git a/includes/api/class-wc-pos-settings.php b/includes/api/class-wc-pos-settings.php index c7d6dee6..a0e75b71 100644 --- a/includes/api/class-wc-pos-settings.php +++ b/includes/api/class-wc-pos-settings.php @@ -17,9 +17,6 @@ class WC_POS_API_Settings extends WC_API_Resource { protected $base = '/pos/settings'; - /* @var string The db prefix for WP Options table */ - const DB_PREFIX = 'woocommerce_pos_'; - /** * Register routes for POS Settings * @@ -49,6 +46,8 @@ public function register_routes( array $routes ) { /** * @param string $id * @return array + * + * @todo move business logic to WC_POS_Admin_Settings */ public function get_settings( $id = '', $wc_pos_admin = null ){ $payload = $handlers = array(); @@ -64,30 +63,19 @@ public function get_settings( $id = '', $wc_pos_admin = null ){ // single settings if( $id && isset( $handlers[$id] ) ){ - $handler = $handlers[$id]; - return $this->get_setting( $handler::get_instance() ); + $class = $handlers[$id]; + $handler = $class::get_instance(); + return $handler->get_payload(); } - foreach($handlers as $key => $handler){ - $payload[] = $this->get_setting( $handler::get_instance() ); + foreach($handlers as $key => $class){ + $handler = $class::get_instance(); + $payload[] = $handler->get_payload(); } return $payload; } - /** - * @param $handler - * @return array - */ - private function get_setting( $handler ) { - return array( - 'id' => $handler->id, - 'label' => $handler->label, - 'data' => $handler->get(), - 'template' => $handler->get_template() - ); - } - /** * @param string $id * @return array|WP_Error @@ -123,7 +111,25 @@ public function delete_settings( $id = '' ){ return $handler->delete(); } + /** + * Delete all settings in WP options table + */ + public function delete_all_settings() { + global $wpdb; + $wpdb->query( + $wpdb->prepare( " + DELETE FROM {$wpdb->options} + WHERE option_name + LIKE '%s'", + WC_POS_Admin_Settings::DB_PREFIX . '%' + ) + ); + } + /** + * @param $id + * @return WC_POS_Admin_Settings_Gateways|WP_Error + */ private function get_settings_handler( $id ){ if( ! $id ){ diff --git a/includes/api/class-wc-pos-templates.php b/includes/api/class-wc-pos-templates.php index 53c02cc4..275d4221 100644 --- a/includes/api/class-wc-pos-templates.php +++ b/includes/api/class-wc-pos-templates.php @@ -32,6 +32,11 @@ public function register_routes( array $routes ) { array( array( $this, 'get_templates' ), WC_API_Server::READABLE ) ); + # GET /pos/templates + $routes[ $this->base . '/receipt' ] = array( + array( array( $this, 'get_receipt_template' ), WC_API_Server::READABLE ) + ); + # GET /pos/templates/modal/ $routes[ $this->base . '/modal/(?P\w+)' ] = array( array( array( $this, 'get_modal' ), WC_API_Server::READABLE ) @@ -164,7 +169,8 @@ public function template_output( $file ) { if( is_readable( $file ) ){ ob_start(); include $file; - $template = ob_get_clean(); + $template = ob_get_contents(); + ob_end_clean(); } return wc_pos_trim_html_string( $template ); @@ -173,8 +179,8 @@ public function template_output( $file ) { /** * Returns path of print receipt template */ - static public function locate_print_receipt_template() { - $receipt_path = self::locate_template_file( WC_POS_PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); + public function locate_print_receipt_template() { + $receipt_path = $this->locate_template_file( WC_POS_PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); return apply_filters( 'woocommerce_pos_print_receipt_path', $receipt_path ); } @@ -190,4 +196,12 @@ public function get_modal( $id = '' ){ return $template; } + /** + * + */ + public function get_receipt_template(){ + $file = $this->locate_print_receipt_template(); + return $this->template_output( $file ); + } + } \ No newline at end of file diff --git a/includes/class-wc-pos-i18n.php b/includes/class-wc-pos-i18n.php index 698df4ec..a5d0d75f 100755 --- a/includes/class-wc-pos-i18n.php +++ b/includes/class-wc-pos-i18n.php @@ -43,15 +43,14 @@ public function __construct() { public function load_plugin_textdomain() { $locale = apply_filters( 'plugin_locale', get_locale(), 'woocommerce-pos' ); - $dir = trailingslashit( WP_LANG_DIR ); - load_textdomain( 'woocommerce-pos', $dir . 'woocommerce-pos/woocommerce-pos-' . $locale . '.mo' ); - load_textdomain( 'woocommerce-pos', $dir . 'plugins/woocommerce-pos-' . $locale . '.mo' ); + load_textdomain( 'woocommerce-pos', WP_LANG_DIR . '/woocommerce-pos/woocommerce-pos-' . $locale . '.mo' ); + load_textdomain( 'woocommerce-pos', WP_LANG_DIR . '/plugins/woocommerce-pos-' . $locale . '.mo' ); // load woocommerce admin translations if ( ! is_admin() && is_pos() ) { - load_textdomain( 'woocommerce', $dir . 'woocommerce/woocommerce-admin-' . $locale . '.mo' ); - load_textdomain( 'woocommerce', $dir . 'plugins/woocommerce-admin-' . $locale . '.mo' ); + load_textdomain( 'woocommerce', WP_LANG_DIR . '/woocommerce/woocommerce-admin-' . $locale . '.mo' ); + load_textdomain( 'woocommerce', WP_LANG_DIR . '/plugins/woocommerce-admin-' . $locale . '.mo' ); } } diff --git a/tests/unit/php/bootstrap.php b/tests/unit/php/bootstrap.php index 39d0296f..7f94c8e9 100644 --- a/tests/unit/php/bootstrap.php +++ b/tests/unit/php/bootstrap.php @@ -23,6 +23,7 @@ public function __construct(){ public function load_wc_pos() { require_once WP_CONTENT_DIR . '/plugins/woocommerce/woocommerce.php'; require_once dirname( __FILE__ ) . '/../../../woocommerce-pos.php'; + WC()->api->includes(); } /** @@ -39,6 +40,9 @@ public function includes(){ require_once '/home/vagrant/.composer/vendor/autoload.php'; } + // extra functions and factories + + } // public function install_wc_pos() { diff --git a/tests/unit/php/spec/admin/settings/test-access.php b/tests/unit/php/spec/admin/settings/test-access.php deleted file mode 100644 index bb8ff5e2..00000000 --- a/tests/unit/php/spec/admin/settings/test-access.php +++ /dev/null @@ -1,65 +0,0 @@ -assertNotEmpty( $pos_capabilities ); -// -// $woo_capabilities = WC_POS_Admin_Settings_Access::$woocaps; -// $this->assertNotEmpty( $woo_capabilities ); -// } -// -// function test_bootstrap_data(){ -// $access = new WC_POS_Admin_Settings_Access(); -// $this->assertNotEmpty( $access->get_data() ); -// -// $pos_caps = WC_POS_Admin_Settings_Access::$poscaps; -// $woo_caps = WC_POS_Admin_Settings_Access::$woocaps; -// -// $data = $access->get_data(); -// $pos_data = array_keys($data['roles']['administrator']['pos_capabilities']); -// $woo_data = array_keys($data['roles']['administrator']['woo_capabilities']); -// -// // admin should have all capabilities -// $this->assertSame(array_diff($pos_caps,$pos_data), array_diff($pos_data,$pos_caps)); -// $this->assertSame(array_diff($woo_caps,$woo_data), array_diff($woo_data,$woo_caps)); -// -// } -// -// function test_update_capabilities(){ -// -// // set shop_manager capabilities -// $role = get_role('shop_manager'); -// $role->add_cap('access_woocommerce_pos'); -// $role->remove_cap('manage_woocommerce_pos'); -// $role->remove_cap('promote_users'); -// -// -// // dummy data with reversed capabilities -// $data = array( -// 'roles' => array( -// 'shop_manager' => array( -// 'pos_capabilities' => array( -// 'access_woocommerce_pos' => false, -// 'manage_woocommerce_pos' => true, -// // security test -// // save function should only change allowed capabilities -// 'promote_users' => true -// ) -// ) -// ) -// ); -// -// $access = new WC_POS_Admin_Settings_Access(); -// $access->save($data); -// -// // -// $role = get_role('shop_manager'); -// $this->assertArrayNotHasKey('access_woocommerce_pos', $role->capabilities); -// $this->assertTrue($role->capabilities['manage_woocommerce_pos']); -// $this->assertArrayNotHasKey('promote_users', $role->capabilities); -// -// } -// -//} \ No newline at end of file diff --git a/tests/unit/php/spec/admin/settings/test-checkout.php b/tests/unit/php/spec/admin/settings/test-checkout.php deleted file mode 100644 index fccb7081..00000000 --- a/tests/unit/php/spec/admin/settings/test-checkout.php +++ /dev/null @@ -1,7 +0,0 @@ -db_version_option = WC_POS_Admin_Settings::DB_PREFIX . 'db_version'; + $this->idb_version_option = WC_POS_Admin_Settings::DB_PREFIX . 'idb_version'; + delete_option( $this->db_version_option ); + delete_option( $this->idb_version_option ); } - function test_delete_settings(){ - update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test', 'dummy' ); - WC_POS_Admin_Settings::delete_settings('test'); - $settings = get_option(WC_POS_Admin_Settings::DB_PREFIX . 'test'); - $this->assertFalse($settings); + public function tearDown() { + delete_option( $this->db_version_option ); + delete_option( $this->idb_version_option ); } - function test_delete_all_settings(){ - update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test1', 'dummy' ); - update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test2', 'dummy' ); - WC_POS_Admin_Settings::delete_all_settings(); + public function test_get_db_version(){ - global $wpdb; - $prefix = WC_POS_Admin_Settings::DB_PREFIX; - $rows = $wpdb->get_var( " - SELECT COUNT(*) FROM {$wpdb->options} - WHERE option_name - LIKE '{$prefix}%'" - ); + // should init with 0 + $this->assertEquals( 0, WC_POS_Admin_Settings::get_db_version() ); - $this->assertEquals( $rows, 0 ); + // bump versions + WC_POS_Admin_Settings::bump_versions(); + $this->assertEquals( WC_POS_VERSION, WC_POS_Admin_Settings::get_db_version() ); } + + public function test_get_idb_version(){ + + // should init with 1 + $this->assertEquals( 1, WC_POS_Admin_Settings::get_idb_version() ); + + // should handle non integers + update_option( $this->idb_version_option, 'corrupt' ); + $this->assertEquals( 1, WC_POS_Admin_Settings::get_idb_version() ); + + } + + public function test_bump_idb_version(){ + + // should init with 1 + $this->assertEquals( 1, WC_POS_Admin_Settings::bump_idb_version() ); + + // should increment version numbers + $this->assertEquals( 2, WC_POS_Admin_Settings::bump_idb_version() ); + + } + } \ No newline at end of file diff --git a/tests/unit/php/spec/api/test-products.php b/tests/unit/php/spec/api/test-products.php index bb96e1ff..e2d3b977 100644 --- a/tests/unit/php/spec/api/test-products.php +++ b/tests/unit/php/spec/api/test-products.php @@ -3,30 +3,41 @@ class ProductsAPITest extends WP_UnitTestCase { private $products_api; + private $product; + + private $sku = 'sku12345'; function setUp(){ - $this->products_api = new WC_POS_API_Products(); + $this->products_api = new WC_POS_API_Products( $this->mock_api_server() ); + + // create product + $this->product = wc_get_product( $this->mock_product() ); } - function mock_simple_product(){ - $product = $this->getMockBuilder('WC_Product_Simple') + function mock_api_server(){ + $stub = $this->getMockBuilder('WC_API_Server') ->disableOriginalConstructor() ->getMock(); - // $product->get_stock_quantity() = 0.25 - $product->method('get_stock_quantity') - ->willReturn(0.25); + return $stub; + } - return $product; + function mock_product(){ + $product_id = $this->factory->post->create( + array( + 'post_title' => 'Woo Product', + 'post_type' => 'product', + ) + ); + add_post_meta( $product_id, '_sku', $this->sku, true ); + return $product_id; } function test_product_response(){ - $data = array('id' => 1, 'sku' => 'sku12345'); - $product = $this->mock_simple_product(); - $response = $this->products_api->product_response($data, $product, null, null); + $response = $this->products_api->wc_pos_api_product_response(array(), $this->product, null, null); // $this->assertEquals(0.25, $response['stock_quantity']); - $this->assertEquals('sku12345', $response['barcode']); - $this->assertEquals( wc_placeholder_img_src(), $response['featured_src']); + $this->assertEquals( $this->sku, $response['barcode'] ); + $this->assertEquals( wc_placeholder_img_src(), $response['featured_src'] ); } } \ No newline at end of file diff --git a/tests/unit/php/spec/api/test-settings.php b/tests/unit/php/spec/api/test-settings.php new file mode 100644 index 00000000..5cbf362d --- /dev/null +++ b/tests/unit/php/spec/api/test-settings.php @@ -0,0 +1,41 @@ +settings_api = new WC_POS_API_Settings( $this->mock_api_server() ); + } + + function mock_api_server(){ + $stub = $this->getMockBuilder('WC_API_Server') + ->disableOriginalConstructor() + ->getMock(); + + return $stub; + } + +// function test_delete_settings(){ +// update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test', 'dummy' ); +// $this->settings_api->delete_settings('test'); +// $settings = get_option(WC_POS_Admin_Settings::DB_PREFIX . 'test'); +// $this->assertFalse($settings); +// } + + function test_delete_all_settings(){ + update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test1', 'dummy' ); + update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test2', 'dummy' ); + $this->settings_api->delete_all_settings(); + + global $wpdb; + $prefix = WC_POS_Admin_Settings::DB_PREFIX; + $rows = $wpdb->get_var( " + SELECT COUNT(*) FROM {$wpdb->options} + WHERE option_name + LIKE '{$prefix}%'" + ); + + $this->assertEquals( $rows, 0 ); + } +} \ No newline at end of file diff --git a/tests/unit/php/spec/test-templates.php b/tests/unit/php/spec/api/test-templates.php similarity index 85% rename from tests/unit/php/spec/test-templates.php rename to tests/unit/php/spec/api/test-templates.php index 6067d2eb..56b77838 100644 --- a/tests/unit/php/spec/test-templates.php +++ b/tests/unit/php/spec/api/test-templates.php @@ -1,15 +1,19 @@ template = new WC_POS_Template(); + $this->template = new WC_POS_API_Templates( $this->mock_api_server() ); } - public function tearDown() { + function mock_api_server(){ + $stub = $this->getMockBuilder('WC_API_Server') + ->disableOriginalConstructor() + ->getMock(); + return $stub; } public function test_locate_default_template_files(){ diff --git a/tests/unit/php/spec/test-settings.php b/tests/unit/php/spec/test-settings.php deleted file mode 100644 index ce165269..00000000 --- a/tests/unit/php/spec/test-settings.php +++ /dev/null @@ -1,51 +0,0 @@ -db_version_option = WC_POS_Settings::DB_PREFIX . 'db_version'; - $this->idb_version_option = WC_POS_Settings::DB_PREFIX . 'idb_version'; - delete_option( $this->db_version_option ); - delete_option( $this->idb_version_option ); - } - - public function tearDown() { - delete_option( $this->db_version_option ); - delete_option( $this->idb_version_option ); - } - - public function test_get_db_version(){ - - // should init with 0 - $this->assertEquals( 0, WC_POS_Settings::get_db_version() ); - - // bump versions - WC_POS_Settings::bump_versions(); - $this->assertEquals( WC_POS_VERSION, WC_POS_Settings::get_db_version() ); - } - - public function test_get_idb_version(){ - - // should init with 1 - $this->assertEquals( 1, WC_POS_Settings::get_idb_version() ); - - // should handle non integers - update_option( $this->idb_version_option, 'corrupt' ); - $this->assertEquals( 1, WC_POS_Settings::get_idb_version() ); - - } - - public function test_bump_idb_version(){ - - // should init with 1 - $this->assertEquals( 1, WC_POS_Settings::bump_idb_version() ); - - // should increment version numbers - $this->assertEquals( 2, WC_POS_Settings::bump_idb_version() ); - - } - -} \ No newline at end of file From 62934dd419cdeb5f29503b6a0d8161a090e6fb79 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 9 Jan 2016 16:59:17 +0800 Subject: [PATCH 013/169] fix integration tests --- includes/api/class-wc-pos-orders.php | 2 +- includes/class-wc-pos-api.php | 4 +- .../integration/php/spec/api/test-orders.php | 25 ++++++- .../php/spec/api/test-products.php | 16 ++--- tests/integration/php/spec/test-ajax.php | 70 ------------------- 5 files changed, 33 insertions(+), 84 deletions(-) delete mode 100644 tests/integration/php/spec/test-ajax.php diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index 435a4261..368cefd8 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -449,7 +449,7 @@ public function wc_pos_api_process_payment( $order_id, $data ){ // load the gateways & process payment $gateway_id = $data['payment_details']['method_id']; - add_filter('option_woocommerce_'. $gateway_id .'_settings', array($this, 'force_enable_gateway')); + add_filter('option_woocommerce_'. $gateway_id .'_settings', array($this, 'wc_pos_api_force_enable_gateway')); $settings = WC_POS_Admin_Settings_Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); $response = $gateways[ $gateway_id ]->process_payment( $order_id ); diff --git a/includes/class-wc-pos-api.php b/includes/class-wc-pos-api.php index c24a3477..706fd5ff 100644 --- a/includes/class-wc-pos-api.php +++ b/includes/class-wc-pos-api.php @@ -91,6 +91,8 @@ public function wc_api_authentication() { } /** + * @todo this is a total hack, need to find a way to customise bb remote sync + * * @param $args * @param $callback * @return mixed @@ -109,7 +111,7 @@ public function dispatch_args($args, $callback){ unset($args['data']['status']); // remove status // a hack to put data in the right format - if( $args['_route'] == '/orders' ){ + if( substr( $args['_route'], 0, 7 ) == '/orders' ){ $args['data'] = array( 'order' => $args['data'] ); diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index b32d091e..4dd44367 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -80,7 +80,9 @@ public function test_get_valid_response() { */ public function test_create_order(){ $response = $this->client->post('', array( - 'json' => array() + 'json' => array( + 'status' => 'CREATE_FAILED' + ) )); // 201 = created $this->assertEquals(201, $response->getStatusCode()); @@ -102,9 +104,11 @@ public function test_edit_order(){ // update note $response = $this->client->put($order_id, array( 'json' => array( - 'note' => 'updated' + 'note' => 'updated', + 'status' => 'UPDATE_FAILED' ) )); + $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('order', $data); @@ -124,6 +128,7 @@ public function test_order_with_product(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -153,6 +158,7 @@ public function test_integer_stock_adjustment(){ // create order with payment details $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ), @@ -197,6 +203,7 @@ public function test_float_stock_adjustment(){ // create order with payment details $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ), @@ -233,6 +240,7 @@ public function test_line_item_discount(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -258,6 +266,7 @@ public function test_line_item_change_title(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -289,6 +298,7 @@ public function test_line_item_exclusive_tax(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -318,6 +328,7 @@ public function test_line_item_change_taxable(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -348,6 +359,7 @@ public function test_line_item_change_tax_rate(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ) @@ -375,6 +387,7 @@ public function test_order_with_fee(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'fee_lines' => array( $fee ) @@ -407,6 +420,7 @@ public function test_order_with_taxable_fee(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'fee_lines' => array( $fee ) @@ -439,6 +453,7 @@ public function test_order_with_taxable_fee_change_tax_class(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'fee_lines' => array( $fee ) @@ -467,6 +482,7 @@ public function test_order_with_negative_fee(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'fee_lines' => array( $fee ) @@ -497,6 +513,7 @@ public function test_order_with_negative_fee_and_tax(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'fee_lines' => array( $fee ) @@ -536,6 +553,7 @@ public function test_order_with_product_and_negative_fee(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'line_items' => array( $product ), @@ -569,6 +587,7 @@ public function test_order_with_shipping(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'shipping_lines' => array( $shipping ) @@ -603,6 +622,7 @@ public function test_order_with_shipping_change_taxable(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'shipping_lines' => array( $shipping ), @@ -641,6 +661,7 @@ public function test_order_with_shipping_change_tax_class(){ // create order $response = $this->client->post('', array( 'json' => array( + 'status' => 'CREATE_FAILED', 'shipping_lines' => array( $shipping ), diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index dce6f396..bbf71d20 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -200,16 +200,12 @@ public function test_online_only_products(){ // get all product ids $this->log_in_user(); - $client = new GuzzleHttp\Client(); - $response = $client->get( admin_url('admin-ajax.php'), array( - 'query' => array( - 'action' => 'wc_pos_get_all_ids', - 'type' => 'products', - 'security' => wp_create_nonce( WC_POS_PLUGIN_NAME ) - ), - 'headers' => array( 'X-WC-POS' => '1' ), - 'exceptions' => false - )); + $response = $this->client->get('', [ + 'query' => [ + 'filter[fields]' => 'id', + 'filter[limit]'=> '-1' + ] + ]); $this->log_out_user(); $this->assertNotContains( $product['id'], $response->json() ); diff --git a/tests/integration/php/spec/test-ajax.php b/tests/integration/php/spec/test-ajax.php deleted file mode 100644 index 7e7bbffe..00000000 --- a/tests/integration/php/spec/test-ajax.php +++ /dev/null @@ -1,70 +0,0 @@ -nonce = wp_create_nonce( WC_POS_PLUGIN_NAME ); - - $this->client = new GuzzleHttp\Client( array( - 'base_url' => admin_url('admin-ajax.php'), - 'defaults' => array( - 'headers' => array( - 'X-WC-POS' => '1' - ), - 'exceptions' => false, - 'cookies' => true - ) - ) ); - - $this->log_in_user(); - } - - /** - * Helper functions - */ - private function log_in_user(){ - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce-pos-test/index.php', - 'woocommerce/woocommerce.php' - )); - update_option('woocommerce_pos_test_logged_in_user', 1); - } - - private function log_out_user(){ - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce/woocommerce.php' - )); - delete_option('woocommerce_pos_test_logged_in_user'); - } - - /** - * - */ - public function test_http_methods(){ - $response = $this->client->put('', array( - 'query' => array( - 'action' => 'wc_pos_test_http_methods', - 'security' => $this->nonce - ), - 'json' => array( - 'foo' => 'bar' - ) - )); - $this->assertEquals(200, $response->getStatusCode()); - $this->assertEquals(array( - 'method' => 'put', - 'payload' => array( - 'foo' => 'bar' - ) - ), $response->json()); - } - - public function tearDown() { - $this->log_out_user(); - } -} \ No newline at end of file From 4901f718770a166ca813596eefa37b6b95c6f7af Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 9 Jan 2016 17:42:22 +0800 Subject: [PATCH 014/169] fix travis apache install --- .travis.yml | 8 ++++++-- includes/api/class-wc-pos-orders.php | 14 ++++++++++---- tests/integration/php/bootstrap.php | 2 -- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index d83bbfe4..c898ddf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,15 @@ install: - 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 + - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse' | sudo tee /etc/apt/sources.list.d/trusty.list > /dev/null + - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null + - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null + - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null - sudo apt-get update - - sudo apt-get install apache2 + - 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 + - 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 diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index 368cefd8..a2c5e0ce 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -452,12 +452,18 @@ public function wc_pos_api_process_payment( $order_id, $data ){ add_filter('option_woocommerce_'. $gateway_id .'_settings', array($this, 'wc_pos_api_force_enable_gateway')); $settings = WC_POS_Admin_Settings_Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); - $response = $gateways[ $gateway_id ]->process_payment( $order_id ); - if(isset($response['result']) && $response['result'] == 'success'){ - $this->wc_pos_api_payment_success($gateway_id, $order_id, $response); + if( isset( $gateways[ $gateway_id ] ) ) { + + $response = $gateways[ $gateway_id ]->process_payment( $order_id ); + if ( isset( $response[ 'result' ] ) && $response[ 'result' ] == 'success' ) { + $this->wc_pos_api_payment_success( $gateway_id, $order_id, $response ); + } else { + $this->wc_pos_api_payment_failure( $gateway_id, $order_id, $response ); + } + } else { - $this->wc_pos_api_payment_failure($gateway_id, $order_id, $response); + $this->wc_pos_api_payment_failure( $gateway_id, $order_id, '' ); } // switch back to logged in user diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index 3e08f4b3..cc81be8f 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -2,8 +2,6 @@ class Integration_Test_WC_POS { - private $wp_root; - public function __construct(){ ini_set( 'display_errors','on' ); From 88ab8ec0b80ff426e14885f795e5f42c2a0b004d Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 15 Jan 2016 20:11:34 +0800 Subject: [PATCH 015/169] Update print settings --- assets/css/src/scss/partials/_modal.scss | 16 ++- .../src/scss/partials/admin/_settings.scss | 30 +++++ .../partials/admin/settings/_receipts.scss | 48 +++++-- assets/js/src/apps/settings/customers/view.js | 17 +-- .../apps/settings/receipts/options/view.js | 16 +++ assets/js/src/apps/settings/receipts/route.js | 76 ++++++++---- .../settings/receipts/template/layout-view.js | 33 +++-- .../apps/settings/receipts/template/route.js | 88 +++++++++++-- assets/js/src/apps/settings/router.js | 26 +++- assets/js/src/apps/status/router.js | 8 +- assets/js/src/apps/status/status/route.js | 3 +- assets/js/src/apps/status/status/view.js | 10 +- .../status/tools/modal/translation-update.js | 5 + assets/js/src/apps/status/tools/route.js | 3 +- assets/js/src/apps/status/tools/view.js | 16 ++- assets/js/src/entities/settings/collection.js | 4 +- assets/js/src/entities/settings/model.js | 47 +++---- .../js/src/lib/behaviors/customer-select.js | 25 ++-- assets/js/src/lib/behaviors/emulateHTTP.js | 14 ++- .../js/src/lib/components/buttons/behavior.js | 19 ++- assets/js/src/lib/components/buttons/view.js | 4 + assets/js/src/lib/components/modal/body.hbs | 8 +- assets/js/src/lib/components/modal/body.js | 8 +- .../js/src/lib/components/print/epos-print.js | 117 ++++++++++++++++++ assets/js/src/lib/components/print/escp.js | 0 assets/js/src/lib/config/deep-model | 2 +- assets/js/src/lib/config/settings-view.js | 5 - .../js/src/lib/utilities/stickit-handlers.js | 3 + includes/admin/class-wc-pos-settings.php | 3 +- .../admin/settings/class-wc-pos-abstract.php | 22 +++- .../admin/settings/class-wc-pos-access.php | 1 + .../admin/settings/class-wc-pos-customers.php | 7 +- .../admin/settings/class-wc-pos-general.php | 5 + .../settings/receipt/class-wc-pos-options.php | 43 +++---- .../receipt/class-wc-pos-template.php | 36 +++--- includes/admin/settings/views/customers.php | 8 +- .../admin/settings/views/receipt_options.php | 35 ++++-- .../admin/settings/views/receipt_template.php | 39 +++--- includes/api/class-wc-pos-customers.php | 18 ++- includes/api/class-wc-pos-i18n.php | 20 ++- includes/api/class-wc-pos-params.php | 8 +- includes/api/class-wc-pos-settings.php | 37 +++++- includes/api/class-wc-pos-templates.php | 17 ++- includes/class-wc-pos-ajax.php | 82 ++++++++++++ includes/class-wc-pos-i18n.php | 2 +- includes/class-wc-pos.php | 5 + includes/updates/update-0.4.6.php | 17 +++ .../views/print/tmpl-receipt-epos-print.php | 8 ++ includes/views/print/tmpl-receipt-escp.php | 33 +++++ includes/wc-pos-functions.php | 2 +- 50 files changed, 832 insertions(+), 267 deletions(-) create mode 100644 assets/js/src/lib/components/print/epos-print.js create mode 100644 assets/js/src/lib/components/print/escp.js create mode 100644 includes/class-wc-pos-ajax.php create mode 100644 includes/updates/update-0.4.6.php create mode 100644 includes/views/print/tmpl-receipt-epos-print.php create mode 100644 includes/views/print/tmpl-receipt-escp.php diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index 338094ec..dffe1640 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -169,10 +169,22 @@ modal { .raw-output { width: 100%; max-height: 200px; - overflow: scroll; - font-family: monospace; + overflow-y: auto; background: $raw-bg; border: 1px solid $raw-border-color; + + h4 { + line-height: 1; + color: $secondary-text-color; + padding: $modal-body-padding-y $modal-body-padding-x 0; + margin: 0; + } + + p { + font-family: monospace; + margin: 0; + padding: $modal-body-padding-y $modal-body-padding-x; + } } } diff --git a/assets/css/src/scss/partials/admin/_settings.scss b/assets/css/src/scss/partials/admin/_settings.scss index 0fd11288..fbf0acd9 100644 --- a/assets/css/src/scss/partials/admin/_settings.scss +++ b/assets/css/src/scss/partials/admin/_settings.scss @@ -91,5 +91,35 @@ settings { } + /** + * Panel + */ + .#{current-module()}-panel { + background: #fff; + border: 1px solid #e5e5e5; + @include box-shadow(0, 0, 0, 0.04); + } + + .#{current-module()}-panel-header { + border-bottom: 1px solid #eee; + padding: 8px; + + h4 { + margin: 0; + line-height: 1; + } + } + + .#{current-module()}-panel-body { + + } + + .#{current-module()}-panel-footer { + border-top: 1px solid #ddd; + background: #f5f5f5; + padding: 8px; + min-height: 28px; + } + } } \ No newline at end of file diff --git a/assets/css/src/scss/partials/admin/settings/_receipts.scss b/assets/css/src/scss/partials/admin/settings/_receipts.scss index 928edb4b..9ce91c85 100644 --- a/assets/css/src/scss/partials/admin/settings/_receipts.scss +++ b/assets/css/src/scss/partials/admin/settings/_receipts.scss @@ -14,18 +14,52 @@ settings { receipt { @at-root { - ##{current-module()}-template-preview { + .#{current-module()}-template-display { - padding: 8px; - border: 1px solid #dcdcdc; - margin: 16px 0; + @include display-flex; + + > div { + @include flex(1); + @include display-flex; + @include flex-direction(column); + + &:first-of-type { + margin-right: 4px; + } + + &:last-of-type { + margin-left: 4px; + } + } + + .#{namespace('settings-panel-body')} { + @include flex(1); + } + + } + + .#{current-module()}-template-editor { + + .#{namespace('settings-panel-body')} { + position: relative; + } + + ##{namespace('ace-editor')} { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + } + + } + + .#{current-module()}-template-preview { iframe { width: 100%; - height: 600px; - background: #fff; + height: 550px; } - } } diff --git a/assets/js/src/apps/settings/customers/view.js b/assets/js/src/apps/settings/customers/view.js index d62a61f7..e208256e 100644 --- a/assets/js/src/apps/settings/customers/view.js +++ b/assets/js/src/apps/settings/customers/view.js @@ -1,10 +1,8 @@ var SettingsView = require('lib/config/settings-view'); -var $ = require('jquery'); var App = require('lib/config/application'); var CustomerSelect = require('lib/behaviors/customer-select'); var Tooltip = require('lib/behaviors/tooltip'); - var View = SettingsView.extend({ behaviors: { @@ -17,9 +15,8 @@ var View = SettingsView.extend({ }, modelEvents: { - 'change:id': 'render', 'change:logged_in_user': function(model, toggle){ - this.ui.customerSelect.prop('disabled', toggle); + this.ui.customerSelect.prop('disabled', !!toggle); } }, @@ -27,17 +24,7 @@ var View = SettingsView.extend({ customerSelect: 'select[data-select="customer"]' }, - onRender: function(){ - var self = this; - - // bind ordinary elements - this.$('input, select, textarea').each(function(){ - var name = $(this).attr('name'); - if(name){ - self.addBinding(null, '*[name="' + name + '"]', name); - } - }); - + onShow: function(){ // disable customer select if logged_in_user checked if( this.model.get('logged_in_user') ){ this.ui.customerSelect.prop('disabled', true); diff --git a/assets/js/src/apps/settings/receipts/options/view.js b/assets/js/src/apps/settings/receipts/options/view.js index ede5b062..1e6ba0d6 100644 --- a/assets/js/src/apps/settings/receipts/options/view.js +++ b/assets/js/src/apps/settings/receipts/options/view.js @@ -3,6 +3,22 @@ var App = require('lib/config/application'); var View = SettingsView.extend({ + ui: { + networkAddress: '#network_printer_address' + }, + + modelEvents: { + 'change:print_method': 'maybeShowNetworkAddress' + }, + + onShow: function(){ + this.maybeShowNetworkAddress( this, this.model.get('print_method') ); + }, + + maybeShowNetworkAddress: function( view, value ){ + this.ui.networkAddress.toggle( value === 'network' ); + } + }); module.exports = View; diff --git a/assets/js/src/apps/settings/receipts/route.js b/assets/js/src/apps/settings/receipts/route.js index 528fc7ad..d8079cbe 100644 --- a/assets/js/src/apps/settings/receipts/route.js +++ b/assets/js/src/apps/settings/receipts/route.js @@ -17,7 +17,8 @@ var Receipts = Route.extend({ initialize: function( options ) { options = options || {}; - this.container = options.container; + this.container = options.layout.getRegion('settings'); + this.footer = options.layout.getRegion('footer'); this.model = options.model; this.collection = this.model.collection; @@ -72,6 +73,7 @@ var Receipts = Route.extend({ showReceiptOptions: function(){ var model = this.collection.get('receipt_options'); + this.showFooter({model: model}); var route = new ReceiptOptionsRoute({ container : this.layout.getRegion('section'), model: model @@ -86,32 +88,54 @@ var Receipts = Route.extend({ model: model }); route.enter(); - } + }, + + showFooter: function(options){ + + _.defaults(options, { + buttons: [ + { + action : 'save', + className : 'button-primary', + icon : 'append' + },{ + type: 'message' + },{ + action : 'restore', + className : 'button-secondary alignright', + icon : 'prepend' + } + ] + }); + + var view = Radio.request('buttons', 'view', options); - //togglePreview: function( args ) { - // var previewArea = _.get(args, ['view', 'ui', 'previewArea']); - // - // if( ! previewArea ){ - // return; - // } - // - // if( ! this.rm ) { - // this.initPreview( previewArea ); - // } - // - // previewArea.slideToggle(); - //}, - // - //initPreview: function( previewArea ){ - // this.rm = new Mn.RegionManager(); - // var region = this.rm.addRegion('preview', previewArea); - // - // var route = new ReceiptRoute({ - // container: region - // }); - // - // route.enter(); - //} + this.listenTo(view, { + 'action:save': function(btn){ + btn.trigger('state', [ 'loading', '' ]); + options.model.save() + .done( function(){ + btn.trigger('state', [ 'success', null ]); + }) + .fail( function(){ + btn.trigger('state', ['error', null ]); + }); + }, + 'action:restore': function(btn){ + btn.trigger('state', [ 'loading', '' ]); + options.model.fetch({ data: { defaults: true } }) + .done( function(){ + btn.trigger('state', [ 'success', null ]); + }) + .fail( function(){ + btn.trigger('state', ['error', null ]); + }); + } + }); + + this.footer.show(view); + + } }); diff --git a/assets/js/src/apps/settings/receipts/template/layout-view.js b/assets/js/src/apps/settings/receipts/template/layout-view.js index a483d7d3..f4672910 100644 --- a/assets/js/src/apps/settings/receipts/template/layout-view.js +++ b/assets/js/src/apps/settings/receipts/template/layout-view.js @@ -1,18 +1,37 @@ var LayoutView = require('lib/config/layout-view'); var App = require('lib/config/application'); +var hbs = require('handlebars'); var View = LayoutView.extend({ - template: function(){ - return '' + - '
    ' + - '
    ' + - ''; + initialize: function(){ + this.template = hbs.compile( this.model.template ); }, + templateHelpers: function(){ + return this.options.template_data; + }, + + ui: { + editor: '#wc_pos-ace-editor' + }, + + /* jshint -W101 */ regions: { - preview : '#wc_pos-receipt-template-preview', - actions : '#wc_pos-receipt-template-actions' + editorActions : '.wc_pos-receipt-template-editor .wc_pos-settings-panel-footer', + preview : '.wc_pos-receipt-template-preview .wc_pos-settings-panel-body', + previewActions : '.wc_pos-receipt-template-preview .wc_pos-settings-panel-footer' + }, + /* jshint +W101 */ + + onShow: function(){ + var editor = window.ace.edit( this.ui.editor[0] ); + editor.$blockScrolling = Infinity; + editor.getSession().setMode('ace/mode/html'); + editor.setValue( this.options.template_data.template, 1 ); + if( ! this.options.template_data.custom ){ + editor.setReadOnly(true); + } } }); diff --git a/assets/js/src/apps/settings/receipts/template/route.js b/assets/js/src/apps/settings/receipts/template/route.js index 5b30e1fc..a9747dbd 100644 --- a/assets/js/src/apps/settings/receipts/template/route.js +++ b/assets/js/src/apps/settings/receipts/template/route.js @@ -1,10 +1,11 @@ var Route = require('lib/config/route'); var Radio = require('backbone.radio'); var LayoutView = require('./layout-view'); -var ReceiptPreview = require('./preview'); -var ReceiptAction = require('./actions'); +var Preview = require('./preview'); +var PreviewActions = require('./actions'); var App = require('lib/config/application'); var $ = require('jquery'); +var polyglot = require('lib/utilities/polyglot'); var ReceiptRoute = Route.extend({ @@ -19,8 +20,8 @@ var ReceiptRoute = Route.extend({ }); }, - fetch: function() { - return $.when( this.fetchOrder(), this.fetchTemplate() ); + fetch: function(){ + return $.when( this.fetchTemplate(), this.fetchOrder() ); }, fetchOrder: function(){ @@ -49,35 +50,96 @@ var ReceiptRoute = Route.extend({ render: function() { this.layout = new LayoutView({ - model: this.model + model: this.model, + template_data: this.template }); this.listenTo( this.layout, 'show', this.showReceiptTemplate ); this.container.show(this.layout); }, showReceiptTemplate: function(){ + this.showReceiptTemplateEditorActions(); this.showReceiptTemplatePreview(); - this.showReceiptTemplateActions(); + this.showReceiptTemplatePreviewActions(); }, showReceiptTemplatePreview: function(){ - var view = new ReceiptPreview({ + var view = new Preview({ model: this.collection.at(0), - receipt_template: this.template + receipt_template: this.template.template }); this.layout.getRegion('preview').show(view); }, - showReceiptTemplateActions: function(){ - var view = new ReceiptAction(); - + showReceiptTemplatePreviewActions: function(){ + var view = new PreviewActions(); this.listenTo( view, 'print', this.print ); - - this.layout.getRegion('actions').show(view); + this.layout.getRegion('previewActions').show(view); }, print: function(){ this.layout.getRegion('preview').currentView.el.contentWindow.print(); + }, + + showReceiptTemplateEditorActions: function(){ + var self = this; + var view = Radio.request('buttons', 'view', { + buttons: this.getEditorActions() + }); + + this.listenTo(view, { + 'action:save': function(btn){ + btn.trigger('state', [ 'loading', '' ]); + self.enter(); + //options.model.save() + // .done( function(){ + // btn.trigger('state', [ 'success', null ]); + // }) + // .fail( function(){ + // btn.trigger('state', ['error', null ]); + // }); + }, + 'action:delete': function(btn){ + btn.trigger('state', [ 'loading', '' ]); + //options.model.fetch({ data: { defaults: true } }) + // .done( function(){ + // btn.trigger('state', [ 'success', null ]); + // }) + // .fail( function(){ + // btn.trigger('state', ['error', null ]); + // }); + } + }); + + this.layout.getRegion('editorActions').show(view); + }, + + getEditorActions: function(){ + if( this.template.custom ){ + return [ + { + action : 'save', + className : 'button-primary', + icon : 'append' + },{ + // type: 'message' + //},{ + action : 'delete', + label : polyglot.t('buttons.delete-template'), + className : 'button-secondary alignright', + icon : 'prepend' + } + ]; + } + + return [ + { + action : 'copy', + label : polyglot.t('buttons.copy-file'), + className : 'button-primary', + icon : 'append' + } + ]; } }); diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index 909fc7c8..a60b5c5f 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -2,6 +2,7 @@ var App = require('lib/config/application'); var Router = require('lib/config/router'); var LayoutView = require('./layout-view'); var General = require('./general/route'); +var Customers = require('./customers/route'); var Checkout = require('./checkout/route'); var Receipts = require('./receipts/route'); var HotKeys = require('./hotkeys/route'); @@ -77,7 +78,7 @@ var SettingsRouter = Router.extend({ showCustomers: function(){ var model = this.collection.get('customers'); this.showFooter({model: model}); - return new Checkout({ + return new Customers({ container : this.layout.getRegion('settings'), model: model }); @@ -94,10 +95,9 @@ var SettingsRouter = Router.extend({ showReceipts: function(){ var model = this.collection.get('receipts'); - this.showFooter({model: model}); return new Receipts({ - container : this.layout.getRegion('settings'), - model: model + model: model, + layout: this.layout }); }, @@ -141,10 +141,24 @@ var SettingsRouter = Router.extend({ this.listenTo(view, { 'action:save': function(btn){ - options.model.save([], { buttons: btn }); + btn.trigger('state', [ 'loading', '' ]); + options.model.save() + .done( function(){ + btn.trigger('state', [ 'success', null ]); + }) + .fail( function(){ + btn.trigger('state', ['error', null ]); + }); }, 'action:restore': function(btn){ - options.model.destroy({ buttons: btn }); + btn.trigger('state', [ 'loading', '' ]); + options.model.fetch({ data: { defaults: true } }) + .done( function(){ + btn.trigger('state', [ 'success', null ]); + }) + .fail( function(){ + btn.trigger('state', ['error', null ]); + }); } }); diff --git a/assets/js/src/apps/status/router.js b/assets/js/src/apps/status/router.js index efe1dc9b..ec1fa760 100644 --- a/assets/js/src/apps/status/router.js +++ b/assets/js/src/apps/status/router.js @@ -51,14 +51,18 @@ var StatusRouter = Router.extend({ }, showTools: function(){ + var model = this.collection.get('tools'); return new Tools({ - container : this.layout.getRegion('settings') + container : this.layout.getRegion('settings'), + model: model }); }, showStatus: function(){ + var model = this.collection.get('status'); return new Status({ - container : this.layout.getRegion('settings') + container : this.layout.getRegion('settings'), + model: model }); } diff --git a/assets/js/src/apps/status/status/route.js b/assets/js/src/apps/status/status/route.js index e1548627..a0597d52 100644 --- a/assets/js/src/apps/status/status/route.js +++ b/assets/js/src/apps/status/status/route.js @@ -7,6 +7,7 @@ var Status = Route.extend({ initialize: function( options ) { options = options || {}; this.container = options.container; + this.model = options.model; }, fetch: function(){ @@ -14,7 +15,7 @@ var Status = Route.extend({ }, render: function() { - var view = new View(); + var view = new View({ model: this.model }); this.container.show(view); } diff --git a/assets/js/src/apps/status/status/view.js b/assets/js/src/apps/status/status/view.js index 2eb21695..36fdd0aa 100644 --- a/assets/js/src/apps/status/status/view.js +++ b/assets/js/src/apps/status/status/view.js @@ -1,19 +1,15 @@ var ItemView = require('lib/config/item-view'); var App = require('lib/config/application'); -var EmulateHTTP = require('lib/behaviors/emulateHTTP'); +var hbs = require('handlebars'); var View = ItemView.extend({ - template: 'settings.status', - attributes: { id: 'wc_pos-settings-status' }, - behaviors: { - EmulateHTTP: { - behaviorClass: EmulateHTTP - } + initialize: function(){ + this.template = hbs.compile( this.model.template ); } }); diff --git a/assets/js/src/apps/status/tools/modal/translation-update.js b/assets/js/src/apps/status/tools/modal/translation-update.js index 4b4d444f..31c81128 100644 --- a/assets/js/src/apps/status/tools/modal/translation-update.js +++ b/assets/js/src/apps/status/tools/modal/translation-update.js @@ -33,6 +33,10 @@ module.exports = ItemView.extend({ url = this.constructURL(), stream = new EventSource(url); + stream.onerror = function(){ + Radio.request('modal', 'error', 'EventSource error'); + }; + stream.onmessage = function(e){ if( e.data === 'complete' ){ this.close(); @@ -42,6 +46,7 @@ module.exports = ItemView.extend({ view.ui.loading.before('

    ' + e.data + '

    '); } }; + }, constructURL: function(){ diff --git a/assets/js/src/apps/status/tools/route.js b/assets/js/src/apps/status/tools/route.js index b7ebeb5e..fbf938f8 100644 --- a/assets/js/src/apps/status/tools/route.js +++ b/assets/js/src/apps/status/tools/route.js @@ -10,10 +10,11 @@ var Tools = Route.extend({ initialize: function( options ) { options = options || {}; this.container = options.container; + this.model = options.model; }, render: function() { - var view = new View(); + var view = new View({ model: this.model }); this.listenTo(view, { 'translation:update': this.openTranslationModal, 'data:delete' : this.openDataDeleteModal diff --git a/assets/js/src/apps/status/tools/view.js b/assets/js/src/apps/status/tools/view.js index 949a9026..515fbd52 100644 --- a/assets/js/src/apps/status/tools/view.js +++ b/assets/js/src/apps/status/tools/view.js @@ -1,15 +1,15 @@ var ItemView = require('lib/config/item-view'); var App = require('lib/config/application'); +var hbs = require('handlebars'); var EmulateHTTP = require('lib/behaviors/emulateHTTP'); var View = ItemView.extend({ - template: 'settings.tools', - attributes: { id: 'wc_pos-settings-tools' }, + behaviors: { EmulateHTTP: { behaviorClass: EmulateHTTP @@ -17,13 +17,17 @@ var View = ItemView.extend({ }, ui: { - translation: '*[data-action="translation"]', - deleteData: '*[data-action="delete-local-data"]' + translation : '*[data-action="translation"]', + deleteData : '*[data-action="delete-local-data"]' }, triggers: { - 'click @ui.translation': 'translation:update', - 'click @ui.deleteData' : 'data:delete' + 'click @ui.translation' : 'translation:update', + 'click @ui.deleteData' : 'data:delete' + }, + + initialize: function(){ + this.template = hbs.compile( this.model.template ); } }); diff --git a/assets/js/src/entities/settings/collection.js b/assets/js/src/entities/settings/collection.js index 4777b2ee..094521ef 100644 --- a/assets/js/src/entities/settings/collection.js +++ b/assets/js/src/entities/settings/collection.js @@ -32,9 +32,7 @@ module.exports = Collection.extend({ parseSettings: function(settings){ return _.map(settings, function(setting){ - var attrs = setting.data || {}; - attrs.id = setting.id; - return new Model( attrs, setting ); + return new Model( setting.data, setting ); }, this); } diff --git a/assets/js/src/entities/settings/model.js b/assets/js/src/entities/settings/model.js index 234f1a0e..8e01411d 100644 --- a/assets/js/src/entities/settings/model.js +++ b/assets/js/src/entities/settings/model.js @@ -1,6 +1,5 @@ var DeepModel = require('lib/config/deep-model'); -//var Radio = require('backbone.radio'); -//var polyglot = require('lib/utilities/polyglot'); +var _ = require('lodash'); module.exports = DeepModel.extend({ @@ -8,36 +7,20 @@ module.exports = DeepModel.extend({ options = options || {}; this.template = options.template; this.sections = options.sections; - } + }, - //updateButtonState: function(options){ - // var success = options.success, - // error = options.error, - // btn = options.buttons; - // - // btn.trigger('state', [ 'loading', '' ]); - // - // options.success = function(model, resp, options){ - // if( success ) { success(model, resp, options); } - // btn.trigger('state', [ 'success', null ]); - // }; - // - // options.error = function(jqxhr, textStatus, errorThrown){ - // if( error ) { error(jqxhr, textStatus, errorThrown); } - // var message = null; - // - // // code 405 = not allowed HTTP methods - // if( jqxhr.status && jqxhr.status === 405 ){ - // message = polyglot.t('messages.legacy') + - // '. ' + polyglot.t('buttons.legacy') + '.'; - // } - // - // // other errors - // if( !message && jqxhr.responseJSON && jqxhr.responseJSON.errors ){ - // message = jqxhr.responseJSON.errors[0].message; - // } - // btn.trigger('state', ['error', message]); - // }; - //} + /** + * https://github.com/jashkenas/backbone/issues/1069 + */ + parse: function(resp) { + if( _.isObject( resp ) ){ + _.keys(this.attributes).forEach(function(key) { + if (resp[key] === undefined) { + resp[key] = undefined; + } + }); + } + return resp; + } }); \ No newline at end of file diff --git a/assets/js/src/lib/behaviors/customer-select.js b/assets/js/src/lib/behaviors/customer-select.js index 1a8f5375..ebb73173 100644 --- a/assets/js/src/lib/behaviors/customer-select.js +++ b/assets/js/src/lib/behaviors/customer-select.js @@ -1,7 +1,6 @@ var Behavior = require('lib/config/behavior'); var App = require('lib/config/application'); var Radio = require('backbone.radio'); -var _ = require('lodash'); var $ = require('jquery'); var hbs = require('handlebars'); @@ -12,15 +11,11 @@ var CustomerSelect = Behavior.extend({ type: 'option', name: 'customers' }); - options.ajaxurl = Radio.request('entities', 'get', { - type: 'option', - name: 'ajaxurl' - }); options.wc_nonce = Radio.request('entities', 'get', { type: 'option', name: 'search_customers_nonce' }); - this.mergeOptions(options, ['guest', 'default', 'ajaxurl', 'wc_nonce']); + this.mergeOptions(options, ['guest', 'default', 'wc_nonce']); }, ui: { @@ -31,14 +26,13 @@ var CustomerSelect = Behavior.extend({ events: { 'stickit:init @ui.select': function( e, name ){ // options - var ajaxurl = this.getOption('ajaxurl'); var nonce = this.getOption('wc_nonce'); var guest = this.getOption('guest'); this.view.select2 = this.view.select2 || {}; this.view.select2[name] = { minimumInputLength: 3, // minimum 3 characters to trigger search ajax: { - url: ajaxurl, + url: window.ajaxurl, dataType: 'json', delay: 250, data: function (params) { @@ -74,19 +68,16 @@ var CustomerSelect = Behavior.extend({ }, onRender: function(){ - // initSelection - if( _.isEmpty( this.ui.select.data('placeholder') ) ){ - this.initSelection(); + this.appendOptions( this.getOption('guest') ); + if( this.getOption('default') ){ + this.appendOptions( this.getOption('default') ); } - + this.ui.select.trigger('change'); }, - initSelection: function(){ - var customer = this.getOption('default') || this.getOption('guest'); + appendOptions: function( customer ){ var name = hbs.helpers.formatCustomerName( customer ); - this.ui.select - .html( $('
    \ No newline at end of file diff --git a/includes/api/class-wc-pos-customers.php b/includes/api/class-wc-pos-customers.php index 0e3c42c1..5d5188ec 100644 --- a/includes/api/class-wc-pos-customers.php +++ b/includes/api/class-wc-pos-customers.php @@ -58,14 +58,28 @@ public function get_customer( $id, $fields = null ){ /** - * Removes the role='customer' restraint - * todo: add this option to settings + * * @param $wp_user_query */ public function wc_pos_api_pre_get_users( $wp_user_query ) { + global $wp_version; $wp_user_query->query_vars[ 'role' ] = ''; + // WordPress 4.4 allows role__in and role__not_in + if( version_compare($wp_version, '4.4', '>=') ) { + $roles = wc_pos_get_option( 'customers', 'customer_roles' ); + + if( is_array( $roles ) && ! in_array( 'all', $roles ) ){ + $wp_user_query->query_vars[ 'role__in' ] = $roles; + } + + // special case: no customer roles + if( is_null( $roles ) ){ + // ? + } + } + if ( isset( $_GET[ 'filter' ] ) ) { // add support for filter[in] diff --git a/includes/api/class-wc-pos-i18n.php b/includes/api/class-wc-pos-i18n.php index 569b8e58..46937a82 100644 --- a/includes/api/class-wc-pos-i18n.php +++ b/includes/api/class-wc-pos-i18n.php @@ -89,7 +89,9 @@ private function plural(){ * @return array */ private function common_titles(){ - return array(); + return array( + 'more-info' => __( 'More info', 'woocommerce-pos' ), + ); } /** @@ -140,12 +142,16 @@ private function frontend_titles(){ /** * @return array */ - private function common_buttons(){ + private function common_buttons() { return array( /* translators: woocommerce */ - 'save' => __( 'Save Changes', 'woocommerce' ), - /* translators: woocommerce */ - 'close' => __( 'Close' ), + 'save' => __( 'Save Changes', 'woocommerce' ), + /* translators: wordpress */ + 'close' => __( 'Close' ), + /* translators: wordpress */ + 'disable' => __( 'Disable' ), + /* translators: wordpress */ + 'enable' => __( 'Enable' ) ); } @@ -155,6 +161,10 @@ private function common_buttons(){ private function admin_buttons(){ return array( 'restore' => _x( 'Restore defaults', 'restore default settings', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'delete-template' => __( 'Delete template file', 'woocommerce' ), + /* translators: woocommerce */ + 'copy-file' => __( 'Copy file to theme', 'woocommerce' ), ); } diff --git a/includes/api/class-wc-pos-params.php b/includes/api/class-wc-pos-params.php index 99ea75dd..66ddcf26 100644 --- a/includes/api/class-wc-pos-params.php +++ b/includes/api/class-wc-pos-params.php @@ -58,7 +58,8 @@ private function common_params(){ 'customers' => $this->customers(), 'debug' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG, 'emulateHTTP' => get_option( 'woocommerce_pos_emulateHTTP' ) === '1', - 'idbVersion' => WC_POS_Admin_Settings::get_idb_version() + 'idbVersion' => WC_POS_Admin_Settings::get_idb_version(), + 'store' => array( 'name' => get_bloginfo( 'name' ) ) ); } @@ -73,7 +74,6 @@ private function frontend_params(){ 'hotkeys' => wc_pos_get_option( 'hotkeys', 'hotkeys' ), 'menu' => $this->menu(), 'shipping' => $this->shipping_labels(), - 'store' => array( 'name' => get_bloginfo( 'name' ) ), 'tabs' => $this->product_tabs(), 'tax' => $this->tax(), 'tax_classes' => WC_POS_Tax::tax_classes(), @@ -170,9 +170,9 @@ private function currency_format() { */ private function customers() { - $user_id = wc_pos_get_option( 'general', 'logged_in_user' ) ? + $user_id = wc_pos_get_option( 'customers', 'logged_in_user' ) ? get_current_user_id() : - wc_pos_get_option( 'general', 'default_customer' ); + wc_pos_get_option( 'customers', 'default_customer' ); if( $user_id ) { $user = get_userdata($user_id); diff --git a/includes/api/class-wc-pos-settings.php b/includes/api/class-wc-pos-settings.php index a0e75b71..ad2d45c3 100644 --- a/includes/api/class-wc-pos-settings.php +++ b/includes/api/class-wc-pos-settings.php @@ -45,11 +45,19 @@ public function register_routes( array $routes ) { /** * @param string $id + * @param null $wc_pos_admin * @return array * - * @todo move business logic to WC_POS_Admin_Settings + * @todo refactor, get_settings returns payload, edit_settings returns data + * @todo move business logic to WC_POS_Admin_Settings? */ - public function get_settings( $id = '', $wc_pos_admin = null ){ + public function get_settings( $id = '', $wc_pos_admin = null, $defaults = false ){ + + // @todo remove this special hack for 'restore default settings' + if( $defaults ){ + return $this->delete_settings( $id ); + } + $payload = $handlers = array(); switch ($wc_pos_admin) { @@ -78,9 +86,15 @@ public function get_settings( $id = '', $wc_pos_admin = null ){ /** * @param string $id + * @param $data * @return array|WP_Error + * @throws WC_API_Exception */ - public function edit_settings( $id = '' ){ + public function edit_settings( $id = '', $data ){ + + if( !$data ){ + throw new WC_API_Exception( 'woocommerce_pos_api_missing_settings_data', sprintf( __( 'No %1$s data specified to edit %1$s', 'woocommerce' ), 'settings' ), 400 ); + } $handler = $this->get_settings_handler( $id ); @@ -88,9 +102,11 @@ public function edit_settings( $id = '' ){ return $handler; } - // todo bump idbVersion + if( $handler->flush_local_data($data) ){ + WC_POS_Admin_Settings::bump_idb_version(); + } - return $handler->set( WC_POS_API::get_raw_data() ); + return $handler->set( $data ); } @@ -106,7 +122,9 @@ public function delete_settings( $id = '' ){ return $handler; } - // todo bump idbVersion + if( $handler->flush_local_data() ){ + WC_POS_Admin_Settings::bump_idb_version(); + } return $handler->delete(); } @@ -146,6 +164,13 @@ private function get_settings_handler( $id ){ return new WC_POS_Admin_Settings_Gateways( $gateway_id ); } + // special case: receipt_ + $receipts_section = preg_replace( '/^receipt_/', '', strtolower( $id ), 1, $count ); + if($count) { + $class = 'WC_POS_Admin_Settings_Receipt_' . ucfirst( $receipts_section ); + return new $class(); + } + // else, find handler by id else { $handlers = (array) WC_POS_Admin_Settings::handlers(); diff --git a/includes/api/class-wc-pos-templates.php b/includes/api/class-wc-pos-templates.php index 275d4221..4aa1b281 100644 --- a/includes/api/class-wc-pos-templates.php +++ b/includes/api/class-wc-pos-templates.php @@ -163,7 +163,7 @@ private function reduce_templates_array( $result, $key ) { * @param $file * @return string */ - public function template_output( $file ) { + public function template_output( $file, $trim = true ) { $template = ''; if( is_readable( $file ) ){ @@ -173,7 +173,7 @@ public function template_output( $file ) { ob_end_clean(); } - return wc_pos_trim_html_string( $template ); + return $trim ? wc_pos_trim_html_string( $template ) : $template ; } /** @@ -199,9 +199,16 @@ public function get_modal( $id = '' ){ /** * */ - public function get_receipt_template(){ - $file = $this->locate_print_receipt_template(); - return $this->template_output( $file ); + public function get_receipt_template() { + $default_path = ''; + $path = $this->locate_print_receipt_template(); + + return array( + 'path' => $path, + 'default_path' => $default_path, + 'custom' => $path != $default_path, + 'template' => $this->template_output( $path, false ) + ); } } \ No newline at end of file diff --git a/includes/class-wc-pos-ajax.php b/includes/class-wc-pos-ajax.php new file mode 100644 index 00000000..1937db28 --- /dev/null +++ b/includes/class-wc-pos-ajax.php @@ -0,0 +1,82 @@ + + * @link http://www.woopos.com.au + */ + +class WC_POS_Ajax { + + /** + * Constructor + */ + public function __construct() { + + $ajax_events = array( + 'toggle_legacy_server' => 'WC_POS_Status' + ); + + foreach ( $ajax_events as $ajax_event => $class ) { + // check_ajax_referer + add_action( 'wp_ajax_wc_pos_' . $ajax_event, array( $this, 'check_ajax_referer' ), 1 ); + // trigger method + add_action( 'wp_ajax_wc_pos_' . $ajax_event, array( $class, $ajax_event ) ); + } + } + + /** + * Verifies the AJAX request + */ + static public function check_ajax_referer(){ + $pass = check_ajax_referer( WC_POS_PLUGIN_NAME, 'security', false ); + if(!$pass){ + $result = new WP_Error( + 'woocommerce_pos_invalid_nonce', + __( 'Invalid security nonce', 'woocommerce-pos' ), + array( 'status' => 401 ) + ); + self::response($result); + } + } + + + /** + * The below functions closely resemble output from the WC REST API + * This keeps response handling in the POS somewhat consistent + * between API and AJAX calls + * + * Output the result + * @param $result + */ + static public function response($result){ + header( 'Content-Type: application/json; charset=utf-8' ); + if (is_wp_error($result)) { + $data = $result->get_error_data(); + if ( is_array( $data ) && isset( $data['status'] ) ) { + status_header( $data['status'] ); + } + $result = self::error_to_array( $result ); + } + echo json_encode( $result ); + die(); + } + /** + * Convert wp_error to array + * @param $error + * @return array + */ + static private function error_to_array( $error ) { + $errors = array(); + foreach ( (array) $error->errors as $code => $messages ) { + foreach ( (array) $messages as $message ) { + $errors[] = array( 'code' => $code, 'message' => $message ); + } + } + return array( 'errors' => $errors ); + } + +} \ No newline at end of file diff --git a/includes/class-wc-pos-i18n.php b/includes/class-wc-pos-i18n.php index a5d0d75f..ce7378ca 100755 --- a/includes/class-wc-pos-i18n.php +++ b/includes/class-wc-pos-i18n.php @@ -144,7 +144,7 @@ public function upgrader_pre_download( $reply, $package, $upgrader ) { */ public function update_translations() { // security - WC_POS_Server::check_ajax_referer(); + WC_POS_AJAX::check_ajax_referer(); header( "Content-Type: text/event-stream" ); header( "Cache-Control: no-cache" ); diff --git a/includes/class-wc-pos.php b/includes/class-wc-pos.php index f39b06a3..a608b60c 100644 --- a/includes/class-wc-pos.php +++ b/includes/class-wc-pos.php @@ -61,6 +61,11 @@ public function init() { new WC_POS_Products(); new WC_POS_Customers(); + // ajax only + if( is_admin() && (defined('DOING_AJAX') && DOING_AJAX) ){ + new WC_POS_AJAX(); + } + // admin only if( is_admin() && !(defined('DOING_AJAX') && DOING_AJAX) ){ new WC_POS_Admin(); diff --git a/includes/updates/update-0.4.6.php b/includes/updates/update-0.4.6.php new file mode 100644 index 00000000..78cf347f --- /dev/null +++ b/includes/updates/update-0.4.6.php @@ -0,0 +1,17 @@ + wc_pos_get_option( 'customers', 'default_customer' ); + +// wc_pos_get_option( 'general', 'logged_in_user' ) +// => wc_pos_get_option( 'customers', 'logged_in_user' ) \ No newline at end of file diff --git a/includes/views/print/tmpl-receipt-epos-print.php b/includes/views/print/tmpl-receipt-epos-print.php new file mode 100644 index 00000000..7be1f9cd --- /dev/null +++ b/includes/views/print/tmpl-receipt-epos-print.php @@ -0,0 +1,8 @@ + + + Intelligent Printer + 201234567890 + + 8PDw8A8PDw/w8PDwDw8PD/Dw8PAPDw8P8PDw8A8PDw/w8PDwDw8PD/Dw8PAPDw8P + + \ No newline at end of file diff --git a/includes/views/print/tmpl-receipt-escp.php b/includes/views/print/tmpl-receipt-escp.php new file mode 100644 index 00000000..5ffd84da --- /dev/null +++ b/includes/views/print/tmpl-receipt-escp.php @@ -0,0 +1,33 @@ + Date: Wed, 20 Jan 2016 14:53:32 +0800 Subject: [PATCH 016/169] refactor order entities --- assets/js/src/apps/pos/cart/route.js | 11 +- .../apps/pos/cart/views/line/views/item.js | 26 +- .../views/item/views/drawer/variation.js | 2 +- .../pos/products/views/item/views/product.js | 2 +- assets/js/src/entities/cart/collection.js | 182 ++--- assets/js/src/entities/cart/model.js | 268 ------- .../js/src/entities/cart/models/abstract.js | 93 +++ assets/js/src/entities/cart/models/fee.js | 15 + assets/js/src/entities/cart/models/product.js | 109 +++ .../js/src/entities/cart/models/shipping.js | 16 + assets/js/src/entities/orders/collection.js | 59 +- assets/js/src/entities/orders/model.js | 304 ++------ assets/js/src/entities/tax/collection.js | 132 ++++ assets/js/src/entities/tax/model.js | 30 + .../js/src/lib/components/print/epos-print.js | 236 +++---- assets/js/src/lib/config/dual-model.js | 4 +- includes/admin/class-wc-pos-abstract.php | 16 +- includes/admin/class-wc-pos-settings.php | 2 + includes/admin/class-wc-pos-status.php | 2 + .../admin/settings/class-wc-pos-checkout.php | 2 +- includes/admin/settings/views/tools.php | 3 + includes/class-wc-pos-gateways.php | 8 +- includes/class-wc-pos-tax.php | 2 - includes/views/pos/cart/tmpl-item.php | 7 +- readme.txt | 21 +- tests/unit/js/data/order.json | 155 ++++ .../apps/pos/cart/{route.js => route.spec.js} | 0 tests/unit/js/spec/apps/pos/posapp.spec.js | 3 - .../unit/js/spec/entities/cart/collection.js | 130 ---- .../js/spec/entities/cart/collection.spec.js | 89 +++ tests/unit/js/spec/entities/cart/model.js | 660 ------------------ .../entities/cart/models/abstract.spec.js | 108 +++ .../js/spec/entities/cart/models/fee.spec.js | 95 +++ .../spec/entities/cart/models/product.spec.js | 581 +++++++++++++++ .../entities/cart/models/shipping.spec.js | 259 +++++++ tests/unit/js/spec/entities/entities.spec.js | 9 - .../js/spec/entities/orders/collection.js | 18 - .../spec/entities/orders/collection.spec.js | 31 + tests/unit/js/spec/entities/orders/model.js | 117 ---- .../js/spec/entities/orders/model.spec.js | 122 ++++ .../products/{model.js => model.spec.js} | 0 .../entities/{service.js => service.spec.js} | 0 .../js/spec/entities/tax/collection.spec.js | 41 ++ tests/unit/js/spec/entities/tax/model.spec.js | 10 + .../{collection.js => collection.spec.js} | 0 tests/unit/js/spec/lib/components.spec.js | 4 - .../{buttons.js => buttons.spec.js} | 0 .../js/spec/lib/components/customer-select.js | 75 -- tests/unit/js/spec/lib/config.spec.js | 5 - ...-collection.js => dual-collection.spec.js} | 0 .../{dual-model.js => dual-model.spec.js} | 0 .../lib/config/{model.js => model.spec.js} | 0 tests/unit/js/spec/lib/utilities.spec.js | 4 - ...-helpers.js => handlebars-helpers.spec.js} | 0 .../lib/utilities/{utils.js => utils.spec.js} | 0 55 files changed, 2215 insertions(+), 1853 deletions(-) delete mode 100644 assets/js/src/entities/cart/model.js create mode 100644 assets/js/src/entities/cart/models/abstract.js create mode 100644 assets/js/src/entities/cart/models/fee.js create mode 100644 assets/js/src/entities/cart/models/product.js create mode 100644 assets/js/src/entities/cart/models/shipping.js create mode 100644 assets/js/src/entities/tax/collection.js create mode 100644 assets/js/src/entities/tax/model.js create mode 100644 tests/unit/js/data/order.json rename tests/unit/js/spec/apps/pos/cart/{route.js => route.spec.js} (100%) delete mode 100644 tests/unit/js/spec/apps/pos/posapp.spec.js delete mode 100644 tests/unit/js/spec/entities/cart/collection.js create mode 100644 tests/unit/js/spec/entities/cart/collection.spec.js delete mode 100644 tests/unit/js/spec/entities/cart/model.js create mode 100644 tests/unit/js/spec/entities/cart/models/abstract.spec.js create mode 100644 tests/unit/js/spec/entities/cart/models/fee.spec.js create mode 100644 tests/unit/js/spec/entities/cart/models/product.spec.js create mode 100644 tests/unit/js/spec/entities/cart/models/shipping.spec.js delete mode 100644 tests/unit/js/spec/entities/entities.spec.js delete mode 100644 tests/unit/js/spec/entities/orders/collection.js create mode 100644 tests/unit/js/spec/entities/orders/collection.spec.js delete mode 100644 tests/unit/js/spec/entities/orders/model.js create mode 100644 tests/unit/js/spec/entities/orders/model.spec.js rename tests/unit/js/spec/entities/products/{model.js => model.spec.js} (100%) rename tests/unit/js/spec/entities/{service.js => service.spec.js} (100%) create mode 100644 tests/unit/js/spec/entities/tax/collection.spec.js create mode 100644 tests/unit/js/spec/entities/tax/model.spec.js rename tests/unit/js/spec/entities/variations/{collection.js => collection.spec.js} (100%) delete mode 100644 tests/unit/js/spec/lib/components.spec.js rename tests/unit/js/spec/lib/components/{buttons.js => buttons.spec.js} (100%) delete mode 100644 tests/unit/js/spec/lib/components/customer-select.js delete mode 100644 tests/unit/js/spec/lib/config.spec.js rename tests/unit/js/spec/lib/config/{dual-collection.js => dual-collection.spec.js} (100%) rename tests/unit/js/spec/lib/config/{dual-model.js => dual-model.spec.js} (100%) rename tests/unit/js/spec/lib/config/{model.js => model.spec.js} (100%) delete mode 100644 tests/unit/js/spec/lib/utilities.spec.js rename tests/unit/js/spec/lib/utilities/{handlebars-helpers.js => handlebars-helpers.spec.js} (100%) rename tests/unit/js/spec/lib/utilities/{utils.js => utils.spec.js} (100%) diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 76041044..160fe5ce 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -145,17 +145,10 @@ var CartRoute = Route.extend({ // this.layout.getRegion('totals').currentView.showDiscountRow(); //}, 'action:fee': function(){ - this.order.cart.addToCart({ - type : 'fee', - title : polyglot.t('titles.fee') - }); + this.order.cart.add( null, { type: 'fee' } ); }, 'action:shipping': function(){ - this.order.cart.addToCart({ - type : 'shipping', - method_title: polyglot.t('titles.shipping'), - method_id : '' // todo: settings - }); + this.order.cart.add( null, { type: 'shipping' }); }, 'action:checkout': function(){ this.navigate('checkout/' + this.order.id, { trigger: true }); diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index a12855a9..7ba3ef31 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -19,9 +19,10 @@ module.exports = FormView.extend({ }, templateHelpers: function(){ - var type = this.model.get('type'); return { - product: (type !== 'shipping' && type !== 'fee') + product : this.model.type === 'product', + shipping : this.model.type === 'shipping', + fee : this.model.type === 'fee' }; }, @@ -49,11 +50,6 @@ module.exports = FormView.extend({ 'click @ui.more' : 'drawer:toggle' }, - modelEvents: { - 'change:title' : 'save', - 'change:method_title' : 'save' - }, - bindings: { 'input[name="quantity"]' : { observe: 'quantity', @@ -62,10 +58,12 @@ module.exports = FormView.extend({ }, onSet: Utils.unformat }, - '*[data-name="title"]' : { - observe: 'title', - events: ['blur'] - }, + + // product: name, shipping: method_title, fee: title + '*[data-name="name"]' : { observe: 'name', events: ['blur'] }, + '*[data-name="method_title"]' : {observe: 'method_title', events: ['blur']}, + '*[data-name="title"]' : { observe: 'title', events: ['blur'] }, + 'dl.meta': { observe: 'meta', updateMethod: 'html', @@ -77,7 +75,6 @@ module.exports = FormView.extend({ return row; } }, - '*[data-name="method_title"]': 'method_title', 'input[name="item_price"]': { observe: 'item_price', onGet: Utils.formatNumber, @@ -104,11 +101,6 @@ module.exports = FormView.extend({ } }, - save: function(){ - console.log(arguments); - this.model.save(); - }, - removeItem: function(e) { if(e) { e.preventDefault(); } var self = this; diff --git a/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js b/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js index 446479bc..ddbf47d0 100644 --- a/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js +++ b/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js @@ -22,7 +22,7 @@ var Item = ItemView.extend({ addToCart: function(e){ e.preventDefault(); - Radio.request('router', 'add:to:cart', {model: this.model}); + Radio.request('router', 'add:to:cart', this.model); }, templateHelpers: function(){ diff --git a/assets/js/src/apps/pos/products/views/item/views/product.js b/assets/js/src/apps/pos/products/views/item/views/product.js index 02a9179b..f40b2577 100644 --- a/assets/js/src/apps/pos/products/views/item/views/product.js +++ b/assets/js/src/apps/pos/products/views/item/views/product.js @@ -36,7 +36,7 @@ var Item = ItemView.extend({ addToCart: function(e){ e.preventDefault(); - Radio.request('router', 'add:to:cart', {model: this.model}); + Radio.request('router', 'add:to:cart', this.model); }, variationsPopover: function(e){ diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index 34fff8aa..d59e82d9 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -1,150 +1,76 @@ -var IndexedDBCollection = require('lib/config/idb-collection'); -var Model = require('./model'); -var _ = require('lodash'); var bb = require('backbone'); +var _ = require('lodash'); + +var subclasses = { + product : require('./models/product'), + shipping : require('./models/shipping'), + fee : require('./models/fee') +}; -module.exports = IndexedDBCollection.extend({ - model: Model, - name: 'cart', - indexes: [ - {name: 'local_id', keyPath: 'local_id', unique: true}, - {name: 'order', keyPath: 'order', unique: false}, - {name: 'type', keyPath: 'type', unique: false} - ], +module.exports = bb.Collection.extend({ /** - * Whitelist of attributes taken from product model + * Order cart: products, then shipping, then fees */ - productAttributes: [ - 'order', - 'title', - 'local_id', - 'product_id', - 'type', - 'price', - 'regular_price', - 'sale_price', - 'taxable', - 'tax_status', - 'tax_class', - 'attributes', - 'meta', // variation meta - 'method_title', // shipping - 'method_id' // shipping - ], - comparator: function( model ){ - var type = model.get( 'type' ); - if( type === 'fee' ) { return 2; } - if( type === 'shipping' ) { return 1; } + if( model.type === 'fee' ) { return 2; } + if( model.type === 'shipping' ) { return 1; } return 0; }, - /** - * If collection has order_id, query idb for index: 'order' = order_id - * onSuccess add items to collection - */ - fetchCartItems: function () { - if(!this.order_id){ - return; - } - - var onSuccess = this.add.bind(this); - var keyRange = this.db.store.makeKeyRange({ - only: this.order_id - }); - - this.db.store.query(onSuccess, { - index: 'order', - keyRange: keyRange - }); + model: function(attributes, options){ + var type = _.get( options, ['type'], 'product' ); + return new subclasses[type](attributes, options); }, - // convenience method to sum attributes in collection - sum: function(attribute, type){ - var col = this.toJSON(); - if(type){ col = _.where(col, {type: type}); } - return _.pluck(col, attribute).reduce(function(a, b){return a + b;}, 0); + initialize: function(models, options){ + options = options || {}; + this.order = options.order; }, /** - * add/increase item - * also prune attributes + * Cart items should always be init with attributes, not bb.Model + * - convert product models to attributes + * - parse attributes, eg: productModel.id = cartModel.product_id + * - if count = 1 for product id, bump quantity */ - /* jshint -W071, -W074 */ - addToCart: function(options){ - options = options || {}; - var model, attributes = options.model || options; - if(attributes instanceof bb.Model){ - attributes = attributes.toJSON(); - } - - if(attributes.id){ - model = this.findWhere({ product_id: attributes.id }); - attributes.product_id = attributes.id; - delete attributes.id; - } - - if(model){ - model.quantity('increase'); - } else { - model = this._addToCart(attributes); - } - - model.trigger('pulse'); - }, - /* jshint +W071, +W074 */ - - _addToCart: function(attributes){ - attributes.order = this.order_id; - - // turn variation attributes into line item meta - if(attributes.type === 'variation'){ - attributes.meta = _.map(attributes.attributes, function(variant, idx){ - return { - key: ++idx, - label: variant.name, - value: variant.option - }; - }); - } - - return this.add(_.pick(attributes, this.productAttributes)); - }, - - itemizedTax: function(){ - var items = _.clone(this.toJSON(), true); - var taxes = _.map(items, function(item){ - if(!item.tax) { return; } - _.each(item.tax, function(tax){ - tax.shipping = item.type === 'shipping' ? tax.total : 0 ; - }); - return item.tax; - }); - var obj = this.sumTaxes(taxes); - - // convert obj to array to be consistent with WC REST API output - var arr = []; - _.each(obj, function(value, key){ - //value.rate_id = parseInt(key, 10); - value.rate_id = key.toString(); // make sure it's a string - arr.push(value); + add: function( models, options ){ + var self = this, + parsedAttrs = [], + type = _.get( options, ['type'], 'product' ); + + models = !_.isArray(models) ? [models] : models; + + _.each(models, function(model){ + var attrs = model instanceof bb.Model ? model.toJSON() : model; + attrs = subclasses[type].prototype.parse( attrs ); + if( type === 'product' ){ + var products = self.where({ product_id: attrs.product_id }); + if( products.length === 1 ){ + products[0].quantity('increase').trigger('pulse'); + return; + } + } + return parsedAttrs.push(attrs); }); - return arr; + var model = bb.Collection.prototype.add.call(this, parsedAttrs, options); + if( model instanceof bb.Model ){ + model.trigger('pulse'); + } + return model; }, - sumTaxes: function(taxes){ - return _.reduce(taxes, function(result, tax){ - return _.merge(result, tax, function(a, b){ - if(a){ - b.total += a.total; - b.subtotal += a.subtotal; - b.shipping += a.shipping; - } - return b; - }); - }, {}); + /** + * convenience method to sum attributes in cart + */ + sum: function(attribute, type){ + return this.reduce( function( sum, model ){ + if( type && type !== model.type ){ + return sum; + } + return sum + parseFloat( model.get(attribute) ); + }, 0 ); } }); \ No newline at end of file diff --git a/assets/js/src/entities/cart/model.js b/assets/js/src/entities/cart/model.js deleted file mode 100644 index 86553d74..00000000 --- a/assets/js/src/entities/cart/model.js +++ /dev/null @@ -1,268 +0,0 @@ -var Model = require('lib/config/model'); -var debug = require('debug')('cartItem'); -var Utils = require('lib/utilities/utils'); -var _ = require('lodash'); -var Radio = require('backbone.radio'); - -module.exports = Model.extend({ - idAttribute: 'local_id', - - defaults : { - 'subtotal' : 0, - 'subtotal_tax' : 0, - 'total_tax' : 0, - 'total' : 0, - 'item_tax' : 0, - 'quantity' : 1, - 'taxable' : true, - 'tax_class' : '' - }, - - /* jshint -W074 */ - initialize: function() { - - // attach tax settings - this.tax = Radio.request('entities', 'get', { - type: 'option', - name: 'tax' - }) || {}; - this.tax_rates = Radio.request('entities', 'get', { - type: 'option', - name: 'tax_rates' - }) || {}; - - // update on change to quantity, item_price ... - this.on( - 'change:quantity ' + - 'change:item_price ' + - 'change:regular_price ' + - 'change:taxable ' + - 'change:tax_class', - this.updateLineTotals ); - - // set item price on init, this wil kick off updateLineTotals - if( this.get('item_price') === undefined ) { - var price = parseFloat( this.get('price') ); - this.set({ 'item_price': _.isNaN(price) ? 0 : price }); - } - }, - /* jshint +W074 */ - - /* jshint -W071, -W074 */ - /* todo: too many statements, too complex */ - updateLineTotals: function() { - var quantity = this.get('quantity'), - item_price = this.get('item_price'), - type = this.get('type'), - regular_price = parseFloat( this.get('regular_price')), - tax_class = this.get('tax_class'), - item_tax, - item_subtotal_tax, - rates; - - // make a copy of the tax rates for this product - if(this.tax_rates[tax_class]){ - rates = _.cloneDeep(this.tax_rates[tax_class]); - } - - // if shipping or fee - if( type === 'shipping' || type === 'fee' ) { - regular_price = item_price; - } - - // calc taxes - item_tax = this.calcTax({ - price : item_price, - quantity : quantity, - rates : rates - }); - - item_subtotal_tax = this.calcTax({ - price : regular_price, - quantity : quantity, - rates : rates, - subtotal : true - }); - - // if price does not include tax - if( this.tax.prices_include_tax === 'yes' ) { - regular_price -= item_subtotal_tax; - item_price -= item_tax; - } - - // create totals object - var totals = { - 'item_subtotal' : Utils.round( regular_price, 4 ), - 'item_subtotal_tax' : Utils.round( item_subtotal_tax, 4 ), - 'item_tax' : Utils.round( item_tax, 4 ), - 'subtotal' : Utils.round( regular_price * quantity, 4 ), - 'subtotal_tax' : Utils.round( item_subtotal_tax * quantity, 4 ), - 'total_tax' : Utils.round( item_tax * quantity, 4 ), - 'total' : Utils.round( item_price * quantity, 4 ) - }; - - this.save(totals); - debug('update totals', totals); - }, - /* jshint +W071, +W074 */ - - /** - * Calculate the line item tax total - * based on the calc_tax function in woocommerce/includes/class-wc-tax.php - */ - calcTax: function(options) { - var item_tax = 0; - - if(this.tax.calc_taxes === 'yes' && this.get('taxable') && options.rates) { - if( this.tax.prices_include_tax === 'yes' ) { - item_tax = this.calcInclusiveTax(options); - } else { - item_tax = this.calcExclusiveTax(options); - } - } else { - this.set('tax', undefined); - } - - return item_tax; - }, - - /** - * Calculate the line item tax total - * based on the calc_inclusive_tax function in - * woocommerce/includes/class-wc-tax.php - */ - /* todo: too many statements */ - /* jshint -W071 */ - calcInclusiveTax: function(options) { - var regular_tax_rates = 0, - compound_tax_rates = 0, - non_compound_price = 0, - tax_amount = 0, - item_tax = 0, - price = options.price, - rates = options.rates, - qty = options.quantity; - - _.each(rates, function(rate, key) { - if( this.get('type') === 'shipping' && rate.shipping === 'no' ){ - delete rates[key]; - return; - } - if ( rate.compound === 'yes' ) { - compound_tax_rates = compound_tax_rates + parseFloat(rate.rate); - } else { - regular_tax_rates = regular_tax_rates + parseFloat(rate.rate); - } - }, this); - - var regular_tax_rate = 1 + ( regular_tax_rates / 100 ); - var compound_tax_rate = 1 + ( compound_tax_rates / 100 ); - non_compound_price = price / compound_tax_rate; - - _.each(rates, function(rate) { - var the_rate = parseFloat(rate.rate) / 100; - var the_price = 0; - - if ( rate.compound === 'yes' ) { - the_price = price; - the_rate = the_rate / compound_tax_rate; - } else { - the_price = non_compound_price; - the_rate = the_rate / regular_tax_rate; - } - - var net_price = price - ( the_rate * the_price ); - tax_amount = price - net_price; - - // set the itemized taxes - var prop = options.subtotal ? 'subtotal' : 'total'; - rate[prop] = Utils.round( tax_amount * qty, 4 ); - - // sum item taxes - item_tax += tax_amount; - - }, this); - - // itemized tax - if( !_.isEmpty(rates) ){ - this.set('tax', rates); - } - - // return the item tax - return item_tax; - }, - /* jshint +W071 */ - - /** - * Calculate the line item tax total - * based on the calc_exclusive_tax function in - * woocommerce/includes/class-wc-tax.php - */ - calcExclusiveTax: function(options) { - var taxes = [], - pre_compound_total = 0, - tax_amount = 0, - item_tax = 0, - price = options.price, - rates = options.rates, - qty = options.quantity; - - // multiple taxes - _.each(rates, function(rate, key) { - tax_amount = 0; - if( this.get('type') === 'shipping' && rate.shipping === 'no' ){ - delete rates[key]; - return; - } - if ( rate.compound !== 'yes' ) { - tax_amount = price * ( parseFloat(rate.rate) / 100 ); - } - taxes[ key ] = tax_amount; - }, this); - - if( taxes.length > 0 ) { - pre_compound_total = taxes.reduce(function(sum, num) {return sum + num;}); - } - - // compound taxes - _.each(rates, function(rate, key) { - if ( rate.compound === 'yes' ) { - var the_price_inc_tax = price + pre_compound_total; - taxes[ key ] = the_price_inc_tax * ( parseFloat(rate.rate) / 100 ); - } - - // set the itemized taxes - var prop = options.subtotal ? 'subtotal' : 'total'; - rate[prop] = Utils.round( taxes[ key ] * qty, 4 ); - - // sum item taxes - item_tax += taxes[ key ]; - - }, this); - - // itemized tax - if( !_.isEmpty(rates) ){ - this.set('tax', rates); - } - - // return the item tax - return item_tax; - }, - - // Convenience method to increase or decrease quantity - quantity: function( type ) { - var quantity = this.get('quantity'); - this.set('quantity', (type === 'increase' ? ++quantity : --quantity) ); - return this; - }, - - // Convenience method to sum attributes - sum: function(array){ - var sum = 0; - for (var i = 0; i < array.length; i++) { - sum += this.get(array[i]); - } - return Utils.round(sum, 4); - } - -}); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/abstract.js b/assets/js/src/entities/cart/models/abstract.js new file mode 100644 index 00000000..905b3c92 --- /dev/null +++ b/assets/js/src/entities/cart/models/abstract.js @@ -0,0 +1,93 @@ +var bb = require('backbone'); +var Utils = require('lib/utilities/utils'); +var _ = require('lodash'); +var Taxes = require('../../tax/collection'); +var debug = require('debug')('cartItem'); + +module.exports = bb.Model.extend({ + + constructor: function(){ + // set attributes, parse if required + bb.Model.apply(this, arguments); + + // copy tax info from order collection + this.tax_options = _.get( this, ['collection', 'order', 'tax'], {} ); + + // attach tax_rates collection + if( this.tax_options.calc_tax === 'yes' ){ + this.attachTaxes({ + prices_include_tax: this.tax_options.prices_include_tax + }); + } + + // update on change item_price + this.on( 'change:item_price', this.updateTotals ); + + // set item price on init, this wil kick off updateLineTotals + if( this.get('item_price') === undefined ) { + var price = parseFloat( this.get('price') ); + this.set({ 'item_price': _.isNaN(price) ? 0 : price }); + } + }, + + attachTaxes: function(options){ + this.taxes = new Taxes( [], _.extend( { line_item : this }, options ) ); + this.on( 'change:taxable change:tax_class', function(){ + this.resetTaxes(); + this.updateTotals(); + }, this ); + this.resetTaxes(); + }, + + updateTotals: function(){ + var item_price = this.get('item_price'), + item_tax = 0; + + if( this.taxes ){ + this.taxes.calcTaxes( this.get('item_price') ); + item_tax = this.taxes.sum('total'); + } + + // if price does not include tax + if( this.tax_options.prices_include_tax === 'yes' ) { + item_price -= item_tax; + } + + // create totals object + var totals = { + 'total_tax' : Utils.round( item_tax, 4 ), + 'total' : Utils.round( item_price, 4 ) + }; + + this.set(totals); + }, + + set: function(){ + debug('update cart item', this); + bb.Model.prototype.set.apply(this, arguments); + }, + + resetTaxes: function(){ + var tax_rates = null; + + if( this.get('taxable') ){ + tax_rates = _.get( + this, ['collection', 'order', 'tax_rates', this.get('tax_class') ], null + ); + } + + this.taxes.reset( tax_rates, { parse: true } ); + }, + + /** + * Convenience method to sum attributes + */ + sum: function(array){ + var sum = 0; + for (var i = 0; i < array.length; i++) { + sum += this.get(array[i]); + } + return Utils.round(sum, 4); + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/fee.js b/assets/js/src/entities/cart/models/fee.js new file mode 100644 index 00000000..10df147d --- /dev/null +++ b/assets/js/src/entities/cart/models/fee.js @@ -0,0 +1,15 @@ +var Model = require('./abstract'); +var polyglot = require('lib/utilities/polyglot'); + +module.exports = Model.extend({ + + type: 'fee', + + defaults: function(){ + return { + title : polyglot.t('titles.fee'), + taxable : true + }; + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js new file mode 100644 index 00000000..942a17c0 --- /dev/null +++ b/assets/js/src/entities/cart/models/product.js @@ -0,0 +1,109 @@ +var Model = require('./abstract'); +var _ = require('lodash'); +var Utils = require('lib/utilities/utils'); + +/** + * Whitelist of attributes taken from product model + */ +var productAttributes = [ + 'product_id', + 'name', + 'type', + 'price', + 'regular_price', + 'sale_price', + 'taxable', + 'tax_status', + 'tax_class', + 'attributes', + 'meta' // variation meta +]; + +module.exports = Model.extend({ + + type: 'product', + + defaults: { + quantity: 1 + }, + + initialize: function(){ + // additional product listeners + this.on( 'change:quantity change:regular_price', this.updateTotals ); + }, + + /* jshint -W071 */ + updateTotals: function(){ + var quantity = this.get('quantity'), + item_price = this.get('item_price'), + regular_price = parseFloat( this.get('regular_price') ), + item_tax = 0, + item_subtotal_tax = 0; + + // calc total and subtotal taxes + if( this.taxes ){ + this.taxes.calcTaxes( item_price, quantity, 'total' ); + this.taxes.calcTaxes( regular_price, quantity, 'subtotal' ); + item_tax = this.taxes.sum('total'); + item_subtotal_tax = this.taxes.sum('subtotal'); + } + + // if price does not include tax + if( this.tax_options.prices_include_tax === 'yes' ) { + regular_price -= item_subtotal_tax; + item_price -= item_tax; + } + + // create totals object + var totals = { + 'item_subtotal' : Utils.round( regular_price, 4 ), + 'item_subtotal_tax' : Utils.round( item_subtotal_tax, 4 ), + 'item_tax' : Utils.round( item_tax, 4 ), + 'subtotal' : Utils.round( regular_price * quantity, 4 ), + 'subtotal_tax' : Utils.round( item_subtotal_tax * quantity, 4 ), + 'total_tax' : Utils.round( item_tax * quantity, 4 ), + 'total' : Utils.round( item_price * quantity, 4 ) + }; + + this.set(totals); + }, + /* jshint +W071 */ + + // parsing Product Model to Cart Model + parse: function( attributes ){ + var attr = _.clone( attributes ) || {}; + if( attr.product_id ){ + return attr; // already in the right format + } + + // id becomes product_id + attr.product_id = attr.id; + + // title becomes name + attr.name = attr.title; + + // turn variation attributes into line item meta + if(attr.type === 'variation'){ + attr.meta = _.map(attr.attributes, function(variant, idx){ + return { + key: ++idx, + label: variant.name, + value: variant.option + }; + }); + } + + // return subset of attributes + return _.pick(attr, productAttributes); + }, + + /* + * Convenience method to increase or decrease quantity + */ + quantity: function( type ) { + var quantity = this.get('quantity'); + this.set('quantity', (type === 'increase' ? ++quantity : --quantity) ); + return this; + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/shipping.js b/assets/js/src/entities/cart/models/shipping.js new file mode 100644 index 00000000..091b9b5e --- /dev/null +++ b/assets/js/src/entities/cart/models/shipping.js @@ -0,0 +1,16 @@ +var Model = require('./abstract'); +var polyglot = require('lib/utilities/polyglot'); + +module.exports = Model.extend({ + + type: 'shipping', + + defaults: function(){ + return { + method_title : polyglot.t('titles.shipping'), + taxable : true, + method_id : '' + }; + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index 4cbb9dc0..2af8ec5d 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -1,21 +1,16 @@ var DualCollection = require('lib/config/dual-collection'); var Model = require('./model'); -var $ = require('jquery'); var _ = require('lodash'); +var $ = require('jquery'); var bb = require('backbone'); module.exports = DualCollection.extend({ + model: Model, + name: 'orders', - _syncDelayed: false, - /** - * Open orders first - */ - //comparator: function( model ){ - // if( model.get('id') === undefined ) { return 0; } - // return 1; - //}, + _syncDelayed: false, /** * @@ -24,13 +19,32 @@ module.exports = DualCollection.extend({ var order = this.get(id); if( !order && id !== 'new' ){ - order = _.first( this.openOrders() ); + order = _.first( this.getOpenOrders() ); } this.active = order; return order; }, + /** + * + */ + getOpenOrders: function(){ + return this.filter(function(model){ + return model.isEditable(); + }); + }, + + /** + * + */ + addToCart: function(options){ + this.getActiveOrder() + .then(function(order){ + order.cart.add(options, { parse: true }); + }); + }, + /** * Promise of an active order */ @@ -54,34 +68,25 @@ module.exports = DualCollection.extend({ return deferred.promise(); }, - addToCart: function(options){ - this.getActiveOrder() - .then(function(order){ - order.cart.addToCart(options); - }); - }, - + /** + * + */ create: function(){ var deferred = new $.Deferred(); // Safari has a problem with create, perhaps an autoincrement problem? // Set local_id as timestamp milliseconds - DualCollection.prototype.create.call(this, { local_id: Date.now() }, { + DualCollection.prototype.create.call(this, { + local_id: Date.now(), + status: 'CREATE_FAILED' + }, { wait: true, + parse: true, success: deferred.resolve, error: deferred.reject }); return deferred.promise(); - }, - - /** - * - */ - openOrders: function(){ - return this.filter(function(model){ - return model.isEditable(); - }); } }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 50a586ae..e07ccfaa 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -1,278 +1,118 @@ -//var DualModel = require('lib/config/dual-model'); var DualModel = require('lib/config/dual-model'); -var Radio = require('backbone.radio'); -var Utils = require('lib/utilities/utils'); +var Cart = require('../cart/collection'); +var _ = require('lodash'); var debug = require('debug')('order'); -var App = require('lib/config/application'); -var $ = require('jquery'); +var Radio = require('backbone.radio'); -var Model = DualModel.extend({ +module.exports = DualModel.extend({ name: 'order', + fields: [ 'customer.first_name', 'customer.last_name', 'customer.email' ], - /** - * Orders with the following status are closed for editing - */ - //closedStatus: [ - // 'completed', - // 'on-hold', - // 'cancelled', - // 'refunded', - // 'processing', - // 'failed' - //], - - /** - * - */ defaults: { - note : '', - order_discount : 0 + note : '' }, - /** - * - attach tax settings - * - attach cart & gateways if order is open - */ - /* jshint -W071, -W074 */ - initialize: function(attributes){ - attributes = attributes || {}; - - if(!attributes.customer){ - var customers = this.getEntities('customers'); - var customer = customers['default'] || customers.guest || {}; - this.set({ - customer_id : customer.id, - customer : customer - }); - } - - this.tax = this.getEntities('tax'); - this.tax_rates = this.getEntities('tax_rates'); - - if( this.isEditable() ){ - this.attachCart(); - this.attachGateways(); - } - - // order_discount input - this.on({ - 'change:order_discount': this.calcTotals, - 'change:status': this.isEditable - }); - - }, - /* jshint +W071, +W074 */ - - getEntities: function(name){ - return Radio.request('entities', 'get', { - type: 'option', - name: name - }) || {}; + initialize: function(){ + // clone tax settings + this.tax = _.clone( this.getSettings( 'tax' ) ); + this.tax_rates = _.clone( this.getSettings( 'tax_rates' ) ); }, /** - * is order editable method, sets _open true or false + * convenience method to get settings */ - isEditable: function(){ - //return !_.contains(this.closedStatus, this.get('status')); - return this.get('status') === undefined || this.isDelayed(); - //return this.isDelayed(); + getSettings: function(name){ + return Radio.request('entities', 'get', { + type: 'option', + name: name + }) || {}; }, /** - * Remove items from cart before destroy + * can order be changed + * - perhaps check an array of closed stati? */ - destroy: function(options){ - var self = this; - return this.cart.db.removeBatch( this.cart.pluck('local_id') ) - .always(function(){ - return DualModel.prototype.destroy.call(self, options); - }); + isEditable: function( status ){ + status = status || this.get('status'); + return status === undefined || this.isDelayed( status ); }, - /** - * Attach cart - */ - attachCart: function(){ - var cart = Radio.request('entities', 'get', { - init : true, - type : 'collection', - name : 'cart' - }); - - cart.order_id = this.id; + attachCart: function( attributes ){ + this.cart = new Cart( null, { order: this } ); - this.listenTo(cart, { - 'add change' : this.calcTotals, - 'remove' : this.itemRemoved - }); + // add line_items, shipping_lines and fee_lines + this.cart.set( attributes.line_items, { parse: true, remove: false } ); + this.cart.set( attributes.shipping_lines, + { parse: true, remove: false, type: 'shipping' } + ); + this.cart.set( attributes.fee_lines, + { parse: true, remove: false, type: 'fee' } + ); - if(cart.db){ - cart.db.open().then(function(){ - cart.fetchCartItems(); - }); - } + //delete attributes.line_items; ? - this.cart = cart; + this.cart.on( 'change add remove', function(){ + this.save(); // note don't pass arguments + }, this ); }, - /** - * remove cart items from idb after successful order - */ - clearCart: function(){ - if(this.cart){ - this.cart.db.removeBatch( this.cart.pluck('local_id') ); + save: function(attributes, options){ + if( this.cart && this.cart.length === 0 ){ + return this.destroy( options ); } - }, - /** - * Attach gateways - */ - attachGateways: function(){ - this.gateways = Radio.request('entities', 'get', { - init : true, - type : 'collection', - name : 'gateways' - }); - }, + this.updateTotals(); + debug('save order', this); - /** - * - */ - itemRemoved: function(){ - if(this.cart.length > 0){ - return this.calcTotals(); - } - return this.destroy(); + return DualModel.prototype.save.call(this, attributes, options); }, - /** - * Sum cart totals - * todo: too many statements - */ - /* jshint -W071 */ - calcTotals: function(){ - var total_tax = 0, - subtotal_tax = 0, - shipping_tax = 0, - cart_discount_tax = 0, - subtotal = this.cart.sum('subtotal'), - total = this.cart.sum('total'), - cart_discount = subtotal - total, - order_discount = this.get('order_discount'); + parse: function(resp) { + resp = DualModel.prototype.parse.call(this, resp); - if( this.tax.calc_taxes === 'yes' ) { - total_tax = this.cart.sum('total_tax'); - subtotal_tax = this.cart.sum('subtotal_tax'); - shipping_tax = this.cart.sum('total_tax', 'shipping'); - cart_discount_tax = subtotal_tax - total_tax; + if( resp && this.isEditable( resp.status ) && !this.cart ){ + this.attachCart( resp ); } - total += total_tax; - total -= order_discount; - - // tax_lines will merge the data - possibly due to deep model - // clear tax_lines before save to ensure clean data - this.unset('tax_lines', { silent: true }); - - // create totals object - var totals = { - 'total' : Utils.round( total, 4 ), - 'subtotal' : Utils.round( subtotal, 4 ), - 'total_tax' : Utils.round( total_tax, 4 ), - 'subtotal_tax' : Utils.round( subtotal_tax, 4 ), - 'shipping_tax' : Utils.round( shipping_tax, 4 ), - 'cart_discount' : Utils.round( cart_discount, 4 ), - 'cart_discount_tax' : Utils.round( cart_discount_tax, 4 ), - 'tax_lines' : this.cart.itemizedTax() - }; - - this.save(totals); - debug('update totals', totals); - }, - /* jshint +W071 */ - - /** - * Convenience method to sum attributes - */ - sum: function(array){ - var sum = 0; - for (var i = 0; i < array.length; i++) { - sum += parseFloat( this.get(array[i]) ); - } - return sum; + return resp; }, - /** - * process order - * todo: remoteSync resolves w/ an array of models, should match sync? - */ - process: function(){ - var self = this; - - return $.when( this.processCart() ) - .then(function(){ - return self.processGateway(); - }) - .then(function(){ - var method = self.get('id') ? 'update' : 'create'; - return self.remoteSync(method); - }) - .then(function(array){ - var model = array[0]; - if(model.get('status') === 'failed'){ - model.save({ status: 'UPDATE_FAILED' }); + toJSON: function(options) { + var attrs = _.clone(this.attributes); + + if( this.isEditable() && this.cart ){ + attrs.line_items = []; + attrs.shipping_lines = []; + attrs.fee_lines = []; + + this.cart.each( function(model) { + if( model.type === 'shipping' ){ + attrs.shipping_lines.push( model.toJSON(options) ); + } else if ( model.type === 'fee' ) { + attrs.fee_lines.push( model.toJSON(options) ); + } else { + attrs.line_items.push( model.toJSON(options) ); } }); - }, - - /** - * - */ - processCart: function(){ - var obj = { - product : [], - shipping: [], - fee : [] - }; - - this.cart.each(function(model){ - var type = model.get('type'); - if(type !== 'shipping' && type !== 'fee'){ - type = 'product'; - } - obj[type].push( model.toJSON() ); - }); + } - // set - this.set({ - line_items : obj.product, - shipping_lines: obj.shipping, - fee_lines : obj.fee, - tax_lines : this.cart.itemizedTax() // reset for retry - }); + return attrs; }, - /** - * @todo remove extraneous attrs, eg: payment_fields - */ - processGateway: function(){ - var data = this.gateways.findWhere({ active: true }).toJSON(); - this.set({ - payment_details: data - }); - }, + updateTotals: function(){ + var totals = { + total : this.cart.sum('total'), + subtotal : this.cart.sum('subtotal'), + total_tax : this.cart.sum('total_tax'), + subtotal_tax : this.cart.sum('subtotal_tax') + }; - emailReceipt: function(email){ - return App.prototype.post( this.url() + 'email/' + email ); + this.set(totals); } -}); - -module.exports = Model; -App.prototype.set('Entities.Order.Model', Model); \ No newline at end of file +}); \ No newline at end of file diff --git a/assets/js/src/entities/tax/collection.js b/assets/js/src/entities/tax/collection.js new file mode 100644 index 00000000..bf732e7a --- /dev/null +++ b/assets/js/src/entities/tax/collection.js @@ -0,0 +1,132 @@ +var bb = require('backbone'); +var Model = require('./model'); +var _ = require('lodash'); + +module.exports = bb.Collection.extend({ + + model: Model, + + /** + * attach line_item early for use by parse + */ + constructor: function( models, options ){ + options = options || {}; + this.line_item = options.line_item; + + // set calcTaxes method + if( options.prices_include_tax === 'yes' ){ + this.calcTaxes = this.calcInclusiveTax; + } else { + this.calcTaxes = this.calcExclusiveTax; + } + + bb.Collection.apply(this, arguments); + }, + + /** + * Calculate the line item tax total + * based on the calc_exclusive_tax function in + * woocommerce/includes/class-wc-tax.php + */ + calcExclusiveTax: function( price, qty, attr ){ + var pre_compound_total = 0, + taxes = {}; + + // defaults + qty = qty || 1; + attr = attr || 'total'; + + // multiple taxes + this.each(function(tax) { + if( ! tax.get('compound') ) { + taxes[ tax.id ] = price * tax.getRate(); + } + }, this); + + pre_compound_total = _.reduce( taxes, function( sum, num ){ + return sum + num; + }, 0 ); + + // compound taxes + this.each(function(tax) { + if ( tax.get('compound') ) { + taxes[ tax.id ] = ( price + pre_compound_total ) * tax.getRate(); + } + tax.set( attr, ( taxes[ tax.id ] * qty ) ); + }, this); + }, + + /** + * Calculate the line item tax total + * based on the calc_inclusive_tax function in + * woocommerce/includes/class-wc-tax.php + */ + calcInclusiveTax: function( price, qty, attr ){ + var regular_tax_rates = 0, + compound_tax_rates = 0, + regular_tax_rate = 1, + compound_tax_rate = 1, + non_compound_price = 0; + + // defaults + qty = qty || 1; + attr = attr || 'total'; + + this.each(function(tax) { + if ( tax.get('compound') ) { + compound_tax_rates += tax.getRate(); + } else { + regular_tax_rates += tax.getRate(); + } + }, this); + + regular_tax_rate += regular_tax_rates; + compound_tax_rate += compound_tax_rates; + non_compound_price = price / compound_tax_rate; + + this.each(function(tax) { + var the_rate = tax.getRate(); + var the_price = 0; + + if ( tax.get('compound') ) { + the_price = price; + the_rate = the_rate / compound_tax_rate; + } else { + the_price = non_compound_price; + the_rate = the_rate / regular_tax_rate; + } + + tax.set( attr, ( the_rate * the_price * qty ) ); + + }, this); + }, + + // move rate_id key to part of rate model + parse: function( rates ){ + var type = _.get( this, ['line_item', 'type'] ); + + return _.chain(rates) + .map(function( rate, rate_id ){ + rate.rate_id = rate_id; + // remove tax rates for shipping = 'no' + if( type !== 'shipping' || rate.shipping !== 'no' ){ + return rate; + } + }) + .compact() + .value(); + }, + + /** + * convenience method to sum taxes + */ + sum: function(attribute, type){ + return this.reduce( function( sum, model ){ + if( type && type !== model.type ){ + return sum; + } + return sum + parseFloat( model.get(attribute) ); + }, 0 ); + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/tax/model.js b/assets/js/src/entities/tax/model.js new file mode 100644 index 00000000..dd5ce4c9 --- /dev/null +++ b/assets/js/src/entities/tax/model.js @@ -0,0 +1,30 @@ +var bb = require('backbone'); +var _ = require('lodash'); + +module.exports = bb.Model.extend({ + + idAttribute: 'rate_id', + + defaults: { + total : 0, + subtotal : 0 + }, + + getRate: function(){ + return parseFloat( this.get('rate') ) / 100; + }, + + // put rates into correct format + parse: function( attributes ){ + if( attributes.hasOwnProperty('label') ){ + attributes = _.extend( {}, attributes, { + title : attributes.label, + compound: attributes.compound === 'yes', + shipping: attributes.shipping === 'yes' + } ); + delete attributes.label; + } + return attributes; + } + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/print/epos-print.js b/assets/js/src/lib/components/print/epos-print.js index 9faf566c..a9a66096 100644 --- a/assets/js/src/lib/components/print/epos-print.js +++ b/assets/js/src/lib/components/print/epos-print.js @@ -1,117 +1,119 @@ -// Create a print document -function sendDocument() { - var request = ''; - request += ''; - request += ''; - request += 'Hello, World! '; - request += ''; - request += ''; - //Create a SOAP envelop - var soap = '' + - '' + request + ''; - //Create an XMLHttpRequest object - var xhr = new XMLHttpRequest(); - //Set the end point address - var url = 'http://192.168.192.168/cgi-bin/epos/service.cgi?devid=local_printer&timeout=10000'; - //Open an XMLHttpRequest object - xhr.open('POST', url, true); - //
    - xhr.setRequestHeader('Content-Type', 'text/xml; charset=utf-8'); - xhr.setRequestHeader('If-Modified-Since', 'Thu, 01 Jan 1970 00:00:00 GMT'); - //xhr.setRequestHeader('SOAPAction', '""'); // required? - // Send print document - xhr.send(soap); -} - -// Check printer status -function checkStatus(){ - //Set the end point address - var url = 'http://192.168.192.168/cgi-bin/epos/service.cgi?devid=local_printer&timeout=10000'; -//Create an empty print document to check the printer status - var soap = '' + - '' + - '' + - '' + - '' + - ''; -//Create an XMLHttpRequest object - var xhr = new XMLHttpRequest(); -// - xhr.open('POST', url, true); -//
    - xhr.setRequestHeader('Content-Type', 'text/xml; charset=utf-8'); - xhr.setRequestHeader('If-Modified-Since', 'Thu, 01 Jan 1970 00:00:00 GMT'); -//Set a response reception callback function for checking - xhr.onreadystatechange = function () { - if (xhr.readyState == 4){ - if (xhr.status == 200){ - var res = xhr.responseXML; - var success = res.getElementsByTagName('response')[0].getAttribute('success'); - if (!/^(1|true)$/.test(success)) { - alert('Success'); - } - } - } - }; -//Send empty print data - xhr.send(soap); -} - -// response codes -// Set a response receipt callback function -xhr.onreadystatechange = function () { - // Obtain the print result and error code - var res = xhr.responseXML; - var msg = 'Print' + (res[0].getAttribute('success') ? 'Success' : 'Failure') + - '\nCode:' + res[0].getAttribute('code') + - '\nStatus:\n'; - // Obtain the printer status - var asb = res[0].getAttribute('status'); - if (asb & 0x00000001) { - msg += ' No printer response\n'; - } - if (asb & 0x00000002) { - msg += ' Print complete\n'; - } - if (asb & 0x00000004) { - msg += ' Status of the drawer kick number 3 connector pin = "H"\n'; - } - if (asb & 0x00000008) { - msg += ' Offline status\n'; - } - if (asb & 0x00000020) { - msg += ' Cover is open\n'; - } - if (asb & 0x00000040) { - msg += ' Paper feed switch is feeding paper\n'; - } - if (asb & 0x00000100) { - msg += ' Waiting for online recovery\n'; - } - if (asb & 0x00000200) { - msg += ' Panel switch is ON\n'; - } - if (asb & 0x00000400) { - msg += ' Mechanical error generated\n'; - } - if (asb & 0x00000800) { - msg += ' Auto cutter error generated\n'; - } - if (asb & 0x00002000) { - msg += ' Unrecoverable error generated\n'; - } - if (asb & 0x00004000) { - msg += ' Auto recovery error generated\n'; - } - if (asb & 0x00020000) { - msg += ' No paper in the roll paper near end detector\n'; - } - if (asb & 0x00080000) { - msg += ' No paper in the roll paper end detector\n'; - } - if (asb & 0x80000000) { - msg += ' Stop the spooler\n'; - } - //Display in the dialog box - alert(msg); -} \ No newline at end of file +/* jshint -W101 */ +//// Create a print document +//function sendDocument() { +// var request = ''; +// request += ''; +// request += ''; +// request += 'Hello, World! '; +// request += ''; +// request += ''; +// //Create a SOAP envelop +// var soap = '' + +// '' + request + ''; +// //Create an XMLHttpRequest object +// var xhr = new XMLHttpRequest(); +// //Set the end point address +// var url = 'http://192.168.192.168/cgi-bin/epos/service.cgi?devid=local_printer&timeout=10000'; +// //Open an XMLHttpRequest object +// xhr.open('POST', url, true); +// //
    +// xhr.setRequestHeader('Content-Type', 'text/xml; charset=utf-8'); +// xhr.setRequestHeader('If-Modified-Since', 'Thu, 01 Jan 1970 00:00:00 GMT'); +// //xhr.setRequestHeader('SOAPAction', '""'); // required? +// // Send print document +// xhr.send(soap); +//} +// +//// Check printer status +//function checkStatus(){ +// //Set the end point address +// var url = 'http://192.168.192.168/cgi-bin/epos/service.cgi?devid=local_printer&timeout=10000'; +////Create an empty print document to check the printer status +// var soap = '' + +// '' + +// '' + +// '' + +// '' + +// ''; +////Create an XMLHttpRequest object +// var xhr = new XMLHttpRequest(); +//// +// xhr.open('POST', url, true); +////
    +// xhr.setRequestHeader('Content-Type', 'text/xml; charset=utf-8'); +// xhr.setRequestHeader('If-Modified-Since', 'Thu, 01 Jan 1970 00:00:00 GMT'); +////Set a response reception callback function for checking +// xhr.onreadystatechange = function () { +// if (xhr.readyState == 4){ +// if (xhr.status == 200){ +// var res = xhr.responseXML; +// var success = res.getElementsByTagName('response')[0].getAttribute('success'); +// if (!/^(1|true)$/.test(success)) { +// alert('Success'); +// } +// } +// } +// }; +////Send empty print data +// xhr.send(soap); +//} +// +//// response codes +//// Set a response receipt callback function +//xhr.onreadystatechange = function () { +// // Obtain the print result and error code +// var res = xhr.responseXML; +// var msg = 'Print' + (res[0].getAttribute('success') ? 'Success' : 'Failure') + +// '\nCode:' + res[0].getAttribute('code') + +// '\nStatus:\n'; +// // Obtain the printer status +// var asb = res[0].getAttribute('status'); +// if (asb & 0x00000001) { +// msg += ' No printer response\n'; +// } +// if (asb & 0x00000002) { +// msg += ' Print complete\n'; +// } +// if (asb & 0x00000004) { +// msg += ' Status of the drawer kick number 3 connector pin = "H"\n'; +// } +// if (asb & 0x00000008) { +// msg += ' Offline status\n'; +// } +// if (asb & 0x00000020) { +// msg += ' Cover is open\n'; +// } +// if (asb & 0x00000040) { +// msg += ' Paper feed switch is feeding paper\n'; +// } +// if (asb & 0x00000100) { +// msg += ' Waiting for online recovery\n'; +// } +// if (asb & 0x00000200) { +// msg += ' Panel switch is ON\n'; +// } +// if (asb & 0x00000400) { +// msg += ' Mechanical error generated\n'; +// } +// if (asb & 0x00000800) { +// msg += ' Auto cutter error generated\n'; +// } +// if (asb & 0x00002000) { +// msg += ' Unrecoverable error generated\n'; +// } +// if (asb & 0x00004000) { +// msg += ' Auto recovery error generated\n'; +// } +// if (asb & 0x00020000) { +// msg += ' No paper in the roll paper near end detector\n'; +// } +// if (asb & 0x00080000) { +// msg += ' No paper in the roll paper end detector\n'; +// } +// if (asb & 0x80000000) { +// msg += ' Stop the spooler\n'; +// } +// //Display in the dialog box +// alert(msg); +//} +/* jshint +W101 */ \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 0bc6f50f..527161a0 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -41,8 +41,8 @@ module.exports = app.prototype.DualModel = DeepModel.extend({ return !!this.get(this.remoteIdAttribute); }, - isDelayed: function() { - var status = this.get('status'); + isDelayed: function( status ) { + status = status || this.get('status'); return status === this.states['update'] || status === this.states['create'] || status === this.states['delete']; diff --git a/includes/admin/class-wc-pos-abstract.php b/includes/admin/class-wc-pos-abstract.php index d0464b85..1202e89e 100644 --- a/includes/admin/class-wc-pos-abstract.php +++ b/includes/admin/class-wc-pos-abstract.php @@ -25,29 +25,31 @@ class WC_POS_Admin_Abstract { */ public function __construct() { add_action( 'admin_menu', array( $this, 'admin_menu' ) ); - add_action( 'current_screen', array( $this, 'conditional_init' ) ); } /** * - * - * @param $current_screen */ - public function conditional_init( $current_screen ) { - if ( $current_screen->id == $this->screen_id ) { - + public function conditional_init() { // Enqueue scripts for the admin pages add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ), 99 ); add_action( 'admin_print_scripts', array( $this, 'admin_print_scripts' ) ); add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 99 ); add_action( 'admin_print_footer_scripts', array( $this, 'print_footer_scripts' ), 99 ); + } + + /** + * + */ + public function admin_menu(){ + if( $this->screen_id ){ + add_action( 'load-' . $this->screen_id, array( $this, 'conditional_init' ) ); } } /** * */ - public function admin_menu(){} public function enqueue_admin_scripts(){} /** diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index b0d76ec1..a8761c55 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -40,6 +40,8 @@ public function admin_menu() { 'wc_pos_settings', array( $this, 'display_settings_page' ) ); + + parent::admin_menu(); } /** diff --git a/includes/admin/class-wc-pos-status.php b/includes/admin/class-wc-pos-status.php index a99d16a2..4c80cb41 100644 --- a/includes/admin/class-wc-pos-status.php +++ b/includes/admin/class-wc-pos-status.php @@ -36,6 +36,8 @@ public function admin_menu() { 'wc_pos_system_status', array( $this, 'display_system_status_page' ) ); + + parent::admin_menu(); } /** diff --git a/includes/admin/settings/class-wc-pos-checkout.php b/includes/admin/settings/class-wc-pos-checkout.php index 7e00a1f4..af7837f8 100644 --- a/includes/admin/settings/class-wc-pos-checkout.php +++ b/includes/admin/settings/class-wc-pos-checkout.php @@ -52,7 +52,7 @@ public function load_gateways() { $ordered_gateways[ ++$i ] = $gateway; } $settings = new WC_POS_Admin_Settings_Gateways($gateway->id); - $settings->merge_settings($gateway); + $settings->merge_settings($gateway); // @todo remove this, use get_title() etc apply_filters( 'woocommerce_pos_load_gateway', $gateway ); } diff --git a/includes/admin/settings/views/tools.php b/includes/admin/settings/views/tools.php index 9d75390e..f7bc7665 100644 --- a/includes/admin/settings/views/tools.php +++ b/includes/admin/settings/views/tools.php @@ -52,6 +52,9 @@ class="button" _e( 'Clear All Local Data', 'woocommerce-pos' ); ?> + Note: Make sure the POS is not open in another tab.', 'woocommerce-pos' ); + ?> diff --git a/includes/class-wc-pos-gateways.php b/includes/class-wc-pos-gateways.php index 86d8ff46..ea048c73 100644 --- a/includes/class-wc-pos-gateways.php +++ b/includes/class-wc-pos-gateways.php @@ -43,11 +43,9 @@ public static function get_instance() { */ public function payment_gateways( array $gateways ) { // don't show POS gateways on WC settings page - if( is_admin() && function_exists('get_current_screen') ){ - $screen = get_current_screen(); - if( !empty($screen) && $screen->id == 'woocommerce_page_wc-settings' ) { - return $gateways; - } + global $plugin_page; + if( $plugin_page == 'wc-settings' ){ + return $gateways; } return array_merge($gateways, array( diff --git a/includes/class-wc-pos-tax.php b/includes/class-wc-pos-tax.php index 0a62bfdf..bbaef338 100644 --- a/includes/class-wc-pos-tax.php +++ b/includes/class-wc-pos-tax.php @@ -43,8 +43,6 @@ static public function tax_rates() { foreach( self::tax_classes() as $class => $label ) { if( $rate = WC_Tax::get_base_tax_rates( $class ) ){ - // WC_Tax returns a assoc array with int as keys = world of pain in js - // possibly change $key to $rate['id'] $rates[$class] = $rate; } } diff --git a/includes/views/pos/cart/tmpl-item.php b/includes/views/pos/cart/tmpl-item.php index 444cb2b4..74df1fb4 100644 --- a/includes/views/pos/cart/tmpl-item.php +++ b/includes/views/pos/cart/tmpl-item.php @@ -1,7 +1,7 @@ {{#if product}}
    - {{title}} + {{name}}
    @@ -9,9 +9,10 @@ {{else}}
    - {{#if method_title}} + {{#if shipping}} {{method_title}} - {{else}} + {{/if}} + {{#if fee}} {{title}} {{/if}} diff --git a/readme.txt b/readme.txt index 14fd2f16..cfd9e27e 100644 --- a/readme.txt +++ b/readme.txt @@ -59,16 +59,18 @@ To install a WordPress Plugin manually: = Where can I find more information on WooCommerce POS? = There is more information on our website at [woopos.com.au](http://woopos.com.au). -Try: -* [FAQ](http://woopos.com.au/faq) -* [Documentation](http://woopos.com.au/docs) -* [Blog](http://woopos.com.au/blog) + +* FAQ - http://woopos.com.au/faq +* Documentation - http://woopos.com.au/docs +* Blog - http://woopos.com.au/blog = Where can I request a feature? = Visit the [Roadmap](http://woopos.com.au/roadmap) for information on what is coming in the next version of WooCommerce POS. If your feature isn't mentioned leave a request in the comments. = Where can I get support? = -WooCommerce POS has a support page within the plugin (eg: http://**/pos/#support). If you are experiencing an error or problem please visit this support page and send a message using the form provided. This form will attach important information we need to assist you. +WooCommerce POS has a support page within the plugin (eg: http://*yourstore*/pos/#support). If you are experiencing an error or problem please visit this support page and send a message using the form provided. This form will attach important information we need to assist you. + +If your problem prevents you from accessing the support page within the POS, please contact [support@woopos.com.au](mailto:support@woopos.com.au). = Where can I report bugs? = Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.com/kilbot/WooCommerce-POS/issues). @@ -79,13 +81,16 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c == Changelog == -= 0.4.6 - 2015/11/** = += 0.4.6 - 2016/01/** = * Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6 -* Fix: POS not showing for some users +* New: Receipt print methods for thermal printers (experimental) +* New: Receipt templates for epos-print and ESC/POS languages (experimental) +* New: Receipt template editor for custom receipts +* Fix: Checkout settings not showing for some users * Fix: issue with some product variation names, e.g.: 000, 00 and 0 -* Fix: display of print receipt path in settings * Tweak: Add Reply-To header to support emails * Tweak: remove hard dependence for unique customer email +* Numerous other tweaks and improvements = 0.4.5 - 2015/10/28 = * Important: WooCommerce POS now requires PHP 5.4 or higher diff --git a/tests/unit/js/data/order.json b/tests/unit/js/data/order.json new file mode 100644 index 00000000..ef11b5a3 --- /dev/null +++ b/tests/unit/js/data/order.json @@ -0,0 +1,155 @@ +{ + "order": { + "id": 645, + "order_number": 645, + "created_at": "2015-01-26T20:00:21Z", + "updated_at": "2015-01-26T20:00:21Z", + "completed_at": "2015-01-26T20:00:21Z", + "status": "processing", + "currency": "USD", + "total": "79.87", + "subtotal": "63.97", + "total_line_items_quantity": 3, + "total_tax": "5.90", + "total_shipping": "10.00", + "cart_tax": "5.40", + "shipping_tax": "0.50", + "total_discount": "0.00", + "shipping_methods": "Flat Rate", + "payment_details": { + "method_id": "bacs", + "method_title": "Direct Bank Transfer", + "paid": true + }, + "billing_address": { + "first_name": "John", + "last_name": "Doe", + "company": "", + "address_1": "969 Market", + "address_2": "", + "city": "San Francisco", + "state": "CA", + "postcode": "94103", + "country": "US", + "email": "john.doe@example.com", + "phone": "(555) 555-5555" + }, + "shipping_address": { + "first_name": "John", + "last_name": "Doe", + "company": "", + "address_1": "969 Market", + "address_2": "", + "city": "San Francisco", + "state": "CA", + "postcode": "94103", + "country": "US" + }, + "note": "", + "customer_ip": "127.0.0.1", + "customer_user_agent": "WordPress/4.1; http://example.com", + "customer_id": 2, + "view_order_url": "https://example.com/my-account/view-order/645", + "line_items": [ + { + "id": 504, + "subtotal": "43.98", + "subtotal_tax": "4.40", + "total": "43.98", + "total_tax": "4.40", + "price": "21.99", + "quantity": 2, + "tax_class": "reduced-rate", + "name": "Premium Quality", + "product_id": 546, + "sku": "", + "meta": [] + }, + { + "id": 505, + "subtotal": "19.99", + "subtotal_tax": "1.00", + "total": "19.99", + "total_tax": "1.00", + "price": "19.99", + "quantity": 1, + "tax_class": null, + "name": "Ship Your Idea", + "product_id": 613, + "sku": "", + "meta": [ + { + "key": "pa_color", + "label": "Color", + "value": "Black" + } + ] + } + ], + "shipping_lines": [ + { + "id": 506, + "method_id": "flat_rate", + "method_title": "Flat Rate", + "total": "10.00" + } + ], + "tax_lines": [ + { + "id": 507, + "rate_id": "5", + "code": "US-CA-TAX-1", + "title": "Tax", + "total": "4.40", + "compound": false + }, + { + "id": 508, + "rate_id": "4", + "code": "US-STANDARD-1", + "title": "Standard", + "total": "1.50", + "compound": false + } + ], + "fee_lines": [], + "coupon_lines": [], + "customer": { + "id": 2, + "created_at": "2014-11-19T18:34:19Z", + "email": "john.doe@example.com", + "first_name": "", + "last_name": "", + "username": "john.doe", + "last_order_id": "645", + "last_order_date": "2015-01-26T20:00:21Z", + "orders_count": 2, + "total_spent": "19.00", + "avatar_url": "https://secure.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=96", + "billing_address": { + "first_name": "John", + "last_name": "Doe", + "company": "", + "address_1": "969 Market", + "address_2": "", + "city": "San Francisco", + "state": "CA", + "postcode": "94103", + "country": "US", + "email": "john.doe@example.com", + "phone": "(555) 555-5555" + }, + "shipping_address": { + "first_name": "John", + "last_name": "Doe", + "company": "", + "address_1": "969 Market", + "address_2": "", + "city": "San Francisco", + "state": "CA", + "postcode": "94103", + "country": "US" + } + } + } +} \ No newline at end of file diff --git a/tests/unit/js/spec/apps/pos/cart/route.js b/tests/unit/js/spec/apps/pos/cart/route.spec.js similarity index 100% rename from tests/unit/js/spec/apps/pos/cart/route.js rename to tests/unit/js/spec/apps/pos/cart/route.spec.js diff --git a/tests/unit/js/spec/apps/pos/posapp.spec.js b/tests/unit/js/spec/apps/pos/posapp.spec.js deleted file mode 100644 index 92b49831..00000000 --- a/tests/unit/js/spec/apps/pos/posapp.spec.js +++ /dev/null @@ -1,3 +0,0 @@ -describe('POSApp', function () { - require('./cart/route'); -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/collection.js b/tests/unit/js/spec/entities/cart/collection.js deleted file mode 100644 index 170c9b2c..00000000 --- a/tests/unit/js/spec/entities/cart/collection.js +++ /dev/null @@ -1,130 +0,0 @@ -describe('entities/cart/collection.js', function () { - - beforeEach(function () { - - var Collection = proxyquire('entities/cart/collection',{ - 'lib/config/idb-collection': Backbone.Collection, - './model': Backbone.Model - }); - this.collection = new Collection(); - - }); - - it('should be in a valid state', function() { - expect(this.collection).to.be.ok; - }); - - it('should have sum convenience method', function() { - var arr = []; - while(arr.length < 3){ - arr.push( Math.random() ); - } - this.collection.add([ - { random: arr[0], type: 'type' }, - { random: arr[1] }, - { random: arr[2] } - ]); - var sum = arr.reduce(function(pv, cv) { return pv + cv; }, 0); - expect(this.collection.sum('random')).equals(sum); - expect(this.collection.sum('random', 'type')).equals(arr[0]); - - }); - - it('should add new items to the cart', function() { - var product = new Backbone.Model({ id: 1, title: 'Product 1'}); - - // add product as model - this.collection.addToCart(product); - expect(this.collection.length).equals(1); - - // add product as attributes - this.collection.addToCart({ id: 2, title: 'Product 2'}); - expect(this.collection.length).equals(2); - }); - - it('should add shipping to cart', function() { - var shipping = { - type : 'shipping', - method_title: 'Shipping', - method_id : '' - }; - - // add product as model - this.collection.addToCart(shipping); - expect(this.collection.length).equals(1); - - var model = this.collection.at(0); - expect(model.get('type')).equals('shipping'); - }); - - it('should add a fee to cart', function() { - var fee = { - type : 'fee', - method_title: 'Fee' - }; - - // add product as model - this.collection.addToCart(fee); - expect(this.collection.length).equals(1); - - var model = this.collection.at(0); - expect(model.get('type')).equals('fee'); - }); - - it('should add shipping and fee to cart', function() { - var shipping = { - type : 'shipping', - method_title: 'Shipping', - method_id : '' - }; - this.collection.addToCart(shipping); - - var fee = { - type : 'fee', - method_title: 'Fee' - }; - this.collection.addToCart(fee); - - expect(this.collection.length).equals(2); - expect(this.collection.pluck('type')).eql(['shipping', 'fee']); - }); - - it('should combine itemized taxes', function() { - this.collection.add([ - { - tax: { - 1: {subtotal: 1.5, total: 1.2}, - 2: {subtotal: 3, total: 2} - } - }, - { - tax: { - 2: {subtotal: 8.5, total: 5} - } - }, - { - tax: { - 1: {subtotal: 3, total: 2} - }, - type: 'shipping' - } - ]); - - var tax = this.collection.itemizedTax(); - expect(tax).to.be.an('array').that.deep.equals([ - { - subtotal: 4.5, - total: 3.2, - shipping: 2, - rate_id: '1' - }, - { - rate_id: '2', - total: 7, - subtotal: 11.5, - shipping: 0 - } - ]); - }); - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/collection.spec.js b/tests/unit/js/spec/entities/cart/collection.spec.js new file mode 100644 index 00000000..9d32831c --- /dev/null +++ b/tests/unit/js/spec/entities/cart/collection.spec.js @@ -0,0 +1,89 @@ +describe('entities/cart/collection.js', function () { + + beforeEach(function () { + var Collection = require('entities/cart/collection'); + this.collection = new Collection(); + }); + + it('should be in a valid state', function() { + expect(this.collection).to.be.ok; + }); + + it('should have sum convenience method', function() { + var arr = []; + while(arr.length < 3){ + arr.push( Math.random() ); + } + this.collection.add([ + { price: arr[0] }, + { price: arr[1] }, + { price: arr[2] } + ]); + this.collection.at(0).type = 'type'; + var sum = arr.reduce(function(pv, cv) { return pv + cv; }, 0); + expect(this.collection.sum('price')).equals(sum); + expect(this.collection.sum('price', 'type')).equals(arr[0]); + + }); + + it('should add new items to the cart', function() { + var product = new Backbone.Model({ id: 1, title: 'Product 1' }); + + // add product as model + this.collection.add(product); + expect(this.collection.length).equals(1); + + // add product as attributes + this.collection.add({ id: 2, title: 'Product 2'}); + expect(this.collection.length).equals(2); + }); + + it('should add shipping to cart', function() { + + this.collection.add({ method_title: 'Shipping' }, { type: 'shipping' }); + expect(this.collection.length).equals(1); + + var model = this.collection.at(0); + expect(model.type).equals('shipping'); + }); + + it('should add a fee to cart', function() { + + this.collection.add({ title: 'Fee' }, { type: 'fee' }); + expect(this.collection.length).equals(1); + + var model = this.collection.at(0); + expect(model.type).equals('fee'); + }); + + it('should increase quantity if exactly one product exists in cart', function(){ + + // add product + this.collection.add({ id: 123, title: 'Product 123' }); + + // add same product + this.collection.add({ id: 123, title: 'Product 123' }); + + expect(this.collection.length).equals(1); + expect(this.collection.at(0).get('quantity')).equals(2); + + }); + + it('should allow multiple lines of the same product', function(){ + + // add product + this.collection.add([ + { id: 123, title: 'Product 123' }, + { id: 123, title: 'Product 123' } + ]); + + expect(this.collection.length).equals(2); + + // add same product + this.collection.add({ id: 123, title: 'Product 123' }); + + expect(this.collection.length).equals(3); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/model.js b/tests/unit/js/spec/entities/cart/model.js deleted file mode 100644 index f51aff97..00000000 --- a/tests/unit/js/spec/entities/cart/model.js +++ /dev/null @@ -1,660 +0,0 @@ -describe('entities/cart/model.js', function () { - - var dummy_tax_GB = { - '': { - 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} - }, - 'reduced-rate': { - 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} - }, - 'zero-rate': { - 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} - } - } - - var dummy_tax_US = { - '': { - 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, - 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} - } - } - - describe('product line items', function () { - - beforeEach(function () { - - var dummy = require('./../../../data/products.json'); - this.products = dummy.products; - - var Model = require('entities/cart/model').extend({ - url: '?', - collection: { tax_rates: {} } - }); - this.model = new Model(this.products[0]); - - }); - - it('should be in a valid state', function() { - expect(this.model).to.be.ok; - }); - - it('should have a quantity convenience method ', function() { - expect(this.model.get('quantity')).equals(1); - this.model.quantity('increase'); - expect(this.model.get('quantity')).equals(2); - this.model.quantity('decrease'); - expect(this.model.get('quantity')).equals(1); - }); - - it('should have sum convenience method ', function() { - this.model.set({ - total: 1.23, - subtotal: 4.56 - }); - var sum = this.model.sum(['total', 'subtotal']); - expect(sum).equals(5.79); - }); - - it("should initiate with the correct values", function() { - - this.model.set({quantity: 1}); - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('total')).equal(2); - - }); - - it("should re-calculate on quantity change to any floating point number", function() { - - var quantity = _.random(10, true); - this.model.set( { 'quantity': quantity } ); - - expect(this.model.get('quantity')).equal(quantity); - expect(this.model.get('total')).equal( parseFloat( (2 * quantity).toFixed(4) ) ); - - }); - - describe('cart/model using GB dummy tax', function () { - - beforeEach(function () { - this.model.tax_rates = dummy_tax_GB; - }); - - it("should calculate the correct exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0.6); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0.4); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1].total).equal(0.4); - expect(tax[1].subtotal).equal(0.6); - - }); - - it("should calculate the correct inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(2.5); - expect(this.model.get('subtotal_tax')).equal(0.5); - expect(this.model.get('total')).equal(1.6667); - expect(this.model.get('total_tax')).equal(0.3333); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1].total).equal(0.3333); - expect(tax[1].subtotal).equal(0.5); - - }); - - it("should recalculate the correct exclusive tax on change to tax_class", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - this.model.set({ 'tax_class': 'reduced-rate' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0.15); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0.1); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1]).to.be.undefined; - expect(tax[2].total).equal(0.1); - expect(tax[2].subtotal).equal(0.15); - - }); - - it("should recalculate the correct inclusive tax on change to tax_class", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - this.model.set({ 'tax_class': 'reduced-rate' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(2.8571); - expect(this.model.get('subtotal_tax')).equal(0.1429); - expect(this.model.get('total')).equal(1.9048); - expect(this.model.get('total_tax')).equal(0.0952); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1]).to.be.undefined; - expect(tax[2].total).equal(0.0952); - expect(tax[2].subtotal).equal(0.1429); - - }); - - it("should recalculate the correct exclusive tax on change to zero rate", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - this.model.set({ 'tax_class': 'zero-rate' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0); - - // itemized - var tax = this.model.get('tax'); - expect(tax[3].total).equal(0); - expect(tax[3].subtotal).equal(0); - - }); - - it("should recalculate the correct inclusive tax on change to zero rate", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - this.model.set({ 'tax_class': 'zero-rate' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0); - - // itemized - var tax = this.model.get('tax'); - expect(tax[3].total).equal(0); - expect(tax[3].subtotal).equal(0); - - }); - - }); - - describe('cart/model using US dummy tax', function () { - - beforeEach(function () { - this.model.tax_rates = dummy_tax_US; - }); - - it("should calculate the correct compound exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0.366); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0.244); - - // itemized - var tax = this.model.get('tax'); - expect(tax[4].total).equal(0.2); - expect(tax[4].subtotal).equal(0.3); - expect(tax[5].total).equal(0.044); - expect(tax[5].subtotal).equal(0.066); - - }); - - it("should calculate the correct compound inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(2.6738); - expect(this.model.get('subtotal_tax')).equal(0.3262); - expect(this.model.get('total')).equal(1.7825); - expect(this.model.get('total_tax')).equal(0.2175); - - // itemized - var tax = this.model.get('tax'); - expect(tax[4].total).equal(0.1783); - expect(tax[4].subtotal).equal(0.2674); - expect(tax[5].total).equal(0.0392); - expect(tax[5].subtotal).equal(0.0588); - - }); - - it("should calculate the correct non-compound exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - this.model.tax_rates['']['4'].compound = 'no'; - this.model.tax_rates['']['5'].compound = 'no'; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0.36); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0.24); - - // itemized - var tax = this.model.get('tax'); - expect(tax[4].total).equal(0.2); - expect(tax[4].subtotal).equal(0.3); - expect(tax[5].total).equal(0.04); - expect(tax[5].subtotal).equal(0.06); - - }); - - it("should calculate the correct non-compound inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - this.model.tax_rates['']['4'].compound = 'no'; - this.model.tax_rates['']['5'].compound = 'no'; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(2.6786); - expect(this.model.get('subtotal_tax')).equal(0.3214); - expect(this.model.get('total')).equal(1.7857); - expect(this.model.get('total_tax')).equal(0.2143); - - // itemized - var tax = this.model.get('tax'); - expect(tax[4].total).equal(0.1786); - expect(tax[4].subtotal).equal(0.2679); - expect(tax[5].total).equal(0.0357); - expect(tax[5].subtotal).equal(0.0536); - - }); - - it("should calculate the correct compound exclusive tax on change to tax_class", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // dummy product id 99, quantity 2, regular price $3, on sale for $2 - this.model.set({ 'taxable': true, 'tax_class': '' }); - this.model.set({ 'tax_class': 'reduced-rate' }); - - expect(this.model.get('item_price')).equal(2); - expect(this.model.get('subtotal')).equal(3); - expect(this.model.get('subtotal_tax')).equal(0); - expect(this.model.get('total')).equal(2); - expect(this.model.get('total_tax')).equal(0); - - // itemized - var tax = this.model.get('tax'); - expect(tax).to.be.undefined; - - }); - - }); - - describe('Woo Unit Tests', function () { - - it("should match the Woo unit test for inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - this.model.tax_rates = dummy_tax_GB; - this.model.set({ - 'taxable': true, - 'tax_class': '', - item_price: 9.99 - }); - expect(this.model.get('total')).equal(8.325); - expect(this.model.get('total_tax')).equal(1.665); - }); - - it("should match the Woo unit test for exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - this.model.tax_rates = dummy_tax_GB; - this.model.set({ - 'taxable': true, - 'tax_class': '', - item_price: 9.99 - }); - expect(this.model.get('total')).equal(9.99); - expect(this.model.get('total_tax')).equal(1.998); - }); - - it("should match the Woo unit test for compound exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - this.model.tax_rates = { - '': { - 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, - 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} - } - }; - this.model.set({ - 'taxable': true, - 'tax_class': '', - item_price: 100 - }); - - expect(this.model.get('total')).equal(100); - expect(this.model.get('total_tax')).equal(13.925); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1].total).equal(5.0000); - expect(tax[2].total).equal(8.925); - }); - - it("should match the Woo unit test for compound inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - this.model.tax_rates = { - '': { - 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, - 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} - } - }; - this.model.set({ - 'taxable': true, - 'tax_class': '', - item_price: 100 - }); - - expect(this.model.get('total')).equal(87.777); - expect(this.model.get('total_tax')).equal(12.223); - - // itemized - var tax = this.model.get('tax'); - expect(tax[1].total).equal(4.3889); - expect(tax[2].total).equal(7.8341); - }); - - }); - - }); - - describe('fee line items', function () { - - beforeEach(function () { - - var Model = require('entities/cart/model').extend({ - url: '?', - collection: {tax_rates: {}} - }); - this.model = new Model({ - type: 'fee' - }); - - }); - - it('should be in a valid state', function(){ - this.model.should.be.ok; - }); - - it('should init with default values', function(){ - this.model.get('item_subtotal').should.eql(0); - this.model.get('item_subtotal_tax').should.eql(0); - this.model.get('item_tax').should.eql(0); - this.model.get('subtotal').should.eql(0); - this.model.get('subtotal_tax').should.eql(0); - this.model.get('total').should.eql(0); - this.model.get('total_tax').should.eql(0); - }); - - }); - - describe('shipping line items', function () { - - beforeEach(function () { - - var Model = require('entities/cart/model').extend({ - url: '?', - collection: { tax_rates: {} } - }); - this.model = new Model({ - type: 'shipping' - }); - - }); - - it('should be in a valid state', function(){ - this.model.should.be.ok; - }); - - it('should init with default values', function(){ - this.model.get('item_subtotal').should.eql(0); - this.model.get('item_subtotal_tax').should.eql(0); - this.model.get('item_tax').should.eql(0); - this.model.get('subtotal').should.eql(0); - this.model.get('subtotal_tax').should.eql(0); - this.model.get('total').should.eql(0); - this.model.get('total_tax').should.eql(0); - }); - - describe('shipping line using GB dummy tax', function () { - - beforeEach(function () { - this.model.tax_rates = dummy_tax_GB; - }); - - it("should calculate the correct exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // 20% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(10); - this.model.get('total_tax').should.eql(2); - - var tax = this.model.get('tax'); - tax[1].total.should.eql(2); - }); - - it("should calculate the correct inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // 20% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(8.3333); - this.model.get('total_tax').should.eql(1.6667); - - var tax = this.model.get('tax'); - tax[1].total.should.eql(1.6667); - }); - - it("should honour the shipping='no' setting for exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - this.model.tax_rates[''][1]['shipping'] = 'no'; - - // 20% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(10); - this.model.get('total_tax').should.eql(0); - - expect(this.model.get('tax')).to.be.undefined; - }); - - it("should honour the shipping='no' setting for inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - this.model.tax_rates[''][1]['shipping'] = 'no'; - - // 20% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(10); - this.model.get('total_tax').should.eql(0); - - expect(this.model.get('tax')).to.be.undefined; - }); - - }); - - describe('shipping line using US dummy tax', function () { - - beforeEach(function () { - this.model.tax_rates = dummy_tax_US; - }); - - it("should calculate the correct exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - // 10% + 2% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(10); - this.model.get('total_tax').should.eql(1.2); - - var tax = this.model.get('tax'); - tax[4].total.should.eql(1); - tax[5].total.should.eql(0.2); - }); - - it("should calculate the correct inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - - // 10% + 2% incl tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(8.9286); - this.model.get('total_tax').should.eql(1.0714); - - var tax = this.model.get('tax'); - tax[4].total.should.eql(0.8929); - tax[5].total.should.eql(0.1786); - }); - - it("should honour the shipping='no' setting for exclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - this.model.tax_rates[''][4]['shipping'] = 'yes'; - this.model.tax_rates[''][5]['shipping'] = 'no'; - - // 10% tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(10); - this.model.get('total_tax').should.eql(1); - - var tax = this.model.get('tax'); - tax[4].total.should.eql(1); - expect(tax[5]).to.be.undefined; - }); - - it("should honour the shipping='no' setting for inclusive tax", function() { - this.model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'yes' - }; - this.model.tax_rates[''][4]['shipping'] = 'no'; - this.model.tax_rates[''][5]['shipping'] = 'yes'; - - // 2% incl tax for $10 shipping - this.model.set({ 'item_price': 10 }); - - this.model.get('item_price').should.eql(10); - this.model.get('total').should.eql(9.8039); - this.model.get('total_tax').should.eql(0.1961); - - var tax = this.model.get('tax'); - expect(tax[4]).to.be.undefined; - tax[5].total.should.eql(0.1961); - }); - - }); - - }); - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/abstract.spec.js b/tests/unit/js/spec/entities/cart/models/abstract.spec.js new file mode 100644 index 00000000..26ea8c69 --- /dev/null +++ b/tests/unit/js/spec/entities/cart/models/abstract.spec.js @@ -0,0 +1,108 @@ +describe('entities/cart/models/abstract.js', function () { + + var Model = require('entities/cart/models/abstract'); + + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + it('should be in a valid state', function () { + var model = new Model(); + expect(model).to.be.ok; + }); + + it('should have sum convenience method ', function() { + + var model = new Model(); + + model.set({ + total: 1.23, + subtotal: 4.56 + }); + + var sum = model.sum(['total', 'subtotal']); + expect(sum).equals(5.79); + }); + + it('should init with a tax_rate collection for calc_tax = \'yes\'', function(){ + + var model = new Model(); + expect( model.taxes ).to.be.undefined; + + var model = new Model( { taxable: true, tax_class: '' }, { + collection: { + order : { + tax: { + calc_tax: 'yes' + }, + tax_rates: dummy_tax_US + } + } + }); + + expect( model.taxes ).to.be.instanceOf( Backbone.Collection ); + expect( model.taxes ).to.have.length(2); + + }); + + it('should reset tax rates on tax_class change', function(){ + + var model = new Model( { taxable: true, tax_class: '' }, { + collection: { + order : { + tax: { + calc_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + expect( model.taxes ).to.have.length(1); + expect( model.taxes.at(0).get('rate_id') ).equals('1'); + + model.set( { tax_class: 'reduced-rate' } ); + + expect( model.taxes ).to.have.length(1); + expect( model.taxes.at(0).get('rate_id') ).equals('2'); + + }); + + it('should reset tax rates on taxable change', function(){ + + var model = new Model( { taxable: false, tax_class: '' }, { + collection: { + order : { + tax: { + calc_tax: 'yes' + }, + tax_rates: dummy_tax_US + } + } + }); + + expect( model.taxes ).to.have.length(0); + model.set( { taxable: true } ); + expect( model.taxes ).to.have.length(2); + model.set( { taxable: false } ); + expect( model.taxes ).to.have.length(0); + + }); + + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/fee.spec.js b/tests/unit/js/spec/entities/cart/models/fee.spec.js new file mode 100644 index 00000000..b3ee32f8 --- /dev/null +++ b/tests/unit/js/spec/entities/cart/models/fee.spec.js @@ -0,0 +1,95 @@ +describe('entities/cart/models/fee.js', function () { + + var Model = require('entities/cart/models/fee'); + + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + it('should be in a valid state', function () { + var model = new Model(); + expect(model).to.be.ok; + expect(model.type).to.equal('fee'); + }); + + it('should init with correct initial values (no tax)', function(){ + + var model = new Model(); + + expect(model.get('item_price')).equals(0); + expect(model.get('total')).equals(0); + + var model = new Model({ taxable: false, price: '5' }); + expect(model.get('item_price')).equals(5); + expect(model.get('total')).equals(5); + + }); + + describe('entities/cart/models/fee using GB dummy tax', function () { + + it("should init with the correct exclusive tax", function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + expect( model.get('item_price') ).equals( 10 ); + expect( model.get('total') ).equals( 10 ); + expect( model.get('total_tax') ).equals( 2 ); + + }); + + it("should init with the correct inclusive tax", function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + expect( model.get('item_price') ).equals( 10 ); + expect( model.get('total') ).equals( 8.3333 ); + expect( model.get('total_tax') ).equals( 1.6667 ); + + }); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/product.spec.js b/tests/unit/js/spec/entities/cart/models/product.spec.js new file mode 100644 index 00000000..2e02248b --- /dev/null +++ b/tests/unit/js/spec/entities/cart/models/product.spec.js @@ -0,0 +1,581 @@ +describe('entities/cart/models/product.js', function () { + + var dummy_products = require('./../../../../data/products.json'); + var Model = require('entities/cart/models/product'); + + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + it('should be in a valid state', function () { + var model = new Model(); + expect(model).to.be.ok; + expect(model.type).to.equal('product'); + }); + + it('should parse simple product attributes into a cart line item', function(){ + + var product = _.find(dummy_products.products, function (product) { + return product.type === 'simple'; + }); + + var model = new Model( product, { parse: true } ); + + expect(model.id).to.be.undefined; + expect(model.get('title')).to.be.undefined; + expect(model.get('name')).to.equal(product.title); + + }); + + it('should parse variations into a cart line item with meta', function(){ + + var product = _.find(dummy_products.products, function (product) { + return product.type === 'variable'; + }); + + var variation = product.variations[0]; + variation.type = 'variation'; + + var model = new Model( variation, { parse: true } ); + + expect(model.id).to.be.undefined; + expect(model.get('meta')).to.eql([{ + key: 1, + label: 'Color', + value: 'Black' + }]); + + }); + + it('should have a quantity convenience method ', function() { + + var product = dummy_products.products[0]; + var model = new Model( product, { parse: true } ); + + expect(model.get('quantity')).equals(1); + model.quantity('increase'); + expect(model.get('quantity')).equals(2); + model.quantity('decrease'); + expect(model.get('quantity')).equals(1); + }); + + it("should initiate with the correct values (no tax)", function() { + + var product = dummy_products.products[0]; + product.taxable = false; + var model = new Model( product, { parse: true } ); + expect(model.get('item_price')).equal( parseFloat( product.price ) ); + expect(model.get('total')).equal( parseFloat( product.price ) ); + + }); + + it("should re-calculate on quantity change to any floating point number", function() { + + var product = dummy_products.products[0]; + var model = new Model( product, { parse: true } ); + + var quantity = _.random(10, true); + model.set( { 'quantity': quantity } ); + + expect(model.get('quantity')).equal(quantity); + expect(model.get('total')).equal( parseFloat( ( product.price * quantity ).toFixed(4) ) ); + + }); + + /** + * matching tests from https://github.com/woothemes/woocommerce/blob/master/tests/unit-tests/tax/tax.php + */ + describe('Woo Unit Tests', function () { + + it("should match the Woo unit test for inclusive tax", function() { + var model = new Model({ + taxable: true, + tax_class: '', + price: 9.99 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + expect(model.get('total')).equal(8.325); + expect(model.get('total_tax')).equal(1.665); + }); + + it("should match the Woo unit test for exclusive tax", function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 9.99 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + expect(model.get('total')).equal(9.99); + expect(model.get('total_tax')).equal(1.998); + }); + + it("should match the Woo unit test for compound exclusive tax", function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 100 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: { + '': { + 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, + 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} + } + } + } + } + }); + + expect(model.get('total')).equal(100); + expect(model.get('total_tax')).equal(13.925); + + // itemized + //var tax = model.get('tax'); + //expect(tax[1].total).equal(5.0000); + //expect(tax[2].total).equal(8.925); + }); + + it("should match the Woo unit test for compound inclusive tax", function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 100 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: { + '': { + 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, + 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} + } + } + } + } + }); + + expect(model.get('total')).equal(87.777); + expect(model.get('total_tax')).equal(12.223); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[1].total).equal(4.3889); + //expect(tax[2].total).equal(7.8341); + }); + + }); + + + describe('entities/cart/models/product using GB dummy tax', function () { + + var product = dummy_products.products[0]; + + it("should calculate the correct exclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0.6); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0.4); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[1].total).equal(0.4); + //expect(tax[1].subtotal).equal(0.6); + + }); + + it("should calculate the correct inclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(2.5); + expect(model.get('subtotal_tax')).equal(0.5); + expect(model.get('total')).equal(1.6667); + expect(model.get('total_tax')).equal(0.3333); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[1].total).equal(0.3333); + //expect(tax[1].subtotal).equal(0.5); + + }); + + it("should recalculate the correct exclusive tax on change to tax_class", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'tax_class': 'reduced-rate' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0.15); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0.1); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[1]).to.be.undefined; + //expect(tax[2].total).equal(0.1); + //expect(tax[2].subtotal).equal(0.15); + + }); + + it("should recalculate the correct inclusive tax on change to tax_class", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'tax_class': 'reduced-rate' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(2.8571); + expect(model.get('subtotal_tax')).equal(0.1429); + expect(model.get('total')).equal(1.9048); + expect(model.get('total_tax')).equal(0.0952); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[1]).to.be.undefined; + //expect(tax[2].total).equal(0.0952); + //expect(tax[2].subtotal).equal(0.1429); + + }); + + it("should recalculate the correct exclusive tax on change to zero rate", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'tax_class': 'zero-rate' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[3].total).equal(0); + //expect(tax[3].subtotal).equal(0); + + }); + + it("should recalculate the correct inclusive tax on change to zero rate", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'tax_class': 'zero-rate' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[3].total).equal(0); + //expect(tax[3].subtotal).equal(0); + + }); + + }); + + describe('cart/model using US dummy tax', function () { + + var product = dummy_products.products[0]; + + it("should calculate the correct compound exclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_US + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0.366); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0.244); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[4].total).equal(0.2); + //expect(tax[4].subtotal).equal(0.3); + //expect(tax[5].total).equal(0.044); + //expect(tax[5].subtotal).equal(0.066); + + }); + + it("should calculate the correct compound inclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_US + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(2.6738); + expect(model.get('subtotal_tax')).equal(0.3262); + expect(model.get('total')).equal(1.7825); + expect(model.get('total_tax')).equal(0.2175); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[4].total).equal(0.1783); + //expect(tax[4].subtotal).equal(0.2674); + //expect(tax[5].total).equal(0.0392); + //expect(tax[5].subtotal).equal(0.0588); + + }); + + it("should calculate the correct non-compound exclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'no'} + } + } + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0.36); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0.24); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[4].total).equal(0.2); + //expect(tax[4].subtotal).equal(0.3); + //expect(tax[5].total).equal(0.04); + //expect(tax[5].subtotal).equal(0.06); + + }); + + it("should calculate the correct non-compound inclusive tax", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'no'} + } + } + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(2.6786); + expect(model.get('subtotal_tax')).equal(0.3214); + expect(model.get('total')).equal(1.7857); + expect(model.get('total_tax')).equal(0.2143); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax[4].total).equal(0.1786); + //expect(tax[4].subtotal).equal(0.2679); + //expect(tax[5].total).equal(0.0357); + //expect(tax[5].subtotal).equal(0.0536); + + }); + + it("should calculate the correct compound exclusive tax on change to tax_class", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_US + } + } + }); + + // dummy product id 99, regular price $3, on sale for $2 + model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'tax_class': 'reduced-rate' }); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal(3); + expect(model.get('subtotal_tax')).equal(0); + expect(model.get('total')).equal(2); + expect(model.get('total_tax')).equal(0); + + // itemized + //var tax = this.model.get('tax'); + //expect(tax).to.be.undefined; + + }); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/shipping.spec.js b/tests/unit/js/spec/entities/cart/models/shipping.spec.js new file mode 100644 index 00000000..9455be88 --- /dev/null +++ b/tests/unit/js/spec/entities/cart/models/shipping.spec.js @@ -0,0 +1,259 @@ +describe('entities/cart/models/shipping.js', function () { + + var Model = require('entities/cart/models/shipping'); + + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + it('should be in a valid state', function () { + var model = new Model(); + expect(model).to.be.ok; + expect(model.type).to.equal('shipping'); + }); + + it('should init with correct initial values (no tax)', function(){ + + var model = new Model(); + expect(model.get('item_price')).equals(0); + expect(model.get('total')).equals(0); + + var model = new Model({ taxable: false, price: '10' }); + expect(model.get('item_price')).equals(10); + expect(model.get('total')).equals(10); + + }); + + describe('shipping line using GB dummy tax', function () { + + it('should calculate the correct exclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(10); + model.get('total_tax').should.eql(2); + + }); + + it('should calculate the correct inclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(8.3333); + model.get('total_tax').should.eql(1.6667); + + }); + + it('should honour the shipping=\'no\' setting for exclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'no', compound: 'yes'} + } + } + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(10); + model.get('total_tax').should.eql(0); + + }); + + it('should honour the shipping=\'no\' setting for inclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'no', compound: 'yes'} + } + } + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(10); + model.get('total_tax').should.eql(0); + + }); + + }); + + describe('shipping line using US dummy tax', function () { + + it('should calculate the correct exclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_US + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(10); + model.get('total_tax').should.eql(1.22); + + }); + + it('should calculate the correct inclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_US + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(8.9127); + model.get('total_tax').should.eql(1.0873); + + }); + + it('should honour the shipping=\'no\' setting for exclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'no' + }, + tax_rates: { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'no', compound: 'yes'} + } + } + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(10); + model.get('total_tax').should.eql(1); + }); + + it('should honour the shipping=\'no\' setting for inclusive tax', function() { + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_tax: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'no', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + } + } + }); + + model.get('item_price').should.eql(10); + model.get('total').should.eql(9.8039); + model.get('total_tax').should.eql(0.1961); + + }); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/entities.spec.js b/tests/unit/js/spec/entities/entities.spec.js deleted file mode 100644 index e26943df..00000000 --- a/tests/unit/js/spec/entities/entities.spec.js +++ /dev/null @@ -1,9 +0,0 @@ -describe('entities', function () { - require('./service'); - require('./products/model'); - require('./variations/collection'); - require('./orders/collection'); - require('./orders/model'); - require('./cart/collection'); - require('./cart/model'); -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/collection.js b/tests/unit/js/spec/entities/orders/collection.js deleted file mode 100644 index a95b7081..00000000 --- a/tests/unit/js/spec/entities/orders/collection.js +++ /dev/null @@ -1,18 +0,0 @@ -describe('entities/orders/collection.js', function () { - - beforeEach(function () { - - var Collection = proxyquire('entities/orders/collection',{ - './model': Backbone.Model, - 'lib/config/dual-collection': Backbone.Collection, - 'lib/config/indexeddb': stub() - }); - this.collection = new Collection(); - - }); - - it('should be in a valid state', function() { - expect(this.collection).to.be.ok; - }); - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/collection.spec.js b/tests/unit/js/spec/entities/orders/collection.spec.js new file mode 100644 index 00000000..b6118924 --- /dev/null +++ b/tests/unit/js/spec/entities/orders/collection.spec.js @@ -0,0 +1,31 @@ +describe('entities/orders/collection.js', function () { + + var dummy_orders = require('./../../../data/orders.json'); + + beforeEach(function () { + + // @todo idb-wrapper throws an error + //var Collection = require('entities/orders/collection'); + + var Collection = proxyquire('entities/orders/collection',{ + 'lib/config/dual-collection': require('lib/config/collection') + }); + this.collection = new Collection(); + }); + + it('should be in a valid state', function() { + expect(this.collection).to.be.ok; + }); + + it('should parse orders, with or without \'orders\' node', function() { + + // { parse: true } runs through both Collection and Model parse + this.collection.set( dummy_orders, { parse: true } ); + expect(this.collection.length).to.equal( dummy_orders.orders.length ); + + this.collection.set( dummy_orders.orders, { parse: true } ); + expect(this.collection.length).to.equal( dummy_orders.orders.length ); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/model.js b/tests/unit/js/spec/entities/orders/model.js deleted file mode 100644 index d96f43da..00000000 --- a/tests/unit/js/spec/entities/orders/model.js +++ /dev/null @@ -1,117 +0,0 @@ -describe('entities/orders/model.js', function () { - - /** - * TODO: cart & gateway collections too coupled to order model - */ - beforeEach(function () { - var entitiesChannel = Backbone.Radio.channel('entities'); - entitiesChannel.reply('get', function(){ - var Collection = Backbone.Collection.extend({ - url: '?', - sum: function(){}, - itemizedTax: function(){} - }); - return new Collection(); - }); - - var Model = require('entities/orders/model'); - this.order = new Model(); - this.order.save = stub(); - - }); - - it('should be in a valid state', function() { - expect(this.order).to.be.ok; - }); - - it('should have sum convenience method', function() { - var arr = []; - while(arr.length < 3){ - arr.push( Math.random() ); - } - this.order.set({ - foo: arr[0], - bar: arr[1], - baz: arr[2] - }); - var sum = arr.reduce(function(pv, cv) { return pv + cv; }, 0); - expect(this.order.sum(['foo', 'bar', 'baz'])).equals(sum); - }); - - it('should destroy itself when cart is empty', function() { - this.order.cart.add([ - { title: 'foo' }, - { title: 'bar' } - ]); - this.order.destroy = stub(); - - // void - _.invoke( this.order.cart.toArray(), 'destroy'); - expect(this.order.destroy).to.have.been.calledOnce; - - // single remove - this.order.cart.add([ - { title: 'foo' } - ]); - this.order.cart.at(0).destroy(); - expect(this.order.destroy).to.have.been.calledTwice; - }); - - //describe('onSaveSuccess()', function () { - // before(function () { - // expect(this.order).to.respondTo('onSaveSuccess'); - // }); - // - // beforeEach(function(){ - // var CartItem = Backbone.Model.extend({ - // url: '?' - // }); - // this.order.cart = new Backbone.Collection([ - // new CartItem({ title: 'foo' }), - // new CartItem({ title: 'bar' }) - // ]); - // }); - // - // it('should set cart.order_id if undefined', function() { - // this.order.set({local_id: 1}); - // this.order.onSaveSuccess(); - // expect(this.order.cart.order_id).equals(1); - // }); - // - // it('should update cart items with order_id', function() { - // this.order.set({local_id: 1}); - // this.order.onSaveSuccess(); - // expect(this.order.cart.where({order: 1})).to.have.length(2); - // }); - // - //}); - - describe('calcTotals()', function () { - - beforeEach(function(){ - var Collection = Backbone.Collection.extend({ - sum: function(prop){ - if(prop === 'total') return 10; - if(prop === 'subtotal') return 12; - }, - save: stub(), - itemizedTax: stub() - }); - this.order.cart = new Collection({ title: 'foo' }); - }); - - it('should calculate the cart discount', function() { - this.order.calcTotals(); - var totals = this.order.save.args[0][0]; // first args on first call - expect(totals.cart_discount).equals(2); - }); - - }); - - afterEach(function(){ - Backbone.Radio.reset(); - }); - - - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js new file mode 100644 index 00000000..d2d296f1 --- /dev/null +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -0,0 +1,122 @@ +describe('entities/orders/model.js', function () { + + var dummy_order = require('./../../../data/order.json'); + var OrderModel = require('entities/orders/model'); + + it('should be in a valid state', function () { + var model = new OrderModel(); + expect(model).to.be.ok; + }); + + it('should parse orders, with or without \'order\' node', function() { + + // parse is not an option on set, only on init .. also automatically on fetch and save + //this.model.set( dummy_order, { parse: true } ); + var model = new OrderModel( dummy_order, { parse: true } ); + expect(model.attributes).to.have.property('id'); + + var model = new OrderModel( dummy_order.order, { parse: true } ); + expect(model.attributes).to.have.property('id'); + + }); + + it('should not change order on export', function(){ + var model = new OrderModel( dummy_order, { parse: true } ); + expect( model.toJSON() ).to.eql( dummy_order.order ); + }); + + it('should parse line_items, shipping_lines and fee_lines into a Cart collection (if isEditable)', function(){ + + // change status to CREATE_FAILED + var order = _.defaults( { status: 'CREATE_FAILED' }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + expect( model.cart ).to.be.instanceOf( Backbone.Collection ); + + expect( model.cart.length ).to.equal( order.line_items.length + order.shipping_lines.length + order.fee_lines.length ); + + }); + + /** + * Removed test: POS changes strings to floats and add extra data, such as item_price + */ + //it('should export line_items, shipping_lines and fee_lines from Cart collection (if Editable)', function(){ + // + // // change status to UPDATE_FAILED + // var order = _.defaults( { status: 'UPDATE_FAILED' }, dummy_order.order ); + // var model = new OrderModel( order, { parse: true } ); + // + // expect( model.toJSON() ).to.containSubset( order ); + // + //}); + + it('should save on change to the cart', function(){ + + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + model.sync = sinon.stub(); + + var cart_item = model.cart.at(0); + cart_item.set({ quantity: 3 }); + + expect( model.sync ).to.have.been.calledWith( 'update' ); + + }); + + it('should save on add item to cart', function(){ + + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + model.sync = sinon.stub(); + + model.cart.add({ id: 123 }); + + expect( model.sync ).to.have.been.calledWith( 'update' ); + + }); + + it('should save on remove item to cart', function(){ + + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + model.sync = sinon.stub(); + + var cart_item = model.cart.at(0); + model.cart.remove(cart_item); + + expect( model.sync ).to.have.been.calledWith( 'update' ); + + }); + + it('should destroy order if cart is empty', function(){ + + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + model.sync = sinon.stub(); + + // http://stackoverflow.com/questions/10858935/cleanest-way-to-destroy-every-model-in-a-collection-in-backbone + + //_.each( model.cart.toArray(), function(cart_item) { + // if( model.cart.length > 1 ){ + // model.cart.remove(cart_item, { silent: true }); + // } else { + // model.cart.remove(cart_item); + // } + //}); +// OR + while (cart_item = model.cart.first()) { + if( model.cart.length > 1 ){ + model.cart.remove(cart_item, { silent: true }); + } else { + model.cart.remove(cart_item); + } + } + + expect( model.sync ).to.have.been.calledWith( 'delete' ); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/products/model.js b/tests/unit/js/spec/entities/products/model.spec.js similarity index 100% rename from tests/unit/js/spec/entities/products/model.js rename to tests/unit/js/spec/entities/products/model.spec.js diff --git a/tests/unit/js/spec/entities/service.js b/tests/unit/js/spec/entities/service.spec.js similarity index 100% rename from tests/unit/js/spec/entities/service.js rename to tests/unit/js/spec/entities/service.spec.js diff --git a/tests/unit/js/spec/entities/tax/collection.spec.js b/tests/unit/js/spec/entities/tax/collection.spec.js new file mode 100644 index 00000000..9f475994 --- /dev/null +++ b/tests/unit/js/spec/entities/tax/collection.spec.js @@ -0,0 +1,41 @@ +describe('entities/tax/collection.js', function () { + + var Collection = require('entities/tax/collection'); + + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + it('should be in a valid state', function() { + var collection = new Collection(); + expect(collection).to.be.ok; + }); + + it('should parse tax rates from POS params', function(){ + var collection = new Collection( dummy_tax_US[''], { parse: true } ); + expect(collection).to.have.length(2); + expect(collection.pluck('rate_id')).to.eql(['4', '5']); + }); + + it('update rate collection on tax_class change', function(){ + var collection = new Collection( dummy_tax_US[''], { parse: true } ); + expect(collection).to.have.length(2); + expect(collection.pluck('rate_id')).to.eql(['4', '5']); + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/tax/model.spec.js b/tests/unit/js/spec/entities/tax/model.spec.js new file mode 100644 index 00000000..59e605c1 --- /dev/null +++ b/tests/unit/js/spec/entities/tax/model.spec.js @@ -0,0 +1,10 @@ +describe('entities/tax/model.js', function () { + + var Model = require('entities/tax/model'); + + it('should be in a valid state', function () { + var model = new Model(); + expect(model).to.be.ok; + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/variations/collection.js b/tests/unit/js/spec/entities/variations/collection.spec.js similarity index 100% rename from tests/unit/js/spec/entities/variations/collection.js rename to tests/unit/js/spec/entities/variations/collection.spec.js diff --git a/tests/unit/js/spec/lib/components.spec.js b/tests/unit/js/spec/lib/components.spec.js deleted file mode 100644 index 6febf73a..00000000 --- a/tests/unit/js/spec/lib/components.spec.js +++ /dev/null @@ -1,4 +0,0 @@ -describe('lib/components', function () { - require('./components/buttons'); - //require('./components/customer-select'); -}); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/components/buttons.js b/tests/unit/js/spec/lib/components/buttons.spec.js similarity index 100% rename from tests/unit/js/spec/lib/components/buttons.js rename to tests/unit/js/spec/lib/components/buttons.spec.js diff --git a/tests/unit/js/spec/lib/components/customer-select.js b/tests/unit/js/spec/lib/components/customer-select.js deleted file mode 100644 index c09f2911..00000000 --- a/tests/unit/js/spec/lib/components/customer-select.js +++ /dev/null @@ -1,75 +0,0 @@ -describe('lib/components/customer-select/view.js', function () { - - beforeEach(function () { - - // dummy customer - var file = fs.readFileSync( 'tests/unit/js/data/customers.json' ); - var dummy = JSON.parse( file ); - this.customer = dummy.customers[0]; - - var View = proxyquire('lib/components/customer-select/view',{ - 'lib/behaviors/select2': stub(), - 'lib/config/item-view': Backbone.View - }); - this.view = new View(); - - }); - - it('should be in a valid state', function() { - expect(this.view).to.be.ok; - }); - - describe('formatResult method', function () { - - before(function(){ - expect(this.view).to.have.property('formatResult') - .that.is.a('function'); - }); - - it('should return customer as "first_name last_name (email_address)"', function(){ - var formattedResult = this.view.formatResult(this.customer); - expect(formattedResult).to.be.a('string') - .that.equals('' + - this.customer.first_name + ' ' + - this.customer.last_name + ' (' + - this.customer.email + ')' - ); - }); - - it('should return "username (email_address)" if no names present', function(){ - this.customer.first_name = this.customer.last_name = ''; - var formattedResult = this.view.formatResult(this.customer); - expect(formattedResult).to.be.a('string') - .that.equals('' + - this.customer.username + ' (' + this.customer.email + ')' - ); - }); - - }); - - describe('formatSelection method', function () { - - before(function(){ - expect(this.view).to.have.property('formatSelection') - .that.is.a('function'); - }); - - it('should return customer as "first_name last_name"', function(){ - var formattedResult = this.view.formatSelection(this.customer); - expect(formattedResult).to.be.a('string') - .that.equals('' + - this.customer.first_name + ' ' + - this.customer.last_name - ); - }); - - it('should return "username" if no names present', function(){ - this.customer.first_name = this.customer.last_name = ''; - var formattedResult = this.view.formatSelection(this.customer); - expect(formattedResult).to.be.a('string') - .that.equals(this.customer.username); - }); - - }); - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/config.spec.js b/tests/unit/js/spec/lib/config.spec.js deleted file mode 100644 index 3b568a28..00000000 --- a/tests/unit/js/spec/lib/config.spec.js +++ /dev/null @@ -1,5 +0,0 @@ -describe('lib/config', function () { - require('./config/model'); - require('./config/dual-model'); - require('./config/dual-collection'); -}); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/config/dual-collection.js b/tests/unit/js/spec/lib/config/dual-collection.spec.js similarity index 100% rename from tests/unit/js/spec/lib/config/dual-collection.js rename to tests/unit/js/spec/lib/config/dual-collection.spec.js diff --git a/tests/unit/js/spec/lib/config/dual-model.js b/tests/unit/js/spec/lib/config/dual-model.spec.js similarity index 100% rename from tests/unit/js/spec/lib/config/dual-model.js rename to tests/unit/js/spec/lib/config/dual-model.spec.js diff --git a/tests/unit/js/spec/lib/config/model.js b/tests/unit/js/spec/lib/config/model.spec.js similarity index 100% rename from tests/unit/js/spec/lib/config/model.js rename to tests/unit/js/spec/lib/config/model.spec.js diff --git a/tests/unit/js/spec/lib/utilities.spec.js b/tests/unit/js/spec/lib/utilities.spec.js deleted file mode 100644 index f03e5062..00000000 --- a/tests/unit/js/spec/lib/utilities.spec.js +++ /dev/null @@ -1,4 +0,0 @@ -describe('lib/utilities', function () { - require('./utilities/utils'); - require('./utilities/handlebars-helpers'); -}); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/utilities/handlebars-helpers.js b/tests/unit/js/spec/lib/utilities/handlebars-helpers.spec.js similarity index 100% rename from tests/unit/js/spec/lib/utilities/handlebars-helpers.js rename to tests/unit/js/spec/lib/utilities/handlebars-helpers.spec.js diff --git a/tests/unit/js/spec/lib/utilities/utils.js b/tests/unit/js/spec/lib/utilities/utils.spec.js similarity index 100% rename from tests/unit/js/spec/lib/utilities/utils.js rename to tests/unit/js/spec/lib/utilities/utils.spec.js From eff942536cc20fd4d545679b083369ffe16b4308 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 21 Jan 2016 15:45:19 +0800 Subject: [PATCH 017/169] refactor order model --- .../apps/pos/cart/views/line/views/drawer.js | 8 ++ .../apps/pos/cart/views/line/views/item.js | 29 ++-- assets/js/src/apps/pos/cart/views/totals.js | 20 +-- assets/js/src/entities/cart/collection.js | 6 +- .../js/src/entities/cart/models/abstract.js | 38 +++-- assets/js/src/entities/cart/models/fee.js | 14 ++ assets/js/src/entities/cart/models/product.js | 4 + .../js/src/entities/cart/models/shipping.js | 14 ++ assets/js/src/entities/orders/model.js | 131 +++++++++++++++++- includes/views/pos/cart/tmpl-item-drawer.php | 9 +- includes/views/pos/cart/tmpl-totals.php | 2 +- .../entities/cart/models/abstract.spec.js | 8 +- .../js/spec/entities/cart/models/fee.spec.js | 46 +++++- .../spec/entities/cart/models/product.spec.js | 30 ++-- .../entities/cart/models/shipping.spec.js | 16 +-- .../js/spec/entities/orders/model.spec.js | 106 ++++++++++++++ 16 files changed, 392 insertions(+), 89 deletions(-) diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index cc14972e..14af86e2 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -11,6 +11,14 @@ module.exports = FormView.extend({ template: 'pos.cart.item-drawer', + templateHelpers: function(){ + return { + product : this.model.type === 'product', + shipping : this.model.type === 'shipping', + fee : this.model.type === 'fee' + }; + }, + behaviors: { AutoGrow: { behaviorClass: AutoGrow diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index 7ba3ef31..43162adc 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -1,7 +1,5 @@ var FormView = require('lib/config/form-view'); var Utils = require('lib/utilities/utils'); -var bb = require('backbone'); -var Radio = bb.Radio; var AutoGrow = require('lib/behaviors/autogrow'); var Numpad = require('lib/components/numpad/behavior'); var _ = require('lodash'); @@ -11,13 +9,6 @@ module.exports = FormView.extend({ className: 'list-row', - initialize: function() { - this.tax = Radio.request('entities', 'get', { - type: 'option', - name: 'tax' - }) || {}; - }, - templateHelpers: function(){ return { product : this.model.type === 'product', @@ -83,20 +74,16 @@ module.exports = FormView.extend({ '.total': { observe: ['total', 'subtotal', 'tax_class', 'taxable'], updateMethod: 'html', - onGet: function(value) { - if( this.tax.tax_display_cart === 'incl' ) { - value[0] = this.model.sum(['total', 'total_tax']); - value[1] = this.model.sum(['subtotal', 'subtotal_tax']); - } - - var total = Utils.formatMoney(value[0]), - subtotal = Utils.formatMoney(value[1]); + onGet: function() { + var total = this.model.getDisplayTotal(), + subtotal = this.model.getDisplaySubtotal(); - if(total !== subtotal){ - return '' + subtotal + ' ' + total + ''; - } else { - return total; + if( ! subtotal || total === subtotal ){ + return Utils.formatMoney( total ); } + + return '' + Utils.formatMoney( subtotal ) + ' ' + + '' + Utils.formatMoney( total ) + ''; } } }, diff --git a/assets/js/src/apps/pos/cart/views/totals.js b/assets/js/src/apps/pos/cart/views/totals.js index 15b36633..fa17ce9e 100644 --- a/assets/js/src/apps/pos/cart/views/totals.js +++ b/assets/js/src/apps/pos/cart/views/totals.js @@ -1,17 +1,9 @@ var ItemView = require('lib/config/form-view'); -var Radio = require('backbone.radio'); module.exports = ItemView.extend({ tagName: 'ul', template: 'pos.cart.totals', - initialize: function() { - this.tax = Radio.request('entities', 'get', { - type : 'option', - name : 'tax' - }) || {}; - }, - // todo: why is this necessary?! // view should re-render automatically on model change modelEvents: { @@ -23,16 +15,14 @@ module.exports = ItemView.extend({ */ templateHelpers: function(){ var data = { - itemized: this.tax.tax_total_display === 'itemized', + itemized: this.model.tax.tax_total_display === 'itemized', + incl_tax: this.model.tax.tax_display_cart === 'incl', has_discount: 0 !== this.model.get('cart_discount') }; - if( this.tax.tax_display_cart === 'incl' ) { - data.subtotal = this.model.sum(['subtotal', 'subtotal_tax']); - data.cart_discount = this.model.sum( - ['cart_discount', 'cart_discount_tax'] - ); - data.incl_tax = true; + if( data.incl_tax ) { + data.subtotal = this.model.getDisplaySubtotal(); + data.cart_discount = this.model.getDisplayCartDiscount(); } return data; diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index d59e82d9..4e492c36 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -65,11 +65,11 @@ module.exports = bb.Collection.extend({ * convenience method to sum attributes in cart */ sum: function(attribute, type){ - return this.reduce( function( sum, model ){ + return this.reduce( function( total, model ){ if( type && type !== model.type ){ - return sum; + return total; } - return sum + parseFloat( model.get(attribute) ); + return _.sum([ total, model.get(attribute) ]); }, 0 ); } diff --git a/assets/js/src/entities/cart/models/abstract.js b/assets/js/src/entities/cart/models/abstract.js index 905b3c92..56252baa 100644 --- a/assets/js/src/entities/cart/models/abstract.js +++ b/assets/js/src/entities/cart/models/abstract.js @@ -6,15 +6,12 @@ var debug = require('debug')('cartItem'); module.exports = bb.Model.extend({ - constructor: function(){ - // set attributes, parse if required - bb.Model.apply(this, arguments); - + initialize: function(){ // copy tax info from order collection this.tax_options = _.get( this, ['collection', 'order', 'tax'], {} ); // attach tax_rates collection - if( this.tax_options.calc_tax === 'yes' ){ + if( this.tax_options.calc_taxes === 'yes' ){ this.attachTaxes({ prices_include_tax: this.tax_options.prices_include_tax }); @@ -34,11 +31,11 @@ module.exports = bb.Model.extend({ this.taxes = new Taxes( [], _.extend( { line_item : this }, options ) ); this.on( 'change:taxable change:tax_class', function(){ this.resetTaxes(); - this.updateTotals(); }, this ); this.resetTaxes(); }, + /* jshint -W071 */ updateTotals: function(){ var item_price = this.get('item_price'), item_tax = 0; @@ -60,12 +57,9 @@ module.exports = bb.Model.extend({ }; this.set(totals); - }, - - set: function(){ debug('update cart item', this); - bb.Model.prototype.set.apply(this, arguments); }, + /* jshint +W071 */ resetTaxes: function(){ var tax_rates = null; @@ -77,6 +71,8 @@ module.exports = bb.Model.extend({ } this.taxes.reset( tax_rates, { parse: true } ); + + this.updateTotals(); }, /** @@ -88,6 +84,28 @@ module.exports = bb.Model.extend({ sum += this.get(array[i]); } return Utils.round(sum, 4); + }, + + /** + * Value displayed in cart + */ + getDisplayTotal: function(){ + if( this.tax_options.tax_display_cart === 'incl' ) { + return this.sum(['total', 'total_tax']); + } else { + return this.get('total'); + } + }, + + /** + * Value displayed in cart + */ + getDisplaySubtotal: function(){ + if( this.tax_options.tax_display_cart === 'incl' ) { + return this.sum(['subtotal', 'subtotal_tax']); + } else { + return this.get('subtotal'); + } } }); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/fee.js b/assets/js/src/entities/cart/models/fee.js index 10df147d..64416ef3 100644 --- a/assets/js/src/entities/cart/models/fee.js +++ b/assets/js/src/entities/cart/models/fee.js @@ -10,6 +10,20 @@ module.exports = Model.extend({ title : polyglot.t('titles.fee'), taxable : true }; + }, + + /** + * Return total and total_tax for subtotal and subtotal_tax, respectively + * - a little confusing, but makes cart.sum('subtotal') easier + */ + get: function( attr ){ + if( attr === 'subtotal' ){ + attr = 'total'; + } + if( attr === 'subtotal_tax' ){ + attr = 'total_tax'; + } + return Model.prototype.get.call(this, attr); } }); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js index 942a17c0..cfdea881 100644 --- a/assets/js/src/entities/cart/models/product.js +++ b/assets/js/src/entities/cart/models/product.js @@ -1,6 +1,7 @@ var Model = require('./abstract'); var _ = require('lodash'); var Utils = require('lib/utilities/utils'); +var debug = require('debug')('productCartItem'); /** * Whitelist of attributes taken from product model @@ -28,6 +29,8 @@ module.exports = Model.extend({ }, initialize: function(){ + Model.prototype.initialize.apply( this, arguments ); + // additional product listeners this.on( 'change:quantity change:regular_price', this.updateTotals ); }, @@ -66,6 +69,7 @@ module.exports = Model.extend({ }; this.set(totals); + debug('update cart item', this); }, /* jshint +W071 */ diff --git a/assets/js/src/entities/cart/models/shipping.js b/assets/js/src/entities/cart/models/shipping.js index 091b9b5e..34931fc2 100644 --- a/assets/js/src/entities/cart/models/shipping.js +++ b/assets/js/src/entities/cart/models/shipping.js @@ -11,6 +11,20 @@ module.exports = Model.extend({ taxable : true, method_id : '' }; + }, + + /** + * Return total and total_tax for subtotal and subtotal_tax, respectively + * - a little confusing, but makes cart.sum('subtotal') easier + */ + get: function( attr ){ + if( attr === 'subtotal' ){ + attr = 'total'; + } + if( attr === 'subtotal_tax' ){ + attr = 'total_tax'; + } + return Model.prototype.get.call(this, attr); } }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index e07ccfaa..b77c66cb 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -3,6 +3,7 @@ var Cart = require('../cart/collection'); var _ = require('lodash'); var debug = require('debug')('order'); var Radio = require('backbone.radio'); +var Utils = require('lib/utilities/utils'); module.exports = DualModel.extend({ name: 'order', @@ -17,10 +18,15 @@ module.exports = DualModel.extend({ note : '' }, - initialize: function(){ + /** + * add tax settings early for use by cart + * - cart set up during parse, parse called by constructor on new Order + */ + constructor: function(){ // clone tax settings this.tax = _.clone( this.getSettings( 'tax' ) ); this.tax_rates = _.clone( this.getSettings( 'tax_rates' ) ); + DualModel.apply( this, arguments ); }, /** @@ -72,6 +78,10 @@ module.exports = DualModel.extend({ return DualModel.prototype.save.call(this, attributes, options); }, + /** + * Attach cart during parse + * - allows order to change status, ie: become editable + */ parse: function(resp) { resp = DualModel.prototype.parse.call(this, resp); @@ -82,37 +92,148 @@ module.exports = DualModel.extend({ return resp; }, + /** + * + */ toJSON: function(options) { var attrs = _.clone(this.attributes); if( this.isEditable() && this.cart ){ + var taxes = [], + shipping_taxes = []; + attrs.line_items = []; attrs.shipping_lines = []; attrs.fee_lines = []; this.cart.each( function(model) { + if( model.type === 'shipping' ){ attrs.shipping_lines.push( model.toJSON(options) ); + if( model.taxes ){ + shipping_taxes.push( model.taxes.toJSON() ); + } } else if ( model.type === 'fee' ) { attrs.fee_lines.push( model.toJSON(options) ); } else { attrs.line_items.push( model.toJSON(options) ); } + + if( model.taxes ){ + taxes.push( model.taxes.toJSON() ); + } + }); + + attrs.tax_lines = this.mergeItemizedTaxes( taxes ); + attrs.shipping_tax = this.sumItemizedTaxes( + this.mergeItemizedTaxes( shipping_taxes ) + ); } return attrs; }, + /** + * + */ updateTotals: function(){ + var total = this.cart.sum('total'), + subtotal = this.cart.sum('subtotal'), + total_tax = this.cart.sum('total_tax'), + subtotal_tax = this.cart.sum('subtotal_tax'), + cart_discount = subtotal - total, + cart_discount_tax = subtotal_tax - total_tax; + + total += total_tax; + var totals = { - total : this.cart.sum('total'), - subtotal : this.cart.sum('subtotal'), - total_tax : this.cart.sum('total_tax'), - subtotal_tax : this.cart.sum('subtotal_tax') + 'total' : Utils.round( total, 4 ), + 'subtotal' : Utils.round( subtotal, 4 ), + 'total_tax' : Utils.round( total_tax, 4 ), + 'subtotal_tax' : Utils.round( subtotal_tax, 4 ), + 'cart_discount' : Utils.round( cart_discount, 4 ), + 'cart_discount_tax' : Utils.round( cart_discount_tax, 4 ) }; this.set(totals); + debug('update totals', totals); + }, + + /** + * Takes an array of itemized taxes and merges them into one combined array + * - model.taxes.toJSON() ensures a shallow clone + */ + mergeItemizedTaxes: function( taxes ){ + return _.reduce( taxes, function( merged, line_taxes ){ + _.each( line_taxes, function( tax ){ + var orig = _.find( merged, { rate_id: tax.rate_id } ); + if( orig ){ + orig.total = _.sum([ orig.total, tax.total ]); + orig.subtotal = _.sum([ orig.subtotal, tax.subtotal ]); + } else { + merged.push( tax ); + } + } ); + return merged; + }) || []; + }, + + /** + * + */ + sumItemizedTaxes: function( taxes, attr ){ + attr = attr || 'total'; + return _.chain( taxes ) + .map( function( tax ) { + return tax[attr]; + }) + .sum() + .value(); + }, + + /** + * Value displayed in cart + */ + getDisplayTotal: function(){ + if( this.tax.tax_display_cart === 'incl' ) { + return this.sum(['total', 'total_tax']); + } else { + return this.get('total'); + } + }, + + /** + * Convenience method to sum attributes + */ + sum: function(array){ + var sum = 0; + for (var i = 0; i < array.length; i++) { + sum += this.get(array[i]); + } + return Utils.round(sum, 4); + }, + + /** + * Value displayed in cart + */ + getDisplaySubtotal: function(){ + if( this.tax.tax_display_cart === 'incl' ) { + return this.sum(['subtotal', 'subtotal_tax']); + } else { + return this.get('subtotal'); + } + }, + + /** + * Value displayed in cart + */ + getDisplayCartDiscount: function(){ + if( this.tax.tax_display_cart === 'incl' ) { + return this.sum(['cart_discount', 'cart_discount_tax']); + } else { + return this.get('cart_discount'); + } } }); \ No newline at end of file diff --git a/includes/views/pos/cart/tmpl-item-drawer.php b/includes/views/pos/cart/tmpl-item-drawer.php index b705d3b2..8fce536e 100644 --- a/includes/views/pos/cart/tmpl-item-drawer.php +++ b/includes/views/pos/cart/tmpl-item-drawer.php @@ -1,21 +1,20 @@ -{{#if product_id}} +{{#if product}}
    :
    - {{/if}} -{{#is type 'shipping'}} +{{#if shipping}}
    :
    -{{/is}} +{{/if}}
    :
    @@ -27,7 +26,7 @@
    -{{#if product_id}} +{{#if product}}
    :
    diff --git a/includes/views/pos/cart/tmpl-totals.php b/includes/views/pos/cart/tmpl-totals.php index 34a61810..463c02d4 100644 --- a/includes/views/pos/cart/tmpl-totals.php +++ b/includes/views/pos/cart/tmpl-totals.php @@ -17,7 +17,7 @@
  • {{#if ../../incl_tax}}(){{/if}} - {{label}}: + {{title}}:
    {{{money total}}}
    diff --git a/tests/unit/js/spec/entities/cart/models/abstract.spec.js b/tests/unit/js/spec/entities/cart/models/abstract.spec.js index 26ea8c69..60f9badd 100644 --- a/tests/unit/js/spec/entities/cart/models/abstract.spec.js +++ b/tests/unit/js/spec/entities/cart/models/abstract.spec.js @@ -39,7 +39,7 @@ describe('entities/cart/models/abstract.js', function () { expect(sum).equals(5.79); }); - it('should init with a tax_rate collection for calc_tax = \'yes\'', function(){ + it('should init with a tax_rate collection for calc_taxes = \'yes\'', function(){ var model = new Model(); expect( model.taxes ).to.be.undefined; @@ -48,7 +48,7 @@ describe('entities/cart/models/abstract.js', function () { collection: { order : { tax: { - calc_tax: 'yes' + calc_taxes: 'yes' }, tax_rates: dummy_tax_US } @@ -66,7 +66,7 @@ describe('entities/cart/models/abstract.js', function () { collection: { order : { tax: { - calc_tax: 'yes' + calc_taxes: 'yes' }, tax_rates: dummy_tax_GB } @@ -89,7 +89,7 @@ describe('entities/cart/models/abstract.js', function () { collection: { order : { tax: { - calc_tax: 'yes' + calc_taxes: 'yes' }, tax_rates: dummy_tax_US } diff --git a/tests/unit/js/spec/entities/cart/models/fee.spec.js b/tests/unit/js/spec/entities/cart/models/fee.spec.js index b3ee32f8..adbe96f1 100644 --- a/tests/unit/js/spec/entities/cart/models/fee.spec.js +++ b/tests/unit/js/spec/entities/cart/models/fee.spec.js @@ -52,7 +52,7 @@ describe('entities/cart/models/fee.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -76,7 +76,7 @@ describe('entities/cart/models/fee.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -92,4 +92,46 @@ describe('entities/cart/models/fee.js', function () { }); + it('should return the total on model.get(\'subtotal\')', function(){ + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_taxes: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + expect(model.get('subtotal')).equals(model.get('total')); + + }); + + it('should return the total_tax on model.get(\'subtotal_tax\')', function(){ + + var model = new Model({ + taxable: true, + tax_class: '', + price: 10 + }, { + collection: { + order : { + tax: { + calc_taxes: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + expect(model.get('subtotal_tax')).equals(model.get('total_tax')); + + }); + }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/product.spec.js b/tests/unit/js/spec/entities/cart/models/product.spec.js index 2e02248b..f4857422 100644 --- a/tests/unit/js/spec/entities/cart/models/product.spec.js +++ b/tests/unit/js/spec/entities/cart/models/product.spec.js @@ -111,7 +111,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -133,7 +133,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -155,7 +155,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: { @@ -187,7 +187,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: { @@ -222,7 +222,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -252,7 +252,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -282,7 +282,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -314,7 +314,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -346,7 +346,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -377,7 +377,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -414,7 +414,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_US @@ -446,7 +446,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_US @@ -478,7 +478,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: { @@ -515,7 +515,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: { @@ -552,7 +552,7 @@ describe('entities/cart/models/product.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_US diff --git a/tests/unit/js/spec/entities/cart/models/shipping.spec.js b/tests/unit/js/spec/entities/cart/models/shipping.spec.js index 9455be88..0a59fe02 100644 --- a/tests/unit/js/spec/entities/cart/models/shipping.spec.js +++ b/tests/unit/js/spec/entities/cart/models/shipping.spec.js @@ -51,7 +51,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_GB @@ -75,7 +75,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_GB @@ -99,7 +99,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: { @@ -127,7 +127,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: { @@ -159,7 +159,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: dummy_tax_US @@ -183,7 +183,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: dummy_tax_US @@ -207,7 +207,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'no' }, tax_rates: { @@ -235,7 +235,7 @@ describe('entities/cart/models/shipping.js', function () { collection: { order : { tax: { - calc_tax: 'yes', + calc_taxes: 'yes', prices_include_tax: 'yes' }, tax_rates: { diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index d2d296f1..7cb76850 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -119,4 +119,110 @@ describe('entities/orders/model.js', function () { }); + it('should have a convience method to combine itemized taxes', function(){ + + var model = new OrderModel(); + + var itemizedTaxes1 = [{ + compound: true, + rate: "20.0000", + rate_id: "1", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 1", + total: _.random(10, true) + }, { + compound: true, + rate: "5.0000", + rate_id: "2", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 2", + total: _.random(10, true) + }]; + + var itemizedTaxes2 = [{ + compound: true, + rate: "20.0000", + rate_id: "1", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 1", + total: _.random(10, true) + }, { + compound: true, + rate: "2.0000", + rate_id: "3", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 3", + total: _.random(10, true) + }]; + + // make clone so originals are preserved for check + var total = itemizedTaxes1[0].total + itemizedTaxes2[0].total; + var subtotal = itemizedTaxes1[0].subtotal + itemizedTaxes2[0].subtotal; + + expect( model.mergeItemizedTaxes( [itemizedTaxes1, itemizedTaxes2] ) ).to.eql( + [{ + compound: true, + rate: "20.0000", + rate_id: "1", + shipping: true, + subtotal: subtotal, + title: "TAX 1", + total: total + }, { + compound: true, + rate: "5.0000", + rate_id: "2", + shipping: true, + subtotal: itemizedTaxes1[1].subtotal, + title: "TAX 2", + total: itemizedTaxes1[1].total + }, { + compound: true, + rate: "2.0000", + rate_id: "3", + shipping: true, + subtotal: itemizedTaxes2[1].subtotal, + title: "TAX 3", + total: itemizedTaxes2[1].total + }] + ); + + }); + + it('should have a convience method to sum itemized taxes', function() { + + var model = new OrderModel(); + + var itemizedTaxes = [{ + compound: true, + rate: "20.0000", + rate_id: "1", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 1", + total: _.random(10, true) + }, { + compound: true, + rate: "2.0000", + rate_id: "3", + shipping: true, + subtotal: _.random(10, true), + title: "TAX 3", + total: _.random(10, true) + }]; + + // make clone so originals are preserved for check + var total = itemizedTaxes[0].total + itemizedTaxes[1].total; + var subtotal = itemizedTaxes[0].subtotal + itemizedTaxes[1].subtotal; + + expect( model.sumItemizedTaxes( itemizedTaxes ) ).equals( total ); + expect( model.sumItemizedTaxes( itemizedTaxes, 'subtotal' ) ).equals( subtotal ); + + }); + + }); \ No newline at end of file From 8b5612c7574fd145afe7fad150d18aa38d23dd15 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 22 Jan 2016 21:33:45 +0800 Subject: [PATCH 018/169] Add split cart item functionality --- .../js/src/apps/pos/cart/views/line/layout.js | 8 +- .../apps/pos/cart/views/line/views/drawer.js | 5 +- .../apps/pos/cart/views/line/views/item.js | 30 ++++++- assets/js/src/entities/cart/collection.js | 51 ++++++++--- .../js/src/entities/cart/models/abstract.js | 75 ++++++++++------ assets/js/src/entities/cart/models/product.js | 56 ++++++------ assets/js/src/entities/orders/collection.js | 4 +- assets/js/src/entities/orders/model.js | 40 ++++++--- assets/js/src/entities/tax/collection.js | 15 ++-- includes/api/class-wc-pos-i18n.php | 2 + includes/views/pos/cart/tmpl-item.php | 4 +- .../js/spec/entities/cart/collection.spec.js | 21 +++++ .../spec/entities/cart/models/product.spec.js | 89 +++++++++++++++++-- .../js/spec/entities/orders/model.spec.js | 73 +++++++++++++++ 14 files changed, 366 insertions(+), 107 deletions(-) diff --git a/assets/js/src/apps/pos/cart/views/line/layout.js b/assets/js/src/apps/pos/cart/views/line/layout.js index 560840e3..7dba71ef 100644 --- a/assets/js/src/apps/pos/cart/views/line/layout.js +++ b/assets/js/src/apps/pos/cart/views/line/layout.js @@ -47,9 +47,11 @@ module.exports = LayoutView.extend({ onRender: function(){ var view = new ItemView({ model: this.model }); - this.listenTo( view, 'drawer:open', this.openDrawer ); - this.listenTo( view, 'drawer:close', this.closeDrawer ); - this.listenTo( view, 'drawer:toggle', this.toggleDrawer ); + this.listenTo(view, { + 'drawer:open' : this.openDrawer, + 'drawer:close' : this.closeDrawer, + 'drawer:toggle' : this.toggleDrawer + }); this.getRegion('item').show(view); }, diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index 14af86e2..2d041dd0 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -129,7 +129,7 @@ module.exports = FormView.extend({ data[ attribute ] = value; - this.model.save(data); + this.model.set(data); }, addMetaFields: function(e){ @@ -158,8 +158,7 @@ module.exports = FormView.extend({ if( index >= 0 ){ meta.splice( index, 1 ); - this.model.save({ 'meta': meta }); - this.model.trigger('change:meta'); + this.model.set({ 'meta': meta }); } row.remove(); diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index 43162adc..b68b75d9 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -3,6 +3,7 @@ var Utils = require('lib/utilities/utils'); var AutoGrow = require('lib/behaviors/autogrow'); var Numpad = require('lib/components/numpad/behavior'); var _ = require('lodash'); +var polyglot = require('lib/utilities/polyglot'); module.exports = FormView.extend({ template: 'pos.cart.item', @@ -29,16 +30,26 @@ module.exports = FormView.extend({ ui: { remove : '*[data-action="remove"]', more : '*[data-action="more"]', + split : '*[data-action="split"]', + combine : '*[data-action="combine"]', title : '.title' }, events: { - 'click @ui.remove': 'removeItem', - 'click @ui.title': 'focusTitle' + 'click @ui.remove' : 'removeItem', + 'click @ui.title' : 'focusTitle', + 'click @ui.split' : function(e){ + if(e) { e.preventDefault(); } + this.model.trigger( 'split', this.model ); + }, + 'click @ui.combine' : function(e){ + if(e) { e.preventDefault(); } + this.model.trigger( 'combine', this.model ); + } }, triggers: { - 'click @ui.more' : 'drawer:toggle' + 'click @ui.more' : 'drawer:toggle' }, bindings: { @@ -50,6 +61,19 @@ module.exports = FormView.extend({ onSet: Utils.unformat }, + // split / combine + '.qty span': { + observe: 'quantity', + updateMethod: 'html', + onGet: function(value){ + if( value > 1 ){ + return '' + + polyglot.t('buttons.split') + + ''; + } + } + }, + // product: name, shipping: method_title, fee: title '*[data-name="name"]' : { observe: 'name', events: ['blur'] }, '*[data-name="method_title"]' : {observe: 'method_title', events: ['blur']}, diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index 4e492c36..3ff68d26 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -26,39 +26,43 @@ module.exports = bb.Collection.extend({ initialize: function(models, options){ options = options || {}; this.order = options.order; + + this.on('split', this.split, this); }, /** * Cart items should always be init with attributes, not bb.Model * - convert product models to attributes - * - parse attributes, eg: productModel.id = cartModel.product_id + * - always parse attributes, eg: productModel.id = cartModel.product_id * - if count = 1 for product id, bump quantity */ add: function( models, options ){ - var self = this, - parsedAttrs = [], - type = _.get( options, ['type'], 'product' ); - + options = options || {}; models = !_.isArray(models) ? [models] : models; + var parsedAttrs = [], + type = options.type || 'product'; + _.each(models, function(model){ var attrs = model instanceof bb.Model ? model.toJSON() : model; - attrs = subclasses[type].prototype.parse( attrs ); + attrs = subclasses[type].prototype.parse.call( this, attrs ); + if( type === 'product' ){ - var products = self.where({ product_id: attrs.product_id }); - if( products.length === 1 ){ + var products = this.where({ product_id: attrs.product_id }); + if( products.length === 1 && ! options.split ){ products[0].quantity('increase').trigger('pulse'); return; } } + return parsedAttrs.push(attrs); - }); + }, this); - var model = bb.Collection.prototype.add.call(this, parsedAttrs, options); - if( model instanceof bb.Model ){ + models = bb.Collection.prototype.add.call(this, parsedAttrs, options); + _.each( models, function( model ){ model.trigger('pulse'); - } - return model; + } ); + return models; }, /** @@ -71,6 +75,27 @@ module.exports = bb.Collection.extend({ } return _.sum([ total, model.get(attribute) ]); }, 0 ); + }, + + split: function( model ){ + var models = [], + qty = model.get( 'quantity'), + duplicate = Math.ceil( qty - 1 ), + attributes = _.extend( model.toJSON(), { quantity: 1 } ); + + if( duplicate > 0 ){ + for( var i = 0; i < duplicate; i++ ){ + models.push( attributes ); + } + this.add(models, { + at: ( model.collection.indexOf( model ) + 1 ), + split: true, + silent: true + }); + model.set({ quantity: qty - duplicate }); + model.collection.trigger('reset'); // re-render the cart + } + } }); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/abstract.js b/assets/js/src/entities/cart/models/abstract.js index 56252baa..11e644f3 100644 --- a/assets/js/src/entities/cart/models/abstract.js +++ b/assets/js/src/entities/cart/models/abstract.js @@ -6,6 +6,12 @@ var debug = require('debug')('cartItem'); module.exports = bb.Model.extend({ + constructor: function( attributes, options ){ + // always parse by default + options = _.defaults( { parse: true }, options ); + bb.Model.call(this, attributes, options ); + }, + initialize: function(){ // copy tax info from order collection this.tax_options = _.get( this, ['collection', 'order', 'tax'], {} ); @@ -20,40 +26,58 @@ module.exports = bb.Model.extend({ // update on change item_price this.on( 'change:item_price', this.updateTotals ); - // set item price on init, this wil kick off updateLineTotals - if( this.get('item_price') === undefined ) { - var price = parseFloat( this.get('price') ); - this.set({ 'item_price': _.isNaN(price) ? 0 : price }); + // calc on init + this.updateTotals(); + }, + + /** + * + */ + parse: function( attributes ){ + attributes = attributes || {}; + var attrs = _.clone( attributes ); // probably unnecessary + + if( attributes.item_price ){ + return attrs; } + + attrs.item_price = parseFloat( attributes.price || 0 ); + return attrs; }, + /** + * @todo init with saved itemized taxes? + */ attachTaxes: function(options){ - this.taxes = new Taxes( [], _.extend( { line_item : this }, options ) ); + this.taxes = new Taxes( + this.getTaxesRates(), + _.extend( { parse: true, line_item : this }, options ) + ); + this.on( 'change:taxable change:tax_class', function(){ - this.resetTaxes(); + this.taxes.reset( this.getTaxesRates(), { parse: true } ); + this.updateTotals(); }, this ); - this.resetTaxes(); }, /* jshint -W071 */ updateTotals: function(){ - var item_price = this.get('item_price'), - item_tax = 0; + var total = this.get('item_price'), + total_tax = 0; if( this.taxes ){ - this.taxes.calcTaxes( this.get('item_price') ); - item_tax = this.taxes.sum('total'); + total_tax = this.taxes.calcTaxes( this.get('item_price') ); } // if price does not include tax if( this.tax_options.prices_include_tax === 'yes' ) { - item_price -= item_tax; + total -= total_tax; } // create totals object var totals = { - 'total_tax' : Utils.round( item_tax, 4 ), - 'total' : Utils.round( item_price, 4 ) + 'total_tax' : Utils.round( total_tax, 4 ), + 'total' : Utils.round( total, 4 ) }; this.set(totals); @@ -61,20 +85,6 @@ module.exports = bb.Model.extend({ }, /* jshint +W071 */ - resetTaxes: function(){ - var tax_rates = null; - - if( this.get('taxable') ){ - tax_rates = _.get( - this, ['collection', 'order', 'tax_rates', this.get('tax_class') ], null - ); - } - - this.taxes.reset( tax_rates, { parse: true } ); - - this.updateTotals(); - }, - /** * Convenience method to sum attributes */ @@ -106,6 +116,15 @@ module.exports = bb.Model.extend({ } else { return this.get('subtotal'); } + }, + + getTaxesRates: function(){ + if( this.get('taxable') ){ + return _.get( + this, ['collection', 'order', 'tax_rates', this.get('tax_class') ], null + ); + } + return null; } }); \ No newline at end of file diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js index cfdea881..39533b41 100644 --- a/assets/js/src/entities/cart/models/product.js +++ b/assets/js/src/entities/cart/models/product.js @@ -11,12 +11,13 @@ var productAttributes = [ 'name', 'type', 'price', + 'item_price', 'regular_price', - 'sale_price', 'taxable', 'tax_status', 'tax_class', 'attributes', + 'quantity', 'meta' // variation meta ]; @@ -39,33 +40,30 @@ module.exports = Model.extend({ updateTotals: function(){ var quantity = this.get('quantity'), item_price = this.get('item_price'), - regular_price = parseFloat( this.get('regular_price') ), - item_tax = 0, - item_subtotal_tax = 0; + regular_price = this.get('regular_price'), + total = item_price * quantity, + subtotal = regular_price * quantity, + total_tax = 0, + subtotal_tax = 0; // calc total and subtotal taxes if( this.taxes ){ - this.taxes.calcTaxes( item_price, quantity, 'total' ); - this.taxes.calcTaxes( regular_price, quantity, 'subtotal' ); - item_tax = this.taxes.sum('total'); - item_subtotal_tax = this.taxes.sum('subtotal'); + total_tax = this.taxes.calcTaxes(item_price, quantity, 'total'); + subtotal_tax = this.taxes.calcTaxes(regular_price, quantity, 'subtotal'); } // if price does not include tax if( this.tax_options.prices_include_tax === 'yes' ) { - regular_price -= item_subtotal_tax; - item_price -= item_tax; + subtotal -= subtotal_tax; + total -= total_tax; } // create totals object var totals = { - 'item_subtotal' : Utils.round( regular_price, 4 ), - 'item_subtotal_tax' : Utils.round( item_subtotal_tax, 4 ), - 'item_tax' : Utils.round( item_tax, 4 ), - 'subtotal' : Utils.round( regular_price * quantity, 4 ), - 'subtotal_tax' : Utils.round( item_subtotal_tax * quantity, 4 ), - 'total_tax' : Utils.round( item_tax * quantity, 4 ), - 'total' : Utils.round( item_price * quantity, 4 ) + 'subtotal' : Utils.round( subtotal, 4 ), + 'subtotal_tax' : Utils.round( subtotal_tax, 4 ), + 'total_tax' : Utils.round( total_tax, 4 ), + 'total' : Utils.round( total, 4 ) }; this.set(totals); @@ -74,21 +72,22 @@ module.exports = Model.extend({ /* jshint +W071 */ // parsing Product Model to Cart Model + /* jshint -W074 */ parse: function( attributes ){ - var attr = _.clone( attributes ) || {}; - if( attr.product_id ){ - return attr; // already in the right format + attributes = attributes || {}; + if( attributes.product_id ){ + return attributes; // already in the right format } - // id becomes product_id - attr.product_id = attr.id; - - // title becomes name - attr.name = attr.title; + var attrs = _.extend( Model.prototype.parse.call( this, attributes ), { + product_id : attributes.id, + name : attributes.title, + regular_price : parseFloat( attributes.regular_price || 0 ) + } ); // turn variation attributes into line item meta - if(attr.type === 'variation'){ - attr.meta = _.map(attr.attributes, function(variant, idx){ + if(attributes.type === 'variation'){ + attrs.meta = _.map(attributes.attributes, function(variant, idx){ return { key: ++idx, label: variant.name, @@ -98,8 +97,9 @@ module.exports = Model.extend({ } // return subset of attributes - return _.pick(attr, productAttributes); + return _.pick(attrs, productAttributes); }, + /* jshint +W074 */ /* * Convenience method to increase or decrease quantity diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index 2af8ec5d..2c135568 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -38,10 +38,10 @@ module.exports = DualCollection.extend({ /** * */ - addToCart: function(options){ + addToCart: function( product ){ this.getActiveOrder() .then(function(order){ - order.cart.add(options, { parse: true }); + order.cart.add( product, { parse: true } ); }); }, diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index b77c66cb..38bd9027 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -4,6 +4,7 @@ var _ = require('lodash'); var debug = require('debug')('order'); var Radio = require('backbone.radio'); var Utils = require('lib/utilities/utils'); +var App = require('lib/config/application'); module.exports = DualModel.extend({ name: 'order', @@ -67,6 +68,9 @@ module.exports = DualModel.extend({ }, this ); }, + /** + * + */ save: function(attributes, options){ if( this.cart && this.cart.length === 0 ){ return this.destroy( options ); @@ -95,6 +99,7 @@ module.exports = DualModel.extend({ /** * */ + /* jshint -W071 */ toJSON: function(options) { var attrs = _.clone(this.attributes); @@ -106,17 +111,22 @@ module.exports = DualModel.extend({ attrs.shipping_lines = []; attrs.fee_lines = []; + /* jshint -W074 */ this.cart.each( function(model) { - if( model.type === 'shipping' ){ - attrs.shipping_lines.push( model.toJSON(options) ); - if( model.taxes ){ - shipping_taxes.push( model.taxes.toJSON() ); - } - } else if ( model.type === 'fee' ) { - attrs.fee_lines.push( model.toJSON(options) ); - } else { - attrs.line_items.push( model.toJSON(options) ); + switch( model.type ) { + case 'shipping': + attrs.shipping_lines.push( model.toJSON(options) ); + if( model.taxes ){ + shipping_taxes.push( model.taxes.toJSON() ); + } + break; + case 'fee': + attrs.fee_lines.push( model.toJSON(options) ); + break; + case 'product': + attrs.line_items.push( model.toJSON(options) ); + break; } if( model.taxes ){ @@ -124,6 +134,7 @@ module.exports = DualModel.extend({ } }); + /* jshint +W074 */ attrs.tax_lines = this.mergeItemizedTaxes( taxes ); attrs.shipping_tax = this.sumItemizedTaxes( @@ -133,9 +144,10 @@ module.exports = DualModel.extend({ return attrs; }, + /* jshint +W071 */ /** - * + * @todo this could be part of model.save( attributes )? */ updateTotals: function(){ var total = this.cart.sum('total'), @@ -157,7 +169,6 @@ module.exports = DualModel.extend({ }; this.set(totals); - debug('update totals', totals); }, /** @@ -234,6 +245,13 @@ module.exports = DualModel.extend({ } else { return this.get('cart_discount'); } + }, + + /** + * Email receipt via ajax + */ + emailReceipt: function(email){ + return App.prototype.post( this.url() + 'email/' + email ); } }); \ No newline at end of file diff --git a/assets/js/src/entities/tax/collection.js b/assets/js/src/entities/tax/collection.js index bf732e7a..5c9b97cd 100644 --- a/assets/js/src/entities/tax/collection.js +++ b/assets/js/src/entities/tax/collection.js @@ -54,6 +54,8 @@ module.exports = bb.Collection.extend({ } tax.set( attr, ( taxes[ tax.id ] * qty ) ); }, this); + + return this.sum( attr ); }, /** @@ -64,8 +66,6 @@ module.exports = bb.Collection.extend({ calcInclusiveTax: function( price, qty, attr ){ var regular_tax_rates = 0, compound_tax_rates = 0, - regular_tax_rate = 1, - compound_tax_rate = 1, non_compound_price = 0; // defaults @@ -80,9 +80,7 @@ module.exports = bb.Collection.extend({ } }, this); - regular_tax_rate += regular_tax_rates; - compound_tax_rate += compound_tax_rates; - non_compound_price = price / compound_tax_rate; + non_compound_price = price / ( 1 + compound_tax_rates ); this.each(function(tax) { var the_rate = tax.getRate(); @@ -90,15 +88,16 @@ module.exports = bb.Collection.extend({ if ( tax.get('compound') ) { the_price = price; - the_rate = the_rate / compound_tax_rate; + the_rate = the_rate / ( 1 + compound_tax_rates ); } else { the_price = non_compound_price; - the_rate = the_rate / regular_tax_rate; + the_rate = the_rate / ( 1 + regular_tax_rates ); } tax.set( attr, ( the_rate * the_price * qty ) ); - }, this); + + return this.sum( attr ); }, // move rate_id key to part of rate model diff --git a/includes/api/class-wc-pos-i18n.php b/includes/api/class-wc-pos-i18n.php index 46937a82..99e76e0d 100644 --- a/includes/api/class-wc-pos-i18n.php +++ b/includes/api/class-wc-pos-i18n.php @@ -198,6 +198,8 @@ private function frontend_buttons(){ /* translators: woocommerce */ 'shipping' => __( 'Shipping', 'woocommerce' ), 'void' => __( 'Void', 'woocommerce-pos' ), + 'split' => __( 'Split', 'woocommerce-pos' ), + 'combine' => __( 'Combine', 'woocommerce-pos' ), ); } diff --git a/includes/views/pos/cart/tmpl-item.php b/includes/views/pos/cart/tmpl-item.php index 74df1fb4..21fcb3a5 100644 --- a/includes/views/pos/cart/tmpl-item.php +++ b/includes/views/pos/cart/tmpl-item.php @@ -1,5 +1,7 @@ {{#if product}} -
    +
    + +
    {{name}}
    diff --git a/tests/unit/js/spec/entities/cart/collection.spec.js b/tests/unit/js/spec/entities/cart/collection.spec.js index 9d32831c..42e070f5 100644 --- a/tests/unit/js/spec/entities/cart/collection.spec.js +++ b/tests/unit/js/spec/entities/cart/collection.spec.js @@ -86,4 +86,25 @@ describe('entities/cart/collection.js', function () { }); + it('should split products', function(){ + + // add product + this.collection.add({ id: 123, title: 'Product 123', quantity: 3 }); + expect(this.collection.length).equals(1); + this.collection.split( this.collection.at(0) ); + expect(this.collection.length).equals(3); + + }); + + it('should split products with float quantities', function(){ + + // add product + this.collection.add({ id: 123, title: 'Product 123', quantity: 3.25 }); + expect(this.collection.length).equals(1); + this.collection.split( this.collection.at(0) ); + expect(this.collection.length).equals(4); + expect(this.collection.at(0).get('quantity')).equals(0.25); + + }); + }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/cart/models/product.spec.js b/tests/unit/js/spec/entities/cart/models/product.spec.js index f4857422..1566defb 100644 --- a/tests/unit/js/spec/entities/cart/models/product.spec.js +++ b/tests/unit/js/spec/entities/cart/models/product.spec.js @@ -2,6 +2,7 @@ describe('entities/cart/models/product.js', function () { var dummy_products = require('./../../../../data/products.json'); var Model = require('entities/cart/models/product'); + var Utils = require('lib/utilities/utils'); var dummy_tax_GB = { '': { @@ -34,7 +35,7 @@ describe('entities/cart/models/product.js', function () { return product.type === 'simple'; }); - var model = new Model( product, { parse: true } ); + var model = new Model( product ); expect(model.id).to.be.undefined; expect(model.get('title')).to.be.undefined; @@ -51,7 +52,7 @@ describe('entities/cart/models/product.js', function () { var variation = product.variations[0]; variation.type = 'variation'; - var model = new Model( variation, { parse: true } ); + var model = new Model( variation ); expect(model.id).to.be.undefined; expect(model.get('meta')).to.eql([{ @@ -65,7 +66,7 @@ describe('entities/cart/models/product.js', function () { it('should have a quantity convenience method ', function() { var product = dummy_products.products[0]; - var model = new Model( product, { parse: true } ); + var model = new Model( product ); expect(model.get('quantity')).equals(1); model.quantity('increase'); @@ -77,8 +78,7 @@ describe('entities/cart/models/product.js', function () { it("should initiate with the correct values (no tax)", function() { var product = dummy_products.products[0]; - product.taxable = false; - var model = new Model( product, { parse: true } ); + var model = new Model( _.extend( {}, product, { taxable: false } ) ); expect(model.get('item_price')).equal( parseFloat( product.price ) ); expect(model.get('total')).equal( parseFloat( product.price ) ); @@ -87,13 +87,13 @@ describe('entities/cart/models/product.js', function () { it("should re-calculate on quantity change to any floating point number", function() { var product = dummy_products.products[0]; - var model = new Model( product, { parse: true } ); + var model = new Model( product ); var quantity = _.random(10, true); model.set( { 'quantity': quantity } ); expect(model.get('quantity')).equal(quantity); - expect(model.get('total')).equal( parseFloat( ( product.price * quantity ).toFixed(4) ) ); + expect(model.get('total')).equal( Utils.round( product.price * quantity, 4 ) ); }); @@ -246,6 +246,31 @@ describe('entities/cart/models/product.js', function () { }); + it("should re-calculate exclusive tax on quantity change to any floating point number", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_taxes: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_GB + } + } + }); + + var quantity = _.random(10, true); + model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal( Utils.round( 3 * quantity, 4 ) ); + expect(model.get('subtotal_tax')).equal( Utils.round( 0.6 * quantity, 4 ) ); + expect(model.get('total')).equal( Utils.round( 2 * quantity, 4 ) ); + expect(model.get('total_tax')).equal( Utils.round( 0.4 * quantity, 4 ) ); + + }); + it("should calculate the correct inclusive tax", function() { var model = new Model(product, { @@ -276,6 +301,31 @@ describe('entities/cart/models/product.js', function () { }); + it("should re-calculate inclusive tax on quantity change to any floating point number", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_taxes: 'yes', + prices_include_tax: 'yes' + }, + tax_rates: dummy_tax_GB + } + } + }); + + var quantity = _.random(10, true); + model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal( Utils.round( 2.5 * quantity, 4 ) ); + expect(model.get('subtotal_tax')).equal( Utils.round( 0.5 * quantity, 4 ) ); + expect(model.get('total')).equal( Utils.round( 1.6666666 * quantity, 4 ) ); + expect(model.get('total_tax')).equal( Utils.round( 0.3333333 * quantity, 4 ) ); + + }); + it("should recalculate the correct exclusive tax on change to tax_class", function() { var model = new Model(product, { @@ -440,6 +490,31 @@ describe('entities/cart/models/product.js', function () { }); + it("should re-calculate exclusive tax on quantity change to any floating point number", function() { + + var model = new Model(product, { + collection: { + order : { + tax: { + calc_taxes: 'yes', + prices_include_tax: 'no' + }, + tax_rates: dummy_tax_US + } + } + }); + + var quantity = _.random(10, true); + model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + + expect(model.get('item_price')).equal(2); + expect(model.get('subtotal')).equal( Utils.round( 3 * quantity, 4 ) ); + expect(model.get('subtotal_tax')).equal( Utils.round( 0.366 * quantity, 4 ) ); + expect(model.get('total')).equal( Utils.round( 2 * quantity, 4 ) ); + expect(model.get('total_tax')).equal( Utils.round( 0.244 * quantity, 4 ) ); + + }); + it("should calculate the correct compound inclusive tax", function() { var model = new Model(product, { diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index 7cb76850..b170385a 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -2,6 +2,7 @@ describe('entities/orders/model.js', function () { var dummy_order = require('./../../../data/order.json'); var OrderModel = require('entities/orders/model'); + var Utils = require('lib/utilities/utils'); it('should be in a valid state', function () { var model = new OrderModel(); @@ -224,5 +225,77 @@ describe('entities/orders/model.js', function () { }); + it('should be match the dummy order', function(){ + + var model = new OrderModel(null, { parse: true }); + model.sync = sinon.stub(); + + model.tax = { + calc_taxes: 'yes', + prices_include_tax: 'no' + }; + + model.tax_rates = { + '': { + 4: {rate: '5.0000', label: 'Standard', shipping: 'yes', compound: 'no'}, + }, + 'reduced-rate': { + 5: {rate: '10.0000', label: 'Tax', shipping: 'yes', compound: 'no'} + } + }; + + expect( model.cart ).to.be.instanceOf( Backbone.Collection ); + + // 2 x 546 + model.cart.add( { + id: 546, + price: '21.99', + regular_price: '21.99', + tax_class: "reduced-rate", + taxable: true, + title: 'Premium Quality' + }, { parse: true } ); + + model.cart.add( { + id: 546, + price: '21.99', + regular_price: '21.99', + tax_class: 'reduced-rate', + taxable: true, + title: 'Premium Quality' + }, { parse: true } ); + + // 1 x 613 + model.cart.add( { + id: 613, + price: '19.99', + regular_price: '19.99', + tax_class: '', + taxable: true, + title: 'Ship Your Idea', + attributes: [{ + name: 'Color', + option: 'Black' + }] + }, { parse: true } ); + + // 1 x shipping + model.cart.add( { + price: '10.00', + tax_class: '', + taxable: true, + method_id: 'flat_rate', + method_title: 'Flat Rate' + }, { parse: true, type: 'shipping' } ); + + expect( Utils.round( model.get('total'), 2 ) ).equals( parseFloat( dummy_order.order.total ) ); + + // POS subtotal includes shipping and fees + var subtotal = parseFloat( dummy_order.order.subtotal ) + parseFloat( dummy_order.order.total_shipping ); + expect( Utils.round( model.get('subtotal'), 2 ) ).equals( subtotal ); + + expect( Utils.round( model.get('total_tax'), 2 ) ).equals( parseFloat( dummy_order.order.total_tax ) ); + + }); }); \ No newline at end of file From 9b16f71693e3398d94283f281ad70e78242592a6 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 23 Jan 2016 00:37:37 +0800 Subject: [PATCH 019/169] refactor cart meta fields --- .../apps/pos/cart/views/line/views/drawer.js | 107 +++++++----------- includes/views/pos/cart/tmpl-item-drawer.php | 6 +- 2 files changed, 43 insertions(+), 70 deletions(-) diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index 2d041dd0..0061a826 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -2,10 +2,9 @@ var FormView = require('lib/config/form-view'); var Utils = require('lib/utilities/utils'); var AutoGrow = require('lib/behaviors/autogrow'); var Numpad = require('lib/components/numpad/behavior'); -var $ = require('jquery'); +var Radio = require('backbone.radio'); var _ = require('lodash'); -var bb = require('backbone'); -var Radio = bb.Radio; +var $ = require('jquery'); module.exports = FormView.extend({ @@ -30,20 +29,17 @@ module.exports = FormView.extend({ ui: { addMeta : '*[data-action="add-meta"]', - removeMeta : '*[data-action="remove-meta"]', - metaLabel : 'input[name="meta.label"]', - metaValue : 'textarea[name="meta.value"]' + removeMeta : '*[data-action="remove-meta"]' }, events: { - 'click @ui.addMeta' : 'addMetaFields', - 'click @ui.removeMeta' : 'removeMetaFields', - 'blur @ui.metaLabel' : 'updateMeta', - 'blur @ui.metaValue' : 'updateMeta' + 'click @ui.addMeta' : 'addMeta', + 'click @ui.removeMeta' : 'removeMeta' }, modelEvents: { - 'pulse': 'pulse' + 'pulse' : 'pulse', + 'change:meta' : 'render' }, bindings: { @@ -82,6 +78,23 @@ module.exports = FormView.extend({ }, comparator: function(){} } + }, + '*[name^="meta"]': { + observe: 'meta', + events: ['blur'], + update: function( $el, meta ){ + _.each( meta, function( row, idx ){ + this.$('input[name="meta.' + idx + '.label"]').val( row.label ); + this.$('textarea[name="meta.' + idx + '.value"]').val( row.value ); + }, this ); + }, + onSet: function(){ + var obj = {}; + this.$('*[name^="meta"]').each(function(){ + _.set( obj, $(this).attr('name'), $(this).val()); + }); + return obj.meta; + } } }, @@ -101,67 +114,27 @@ module.exports = FormView.extend({ } }, - updateMeta: function(e) { - var el = $(e.target), - name = el.attr('name').split('.'), - attribute = name[0], - value = el.val(), - data = {}, - self = this; - - var newValue = function(){ - var key = el.parent('span').data('key'); - var meta = ( self.model.get('meta') || [] ); - - // select row (or create new one) - var row = _.where( meta, { 'key': key } ); - row = row.length > 0 ? row[0] : { 'key': key }; - row[ name[1] ] = value; - - // add the change row and make unique on key - meta.push(row); - return _.uniq( meta, 'key' ); - }; - - if( name.length > 1 && attribute === 'meta' ) { - value = newValue(); - } - - data[ attribute ] = value; - - this.model.set(data); - }, - - addMetaFields: function(e){ + addMeta: function(e){ e.preventDefault(); - - var row = $(e.currentTarget).prev('span').data('key'); - var i = row ? row + 1 : 1 ; - - $('') - .append('' + - '' + - '' + - '' + - '' + - '' - ) - .insertBefore( $(e.currentTarget) ); + var meta = this.model.get('meta'); + if( !_.isArray(meta) ){ + meta = []; + } + meta = meta.slice(); + meta.push({ label: '', value: '' }); + this.model.set({ meta: meta }); }, - removeMetaFields: function(e){ + removeMeta: function(e) { e.preventDefault(); - - var row = $(e.currentTarget).parent('span'), - meta = ( this.model.get('meta') || [] ), - index = _.findIndex( meta, { 'key': row.data('key') } ); - - if( index >= 0 ){ - meta.splice( index, 1 ); - this.model.set({ 'meta': meta }); + var index = $(e.target).closest('span').data('index'); + var meta = this.model.get('meta'); + if( !_.isArray(meta) ){ + meta = []; } - - row.remove(); + meta = meta.slice(); + _.pullAt( meta, index ); + this.model.set({ meta: meta }); } }); \ No newline at end of file diff --git a/includes/views/pos/cart/tmpl-item-drawer.php b/includes/views/pos/cart/tmpl-item-drawer.php index 8fce536e..a2d253f7 100644 --- a/includes/views/pos/cart/tmpl-item-drawer.php +++ b/includes/views/pos/cart/tmpl-item-drawer.php @@ -31,9 +31,9 @@
    :
    {{#each meta}} - - - + + + From 81c34b6504c5cb1c3cc9d8e05cb5309130d10649 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 28 Jan 2016 11:22:32 +0800 Subject: [PATCH 020/169] improve cart void --- .travis.yml | 8 +++---- assets/js/src/apps/pos/cart/route.js | 2 +- assets/js/src/apps/pos/cart/views/items.js | 15 ++++++------ .../js/src/apps/pos/cart/views/line/layout.js | 23 +++++++++++++++---- .../apps/pos/cart/views/line/views/drawer.js | 13 ----------- .../apps/pos/cart/views/line/views/item.js | 13 ++++------- assets/js/src/apps/pos/cart/views/totals.js | 2 -- assets/js/src/entities/cart/collection.js | 5 ++++ assets/js/src/entities/orders/collection.js | 1 - assets/js/src/entities/orders/model.js | 13 +++++++---- package.json | 3 ++- 11 files changed, 51 insertions(+), 47 deletions(-) diff --git a/.travis.yml b/.travis.yml index c898ddf7..2c098e9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,10 @@ install: - 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 - - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse' | sudo tee /etc/apt/sources.list.d/trusty.list > /dev/null - - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null - - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null - - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null +# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse' | sudo tee /etc/apt/sources.list.d/trusty.list > /dev/null +# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null +# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null +# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi # enable php-fpm diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 160fe5ce..1e3b2b78 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -136,7 +136,7 @@ var CartRoute = Route.extend({ this.listenTo(view, { 'action:void': function(){ view.triggerMethod('disableButtons'); - this.layout.getRegion('list').currentView.voidCart( this.order ); + this.layout.getRegion('list').currentView.voidCart(); }, 'action:note': function(){ this.layout.getRegion('note').currentView.showNoteField(); diff --git a/assets/js/src/apps/pos/cart/views/items.js b/assets/js/src/apps/pos/cart/views/items.js index d4e124da..2a011dcb 100644 --- a/assets/js/src/apps/pos/cart/views/items.js +++ b/assets/js/src/apps/pos/cart/views/items.js @@ -3,6 +3,7 @@ var CollectionView = require('lib/config/collection-view'); var LineItem = require('./line/layout'); var App = require('lib/config/application'); var polyglot = require('lib/utilities/polyglot'); +var $ = require('jquery'); var Empty = ItemView.extend({ tagName: 'li', @@ -16,13 +17,13 @@ var View = CollectionView.extend({ tagName: 'ul', childView: LineItem, emptyView: Empty, - voidCart: function( order ){ - this.children.each(function(child){ - if( child instanceof Empty ){ - order.destroy(); - } else { - child.getRegion('item').currentView.removeItem(); - } + voidCart: function(){ + var self = this; + var fadeAll = this.children.map( function( child ){ + return child.fadeOut(); + } ); + $.when.apply( $, fadeAll ).done( function() { + self.collection.reset(); }); } }); diff --git a/assets/js/src/apps/pos/cart/views/line/layout.js b/assets/js/src/apps/pos/cart/views/line/layout.js index 7dba71ef..8b6a2610 100644 --- a/assets/js/src/apps/pos/cart/views/line/layout.js +++ b/assets/js/src/apps/pos/cart/views/line/layout.js @@ -45,15 +45,16 @@ module.exports = LayoutView.extend({ }, onRender: function(){ - var view = new ItemView({ model: this.model }); + this.itemView = new ItemView({ model: this.model }); - this.listenTo(view, { + this.listenTo(this.itemView, { 'drawer:open' : this.openDrawer, 'drawer:close' : this.closeDrawer, - 'drawer:toggle' : this.toggleDrawer + 'drawer:toggle' : this.toggleDrawer, + 'item:remove' : this.removeItem }); - this.getRegion('item').show(view); + this.getRegion('item').show(this.itemView); }, openDrawer: function(){ @@ -90,6 +91,20 @@ module.exports = LayoutView.extend({ }); }}); + }, + + removeItem: function(){ + var self = this; + $.when( this.fadeOut() ).done( function(){ + self.model.destroy(); + }); + }, + + fadeOut: function(){ + var item = this.getRegion('item').currentView; + if( item ){ + return item.fadeOut(); + } } }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index 0061a826..e7b774ac 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -38,7 +38,6 @@ module.exports = FormView.extend({ }, modelEvents: { - 'pulse' : 'pulse', 'change:meta' : 'render' }, @@ -102,18 +101,6 @@ module.exports = FormView.extend({ this.$el.hide().slideDown(250); }, - remove: function() { - this.$el.slideUp( 250, function() { - FormView.prototype.remove.call(this); - }.bind(this)); - }, - - pulse: function(type){ - if(type === 'remove'){ - return this.$el.slideUp(250); - } - }, - addMeta: function(e){ e.preventDefault(); var meta = this.model.get('meta'); diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index b68b75d9..1607b77d 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -36,7 +36,6 @@ module.exports = FormView.extend({ }, events: { - 'click @ui.remove' : 'removeItem', 'click @ui.title' : 'focusTitle', 'click @ui.split' : function(e){ if(e) { e.preventDefault(); } @@ -49,7 +48,8 @@ module.exports = FormView.extend({ }, triggers: { - 'click @ui.more' : 'drawer:toggle' + 'click @ui.more' : 'drawer:toggle', + 'click @ui.remove' : 'item:remove' }, bindings: { @@ -112,14 +112,9 @@ module.exports = FormView.extend({ } }, - removeItem: function(e) { - if(e) { e.preventDefault(); } - var self = this; + fadeOut: function(){ this.ui.remove.attr('disabled', 'true'); - this.$el.addClass('pulse-out') - .fadeOut(500, function(){ - self.model.destroy(); - }); + return this.$el.addClass('pulse-out').fadeOut(500); }, focusTitle: function(){ diff --git a/assets/js/src/apps/pos/cart/views/totals.js b/assets/js/src/apps/pos/cart/views/totals.js index fa17ce9e..c3645278 100644 --- a/assets/js/src/apps/pos/cart/views/totals.js +++ b/assets/js/src/apps/pos/cart/views/totals.js @@ -4,8 +4,6 @@ module.exports = ItemView.extend({ tagName: 'ul', template: 'pos.cart.totals', - // todo: why is this necessary?! - // view should re-render automatically on model change modelEvents: { 'change': 'render' }, diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index 3ff68d26..a354469a 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -36,7 +36,11 @@ module.exports = bb.Collection.extend({ * - always parse attributes, eg: productModel.id = cartModel.product_id * - if count = 1 for product id, bump quantity */ + /* jshint -W071, -W074 */ add: function( models, options ){ + if ( ! models ) { + return; + } options = options || {}; models = !_.isArray(models) ? [models] : models; @@ -64,6 +68,7 @@ module.exports = bb.Collection.extend({ } ); return models; }, + /* jshint +W071, +W074 */ /** * convenience method to sum attributes in cart diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index 2c135568..76787e5f 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -54,7 +54,6 @@ module.exports = DualCollection.extend({ if(!this.active){ this.create().then(function(order){ - order.cart.order_id = order.id; self.active = order; if(bb.history.getHash() === 'cart/new') { bb.history.navigate('cart/' + order.id); diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 38bd9027..a45d51dd 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -63,8 +63,12 @@ module.exports = DualModel.extend({ //delete attributes.line_items; ? - this.cart.on( 'change add remove', function(){ - this.save(); // note don't pass arguments + this.cart.on( 'change add remove reset', function(){ + if( this.cart && this.cart.length === 0 ){ + this.destroy(); + } else { + this.save(); + } }, this ); }, @@ -72,11 +76,10 @@ module.exports = DualModel.extend({ * */ save: function(attributes, options){ - if( this.cart && this.cart.length === 0 ){ - return this.destroy( options ); + if( this.cart && this.cart.length > 0 ){ + this.updateTotals(); } - this.updateTotals(); debug('save order', this); return DualModel.prototype.save.call(this, attributes, options); diff --git a/package.json b/package.json index 3f569e1d..53d8d525 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ "normalize.css": "^3.0.3", "select2": "^4.0.0", "tether": "^1.1.1", - "tether-drop": "^1.4.1" + "tether-drop": "^1.4.1", + "vex-js": "^2.3.4" }, "devDependencies": { "chai": "^3.4.1", From 5c8b881865ea567229b1c2dc42ade926d6ed0353 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 29 Jan 2016 15:33:55 +0800 Subject: [PATCH 021/169] add settings for shipping and fee --- .travis.yml | 4 - assets/js/src/apps/pos/cart/route.js | 4 +- .../apps/pos/cart/views/line/views/drawer.js | 8 +- assets/js/src/apps/settings/access/route.js | 6 -- assets/js/src/apps/settings/checkout/route.js | 6 -- .../js/src/apps/settings/customers/route.js | 6 -- assets/js/src/apps/settings/general/route.js | 6 -- assets/js/src/apps/settings/general/view.js | 26 +++++ assets/js/src/apps/settings/receipts/route.js | 4 +- .../js/src/entities/cart/models/abstract.js | 22 ++--- assets/js/src/entities/cart/models/fee.js | 12 ++- assets/js/src/entities/cart/models/product.js | 3 +- .../js/src/entities/cart/models/shipping.js | 14 ++- assets/js/src/entities/settings/collection.js | 11 +-- assets/js/src/entities/settings/model.js | 39 ++++---- .../js/src/entities/variations/collection.js | 6 +- assets/js/src/lib/config/application.js | 2 +- assets/js/src/lib/config/deep-model | 2 +- includes/admin/class-wc-pos-abstract.php | 9 +- .../admin/settings/class-wc-pos-abstract.php | 6 +- .../admin/settings/class-wc-pos-general.php | 8 +- includes/admin/settings/views/general.php | 95 +++++++++++++++++++ includes/api/class-wc-pos-params.php | 12 ++- includes/api/class-wc-pos-payload.php | 5 +- includes/class-wc-pos-api.php | 10 ++ includes/views/main.php | 9 +- readme.txt | 3 + .../entities/variations/collection.spec.js | 6 +- 28 files changed, 244 insertions(+), 100 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c098e9f..0521ca71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,6 @@ install: - 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 -# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse' | sudo tee /etc/apt/sources.list.d/trusty.list > /dev/null -# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null -# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null -# - echo 'deb http://us.archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/trusty.list > /dev/null - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi # enable php-fpm diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 1e3b2b78..a27c6a5b 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -145,10 +145,10 @@ var CartRoute = Route.extend({ // this.layout.getRegion('totals').currentView.showDiscountRow(); //}, 'action:fee': function(){ - this.order.cart.add( null, { type: 'fee' } ); + this.order.cart.add( {}, { type: 'fee' } ); }, 'action:shipping': function(){ - this.order.cart.add( null, { type: 'shipping' }); + this.order.cart.add( {}, { type: 'shipping' }); }, 'action:checkout': function(){ this.navigate('checkout/' + this.order.id, { trigger: true }); diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index e7b774ac..14b59929 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -72,7 +72,7 @@ module.exports = FormView.extend({ collection: function(){ return Radio.request('entities', 'get', { type: 'option', - name: 'shipping' + name: 'shipping.labels' }); }, comparator: function(){} @@ -101,6 +101,12 @@ module.exports = FormView.extend({ this.$el.hide().slideDown(250); }, + remove: function() { + this.$el.slideUp( 250, function() { + $(this).remove(); + }); + }, + addMeta: function(e){ e.preventDefault(); var meta = this.model.get('meta'); diff --git a/assets/js/src/apps/settings/access/route.js b/assets/js/src/apps/settings/access/route.js index 96f91fff..bc0e7776 100644 --- a/assets/js/src/apps/settings/access/route.js +++ b/assets/js/src/apps/settings/access/route.js @@ -10,12 +10,6 @@ var Access = Route.extend({ this.model = options.model; }, - fetch: function() { - if(this.model.isNew()){ - return this.model.fetch(); - } - }, - render: function() { var view = new View({ model: this.model diff --git a/assets/js/src/apps/settings/checkout/route.js b/assets/js/src/apps/settings/checkout/route.js index 8aa1ad5e..94d40b02 100644 --- a/assets/js/src/apps/settings/checkout/route.js +++ b/assets/js/src/apps/settings/checkout/route.js @@ -12,12 +12,6 @@ var SettingsRoute = Route.extend({ this.model = options.model; }, - fetch: function() { - if(this.model.isNew()){ - return this.model.fetch(); - } - }, - render: function() { var view = new View({ model: this.model diff --git a/assets/js/src/apps/settings/customers/route.js b/assets/js/src/apps/settings/customers/route.js index 2045a456..c7bc23cb 100644 --- a/assets/js/src/apps/settings/customers/route.js +++ b/assets/js/src/apps/settings/customers/route.js @@ -10,12 +10,6 @@ var Customers = Route.extend({ this.model = options.model; }, - fetch: function() { - if(this.model.isNew()){ - return this.model.fetch(); - } - }, - render: function() { var view = new View({ model: this.model }); this.container.show(view); diff --git a/assets/js/src/apps/settings/general/route.js b/assets/js/src/apps/settings/general/route.js index baea072d..7c6462e8 100644 --- a/assets/js/src/apps/settings/general/route.js +++ b/assets/js/src/apps/settings/general/route.js @@ -10,12 +10,6 @@ var General = Route.extend({ this.model = options.model; }, - fetch: function() { - if(this.model && this.model.isNew()){ - return this.model.fetch(); - } - }, - render: function() { var view = new View({ model: this.model }); this.container.show(view); diff --git a/assets/js/src/apps/settings/general/view.js b/assets/js/src/apps/settings/general/view.js index 6ac1a56c..6de5eb06 100644 --- a/assets/js/src/apps/settings/general/view.js +++ b/assets/js/src/apps/settings/general/view.js @@ -14,6 +14,32 @@ var View = SettingsView.extend({ 'discount_quick_keys': { maximumSelectionLength: 4 } + }, + + modelEvents: { + 'all': function(e){ + console.log(e); + }, + 'change:shipping.taxable': function(model, toggle){ + this.ui.shippingTaxClass.prop('disabled', !toggle); + }, + 'change:fee.taxable': function(model, toggle){ + this.ui.feeTaxClass.prop('disabled', !toggle); + } + }, + + ui: { + shippingTaxClass: 'select[name="shipping.tax_class"]', + feeTaxClass : 'select[name="fee.tax_class"]' + }, + + onShow: function(){ + if( ! this.model.get('shipping.taxable') ){ + this.ui.shippingTaxClass.prop('disabled', true); + } + if( ! this.model.get('fee.taxable') ){ + this.ui.feeTaxClass.prop('disabled', true); + } } }); diff --git a/assets/js/src/apps/settings/receipts/route.js b/assets/js/src/apps/settings/receipts/route.js index d8079cbe..b2a2274f 100644 --- a/assets/js/src/apps/settings/receipts/route.js +++ b/assets/js/src/apps/settings/receipts/route.js @@ -21,9 +21,7 @@ var Receipts = Route.extend({ this.footer = options.layout.getRegion('footer'); this.model = options.model; this.collection = this.model.collection; - - var models = this.collection.parseSettings( this.model.sections ); - this.collection.add( models ); + this.collection.add( this.model.sections, { parse: true } ); }, render: function( section ) { diff --git a/assets/js/src/entities/cart/models/abstract.js b/assets/js/src/entities/cart/models/abstract.js index 11e644f3..95c2ba06 100644 --- a/assets/js/src/entities/cart/models/abstract.js +++ b/assets/js/src/entities/cart/models/abstract.js @@ -7,7 +7,7 @@ var debug = require('debug')('cartItem'); module.exports = bb.Model.extend({ constructor: function( attributes, options ){ - // always parse by default + // always parse attributes by default options = _.defaults( { parse: true }, options ); bb.Model.call(this, attributes, options ); }, @@ -23,6 +23,11 @@ module.exports = bb.Model.extend({ }); } + // make sure there is an item_price + if( this.get('item_price') === undefined ){ + this.set({ item_price: parseFloat( this.get('price') || 0 ) }); + } + // update on change item_price this.on( 'change:item_price', this.updateTotals ); @@ -30,21 +35,6 @@ module.exports = bb.Model.extend({ this.updateTotals(); }, - /** - * - */ - parse: function( attributes ){ - attributes = attributes || {}; - var attrs = _.clone( attributes ); // probably unnecessary - - if( attributes.item_price ){ - return attrs; - } - - attrs.item_price = parseFloat( attributes.price || 0 ); - return attrs; - }, - /** * @todo init with saved itemized taxes? */ diff --git a/assets/js/src/entities/cart/models/fee.js b/assets/js/src/entities/cart/models/fee.js index 64416ef3..5604fbd9 100644 --- a/assets/js/src/entities/cart/models/fee.js +++ b/assets/js/src/entities/cart/models/fee.js @@ -1,14 +1,22 @@ var Model = require('./abstract'); var polyglot = require('lib/utilities/polyglot'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); module.exports = Model.extend({ type: 'fee', defaults: function(){ + var fee = Radio.request('entities', 'get', { + type: 'option', + name: 'fee' + }); return { - title : polyglot.t('titles.fee'), - taxable : true + title : _.get( fee, 'name', polyglot.t('titles.fee') ), + taxable : _.get( fee, 'taxable', true ), + tax_class : _.get( fee, 'tax_class', '' ), + price : _.get( fee, 'price', 0 ) }; }, diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js index 39533b41..bb81aaaa 100644 --- a/assets/js/src/entities/cart/models/product.js +++ b/assets/js/src/entities/cart/models/product.js @@ -79,9 +79,10 @@ module.exports = Model.extend({ return attributes; // already in the right format } - var attrs = _.extend( Model.prototype.parse.call( this, attributes ), { + var attrs = _.extend( attributes, { product_id : attributes.id, name : attributes.title, + item_price : parseFloat( attributes.price || 0 ), regular_price : parseFloat( attributes.regular_price || 0 ) } ); diff --git a/assets/js/src/entities/cart/models/shipping.js b/assets/js/src/entities/cart/models/shipping.js index 34931fc2..d0dc59bd 100644 --- a/assets/js/src/entities/cart/models/shipping.js +++ b/assets/js/src/entities/cart/models/shipping.js @@ -1,15 +1,23 @@ var Model = require('./abstract'); var polyglot = require('lib/utilities/polyglot'); +var Radio = require('backbone.radio'); +var _ = require('lodash'); module.exports = Model.extend({ type: 'shipping', defaults: function(){ + var shipping = Radio.request('entities', 'get', { + type: 'option', + name: 'shipping' + }); return { - method_title : polyglot.t('titles.shipping'), - taxable : true, - method_id : '' + method_title : _.get( shipping, 'name', polyglot.t('titles.shipping') ), + method_id : _.get( shipping, 'method', '' ), + taxable : _.get( shipping, 'taxable', true ), + tax_class : _.get( shipping, 'tax_class', '' ), + price : _.get( shipping, 'price', 0 ) }; }, diff --git a/assets/js/src/entities/settings/collection.js b/assets/js/src/entities/settings/collection.js index 094521ef..61e04ded 100644 --- a/assets/js/src/entities/settings/collection.js +++ b/assets/js/src/entities/settings/collection.js @@ -25,15 +25,10 @@ module.exports = Collection.extend({ _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) ); - models = this.parseSettings( settings ); + //models = this.parseSettings( settings ); + options = _.extend( {}, options, { parse: true } ); - return Collection.prototype.constructor.call(this, models, options); - }, - - parseSettings: function(settings){ - return _.map(settings, function(setting){ - return new Model( setting.data, setting ); - }, this); + return Collection.prototype.constructor.call(this, settings, options); } }); \ No newline at end of file diff --git a/assets/js/src/entities/settings/model.js b/assets/js/src/entities/settings/model.js index 8e01411d..53d91f67 100644 --- a/assets/js/src/entities/settings/model.js +++ b/assets/js/src/entities/settings/model.js @@ -1,26 +1,33 @@ var DeepModel = require('lib/config/deep-model'); var _ = require('lodash'); +/* jshint -W071, -W074 */ module.exports = DeepModel.extend({ - initialize: function( attrs, options ){ - options = options || {}; - this.template = options.template; - this.sections = options.sections; - }, - - /** - * https://github.com/jashkenas/backbone/issues/1069 - */ parse: function(resp) { - if( _.isObject( resp ) ){ - _.keys(this.attributes).forEach(function(key) { - if (resp[key] === undefined) { - resp[key] = undefined; - } - }); + // init + if( _.has(resp, 'data') ){ + this.template = resp.template; + this.sections = resp.sections; + resp = _.defaults( { id: resp.id }, resp.data ); + } + + // save & restore + if( resp && ! resp.id ){ + resp.id = this.id; } + + // https://github.com/jashkenas/backbone/issues/1069 + // https://github.com/kahwee/backbone-deep-model/issues/6 + var attr, attrs = this.objToPaths(resp); + for( attr in this.objToPaths(this.attributes) ){ + if( attrs[attr] === undefined ){ + this.set( attr, undefined, { unset: true } ); + } + } + return resp; } -}); \ No newline at end of file +}); +/* jshint +W071, +W074 */ \ No newline at end of file diff --git a/assets/js/src/entities/variations/collection.js b/assets/js/src/entities/variations/collection.js index 8fcbe439..5559c8d7 100644 --- a/assets/js/src/entities/variations/collection.js +++ b/assets/js/src/entities/variations/collection.js @@ -40,10 +40,10 @@ module.exports = Collection.extend({ /* jshint +W074 */ range: function(attr){ - var attrs = this.compact( this.pluck(attr)), min = 0, max = 0; + var attrs = this.compact( this.pluck(attr) ), min = 0, max = 0; if( !_.isEmpty(attrs) ) { - min = _(attrs).min(); - max = _(attrs).max(); + min = parseFloat( _(attrs).min() ); + max = parseFloat( _(attrs).max() ); } return _.uniq([min, max]); } diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index 80fba5f3..1b60de8e 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -35,7 +35,7 @@ var Application = Mn.Application.extend({ * force wc_api to have trailing slash */ start: function( options ){ - options = options || {}; + options = _.isString(options) ? { wc_api: options } : options || {}; var params, self = this, wc_api = options.wc_api.replace(/\/?$/, '/'); // get payload diff --git a/assets/js/src/lib/config/deep-model b/assets/js/src/lib/config/deep-model index 671232e4..e6dbd26b 160000 --- a/assets/js/src/lib/config/deep-model +++ b/assets/js/src/lib/config/deep-model @@ -1 +1 @@ -Subproject commit 671232e4097054c61b134c1fefbc42ef9c8e62a0 +Subproject commit e6dbd26bc4531648c327a4517fa7a8b2f525cacd diff --git a/includes/admin/class-wc-pos-abstract.php b/includes/admin/class-wc-pos-abstract.php index 1202e89e..12e2e651 100644 --- a/includes/admin/class-wc-pos-abstract.php +++ b/includes/admin/class-wc-pos-abstract.php @@ -76,8 +76,13 @@ public function admin_print_scripts(){ * Start the Admin App */ public function print_footer_scripts() { - $options = array( 'wc_api' => get_woocommerce_api_url(null) ); - echo ''; + echo ''; } /** diff --git a/includes/admin/settings/class-wc-pos-abstract.php b/includes/admin/settings/class-wc-pos-abstract.php index 3852acd4..ceb52c39 100644 --- a/includes/admin/settings/class-wc-pos-abstract.php +++ b/includes/admin/settings/class-wc-pos-abstract.php @@ -147,12 +147,10 @@ public function get_sections(){ } /** - * Return setting defaults. Merge with settings id. + * Return setting defaults */ public function get_defaults(){ - return wp_parse_args( array( - 'id' => $this->id, - ), $this->defaults ); + return $this->defaults; } /** diff --git a/includes/admin/settings/class-wc-pos-general.php b/includes/admin/settings/class-wc-pos-general.php index df871e71..c7d5b936 100644 --- a/includes/admin/settings/class-wc-pos-general.php +++ b/includes/admin/settings/class-wc-pos-general.php @@ -27,7 +27,13 @@ public function __construct() { $this->label = __( 'General', 'woocommerce' ); $this->defaults = array( - 'discount_quick_keys' => array('5', '10', '20', '25') + 'discount_quick_keys' => array('5', '10', '20', '25'), + 'shipping' => array( + 'taxable' => true + ), + 'fee' => array( + 'taxable' => true + ) ); } diff --git a/includes/admin/settings/views/general.php b/includes/admin/settings/views/general.php index d8d0a678..3aa27a52 100644 --- a/includes/admin/settings/views/general.php +++ b/includes/admin/settings/views/general.php @@ -43,4 +43,99 @@ + + +

    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + +
    + + + + +
    + + + +
    + +

    + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + +
    + + + +
    \ No newline at end of file diff --git a/includes/api/class-wc-pos-params.php b/includes/api/class-wc-pos-params.php index 66ddcf26..6b798f73 100644 --- a/includes/api/class-wc-pos-params.php +++ b/includes/api/class-wc-pos-params.php @@ -71,9 +71,10 @@ private function frontend_params(){ 'auto_print' => wc_pos_get_option( 'checkout', 'auto_print_receipt' ), 'denominations' => WC_POS_i18n::currency_denominations(), 'discount_keys' => wc_pos_get_option( 'general', 'discount_quick_keys' ), + 'fee' => wc_pos_get_option( 'general', 'fee' ), 'hotkeys' => wc_pos_get_option( 'hotkeys', 'hotkeys' ), 'menu' => $this->menu(), - 'shipping' => $this->shipping_labels(), + 'shipping' => $this->shipping(), 'tabs' => $this->product_tabs(), 'tax' => $this->tax(), 'tax_classes' => WC_POS_Tax::tax_classes(), @@ -228,6 +229,15 @@ private function user() { ); } + /** + * + */ + private function shipping(){ + $shipping = wc_pos_get_option( 'general', 'shipping' ); + $shipping['labels'] = self::shipping_labels(); + return $shipping; + } + /** * @return array */ diff --git a/includes/api/class-wc-pos-payload.php b/includes/api/class-wc-pos-payload.php index d5a902b2..1a642a5c 100644 --- a/includes/api/class-wc-pos-payload.php +++ b/includes/api/class-wc-pos-payload.php @@ -49,8 +49,9 @@ public function get_payload( $wc_pos_admin = null ) { 'templates' => $wc_api->WC_POS_API_Templates->get_templates( $wc_pos_admin ), ); - $payload['params']['settings'] = $wc_api->WC_POS_API_Settings->get_settings( '', $wc_pos_admin ); - if( ! $wc_pos_admin ){ + if( $wc_pos_admin ){ + $payload['params']['settings'] = $wc_api->WC_POS_API_Settings->get_settings( '', $wc_pos_admin ); + } else { $payload['params']['gateways'] = $wc_api->WC_POS_API_Gateways->get_gateways(); } diff --git a/includes/class-wc-pos-api.php b/includes/class-wc-pos-api.php index 706fd5ff..a5fe41ff 100644 --- a/includes/class-wc-pos-api.php +++ b/includes/class-wc-pos-api.php @@ -141,6 +141,16 @@ public function woocommerce_api_query_args($args, $request_args){ unset( $request_args['not_in'] ); } + /** + * This is a safe guard against overloading the POS + * - some theme developers use pre_get_posts to alter the no. of posts/products + * - $query->set( 'posts_per_page', LARGE/-1 ) will grind the POS to a halt + * - ensure the default is 10, unless specifically requested by the POS + */ + if( empty( $args['posts_per_page'] ) ){ + $args['posts_per_page'] = 10; + } + return $args; } diff --git a/includes/views/main.php b/includes/views/main.php index b925ac67..f21d6336 100644 --- a/includes/views/main.php +++ b/includes/views/main.php @@ -42,8 +42,13 @@ - get_woocommerce_api_url(null) ); ?> - + \ No newline at end of file diff --git a/readme.txt b/readme.txt index cfd9e27e..5d2298be 100644 --- a/readme.txt +++ b/readme.txt @@ -86,6 +86,9 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c * New: Receipt print methods for thermal printers (experimental) * New: Receipt templates for epos-print and ESC/POS languages (experimental) * New: Receipt template editor for custom receipts +* New: Settings for default Shipping and Fee line items +* New: Setting for which customer roles to display in the POS +* New: Split products into multiple lines in the cart * Fix: Checkout settings not showing for some users * Fix: issue with some product variation names, e.g.: 000, 00 and 0 * Tweak: Add Reply-To header to support emails diff --git a/tests/unit/js/spec/entities/variations/collection.spec.js b/tests/unit/js/spec/entities/variations/collection.spec.js index abf57108..f6603cb5 100644 --- a/tests/unit/js/spec/entities/variations/collection.spec.js +++ b/tests/unit/js/spec/entities/variations/collection.spec.js @@ -19,15 +19,15 @@ describe('entities/variations/collection.js', function () { }); it('should return the price range', function(){ - variations.range('price').should.eql([ '30.00', '35.00' ]); + variations.range('price').should.eql([ 30, 35 ]); }); it('should return the regular_price range', function(){ - variations.range('regular_price').should.eql([ '35.00' ]); + variations.range('regular_price').should.eql([ 35 ]); }); it('should return the sale_price range', function(){ - variations.range('sale_price').should.eql([ '30.00' ]); + variations.range('sale_price').should.eql([ 30 ]); }); }); \ No newline at end of file From e25ab15b3512490d86f16f075745784650c1560b Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 29 Jan 2016 21:56:18 +0800 Subject: [PATCH 022/169] fix modal close --- assets/css/src/scss/partials/_cart.scss | 9 +++++++++ assets/css/src/scss/partials/_list.scss | 6 +----- assets/css/src/scss/partials/_modal.scss | 6 +++++- assets/css/src/scss/partials/_products.scss | 8 ++++++++ assets/js/src/apps/pos/cart/route.js | 5 ++++- assets/js/src/apps/pos/cart/views/items.js | 7 ++----- assets/js/src/apps/pos/cart/views/line/layout.js | 3 +-- assets/js/src/apps/pos/cart/views/totals.js | 12 ++++++++++++ assets/js/src/apps/settings/general/view.js | 3 --- assets/js/src/apps/support/status/route.js | 2 +- assets/js/src/entities/cart/collection.js | 15 +++++++++++---- assets/js/src/entities/orders/model.js | 2 +- assets/js/src/lib/components/modal/layout.js | 9 ++++++--- assets/js/src/lib/components/modal/service.js | 16 ++++++++++------ includes/views/pos/cart/tmpl-totals.php | 12 ++++++++++-- 15 files changed, 81 insertions(+), 34 deletions(-) diff --git a/assets/css/src/scss/partials/_cart.scss b/assets/css/src/scss/partials/_cart.scss index 346c349f..d2f0c81c 100644 --- a/assets/css/src/scss/partials/_cart.scss +++ b/assets/css/src/scss/partials/_cart.scss @@ -12,6 +12,8 @@ $pulse-in-bg-color : lighten( $brand-success, 40% ); $pulse-out-bg-color : lighten( $brand-danger, 30% ); //$pulse-out-bg-color : #f2dede; +$cart-row-action-icon-size : 2.5em; + cart { @at-root { @@ -172,6 +174,13 @@ cart { } + .action { + // icon size + i { + font-size: $cart-row-action-icon-size; + } + } + } diff --git a/assets/css/src/scss/partials/_list.scss b/assets/css/src/scss/partials/_list.scss index 6bb79190..65dfde58 100644 --- a/assets/css/src/scss/partials/_list.scss +++ b/assets/css/src/scss/partials/_list.scss @@ -9,8 +9,6 @@ $list-header-color : $inverse-text-color; $list-item-padding-x : $padding-base-horizontal; $list-item-padding-y : $padding-base-vertical; -$list-row-action-icon-size : 2.5em; - $list-item-drawer-padding-x : $padding-base-horizontal; $list-item-drawer-padding-y : $padding-base-vertical; $list-item-drawer-bg : $list-border-color; @@ -137,9 +135,7 @@ list { word-wrap: break-word; &.action { - i { - font-size: $list-row-action-icon-size; - } + text-align: center; } } diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index dffe1640..fbf51e61 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -92,7 +92,7 @@ modal { bottom: 0; left: 0; - &.vex.vex-closing { + .#{namespace('modal')}.#{namespace('modal-closing')} & { @include animation($modal-fade-out-name 0.5s); } } @@ -109,6 +109,10 @@ modal { margin: 0 auto; // Remove focus outline from opened modal outline: 0; + + .#{namespace('modal')}.#{namespace('modal-closing')} & { + @include animation($modal-fade-out-name 0.5s); + } } // Modal header diff --git a/assets/css/src/scss/partials/_products.scss b/assets/css/src/scss/partials/_products.scss index d9c664da..9e49b839 100644 --- a/assets/css/src/scss/partials/_products.scss +++ b/assets/css/src/scss/partials/_products.scss @@ -1,3 +1,5 @@ +$product-row-action-icon-size : 2.5em; + products { @at-root { @@ -88,6 +90,12 @@ products { color: darken($brand-success, 10%); } } + + // icon size + i { + font-size: $product-row-action-icon-size; + } + } } diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index a27c6a5b..64497283 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -135,8 +135,11 @@ var CartRoute = Route.extend({ this.listenTo(view, { 'action:void': function(){ + var order = this.order; view.triggerMethod('disableButtons'); - this.layout.getRegion('list').currentView.voidCart(); + this.layout.getRegion('list').currentView.fadeCart().done(function(){ + order.destroy(); + }); }, 'action:note': function(){ this.layout.getRegion('note').currentView.showNoteField(); diff --git a/assets/js/src/apps/pos/cart/views/items.js b/assets/js/src/apps/pos/cart/views/items.js index 2a011dcb..8e1198c4 100644 --- a/assets/js/src/apps/pos/cart/views/items.js +++ b/assets/js/src/apps/pos/cart/views/items.js @@ -17,14 +17,11 @@ var View = CollectionView.extend({ tagName: 'ul', childView: LineItem, emptyView: Empty, - voidCart: function(){ - var self = this; + fadeCart: function(){ var fadeAll = this.children.map( function( child ){ return child.fadeOut(); } ); - $.when.apply( $, fadeAll ).done( function() { - self.collection.reset(); - }); + return $.when.apply( $, fadeAll ); } }); diff --git a/assets/js/src/apps/pos/cart/views/line/layout.js b/assets/js/src/apps/pos/cart/views/line/layout.js index 8b6a2610..8a4db7d0 100644 --- a/assets/js/src/apps/pos/cart/views/line/layout.js +++ b/assets/js/src/apps/pos/cart/views/line/layout.js @@ -76,8 +76,7 @@ module.exports = LayoutView.extend({ } }, - pulse: function(opt) { - if(opt === 'remove'){ return; } + pulse: function() { var el = this.$el, type = this.model.get( 'type' ); // scroll to row diff --git a/assets/js/src/apps/pos/cart/views/totals.js b/assets/js/src/apps/pos/cart/views/totals.js index c3645278..daa261de 100644 --- a/assets/js/src/apps/pos/cart/views/totals.js +++ b/assets/js/src/apps/pos/cart/views/totals.js @@ -8,6 +8,14 @@ module.exports = ItemView.extend({ 'change': 'render' }, + ui: { + toggleTax: 'a[data-action="toggle-tax"]' + }, + + events: { + 'click @ui.toggleTax': 'toggleTax' + }, + /** * */ @@ -24,6 +32,10 @@ module.exports = ItemView.extend({ } return data; + }, + + toggleTax: function(e){ + if(e){ e.preventDefault(); } } }); \ No newline at end of file diff --git a/assets/js/src/apps/settings/general/view.js b/assets/js/src/apps/settings/general/view.js index 6de5eb06..4725cd75 100644 --- a/assets/js/src/apps/settings/general/view.js +++ b/assets/js/src/apps/settings/general/view.js @@ -17,9 +17,6 @@ var View = SettingsView.extend({ }, modelEvents: { - 'all': function(e){ - console.log(e); - }, 'change:shipping.taxable': function(model, toggle){ this.ui.shippingTaxClass.prop('disabled', !toggle); }, diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index 71f398a1..829a99ca 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -9,7 +9,7 @@ var polyglot = require('lib/utilities/polyglot'); var StatusRoute = Route.extend({ - databases: ['products', 'orders', 'cart', 'customers'], + databases: ['products', 'orders', 'customers'], initialize: function(options){ this.container = options.container; diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index a354469a..fb1af49a 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -63,9 +63,9 @@ module.exports = bb.Collection.extend({ }, this); models = bb.Collection.prototype.add.call(this, parsedAttrs, options); - _.each( models, function( model ){ - model.trigger('pulse'); - } ); + if( ! options.split ){ + this.pulseModels(models); + } return models; }, /* jshint +W071, +W074 */ @@ -92,15 +92,22 @@ module.exports = bb.Collection.extend({ for( var i = 0; i < duplicate; i++ ){ models.push( attributes ); } - this.add(models, { + models = this.add(models, { at: ( model.collection.indexOf( model ) + 1 ), split: true, silent: true }); model.set({ quantity: qty - duplicate }); model.collection.trigger('reset'); // re-render the cart + this.pulseModels(models); } + }, + + pulseModels: function(models){ + _.each( models, function( model ){ + model.trigger('pulse'); + } ); } }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index a45d51dd..e83c775f 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -63,7 +63,7 @@ module.exports = DualModel.extend({ //delete attributes.line_items; ? - this.cart.on( 'change add remove reset', function(){ + this.cart.on( 'change add remove', function(){ if( this.cart && this.cart.length === 0 ){ this.destroy(); } else { diff --git a/assets/js/src/lib/components/modal/layout.js b/assets/js/src/lib/components/modal/layout.js index 50f0b09f..40782e4f 100644 --- a/assets/js/src/lib/components/modal/layout.js +++ b/assets/js/src/lib/components/modal/layout.js @@ -29,17 +29,20 @@ module.exports = LayoutView.extend({ template: hbs.compile(Tmpl), initialize: function( options ){ + // this.$el.data() = this.options options = _.defaults( options, { header: _.get(options, ['view', 'modal', 'header'], defaultModal.header), tabs : _.get(options, ['view', 'modal', 'tabs'], defaultModal.tabs), footer: _.get(options, ['view', 'modal', 'footer'], defaultModal.footer) }); - this.mergeOptions( options, ['header', 'tabs', 'footer', 'view'] ); + this.mergeOptions( options, ['header', 'tabs', 'footer', 'view', 'id'] ); + this.render(); }, childEvents: { 'action:close' : function(){ - Radio.request( 'modal', 'close', this.el.id ); + //Radio.request( 'modal', 'close', this.$el.data().vex.id ); + Radio.request( 'modal', 'close', this.id ); } }, @@ -51,7 +54,7 @@ module.exports = LayoutView.extend({ }; }, - onShow: function(){ + onRender: function(){ if( this.header ){ this.showHeader( this.header ); } if( this.tabs ){ this.showTabs( this.tabs ); } this.showBody(); diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 64eb96e5..21370bed 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -5,7 +5,6 @@ var prefix = App.prototype.namespace('modal'); var _ = require('lodash'); var Layout = require('./layout.js'); var bb = require('backbone'); -var mn = require('backbone.marionette'); var globalChannel = require('backbone.radio').channel('global'); var JSON = window.JSON; @@ -71,14 +70,19 @@ module.exports = Service.extend({ overlayClosesOnClick : false }, options ); - var modal = Modal.open( options ); - var region = new mn.Region({ el: modal }); - options.className = undefined; // note className leaks into Layout View - return region.show( new Layout( options ) ); + var afterOpen = options.afterOpen; + options.afterOpen = function( $el, opts ){ + opts.el = $el; + opts.layout = new Layout( opts ); + if(afterOpen){ + afterOpen( $el, opts ); + } + }; + + return Modal.open( options ); }, close: function( id ){ - id = parseInt( id, 10 ); return Modal.close( id ); }, diff --git a/includes/views/pos/cart/tmpl-totals.php b/includes/views/pos/cart/tmpl-totals.php index 463c02d4..a149d1bc 100644 --- a/includes/views/pos/cart/tmpl-totals.php +++ b/includes/views/pos/cart/tmpl-totals.php @@ -20,7 +20,11 @@ {{title}}:
    {{{money total}}}
    -
    +
    + + + +
    • {{/compare}} {{/each}} @@ -31,7 +35,11 @@ countries->tax_or_vat() ); ?>:
    {{{money total_tax}}}
    -
    +
    + + + +
    {{/if}} {{/compare}} From 44f69c68f378c99c859140242e44a53cf3eecc2c Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sun, 31 Jan 2016 00:53:09 +0800 Subject: [PATCH 023/169] toggle taxes --- assets/css/src/scss/partials/_cart.scss | 2 +- assets/css/src/scss/partials/_icons.scss | 15 +- assets/fonts/woocommerce-pos.eot | Bin 11252 -> 0 bytes assets/fonts/woocommerce-pos.svg | 81 +++++---- assets/fonts/woocommerce-pos.ttf | Bin 11056 -> 11504 bytes assets/fonts/woocommerce-pos.woff | Bin 11132 -> 11580 bytes assets/js/src/apps/pos/cart/views/totals.js | 3 + .../js/src/entities/cart/models/abstract.js | 53 +++--- assets/js/src/entities/cart/models/product.js | 2 +- assets/js/src/entities/orders/model.js | 134 +++++++++++--- assets/js/src/entities/tax/collection.js | 44 ++++- assets/js/src/entities/tax/model.js | 3 +- assets/js/src/lib/components/modal/service.js | 1 + includes/views/pos/cart/tmpl-customer.php | 2 +- includes/views/pos/cart/tmpl-item.php | 4 +- includes/views/pos/cart/tmpl-totals.php | 2 +- .../entities/cart/models/abstract.spec.js | 25 ++- .../js/spec/entities/cart/models/fee.spec.js | 32 +++- .../spec/entities/cart/models/product.spec.js | 171 +++++++++++++----- .../entities/cart/models/shipping.spec.js | 72 +++++--- .../js/spec/entities/orders/model.spec.js | 102 +++++++++-- .../js/spec/entities/tax/collection.spec.js | 27 ++- 22 files changed, 569 insertions(+), 206 deletions(-) delete mode 100755 assets/fonts/woocommerce-pos.eot diff --git a/assets/css/src/scss/partials/_cart.scss b/assets/css/src/scss/partials/_cart.scss index d2f0c81c..bdf0a51c 100644 --- a/assets/css/src/scss/partials/_cart.scss +++ b/assets/css/src/scss/partials/_cart.scss @@ -162,7 +162,7 @@ cart { a { position: absolute; top: 50%; - margin-top: -11px; // half height of btn + margin-top: -9px; // half height of btn right: -11px; i { @include single-transition(transform, 0.4s); diff --git a/assets/css/src/scss/partials/_icons.scss b/assets/css/src/scss/partials/_icons.scss index c447908b..caa92a4a 100644 --- a/assets/css/src/scss/partials/_icons.scss +++ b/assets/css/src/scss/partials/_icons.scss @@ -1,7 +1,9 @@ @font-face { font-family: 'WooCommercePOS'; - src: url('../fonts/woocommerce-pos.eot?v=0.3.1'); - src: url('../fonts/woocommerce-pos.eot?#iefix&v=0.3.1') format('embedded-opentype'), url('../fonts/woocommerce-pos.woff?v=0.3.1') format('woff'), url('../fonts/woocommerce-pos.ttf?v=0.3.1') format('truetype'), url('../fonts/woocommerce-pos.svg?v=0.3.1#woocommerceposregular') format('svg'); + src: + url('../fonts/woocommerce-pos.ttf?nkmeb4') format('truetype'), + url('../fonts/woocommerce-pos.woff?nkmeb4') format('woff'), + url('../fonts/woocommerce-pos.svg?nkmeb4#woocommerce-pos') format('svg'); font-weight: normal; font-style: normal; } @@ -16,6 +18,7 @@ icon { font-weight: normal; font-variant: normal; text-transform: none; + line-height: 1; /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -47,7 +50,10 @@ icon { chevron-left chevron-right chevron-up + chevron-circle-down + chevron-circle-left chevron-circle-right + chevron-circle-up cog coupons customers @@ -92,7 +98,10 @@ $icons: ( "chevron-down" : "f078", "chevron-right" : "f054", "chevron-up" : "f077", + "chevron-circle-down" : "e900", + "chevron-circle-left" : "e902", "chevron-circle-right" : "f138", + "chevron-circle-up" : "e901", "cog" : "f013", "coupons" : "e607", "customers" : "e606", @@ -225,7 +234,7 @@ icon { icon { @at-root { - .#{current-module()}-lg, { + .#{current-module()}-lg { font-size: 1.33333333em; } .#{current-module()}-2x { diff --git a/assets/fonts/woocommerce-pos.eot b/assets/fonts/woocommerce-pos.eot deleted file mode 100755 index c5730c0e2587afeaba1999837703bb9fbc743aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11252 zcmb7K3ve69dEUJ@?f@J>;=v~f0s=r0GDHFdV2L7yIC@dki;^hGN-bFrO0sKFils!B z(>idHcAPkqc;vn!d1}wtP1P#3<8cys;$((xJWbNdt(~zmZN`}>O{27_<0^HM$xKAB z-@kVtL5Y%*JM8W5zyJRG@Bi5S_YS|vGS-L0nZ)K_oISw_vSG`7IN>_i(t~e2b$uIS zF?Na_!+ikhDDDaNAj%W$4t5-n6X@V)TTwsEKExhi`_Rf*gzXS`C)jTe(3cj7qm0P4R+ZXAB# z^r5c4a|2AwKXv}d#J+?2-~UyavCMh2myQ6Se@p%e>X%VpbmZvCht6u+UozICp#Fsi zjvd%{Vfk15sDBalT}Sslbev5{Z!oslKs`RW@94y@4;^|D^&X6Q<@m7^C&4GKEO@{~ zWqFD}!BmX@Iq4E0pLKHnKdit#gx7F!>N4-DF!u91<*At|R*{j=MzW}1aZ#YrD0QIC z$z_4n!4x(H_!4lTFfU;7%aO~Sm(!OESIn!@Ro~U-tFf!&S9f0Bef7xIhpv9%>bHNc z|NPFG>6sbyV!#f%*bLZSfxS&&AHI4@U~4WmpZQVOdtE>4`f=C4xA_8*fG=R!HT$3J zZ`|J@-8O@S1wgr<^|ZzH@nFH|pNli+Yo$ z-Fa!Oom`0ryNk(SlHZ=^@A1~xHq_E}uIl*>+)1z1UfRf6?Y-MF11-W^Tz*2Vmn~!K zz)_>5NODDzVIzP2GLM9GEs^2rfpRGyRXNHia+J{^v3s69y>{(s5}K1=&&gwa$m8*} zdurbh86QHS9YugCldDeWhu5wZl0Ut+QlD)-uYGxbmpf)j35pH#@~~#s!-g=gawgmz zE*HDQHjfs&i+Z@bm};EXf~F$vK6kG6Qh~RfJ$H_8EYz;lZs6qx4e*!mx%aNWS-N(e zx_9sJ^Zn~L`mPtiE$qTzoh%P-yCj~`GrD?P4td+B7d7!k#jBqIcXj#H^BZ~l=f@I3 z-dgy{V|nYgT#}mOiWvCt$B@*fz$Ri#eXj@hnehx}WQXU?>ue@j`dL zR37H#?qVcgFE<SQN+5)0ofKvlJvx%2HLz{ukAHk?df-d zouX{D*qeCJXSFr)bTH<%EIwMh^wa6DJH6|D(`~fa&aE5WSPlE31!ol$GYy9lx?c{5 zBCu$zd6{8eOa;4x-OWfs2F0LsurNHFk2K5en&KVZva(6at=_T4n~m_z*Urj^HeO@$ zmzzSC&&S_MZ(o;d*&2}}x}~(WwD#t#u(c-D9cho}S7zUw-YC7q*)@h4#DnsM`MibL zVgv|`U%y}kY0+(5gk^A=l-TW5{T~0xYw}dxmh1Vo8;$zPh7FAAvujx&{QVgF6#H}b zP4*`7(}Q(i>vXlBr2viQ-a7aU! zVsM~T$VZ~X98Usu113Q8D$b_1l;`+dV?u0lp-2~xaTqhn(- zi)Eke?TTg3WMf^uPf|4-n;z)S<+>BOTtd1OPT6)k6i(ZADjX6|7ea6s0ys}eXJT1k zP7g#D2b#RTK+tRY+V%!oL#E{o z>YA;0g>p-4Kcn#}$y3?bB(d~~Ph9^5xVGHkvOD*j?f2UYr)l+4HpZ{`?b^ru-u;1K zlg*dgO_twlk1ZpPmW@%K2$^<^&oF|PFOX{K%=Li#X0PV)nu?+;flR2g?|TkQ-LO&- zb!D-RWD#SuvG>DHy0L$SgV@@V-JExOP%lHJ1DSME4`I`Q3el8U%ITSbCRcKLmZ9S= zPETO)aVc9&rBmtR^jozHa&`Jz?N{8C6iCzOZ5sFO-|zGKnwq@(_j~d5Q62Evx|~g? ziZxbDr+Ah3*1lVN3)m71`n-SJ<>=fU#O^YC2W3`6tX)sj)yhq-w|4BfFg}jo^jnP>@_1wInphVoEUrMl z6-ZjgNx;TV97WXA#gZ(;vTP}KlQJT^l~}>Cr8Fk))+v{fC|3*NWZ6wAWsE(G9RW*$Tw`s}M_VK-9XO?P9;j?qvtr5ge?Jvy<#0_6N|^C)i``)9eZM zC+siSQ|uY`96Qgxz`n@7#9qc3X^OqdzQr!F*Rg*68+)5wX8+0li@ifOij}?GPs=+A zBsIT!T`N|#9OtuH=Rsa&fHbUevqoNKCHXv}NXdTqAgf@bSLs7>Kf zzovvWRx1@5oV!zijW(1UxW~+ZIscLv>Qy9M)wv&v4zwyVs-hq&qKqojX6-Y?x)Dph z9|!w=u$=36WqEcd!mgzDQ`ms;s4O-cyTtC8;V2$#Wq!L1|l}D zGN80M-nf}h9pAF$I3;P%iyqVTyclR|3cNQG?Qd)AkB($^0iyW=eiiu0kI>u@-z1YcoZxndV_c92pPyBRGjR>m+YKZTKYG zVV)^RH4)3AR!V17M7QEc5_i;q09X7-LyqRkjWGs#IJiKc?cv}8-R&WNB(c4xvoh0y ztM+K^QOaj3ojuzVL;gZ!Fy6B**^|)U_dY$*lib!5AB+_IL(^BZpk=lAy{(oP;jE#l zTEMbe{oWR@TYoxLET$;&oq$-aUVn>a1%YP>j25rI)v^Mj{+mP+KG?Eq-KrMyby1jM zm1JV*=|UuuO!OSc-E~*)Ku;nWi4>k5`lPSboTX%8#74@Nx7GU+_D>9)E?yIi1ue7H z2e9Qb>M-6yb<&N@F7R=A94{oCcMb5AhWM}hrWMYT`FxU+G+UaPElDh&T$Il*qW1Z@ z7?WRM0T|iE+E3Cy&m~{*L)kU?j@C%+h1;De_|%<;cCL={|4wdL+??!h zj`l{|dU69TONKKlk4ZAG{r<0><}&Z%s#~A@!_4xQf!bGf!!psp2jBEGn;m!c)V|WP zYWv=S{@p!%WBqJW&u=`VFoail*CJn(PvHcIH<`@{9O@-D#hb#Ukyhhon7Hq4?QwAI$A1q#m|gxxbOZ^T=(C% zVU+)P%)yJtOQrRrV~-qqH4=-V%Qx0KkgYE2=!OlW_hEfp&34PL$Q%(dI9$oWUKe+s z#33ifc)GYcu!&xmo#!8>Y*Qdm3k4$4KMHJNthpd2c#86b~VfdqIO|^R$=&@BrkCCv`!}d@Q zesM(>*NUNRZ*O*J_@g?}?h1G2b=}ayJ&V<0pJ!udKvnhoJl-KyyDO#{n(l3D^LKVY zI-2o_uA@g=dpw7N9$vgy8}b>OM34K?L(^7us)nwK9_<0@;q1R2`FZ%j+Uq=^T!QsG zXD`TjB^Sm{G73X4bdwX{cFcqt=nN)Yq>@YyF5fzK_x4Sjht>z9QOmMtSc~ZiZr*-k zMX8j@v_zvVnM|p)V%3VFUd3Z*n>1zRuDkc&J+^iEU^2<4?j9Q(L?IquHqvBzTJZMT zvZ9gT=FKh9Oi!saI9Mw6WTGvxSV`mRW)<@tUEGUN2gkodD7e%`YE)?Ul1y}_4SDEMuw2Jnyl)MV{7ZPeeWz3yTWI_#C>oYW$H+@W6{ zD0|=$j%P-RzVJ!%l7hwi&=+JuhMzZ0kVa{*bq>`&3~1XXjlIhqmd1DdfiaIf37sr~ z_cKIynRM2DV!`P|1VK-z0r9zbLKApnLW@#an6aaYy2*>hOu7gyoIx6~P3uX&h0Fh> zWuj_XXOJ!q4o*y*dg$Q9Ag+mn51pDoiJw~!Olo#I`>(5}1eWMISAsuRz(3hk3-Rx) ztIn$Gc$v#yGz14MlKdE_w3 zb-=QY9I=q0eE5iI2heC8K5X%+Io{?UAaNsvVv)JIti;*z=CdJv;I$@c zLgXS~LvW4eZd)H7kO*KA1 z7%2z)1BeVSqVoqNP_8#po$Q*it#V4(9p2$$!5oCu(GzQBC+v%!u&*qv&Ru$kV2fB= z8NSuLi*GfP_+axcl2eUN;zJBo`SVBTH(Xa0KE?PcIVEjnA;_3Ug)H6i@RrUUL%Qe? zpB|Z|ilK-aGU1nd%7l|?-THD zjPloFfCgKWPD=lB3tKBkqWLHcsf<{Vyj#b*8`e;#cq9~#QW2>j)@ec@h~B3s`UND6 zXSw7o))`1ykN`&gPP#CvckzA)>@4?GCepKaiE8j#Edz6gn$qQgLcUlhu4NJ#*h)B& zp{+t}!PJ(dtybJ2*Y$}>Y(lP2A{5=h)uf5??@z> z2;u5l6iIjbi4if=G;ye70J;nAFu)Xsk%=s&Wr!qAa|02CIf8I03Q`4Mo9n*u5ynmvcx&pRJqmS zT<3}^Ns^*)iA#ud^k$iI;K;I!&zd?=xo*&tE8O;Q;2}veIw6-81woUnDvGMK=LV4*xxM63dWI$Q%MSWAXizHAvzfnQi%=S zqaYXqWragsn5|)GRzT4Wa02b2gJdX>7We}vB!9ex*B~RPg&2hLczZk0z*{rO%8Jhd zlb92PFiF!Su|bx&z$m!DM?`2_bA``gkFZ5e zf(2?QniggW@?r$CPi~r$rE*LLf`#$p2{X{S6!bKM1xyoDm7so!peks!_<)0Jn!*EQjHXD? z4Vf+32UwuNFf&9DG*hxP6TL{a_#&-fP&glm$X-R&F(oQPawx*ianaah2C`x13(x7))$?`0E5Fs0VcVjtLFC`LDTQ?NeUJw#F!L!P0BgMK8x8fVwZ*D zpWtr|WC+&fMNZIu?QJK&W&IQ#0>sfkWPA~Y`8XfA8Bfh`r!xx2+2kGRkhHAfj5QZ) z&AlmDqHz;SgGyAjlL|k)ticsJG~RAdlUDncQ`atE)&SOB+BMJ~ZHTj+?|I^l#Oynd zC4_Himw!m7+D=ui{gMhGD1ml|=2CP(f(_8dJ0JIK)kgoFNYSYS?@t;}8qTStOpz|O zGwg$Id?Get?A-h;ml4uUQ}njnvR-(>LWVMbbM9a=cUXBA$kd1~0t@I)Ki)Za7?~@9 zJrRc^7JurEgG=|?D}Ko=@y42cXVVw&p=Kv{{{@2o=7~AE{ltIV@Nye(wtl0if)cgV zFMM5{yGRsNUm&RqzzDB;9lV12QKSnB<48Czy)5XhmeXt{>LW-M>20y!!2uof5a`Du;rhk7gs!h z#L(iDC48@Z!7a;x(?8M(M?v|LTUPPM&pX|+CZyrum~4P6r;Z&vaO~*Oi3bl%+<|{h z-uhpqJ0>1Hao@4Ycz>>M;lGmpPSk!U?DM=Gf%P_~D7ki3j(c zoH!WYe>y&L;Mm4v$0l=Zjrcq4NfyW7Whd~*So$;VK784oz?Ypk+s{tpIU@dQyAhc5 O*V+324TLfme*8ZK#9vAP diff --git a/assets/fonts/woocommerce-pos.svg b/assets/fonts/woocommerce-pos.svg index 54508340..ad4e5cee 100755 --- a/assets/fonts/woocommerce-pos.svg +++ b/assets/fonts/woocommerce-pos.svg @@ -7,43 +7,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/fonts/woocommerce-pos.ttf b/assets/fonts/woocommerce-pos.ttf index 9af5dbc319e65ab09f39b34ed7b24ea52ebadc87..5765b4af7a9e92bfe879397c2d593da7db0ddfea 100755 GIT binary patch delta 4770 zcma)A3v3+6d7hbl-p=xNkH>rPcy|=FN;!52Hhd}4I;iHp;_P8=Q>IDBH)t`m=J*zm}SUBC@>KJq3LN#*XoA5_kdP*VBNPaz0x z7bQs@X(45@UOcZXk1I4>XXvRM&32Yc1&yML8Z8wf;X3gLrF|#eP`Tu5@cDeSPZr9d zfx{LbwZ&5GrOEaKPA4jpBO}jzijifYsR)B<1i*T-MNH`_ zmZaiIeK}lzPQPp8(XY8N+qNB>N1cV=2NKunn<%Zd?N}|%29n(7bhz@`)rA)tGMR>0 zHXFNEO2aKFK4y%^ev`fPwtRF;SP2_kjYaEQ^E|{iWST;8aoLD3hGdX5ladVtP!L4<7wKmc#ey8%7-@eDK4LY>jALM@98C}&qI@-NzRF+L4%Zb*Q zW`NhYnP?*4Y+L@IZJ4&Ds)icK)+O5C$Tu~$wKX;6J;g~1woQrC){`_P%Dk`i(fi5~ zWf(Rwu*-h>t6J(mq zkk6ApCXbLmA&-%xu-BiHr(m<=7MwUX$%MO)a2w$k^-x!Mtif(DnxhS^s3{^Axw=(W8g zR2Pnj-e9zWk#wPuzRAOe#e>0k6nZRq(nmfEFYZPN9u?mSX0{i?M!RkV%eg%5$d-!j za&PLm*4R%CB?-5c%6ZxqT=ZzaBK`Y`w2{gqee@%ZB#}=1Or-19(SH%sbt`7++$|H^ z)<@{o^l(csRR~5}qV+8+yP_*rXSD=VXytS7eTynIsa2_&M|0ir$_2yZ7FwC(3tEY_ z&6Ve)>+aaw*>P7h9l0?&KAD>q4;IRdGDDhTqzJE5Y`JX|o32B1-dhjVMJUuQXGD9h ze)cj|IPd0;!=F8C;oZ$ST2P^X)zhq!`bI z?w~6?pb~MF3Ea;<%lWZSGkZqP-sWNO?BQXEh}K+kmKitdQ`M4A-pmBRcpcXNf=d%O z#eq1)aS!Wh4qnOPoI!#(S;)JHGX-wZ7TR9^)s~GzrP4B7rP9#GEsswAAe2mo!r@B; z)t1rwHVzMOyl;9Vu4%07^<-4J$UYD+gt}8thuuxCdx{=%QAWaUrOtI}!i|7!HCfHB zuqz@K9=q*Q#65LNp0FhIDUY|>QWf`F!gBdDGKjn}r|c&Vay6lyGI9(VIMP)m@sHuR zXV3J023K#Ne1CD)&~@rIh7twC1YdKD)?ee>6nBvf?(^Awn!dJCHw?p$#r*NOOLg6V zghAa{tSN7x7HVnM`fAKg2}qcpgtjiBVJIn)XmA-MBrqg2)>D)sc1O1WG#l1!F#s%_RV?#9-Zbh@W|%jgbBZYK^qrJNG)L|5g0h44Pb`5x{^ z`2MVNSvqtN0{;~Ed$Sb5`xWqRslTQ9De$(@cJBDW&nw$y1#iB`awH`0BrjuJoU4D# z_tc=nIVAW~v2Z$b({Nzdb%^4`c{b4?z8afaKj*Ek8^Z0&E-!LEImuDDjx{wYS3)P} zQ&SuT>XTCvgmP^}(ckc`k(-WG`FEsXr0Tm(O`{pSVCS7E=1|_v$Wo`IrJV^GR5DPi zH9kt87GH{ItQjT4260j*LGeX>}m14cz5=fRU=D_ zIea&)+Xh3U;+ajdmce>d3?+IpipNm7OxrvLIAsU;|Jq|+((ZI(c_|!05SGJ6r(8Kk zHkS?Q2ud$FLlIQVcs_Q6GTIGYsL7qQU5qC?!)eImvR!focIMxP~ddm3-OrI5=Sr7qlMZ~3OfON+ROdM+#nHuMM{Lzi`| znG#CzdSesIrNxJh+14D88niA_DrY?)SXm#xja1r@9J`Lar>s!^t> zSV9)lRjR5?F-)J2b4HDt8pgsJrHZ03m06amm?lV7RTZ%}-7srV*`Vtxw-hu|4L^-B zMk%!{#x<%cnhse-(^QOL7?cHkK{PP@aDf?%i)y&Bi&5$`RYe6Wm>K0vVxf#O&9;5I z&r&s?Y@)IW%#_V4s*cE0Tws-rcq^tJ#z-0vsw!781A-NuxVTT3a*ECX6RjAEsp!Fc zayp$+#ID2zX~mLef!ZoQXD|@5hMZ8bRSi1BXmU1X7TCc9j8ckuRoUek46r4B+*H0$ z)pXBtP|#GNxeB|@TI{tIR$`Ah$=N5Ih_Ja``{{AP?bgn%gWJ(Hx<2ZJE{l+1%`%Z zzz%l#c$ejw3LUTqGgld&DWEvmq#->s=zhOh>vPN+rkaK(6Px^c8$@Eucwfi;_#(i% zZxJtMLgH$sqjv_G&a${86CURdUA|ZubS%y-hi0zRUcVfXk`?4PY=X6kvFxgJErOD3 zTIF4t=i|CQKd+;ZXpkM0=3U!*>0i)!*2+$@ca)Mktp1() zo_3FZ+9(+Jo41&sH&6Q}e9v3DwcR>x{gTJ|8}>T;A^T*FS~FcU?@#*I_z(KOUHk3Y V{|+_>$AZsbDw)0W=lv}y_CI*czXSjP delta 4277 zcmZ`63vg7`^?u%O-+jC9ZL+^?vYYHKyPFRz`D}JcLSm#yARkCD2_YIF3IQpfv|{no znur}s)oCfWAB&E)qis{M2tyU8*v?j+N?UZm!A{4~G3`{e9j12FI!+5q&wU#bDEM~o zJNMjs&bjAz&%N(oYYz`jAdC=VXcAFWyXwY;^=6SP3L`H<+i>gl(eeI2b)^u(Wq`lE zdGz*ifEM7N0n|2cyKAhx_R%y#1km`@mQAA@)!+Uki%@b31~OY5(&QP)TObzH|WS>BYB5Y2&r5|ltKs2A4r_!{anjp;-zs(2ed z7m4smGFp4VnI-9BY%NY95#n6Wdo~N}V4&0i5*-`3nK*t7jvg58NM@F8!yQAZ7 z0q^Q)?|ta_)~&}M>b(T>&t1u~08j@og9HKQwBZj*ceq~|*|6m23p({p(s_X1= zUS(6WJj(vKH|oYE4e#%*XJS4o%#x4{R?Fa52{}+0HGo&$4eprR+t3(`gX5y=yFKva z6Wpal@ljr<6!R{R*KIotIUyvsgEN+)8~HXRN__QvpE8elBm6mKc)`B!SwX`vOhYd* zFPw9S>^=*aE3w{mWB<)jsM|nG_6^ zRHvAiEsIBdr4{wp)ttG|Lylr}9)ZXTH$5l|4#VBcE@yBi^OHsZCY741Y1q934F(HZ`*_6UhZc-(P}HsfOc zjw6M0+|ZZaR1?N$U1old%ecjI7n!)(EMhLh>}zW7>uYZ66EN!0&45$W+{|gk1EEx< zp}UF=#bM}@q)JxO6RLeH6^W!oE7*i;z$Z2QY5ieb!?Ucl94wur19rSzU?_@58YAAu z*%#l(g4oTUW|i#C!NG$A1Mt7_CVz_s&GWXO#Kvp~ne9B!4&ZkFVu*ArwWGuybos8ZAPLQ9D|SmZNUieEnz$-HbM%jc5znhQ`q@bSL^MRH?6{ zz35@I4}BLsf*wOppr_CjdIlXvzeF!U&B~!y&Wc7j7vpw>{L|BB>b zDm9p-S0!s6^^TACigxfyQnKQ6rCh#%*eT!#NTM9wfRcbW0Y)cA8e!2f@QRM}@w}k{nVab)PNT$NP$vpF z3%Gy{aIq>y2k`(MAc*fN>LCD57gh8QkOA2Cg(Css*|PwS0xuj1vnPW4a)h8*eSPd& zjSTR%;xg}C8aN=`dm+j1Ko9aS7sqeT_|#fOEzTxWxGs_L*NWq(?$RJ+fl9*=@k};_ z8)>|d4z!Jmb zEB06WgO#atV18Rt#$iHn{)?af2vb~+jpGTk5kOY{LRrreyhi_rtogdT50+GR^DS-IAr;O>^iiZ zoFyOfm;8e(Uh`Q~QEhd^XA zjeJAkgNb8{Yv5VjT2ozJ)7mznDhjsBy`g$l)f8`KmE7iZ^n@%~R&R3{t+KKttZ0gA z1cRsa?nF`H|pRg zN*?OSt?lb;X^F)uDw5jlfWHRRWxmT?U_>+~HOiN29QKvNOmGQ?6FWfe2ipGx z7gauLGF*!nGSk$7BtOJlz%vBQ3~q3ROQ3`9fXEJ)?rD3p)5X|+P>eBiKVz={L*u(Q zZEAsM)27{XJqSTNvMuGovTt$lNCkQZqgv#JP1+8m-{v2M zTWSmw!lLI-;aVO1E#k8l=znIDUS=NIMP3)?HD!JNdOsv<7Rrd<=l7|JWWuWeZYQzV zFS^hgU~1+Em|Ckw`7`A=<1}|vq|-^bUM3TbaM{eJlNor!Q6!Q-3!^b#HUlDRlZh;> zQ4ry+&(`xVRrKK~f4L$Si2>Qn4|b3Ei5;XWv4k3p0aUpfS%NdXGg4XxQjlBi^a zN{XcuMZ%IqsH$Pz!5G1+)4{SPAIJe6WK5vibIzrT_^%_pb-L# ztB`xt0+j?6ys0Mpq1eJ8tjr`L%LAZs ziNZEh-vHqFmGgydJs+JTW2A{Il})iyO~JaN({=e{m!x1@s_UX s-Are@*i-C`kv0xEE$2$-xbq3;Dfh{uL{Wdyo}x2$#jQE|dUcfi4?h_!r~m)} diff --git a/assets/fonts/woocommerce-pos.woff b/assets/fonts/woocommerce-pos.woff index 462ff1d464f5ddb7003face63e517b16edbbe1bd..5f396dd7d102cb23c43ea720d41114319d4a93ed 100755 GIT binary patch delta 4678 zcma)A3v5)!xt^Kx+%xOlv)-re-L-d@eHifC-Zi`N6G#Ea#s*A-4TMLWfFW)$q)h`P zO-&Oiw>MN(o2jA-sR<1v<kX;h`D)X;}$sjBoz5>@fiZ;p+j zgsM5mb7tm0|NqbTKjuHP{%H9BHiq`DUa^8uf~%>EaM>^X6QLr(LSJ9#pN!tQYjh7G zbSLP)k?nS)abU;j=Rjivn47cB-f{Q-G0<)$Bnx_W;I<>#T|2jrZX=}eFnCI`nP;Nk z-w7gUZ(}}BHsg%)`<=V)-3Qu7nE$VAN7v|2+`aow@U5EvA_!Y#JNvg+^)DAq$sC^n?6u?2ID;BRpNo&4d+AW zW9KvHix;emOdO_pdQrSVn;OCqyT-O{Zd30Y-m~5xdSCXQ^giev^`{>b{Q|wyPK3XD^?AoNG7X}BhvN4xBEu@?5CXbTG$^Vm| zh_}pd(xRAfP0^o;oRz0jV#HdOo?lNdc)XQ|JnlQ}YQL9uc>LVs_71go3=MU(56M0e z6t7r;gkicZRW(#!CJ<|RC!a_(HzyK#$5N7nGn3+d>nk)V9_HQA%O5BQlmR%wz&1-0 zl1?m|yT!Y_R{Wjk%(KJm)(x+lJ|LRhwHC1fy$m&FG3-7>%i_=OnIX@&nB5#tPl6S~2$gha3O9@}X-x~KNeBoj+m3C&c zlbKg?BFQ=TKr=S>0J2mnYRm=b#TvWvD zsGpImiR0}2%1_0hot&Kh#d9v~_UG*CYWuH!;nv#P)^J~TIG-O@rao3D$m)CUS-ob@ zo=yE%7)P4&!#URfyoKv|=%`H3>gdl6=bJ{d(^E6*eLkP`4|3uaWdzY9={#+1DV4<~ zJ0|?TMDatVdwA)#8u!SS{{Af^?wV~&hr1QEsdqz5%Z6U;2w4brU7k{evKL_=A$O85 zi*etWIOltq(SjJMZlHe=`>I>RoZGsln{IcEyCZH-gma&+X@+>EI+U?Fuc>m^xH&en zp=r90^N0srn9CggE*((T(GNtWdXS+T^fwd+*gE#X>}P_|E8mA;AQVpOc+P$?eAi6G zxBWGY4T$giqY_8d1uFBp{8nsfuJTf3*{5%BYu%WmgV#s? zw(Xs`wr|_FcRNOs-RreFIX`)l^G+#Indbb$b!?94HDDYpv3z?S%DgdqLwvz#CNBv{fC zOS6N>@s32q0%37qHa^LW>&=@nn(nv}41k`)`A_(1?1n%P9|Q@TW(q;d-~>VZI5Wt* zh|>aY@j!5W`R8j__LoWxxJsq|m1`f|@q=JI9t?$E@13Cx-L-OHVC7xoD{+lu6E7!2 z%4znYutFWlr$hEC+dfA3+UUa}yArT%8neS-TTB+S3+#dz3k}oP#o zVWbbWU`p9eyr|BEw#ke!WWvZ0m4p`l-Qf9-7pMyZLKF7wW+QfkT9rSTbsxm7zG=1T6dMXDh3JDkBl(V%00;BA6L%FU~a`8 zIL1BB!bR{t4BjVdZpu9d-e%guy&mxM%6d7#lW(=W66M_96P22WdLHWoC`jP)K8Duk zwYc!esYh_jo4#Rkuq%d&muvqcKILq=>yqwEHZO9%V+R)vby57zQ07D)t$T9th9Z^s zOjKLlyv@`!n#Kd(-h^%n{cVg~eJSVC+l2HfX=Os(7agKci!;%*HKC+gACA1lFA|xc zaL0T#Pw&F<8;9@N4q`>JPI-epElRPD%-b`5l}_^VEpTWve2anODal#}>m%avSmy%8 zVW^y=%?<3}l(?lK zGd~Nc1`UL z6e~i9%2kHsL}ua@W89@nF-2#<11dBz6>qSdTuo;b={kuagScWz2f#oTzeS)4^}<=u zt!l6i?vcwWKn@l_ltRoI$~TT@fLg-GP2~eaO?O-b`%D%7P~jk{6HTHrOb`4qX_%T~ z!b}9wnBiw8)^T(jhDI%*)}YhSRYj+UVM+%ZrUFn7bm)U6j#gln5Sb>I0B#9UrKVRd zrepVD;gAkQVQy_jOI6Mp>4uO-`Aj^JWLKR-s1G^xWKeFBMR-ko=mBv1aj9rae`S zjN+PBxg?8rRM*d+*U`zEE%`2i?`BcSv}eH=)Ae8eQrDgGUU?sZvK+p-qKV%S1+gU? z6%S-vCh5D^RXwK?9-2LwTz_Jrxf>SKnM#Ig_QLKjyt>ufb%}8NddKzVxj!^s?Pq_; z%KyPQVDLsX<&rcn*5pQA6Y@AEn>dl%JkmwKLC>@K>?r$-Qc?%h7uEN*JM`m5!MNMJ z$^5K&+%@KU$j)7s3cy?VU(>U_HV-N&?@hE1rnmx?^-VLU;>Iyes

    %Gx?$+k*cZ|VUFG7ha(JSg7PH)*Xx)CA!BjCx1uDtx?mMt)dP*ok! z^F&u(r|)msv1c!g^#lF1=m!~lbo;Jbfp10CWf)j1`r)?cJv&DC!ot;qKvz0_6FIwc zbjKzb+XF^k5dGt^v7@_p-3D~+&9i(IFiLaWz+W!O0bU345;DN=%JYHq<>!;xgbz;zKTV7V>T%$vV4e{H^Io-}`I?lae$G0#5{bwX3ed&%u75EqFP3r0Vu|ACQ{}Pjd zb>IP*KRu6ps0Ov7Wn7cyRWwi>@F^^2<7B!e(-@R7;DBPlVS;x{_3K=CasCxosmle3 z1L)+^JDym#?umU%m+lkrj-}cD`%Z4#cJjXd8JPe1Cq?E1=>lQUAi$h8{4MEr?}>G{ zEO~0d(q;074IM`sy8GPM`E-vws{i&t%!^B!-apW&i}|Q(5R5Lgnx9}X5@_V_vU$WG z9gF3RR+;yVK`XS5{B89i5|8pP zxQ^2{T+FMr6wdLrT4$m*f-iW?{M{bobC$Qr#BFAg?lH`P*0zCxw$=dwV?O?}=8G|x zp-GY=S+=jd{+(1bni9R>Evf}4YWXGYeq77<>x(NO29tEiNsb3RLy2f})ZaY&;_vEV z?B$pAs`Q(~!-t24;CJQC>@|%JT|;Cq9~NP?pl4yBEblfB;w=A%5#U!1l~Z?kq7X$1 zX~=_$;i#3P7^;HvTaVIcAzFm8s1q$iy>R>np-$Y4Zb2K-7PKAhMtjg+bSIibUqc7b z{pbPoUGxxo1U-(PL{m^^o<+~06X->hL$9LO(J6EWokMR!i93(}j6OgYA!AW*)Y~$z z0p3x$$sbQR^ekDJE|B~M_o*13yox3#Y4$1Hrlpeb!f?-H$psiR*VW>n3 zOaNa{=2y%zpH0xU=UVK$9Ivxt)V^|@_gkTqO|RROdDOpqcfaU|mj@fd;fCOHdpMOE zw#jlKQURhzU7F@PY84fUTnZ0iqvYr<$OeMHX2r41KeVEmQjBTGaCT#fv1WaD_xd$P z$;Rw(2bJb`jnvnVbj^pNCThTrt2xT)B>27t()kVE;T^+q{-k$5P2e@Wx~LNWhj$k> z3~9QT$xJnja@`0So{)YGU1A(-P9~b06UpYwh6-$6T`O@LC58^?zCi0C4~PLRR;B1L z9->18@!u8o5dh`ImFXce1ZTcb;t`&$?NHkNP~vARy!Tpy?hT>pNFkF>Nhw3_P8Ak}k z`OjZ^3{zZzI{$*A>KaVo_H(Xct!znE{`pYn;D&U=NEPmzsZ2BQ`U(Y~ zeb}*bjvlAu+!Nf<^4>sCcP3K_EtBc)8Mtfg)j%ZT4+LIWS{PZitq0n+tv$WHJzHV3 z+<->tNs9T;f^D%QL95TQrtr9Bt*`bAKobH4wvmZ8N+J>*Q0=Wx9z*{oS{OQmK6UP_TLR+-Bwx*_b zamR$h7`7_><&BD>GJjRI+~Ichm0Pl`Y;_rnWws>3RHhi=u&2Dt#EhwTDGEr0ODj`= zDE{hdw%Dz%a3r>Y1Y@1$vZ^pgqSO)+g)`!!N9Z_O%6;Mcplm-L4y9Ixf_7CV)83xR zRN28$B$8oRUMYjxp6Z%-yuE#3;6@0=S`;Ev^eDd&ZnfX@=y*!kH)y7*=g;QP=%z>C z0H3ib-30$Jd_qHHKk#;yF06Xk)Nwstpqr)!Ecvy%2V~ZQuFRBxJ;p9e%AK$=OW&cBRhf?wBR&wg1MfaCP(=1BW=k) zTAB!aey#9gJw&`7f)9uYyTh6V)^GEUiuQzILVmRT8CxJZhtLl zI|Fa{NHjI_$12N6OCx`&asbD;8I4Edz%~8AnGlaS7Yd6fl~^30!dFL^EX>$RCDRN~ zi%^(}2gF;bEF2#@AOsZ_gsw10O-uoqI6obYk_DLmJ({eE3w_uZ%(Nthaq;Qp3X1~G z;!0s<-?41$bu#g(3I3%dsurOVvoyjaEJ=haD%M=OPO#!OFb>LuQut9#lc=i7zyeJ0 zBN*;@gfd2Op-GHMuv-X)GYP1sQ{cq1vjQcRz@%wJmob%OS)$l^Q#gZ|cwNPq@TU@` z6EcxtPNG6Ph(dKGn8=3VVlGXVG+`g;fldh6q`;1(7Fa5{;7wII2=x{QVQF0=vdq9c zhgZ|UP2f<3Rt5GkH~`9lg^0z#3E0-sgwVpkR}cf2CAcz6uqqTT&_WGKR=|3JLzDoe zpadk~0cHxKg$6hnEko4c0WLzo5t)g|36-kjB1A|iawI5IR1+kW300<8Rfzvcg9$Df?wBrE1Xd8XV~F8sHLU@?N`g0f-B435IM5^&)04&paO0t9e{*BB_cjZtrmDchVGp z)ZV*je0ia=O#?hnl(*?B2LLBNIbS%_b?71)BdvT@RcpLdWmsb@e~H01Dr4;Yc?JM3 z>Tve!P#*Yt_>rns8~A2tffM+JoZy4cW})1oFlyqSYB-^o_xekCXLW$;_#B_~`_?~! zsVErm*4qT~%roNM2IZrCuB6Uk1v{Mz_sH3e3pSXG{*83!T7}+N@vQUDu>cEyv-qj% z1#q>$Ts_LS){Ly|z~9GzB6Z{t`G_u*`lS;xlDD%Lm2Tx8bx{45`YYD~*E^c3_3E0w pM}Ja3XQYjTZp*#Gz1#h``;7NgQL<>T=

    - {{#if customer_id}} {{/if}} + {{#if customer_id}} {{/if}} {{formatCustomerName customer}}
    \ No newline at end of file diff --git a/includes/views/pos/cart/tmpl-item.php b/includes/views/pos/cart/tmpl-item.php index 21fcb3a5..c46c0559 100644 --- a/includes/views/pos/cart/tmpl-item.php +++ b/includes/views/pos/cart/tmpl-item.php @@ -5,7 +5,7 @@
    {{name}}
    - +
    {{else}} @@ -17,7 +17,7 @@ {{#if fee}} {{title}} {{/if}} - +
    {{/if}} diff --git a/includes/views/pos/cart/tmpl-totals.php b/includes/views/pos/cart/tmpl-totals.php index a149d1bc..bd885f14 100644 --- a/includes/views/pos/cart/tmpl-totals.php +++ b/includes/views/pos/cart/tmpl-totals.php @@ -21,7 +21,7 @@
    {{{money total}}}
    - +
    diff --git a/tests/unit/js/spec/entities/cart/models/abstract.spec.js b/tests/unit/js/spec/entities/cart/models/abstract.spec.js index 60f9badd..e4b72cc8 100644 --- a/tests/unit/js/spec/entities/cart/models/abstract.spec.js +++ b/tests/unit/js/spec/entities/cart/models/abstract.spec.js @@ -44,13 +44,18 @@ describe('entities/cart/models/abstract.js', function () { var model = new Model(); expect( model.taxes ).to.be.undefined; - var model = new Model( { taxable: true, tax_class: '' }, { + var model = new Model( { taxable: true }, { collection: { order : { tax: { calc_taxes: 'yes' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -68,7 +73,12 @@ describe('entities/cart/models/abstract.js', function () { tax: { calc_taxes: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function( tax_class ){ + return dummy_tax_GB[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -85,13 +95,18 @@ describe('entities/cart/models/abstract.js', function () { it('should reset tax rates on taxable change', function(){ - var model = new Model( { taxable: false, tax_class: '' }, { + var model = new Model( { taxable: false }, { collection: { order : { tax: { calc_taxes: 'yes' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); diff --git a/tests/unit/js/spec/entities/cart/models/fee.spec.js b/tests/unit/js/spec/entities/cart/models/fee.spec.js index adbe96f1..6569fb65 100644 --- a/tests/unit/js/spec/entities/cart/models/fee.spec.js +++ b/tests/unit/js/spec/entities/cart/models/fee.spec.js @@ -46,7 +46,6 @@ describe('entities/cart/models/fee.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -55,7 +54,12 @@ describe('entities/cart/models/fee.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -70,7 +74,6 @@ describe('entities/cart/models/fee.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -79,7 +82,12 @@ describe('entities/cart/models/fee.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -96,7 +104,6 @@ describe('entities/cart/models/fee.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -105,7 +112,12 @@ describe('entities/cart/models/fee.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -117,7 +129,6 @@ describe('entities/cart/models/fee.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -126,7 +137,12 @@ describe('entities/cart/models/fee.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); diff --git a/tests/unit/js/spec/entities/cart/models/product.spec.js b/tests/unit/js/spec/entities/cart/models/product.spec.js index 1566defb..aa36cc00 100644 --- a/tests/unit/js/spec/entities/cart/models/product.spec.js +++ b/tests/unit/js/spec/entities/cart/models/product.spec.js @@ -105,7 +105,6 @@ describe('entities/cart/models/product.js', function () { it("should match the Woo unit test for inclusive tax", function() { var model = new Model({ taxable: true, - tax_class: '', price: 9.99 }, { collection: { @@ -114,7 +113,12 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -127,7 +131,6 @@ describe('entities/cart/models/product.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 9.99 }, { collection: { @@ -136,7 +139,12 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -149,7 +157,6 @@ describe('entities/cart/models/product.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 100 }, { collection: { @@ -158,11 +165,14 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } @@ -181,7 +191,6 @@ describe('entities/cart/models/product.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 100 }, { collection: { @@ -190,11 +199,14 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 1: {rate: '5.0000', label: 'GST', shipping: 'yes', compound: 'no'}, 2: {rate: '8.5000', label: 'PST', shipping: 'yes', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } @@ -225,13 +237,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -255,13 +272,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); var quantity = _.random(10, true); - model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + model.set( { 'taxable': true, quantity: quantity } ); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal( Utils.round( 3 * quantity, 4 ) ); @@ -280,13 +302,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(2.5); @@ -310,13 +337,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); var quantity = _.random(10, true); - model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + model.set( { 'taxable': true, quantity: quantity } ); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal( Utils.round( 2.5 * quantity, 4 ) ); @@ -335,14 +367,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(tax_class){ + return dummy_tax_GB[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); - model.set({ 'tax_class': 'reduced-rate' }); + model.set({ 'taxable': true, 'tax_class': 'reduced-rate' }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -367,14 +403,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(tax_class){ + return dummy_tax_GB[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); - model.set({ 'tax_class': 'reduced-rate' }); + model.set({ 'taxable': true, 'tax_class': 'reduced-rate' }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(2.8571); @@ -399,14 +439,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(tax_class){ + return dummy_tax_GB[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); - model.set({ 'tax_class': 'zero-rate' }); + model.set({ 'taxable': true, 'tax_class': 'zero-rate' }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -430,14 +474,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function( tax_class ){ + return dummy_tax_GB[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); - model.set({ 'tax_class': 'zero-rate' }); + model.set({ 'taxable': true, 'tax_class': 'zero-rate' }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -467,13 +515,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -499,13 +552,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); var quantity = _.random(10, true); - model.set( { 'taxable': true, 'tax_class': '', quantity: quantity } ); + model.set( { 'taxable': true, quantity: quantity } ); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal( Utils.round( 3 * quantity, 4 ) ); @@ -524,13 +582,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(2.6738); @@ -556,18 +619,21 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'no'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); @@ -593,18 +659,21 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'no'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); + model.set({ 'taxable': true }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(2.6786); @@ -630,14 +699,18 @@ describe('entities/cart/models/product.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_US + getTaxRates: function( tax_class ){ + return dummy_tax_US[tax_class]; + }, + taxRateEnabled: function(){ + return true; + } } } }); // dummy product id 99, regular price $3, on sale for $2 - model.set({ 'taxable': true, 'tax_class': '' }); - model.set({ 'tax_class': 'reduced-rate' }); + model.set({ 'taxable': true, 'tax_class': 'reduced-rate' }); expect(model.get('item_price')).equal(2); expect(model.get('subtotal')).equal(3); diff --git a/tests/unit/js/spec/entities/cart/models/shipping.spec.js b/tests/unit/js/spec/entities/cart/models/shipping.spec.js index 0a59fe02..ea9fbb10 100644 --- a/tests/unit/js/spec/entities/cart/models/shipping.spec.js +++ b/tests/unit/js/spec/entities/cart/models/shipping.spec.js @@ -45,7 +45,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -54,7 +53,12 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -69,7 +73,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -78,7 +81,12 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_GB + getTaxRates: function(){ + return dummy_tax_GB['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -93,7 +101,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -102,10 +109,13 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 1: {rate: '20.0000', label: 'VAT', shipping: 'no', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } @@ -121,7 +131,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -130,10 +139,13 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 1: {rate: '20.0000', label: 'VAT', shipping: 'no', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } @@ -153,7 +165,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -162,7 +173,12 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -177,7 +193,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -186,7 +201,12 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: dummy_tax_US + getTaxRates: function(){ + return dummy_tax_US['']; + }, + taxRateEnabled: function(){ + return true; + } } } }); @@ -201,7 +221,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -210,11 +229,14 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'no' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, 5: {rate: '2.0000', label: 'VAT', shipping: 'no', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } @@ -229,7 +251,6 @@ describe('entities/cart/models/shipping.js', function () { var model = new Model({ taxable: true, - tax_class: '', price: 10 }, { collection: { @@ -238,11 +259,14 @@ describe('entities/cart/models/shipping.js', function () { calc_taxes: 'yes', prices_include_tax: 'yes' }, - tax_rates: { - '': { + getTaxRates: function(){ + return { 4: {rate: '10.0000', label: 'VAT', shipping: 'no', compound: 'no'}, 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} - } + }; + }, + taxRateEnabled: function(){ + return true; } } } diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index b170385a..3648e61d 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -4,6 +4,25 @@ describe('entities/orders/model.js', function () { var OrderModel = require('entities/orders/model'); var Utils = require('lib/utilities/utils'); + var dummy_tax_GB = { + '': { + 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'reduced-rate': { + 2: {rate: '5.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + }, + 'zero-rate': { + 3: {rate: '0.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + + var dummy_tax_US = { + '': { + 4: {rate: '10.0000', label: 'VAT', shipping: 'yes', compound: 'no'}, + 5: {rate: '2.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} + } + } + it('should be in a valid state', function () { var model = new OrderModel(); expect(model).to.be.ok; @@ -227,22 +246,29 @@ describe('entities/orders/model.js', function () { it('should be match the dummy order', function(){ - var model = new OrderModel(null, { parse: true }); - model.sync = sinon.stub(); - - model.tax = { - calc_taxes: 'yes', - prices_include_tax: 'no' - }; - - model.tax_rates = { - '': { - 4: {rate: '5.0000', label: 'Standard', shipping: 'yes', compound: 'no'}, + var Model = OrderModel.extend({ + getSettings: function(name){ + if( name === 'tax' ){ + return { + calc_taxes: 'yes', + prices_include_tax: 'no' + }; + } + if( name === 'tax_rates' ){ + return { + '': { + 4: {rate: '5.0000', label: 'Standard', shipping: 'yes', compound: 'no'}, + }, + 'reduced-rate': { + 5: {rate: '10.0000', label: 'Tax', shipping: 'yes', compound: 'no'} + } + }; + } }, - 'reduced-rate': { - 5: {rate: '10.0000', label: 'Tax', shipping: 'yes', compound: 'no'} - } - }; + sync: stub() + }); + + var model = new Model(null, { parse: true }); expect( model.cart ).to.be.instanceOf( Backbone.Collection ); @@ -298,4 +324,50 @@ describe('entities/orders/model.js', function () { }); + it('should parse tax rates', function(){ + var model = new OrderModel(); + model.getSettings = function(name){ + if( name === 'tax_rates' ){ + return dummy_tax_GB; + } + }; + expect( model.parseTaxRates() ).eqls({ + all: true, + rate_1: true, + rate_2: true, + rate_3: true + }); + + }); + + it('should return an array of tax rates for a given tax_class', function(){ + var model = new OrderModel(); + model.getSettings = function(name){ + if( name === 'tax_rates' ){ + return dummy_tax_GB; + } + }; + model.parseTaxRates(); + expect( model.getTaxRates('') ).eqls([{ + rate_id: '1', + rate: '20.0000', + title: 'VAT', + shipping: true, + compound: true, + enabled: true, + total: 0, + subtotal: 0 + }]); + expect( model.getTaxRates('reduced-rate') ).eqls([{ + rate_id: '2', + rate: '5.0000', + title: 'VAT', + shipping: true, + compound: true, + enabled: true, + total: 0, + subtotal: 0 + }]); + }); + }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/tax/collection.spec.js b/tests/unit/js/spec/entities/tax/collection.spec.js index 9f475994..e62d96a9 100644 --- a/tests/unit/js/spec/entities/tax/collection.spec.js +++ b/tests/unit/js/spec/entities/tax/collection.spec.js @@ -27,15 +27,34 @@ describe('entities/tax/collection.js', function () { }); it('should parse tax rates from POS params', function(){ - var collection = new Collection( dummy_tax_US[''], { parse: true } ); + var collection = new Collection( dummy_tax_US[''] ); expect(collection).to.have.length(2); expect(collection.pluck('rate_id')).to.eql(['4', '5']); }); it('update rate collection on tax_class change', function(){ - var collection = new Collection( dummy_tax_US[''], { parse: true } ); - expect(collection).to.have.length(2); - expect(collection.pluck('rate_id')).to.eql(['4', '5']); + var collection = new Collection( dummy_tax_GB[''] ); + collection.reset( dummy_tax_GB['reduced-rate'] ); + expect(collection).to.have.length(1); + expect(collection.pluck('rate_id')).to.eql(['2']); + }); + + it('toggle taxes enabled true/false', function(){ + var collection = new Collection( dummy_tax_US[''] ); + expect(collection.pluck('enabled')).to.eql([true, true]); + + collection.toggleTaxes({ all: false }); + expect(collection.pluck('enabled')).to.eql([false, false]); + + collection.toggleTaxes({ + all: true, + rate_1: true, + rate_2: true, + rate_3: true, + rate_4: true, + rate_5: false + }); + expect(collection.pluck('enabled')).to.eql([true, false]); }); }); \ No newline at end of file From ccdc6d25656a4179319c8b1ef3064cf88d8db98d Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Mon, 1 Feb 2016 15:28:14 +0800 Subject: [PATCH 024/169] refactor product entities --- .../css/src/scss/partials/_button_group.scss | 1 + assets/css/src/scss/partials/_cart.scss | 5 + assets/css/src/scss/partials/_icons.scss | 23 ++- .../css/src/scss/partials/_input-group.scss | 5 + .../apps/pos/cart/views/line/views/item.js | 7 +- assets/js/src/apps/pos/cart/views/totals.js | 8 + .../views/item/views/drawer/variation.js | 3 +- .../pos/products/views/item/views/product.js | 21 +- assets/js/src/apps/support/form/views/form.js | 2 +- .../js/src/entities/cart/models/abstract.js | 4 + assets/js/src/entities/orders/model.js | 12 +- assets/js/src/entities/products/collection.js | 18 +- assets/js/src/entities/products/model.js | 178 ---------------- .../src/entities/products/models/abstract.js | 79 +++++++ .../js/src/entities/products/models/simple.js | 5 + .../src/entities/products/models/variable.js | 172 ++++++++++++++++ assets/js/src/entities/tax/collection.js | 12 ++ .../js/src/entities/variations/collection.js | 47 ++++- assets/js/src/entities/variations/model.js | 26 +-- .../js/src/lib/utilities/stickit-handlers.js | 18 ++ includes/views/pos/cart/tmpl-customer.php | 2 +- includes/views/pos/cart/tmpl-item-drawer.php | 4 +- includes/views/pos/cart/tmpl-item.php | 4 +- includes/views/pos/cart/tmpl-totals.php | 8 +- includes/views/support/tmpl-form.php | 2 +- readme.txt | 1 + .../spec/entities/products/collection.spec.js | 29 +++ .../js/spec/entities/products/model.spec.js | 193 ------------------ .../entities/products/models/abstract.spec.js | 106 ++++++++++ .../entities/products/models/simple.spec.js | 11 + .../entities/products/models/variable.spec.js | 109 ++++++++++ .../entities/variations/collection.spec.js | 7 + .../js/spec/entities/variations/model.spec.js | 25 +++ 33 files changed, 711 insertions(+), 436 deletions(-) delete mode 100644 assets/js/src/entities/products/model.js create mode 100644 assets/js/src/entities/products/models/abstract.js create mode 100644 assets/js/src/entities/products/models/simple.js create mode 100644 assets/js/src/entities/products/models/variable.js create mode 100644 tests/unit/js/spec/entities/products/collection.spec.js delete mode 100644 tests/unit/js/spec/entities/products/model.spec.js create mode 100644 tests/unit/js/spec/entities/products/models/abstract.spec.js create mode 100644 tests/unit/js/spec/entities/products/models/simple.spec.js create mode 100644 tests/unit/js/spec/entities/products/models/variable.spec.js create mode 100644 tests/unit/js/spec/entities/variations/model.spec.js diff --git a/assets/css/src/scss/partials/_button_group.scss b/assets/css/src/scss/partials/_button_group.scss index 682d1c1b..d39eb47a 100644 --- a/assets/css/src/scss/partials/_button_group.scss +++ b/assets/css/src/scss/partials/_button_group.scss @@ -33,6 +33,7 @@ btn-group { &:last-child:not(:first-child) { @include border-left-radius(0); } + } .btn + .btn, diff --git a/assets/css/src/scss/partials/_cart.scss b/assets/css/src/scss/partials/_cart.scss index bdf0a51c..9e9d58aa 100644 --- a/assets/css/src/scss/partials/_cart.scss +++ b/assets/css/src/scss/partials/_cart.scss @@ -253,6 +253,11 @@ cart { font-size: 1.4em; } + .disabled { + text-decoration: line-through; + color: $secondary-text-color; + } + } diff --git a/assets/css/src/scss/partials/_icons.scss b/assets/css/src/scss/partials/_icons.scss index caa92a4a..5ff74c20 100644 --- a/assets/css/src/scss/partials/_icons.scss +++ b/assets/css/src/scss/partials/_icons.scss @@ -146,10 +146,29 @@ icon { } + // common icon colors + .#{current-module()}-secondary { + a & { + color: $secondary-text-color; + &:hover { + color: $brand-primary; + } + } + } + + .#{current-module()}-tertiary { + a & { + color: $tertiary-text-color; + &:hover { + color: $brand-primary; + } + } + } + // special cases .#{current-module()}-add { a & { - color: $tertiary-text-color; + //color: $tertiary-text-color; &:hover { color: $brand-success; } @@ -158,7 +177,7 @@ icon { .#{current-module()}-remove { a & { - color: $tertiary-text-color; + //color: $tertiary-text-color; &:hover { color: $brand-danger; } diff --git a/assets/css/src/scss/partials/_input-group.scss b/assets/css/src/scss/partials/_input-group.scss index 7632003d..6d790bff 100644 --- a/assets/css/src/scss/partials/_input-group.scss +++ b/assets/css/src/scss/partials/_input-group.scss @@ -121,6 +121,11 @@ input-group { font-size: 0; white-space: nowrap; + // give icons the same line-height at the input + i { + line-height: 1.5; + } + // Negative margin for spacing, position for bringing hovered/focused/actived // element above the siblings. > .btn { diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index 1607b77d..904e6b1c 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -75,9 +75,10 @@ module.exports = FormView.extend({ }, // product: name, shipping: method_title, fee: title - '*[data-name="name"]' : { observe: 'name', events: ['blur'] }, - '*[data-name="method_title"]' : {observe: 'method_title', events: ['blur']}, - '*[data-name="title"]' : { observe: 'title', events: ['blur'] }, + // note: contenteditable=true comes with filter and events: ['blur'] + '*[data-name="name"]' : { observe: 'name' }, + '*[data-name="method_title"]' : {observe: 'method_title' }, + '*[data-name="title"]' : { observe: 'title' }, 'dl.meta': { observe: 'meta', diff --git a/assets/js/src/apps/pos/cart/views/totals.js b/assets/js/src/apps/pos/cart/views/totals.js index fa360ee2..c4e44846 100644 --- a/assets/js/src/apps/pos/cart/views/totals.js +++ b/assets/js/src/apps/pos/cart/views/totals.js @@ -32,9 +32,17 @@ module.exports = ItemView.extend({ data.cart_discount = this.model.getDisplayCartDiscount(); } + // sum for disabled taxes + data.total_tax = this.model.sumItemizedTaxes( + this.model.get('tax_lines'), 'total' + ); + return data; }, + /** + * + */ toggleTax: function(e){ if(e){ e.preventDefault(); } var rate_id = $(e.currentTarget).data('rate_id'); diff --git a/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js b/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js index ddbf47d0..e9ac781b 100644 --- a/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js +++ b/assets/js/src/apps/pos/products/views/item/views/drawer/variation.js @@ -27,8 +27,7 @@ var Item = ItemView.extend({ templateHelpers: function(){ return { - variation: true, - title: this.options.model.parent.get('title') + variation: true }; } diff --git a/assets/js/src/apps/pos/products/views/item/views/product.js b/assets/js/src/apps/pos/products/views/item/views/product.js index f40b2577..c90cecdb 100644 --- a/assets/js/src/apps/pos/products/views/item/views/product.js +++ b/assets/js/src/apps/pos/products/views/item/views/product.js @@ -77,14 +77,19 @@ var Item = ItemView.extend({ }, templateHelpers: function(){ - var variations = this.model.getVariations(); - var data = variations ? { - price: variations.superset().range('price'), - sale_price: variations.superset().range('sale_price'), - regular_price: variations.superset().range('regular_price'), - product_variations: this.model.getVariationOptions() - } : {} ; - data.product_attributes = this.model.productAttributes(); + var data = { + product_attributes: this.model.getProductAttributes() + }; + + if( this.model.get('type') === 'variable' ){ + _.extend( data, { + price: this.model.getRange('price'), + sale_price: this.model.getRange('sale_price'), + regular_price: this.model.getRange('regular_price'), + product_variations: this.model.getVariationOptions() + }); + } + return data; } diff --git a/assets/js/src/apps/support/form/views/form.js b/assets/js/src/apps/support/form/views/form.js index 73bd4b0c..5cc657c8 100644 --- a/assets/js/src/apps/support/form/views/form.js +++ b/assets/js/src/apps/support/form/views/form.js @@ -6,7 +6,7 @@ module.exports = FormView.extend({ template: 'support.form', ui: { - toggle : '.toggle' + toggle : '[data-action="toggle"]' }, events: { diff --git a/assets/js/src/entities/cart/models/abstract.js b/assets/js/src/entities/cart/models/abstract.js index d6800616..abe7b727 100644 --- a/assets/js/src/entities/cart/models/abstract.js +++ b/assets/js/src/entities/cart/models/abstract.js @@ -42,6 +42,10 @@ module.exports = bb.Model.extend({ line_item: this }); + // listen to tax toggle on order + this.listenTo( this.taxes, 'change:enabled', this.updateTotals ); + + // on change in line item tax options this.on( 'change:taxable change:tax_class', function(){ this.taxes.reset( this.getTaxRates() ); this.updateTotals(); diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 224adc69..9f954627 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -283,14 +283,6 @@ module.exports = DualModel.extend({ } else { this.set( 'taxes.all', ! this.get( 'taxes.all' ) ); } - - // - if( this.tax_rates ){ - var enabled_taxes = this.get('taxes'); - _.each( this.tax_rates, function( taxes ){ - taxes.toggleTaxes( enabled_taxes ); - }); - } }, /** @@ -304,7 +296,7 @@ module.exports = DualModel.extend({ // parse tax_rates _.each( tax_rates, function( tax_rate, tax_class ){ - var taxes = new Taxes( tax_rate ); + var taxes = new Taxes( tax_rate, { order: this } ); taxes.toggleTaxes( enabled_taxes ); this.tax_rates[ tax_class ] = taxes; }, this); @@ -334,7 +326,7 @@ module.exports = DualModel.extend({ }, /** - * Returns this.tax_rates.toJSON() for a given tax_rate + * Returns parsed tax rates for a given tax_rate */ getTaxRates: function( tax_class ){ if( this.tax_rates ){ diff --git a/assets/js/src/entities/products/collection.js b/assets/js/src/entities/products/collection.js index 200d363b..a1efbba3 100644 --- a/assets/js/src/entities/products/collection.js +++ b/assets/js/src/entities/products/collection.js @@ -1,7 +1,21 @@ var DualCollection = require('lib/config/dual-collection'); -var Model = require('./model'); + +var subclasses = { + simple : require('./models/simple'), + variable : require('./models/variable') +}; module.exports = DualCollection.extend({ - model: Model, + + /** + * Init model based on product type + */ + model: function(attributes, options){ + attributes = attributes || {}; + var Subclass = subclasses[attributes.type] || subclasses['simple']; + return new Subclass(attributes, options); + }, + name: 'products' + }); \ No newline at end of file diff --git a/assets/js/src/entities/products/model.js b/assets/js/src/entities/products/model.js deleted file mode 100644 index faf803a9..00000000 --- a/assets/js/src/entities/products/model.js +++ /dev/null @@ -1,178 +0,0 @@ -var DualModel = require('lib/config/dual-model'); -var _ = require('lodash'); -var Variations = require('../variations/collection'); -var FilteredCollection = require('lib/config/obscura'); - -module.exports = DualModel.extend({ - name: 'product', - - // this is an array of fields used by FilterCollection.matchmaker() - fields: ['title'], - - // data types - schema: { - price : 'number', - regular_price : 'number', - sale_price : 'number', - stock_quantity: 'number' - }, - - initialize: function(){ - this.on({ - 'change:updated_at': this.onUpdate - }); - }, - - onUpdate: function(){ - // update stock - if( this.get('type') === 'variable' ){ - var variations = this.getVariations().superset(); - variations.set( this.get('variations') ); - } - }, - - /** - * Helper functions to display attributes vs variations - */ - productAttributes: function(){ - return _.chain(this.get('attributes')) - .where({variation: false}) - .where({visible: true}) - .value(); - }, - - productVariations: function(){ - return _.where(this.get('attributes'), {variation: true}); - }, - - /** - * Special cases for product model filter - * @param {Array} tokens An array of query tokens, see QParser - * @param {Object} methods Helper match methods - * @param {Function} callback - */ - matchMaker: function(tokens, methods, callback){ - - var match = _.all(tokens, function(token){ - - // barcode - if( token.type === 'prefix' && token.prefix === 'barcode' ){ - if(token.query){ return this.barcodeMatch(token.query); } - } - - // cat - if( token.type === 'prefix' && token.prefix === 'cat' ){ - token.prefix = 'categories'; - return methods.prefix(token, this); - } - - }, this); - - //if(match){ - // return match; - //} - - // the original matchMaker - return match ? match : callback(tokens, this); - - }, - - barcodeMatch: function(barcode){ - var type = this.get('type'), - test = this.get('barcode').toLowerCase(), - value = barcode.toString().toLowerCase(); - - if(test === value) { - if(type !== 'variable'){ - this.trigger('match:barcode', this); - } - return true; - } - - if(type !== 'variable'){ - return this.partialBarcodeMatch(test, value); - } - - return this.variableBarcodeMatch(test, value); - }, - - partialBarcodeMatch: function(test, value){ - if(test.indexOf( value ) !== -1) { - return true; - } - return false; - }, - - variableBarcodeMatch: function(test, value){ - var match; - - this.getVariations().superset().each(function(variation){ - var vtest = variation.get('barcode').toLowerCase(); - if(vtest === value){ - match = variation; - return; - } - if(vtest.indexOf( value ) !== -1) { - match = 'partial'; - return; - } - }); - - if(match){ - if(match !== 'partial'){ - this.trigger('match:barcode', match, this); - } - return true; - } - - return this.partialBarcodeMatch(test, value); - }, - - /** - * Construct variable options from variation array - * - variable.attributes includes all options, including those not used - */ - getVariationOptions: function(){ - if( this._variationOptions ) { - return this._variationOptions; - } - - var variations = this.get('variations'); - - // pluck all options, eg: - // { Color: ['Black', 'Blue'], Size: ['Small', 'Large'] } - var result = _.pluck(variations, 'attributes') - .reduce(function(result, attrs){ - _.each(attrs, function(attr){ - if(result[attr.name]){ - return result[attr.name].push(attr.option); - } - result[attr.name] = [attr.option]; - }); - return result; - }, {}); - - // map options with consistent keys - this._variationOptions = _.map(result, function(options, name){ - return { - 'name': name, - 'options': _.uniq( options ) - }; - }); - - return this._variationOptions; - }, - - /** - * - */ - getVariations: function(){ - if( this.get('type') !== 'variable' ){ return false; } - if( ! this._variations ){ - var variations = new Variations(this.get('variations'), { parent: this }); - this._variations = new FilteredCollection(variations); - } - return this._variations; - } - -}); \ No newline at end of file diff --git a/assets/js/src/entities/products/models/abstract.js b/assets/js/src/entities/products/models/abstract.js new file mode 100644 index 00000000..f362c2c7 --- /dev/null +++ b/assets/js/src/entities/products/models/abstract.js @@ -0,0 +1,79 @@ +var DualModel = require('lib/config/dual-model'); +var _ = require('lodash'); + +module.exports = DualModel.extend({ + + name: 'product', + + // this is an array of fields used by FilterCollection.matchmaker() + fields: ['title'], + + // data types + schema: { + price : 'number', + regular_price : 'number', + sale_price : 'number', + stock_quantity: 'number' + }, + + /** + * Get the product attributes + * - not to be confused with Backbone Model attributes + * - visible product attributes without variations + */ + getProductAttributes: function(){ + return _.chain(this.get('attributes')) + .where({variation: false}) + .where({visible: true}) + .value(); + }, + + /** + * Special cases for product model filter + */ + matchMaker: function(tokens, methods, callback){ + + var match = _.all(tokens, function(token){ + + // barcode + if( token.type === 'prefix' && token.prefix === 'barcode' ){ + if(token.query){ return this.barcodeMatch(token.query); } + } + + // cat + if( token.type === 'prefix' && token.prefix === 'cat' ){ + token.prefix = 'categories'; + return methods.prefix(token, this); + } + + }, this); + + //if(match){ + // return match; + //} + + // the original matchMaker + return match ? match : callback(tokens, this); + + }, + + barcodeMatch: function(barcode){ + var type = this.get('type'), + test = this.get('barcode').toLowerCase(), + value = barcode.toString().toLowerCase(); + + if(test === value) { + if(type !== 'variable'){ + this.trigger('match:barcode', this); + } + return true; + } + + if(type !== 'variable'){ + return this.partialBarcodeMatch(test, value); + } + + return this.variableBarcodeMatch(test, value); + } + +}); \ No newline at end of file diff --git a/assets/js/src/entities/products/models/simple.js b/assets/js/src/entities/products/models/simple.js new file mode 100644 index 00000000..eed0b085 --- /dev/null +++ b/assets/js/src/entities/products/models/simple.js @@ -0,0 +1,5 @@ +var Model = require('./abstract'); + +module.exports = Model.extend({ + +}); \ No newline at end of file diff --git a/assets/js/src/entities/products/models/variable.js b/assets/js/src/entities/products/models/variable.js new file mode 100644 index 00000000..2ceff3ca --- /dev/null +++ b/assets/js/src/entities/products/models/variable.js @@ -0,0 +1,172 @@ +var Model = require('./abstract'); +var Variations = require('../../variations/collection'); +var FilteredCollection = require('lib/config/obscura'); +var _ = require('lodash'); + +module.exports = Model.extend({ + + /** + * attach variations during parse + */ + parse: function( attributes ){ + attributes = Model.prototype.parse.call( this, attributes ); + + if( attributes.variations && ! this.variations ){ + this.attachVariations( attributes ); + } + + return attributes; + }, + + /** + * attach Filtered Collection of variations + */ + attachVariations: function( parent ){ + var attributes = _.defaults( parent.variations ); + var variations = new Variations(attributes, { + title: parent.title, + parent: this // a reference to the parent model + }); + this.variations = new FilteredCollection( variations ); + }, + + /** + * return attached variations, returns Filtered Collection + */ + getVariations: function(){ + return this.variations; + }, + + /** + * Wrapper for variation options + */ + getVariationOptions: function(){ + return this.variations.superset().getVariationOptions(); + }, + + /** + * Wrapper for variations range + */ + getRange: function( attribute ){ + return this.variations.superset().range( attribute ); + } + + /** + * Special cases for product model filter + * @param {Array} tokens An array of query tokens, see QParser + * @param {Object} methods Helper match methods + * @param {Function} callback + */ + //matchMaker: function(tokens, methods, callback){ + // + // var match = _.all(tokens, function(token){ + // + // // barcode + // if( token.type === 'prefix' && token.prefix === 'barcode' ){ + // if(token.query){ return this.barcodeMatch(token.query); } + // } + // + // // cat + // if( token.type === 'prefix' && token.prefix === 'cat' ){ + // token.prefix = 'categories'; + // return methods.prefix(token, this); + // } + // + // }, this); + // + // //if(match){ + // // return match; + // //} + // + // // the original matchMaker + // return match ? match : callback(tokens, this); + // + //}, + // + //barcodeMatch: function(barcode){ + // var type = this.get('type'), + // test = this.get('barcode').toLowerCase(), + // value = barcode.toString().toLowerCase(); + // + // if(test === value) { + // if(type !== 'variable'){ + // this.trigger('match:barcode', this); + // } + // return true; + // } + // + // if(type !== 'variable'){ + // return this.partialBarcodeMatch(test, value); + // } + // + // return this.variableBarcodeMatch(test, value); + //}, + // + //partialBarcodeMatch: function(test, value){ + // if(test.indexOf( value ) !== -1) { + // return true; + // } + // return false; + //}, + // + //variableBarcodeMatch: function(test, value){ + // var match; + // + // this.getVariations().superset().each(function(variation){ + // var vtest = variation.get('barcode').toLowerCase(); + // if(vtest === value){ + // match = variation; + // return; + // } + // if(vtest.indexOf( value ) !== -1) { + // match = 'partial'; + // return; + // } + // }); + // + // if(match){ + // if(match !== 'partial'){ + // this.trigger('match:barcode', match, this); + // } + // return true; + // } + // + // return this.partialBarcodeMatch(test, value); + //}, + + /** + * Construct variable options from variation array + * - variable.attributes includes all options, including those not used + */ + //getVariationOptions: function(){ + // if( this._variationOptions ) { + // return this._variationOptions; + // } + // + // var variations = this.get('variations'); + // + // // pluck all options, eg: + // // { Color: ['Black', 'Blue'], Size: ['Small', 'Large'] } + // var result = _.pluck(variations, 'attributes') + // .reduce(function(result, attrs){ + // _.each(attrs, function(attr){ + // if(result[attr.name]){ + // return result[attr.name].push(attr.option); + // } + // result[attr.name] = [attr.option]; + // }); + // return result; + // }, {}); + // + // // map options with consistent keys + // this._variationOptions = _.map(result, function(options, name){ + // return { + // 'name': name, + // 'options': _.uniq( options ) + // }; + // }); + // + // return this._variationOptions; + //}, + +}); \ No newline at end of file diff --git a/assets/js/src/entities/tax/collection.js b/assets/js/src/entities/tax/collection.js index 13203576..1fd058ee 100644 --- a/assets/js/src/entities/tax/collection.js +++ b/assets/js/src/entities/tax/collection.js @@ -24,6 +24,18 @@ module.exports = bb.Collection.extend({ bb.Collection.call(this, models, options); }, + /** + * Listen to the order model for tax toggle + */ + initialize: function( models, options ){ + var order = options.order || _.get(this.line_item, ['collection', 'order']); + + // listen for order tax toggle + this.listenTo( order, 'change:taxes', function(){ + this.toggleTaxes( order.get('taxes') ); + }); + }, + /** * Calculate the line item tax total * based on the calc_exclusive_tax function in diff --git a/assets/js/src/entities/variations/collection.js b/assets/js/src/entities/variations/collection.js index 5559c8d7..4d80b88b 100644 --- a/assets/js/src/entities/variations/collection.js +++ b/assets/js/src/entities/variations/collection.js @@ -1,26 +1,48 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); -var Radio = require('backbone.radio'); var _ = require('lodash'); module.exports = Collection.extend({ + model: Model, - url: function(){ - var wc_api = Radio.request('entities', 'get', { - type: 'option', - name: 'wc_api' + /** + * Returns an array of options for the variation collection + * - caches on first run + */ + getVariationOptions: function(){ + if( this._variationOptions ) { + return this._variationOptions; + } + + // pluck all options, eg: + // { Color: ['Black', 'Blue'], Size: ['Small', 'Large'] } + var result = this.pluck('attributes') + .reduce(function(result, attrs){ + _.each(attrs, function(attr){ + if(result[attr.name]){ + return result[attr.name].push(attr.option); + } + result[attr.name] = [attr.option]; + }); + return result; + }, {}); + + // map options with consistent keys + // { name: 'Color', options: ['Black', 'Blue'] }, + // { name: 'Size', options: ['Small', 'Large'] } + this._variationOptions = _.map(result, function(options, name){ + return { + 'name': name, + 'options': _.uniq( options ) + }; }); - return wc_api + 'products'; - }, - initialize: function() { - this._isNew = false; + return this._variationOptions; }, /** - * same as _.compact - * except allows 0 + * same as _.compact, except allows 0 */ /* jshint -W074 */ compact: function(array) { @@ -39,6 +61,9 @@ module.exports = Collection.extend({ }, /* jshint +W074 */ + /** + * + */ range: function(attr){ var attrs = this.compact( this.pluck(attr) ), min = 0, max = 0; if( !_.isEmpty(attrs) ) { diff --git a/assets/js/src/entities/variations/model.js b/assets/js/src/entities/variations/model.js index 5277447d..ef97fc91 100644 --- a/assets/js/src/entities/variations/model.js +++ b/assets/js/src/entities/variations/model.js @@ -1,11 +1,6 @@ -//var Model = require('lib/config/model'); var Model = require('lib/config/deep-model'); module.exports = Model.extend({ - name: 'product', - defaults: { - type: 'variation' - }, // data types schema: { @@ -15,20 +10,19 @@ module.exports = Model.extend({ stock_quantity: 'number' }, - initialize: function(attributes, options){ + /** + * Attach parent product, add defaults + */ + constructor: function(attributes, options){ options = options || {}; this.parent = options.parent; - this.set({ title: options.parent.get('title') }); - }, - // copy variation to parent - save: function(attributes, options){ - var self = this; - return Model.prototype.save.call(this, attributes, options) - .then(function(){ - self.parent.set({ variations: self.collection.toJSON() }); - self.parent.merge(); - }); + this.defaults = { + type : 'variation', + title : options.title + } + + Model.apply( this, arguments ); } }); \ No newline at end of file diff --git a/assets/js/src/lib/utilities/stickit-handlers.js b/assets/js/src/lib/utilities/stickit-handlers.js index a413241a..bf2cc02e 100644 --- a/assets/js/src/lib/utilities/stickit-handlers.js +++ b/assets/js/src/lib/utilities/stickit-handlers.js @@ -71,4 +71,22 @@ bb.Stickit.addHandler({ } return val; } +}); + +/** + * Default stickit updateMethod = 'html' for contenteditable + * - change updateMethod to 'text' + * - update on 'blur' + * - filter html input + */ +bb.Stickit.addHandler({ + selector: '[contenteditable=true]', + updateMethod: 'text', + events: ['blur'], + onSet: function(val, obj){ + if( val !== this.$(obj.selector).html() ){ + this.$(obj.selector).text( val ); + } + return val; + } }); \ No newline at end of file diff --git a/includes/views/pos/cart/tmpl-customer.php b/includes/views/pos/cart/tmpl-customer.php index e089d19f..5e1bd5e7 100644 --- a/includes/views/pos/cart/tmpl-customer.php +++ b/includes/views/pos/cart/tmpl-customer.php @@ -2,6 +2,6 @@
    - {{#if customer_id}} {{/if}} + {{#if customer_id}} {{/if}} {{formatCustomerName customer}}
    \ No newline at end of file diff --git a/includes/views/pos/cart/tmpl-item-drawer.php b/includes/views/pos/cart/tmpl-item-drawer.php index a2d253f7..45819982 100644 --- a/includes/views/pos/cart/tmpl-item-drawer.php +++ b/includes/views/pos/cart/tmpl-item-drawer.php @@ -35,12 +35,12 @@ - + {{/each}} - + diff --git a/includes/views/pos/cart/tmpl-item.php b/includes/views/pos/cart/tmpl-item.php index c46c0559..67487ae1 100644 --- a/includes/views/pos/cart/tmpl-item.php +++ b/includes/views/pos/cart/tmpl-item.php @@ -5,7 +5,7 @@
    {{name}}
    - +
    {{else}} @@ -17,7 +17,7 @@ {{#if fee}} {{title}} {{/if}} - +
    {{/if}} diff --git a/includes/views/pos/cart/tmpl-totals.php b/includes/views/pos/cart/tmpl-totals.php index bd885f14..9d6a38e9 100644 --- a/includes/views/pos/cart/tmpl-totals.php +++ b/includes/views/pos/cart/tmpl-totals.php @@ -14,7 +14,7 @@ {{#if itemized}} {{#each tax_lines}} {{#compare total '!==' 0}} -
  • +
  • {{#if ../../incl_tax}}(){{/if}} {{title}}: @@ -22,14 +22,14 @@
    {{{money total}}}
    - +
    • {{/compare}} {{/each}} {{else}} -
  • +
  • {{#if incl_tax}}(){{/if}} countries->tax_or_vat() ); ?>: @@ -37,7 +37,7 @@
    {{{money total_tax}}}
    - +
    • diff --git a/includes/views/support/tmpl-form.php b/includes/views/support/tmpl-form.php index 7f1a673c..6d96e8bd 100644 --- a/includes/views/support/tmpl-form.php +++ b/includes/views/support/tmpl-form.php @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/readme.txt b/readme.txt index 5d2298be..e236e817 100644 --- a/readme.txt +++ b/readme.txt @@ -89,6 +89,7 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c * New: Settings for default Shipping and Fee line items * New: Setting for which customer roles to display in the POS * New: Split products into multiple lines in the cart +* New: Toggle order taxes * Fix: Checkout settings not showing for some users * Fix: issue with some product variation names, e.g.: 000, 00 and 0 * Tweak: Add Reply-To header to support emails diff --git a/tests/unit/js/spec/entities/products/collection.spec.js b/tests/unit/js/spec/entities/products/collection.spec.js new file mode 100644 index 00000000..e71be7bc --- /dev/null +++ b/tests/unit/js/spec/entities/products/collection.spec.js @@ -0,0 +1,29 @@ +describe('entities/products/collection.js', function () { + + // @todo idb-wrapper throws an error + var Collection = proxyquire('entities/products/collection',{ + 'lib/config/dual-collection': require('lib/config/collection') + }); + + var dummy_products = require('../../../data/products.json'); + + it('should be in a valid state', function() { + var collection = new Collection(); + expect(collection).to.be.ok; + }); + + it('should parse products, with or without \'products\' node', function() { + + // with node + var collection = new Collection(); + collection.set( dummy_products, { parse: true } ); + expect(collection.length).to.equal( dummy_products.products.length ); + + // without node + var collection = new Collection(); + collection.set( dummy_products.products, { parse: true } ); + expect(collection.length).to.equal( dummy_products.products.length ); + + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/products/model.spec.js b/tests/unit/js/spec/entities/products/model.spec.js deleted file mode 100644 index 4c536324..00000000 --- a/tests/unit/js/spec/entities/products/model.spec.js +++ /dev/null @@ -1,193 +0,0 @@ -describe('entities/products/model.js', function () { - - var Model = require('entities/products/model'); - var _ = require('lodash'); - var dummy = require('../../../data/products.json'); - - var dummy_data = { - id: 2, - title: 'Variable Product', - type: 'variable', - on_sale: true, - price: '2.00', - sale_price: null, - regular_price: '2.00', - barcode: 'SKU12345', - variations: [{ - id: 3, - on_sale: false, - price: '6.00', - sale_price: null, - regular_price: '6.00', - barcode: 'SKU67890' - },{ - id: 4, - on_sale: true, - price: '2.50', - sale_price: '2.50', - regular_price: '5.00' - },{ - id: 5, - on_sale: false, - price: '5.00', - sale_price: '2.00', - regular_price: '5.00' - }], - attributes: [{ - name: 'Ingredients', - visible: true, - variation: false, - options: ['Milk', 'Flour', 'Eggs', 'Butter'] - },{ - name: 'States', - visible: false, - variation: false, - options: ['WA', 'VIC', 'NSW'] - },{ - name: 'OS', - visible: true, - variation: false, - options: ['Mac', 'PC', 'Linux'] - },{ - name: 'Color', - visible: true, - variation: true, - options: ['Black', 'Blue'] - },{ - name: 'Size', - visible: true, - variation: true, - options: ['S', 'M', 'L'] - }] - }; - - beforeEach(function () { - this.product = new Model(dummy_data); - }); - - it('should be in a valid state', function() { - expect(this.product).to.be.ok; - }); - - describe('product attributes', function () { - - it('should return the visible product attributes (without variations)', function() { - expect(this.product.productAttributes()).eql([{ - name: 'Ingredients', - visible: true, - variation: false, - options: ['Milk', 'Flour', 'Eggs', 'Butter'] - },{ - name: 'OS', - visible: true, - variation: false, - options: ['Mac', 'PC', 'Linux'] - }]); - }); - - it('should return the product variations', function() { - expect(this.product.productVariations()).eql([{ - name: 'Color', - visible: true, - variation: true, - options: ['Black', 'Blue'] - },{ - name: 'Size', - visible: true, - variation: true, - options: ['S', 'M', 'L'] - }]); - }); - - }); - - describe('barcode match', function () { - - it('should return true for a simple barcode match', function() { - this.product.set({ type: 'simple' }); - this.product.barcodeMatch('SKU12345').should.be.true; - }); - - it('should return false for a simple barcode mismatch', function() { - this.product.set({ type: 'simple' }); - this.product.barcodeMatch('FOO12345').should.be.false; - }); - - it('should trigger "match:barcode" for exact barcode match', function() { - var trigger = stub(); - this.product.set({ type: 'simple' }); - this.product.on('match:barcode', trigger); - this.product.barcodeMatch('SKU12345'); - trigger.should.have.been.calledWith(this.product); - }); - - //it('should return true for a variable barcode match', function() { - // this.product.barcodeMatch('SKU12345').should.be.true; - //}); - // - //it('should return true for a variation barcode match', function() { - // this.product.barcodeMatch('SKU67890').should.be.true; - //}); - // - //it('should trigger "match:barcode" for exact variation match', function() { - // var trigger = stub(); - // this.product.on('match:barcode', trigger); - // this.product.barcodeMatch('SKU67890'); - // trigger.should.have.been.calledWith(dummy_data.variations[0], this.product); - //}); - // - //it('should return true for a partial barcode match', function() { - // this.product.barcodeMatch('12345').should.be.true; - //}); - // - //it('should return true for a partial variation barcode match', function() { - // this.product.barcodeMatch('67890').should.be.true; - //}); - - }); - - describe('variable products', function () { - - before(function () { - var variableAttributes = _.findWhere(dummy.products, { id: 40 }); - this.variableProduct = new Model(variableAttributes); - }); - - it('getVariationOptions should return variation options', function() { - this.variableProduct.should.respondTo('getVariationOptions'); - this.variableProduct.getVariationOptions().should.eql([{ - name: 'Color', - options: [ 'Black', 'Blue' ] - }]); - }); - - it('getVariations should return variation collection', function(){ - this.variableProduct.should.respondTo('getVariations'); - var variations = this.variableProduct.getVariations(); - variations.should.be.instanceOf( require('lib/config/obscura') ); - variations.length.should.eql(2); - }); - - // changes to variations to made to parent.variations?? - // - // it('getVariationOptions should return multiple variation options', function() { - // var filteredVariations = this.variableProduct.getVariations(); - // var variations = filteredVariations.superset(); - // variations.each(function(variation) { - // var variant = variation.get('attributes'); - // variant.push({name: 'Size', option: 'Small'}); - // variation.set('attributes', variant); - // }); - // - // this.variableProduct.getVariationOptions().should.eql([{ - // name: 'Color', - // options: [ 'Black', 'Blue' ] - // }, { - // name: 'Size', - // options: [ 'Small' ] - // }]); - //}); - - }); - -}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/products/models/abstract.spec.js b/tests/unit/js/spec/entities/products/models/abstract.spec.js new file mode 100644 index 00000000..54c8c696 --- /dev/null +++ b/tests/unit/js/spec/entities/products/models/abstract.spec.js @@ -0,0 +1,106 @@ +describe('entities/products/models/abstract.js', function () { + + var Model = require('entities/products/models/abstract'); + + var dummy_products = require('../../../../data/products.json'); + + it('should be in a valid state', function() { + var product = new Model(dummy_products.products[0]); + expect(product).to.be.ok; + }); + + it('should return Product attributes (ie: visible no variations)', function(){ + + var dummy_product = { + attributes: [{ + name: 'Ingredients', + visible: true, + variation: false, + options: ['Milk', 'Flour', 'Eggs', 'Butter'] + },{ + name: 'States', + visible: false, + variation: false, + options: ['WA', 'VIC', 'NSW'] + },{ + name: 'OS', + visible: true, + variation: false, + options: ['Mac', 'PC', 'Linux'] + },{ + name: 'Color', + visible: true, + variation: true, + options: ['Black', 'Blue'] + },{ + name: 'Size', + visible: true, + variation: true, + options: ['S', 'M', 'L'] + }] + }; + + var product = new Model(dummy_product); + + expect( product.getProductAttributes() ).eqls([{ + name: 'Ingredients', + visible: true, + variation: false, + options: ['Milk', 'Flour', 'Eggs', 'Butter'] + },{ + name: 'OS', + visible: true, + variation: false, + options: ['Mac', 'PC', 'Linux'] + }]); + + }); + + + describe('barcode match', function () { + + //it('should return true for a simple barcode match', function() { + // this.product.set({ type: 'simple' }); + // this.product.barcodeMatch('SKU12345').should.be.true; + //}); + // + //it('should return false for a simple barcode mismatch', function() { + // this.product.set({ type: 'simple' }); + // this.product.barcodeMatch('FOO12345').should.be.false; + //}); + // + //it('should trigger "match:barcode" for exact barcode match', function() { + // var trigger = stub(); + // this.product.set({ type: 'simple' }); + // this.product.on('match:barcode', trigger); + // this.product.barcodeMatch('SKU12345'); + // trigger.should.have.been.calledWith(this.product); + //}); + + //it('should return true for a variable barcode match', function() { + // this.product.barcodeMatch('SKU12345').should.be.true; + //}); + // + //it('should return true for a variation barcode match', function() { + // this.product.barcodeMatch('SKU67890').should.be.true; + //}); + // + //it('should trigger "match:barcode" for exact variation match', function() { + // var trigger = stub(); + // this.product.on('match:barcode', trigger); + // this.product.barcodeMatch('SKU67890'); + // trigger.should.have.been.calledWith(dummy_data.variations[0], this.product); + //}); + // + //it('should return true for a partial barcode match', function() { + // this.product.barcodeMatch('12345').should.be.true; + //}); + // + //it('should return true for a partial variation barcode match', function() { + // this.product.barcodeMatch('67890').should.be.true; + //}); + + }); + + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/products/models/simple.spec.js b/tests/unit/js/spec/entities/products/models/simple.spec.js new file mode 100644 index 00000000..514e9f2a --- /dev/null +++ b/tests/unit/js/spec/entities/products/models/simple.spec.js @@ -0,0 +1,11 @@ +describe('entities/products/models/simple.js', function () { + + var Model = require('entities/products/models/simple'); + var dummy_products = require('../../../../data/products.json'); + + it('should be in a valid state', function() { + var product = new Model( dummy_products.products[0] ); + expect(product).to.be.ok; + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/products/models/variable.spec.js b/tests/unit/js/spec/entities/products/models/variable.spec.js new file mode 100644 index 00000000..d670b509 --- /dev/null +++ b/tests/unit/js/spec/entities/products/models/variable.spec.js @@ -0,0 +1,109 @@ +describe('entities/products/models/variable.js', function () { + + var Model = require('entities/products/models/variable'); + + var dummy_products = require('../../../../data/products.json'); + + var dummy_product = { + id: 2, + title: 'Variable Product', + type: 'variable', + on_sale: true, + price: '2.00', + sale_price: null, + regular_price: '2.00', + barcode: 'SKU12345', + variations: [{ + id: 3, + on_sale: false, + price: '6.00', + sale_price: null, + regular_price: '6.00', + barcode: 'SKU67890', + attributes: [{ + name: 'Color', + option: 'Black' + },{ + name: 'Size', + option: 'S' + }] + },{ + id: 4, + on_sale: true, + price: '2.50', + sale_price: '2.50', + regular_price: '5.00', + attributes: [{ + name: 'Color', + option: 'Black' + },{ + name: 'Size', + option: 'M' + }] + },{ + id: 5, + on_sale: false, + price: '5.00', + sale_price: '2.00', + regular_price: '5.00', + attributes: [{ + name: 'Color', + option: 'Blue' + },{ + name: 'Size', + option: 'S' + }] + }], + attributes: [{ + name: 'Ingredients', + visible: true, + variation: false, + options: ['Milk', 'Flour', 'Eggs', 'Butter'] + },{ + name: 'States', + visible: false, + variation: false, + options: ['WA', 'VIC', 'NSW'] + },{ + name: 'OS', + visible: true, + variation: false, + options: ['Mac', 'PC', 'Linux'] + },{ + name: 'Color', + visible: true, + variation: true, + options: ['Black', 'Blue'] + },{ + name: 'Size', + visible: true, + variation: true, + options: ['S', 'M', 'L'] + }] + }; + + it('should be in a valid state', function() { + var variableProduct = _.findWhere(dummy_products.products, { id: 40 }); + var product = new Model( variableProduct ); + expect(product).to.be.ok; + }); + + it('should attach a collection of variations', function() { + var variableProduct = _.findWhere(dummy_products.products, { id: 40 }); + var product = new Model( variableProduct, { parse: true } ); + expect( product.variations ).to.be.an.instanceof( Backbone.Collection ); + expect( product.variations.length).equals( variableProduct.variations.length ); + }); + + it('should return Product variations', function(){ + var product = new Model( dummy_product, { parse: true } ); + expect( product.getVariationOptions() ).eqls([{ + name: 'Color', + options: ['Black', 'Blue'] + },{ + name: 'Size', + options: ['S', 'M'] // note: L variation not preset in dummy_product + }]); + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/variations/collection.spec.js b/tests/unit/js/spec/entities/variations/collection.spec.js index f6603cb5..6c00d099 100644 --- a/tests/unit/js/spec/entities/variations/collection.spec.js +++ b/tests/unit/js/spec/entities/variations/collection.spec.js @@ -30,4 +30,11 @@ describe('entities/variations/collection.js', function () { variations.range('sale_price').should.eql([ 30 ]); }); + it('should return an array of the available variation options', function(){ + variations.getVariationOptions().should.eql([{ + name: 'Color', + options: [ "Black", "Blue" ] + }]); + }); + }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/variations/model.spec.js b/tests/unit/js/spec/entities/variations/model.spec.js new file mode 100644 index 00000000..617dd93c --- /dev/null +++ b/tests/unit/js/spec/entities/variations/model.spec.js @@ -0,0 +1,25 @@ +describe('entities/variations/model.js', function () { + + var dummy_products = require('../../../data/products.json'); + + var Model = require('entities/variations/model'); + + it('should be in a valid state', function(){ + var variable = _.find( dummy_products.products, { id: 40 } ); + var model = new Model( variable.variations[0] ); + model.should.be.ok; + }); + + it('should init with type = variation', function(){ + var variable = _.find( dummy_products.products, { id: 40 } ); + var model = new Model( variable.variations[0] ); + model.get('type').should.equal('variation'); + }); + + it('should parse the title from the parent product', function(){ + var variable = _.find( dummy_products.products, { id: 40 } ); + var model = new Model( variable.variations[0], { title: variable.title } ); + model.get('title').should.equal(variable.title); + }); + +}); \ No newline at end of file From 3c2aefc2dbdfa45092b795f12166c4167f3d387b Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sun, 7 Feb 2016 02:54:19 +0800 Subject: [PATCH 025/169] refactor cart --- .jshintrc | 4 +- assets/css/src/scss/partials/_checkout.scss | 12 +- assets/css/src/scss/partials/_header.scss | 4 + assets/css/src/scss/partials/_loading.scss | 3 +- assets/css/src/scss/partials/_main.scss | 8 +- assets/css/src/scss/partials/_panel.scss | 8 +- assets/css/src/scss/partials/_tabs.scss | 45 +++-- assets/js/src/apps/app/layout-view.js | 32 ++-- assets/js/src/apps/pos/cart/layout.js | 13 +- assets/js/src/apps/pos/cart/route.js | 148 +++++++++------- assets/js/src/apps/pos/cart/views/items.js | 3 + .../js/src/apps/pos/cart/views/line/layout.js | 18 +- .../apps/pos/cart/views/line/views/drawer.js | 14 +- .../apps/pos/cart/views/line/views/item.js | 14 +- assets/js/src/apps/pos/cart/views/notes.js | 71 ++++---- assets/js/src/apps/pos/checkout/route.js | 14 +- .../pos/checkout/views/gateways/drawer.js | 48 ++++- assets/js/src/apps/pos/layout.js | 16 -- assets/js/src/apps/pos/products/route.js | 28 ++- .../pos/products/views/item/views/product.js | 2 +- assets/js/src/apps/pos/receipt/route.js | 5 +- assets/js/src/apps/pos/router.js | 77 +++++--- assets/js/src/apps/support/form/route.js | 5 +- assets/js/src/apps/support/layout.js | 18 -- assets/js/src/apps/support/router.js | 10 +- assets/js/src/apps/support/status/route.js | 5 +- assets/js/src/entities/cart/collection.js | 4 +- assets/js/src/entities/gateways/collection.js | 33 ++-- assets/js/src/entities/gateways/model.js | 24 +++ assets/js/src/entities/orders/collection.js | 81 +-------- assets/js/src/entities/orders/model.js | 114 +++++++++--- assets/js/src/entities/variations/model.js | 2 +- .../js/src/lib/components/logger/service.js | 2 + assets/js/src/lib/components/modal/service.js | 1 + .../components/tabs/entities/collection.js | 49 +++--- .../src/lib/components/tabs/entities/model.js | 5 +- .../src/lib/components/tabs/old_views/tab.hbs | 6 + .../src/lib/components/tabs/old_views/tab.js | 46 +++++ .../src/lib/components/tabs/old_views/tabs.js | 32 ++++ assets/js/src/lib/components/tabs/service.js | 2 - .../js/src/lib/components/tabs/views/tab.hbs | 5 - .../js/src/lib/components/tabs/views/tab.js | 57 +++--- .../js/src/lib/components/tabs/views/tabs.hbs | 1 + .../js/src/lib/components/tabs/views/tabs.js | 89 ++++++++-- assets/js/src/lib/config/application.js | 2 + assets/js/src/lib/config/composite-view.js | 2 +- assets/js/src/lib/config/dual-model.js | 25 ++- assets/js/src/lib/config/obscura.js | 5 +- assets/js/src/lib/config/route.js | 15 +- assets/js/src/lib/config/router.js | 35 ++++ .../src/lib/utilities/handlebars-helpers.js | 2 + .../js/vendor/jquery.scrollIntoView.build.js | 134 ++++++++++++++ assets/js/vendor/jquery.scrollIntoView.min.js | 2 +- .../admin/settings/class-wc-pos-checkout.php | 29 +-- includes/api/class-wc-pos-gateways.php | 12 +- includes/class-wc-pos-gateways.php | 12 +- includes/class-wc-pos-template.php | 2 +- tests/unit/js/setup/helpers.js | 3 +- .../spec/entities/gateways/collection.spec.js | 28 +++ .../js/spec/entities/gateways/model.spec.js | 40 +++++ .../js/spec/entities/orders/model.spec.js | 166 +++++++++++++----- 61 files changed, 1148 insertions(+), 544 deletions(-) delete mode 100644 assets/js/src/apps/pos/layout.js delete mode 100644 assets/js/src/apps/support/layout.js create mode 100644 assets/js/src/lib/components/tabs/old_views/tab.hbs create mode 100644 assets/js/src/lib/components/tabs/old_views/tab.js create mode 100644 assets/js/src/lib/components/tabs/old_views/tabs.js create mode 100644 assets/js/src/lib/components/tabs/views/tabs.hbs create mode 100644 assets/js/vendor/jquery.scrollIntoView.build.js create mode 100644 tests/unit/js/spec/entities/gateways/collection.spec.js create mode 100644 tests/unit/js/spec/entities/gateways/model.spec.js diff --git a/.jshintrc b/.jshintrc index 642261a2..30bd08b5 100644 --- a/.jshintrc +++ b/.jshintrc @@ -3,9 +3,7 @@ "require" : true, "module" : true, "exports" : true, - "console" : true, - "global" : true, - "__VERSION__": true + "global" : true }, "predef": ["-Promise"], diff --git a/assets/css/src/scss/partials/_checkout.scss b/assets/css/src/scss/partials/_checkout.scss index 476b94f2..0776ba50 100644 --- a/assets/css/src/scss/partials/_checkout.scss +++ b/assets/css/src/scss/partials/_checkout.scss @@ -53,8 +53,9 @@ checkout { } .drawer { - > div { + > form { padding: $gateway-padding-y $gateway-padding-x; + margin: 0; fieldset { border: 0; padding: 0; @@ -63,11 +64,12 @@ checkout { .form-row { @include clearfix(); label { - float: left; - margin-right: $gateway-padding-x; - line-height: 2.4; + //float: left; + //margin-right: $gateway-padding-x; + //line-height: 2.4; } - input { + // special case for SV Braintree, uses div instead of input + input, .wc-braintree-hosted-field { @extend .form-control } } diff --git a/assets/css/src/scss/partials/_header.scss b/assets/css/src/scss/partials/_header.scss index a5e15332..12fdeb93 100644 --- a/assets/css/src/scss/partials/_header.scss +++ b/assets/css/src/scss/partials/_header.scss @@ -89,6 +89,10 @@ header { } } + i { + line-height: 1.5; + } + } } diff --git a/assets/css/src/scss/partials/_loading.scss b/assets/css/src/scss/partials/_loading.scss index 47bd39b1..26109017 100644 --- a/assets/css/src/scss/partials/_loading.scss +++ b/assets/css/src/scss/partials/_loading.scss @@ -39,7 +39,8 @@ $pulse-name : namespace('pulse'); #page > i.icon-pos { font-size: 40em; - font-size: 40vw; + font-size: 50vh; + line-height: 100vh; color: nth( $primaryPalette, 10 ); width: 100%; text-align: center; diff --git a/assets/css/src/scss/partials/_main.scss b/assets/css/src/scss/partials/_main.scss index d257d7e6..7ddd3f41 100644 --- a/assets/css/src/scss/partials/_main.scss +++ b/assets/css/src/scss/partials/_main.scss @@ -58,12 +58,12 @@ main { .two-column & { top: 68px; - &.left-active { + .left-active { #right { display: none; } } - &.right-active { + .right-active { #left { display: none; } @@ -76,8 +76,8 @@ main { .two-column & { top: 38px; - &.left-active #right, - &.right-active #left { + .left-active #right, + .right-active #left { @include display-flex; } diff --git a/assets/css/src/scss/partials/_panel.scss b/assets/css/src/scss/partials/_panel.scss index 46963c0b..da0226e6 100644 --- a/assets/css/src/scss/partials/_panel.scss +++ b/assets/css/src/scss/partials/_panel.scss @@ -76,6 +76,12 @@ panel { background: $panel-bg; overflow-y: auto; -webkit-overflow-scrolling: touch; + + /** + * prevent body from collapsing completely + * @todo: panel-body can be 1 row, so anything over 20px is too much + */ + min-height: 20px; } /** @@ -94,7 +100,6 @@ panel { > div { background: $panel-footer-bg; @include clearfix(); - line-height: 1; } .info { @@ -102,6 +107,7 @@ panel { color: $panel-footer-color; float: right; font-style: italic; + line-height: 1; } } diff --git a/assets/css/src/scss/partials/_tabs.scss b/assets/css/src/scss/partials/_tabs.scss index 7b4c0745..d544e9cc 100644 --- a/assets/css/src/scss/partials/_tabs.scss +++ b/assets/css/src/scss/partials/_tabs.scss @@ -12,22 +12,27 @@ tabs { * @name Tabs Spec * * @markup - *
      - *
    • Item 1
      • - *
    • Item 2
      • - *
    • Item 3
      • - *
      • - *
    + *
    + *
      + *
    • Item 1
      • + *
    • Item 2
      • + *
    • Item 3
      • + *
      • + *
    + *
    */ .#{current-module()} { background: $tabs-background; - list-style: none; - margin: 0; - padding: 0; - @include clearfix(); - > li { + ul { + list-style: none; + margin: 0; + padding: 0; + @include clearfix(); + } + + li { //display: inline-block; float: left; background: $tab-item-background; @@ -37,17 +42,25 @@ tabs { &.active { background: $tab-active-background; + cursor: default; + } + + // icons + i { + line-height: 1.5; } /** * @name Removable Tabs Spec * * @markup - *
      - *
    • Item 1
      • - *
    • Item 2
      • - *
    • Item 3
      • - *
    + *
    + *
      + *
    • Item 1
      • + *
    • Item 2
      • + *
    • Item 3
      • + *
    + *
    */ > .tab-remove { color: $secondary-text-color; diff --git a/assets/js/src/apps/app/layout-view.js b/assets/js/src/apps/app/layout-view.js index a0fe32bf..bbe9e4dd 100644 --- a/assets/js/src/apps/app/layout-view.js +++ b/assets/js/src/apps/app/layout-view.js @@ -1,5 +1,4 @@ var LayoutView = require('lib/config/layout-view'); -var $ = require('jquery'); var _ = require('lodash'); var Radio = require('backbone.radio'); var globalChannel = Radio.channel('global'); @@ -13,7 +12,7 @@ module.exports = LayoutView.extend({ return '' + '' + '' + - '
    ' + + '
    ' + '
    '; }, @@ -34,7 +33,7 @@ module.exports = LayoutView.extend({ }, onMainShow: function(layout){ - if(layout.columns && layout.columns === 2){ + if(layout.columns && layout.columns.length === 2){ this.$el.addClass('two-column'); this.showTabs(); } else { @@ -62,23 +61,30 @@ module.exports = LayoutView.extend({ }, showTabs: function(){ - var tabs = this.getRegion('main').tabs = Radio.request('tabs', 'view', { - tabs: [ - {id: 'left'}, - {id: 'right'} - ] + var tabs = Radio.request('tabs', 'view', { + collection : [ + { id: 'left', active: true }, + { id: 'right' } + ], + activeId: 'left' }); - this.listenTo(tabs.collection, 'active:tab', this.toggleLayout); + + this.listenTo( tabs, 'childview:click', function(tab){ + this.toggleLayout( tab.model.id ); + }); + + this.getRegion('main').tabs = tabs; this.getRegion('tabs').show(tabs); }, - toggleLayout: function(model){ - $('#main').removeClass('left-active right-active'); - $('#main').addClass(model.id + '-active'); + toggleLayout: function(id){ + this.getRegion('main').currentView.$el + .removeClass('left-active right-active') + .addClass(id + '-active'); }, updateTabLabel: function(options){ - this.getRegion('main').tabs.setLabel(options); + this.getRegion('tabs').currentView.setLabel(options); }, showHelpModal: function() { diff --git a/assets/js/src/apps/pos/cart/layout.js b/assets/js/src/apps/pos/cart/layout.js index 25b146ce..57bbabf8 100644 --- a/assets/js/src/apps/pos/cart/layout.js +++ b/assets/js/src/apps/pos/cart/layout.js @@ -1,12 +1,8 @@ var LayoutView = require('lib/config/layout-view'); module.exports = LayoutView.extend({ - template: 'pos.cart.panel', - initialize: function(options){ - options = options || {}; - this.order = options.order; - }, + template: 'pos.cart.panel', regions: { list : '.cart-list', @@ -19,13 +15,6 @@ module.exports = LayoutView.extend({ attributes: { 'class' : 'panel cart' - }, - - /** - * add/remove cart-empty class - */ - onShow: function(){ - this.$el.toggleClass('cart-empty', !this.order); } }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 64497283..1a57cc15 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -6,9 +6,7 @@ var NotesView = require('./views/notes'); var CustomerView = require('./views/customer'); var Buttons = require('lib/components/buttons/view'); //var debug = require('debug')('cart'); -var _ = require('lodash'); var App = require('lib/config/application'); -var Utils = require('lib/utilities/utils'); var polyglot = require('lib/utilities/polyglot'); var CartRoute = Route.extend({ @@ -16,77 +14,103 @@ var CartRoute = Route.extend({ initialize: function( options ) { options = options || {}; this.container = options.container; - this.collection = options.collection; - this.setTabLabel({ - tab : 'right', - label : polyglot.t('titles.cart') + this.filtered = options.filtered; + this.collection = options.filtered.superset(); + this.setTabLabel( polyglot.t('titles.cart') ); + + this.listenTo( this.filtered, { + destroy: function(){ + this.render(); + } }); }, + /** + * + */ + addToCart: function( products ){ + if( this.activeOrder ){ + + // if new, wait for save to complete, then render + if( this.activeOrder.id === 'new' ) { + this.listenToOnce(this.activeOrder, { + 'sync': function ( model ) { + this.render( model.id ); + } + }); + } + + this.activeOrder.cart.add( products ); + } + }, + + /** + * Fetch orders from idb if new + */ fetch: function() { if (this.collection.isNew()) { - return this.collection.fetch({ silent: true }); + return this.collection.fetch(); } }, - onFetch: function(id){ - this.order = this.collection.setActiveOrder(id); - - if(this.order){ - this.setTabLabel({ - tab : 'right', - label : this.tabLabel(this.order) - }); + /** + * + */ + render: function(id) { + this.setActiveOrder( id ); + this.updateTabLabel(); + this.layout = new LayoutView(); + this.listenTo( this.layout, 'show', this.onShow ); + this.container.show( this.layout ); + }, - this.listenTo( this.order, 'change:total', function(model){ - this.setTabLabel({ - tab : 'right', - label : this.tabLabel(model) - }); - }); + /** + * + */ + setActiveOrder: function(id){ + if( ! this.collection.get('new') ){ + this.collection.add({ local_id: 'new' }); } - }, - render: function() { - this.layout = new LayoutView({ - order: this.order - }); + this.activeOrder = this.collection.get(id); - this.listenTo( this.layout, 'show', this.onShow ); + if( ! this.activeOrder ){ + this.activeOrder = this.filtered.first(); + } - this.container.show( this.layout ); + if( ! this.activeOrder.isEditable() ){ + this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + } }, - onRender: function(){ - if( this.order && !this.order.isEditable() ){ - this.navigate('receipt/' + this.order.id, { trigger: true }); - } + /** + * + */ + updateTabLabel: function(){ + this.setTabLabel( this.activeOrder.getLabel() ); + this.listenTo( this.activeOrder, 'change:total', function(model){ + this.setTabLabel( model.getLabel() ); + }); }, + /** + * + */ onShow: function(){ - if(!this.order){ - return this.noActiveOrder(); - } - this.showCart(); - this.showTotals(); - this.showCustomer(); - this.showActions(); - this.showNotes(); + this._showCart(); }, /** - * Empty Cart + * */ - noActiveOrder: function(){ - var view = new ItemsView(); - this.layout.getRegion('list').show(view); - _.invoke([ - this.layout.getRegion('totals'), - this.layout.getRegion('customer'), - this.layout.getRegion('actions'), - this.layout.getRegion('note') - ], 'empty'); + _showCart: function(){ + if( this.activeOrder.cart.length > 0 ){ + this.showTotals(); + this.showCustomer(); + this.showActions(); + this.showNotes(); + } }, /** @@ -94,7 +118,7 @@ var CartRoute = Route.extend({ */ showCart: function() { var view = new ItemsView({ - collection: this.order.cart + collection: this.activeOrder.cart }); this.layout.getRegion('list').show(view); }, @@ -104,15 +128,17 @@ var CartRoute = Route.extend({ */ showTotals: function() { var view = new TotalsView({ - model: this.order + model: this.activeOrder }); - this.on('discount:clicked', view.showDiscountRow); this.layout.getRegion('totals').show(view); }, + /** + * + */ showCustomer: function(){ var view = new CustomerView({ - model: this.order + model: this.activeOrder }); this.layout.getRegion('customer').show( view ); }, @@ -135,7 +161,7 @@ var CartRoute = Route.extend({ this.listenTo(view, { 'action:void': function(){ - var order = this.order; + var order = this.activeOrder; view.triggerMethod('disableButtons'); this.layout.getRegion('list').currentView.fadeCart().done(function(){ order.destroy(); @@ -154,7 +180,7 @@ var CartRoute = Route.extend({ this.order.cart.add( {}, { type: 'shipping' }); }, 'action:checkout': function(){ - this.navigate('checkout/' + this.order.id, { trigger: true }); + this.navigate('checkout/' + this.activeOrder.id, { trigger: true }); } }); @@ -166,18 +192,10 @@ var CartRoute = Route.extend({ */ showNotes: function() { var view = new NotesView({ - model: this.order + model: this.activeOrder }); this.on( 'note:clicked', view.showNoteField ); this.layout.getRegion('note').show( view ); - }, - - tabLabel: function(order){ - var prefix = polyglot.t('titles.cart'), - total = order.get('total'), - formatTotal = Utils.formatMoney(total); - - return prefix + ': ' + formatTotal; } }); diff --git a/assets/js/src/apps/pos/cart/views/items.js b/assets/js/src/apps/pos/cart/views/items.js index 8e1198c4..c518f8fe 100644 --- a/assets/js/src/apps/pos/cart/views/items.js +++ b/assets/js/src/apps/pos/cart/views/items.js @@ -19,6 +19,9 @@ var View = CollectionView.extend({ emptyView: Empty, fadeCart: function(){ var fadeAll = this.children.map( function( child ){ + if( child instanceof Empty ){ + return; + } return child.fadeOut(); } ); return $.when.apply( $, fadeAll ); diff --git a/assets/js/src/apps/pos/cart/views/line/layout.js b/assets/js/src/apps/pos/cart/views/line/layout.js index 8a4db7d0..09ad5e60 100644 --- a/assets/js/src/apps/pos/cart/views/line/layout.js +++ b/assets/js/src/apps/pos/cart/views/line/layout.js @@ -79,16 +79,16 @@ module.exports = LayoutView.extend({ pulse: function() { var el = this.$el, type = this.model.get( 'type' ); - // scroll to row + // @todo: do a better scrollTo for multiple pulses + el.scrollIntoView(); + el.addClass('pulse-in') - .scrollIntoView({ complete: function(){ - el.animate({backgroundColor: 'transparent'}, 500, function() { - $(this).removeClass('pulse-in').removeAttr('style'); - if( type === 'fee' || type === 'shipping' ) { - $('.title strong', this).focus().selectText(); - } - }); - }}); + .animate({backgroundColor: 'transparent'}, 500, function() { + $(this).removeClass('pulse-in').removeAttr('style'); + if( type === 'fee' || type === 'shipping' ) { + $('.title strong', this).focus().selectText(); + } + }); }, diff --git a/assets/js/src/apps/pos/cart/views/line/views/drawer.js b/assets/js/src/apps/pos/cart/views/line/views/drawer.js index 14b59929..008ebfe0 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/drawer.js +++ b/assets/js/src/apps/pos/cart/views/line/views/drawer.js @@ -5,11 +5,16 @@ var Numpad = require('lib/components/numpad/behavior'); var Radio = require('backbone.radio'); var _ = require('lodash'); var $ = require('jquery'); +var App = require('lib/config/application'); -module.exports = FormView.extend({ +var View = FormView.extend({ template: 'pos.cart.item-drawer', + attributes: { + style: 'display:none' // start drawer closed + }, + templateHelpers: function(){ return { product : this.model.type === 'product', @@ -98,7 +103,7 @@ module.exports = FormView.extend({ }, onShow: function() { - this.$el.hide().slideDown(250); + this.$el.slideDown(250); }, remove: function() { @@ -130,4 +135,7 @@ module.exports = FormView.extend({ this.model.set({ meta: meta }); } -}); \ No newline at end of file +}); + +module.exports = View; +App.prototype.set('POSApp.Cart.Views.Line.Drawer', View); \ No newline at end of file diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index 904e6b1c..55502fa2 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -37,14 +37,7 @@ module.exports = FormView.extend({ events: { 'click @ui.title' : 'focusTitle', - 'click @ui.split' : function(e){ - if(e) { e.preventDefault(); } - this.model.trigger( 'split', this.model ); - }, - 'click @ui.combine' : function(e){ - if(e) { e.preventDefault(); } - this.model.trigger( 'combine', this.model ); - } + 'click @ui.split' : 'split' }, triggers: { @@ -120,6 +113,11 @@ module.exports = FormView.extend({ focusTitle: function(){ this.ui.title.find('strong').focus(); + }, + + split: function(e){ + if(e) { e.preventDefault(); } + this.model.trigger( 'split', this.model ); } }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/cart/views/notes.js b/assets/js/src/apps/pos/cart/views/notes.js index fffe4708..6ccde7ef 100644 --- a/assets/js/src/apps/pos/cart/views/notes.js +++ b/assets/js/src/apps/pos/cart/views/notes.js @@ -1,40 +1,55 @@ -var ItemView = require('lib/config/item-view'); +var FormView = require('lib/config/form-view'); +var hbs = require('handlebars'); var _ = require('lodash'); -module.exports = ItemView.extend({ - template: _.template( '<%= note %>' ), +module.exports = FormView.extend({ - modelEvents: { - 'change:note': 'render' - }, - - events: { - 'click' : 'edit', - 'keypress': 'saveOnEnter', - 'blur' : 'save' - }, + template: hbs.compile( '{{note}}' ), - onShow: function() { - this.showOrHide(); + attributes: { + contenteditable: true, + style: 'display:none' }, - showOrHide: function() { - if( this.model.get('note') === '' ) { - this.$el.hide(); + modelEvents: { + 'change:note': function(){ + this.model.save(); } }, - edit: function() { - this.$el.attr('contenteditable','true').focus(); + events: { + 'keypress': 'saveOnEnter' }, - save: function() { - var value = this.$el.text(); + bindings: { + ':el': { + observe: 'note', + onGet: function (val) { + val = _.isString(val) ? val.trim() : ''; + if (val) { + this.$el.show(); + } else { + this.$el.hide(); + } + return val; + }, + onSet: function (val) { + val = _.isString(val) ? val.trim() : ''; + if (val !== this.$el.html()) { + this.$el.text(val); + } + if (val) { + this.$el.show(); + } else { + this.$el.hide(); + } + return val; + } + } + }, - // validate and save - this.model.save({ note: value }); - this.$el.attr('contenteditable','false'); - this.showOrHide(); + showNoteField: function(){ + this.$el.show().focus(); }, saveOnEnter: function(e) { @@ -43,10 +58,6 @@ module.exports = ItemView.extend({ e.preventDefault(); this.$el.blur(); } - }, - - showNoteField: function() { - this.$el.show(); - this.$el.attr('contenteditable','true').focus(); } + }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/checkout/route.js b/assets/js/src/apps/pos/checkout/route.js index bac5b4fe..bf594496 100644 --- a/assets/js/src/apps/pos/checkout/route.js +++ b/assets/js/src/apps/pos/checkout/route.js @@ -13,10 +13,7 @@ var CheckoutRoute = Route.extend({ options = options || {}; this.container = options.container; this.collection = options.collection; - this.setTabLabel({ - tab : 'right', - label : polyglot.t('titles.checkout') - }); + this.setTabLabel( polyglot.t('titles.checkout') ); }, fetch: function(){ @@ -88,7 +85,14 @@ var CheckoutRoute = Route.extend({ }, 'action:process-payment': function(btn){ btn.trigger('state', 'loading'); - this.order.process() + + // alert third party plugins that gateway has init + if( this.order.gateways ){ + var gateway = this.order.gateways.getActiveGateway(); + Radio.trigger('checkout', 'order:payment:' + gateway.id, this.order); + } + + this.order.save({}, { remote: true }) .always(function(){ btn.trigger('state', 'reset'); }); diff --git a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js index 6064d691..8aadd500 100644 --- a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js +++ b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js @@ -5,13 +5,24 @@ var Numpad = require('lib/components/numpad/behavior'); var Utils = require('lib/utilities/utils'); var polyglot = require('lib/utilities/polyglot'); var hbs = require('handlebars'); +var App = require('lib/config/application'); +var Radio = require('backbone.radio'); -module.exports = FormView.extend({ +var View = FormView.extend({ + + tagName: 'form', + + attributes: { + style: 'display:none' // start drawer closed + }, initialize: function() { - this.template = hbs.compile( this.model.get('payment_fields') ); + this.template = hbs.compile( this.model.getPaymentFields() ); this.order_total = this.model.collection.order.get('total'); this.updateStatusMessage(); + + // alert third party plugins that gateway has init + Radio.trigger( 'checkout', 'gateway:init:' + this.model.id, this ); }, templateHelpers: function(){ @@ -100,7 +111,9 @@ module.exports = FormView.extend({ }, onShow: function() { - this.$el.hide().slideDown(250); + // allow third party to setup before show + $.when( this.deferShow.call( this ) ) + .then( this.slideDown.bind(this) ); if(window.Modernizr.touch){ this.$('#pos-cash-tendered').attr('readonly', true); @@ -108,10 +121,20 @@ module.exports = FormView.extend({ } }, + slideDown: function(){ + this.$el.slideDown(250); + }, + remove: function() { - this.$el.slideUp( 250, function() { - FormView.prototype.remove.call(this); - }.bind(this)); + // allow third party to setup before remove + this.slideUp(); + + $.when( this.deferRemove.call( this ) ) + .then( FormView.prototype.remove.bind(this) ); + }, + + slideUp: function(){ + return this.$el.slideUp( 250 ); }, calcChange: function(tendered){ @@ -124,6 +147,15 @@ module.exports = FormView.extend({ this.model.collection.order.set({ 'payment_details.message': this.model.get('message') }); - } + }, + + /** + * Allow third party gateways to setup, teardown and submit payment details + */ + deferShow: function(){}, + deferRemove: function(){} + +}); -}); \ No newline at end of file +module.exports = View; +App.prototype.set('POSApp.Checkout.Views.Gateways.Drawer', View); \ No newline at end of file diff --git a/assets/js/src/apps/pos/layout.js b/assets/js/src/apps/pos/layout.js deleted file mode 100644 index 0718697d..00000000 --- a/assets/js/src/apps/pos/layout.js +++ /dev/null @@ -1,16 +0,0 @@ -var LayoutView = require('lib/config/layout-view'); - -module.exports = LayoutView.extend({ - columns: 2, - - template: function(){ - return '' + - '
    ' + - ''; - }, - - regions: { - left: '#left', - right: '#right' - } -}); \ No newline at end of file diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 0f8084a6..8246a0c1 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -16,10 +16,7 @@ module.exports = Route.extend({ name : 'products', perPage : 10 }); - this.setTabLabel({ - tab : 'left', - label : polyglot.t('titles.products') - }); + this.setTabLabel( polyglot.t('titles.products') ); }, fetch: function() { @@ -59,17 +56,22 @@ module.exports = Route.extend({ }, showTabs: function() { + var tabSettings = Radio.request('entities', 'get', { + type: 'option', + name: 'tabs' + }); + var view = Radio.request('tabs', 'view', { - tabs: this.tabsArray() + collection: _.map( tabSettings, function( obj ){ + return obj; + }) }); - this.listenTo(view.collection, 'active:tab', function(model) { - this.filtered.query('tab', model.id); + this.listenTo(view, 'childview:click', function(tab) { + this.filtered.query('tab', tab.model.id); }); - // show tabs component this.layout.getRegion('tabs').show(view); - this.tabs = view; }, showProducts: function() { @@ -79,14 +81,6 @@ module.exports = Route.extend({ this.layout.getRegion('list').show(view); }, - tabsArray: function(){ - var tabs = Radio.request('entities', 'get', { - type: 'option', - name: 'tabs' - }); - return _.map(tabs); - }, - showPagination: function(){ var view = new Pagination({ collection: this.filtered diff --git a/assets/js/src/apps/pos/products/views/item/views/product.js b/assets/js/src/apps/pos/products/views/item/views/product.js index c90cecdb..258ec3dd 100644 --- a/assets/js/src/apps/pos/products/views/item/views/product.js +++ b/assets/js/src/apps/pos/products/views/item/views/product.js @@ -18,7 +18,7 @@ var Item = ItemView.extend({ }, events: { - 'click @ui.add' : 'addToCart', + 'click @ui.add' : 'addToCart', 'click @ui.vpopover' : 'variationsPopover', 'click @ui.vdrawer' : 'variationsDrawer' }, diff --git a/assets/js/src/apps/pos/receipt/route.js b/assets/js/src/apps/pos/receipt/route.js index 9dfe1745..6b0589aa 100644 --- a/assets/js/src/apps/pos/receipt/route.js +++ b/assets/js/src/apps/pos/receipt/route.js @@ -18,10 +18,7 @@ var ReceiptRoute = Route.extend({ this.container = options.container; this.collection = options.collection; this.autoPrint = options.autoPrint; - this.setTabLabel({ - tab : 'right', - label : polyglot.t('titles.receipt') - }); + this.setTabLabel( polyglot.t('titles.receipt') ); this.tax = Radio.request('entities', 'get', { type: 'option', name: 'tax' diff --git a/assets/js/src/apps/pos/router.js b/assets/js/src/apps/pos/router.js index 8997d2d8..82728fba 100644 --- a/assets/js/src/apps/pos/router.js +++ b/assets/js/src/apps/pos/router.js @@ -1,14 +1,17 @@ var App = require('lib/config/application'); var Router = require('lib/config/router'); -var LayoutView = require('./layout'); var Products = require('./products/route'); var CartRoute = require('./cart/route'); var CheckoutRoute = require('./checkout/route'); var ReceiptRoute = require('./receipt/route'); var Radio = require('backbone.radio'); var bb = require('backbone'); +var _ = require('lodash'); var POSRouter = Router.extend({ + + columns: ['left', 'right'], + routes: { '(cart)(/:id)(/)' : 'showCart', 'checkout(/:id)(/)': 'showCheckout', @@ -23,62 +26,89 @@ var POSRouter = Router.extend({ 'show:receipt' : this.showReceipt, 'add:to:cart' : this.addToCart }, this); + + this.initOrders(); }, onBeforeEnter: function() { - this.layout = new LayoutView(); this.container.show(this.layout); - this.initOrders(); }, + /** + * init a filtered collection of open orders + */ initOrders: function(){ - if(this.orders){ return; } + if(this.openOrders){ + return; + } // attach orders - this.orders = Radio.request('entities', 'get', { - type: 'collection', - name: 'orders' + this.openOrders = Radio.request('entities', 'get', { + type: 'filtered', + name: 'orders', + perPage : 10 // max open carts }); - // listen to order collection - this.listenTo(this.orders, { - 'add' : this.addOrder, - 'remove' : this.removeOrder + // show only open orders + this.openOrders.filterBy('openOrders', function(model) { + return model.isEditable(); }); + + // listen to order collection + //this.listenTo(this.openOrders, { + // add : this.addOrder, + // destroy : this.removeOrder + //}); }, onBeforeRoute: function(){ - //this.setActiveTab(); + this.setActiveTab(); this.showProducts(); Radio.request('header', 'update:title', ''); }, + /** + * todo: refactor + * hacky way to set the right tab + */ setActiveTab: function(){ - var tab = bb.history.getFragment() === '' ? 'left' : 'right'; - this.container.tabs.setActive(tab); + if( bb.history.getFragment() ){ + var rightTab, tabViews = _.get(this, ['container', 'tabs', 'children']); + if( tabViews ){ + rightTab = tabViews.findByIndex(1); + } + if( rightTab ){ + rightTab.$el.click(); + } + } }, showProducts: function(){ if( this.layout.getRegion('left').hasView() ){ return; } + var products = new Products({ - container : this.layout.getRegion('left') + container : this.layout.getRegion('left'), + column : this.columns[0] }); + products.enter(); }, showCart: function() { return new CartRoute({ container : this.layout.getRegion('right'), - collection: this.orders + filtered : this.openOrders, + column : this.columns[1] }); }, showCheckout: function() { return new CheckoutRoute({ container : this.layout.getRegion('right'), - collection: this.orders + collection: this.openOrders.superset(), + column : this.columns[1] }); }, @@ -90,26 +120,25 @@ var POSRouter = Router.extend({ return new ReceiptRoute({ container : this.layout.getRegion('right'), - collection: this.orders, - autoPrint : autoPrint + collection: this.openOrders.superset(), + autoPrint : autoPrint, + column : this.columns[1] }); }, /** * Add to cart only when cart route is active */ - addToCart: function(options){ + addToCart: function(products){ if(this._currentRoute instanceof CartRoute){ - this.orders.addToCart(options); + this._currentRoute.addToCart(products); } }, addOrder: function(order){ if(this._currentRoute instanceof CartRoute){ //bb.history.navigate('cart/' + order.id); - if(order.isEditable()){ - this.execute(this.showCart, [order.id]); - } + this.execute(this.showCart, [order.id]); } }, diff --git a/assets/js/src/apps/support/form/route.js b/assets/js/src/apps/support/form/route.js index 92b6c09d..3a07d654 100644 --- a/assets/js/src/apps/support/form/route.js +++ b/assets/js/src/apps/support/form/route.js @@ -10,10 +10,7 @@ var FormRoute = Route.extend({ initialize: function(options){ this.container = options.container; - this.setTabLabel({ - tab : 'left', - label : polyglot.t('titles.support-form') - }); + this.setTabLabel( polyglot.t('titles.support-form') ); }, render: function(){ diff --git a/assets/js/src/apps/support/layout.js b/assets/js/src/apps/support/layout.js deleted file mode 100644 index 5f9a8396..00000000 --- a/assets/js/src/apps/support/layout.js +++ /dev/null @@ -1,18 +0,0 @@ -var LayoutView = require('lib/config/layout-view'); - -module.exports = LayoutView.extend({ - - columns: 2, - - template: function(){ - return '' + - '
    ' + - ''; - }, - - regions: { - left: '#left', - right: '#right' - } - -}); \ No newline at end of file diff --git a/assets/js/src/apps/support/router.js b/assets/js/src/apps/support/router.js index 438ff7b0..ad1689aa 100644 --- a/assets/js/src/apps/support/router.js +++ b/assets/js/src/apps/support/router.js @@ -1,5 +1,4 @@ var Router = require('lib/config/router'); -var LayoutView = require('./layout'); var FormRoute = require('./form/route'); var StatusRoute = require('./status/route'); var Radio = require('backbone.radio'); @@ -8,6 +7,8 @@ var $ = require('jquery'); module.exports = Router.extend({ + columns: ['left', 'right'], + routes: { 'support' : 'showStatus' }, @@ -18,7 +19,6 @@ module.exports = Router.extend({ }, onBeforeEnter: function() { - this.layout = new LayoutView(); this.container.show(this.layout); this.updateTitle(); this.showForm(); @@ -32,7 +32,8 @@ module.exports = Router.extend({ showForm: function(){ var route = new FormRoute({ - container : this.layout.getRegion('left') + container : this.layout.getRegion('left'), + column : this.columns[0] }); route.enter(); }, @@ -40,7 +41,8 @@ module.exports = Router.extend({ showStatus: function(){ return new StatusRoute({ container : this.layout.getRegion('right'), - collection : this.collection + collection : this.collection, + column : this.columns[1] }); } diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index 829a99ca..1c909563 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -14,10 +14,7 @@ var StatusRoute = Route.extend({ initialize: function(options){ this.container = options.container; this.collection = options.collection; - this.setTabLabel({ - tab : 'right', - label : polyglot.t('titles.system-status') - }); + this.setTabLabel( polyglot.t('titles.system-status') ); }, fetch: function(){ diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index fb1af49a..a0b6bb48 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -94,11 +94,9 @@ module.exports = bb.Collection.extend({ } models = this.add(models, { at: ( model.collection.indexOf( model ) + 1 ), - split: true, - silent: true + split: true }); model.set({ quantity: qty - duplicate }); - model.collection.trigger('reset'); // re-render the cart this.pulseModels(models); } diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index a14ed696..6e005c99 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -1,25 +1,29 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); var Radio = require('backbone.radio'); -var _ = require('lodash'); +/** + * @todo: abstract a tabbed collection + */ module.exports = Collection.extend({ model: Model, - constructor: function(models, options) { - models = Radio.request('entities', 'get', { + /** + * Construct with gateway settings, mix in saved attributes + */ + constructor: function( models, options ) { + var settings = Radio.request('entities', 'get', { type: 'option', name: 'gateways' }) || []; - if( models.length > 0 && _(models).pluck('active').compact().isEmpty() ){ - models[0].active = true; - } - return Collection.prototype.constructor.call(this, models, options); - }, - initialize: function() { - this._isNew = false; + Collection.prototype.constructor.call(this, settings, options); + this.on( 'change:active', this.onChangeActive ); + + if( models ){ + this.set( models, { remove: false } ); + } }, onChangeActive: function(model, active) { @@ -29,5 +33,14 @@ module.exports = Collection.extend({ tab.set({ active: false }); } }); + }, + + getActiveGateway: function(){ + return this.findWhere({ active: true }); + }, + + getPaymentDetails: function(){ + return this.getActiveGateway().toJSON(); } + }); \ No newline at end of file diff --git a/assets/js/src/entities/gateways/model.js b/assets/js/src/entities/gateways/model.js index 19efe4df..6eafd442 100644 --- a/assets/js/src/entities/gateways/model.js +++ b/assets/js/src/entities/gateways/model.js @@ -1,9 +1,33 @@ var Model = require('lib/config/model'); +var _ = require('lodash'); module.exports = Model.extend({ + idAttribute: 'method_id', defaults: { active: false + }, + + constructor: function( attributes, options ){ + attributes = attributes || {}; + this.payment_fields = attributes.payment_fields; + this.params = attributes.params; + + attributes = _.pick( + attributes, + ['active', 'icon', 'method_id', 'method_title'] + ); + + Model.call( this, attributes, options ); + }, + + getPaymentFields: function(){ + return this.payment_fields; + }, + + getParams: function(){ + return this.params; } + }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index 76787e5f..e2f9aaa7 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -1,8 +1,5 @@ var DualCollection = require('lib/config/dual-collection'); var Model = require('./model'); -var _ = require('lodash'); -var $ = require('jquery'); -var bb = require('backbone'); module.exports = DualCollection.extend({ @@ -10,82 +7,6 @@ module.exports = DualCollection.extend({ name: 'orders', - _syncDelayed: false, - - /** - * - */ - setActiveOrder: function(id){ - var order = this.get(id); - - if( !order && id !== 'new' ){ - order = _.first( this.getOpenOrders() ); - } - - this.active = order; - return order; - }, - - /** - * - */ - getOpenOrders: function(){ - return this.filter(function(model){ - return model.isEditable(); - }); - }, - - /** - * - */ - addToCart: function( product ){ - this.getActiveOrder() - .then(function(order){ - order.cart.add( product, { parse: true } ); - }); - }, - - /** - * Promise of an active order - */ - getActiveOrder: function(){ - var self = this; - var deferred = new $.Deferred(); - - if(!this.active){ - this.create().then(function(order){ - self.active = order; - if(bb.history.getHash() === 'cart/new') { - bb.history.navigate('cart/' + order.id); - } - deferred.resolve(order); - }); - } else { - deferred.resolve(this.active); - } - - return deferred.promise(); - }, - - /** - * - */ - create: function(){ - var deferred = new $.Deferred(); - - // Safari has a problem with create, perhaps an autoincrement problem? - // Set local_id as timestamp milliseconds - DualCollection.prototype.create.call(this, { - local_id: Date.now(), - status: 'CREATE_FAILED' - }, { - wait: true, - parse: true, - success: deferred.resolve, - error: deferred.reject - }); - - return deferred.promise(); - } + _syncDelayed: false }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 9f954627..1c11cca3 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -1,13 +1,16 @@ var DualModel = require('lib/config/dual-model'); var Cart = require('../cart/collection'); +var Gateways = require('../gateways/collection'); var _ = require('lodash'); var debug = require('debug')('order'); var Radio = require('backbone.radio'); -var Utils = require('lib/utilities/utils'); var App = require('lib/config/application'); var Taxes = require('../tax/collection'); +var $ = require('jquery'); +var polyglot = require('lib/utilities/polyglot'); +var Utils = require('lib/utilities/utils'); -module.exports = DualModel.extend({ +var OrderModel = DualModel.extend({ name: 'order', fields: [ @@ -16,19 +19,14 @@ module.exports = DualModel.extend({ 'customer.email' ], - defaults: { - note : '' - }, - /** * add tax settings early for use by cart - * - cart set up during parse, parse called by constructor on new Order + * - always be parsin' */ - constructor: function(){ + constructor: function( attributes, options ){ // clone tax settings this.tax = _.clone( this.getSettings( 'tax' ) ); - - DualModel.apply( this, arguments ); + DualModel.call( this, attributes, _.extend( { parse: true }, options ) ); }, /** @@ -53,15 +51,51 @@ module.exports = DualModel.extend({ /** * */ - save: function(attributes, options){ - if( this.cart && this.cart.length > 0 ){ + save: _.debounce( function(){ + + // Safari doesn't like empty keyPath, perhaps an autoincrement problem? + // Set local_id as timestamp milliseconds + if( this.id === 'new' ){ + //this.set({ local_id: Date.now() }); + this.unset('local_id'); + } + + if( this.cart ){ this.updateTotals(); } - debug('save order', this); + var self = this; - return DualModel.prototype.save.call(this, attributes, options); - }, + // if remote save, let gateway do it's thing + + return $.when( this.deferSave.call(this) ) + .then( function(){ + debug('save order', self); + return DualModel.prototype.save.apply(self, arguments); + }); + + }, 10), + + //save: function(){ + // if( this.cart && this.cart.length > 0 ){ + // this.updateTotals(); + // } + // + // var self = this; + // var args = arguments; + // + // return $.when( this.deferSave.call(this) ) + // .then( function(){ + // debug('save order', self); + // return DualModel.prototype.save.apply(self, args); + // }); + // + //}, + + /** + * Allow third party plugins to defer the order save + */ + deferSave: function(){}, /** * Attach cart during parse @@ -70,9 +104,10 @@ module.exports = DualModel.extend({ parse: function(resp) { resp = DualModel.prototype.parse.call(this, resp); - if( resp && this.isEditable( resp.status ) && !this.cart ){ - this.attachCart( resp ); + if( resp && this.isEditable( resp.status ) ){ resp.taxes = this.parseTaxRates( resp.taxes ); + this.attachCart( resp ); + this.attachGateways( resp ); } return resp; @@ -82,10 +117,16 @@ module.exports = DualModel.extend({ * Attach cart during parse, allows updates from server */ attachCart: function( attributes ){ + if( this.cart ){ + return; + } + this.cart = new Cart( null, { order: this } ); // add line_items, shipping_lines and fee_lines - this.cart.set( attributes.line_items, { parse: true, remove: false } ); + this.cart.set( attributes.line_items, + { parse: true, remove: false } + ); this.cart.set( attributes.shipping_lines, { parse: true, remove: false, type: 'shipping' } ); @@ -93,8 +134,6 @@ module.exports = DualModel.extend({ { parse: true, remove: false, type: 'fee' } ); - //delete attributes.line_items; ? - this.cart.on( 'change add remove', function(){ if( this.cart && this.cart.length === 0 ){ this.destroy(); @@ -104,6 +143,21 @@ module.exports = DualModel.extend({ }, this ); }, + /** + * Attach gateways + */ + attachGateways: function( attributes ){ + if( this.gateways ){ + return; + } + + this.gateways = new Gateways( attributes.payment_details, { order: this } ); + + this.gateways.on( 'change', function(){ + this.save(); + }, this ); + }, + /** * */ @@ -111,6 +165,7 @@ module.exports = DualModel.extend({ toJSON: function(options) { var attrs = _.clone(this.attributes); + // process cart collection if( this.isEditable() && this.cart ){ var taxes = [], shipping_taxes = []; @@ -150,6 +205,11 @@ module.exports = DualModel.extend({ ); } + // process gateways + if( this.isEditable() && this.gateways ){ + attrs.payment_details = this.gateways.getPaymentDetails(); + } + return attrs; }, /* jshint +W071 */ @@ -333,6 +393,18 @@ module.exports = DualModel.extend({ var taxes = this.tax_rates[tax_class]; return taxes.toJSON(); } + }, + + /** + * Helper function to construct the tab label + * @todo: give users options on what to display, eg: customer name + */ + getLabel: function(){ + return polyglot.t('titles.cart') + ': ' + + Utils.formatMoney(this.get('total')); } -}); \ No newline at end of file +}); + +module.exports = OrderModel; +App.prototype.set('Entities.Order.Model', OrderModel); \ No newline at end of file diff --git a/assets/js/src/entities/variations/model.js b/assets/js/src/entities/variations/model.js index ef97fc91..6f5dbff4 100644 --- a/assets/js/src/entities/variations/model.js +++ b/assets/js/src/entities/variations/model.js @@ -20,7 +20,7 @@ module.exports = Model.extend({ this.defaults = { type : 'variation', title : options.title - } + }; Model.apply( this, arguments ); } diff --git a/assets/js/src/lib/components/logger/service.js b/assets/js/src/lib/components/logger/service.js index de86fc30..70c7e49a 100644 --- a/assets/js/src/lib/components/logger/service.js +++ b/assets/js/src/lib/components/logger/service.js @@ -21,8 +21,10 @@ module.exports = Service.extend({ /** * eg: jqXHR.fail */ + /* jshint -W117 */ error: function(options){ console.log(options); } + /* jshint +W117 */ }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 906fb83f..4344411a 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -73,6 +73,7 @@ module.exports = Service.extend({ var afterOpen = options.afterOpen; options.afterOpen = function( $el, opts ){ opts.el = $el; + // @todo pass smaller options object to Layout opts.layout = new Layout( opts ); if(afterOpen){ diff --git a/assets/js/src/lib/components/tabs/entities/collection.js b/assets/js/src/lib/components/tabs/entities/collection.js index 8ffa514d..265eadb7 100644 --- a/assets/js/src/lib/components/tabs/entities/collection.js +++ b/assets/js/src/lib/components/tabs/entities/collection.js @@ -1,31 +1,34 @@ var Collection = require('lib/config/collection'); var Model = require('./model'); +var App = require('lib/config/application'); -var TabsCollection = Collection.extend({ - model: Model, +var Tabs = Collection.extend({ - initialize: function(){ - this.on({ - 'change:active' : this.onChangeActive, - 'remove' : this.ensureActiveTab - }); - }, + model: Model - onChangeActive: function(model, active){ - if(!active){ return; } - this.each(function(m) { - m.set({active: m === model}); - }); - this.trigger('active:tab', model); - }, - - ensureActiveTab: function() { - var activeTabs = this.where({ 'active': true }); - if( this.length > 0 && activeTabs.length === 0 ) { - this.at(0).set({ active: true }); - } - } + //initialize: function(){ + // this.on({ + // 'change:active' : this.onChangeActive, + // 'remove' : this.ensureActiveTab + // }); + //}, + // + //onChangeActive: function(model, active){ + // if(!active){ return; } + // this.each(function(m) { + // m.set({active: m === model}); + // }); + // this.trigger('active:tab', model); + //}, + // + //ensureActiveTab: function() { + // var activeTabs = this.where({ 'active': true }); + // if( this.length > 0 && activeTabs.length === 0 ) { + // this.at(0).set({ active: true }); + // } + //} }); -module.exports = TabsCollection; \ No newline at end of file +module.exports = Tabs; +App.prototype.set('Components.Tabs.Collection', Tabs); \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/entities/model.js b/assets/js/src/lib/components/tabs/entities/model.js index 3107e2f5..9aefe631 100644 --- a/assets/js/src/lib/components/tabs/entities/model.js +++ b/assets/js/src/lib/components/tabs/entities/model.js @@ -3,9 +3,8 @@ var Model = require('lib/config/model'); var TabModel = Model.extend({ defaults: { id: '', - label: 'Tab', - active: false, - fixed: true + label: 'Tab', // space + active: false } }); diff --git a/assets/js/src/lib/components/tabs/old_views/tab.hbs b/assets/js/src/lib/components/tabs/old_views/tab.hbs new file mode 100644 index 00000000..c5ed397d --- /dev/null +++ b/assets/js/src/lib/components/tabs/old_views/tab.hbs @@ -0,0 +1,6 @@ +{{#unless fixed}} + + + +{{/unless}} +{{{ label }}} \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/old_views/tab.js b/assets/js/src/lib/components/tabs/old_views/tab.js new file mode 100644 index 00000000..b794181a --- /dev/null +++ b/assets/js/src/lib/components/tabs/old_views/tab.js @@ -0,0 +1,46 @@ +var hbs = require('handlebars'); +var ItemView = require('lib/config/item-view'); +var Tmpl = require('./tab.hbs'); + +var View = ItemView.extend({ + + tagName: 'li', + + template: hbs.compile(Tmpl), + + activeClassName: 'active', + + initialize: function( options ){ + this.mergeOptions( options, ['activeClassName'] ); + + // add active className + if( this.model.get('active') ){ + this.$el.addClass( this.activeClassName ); + } + }, + + modelEvents: { + 'change:active': 'toggleActive', + 'change:label' : 'render' // why does this not auto render?! + }, + + toggleActive: function(){ + this.$el.toggleClass(this.activeClassName, this.model.get('active')); + }, + + triggers: { + 'click': 'tab:clicked', + 'click *[data-action="remove"]': 'remove:tab' + }, + + onTabClicked: function () { + this.model.set({active: true}); + }, + + onRemoveTab: function(){ + this.model.collection.remove(this.model); + } + +}); + +module.exports = View; \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/old_views/tabs.js b/assets/js/src/lib/components/tabs/old_views/tabs.js new file mode 100644 index 00000000..f91c4184 --- /dev/null +++ b/assets/js/src/lib/components/tabs/old_views/tabs.js @@ -0,0 +1,32 @@ +var CollectionView = require('lib/config/collection-view'); +var Tab = require('./tab'); + +var View = CollectionView.extend({ + + tagName: 'ul', + + childView: Tab, + + attributes: { + 'class' : 'tabs', + 'role' : 'tablist' + }, + + setActive: function(id){ + var model = this.collection.get(id); + model.set({active: true}); + }, + + setLabel: function(options){ + options = options || {}; + var model = this.collection.get(options.tab); + model.set({label: options.label}); + }, + + onShow: function(){ + // last call for active tabs + this.collection.ensureActiveTab(); + } +}); + +module.exports = View; \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/service.js b/assets/js/src/lib/components/tabs/service.js index 9561a2c1..1a547a32 100644 --- a/assets/js/src/lib/components/tabs/service.js +++ b/assets/js/src/lib/components/tabs/service.js @@ -1,6 +1,5 @@ var Service = require('lib/config/service'); var TabsView = require('./views/tabs'); -var TabsCollection = require('./entities/collection'); var _ = require('lodash'); module.exports = Service.extend({ @@ -17,7 +16,6 @@ module.exports = Service.extend({ */ tabsView: function(options){ options = options || {}; - _.defaults( options, { collection: new TabsCollection(options.tabs) } ); if( options.adminTabs ){ _.defaults( options, { diff --git a/assets/js/src/lib/components/tabs/views/tab.hbs b/assets/js/src/lib/components/tabs/views/tab.hbs index c5ed397d..875ac0f4 100644 --- a/assets/js/src/lib/components/tabs/views/tab.hbs +++ b/assets/js/src/lib/components/tabs/views/tab.hbs @@ -1,6 +1 @@ -{{#unless fixed}} - - - -{{/unless}} {{{ label }}} \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/views/tab.js b/assets/js/src/lib/components/tabs/views/tab.js index b794181a..c396a5f6 100644 --- a/assets/js/src/lib/components/tabs/views/tab.js +++ b/assets/js/src/lib/components/tabs/views/tab.js @@ -1,46 +1,49 @@ -var hbs = require('handlebars'); var ItemView = require('lib/config/item-view'); var Tmpl = require('./tab.hbs'); +var hbs = require('handlebars'); +var _ = require('lodash'); -var View = ItemView.extend({ +module.exports = ItemView.extend({ tagName: 'li', template: hbs.compile(Tmpl), - activeClassName: 'active', - - initialize: function( options ){ - this.mergeOptions( options, ['activeClassName'] ); - - // add active className - if( this.model.get('active') ){ - this.$el.addClass( this.activeClassName ); + events: { + click: function(e){ + e.preventDefault(); + if( ! this.$el.hasClass(this.activeClassName) ){ + this.trigger('click', this); + } } }, - modelEvents: { - 'change:active': 'toggleActive', - 'change:label' : 'render' // why does this not auto render?! + label: { + observe: 'label' }, - toggleActive: function(){ - this.$el.toggleClass(this.activeClassName, this.model.get('active')); - }, + initialize: function(options){ + this.mergeOptions(options, ['label', 'activeClassName']); - triggers: { - 'click': 'tab:clicked', - 'click *[data-action="remove"]': 'remove:tab' + // re-render on change to observed attribute + if( this.label.observe ){ + this.listenTo( this.model, 'change:' + this.label.observe, this.render ); + } }, - onTabClicked: function () { - this.model.set({active: true}); - }, + /** + * Poor man's stickit + */ + templateHelpers: function(){ + var label = this.model.get( this.label.observe ); - onRemoveTab: function(){ - this.model.collection.remove(this.model); - } + if( this.label && this.label.onGet ){ + label = this.label.onGet( label, this.model ); + } -}); + return { + label: label || _.result( this, 'label' ) + }; + } -module.exports = View; \ No newline at end of file +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/views/tabs.hbs b/assets/js/src/lib/components/tabs/views/tabs.hbs new file mode 100644 index 00000000..5487c3f1 --- /dev/null +++ b/assets/js/src/lib/components/tabs/views/tabs.hbs @@ -0,0 +1 @@ +
      \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/views/tabs.js b/assets/js/src/lib/components/tabs/views/tabs.js index f91c4184..ab1612c2 100644 --- a/assets/js/src/lib/components/tabs/views/tabs.js +++ b/assets/js/src/lib/components/tabs/views/tabs.js @@ -1,32 +1,89 @@ -var CollectionView = require('lib/config/collection-view'); +var CompositeView = require('lib/config/composite-view'); +var hbs = require('handlebars'); +var Tmpl = require('./tabs.hbs'); var Tab = require('./tab'); +var App = require('lib/config/application'); +var bb = require('backbone'); +var TabsCollection = require('../entities/collection'); -var View = CollectionView.extend({ +var Tabs = CompositeView.extend({ - tagName: 'ul', + template: hbs.compile(Tmpl), + + childViewContainer: '[role="tablist"]', childView: Tab, attributes: { - 'class' : 'tabs', - 'role' : 'tablist' + 'class' : 'tabs' }, - setActive: function(id){ - var model = this.collection.get(id); - model.set({active: true}); - }, + activeClassName: 'active', - setLabel: function(options){ + initialize: function(options){ options = options || {}; - var model = this.collection.get(options.tab); - model.set({label: options.label}); + + // store options + this.mergeOptions(options, [ + 'activeId', // current active model id + 'activeClassName', // className for active tab + 'label' // label string or function + ]); + + // + if( options.collection instanceof bb.Collection ){ + return; + } + + this.collection = new TabsCollection( options.collection ); + }, + + /** + * Pick options to pass to childview + */ + childViewOptions: function( model ){ + // pass default options + var options = { + activeClassName : 'active' + }; + + // pass label options + if( this.label ){ + options.label = this.label; + } + + // init with active class + if( this.activeId === model.id ){ + options.className = this.activeClassName; + } + + return options; + }, + + /** + * On child click, toggle active class + */ + childEvents: { + click: function( activeView ){ + this.children.each(function( childView ){ + if( childView === activeView ){ + return childView.$el.addClass( this.activeClassName ); + } + childView.$el.removeClass( this.activeClassName ); + }, this); + } }, - onShow: function(){ - // last call for active tabs - this.collection.ensureActiveTab(); + /** + * Helper function to set label + */ + setLabel: function(options){ + options = options || {}; + var model = this.collection.get( options.tab ); + model.set({ label: options.label }); } + }); -module.exports = View; \ No newline at end of file +module.exports = Tabs; +App.prototype.set('Components.Tabs.View', Tabs); \ No newline at end of file diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index 1b60de8e..d1c7d33e 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -14,11 +14,13 @@ var initDebug = function( debug ){ debugFunction.enable('*'); } Radio.DEBUG = debug; + /* jshint -W117 */ console.info( 'Debugging is ' + ( debug ? 'on' : 'off' ) + ', visit http://woopos.com.au/docs/debugging' ); + /* jshint +W117 */ }; var Application = Mn.Application.extend({ diff --git a/assets/js/src/lib/config/composite-view.js b/assets/js/src/lib/config/composite-view.js index 3fc9ff68..f80ef06c 100644 --- a/assets/js/src/lib/config/composite-view.js +++ b/assets/js/src/lib/config/composite-view.js @@ -1,4 +1,4 @@ var Mn = require('backbone.marionette'); var app = require('./application'); -module.exports = app.prototype.CollectionView = Mn.CompositeView; \ No newline at end of file +module.exports = app.prototype.CompositeView = Mn.CompositeView; \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 527161a0..aedcfcd7 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -4,21 +4,28 @@ var _ = require('lodash'); var debug = require('debug')('dualModel'); module.exports = app.prototype.DualModel = DeepModel.extend({ + idAttribute: 'local_id', + remoteIdAttribute: 'id', + fields: ['title'], - validate: function(attrs){ - var obj = {}; - if(attrs[this.idAttribute]) { - obj[this.idAttribute] = parseInt(attrs[this.idAttribute], 10); - } - if(attrs[this.remoteIdAttribute]){ - obj[this.remoteIdAttribute] = parseInt(attrs[this.remoteIdAttribute], 10); - } - this.set(obj, {silent: true}); + defaults: { + status: 'CREATE_FAILED' }, +//validate: function(attrs){ +// var obj = {}; +// if(attrs[this.idAttribute]) { +// obj[this.idAttribute] = parseInt(attrs[this.idAttribute], 10); +// } +// if(attrs[this.remoteIdAttribute]){ +// obj[this.remoteIdAttribute] = parseInt(attrs[this.remoteIdAttribute], 10); +// } +// this.set(obj, {silent: true}); +//}, + url: function(){ var remoteId = this.get(this.remoteIdAttribute), urlRoot = _.result(this.collection, 'url'); diff --git a/assets/js/src/lib/config/obscura.js b/assets/js/src/lib/config/obscura.js index 8e6497e4..c238c9a0 100644 --- a/assets/js/src/lib/config/obscura.js +++ b/assets/js/src/lib/config/obscura.js @@ -7,6 +7,7 @@ var PaginatedCollection = require('./obscura/paginated'); var proxyCollection = require('backbone-collection-proxy'); var proxyEvents = require('./obscura/proxy-events'); var query = require('./obscura/query'); +var app = require('./application'); // extend FilteredCollection with query methods _.extend(FilteredCollection.prototype, query); @@ -134,7 +135,7 @@ _.each(unsupportedMethods, function (method) { methods[method] = function () { throw new Error( 'Backbone.Obscura: Unsupported method: ' + - method + 'called on read-only proxy' + method + ' called on read-only proxy' ); }; }); @@ -144,5 +145,5 @@ Obscura = Backbone.Collection.extend(Obscura.prototype); Obscura.FilteredCollection = FilteredCollection; Obscura.SortedCollection = SortedCollection; Obscura.PaginatedCollection = PaginatedCollection; -module.exports = Obscura; +module.exports = app.prototype.Obscura = Obscura; /* jshint +W071, +W003, +W021 */ \ No newline at end of file diff --git a/assets/js/src/lib/config/route.js b/assets/js/src/lib/config/route.js index 7c6afc63..c8416604 100644 --- a/assets/js/src/lib/config/route.js +++ b/assets/js/src/lib/config/route.js @@ -8,7 +8,8 @@ var Radio = require('backbone.radio'); var globalChannel = Radio.channel('global'); module.exports = app.prototype.Route = Mn.Object.extend({ - constructor: function() { + constructor: function( options ) { + this.mergeOptions( options, ['column'] ); this.initialize.apply(this, arguments); }, @@ -57,8 +58,16 @@ module.exports = app.prototype.Route = Mn.Object.extend({ fetch : function() {}, render : function() {}, - setTabLabel: function(options){ - globalChannel.trigger('tab:label', options); + /** + * Helper function to set the columned layout tabs + */ + setTabLabel: function(label){ + if( this.column ){ + globalChannel.trigger('tab:label', { + tab : this.column, + label : label + }); + } } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/router.js b/assets/js/src/lib/config/router.js index 70de9bac..49652025 100644 --- a/assets/js/src/lib/config/router.js +++ b/assets/js/src/lib/config/router.js @@ -4,6 +4,32 @@ var $ = require('jquery'); var _ = require('lodash'); var Route = require('./route'); var app = require('./application'); +var LayoutView = require('./layout-view'); + +/** + * Columned layout + * - fix at two col for now + */ +var ColumnLayout = LayoutView.extend({ + + className: 'left-active', + + initialize: function(options){ + this.mergeOptions(options, ['columns']); + }, + + template: function(){ + return '' + + '
      ' + + ''; + }, + + regions: { + left: '#left', + right: '#right' + } + +}); module.exports = app.prototype.Router = Mn.AppRouter.extend({ @@ -28,10 +54,19 @@ module.exports = app.prototype.Router = Mn.AppRouter.extend({ } }, + /** + * + */ execute: function(callback, args) { var self = this; if (!this.active) { + + // attach layout if columns + if( this.columns ){ + this.layout = new ColumnLayout({ columns: this.columns }); + } + this.triggerMethod.apply(this, ['before:enter'].concat(args)); } diff --git a/assets/js/src/lib/utilities/handlebars-helpers.js b/assets/js/src/lib/utilities/handlebars-helpers.js index bdcb3e45..944154e2 100644 --- a/assets/js/src/lib/utilities/handlebars-helpers.js +++ b/assets/js/src/lib/utilities/handlebars-helpers.js @@ -159,6 +159,7 @@ hbs.registerHelper('formatDay', function(day, options){ return moment().isoWeekday(idx).format(f); }); +/* jshint -W117 */ hbs.registerHelper('debug', function(optionalValue) { console.log('Current Context'); console.log('===================='); @@ -170,6 +171,7 @@ hbs.registerHelper('debug', function(optionalValue) { console.log(optionalValue); } }); +/* jshint +W117 */ hbs.registerHelper('formatCustomerName', function(customer) { var name = _(customer).pick(['first_name','last_name']) diff --git a/assets/js/vendor/jquery.scrollIntoView.build.js b/assets/js/vendor/jquery.scrollIntoView.build.js new file mode 100644 index 00000000..499e04e4 --- /dev/null +++ b/assets/js/vendor/jquery.scrollIntoView.build.js @@ -0,0 +1,134 @@ +/*! + * $.fn.scrollIntoView - similar to the default browser scrollIntoView + * The default browser behavior always places the element at the top or bottom of its container. + * This override is smart enough to not scroll if the element is already visible. + * + * Copyright 2011 Arwid Bancewicz + * Licensed under the MIT license + * http://www.opensource.org/licenses/mit-license.php + * + * @date 8 Jan 2013 + * @author Arwid Bancewicz http://arwid.ca + * @version 0.3 + */ +(function($) { + $.fn.scrollIntoView = function(duration, easing, complete) { + // The arguments are optional. + // The first argment can be false for no animation or a duration. + // The first argment could also be a map of options. + // Refer to http://api.jquery.com/animate/. + var opts = $.extend({}, + $.fn.scrollIntoView.defaults); + + // Get options + if ($.type(duration) == "object") { + $.extend(opts, duration); + } else if ($.type(duration) == "number") { + $.extend(opts, { duration: duration, easing: easing, complete: complete }); + } else if (duration == false) { + opts.smooth = false; + } + + // get enclosing offsets + var elY = Infinity, elH = 0; + if (this.size()==1)((elY=this.get(0).offsetTop)==null||(elH=elY+this.get(0).offsetHeight)); + else this.each(function(i,el){(el.offsetTopelH?elH=el.offsetTop+el.offsetHeight:null)}); + elH -= elY; + + // start from the common ancester + var pEl = this.commonAncestor().get(0); + + var wH = $(window).height(); + + // go up parents until we find one that scrolls + while (pEl) { + var pY = pEl.scrollTop, pH = pEl.clientHeight; + if (pH > wH) pH = wH; + + // case: if body's elements are all absolutely/fixed positioned, use window height + if (pH == 0 && pEl.tagName == "BODY") pH = wH; + + if (pEl.scrollHeight > pEl.clientHeight) { + if (elY <= pY) scrollTo(pEl, elY); // scroll up + else if ((elY + elH) > (pY + pH)) scrollTo(pEl, elY + elH - pH); // scroll down + else scrollTo(pEl, undefined) // no scroll + return; + } + + // try next parent + pEl = pEl.parentNode; + } + + function scrollTo(el, scrollTo) { + if (scrollTo === undefined) { + if ($.isFunction(opts.complete)) opts.complete.call(el); + } else if (opts.smooth) { + $(el).stop().animate({ scrollTop: scrollTo }, opts); + } else { + el.scrollTop = scrollTo; + if ($.isFunction(opts.complete)) opts.complete.call(el); + } + } + return this; + }; + + $.fn.scrollIntoView.defaults = { + smooth: true, + duration: null, + easing: $.easing && $.easing.easeOutExpo ? 'easeOutExpo': null, + // Note: easeOutExpo requires jquery.effects.core.js + // otherwise jQuery will default to use 'swing' + complete: $.noop(), + step: null, + specialEasing: {} // cannot be null in jQuery 1.8.3 + }; + + /* + Returns whether the elements are in view + */ + $.fn.isOutOfView = function(completely) { + // completely? whether element is out of view completely + var outOfView = true; + this.each(function() { + var pEl = this.parentNode, pY = pEl.scrollTop, pH = pEl.clientHeight, elY = this.offsetTop, elH = this.offsetHeight; + if (completely ? (elY) > (pY + pH) : (elY + elH) > (pY + pH)) {} + else if (completely ? (elY + elH) < pY: elY < pY) {} + else outOfView = false; + }); + return outOfView; + }; + + /* + Returns the common ancestor of the elements. + It was taken from http://stackoverflow.com/questions/3217147/jquery-first-parent-containing-all-children + It has received minimal testing. + */ + $.fn.commonAncestor = function() { + var parents = []; + var minlen = Infinity; + + $(this).each(function() { + var curparents = $(this).parents(); + parents.push(curparents); + minlen = Math.min(minlen, curparents.length); + }); + + for (var i = 0; i < parents.length; i++) { + parents[i] = parents[i].slice(parents[i].length - minlen); + } + + // Iterate until equality is found + for (var i = 0; i < parents[0].length; i++) { + var equal = true; + for (var j in parents) { + if (parents[j][i] != parents[0][i]) { + equal = false; + break; + } + } + if (equal) return $(parents[0][i]); + } + return $([]); + } + +})(jQuery); \ No newline at end of file diff --git a/assets/js/vendor/jquery.scrollIntoView.min.js b/assets/js/vendor/jquery.scrollIntoView.min.js index 43aec2ac..eb34ff5d 100644 --- a/assets/js/vendor/jquery.scrollIntoView.min.js +++ b/assets/js/vendor/jquery.scrollIntoView.min.js @@ -11,4 +11,4 @@ * @author Arwid Bancewicz http://arwid.ca * @version 0.3 */ -(function(a){a.fn.scrollIntoView=function(f,j,c){var b=a.extend({},a.fn.scrollIntoView.defaults);if(a.type(f)=="object"){a.extend(b,f)}else{if(a.type(f)=="number"){a.extend(b,{duration:f,easing:j,complete:c})}else{if(f==false){b.smooth=false}}}var h=Infinity,e=0;if(this.size()==1){((h=this.get(0).offsetTop)==null||(e=h+this.get(0).offsetHeight))}else{this.each(function(m,n){(n.offsetTope?e=n.offsetTop+n.offsetHeight:null)})}e-=h;var k=this.commonAncestor().get(0);var g=a(window).height();while(k){var d=k.scrollTop,l=k.clientHeight;if(l>g){l=g}if(l==0&&k.tagName=="BODY"){l=g}if((k.scrollTop!=((k.scrollTop+=1)==null||k.scrollTop)&&(k.scrollTop-=1)!=null)||(k.scrollTop!=((k.scrollTop-=1)==null||k.scrollTop)&&(k.scrollTop+=1)!=null)){if(h<=d){i(k,h)}else{if((h+e)>(d+l)){i(k,h+e-l)}else{i(k,undefined)}}return}k=k.parentNode}function i(n,m){if(m===undefined){if(a.isFunction(b.complete)){b.complete.call(n)}}else{if(b.smooth){a(n).stop().animate({scrollTop:m},b)}else{n.scrollTop=m;if(a.isFunction(b.complete)){b.complete.call(n)}}}}return this};a.fn.scrollIntoView.defaults={smooth:true,duration:null,easing:a.easing&&a.easing.easeOutExpo?"easeOutExpo":null,complete:a.noop(),step:null,specialEasing:{}};a.fn.isOutOfView=function(b){var c=true;this.each(function(){var h=this.parentNode,d=h.scrollTop,g=h.clientHeight,f=this.offsetTop,e=this.offsetHeight;if(b?(f)>(d+g):(f+e)>(d+g)){}else{if(b?(f+e)e?e=n.offsetTop+n.offsetHeight:null)})}e-=h;var k=this.commonAncestor().get(0);var g=a(window).height();while(k){var d=k.scrollTop,l=k.clientHeight;if(l>g){l=g}if(l==0&&k.tagName=="BODY"){l=g}if(k.scrollHeight>k.clientHeight){if(h<=d){i(k,h)}else{if((h+e)>(d+l)){i(k,h+e-l)}else{i(k,undefined)}}return}k=k.parentNode}function i(n,m){if(m===undefined){if(a.isFunction(b.complete)){b.complete.call(n)}}else{if(b.smooth){a(n).stop().animate({scrollTop:m},b)}else{n.scrollTop=m;if(a.isFunction(b.complete)){b.complete.call(n)}}}}return this};a.fn.scrollIntoView.defaults={smooth:true,duration:null,easing:a.easing&&a.easing.easeOutExpo?"easeOutExpo":null,complete:a.noop(),step:null,specialEasing:{}};a.fn.isOutOfView=function(b){var c=true;this.each(function(){var h=this.parentNode,d=h.scrollTop,g=h.clientHeight,f=this.offsetTop,e=this.offsetHeight;if(b?(f)>(d+g):(f+e)>(d+g)){}else{if(b?(f+e)payment_gateways; $order = $this->get('gateway_order'); @@ -53,31 +56,37 @@ public function load_gateways() { } $settings = new WC_POS_Admin_Settings_Gateways($gateway->id); $settings->merge_settings($gateway); // @todo remove this, use get_title() etc - apply_filters( 'woocommerce_pos_load_gateway', $gateway ); } ksort( $ordered_gateways, SORT_NUMERIC ); - return $ordered_gateways; + return apply_filters( 'woocommerce_pos_load_gateways', $ordered_gateways ); } - public function load_enabled_gateways(){ + /** + * @return mixed|void + */ + public function load_enabled_gateways() { $gateways = $this->load_gateways(); $enabled = $this->get_enabled_gateway_ids(); - $default = $this->get('default_gateway'); - $_gateways = array(); + $default = $this->get( 'default_gateway' ); + $enabled_gateways = array(); - if($gateways): foreach($gateways as $gateway): + if ( $gateways ): foreach ( $gateways as $gateway ): $id = $gateway->id; - if(in_array($id, $enabled) && isset($gateway->pos) && $gateway->pos){ + if ( in_array( $id, $enabled ) && isset( $gateway->pos ) && $gateway->pos ) { $gateway->default = $id == $default; -// $gateway->enabled = 'yes'; // gets stomped later by init_settings() - $_gateways[$id] = $gateway; + // $gateway->enabled = 'yes'; // gets stomped later by init_settings() + $enabled_gateways[ $id ] = $gateway; } endforeach; endif; - return $_gateways; + return apply_filters( 'woocommerce_pos_load_enabled_gateways', $enabled_gateways ); } + /** + * Convenience function, returns POS enabled gateway ids + * @return array + */ public function get_enabled_gateway_ids(){ return array_keys( (array) $this->get('enabled'), true); } diff --git a/includes/api/class-wc-pos-gateways.php b/includes/api/class-wc-pos-gateways.php index 71e7fbd7..b7dda844 100644 --- a/includes/api/class-wc-pos-gateways.php +++ b/includes/api/class-wc-pos-gateways.php @@ -55,7 +55,8 @@ public function get_gateways( $wc_pos_admin = null ){ 'method_title' => esc_html( $gateway->get_title() ), 'icon' => $this->sanitize_icon( $gateway ), 'active' => $gateway->default, - 'payment_fields' => $this->sanitize_payment_fields( $gateway ) + 'payment_fields' => $this->sanitize_payment_fields( $gateway ), + 'params' => apply_filters('woocommerce_pos_gateway_' . strtolower( $gateway->id ) . '_params', array(), $gateway, $this ) ); endforeach; endif; @@ -117,14 +118,17 @@ private function removeDomNodes( $html, $xpathString ) { $dom = new DOMDocument(); + // suppress warnings for malformed HTML + libxml_use_internal_errors(true); + // Libxml constants not available on all servers (Libxml < 2.7.8) // $html->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); $dom->loadHtml( '' . '
      ' . $html . '
      ' ); - # remove removeChild( $dom->doctype ); - # remove + // remove $dom->removeChild( $dom->firstChild ); - # + // $dom->replaceChild( $dom->firstChild->firstChild->firstChild, $dom->firstChild ); // remove the required node diff --git a/includes/class-wc-pos-gateways.php b/includes/class-wc-pos-gateways.php index ea048c73..28786daa 100644 --- a/includes/class-wc-pos-gateways.php +++ b/includes/class-wc-pos-gateways.php @@ -18,7 +18,7 @@ class WC_POS_Gateways { */ public function __construct() { add_action( 'woocommerce_payment_gateways', array( $this, 'payment_gateways' ) ); - add_action( 'woocommerce_pos_load_gateway', array( $this, 'load_gateway' ) ); + add_action( 'woocommerce_pos_load_gateways', array( $this, 'load_gateways' ) ); static::$instance = $this; } @@ -56,12 +56,14 @@ public function payment_gateways( array $gateways ) { /** * Enable POS gateways - * @param $gateway + * @param $gateways * @return bool */ - public function load_gateway( WC_Payment_Gateway $gateway ) { - $gateway->pos = in_array( $gateway->id, array( 'pos_cash', 'pos_card', 'paypal' ) ); - return $gateway; + public function load_gateways( $gateways ) { + foreach( $gateways as $gateway ){ + $gateway->pos = in_array( $gateway->id, array( 'pos_cash', 'pos_card', 'paypal' ) ); + } + return $gateways; } } \ No newline at end of file diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index 4c14b024..560ed70d 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -171,7 +171,7 @@ public function footer() { $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; $js = self::get_external_js_libraries(); - $js[ 'scrollIntoView' ] = WC_POS_PLUGIN_URL . 'assets/js/vendor/jquery.scrollIntoView.min.js?ver=' . WC_POS_VERSION; + $js[ 'scrollIntoView' ] = WC_POS_PLUGIN_URL . 'assets/js/vendor/jquery.scrollIntoView.' . $build . '.js?ver=' . WC_POS_VERSION; $js[ 'app' ] = WC_POS_PLUGIN_URL . 'assets/js/app.' . $build . '.js?ver=' . WC_POS_VERSION; $scripts = apply_filters( 'woocommerce_pos_enqueue_footer_js', $js ); diff --git a/tests/unit/js/setup/helpers.js b/tests/unit/js/setup/helpers.js index 78636c37..de363712 100644 --- a/tests/unit/js/setup/helpers.js +++ b/tests/unit/js/setup/helpers.js @@ -13,7 +13,7 @@ before(function() { beforeEach(function() { this.sinon = sinon.sandbox.create(); //this.server = sinon.fakeServer.create(); - //this.clock = this.sandbox.useFakeTimers(); + //this.clock = sinon.useFakeTimers(); global.stub = this.sinon.stub.bind(this.sinon); global.spy = this.sinon.spy.bind(this.sinon); }); @@ -21,4 +21,5 @@ beforeEach(function() { afterEach(function() { this.sinon.restore(); //this.server.restore(); + //this.clock.restore(); }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/gateways/collection.spec.js b/tests/unit/js/spec/entities/gateways/collection.spec.js new file mode 100644 index 00000000..5fb08a6d --- /dev/null +++ b/tests/unit/js/spec/entities/gateways/collection.spec.js @@ -0,0 +1,28 @@ +describe('entities/gateways/collection.js', function () { + + var Gateways = require('entities/gateways/collection'); + + var gateway_settings = [{ + active: false, + method_id: 'inactive_gateway' + }, { + active: true, + method_id: 'active_gateway' + }]; + + it('should be in a valid state', function() { + var gateways = new Gateways(); + expect(gateways).to.be.ok; + }); + + it('should return the active gateway', function() { + var gateways = new Gateways(gateway_settings); + expect( gateways.getActiveGateway()).to.be.instanceof( Backbone.Model ); + }); + + it('should return the active gateway payment details', function() { + var gateways = new Gateways(gateway_settings); + expect( gateways.getPaymentDetails() ).eqls( gateway_settings[1] ); + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/gateways/model.spec.js b/tests/unit/js/spec/entities/gateways/model.spec.js new file mode 100644 index 00000000..d0e3c1eb --- /dev/null +++ b/tests/unit/js/spec/entities/gateways/model.spec.js @@ -0,0 +1,40 @@ +describe('entities/gateways/model.js', function () { + + var Gateway = require('entities/gateways/model'); + + var settings = { + active: false, + icon: 'http://example.com/credit-card.gif', + method_id: 'example_gateway', + method_title: 'Example Gateway', + payment_fields: '
      Hello World
      ', + params: { + client_token: '123456789', + flag: true + } + }; + + it('should be in a valid state', function() { + var gateway = new Gateway(); + expect(gateway).to.be.ok; + }); + + it('should parse the gateway settings', function() { + var gateway = new Gateway(settings); + + // only store necessary data, ie: no need to save templates + var whitelist = ['active', 'icon', 'method_id', 'method_title']; + expect( gateway.toJSON() ).eqls( _.pick( settings, whitelist ) ); + }); + + it('should have a function to return the payment_fields', function() { + var gateway = new Gateway(settings); + expect( gateway.getPaymentFields() ).equals( settings.payment_fields ); + }); + + it('should have a function to return the gateway params', function() { + var gateway = new Gateway(settings); + expect( gateway.getParams() ).equals( settings.params ); + }); + +}); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index 3648e61d..1d5c9047 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -69,74 +69,97 @@ describe('entities/orders/model.js', function () { // //}); - it('should save on change to the cart', function(){ + it('should save on change to the cart', function( done ){ var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); - model.sync = sinon.stub(); + + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + expect( method ).equals( 'update' ); + done(); + }; var cart_item = model.cart.at(0); cart_item.set({ quantity: 3 }); - expect( model.sync ).to.have.been.calledWith( 'update' ); - }); - it('should save on add item to cart', function(){ + it('should save on add item to cart', function( done ){ var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); - model.sync = sinon.stub(); + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + expect( method ).equals( 'update' ); + done(); + }; model.cart.add({ id: 123 }); - expect( model.sync ).to.have.been.calledWith( 'update' ); + }); + + it('should debounce save on add items to cart', function( done ){ + + // need to add editable order to attach gateways + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + var callCount = 0; + + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + callCount++; + expect( method ).equals( 'update' ); + }; + + // trigger change + for( var i = 0; i < 10; i++ ){ + model.cart.add({ id: i }); + } + + expect( callCount ).equals( 0 ); + + setTimeout(function() { + expect( callCount ).equals( 1 ); + done(); + }, 150); }); - it('should save on remove item to cart', function(){ + it('should save on remove item to cart', function( done ){ var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); - model.sync = sinon.stub(); + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + expect( method ).equals( 'update' ); + done(); + }; var cart_item = model.cart.at(0); model.cart.remove(cart_item); - expect( model.sync ).to.have.been.calledWith( 'update' ); - }); - it('should destroy order if cart is empty', function(){ + it('should destroy order if cart is empty', function( done ){ var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); - model.sync = sinon.stub(); - - // http://stackoverflow.com/questions/10858935/cleanest-way-to-destroy-every-model-in-a-collection-in-backbone + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + expect( method ).equals( 'delete' ); + done(); + }; - //_.each( model.cart.toArray(), function(cart_item) { - // if( model.cart.length > 1 ){ - // model.cart.remove(cart_item, { silent: true }); - // } else { - // model.cart.remove(cart_item); - // } - //}); -// OR while (cart_item = model.cart.first()) { - if( model.cart.length > 1 ){ - model.cart.remove(cart_item, { silent: true }); - } else { - model.cart.remove(cart_item); - } + model.cart.remove(cart_item); } - expect( model.sync ).to.have.been.calledWith( 'delete' ); - }); it('should have a convience method to combine itemized taxes', function(){ @@ -244,7 +267,7 @@ describe('entities/orders/model.js', function () { }); - it('should be match the dummy order', function(){ + it('should be match the dummy order', function( done ){ var Model = OrderModel.extend({ getSettings: function(name){ @@ -264,14 +287,23 @@ describe('entities/orders/model.js', function () { } }; } - }, - sync: stub() + } }); var model = new Model(null, { parse: true }); expect( model.cart ).to.be.instanceOf( Backbone.Collection ); + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function(){ + expect( Utils.round( model.get('total'), 2 ) ).equals( parseFloat( dummy_order.order.total ) ); + // POS subtotal includes shipping and fees + var subtotal = parseFloat( dummy_order.order.subtotal ) + parseFloat( dummy_order.order.total_shipping ); + expect( Utils.round( model.get('subtotal'), 2 ) ).equals( subtotal ); + expect( Utils.round( model.get('total_tax'), 2 ) ).equals( parseFloat( dummy_order.order.total_tax ) ); + done(); + }; + // 2 x 546 model.cart.add( { id: 546, @@ -314,14 +346,6 @@ describe('entities/orders/model.js', function () { method_title: 'Flat Rate' }, { parse: true, type: 'shipping' } ); - expect( Utils.round( model.get('total'), 2 ) ).equals( parseFloat( dummy_order.order.total ) ); - - // POS subtotal includes shipping and fees - var subtotal = parseFloat( dummy_order.order.subtotal ) + parseFloat( dummy_order.order.total_shipping ); - expect( Utils.round( model.get('subtotal'), 2 ) ).equals( subtotal ); - - expect( Utils.round( model.get('total_tax'), 2 ) ).equals( parseFloat( dummy_order.order.total_tax ) ); - }); it('should parse tax rates', function(){ @@ -370,4 +394,64 @@ describe('entities/orders/model.js', function () { }]); }); + it('should attach and init gateways (if Editable)', function(){ + + // need to add editable order to attach gateways + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + model.sync = sinon.stub(); + + expect( model.gateways ).to.be.instanceOf( Backbone.Collection ); + // expect one gateway parsed from payment_details + expect( model.gateways.length ).equals(1); + expect( model.gateways.at( 0).id ).equals( dummy_order.order.payment_details.method_id ); + + }); + + it('should save on change to the gateways', function( done ){ + + // need to add editable order to attach gateways + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + expect( method ).equals( 'update' ); + done(); + }; + + // trigger change + model.gateways.trigger('change'); + + }); + + it('should debounce save on changes to the gateways', function( done ){ + + // need to add editable order to attach gateways + var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var model = new OrderModel( order, { parse: true } ); + + var callCount = 0; + + // Note: stubbing w/ my own function because sinon is weird with debounce + model.sync = function( method ){ + callCount++; + expect( method ).equals( 'update' ); + }; + + // trigger change + for( var i = 0; i < 10; i++ ){ + model.gateways.trigger('change'); + } + + expect( callCount ).equals( 0 ); + + setTimeout(function() { + expect( callCount ).equals( 1 ); + done(); + }, 150); + + }); + }); \ No newline at end of file From 67f64d031b042e14f6c9b13e572298464a4c4d1f Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Mon, 8 Feb 2016 23:19:32 +0800 Subject: [PATCH 026/169] refactor modals --- assets/css/src/scss/partials/_cart.scss | 4 +- assets/css/src/scss/partials/_header.scss | 2 +- .../css/src/scss/partials/_input-group.scss | 2 +- assets/css/src/scss/partials/_list.scss | 7 +- assets/css/src/scss/partials/_modal.scss | 13 +- assets/css/src/scss/partials/_tabs.scss | 2 +- assets/js/src/apps/pos/cart/route.js | 9 +- assets/js/src/apps/pos/checkout/route.js | 44 +++-- assets/js/src/apps/pos/router.js | 14 -- assets/js/src/entities/gateways/collection.js | 5 +- assets/js/src/entities/orders/model.js | 31 +-- assets/js/src/entities/service.js | 39 +++- assets/js/src/lib/components/modal/body.js | 30 --- .../src/lib/components/modal/dialog/view.js | 18 ++ .../modal/{body.hbs => error/error.hbs} | 6 +- .../src/lib/components/modal/error/parser.js | 104 ++++++++++ .../js/src/lib/components/modal/error/view.js | 46 +++++ .../components/modal/{ => header}/header.hbs | 4 +- .../modal/{header.js => header/view.js} | 14 +- assets/js/src/lib/components/modal/layout.js | 138 ++++++------- assets/js/src/lib/components/modal/modal.hbs | 4 - assets/js/src/lib/components/modal/service.js | 184 +++++------------- .../src/lib/components/tabs/old_views/tab.hbs | 6 - .../src/lib/components/tabs/old_views/tab.js | 46 ----- .../src/lib/components/tabs/old_views/tabs.js | 32 --- assets/js/src/lib/config/ajax.js | 9 +- assets/js/src/lib/config/idb-collection.js | 33 +--- assets/js/src/lib/config/module.js | 24 --- assets/js/src/lib/config/sync.js | 6 +- includes/api/class-wc-pos-i18n.php | 2 + includes/api/class-wc-pos-payload.php | 2 +- .../lib/components/modal/error/parser.spec.js | 83 ++++++++ 32 files changed, 494 insertions(+), 469 deletions(-) delete mode 100644 assets/js/src/lib/components/modal/body.js create mode 100644 assets/js/src/lib/components/modal/dialog/view.js rename assets/js/src/lib/components/modal/{body.hbs => error/error.hbs} (59%) create mode 100644 assets/js/src/lib/components/modal/error/parser.js create mode 100644 assets/js/src/lib/components/modal/error/view.js rename assets/js/src/lib/components/modal/{ => header}/header.hbs (87%) rename assets/js/src/lib/components/modal/{header.js => header/view.js} (69%) delete mode 100644 assets/js/src/lib/components/modal/modal.hbs delete mode 100644 assets/js/src/lib/components/tabs/old_views/tab.hbs delete mode 100644 assets/js/src/lib/components/tabs/old_views/tab.js delete mode 100644 assets/js/src/lib/components/tabs/old_views/tabs.js delete mode 100644 assets/js/src/lib/config/module.js create mode 100644 tests/unit/js/spec/lib/components/modal/error/parser.spec.js diff --git a/assets/css/src/scss/partials/_cart.scss b/assets/css/src/scss/partials/_cart.scss index 9e9d58aa..513d2d44 100644 --- a/assets/css/src/scss/partials/_cart.scss +++ b/assets/css/src/scss/partials/_cart.scss @@ -267,8 +267,10 @@ cart { .#{current-module()}-customer { background: $cart-customer-background; - border-top: 2px solid $input-border-color; + > div { + border-top: 2px solid $input-border-color; + } } .#{current-module()}-notes { diff --git a/assets/css/src/scss/partials/_header.scss b/assets/css/src/scss/partials/_header.scss index 12fdeb93..1f1253a7 100644 --- a/assets/css/src/scss/partials/_header.scss +++ b/assets/css/src/scss/partials/_header.scss @@ -90,7 +90,7 @@ header { } i { - line-height: 1.5; + line-height: inherit; } } diff --git a/assets/css/src/scss/partials/_input-group.scss b/assets/css/src/scss/partials/_input-group.scss index 6d790bff..baad6a95 100644 --- a/assets/css/src/scss/partials/_input-group.scss +++ b/assets/css/src/scss/partials/_input-group.scss @@ -123,7 +123,7 @@ input-group { // give icons the same line-height at the input i { - line-height: 1.5; + line-height: inherit; } // Negative margin for spacing, position for bringing hovered/focused/actived diff --git a/assets/css/src/scss/partials/_list.scss b/assets/css/src/scss/partials/_list.scss index 65dfde58..83c28cad 100644 --- a/assets/css/src/scss/partials/_list.scss +++ b/assets/css/src/scss/partials/_list.scss @@ -299,7 +299,10 @@ list { text-align: right; background: $list-totals-background; - border-top: 2px solid $input-border-color; + + > ul { + border-top: 2px solid $input-border-color; + } li { @@ -327,9 +330,9 @@ list { .#{current-module()}-actions { background: $list-actions-background; - border-top: 2px solid $input-border-color; > div { + border-top: 2px solid $input-border-color; padding: $list-actions-padding-y $list-actions-padding-x; text-align: right; diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index fbf51e61..716624d3 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -37,7 +37,7 @@ $raw-border-color : $modal-header-border-color; /** * @name Modal * - * @state .error - Error Modal + * @state .modal-error - Error Modal * * @markup
      @@ -127,7 +127,7 @@ modal { /** * Error modal */ - .#{namespace('error')} & { + .#{namespace('modal-error')} & { background: nth($paletteRed, 8); border-color: lighten(nth($paletteRed, 8), 5%); color: $inverse-text-color; @@ -152,6 +152,7 @@ modal { i { padding: 5px 10px; + line-height: inherit; } } @@ -170,14 +171,20 @@ modal { padding: $modal-body-padding-y $modal-body-padding-x; @include clearfix(); + p { + margin-top: 0; + } + .raw-output { + font-size: $font-size-sm; width: 100%; max-height: 200px; overflow-y: auto; background: $raw-bg; border: 1px solid $raw-border-color; - h4 { + h5 { + font-size: $font-size-sm; line-height: 1; color: $secondary-text-color; padding: $modal-body-padding-y $modal-body-padding-x 0; diff --git a/assets/css/src/scss/partials/_tabs.scss b/assets/css/src/scss/partials/_tabs.scss index d544e9cc..42161e05 100644 --- a/assets/css/src/scss/partials/_tabs.scss +++ b/assets/css/src/scss/partials/_tabs.scss @@ -47,7 +47,7 @@ tabs { // icons i { - line-height: 1.5; + line-height: inherit; } /** diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 1a57cc15..310bb7d7 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -31,10 +31,13 @@ var CartRoute = Route.extend({ addToCart: function( products ){ if( this.activeOrder ){ - // if new, wait for save to complete, then render + // if new, wait for save to complete, then: + // - update the url + // - re-render if( this.activeOrder.id === 'new' ) { this.listenToOnce(this.activeOrder, { 'sync': function ( model ) { + this.navigate( 'cart/' + model.id ); this.render( model.id ); } }); @@ -174,10 +177,10 @@ var CartRoute = Route.extend({ // this.layout.getRegion('totals').currentView.showDiscountRow(); //}, 'action:fee': function(){ - this.order.cart.add( {}, { type: 'fee' } ); + this.activeOrder.cart.add( {}, { type: 'fee' } ); }, 'action:shipping': function(){ - this.order.cart.add( {}, { type: 'shipping' }); + this.activeOrder.cart.add( {}, { type: 'shipping' }); }, 'action:checkout': function(){ this.navigate('checkout/' + this.activeOrder.id, { trigger: true }); diff --git a/assets/js/src/apps/pos/checkout/route.js b/assets/js/src/apps/pos/checkout/route.js index bf594496..76ce455d 100644 --- a/assets/js/src/apps/pos/checkout/route.js +++ b/assets/js/src/apps/pos/checkout/route.js @@ -23,10 +23,14 @@ var CheckoutRoute = Route.extend({ }, onFetch: function(id){ - this.order = this.collection.setActiveOrder(id); + this.activeOrder = this.collection.get(id); - if(this.order){ - this.listenTo( this.order, 'change:status', function(model){ + if( this.activeOrder && ! this.activeOrder.isEditable() ){ + this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + } + + if(this.activeOrder){ + this.listenTo( this.activeOrder, 'change:status', function(model){ if(!model.isEditable() && model.get('status') !== 'failed'){ this.navigate('receipt/' + model.id, { trigger: true }); } @@ -46,23 +50,17 @@ var CheckoutRoute = Route.extend({ this.container.show(this.layout); }, - onRender: function(){ - if( this.order && !this.order.isEditable() ){ - this.navigate('receipt/' + this.order.id, { trigger: true }); - } - }, - showStatus: function(){ var view = new StatusView({ - model: this.order + model: this.activeOrder }); this.layout.getRegion('status').show(view); }, showGateways: function(){ - this.order.gateways.order = this.order; + this.activeOrder.gateways.order = this.activeOrder; var view = new GatewaysView({ - collection: this.order.gateways + collection: this.activeOrder.gateways }); this.layout.getRegion('list').show(view); }, @@ -81,21 +79,27 @@ var CheckoutRoute = Route.extend({ this.listenTo(view, { 'action:return-to-sale': function(){ - this.navigate('cart/' + this.order.id, { trigger: true }); + this.navigate('cart/' + this.activeOrder.id, { trigger: true }); }, 'action:process-payment': function(btn){ btn.trigger('state', 'loading'); // alert third party plugins that gateway has init - if( this.order.gateways ){ - var gateway = this.order.gateways.getActiveGateway(); - Radio.trigger('checkout', 'order:payment:' + gateway.id, this.order); + if( this.activeOrder.gateways ){ + var gateway = this.activeOrder.gateways.getActiveGateway(); + var trigger = 'order:payment:' + gateway.id; + Radio.trigger('checkout', trigger, this.activeOrder ); } - this.order.save({}, { remote: true }) - .always(function(){ - btn.trigger('state', 'reset'); - }); + var always = function(){ + btn.trigger('state', 'reset'); + }; + + this.activeOrder.save({}, { + remote: true, + success: always, + error: always + }); } }); diff --git a/assets/js/src/apps/pos/router.js b/assets/js/src/apps/pos/router.js index 82728fba..99ce91d1 100644 --- a/assets/js/src/apps/pos/router.js +++ b/assets/js/src/apps/pos/router.js @@ -133,20 +133,6 @@ var POSRouter = Router.extend({ if(this._currentRoute instanceof CartRoute){ this._currentRoute.addToCart(products); } - }, - - addOrder: function(order){ - if(this._currentRoute instanceof CartRoute){ - //bb.history.navigate('cart/' + order.id); - this.execute(this.showCart, [order.id]); - } - }, - - removeOrder: function(){ - if(this._currentRoute instanceof CartRoute){ - bb.history.navigate(''); - this.execute(this.showCart); - } } }); diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index 6e005c99..935e4550 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -40,7 +40,10 @@ module.exports = Collection.extend({ }, getPaymentDetails: function(){ - return this.getActiveGateway().toJSON(); + var activeGateway = this.getActiveGateway(); + if( activeGateway ){ + return activeGateway.toJSON(); + } } }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 1c11cca3..62592d94 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -49,9 +49,9 @@ var OrderModel = DualModel.extend({ }, /** - * + * Order saves on any change to cart, debounce total calcs and db saves */ - save: _.debounce( function(){ + save: _.debounce( function( attributes, options ){ // Safari doesn't like empty keyPath, perhaps an autoincrement problem? // Set local_id as timestamp milliseconds @@ -71,26 +71,10 @@ var OrderModel = DualModel.extend({ return $.when( this.deferSave.call(this) ) .then( function(){ debug('save order', self); - return DualModel.prototype.save.apply(self, arguments); + return DualModel.prototype.save.call(self, attributes, options); }); - }, 10), - - //save: function(){ - // if( this.cart && this.cart.length > 0 ){ - // this.updateTotals(); - // } - // - // var self = this; - // var args = arguments; - // - // return $.when( this.deferSave.call(this) ) - // .then( function(){ - // debug('save order', self); - // return DualModel.prototype.save.apply(self, args); - // }); - // - //}, + }, 20), /** * Allow third party plugins to defer the order save @@ -400,8 +384,11 @@ var OrderModel = DualModel.extend({ * @todo: give users options on what to display, eg: customer name */ getLabel: function(){ - return polyglot.t('titles.cart') + ': ' + - Utils.formatMoney(this.get('total')); + var title = polyglot.t('titles.cart'); + if( this.id !== 'new' ){ + title += ' ' + Utils.formatMoney( this.get('total') ); + } + return title; } }); diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index e72af211..2bd6b7a0 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -10,6 +10,7 @@ var FilteredCollection = require('lib/config/obscura'); var debug = require('debug')('entities'); var App = require('lib/config/application'); var _ = require('lodash'); +var Radio = require('backbone.radio'); var storage = global.localStorage || window.localStorage; var JSON = global.JSON || window.JSON; @@ -141,11 +142,19 @@ var EntitiesService = Service.extend({ getLocalStorage: function(options){ options = options || {}; - var data = storage.getItem('wc_pos_' + options.name); + var data; + + try { + data = storage.getItem('wc_pos_' + options.name); + } catch (error) { + return Radio.channel('global', 'error', error); + } + var obj = this.deserialize(data); if(options.key && obj && obj[options.key]){ return obj[options.key]; } + return obj; }, @@ -153,22 +162,44 @@ var EntitiesService = Service.extend({ options = options || {}; var data = options.data; var old = this.getLocalStorage({name: options.name}); + if( _.isObject(old) && _.isObject(data) ){ data = _.extend(old, data); } - storage.setItem('wc_pos_' + options.name, this.serialize(data)); + + try { + storage.setItem('wc_pos_' + options.name, this.serialize(data)); + } catch (error) { + return Radio.channel('global', 'error', error); + } }, + /* jshint -W074 */ remove: function(options){ options = options || {}; + if(options.type === 'localStorage' && options.name && options.key){ var data = this.getLocalStorage({name: options.name}); delete data[options.key]; - storage.setItem('wc_pos_' + options.name, JSON.stringify(data)); + + try { + storage.setItem('wc_pos_' + options.name, JSON.stringify(data)); + } catch (error) { + return Radio.channel('global', 'error', error); + } + } else { - storage.removeItem('wc_pos_' + options.name); + + try { + storage.removeItem('wc_pos_' + options.name); + } catch (error) { + return Radio.channel('global', 'error', error); + } + } + }, + /* jshint +W074 */ idbCollections: function(){ return _.reduce( this.getAllCollections(), function(result, col, key){ diff --git a/assets/js/src/lib/components/modal/body.js b/assets/js/src/lib/components/modal/body.js deleted file mode 100644 index 380d9370..00000000 --- a/assets/js/src/lib/components/modal/body.js +++ /dev/null @@ -1,30 +0,0 @@ -var ItemView = require('lib/config/item-view'); -var hbs = require('handlebars'); -var Tmpl = require('./body.hbs'); -var _ = require('lodash'); -var polyglot = require('lib/utilities/polyglot'); - -module.exports = ItemView.extend({ - template: hbs.compile(Tmpl), - - templateHelpers: function(){ - return _.extend({ - moreInfo: polyglot.t('titles.more-info') - }, this.options ); - }, - - ui: { - raw: '*[data-action="raw"]', - output: '.raw-output' - }, - - events: { - 'click @ui.raw': 'toggleRaw' - }, - - toggleRaw: function(e){ - e.preventDefault(); - this.ui.output.toggle(); - } - -}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/dialog/view.js b/assets/js/src/lib/components/modal/dialog/view.js new file mode 100644 index 00000000..167c086c --- /dev/null +++ b/assets/js/src/lib/components/modal/dialog/view.js @@ -0,0 +1,18 @@ +var ItemView = require('lib/config/item-view'); +var hbs = require('handlebars'); + +module.exports = ItemView.extend({ + + template: hbs.compile('

      {{{message}}}

      '), + + initialize: function(options){ + this.mergeOptions( options, ['message'] ); + }, + + templateHelpers: function(){ + return { + message: this.message + }; + } + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/body.hbs b/assets/js/src/lib/components/modal/error/error.hbs similarity index 59% rename from assets/js/src/lib/components/modal/body.hbs rename to assets/js/src/lib/components/modal/error/error.hbs index a45eb3c3..953a19e9 100644 --- a/assets/js/src/lib/components/modal/body.hbs +++ b/assets/js/src/lib/components/modal/error/error.hbs @@ -1,9 +1,7 @@ -

      - {{{message}}} -

      +

      {{{message}}}

      {{#if raw}}
      -

      {{moreInfo}}

      +
      {{moreInfo}}

      {{raw}}

      {{/if}} \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/error/parser.js b/assets/js/src/lib/components/modal/error/parser.js new file mode 100644 index 00000000..b41ec747 --- /dev/null +++ b/assets/js/src/lib/components/modal/error/parser.js @@ -0,0 +1,104 @@ +var _ = require('lodash'); +var polyglot = require('lib/utilities/polyglot'); + +/** + * + */ +var parseResponseJSON = function( json ){ + var result = ''; + + // rest api errors + if( json.errors ){ + return _.map( json.errors, function( error ){ + return error.message; + } ); + } + + return result; +}; + +/** + * + */ +/* jshint -W071, -W074 */ +var parseObject = function( obj ){ + var result = {}; + + // looks like jqXHR + if( obj.promise && obj.setRequestHeader ){ + result = { + title : obj.statusText !== 'OK' ? obj.statusText : '', + message : obj.responseJSON ? parseResponseJSON( obj.responseJSON ) : '', + raw : obj.responseText + }; + } + + // Error obj, used by idb-wrapper + if( _.isError( obj ) ){ + result = { + title: obj.name, + message: obj.message + }; + } + + // IndexedDB transaction errors and other Events + if( obj.target && obj.target.error ){ + result = { + title: obj.target.error.name, + message: obj.target.error.message + }; + + // special case Private Browsing + if( result.title === 'InvalidStateError' ){ + result.message += ' ' + polyglot.t('messages.private-browsing'); + } + } + + return result; +}; +/* jshint +W071, +W074 */ + +/** + * + */ +var parseArray = function( arr ){ + var result = {}; + + // jqXHR + if( _.isObject( arr[0] ) ){ + result = parseObject( arr[0] ); + } + + // text status + if( _.isString( arr[1] ) && ! result.title ){ + result.title = arr[1]; + } + + // error thrown, SyntaxError + if( _.isError( arr[2] ) && ! result.message ){ + _.extend( result, parseObject( arr[2] ) ); + } + + return result; +}; + +module.exports = function(error){ + var result = {}; + + // simple string error + if( _.isString(error) ){ + result.message = error; + } + + // arguments, eg: [ jqXHR, textStatus, errorThrown ] + else if( _.isArray(error) ){ + result = parseArray(error); + } + + // object error, eg: jqXHR + else if( _.isObject(error) ){ + result = parseObject(error); + } + + return result; +}; \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/error/view.js b/assets/js/src/lib/components/modal/error/view.js new file mode 100644 index 00000000..64acdf84 --- /dev/null +++ b/assets/js/src/lib/components/modal/error/view.js @@ -0,0 +1,46 @@ +var ItemView = require('lib/config/item-view'); +var hbs = require('handlebars'); +var Tmpl = require('./error.hbs'); +var parse = require('./parser'); +var polyglot = require('lib/utilities/polyglot'); +var _ = require('lodash'); + +module.exports = ItemView.extend({ + + modal: { + header: { + title: polyglot.t('titles.error', { _ : 'Error' }) + }, + footer : { + buttons: [ + { + action: 'close' + } + ] + } + }, + + template: hbs.compile(Tmpl), + + initialize: function( options ){ + options = options || {}; + + // parse error and merge with defaults + this.error = _.defaults( parse( options.error ), { + message: polyglot.t('messages.error', { + _ : 'Sorry, there has been an error.' + }), + moreInfo: polyglot.t('titles.more-info', { _ : 'More info' }) + }); + + // set the modal title + if( this.error.title ){ + this.modal.header.title = this.error.title; + } + }, + + templateHelpers: function(){ + return this.error; + } + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/header.hbs b/assets/js/src/lib/components/modal/header/header.hbs similarity index 87% rename from assets/js/src/lib/components/modal/header.hbs rename to assets/js/src/lib/components/modal/header/header.hbs index 7c880a79..f32c32f3 100644 --- a/assets/js/src/lib/components/modal/header.hbs +++ b/assets/js/src/lib/components/modal/header/header.hbs @@ -1,6 +1,8 @@

      {{{title}}}

      +{{#if close}} - \ No newline at end of file + +{{/if}} \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/header.js b/assets/js/src/lib/components/modal/header/view.js similarity index 69% rename from assets/js/src/lib/components/modal/header.js rename to assets/js/src/lib/components/modal/header/view.js index 012ad366..2632c658 100644 --- a/assets/js/src/lib/components/modal/header.js +++ b/assets/js/src/lib/components/modal/header/view.js @@ -1,21 +1,23 @@ var ItemView = require('lib/config/item-view'); var hbs = require('handlebars'); var Tmpl = require('./header.hbs'); -var _ = require('lodash'); var polyglot = require('lib/utilities/polyglot'); module.exports = ItemView.extend({ + + title: polyglot.t('messages.loading', { _ : 'Loading' }), + close: polyglot.t('buttons.close', { _ : 'Close' }), template: hbs.compile(Tmpl), initialize: function(options){ - _.defaults(options, { - title: polyglot.t('messages.loading', { _ : 'Loading' }), - close: polyglot.t('buttons.close', { _ : 'Close' }) - }); + this.mergeOptions( options, ['title', 'close'] ); }, templateHelpers: function(){ - return this.options; + return { + title: this.title, + close: this.close + }; }, ui: { diff --git a/assets/js/src/lib/components/modal/layout.js b/assets/js/src/lib/components/modal/layout.js index 40782e4f..9287f198 100644 --- a/assets/js/src/lib/components/modal/layout.js +++ b/assets/js/src/lib/components/modal/layout.js @@ -1,16 +1,17 @@ var LayoutView = require('lib/config/layout-view'); var Radio = require('backbone.radio'); +var Header = require('./header/view'); +var Dialog = require('./dialog/view'); +var $ = require('jquery'); var _ = require('lodash'); -var Header = require('./header'); -var Body = require('./body'); -var Tmpl = require('./modal.hbs'); -var hbs = require('handlebars'); - -var defaultModal = { - header: { - title: '' - }, - tabs: false, +var bb = require('backbone'); + +module.exports = LayoutView.extend({ + + // default header options (not false) + header: {}, + + // default footer options (save button) footer: { buttons: [ { @@ -21,92 +22,93 @@ var defaultModal = { className: 'btn-primary' } ] - } -}; - -module.exports = LayoutView.extend({ + }, - template: hbs.compile(Tmpl), + // template with regions is created during render + template: false, initialize: function( options ){ - // this.$el.data() = this.options - options = _.defaults( options, { - header: _.get(options, ['view', 'modal', 'header'], defaultModal.header), - tabs : _.get(options, ['view', 'modal', 'tabs'], defaultModal.tabs), - footer: _.get(options, ['view', 'modal', 'footer'], defaultModal.footer) - }); - this.mergeOptions( options, ['header', 'tabs', 'footer', 'view', 'id'] ); - this.render(); + this.mergeOptions( options, ['view', 'prefix'] ); + this.header = _.get(this, ['view', 'modal', 'header'], this.header); + this.footer = _.get(this, ['view', 'modal', 'footer'], this.footer); }, childEvents: { 'action:close' : function(){ - //Radio.request( 'modal', 'close', this.$el.data().vex.id ); - Radio.request( 'modal', 'close', this.id ); + Radio.request( 'modal', 'close', this.$el.data().vex.id ); } }, - templateHelpers: function(){ - return { - header: !!this.header, - tabs : !!this.tabs, - footer: !!this.footer - }; - }, - onRender: function(){ - if( this.header ){ this.showHeader( this.header ); } - if( this.tabs ){ this.showTabs( this.tabs ); } + if( this.header ){ + this.showHeader(); + } + this.showBody(); - if( this.footer ){ this.showFooter( this.footer ); } - }, - showHeader: function( options ){ - var container = this.$('[class$="modal-header"]'); - if( container.length === 0 ){ - return; + if( this.footer ){ + this.showFooter(); } - - var region = this.addRegion( 'headerRegion', container ); - var view = new Header( options ); - region.show( view ); }, - showTabs: function( options ){ - var container = this.$('[class$="modal-tabs"]'); - if( container.length === 0 ){ - return; + /** + * Creates header div and inits region (if required) + */ + showHeader: function(){ + var view, + className = this.prefix + '-header', + container = $('
      ', { 'class': className }); + + this.$el.append( container ); + var region = this.addRegion( 'headerRegion', '.' + className ); + + if( this.header instanceof bb.View ){ + view = this.header; + } else { + view = new Header( this.header ); } - var view = Radio.request('tabs', 'view', { - tabs: options - }); - - var region = this.addRegion( 'tabsRegion', container ); region.show( view ); }, + /** + * Creates body div and inits region + */ showBody: function(){ - var container = this.$('[class$="modal-body"]'); - if( container.length === 0 ){ - return; + var view, + className = this.prefix + '-body', + container = $('
      ', { 'class': className }); + + this.$el.append( container ); + var region = this.addRegion( 'bodyRegion', '.' + className ); + + if( this.view instanceof bb.View ){ + view = this.view; + } else { + view = new Dialog({ message: this.view }); } - var region = this.addRegion( 'bodyRegion', container ); - var view = this.view || new Body(this.options); region.show( view ); }, - showFooter: function( options ){ - options = options || {}; - var container = this.$('[class$="modal-footer"]'); - - if( container.length && options.buttons ){ - var region = this.addRegion( 'footerRegion', container ); - var view = Radio.request('buttons', 'view', options); - region.$el.toggle( options.show !== false ); - region.show( view ); + /** + * Creates footer div and inits region (if required) + */ + showFooter: function(){ + var view, + className = this.prefix + '-footer', + container = $('
      ', { 'class': className }); + + this.$el.append( container ); + var region = this.addRegion( 'footerRegion', '.' + className ); + + if( this.footer instanceof bb.View ){ + view = this.footer; + } else { + view = Radio.request('buttons', 'view', this.footer); } + + region.show( view ); } }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/modal.hbs b/assets/js/src/lib/components/modal/modal.hbs deleted file mode 100644 index 77508bb9..00000000 --- a/assets/js/src/lib/components/modal/modal.hbs +++ /dev/null @@ -1,4 +0,0 @@ -{{#if header}}
      {{/if}} -{{#if tabs}}
      {{/if}} -
      -{{#if footer}}
      {{/if}} \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 4344411a..311170af 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -2,175 +2,91 @@ var Service = require('lib/config/service'); var Modal = require('vex-js'); var App = require('lib/config/application'); var prefix = App.prototype.namespace('modal'); +var Layout = require('./layout'); +var Radio = require('backbone.radio'); var _ = require('lodash'); -var Layout = require('./layout.js'); var bb = require('backbone'); -var globalChannel = require('backbone.radio').channel('global'); -var JSON = window.JSON; +var ErrorView = require('./error/view'); -// css classes -Modal.baseClassNames = { +// change Vex default options +_.extend( Modal.defaultOptions, { + showCloseButton : false, + overlayClosesOnClick : false +}); + +// change Vex default css classes +_.extend( Modal.baseClassNames, { vex : prefix, content : prefix + '-content', overlay : prefix + '-overlay', close : prefix + '-close', closing : prefix + '-closing', open : prefix + '-open' -}; - -/* jshint -W071, -W074 */ -var parseXHR = function(xhr, statusText, thrownError) { - thrownError = thrownError || {}; - var options = { header: {} }; - - // header - if( _.isString(thrownError) ){ - options.header.title = thrownError; - } else { - options.header.title = (thrownError.title || statusText); - } - - // message - options.message = thrownError.message || _.get( - xhr, - ['responseJSON', 'errors', 0, 'message'], - JSON.stringify(xhr.responseText) - ); - - // raw output - if (options.message !== xhr.responseText) { - options.raw = xhr.responseText; - } - - return options; -}; -/* jshint +W071, +W074 */ +}); module.exports = Service.extend({ channelName: 'modal', initialize: function(){ + + /** + * Modals can be requested directly + */ this.channel.reply({ open : this.open, close : this.close, error : this.error }, this); - // global error messages - globalChannel.on({ - 'error' : this.error + /** + * or triggered on the global channel + * - error on global channel could be used by another service, eg: Logger + */ + Radio.channel('global').on({ + error : this.error }, this); + }, + /** + * Open modal + */ + /* jshint -W074 */ open: function(options){ - options = this.parseOptions( options ); + options = options || {}; - options = _.extend( { - showCloseButton : false, - overlayClosesOnClick : false - }, options ); - - var afterOpen = options.afterOpen; - options.afterOpen = function( $el, opts ){ - opts.el = $el; + if( _.isString(options) || options instanceof bb.View ){ + options = { view: options }; + } - // @todo pass smaller options object to Layout - opts.layout = new Layout( opts ); - if(afterOpen){ - afterOpen( $el, opts ); - } + options.afterOpen = options.afterOpen || function( $el, opts ){ + opts.layout = new Layout({ + el : $el, + view : options.view, + prefix : prefix + }); + opts.layout.render(); }; return Modal.open( options ); }, + /* jshint -W074 */ close: function( id ){ return Modal.close( id ); }, - alert: function(){ - - }, - - confirm: function(){ - - }, - - prompt: function(){ - - }, - - error: function( options ){ - options = _.extend( { - className : App.prototype.namespace('error'), - footer : { - buttons: [ - { - action: 'close' - } - ] - } - }, this.parseOptions( options ) ); - return this.open( options ); - }, - - /* jshint -W074 */ - parseOptions: function( options ) { - // simple message - if ( _.isString(options) ) { - options = {message: options}; - } - - // backbone view - else if (options instanceof bb.View) { - options = {view: options}; - } - - // errors thrown by idb-wrapper, handlebars - else if (window.Error && options instanceof window.Error) { - options = { - header: { - title: options.name || 'Error' - }, - message: options.message - }; - } - - // other objects - else if ( _.isObject(options) ) { - options = this._parseObject(options); - } - - return options; - }, - /* jshint +W074 */ - - _parseObject: function(options){ - var err = _.get(options, ['target', 'error']); - - // errors thrown by indexedDB - if (window.DOMError && err instanceof window.DOMError) { - options = { - header: { - title: err.name - }, - message: err.message - }; - } - - // backbone sync error - else if (options.xhr) { - options = parseXHR( - options.xhr, options.statusText, options.thrownError - ); - } - - // raw jqXHR - else if (options.readyState) { - options = parseXHR(options); - } - - return options; + /** + * error modal + */ + error: function( error ){ + var view = new ErrorView({ + error: error + }); + return this.open({ + view: view, + className: prefix + '-error' + }); } }); \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/old_views/tab.hbs b/assets/js/src/lib/components/tabs/old_views/tab.hbs deleted file mode 100644 index c5ed397d..00000000 --- a/assets/js/src/lib/components/tabs/old_views/tab.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{#unless fixed}} - - - -{{/unless}} -{{{ label }}} \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/old_views/tab.js b/assets/js/src/lib/components/tabs/old_views/tab.js deleted file mode 100644 index b794181a..00000000 --- a/assets/js/src/lib/components/tabs/old_views/tab.js +++ /dev/null @@ -1,46 +0,0 @@ -var hbs = require('handlebars'); -var ItemView = require('lib/config/item-view'); -var Tmpl = require('./tab.hbs'); - -var View = ItemView.extend({ - - tagName: 'li', - - template: hbs.compile(Tmpl), - - activeClassName: 'active', - - initialize: function( options ){ - this.mergeOptions( options, ['activeClassName'] ); - - // add active className - if( this.model.get('active') ){ - this.$el.addClass( this.activeClassName ); - } - }, - - modelEvents: { - 'change:active': 'toggleActive', - 'change:label' : 'render' // why does this not auto render?! - }, - - toggleActive: function(){ - this.$el.toggleClass(this.activeClassName, this.model.get('active')); - }, - - triggers: { - 'click': 'tab:clicked', - 'click *[data-action="remove"]': 'remove:tab' - }, - - onTabClicked: function () { - this.model.set({active: true}); - }, - - onRemoveTab: function(){ - this.model.collection.remove(this.model); - } - -}); - -module.exports = View; \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/old_views/tabs.js b/assets/js/src/lib/components/tabs/old_views/tabs.js deleted file mode 100644 index f91c4184..00000000 --- a/assets/js/src/lib/components/tabs/old_views/tabs.js +++ /dev/null @@ -1,32 +0,0 @@ -var CollectionView = require('lib/config/collection-view'); -var Tab = require('./tab'); - -var View = CollectionView.extend({ - - tagName: 'ul', - - childView: Tab, - - attributes: { - 'class' : 'tabs', - 'role' : 'tablist' - }, - - setActive: function(id){ - var model = this.collection.get(id); - model.set({active: true}); - }, - - setLabel: function(options){ - options = options || {}; - var model = this.collection.get(options.tab); - model.set({label: options.label}); - }, - - onShow: function(){ - // last call for active tabs - this.collection.ensureActiveTab(); - } -}); - -module.exports = View; \ No newline at end of file diff --git a/assets/js/src/lib/config/ajax.js b/assets/js/src/lib/config/ajax.js index eb585df8..2bb8c9e1 100644 --- a/assets/js/src/lib/config/ajax.js +++ b/assets/js/src/lib/config/ajax.js @@ -14,12 +14,9 @@ var setHeaders = function(xhr){ } }; -var onError = function(xhr, statusText, thrownError){ - Radio.request('modal', 'error', { - xhr: xhr, - statusText: statusText, - thrownError: thrownError - }); +var onError = function(){ + var args = Array.prototype.slice.call(arguments); + Radio.trigger('global', 'error', args); }; // remove comments, eg: WP Super Cache diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index c148a0b3..db5e28ac 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -7,32 +7,6 @@ var Collection = require('./collection'); var app = require('./application'); var IndexedDB = require('./idb/src/idb'); var Radio = require('backbone.radio'); -var polyglot = require('lib/utilities/polyglot'); -var _ = require('lodash'); - -var parseError = function( error ){ - - // errors thrown by idb-wrapper - if( window.Error && error instanceof window.Error ){ - return { - header: { - title: 'IDBError' - }, - message: error.message - }; - } - - // errors thrown by indexedDB - var err = _.get(error, ['target', 'error']); - if( window.DOMError && err instanceof window.DOMError ){ - return { - header: { - title: err.name - }, - message: err.message - }; - } -}; module.exports = app.prototype.IndexedDBCollection = Collection.extend({ name : 'store', @@ -56,8 +30,7 @@ module.exports = app.prototype.IndexedDBCollection = Collection.extend({ autoIncrement : this.autoIncrement, indexes : this.indexes, defaultErrorHandler : function(error){ - var result = parseError(error); - Radio.trigger('global', 'error', result); + Radio.trigger('global', 'error', error); } }; @@ -66,9 +39,7 @@ module.exports = app.prototype.IndexedDBCollection = Collection.extend({ this.db.open() // error opening db .fail(function(error){ - var result = parseError(error); - result.message += ' ' + polyglot.t('messages.private-browsing'); - Radio.trigger('global', 'error', result); + Radio.trigger('global', 'error', error); }); }, diff --git a/assets/js/src/lib/config/module.js b/assets/js/src/lib/config/module.js deleted file mode 100644 index 1aa75bef..00000000 --- a/assets/js/src/lib/config/module.js +++ /dev/null @@ -1,24 +0,0 @@ -var bb = require('backbone'); -var Mn = require('backbone.marionette'); -var app = require('./application'); - -module.exports = app.prototype.Module = Mn.Module.extend({ - constructor: function() { - this.listenTo(bb.history, 'route', this._onHistoryRoute); - Mn.Module.apply(this, arguments); - }, - - initialize: function() {}, - - _onHistoryRoute: function(router) { - if (!this.router) { - return; - } - - if (this.router && this.router === router) { - this.start(); - } else { - this.stop(); - } - } -}); \ No newline at end of file diff --git a/assets/js/src/lib/config/sync.js b/assets/js/src/lib/config/sync.js index b47084df..db16c9e9 100644 --- a/assets/js/src/lib/config/sync.js +++ b/assets/js/src/lib/config/sync.js @@ -11,10 +11,10 @@ module.exports = function(method, entity, options) { // wrap sync errors, kick to error modal var onError = options.error; - options.error = function( xhr, textStatus, errorThrown ){ - App.prototype._onError( xhr, textStatus, errorThrown ); + options.error = function(){ + App.prototype._onError.apply(this, arguments); if(onError) { - onError.call(options.context, xhr, textStatus, errorThrown); + onError.apply(options.context, arguments); } }; diff --git a/includes/api/class-wc-pos-i18n.php b/includes/api/class-wc-pos-i18n.php index 99e76e0d..ef48921d 100644 --- a/includes/api/class-wc-pos-i18n.php +++ b/includes/api/class-wc-pos-i18n.php @@ -91,6 +91,8 @@ private function plural(){ private function common_titles(){ return array( 'more-info' => __( 'More info', 'woocommerce-pos' ), + /* translators: woocommerce */ + 'error' => __( 'Error', 'woocommerce' ), ); } diff --git a/includes/api/class-wc-pos-payload.php b/includes/api/class-wc-pos-payload.php index 1a642a5c..4f6c3aae 100644 --- a/includes/api/class-wc-pos-payload.php +++ b/includes/api/class-wc-pos-payload.php @@ -27,7 +27,7 @@ class WC_POS_API_Payload extends WC_API_Resource { */ public function register_routes( array $routes ) { - # GET /pos/params + # GET /pos $routes[ $this->base ] = array( array( array( $this, 'get_payload' ), WC_API_Server::READABLE ) ); diff --git a/tests/unit/js/spec/lib/components/modal/error/parser.spec.js b/tests/unit/js/spec/lib/components/modal/error/parser.spec.js new file mode 100644 index 00000000..a788fae4 --- /dev/null +++ b/tests/unit/js/spec/lib/components/modal/error/parser.spec.js @@ -0,0 +1,83 @@ +describe('lib/components/modal/error/parser.js', function () { + + var parser = require('lib/components/modal/error/parser'); + + var wooErrorJSON = { + errors: [{ + code: 'woocommerce_api_error', + message: 'WooCommerce REST API error' + }] + }; + + // mock Woo API error + var wooErrorArgs = [{ + statusText: 'Not Found', + responseJSON: wooErrorJSON, + responseText: window.JSON.stringify(wooErrorJSON), + promise: function(){}, + setRequestHeader: function(){} + }, 'error', 'Not Found']; + + // mock jQuery AJAX parse error + var parseError = [{ + statusText: 'OK', + responseText: '
      PHP error', + promise: function(){}, + setRequestHeader: function(){} + }, 'parsererror', new SyntaxError( 'Unexpected token <' )]; + + // mock idb-wrapper error + var idbWrapperError = new Error('The version number provided is lower than the existing one.'); + + // mock IDBTransaction error in Firefox + var errorEvent = { + target: { + error: { + message: 'A mutation operation was attempted on a database that did not allow mutations.', + name: 'InvalidStateError' + } + } + } + + + it('should return an object', function(){ + expect( parser() ).eqls({}); + }); + + it('should parse a simple string error', function(){ + expect( parser('Hello World') ).eqls({ + message: 'Hello World' + }); + }); + + it('should parse a Woo REST API error', function(){ + expect( parser( wooErrorArgs ) ).eqls({ + title: 'Not Found', + message: ['WooCommerce REST API error'], + raw: window.JSON.stringify(wooErrorJSON) + }); + }); + + it('should parse a syntax error, ie: PHP error message in API response', function(){ + expect( parser( parseError ) ).eqls({ + title: 'SyntaxError', + message: 'Unexpected token <', + raw: '
      PHP error' + }); + }); + + it('should parse an error from idb-wrapper', function(){ + expect( parser( idbWrapperError ) ).eqls({ + title: 'Error', + message: 'The version number provided is lower than the existing one.' + }); + }); + + it('should parse an Event error, eg: IDBTransaction', function(){ + expect( parser( errorEvent ) ).eqls({ + title: 'InvalidStateError', + message: 'A mutation operation was attempted on a database that did not allow mutations. messages.private-browsing' + }); + }); + +}); \ No newline at end of file From f4285b55505e8a9f4bdbb21c9ab68372ce9564e4 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 11 Feb 2016 21:16:41 +0800 Subject: [PATCH 027/169] Add support for gateway integrations --- .travis.yml | 3 +- .../src/scss/partials/admin/_settings.scss | 10 +- .../js/src/apps/pos/checkout/integrations.js | 36 ++++ assets/js/src/apps/pos/checkout/route.js | 79 +++++---- .../pos/checkout/views/gateways/drawer.js | 41 ++--- .../js/src/apps/pos/checkout/views/status.js | 5 +- assets/js/src/apps/pos/receipt/route.js | 1 - assets/js/src/apps/settings/receipts/route.js | 37 +++-- .../settings/receipts/template/actions.js | 2 +- assets/js/src/apps/settings/router.js | 42 +++-- assets/js/src/apps/status/router.js | 40 +++-- .../status/tools/modal/delete-local-data.js | 1 - .../status/tools/modal/translation-update.js | 27 ++- assets/js/src/apps/status/tools/route.js | 3 +- assets/js/src/entities/cart/models/fee.js | 1 + assets/js/src/entities/cart/models/product.js | 3 +- .../js/src/entities/cart/models/shipping.js | 1 + assets/js/src/entities/gateways/collection.js | 2 +- assets/js/src/entities/orders/model.js | 94 +++++------ assets/js/src/entities/settings/collection.js | 6 - assets/js/src/lib/behaviors/emulateHTTP.js | 9 +- .../src/lib/components/modal/error/error.hbs | 10 +- .../src/lib/components/modal/error/parser.js | 15 +- .../js/src/lib/components/modal/error/view.js | 4 +- assets/js/src/lib/components/modal/service.js | 5 +- .../js/src/lib/components/tabs/views/tab.js | 8 + .../js/src/lib/components/tabs/views/tabs.hbs | 2 +- .../js/src/lib/components/tabs/views/tabs.js | 17 +- assets/js/src/lib/config/dual-model.js | 15 +- assets/js/src/lib/config/router.js | 1 + assets/js/src/lib/config/template-cache.js | 3 +- includes/api/class-wc-pos-orders.php | 39 ++--- includes/class-wc-pos-api.php | 2 +- readme.txt | 2 +- .../integration/php/spec/api/test-orders.php | 39 ++++- .../spec/entities/cart/models/product.spec.js | 4 +- .../js/spec/entities/orders/model.spec.js | 157 +++++++++--------- 37 files changed, 432 insertions(+), 334 deletions(-) create mode 100644 assets/js/src/apps/pos/checkout/integrations.js diff --git a/.travis.yml b/.travis.yml index 0521ca71..b7bb3d1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: php php: - - 5.4 + - '5.4' + - '7.0' addons: hosts: diff --git a/assets/css/src/scss/partials/admin/_settings.scss b/assets/css/src/scss/partials/admin/_settings.scss index fbf0acd9..77a9c41f 100644 --- a/assets/css/src/scss/partials/admin/_settings.scss +++ b/assets/css/src/scss/partials/admin/_settings.scss @@ -19,15 +19,11 @@ settings { .nav-tab-wrapper { border-bottom: 1px solid $settings-border-color; - //padding: 9px 15px 0 0; - //line-height: inherit; } - //.nav-tab { - // &:hover, &:active, &:focus { - // outline: 0; - // } - //} + .nav-tab-active:focus { + @include box-shadow(none); + } } diff --git a/assets/js/src/apps/pos/checkout/integrations.js b/assets/js/src/apps/pos/checkout/integrations.js new file mode 100644 index 00000000..e2993b59 --- /dev/null +++ b/assets/js/src/apps/pos/checkout/integrations.js @@ -0,0 +1,36 @@ +var Service = require('lib/config/service'); +var App = require('lib/config/application'); +var debug = require('debug'); + +var Integration = Service.extend({ + + channelName: 'checkout', + + constructor: function(){ + Service.apply( this, arguments ); + if( ! this.id ){ + throw new Error('Gateway id required'); + } + + var events = {}; + this.debug = debug( this.id ); + + // gateway view events + events['gateway:' + this.id] = function( view ){ + view.once( 'show', this.onShow, this ); + view.once( 'destroy', this.onDestroy, this ); + }.bind(this); + + // process order button clicked + events['order:payment:' + this.id] = this.onSubmit; + + this.channel.on(events, this); + }, + + onShow: function(){}, + onDestroy: function(){}, + onSubmit: function(){} + +}); + +App.prototype.set('POSApp.Checkout.Integration', Integration); \ No newline at end of file diff --git a/assets/js/src/apps/pos/checkout/route.js b/assets/js/src/apps/pos/checkout/route.js index 76ce455d..6620c526 100644 --- a/assets/js/src/apps/pos/checkout/route.js +++ b/assets/js/src/apps/pos/checkout/route.js @@ -6,6 +6,7 @@ var StatusView = require('./views/status'); var GatewaysView = require('./views/gateways'); var polyglot = require('lib/utilities/polyglot'); var Radio = require('backbone.radio'); +require('./integrations'); var CheckoutRoute = Route.extend({ @@ -22,34 +23,36 @@ var CheckoutRoute = Route.extend({ } }, - onFetch: function(id){ + /** + * + */ + render: function( id ){ this.activeOrder = this.collection.get(id); - if( this.activeOrder && ! this.activeOrder.isEditable() ){ - this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + if( ! this.activeOrder ){ + // return to cart + return this.navigate('cart', { trigger: true }); } - if(this.activeOrder){ - this.listenTo( this.activeOrder, 'change:status', function(model){ - if(!model.isEditable() && model.get('status') !== 'failed'){ - this.navigate('receipt/' + model.id, { trigger: true }); - } - }); + if( ! this.activeOrder.isEditable() ){ + // go to receipts + return this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); } - }, - render: function(){ this.layout = new LayoutView(); - - this.listenTo( this.layout, 'show', function(){ - this.showStatus(); - this.showGateways(); - this.showActions(); - }); - + this.listenTo( this.layout, 'show', this.onShow ); this.container.show(this.layout); }, + /** + * + */ + onShow: function(){ + this.showStatus(); + this.showGateways(); + this.showActions(); + }, + showStatus: function(){ var view = new StatusView({ model: this.activeOrder @@ -84,26 +87,46 @@ var CheckoutRoute = Route.extend({ 'action:process-payment': function(btn){ btn.trigger('state', 'loading'); + // options object + // - may be extended by gateway + var self = this, options = { remote: true }; + // alert third party plugins that gateway has init if( this.activeOrder.gateways ){ var gateway = this.activeOrder.gateways.getActiveGateway(); var trigger = 'order:payment:' + gateway.id; - Radio.trigger('checkout', trigger, this.activeOrder ); + Radio.trigger('checkout', trigger, this.activeOrder, options ); } - var always = function(){ - btn.trigger('state', 'reset'); - }; - - this.activeOrder.save({}, { - remote: true, - success: always, - error: always - }); + // now save + this.activeOrder.save({}, options) + .done( self.onProcessPayment.bind(this) ) + .always( function(){ + btn.trigger('state', 'reset'); + }); } }); this.layout.getRegion('actions').show(view); + }, + + /** + * + */ + onProcessPayment: function(){ + + if( this.activeOrder.get('status') !== 'failed' ){ + // order has been processed, go to receipt + return this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + } + + // silently save, will change status to UPDATE_FAILED + this.activeOrder.save( {}, { silent: true } ); + + Radio.trigger('global', 'error', { + title: 'Payment Error', + message: this.activeOrder.get('payment_details.message') + }); } }); diff --git a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js index 8aadd500..6d7082c3 100644 --- a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js +++ b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js @@ -16,13 +16,18 @@ var View = FormView.extend({ style: 'display:none' // start drawer closed }, + constructor: function( options ){ + options = options || {}; + if( options.model ){ + Radio.trigger( 'checkout', 'gateway:' + options.model.id, this ); + } + FormView.apply( this, arguments ); + }, + initialize: function() { this.template = hbs.compile( this.model.getPaymentFields() ); this.order_total = this.model.collection.order.get('total'); this.updateStatusMessage(); - - // alert third party plugins that gateway has init - Radio.trigger( 'checkout', 'gateway:init:' + this.model.id, this ); }, templateHelpers: function(){ @@ -111,9 +116,7 @@ var View = FormView.extend({ }, onShow: function() { - // allow third party to setup before show - $.when( this.deferShow.call( this ) ) - .then( this.slideDown.bind(this) ); + this.$el.slideDown(250); if(window.Modernizr.touch){ this.$('#pos-cash-tendered').attr('readonly', true); @@ -121,20 +124,10 @@ var View = FormView.extend({ } }, - slideDown: function(){ - this.$el.slideDown(250); - }, - remove: function() { - // allow third party to setup before remove - this.slideUp(); - - $.when( this.deferRemove.call( this ) ) - .then( FormView.prototype.remove.bind(this) ); - }, - - slideUp: function(){ - return this.$el.slideUp( 250 ); + this.$el.slideUp( 250, function() { + FormView.prototype.remove.call(this); + }.bind(this)); }, calcChange: function(tendered){ @@ -143,17 +136,11 @@ var View = FormView.extend({ this.model.set({ message: msg, 'pos-cash-change': change }); }, - updateStatusMessage: function(){ + updateStatusMessage: function() { this.model.collection.order.set({ 'payment_details.message': this.model.get('message') }); - }, - - /** - * Allow third party gateways to setup, teardown and submit payment details - */ - deferShow: function(){}, - deferRemove: function(){} + } }); diff --git a/assets/js/src/apps/pos/checkout/views/status.js b/assets/js/src/apps/pos/checkout/views/status.js index 14bede52..c8371e74 100644 --- a/assets/js/src/apps/pos/checkout/views/status.js +++ b/assets/js/src/apps/pos/checkout/views/status.js @@ -7,11 +7,8 @@ var Tmpl = require('./status.hbs'); var _ = require('lodash'); var View = ItemView.extend({ - template: hbs.compile(Tmpl), - - initialize: function(){ - }, + template: hbs.compile(Tmpl), templateHelpers: function(){ return { diff --git a/assets/js/src/apps/pos/receipt/route.js b/assets/js/src/apps/pos/receipt/route.js index 6b0589aa..f5ad4fb2 100644 --- a/assets/js/src/apps/pos/receipt/route.js +++ b/assets/js/src/apps/pos/receipt/route.js @@ -33,7 +33,6 @@ var ReceiptRoute = Route.extend({ onFetch: function(id){ this.order = this.collection.get(id); - this.order.clearCart(); // redirect, ie: offsite payment var redirect = this.order.get('payment_details.redirect'); diff --git a/assets/js/src/apps/settings/receipts/route.js b/assets/js/src/apps/settings/receipts/route.js index b2a2274f..2415c720 100644 --- a/assets/js/src/apps/settings/receipts/route.js +++ b/assets/js/src/apps/settings/receipts/route.js @@ -34,29 +34,30 @@ var Receipts = Route.extend({ }, showSectionTabs: function(){ + + // check hash and set tab active + var activeId = _.invert( hashMap )[ bb.history.getHash() ] || + 'receipt_options'; + var view = Radio.request('tabs', 'view', { - tabs: _.map( this.model.sections, + collection: _.map( this.model.sections, _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) ), - adminSubTabs: true + tabsClassName: 'wc_pos-sub-nav-tab-wrapper', + activeClassName: 'wc_pos-sub-nav-tab-active', + childViewOptions: function( model ){ + var options = { + className: 'wc_pos-sub-nav-tab' + }; + if( model.id === activeId ){ + options.className += ' wc_pos-sub-nav-tab-active'; + } + return options; + } }); - // check hash and set tab active - var activeTab = view.collection.get( - _.invert( hashMap )[ bb.history.getHash() ] - ); - if( activeTab ){ - activeTab.set({ active: true }); - } else { - view.collection.at(0).set({ active: true }); - } - - this.listenTo(view.collection, 'change:active', function(model, active){ - if(active){ - this.navigate(hashMap[model.id], { - trigger: true - }); - } + this.listenTo(view, 'childview:click', function(view){ + this.navigate(hashMap[view.model.id], { trigger: true }); }); this.layout.getRegion('tabs').show(view); diff --git a/assets/js/src/apps/settings/receipts/template/actions.js b/assets/js/src/apps/settings/receipts/template/actions.js index d24c5edf..cb1ff0f0 100644 --- a/assets/js/src/apps/settings/receipts/template/actions.js +++ b/assets/js/src/apps/settings/receipts/template/actions.js @@ -2,7 +2,7 @@ var View = require('lib/config/item-view'); var Actions = View.extend({ template: function(){ - return 'Print'; + return 'Print'; }, ui: { diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index a60b5c5f..71a05fbb 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -43,26 +43,38 @@ var SettingsRouter = Router.extend({ }, showTabs: function(){ - // this.tabsArray is added during POS.onBeforeStart - var view = Radio.request('tabs', 'view', { - tabs: this.collection.tabsArray, - adminTabs: true + var settings = Radio.request('entities', 'get', { + type: 'option', + name: 'settings' }); - // check hash and set tab active - var activeTab = view.collection.get( bb.history.getHash().split('/')[0] ); - if( activeTab ){ - activeTab.set({ active: true }, { silent: true }); - } - - this.listenTo(view.collection, 'change:active', function(model, active){ - if(active){ - this.navigate(model.id, { - trigger: true - }); + // get active tab from url fragment + var activeId = bb.history.getHash().split('/')[0] || 'general'; + + // pass id & label collection to tabs + var view = Radio.request('tabs', 'view', { + collection: _.map( settings, + _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) + ), + tabsTagName: 'div', + tabsClassName: 'nav-tab-wrapper', + activeClassName: 'nav-tab-active', + childViewOptions: function( model ){ + var options = { + tagName: 'a', + className: 'nav-tab' + }; + if( model.id === activeId ){ + options.className += ' nav-tab-active'; + } + return options; } }); + this.listenTo(view, 'childview:click', function(view){ + this.navigate(view.model.id, { trigger: true }); + }); + this.layout.getRegion('tabs').show(view); }, diff --git a/assets/js/src/apps/status/router.js b/assets/js/src/apps/status/router.js index ec1fa760..8d7f1f25 100644 --- a/assets/js/src/apps/status/router.js +++ b/assets/js/src/apps/status/router.js @@ -4,7 +4,8 @@ var LayoutView = require('./layout-view'); var Tools = require('./tools/route'); var Status = require('./status/route'); var bb = require('backbone'); -var Radio = bb.Radio; +var _ = require('lodash'); +var Radio = require('backbone.radio'); var StatusRouter = Router.extend({ initialize: function(options) { @@ -32,21 +33,38 @@ var StatusRouter = Router.extend({ }, showTabs: function(){ - // this.tabsArray is added during POS.onBeforeStart - var view = Radio.request('tabs', 'view', { - tabs: this.collection.tabsArray, - adminTabs: true + var settings = Radio.request('entities', 'get', { + type: 'option', + name: 'settings' }); - this.listenTo(view.collection, 'change:active', function(model, active){ - if(active){ - this.navigate(model.id, { - trigger: true, - replace: true - }); + // get active tab from url fragment + var activeId = bb.history.getHash().split('/')[0] || 'general'; + + // pass id & label collection to tabs + var view = Radio.request('tabs', 'view', { + collection: _.map( settings, + _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) + ), + tabsTagName: 'div', + tabsClassName: 'nav-tab-wrapper', + activeClassName: 'nav-tab-active', + childViewOptions: function( model ){ + var options = { + tagName: 'a', + className: 'nav-tab' + }; + if( model.id === activeId ){ + options.className += ' nav-tab-active'; + } + return options; } }); + this.listenTo(view, 'childview:click', function(view){ + this.navigate(view.model.id, { trigger: true }); + }); + this.layout.getRegion('tabs').show(view); }, diff --git a/assets/js/src/apps/status/tools/modal/delete-local-data.js b/assets/js/src/apps/status/tools/modal/delete-local-data.js index 3e1c6b99..d7883f35 100644 --- a/assets/js/src/apps/status/tools/modal/delete-local-data.js +++ b/assets/js/src/apps/status/tools/modal/delete-local-data.js @@ -27,7 +27,6 @@ module.exports = ItemView.extend({ title: options.title }, footer: { - show: false, buttons: [{ action: 'close', className: 'button' diff --git a/assets/js/src/apps/status/tools/modal/translation-update.js b/assets/js/src/apps/status/tools/modal/translation-update.js index 31c81128..4d68ee59 100644 --- a/assets/js/src/apps/status/tools/modal/translation-update.js +++ b/assets/js/src/apps/status/tools/modal/translation-update.js @@ -2,6 +2,16 @@ var ItemView = require('lib/config/item-view'); var Radio = require('backbone.radio'); var EventSource = global['EventSource']; +var constructURL = function(){ + var nonce = Radio.request('entities', 'get', { + type: 'option', + name: 'nonce' + }); + return window.ajaxurl + + '?action=wc_pos_update_translations&security=' + + nonce; +}; + module.exports = ItemView.extend({ template: function(){ return ''; @@ -15,7 +25,6 @@ module.exports = ItemView.extend({ title: options.title }, footer: { - show: false, buttons: [{ action: 'close', className: 'button' @@ -30,11 +39,11 @@ module.exports = ItemView.extend({ onShow: function() { var view = this, - url = this.constructURL(), + url = constructURL(), stream = new EventSource(url); - stream.onerror = function(){ - Radio.request('modal', 'error', 'EventSource error'); + stream.onerror = function( error ){ + Radio.trigger('global', 'error', error); }; stream.onmessage = function(e){ @@ -47,15 +56,5 @@ module.exports = ItemView.extend({ } }; - }, - - constructURL: function(){ - var nonce = Radio.request('entities', 'get', { - type: 'option', - name: 'nonce' - }); - return window.ajaxurl + - '?action=wc_pos_update_translations&security=' + - nonce; } }); \ No newline at end of file diff --git a/assets/js/src/apps/status/tools/route.js b/assets/js/src/apps/status/tools/route.js index fbf938f8..7d06d015 100644 --- a/assets/js/src/apps/status/tools/route.js +++ b/assets/js/src/apps/status/tools/route.js @@ -32,9 +32,10 @@ var Tools = Route.extend({ }); var modal = Radio.request('modal', 'open', view); + modal.getRegion('footerRegion').$el.hide(); this.listenTo( view, 'update:complete', function(){ - modal.currentView.getRegion('footerRegion').$el.show(); + modal.getRegion('footerRegion').$el.show(); }); }, diff --git a/assets/js/src/entities/cart/models/fee.js b/assets/js/src/entities/cart/models/fee.js index 5604fbd9..5b864c04 100644 --- a/assets/js/src/entities/cart/models/fee.js +++ b/assets/js/src/entities/cart/models/fee.js @@ -13,6 +13,7 @@ module.exports = Model.extend({ name: 'fee' }); return { + id : null, title : _.get( fee, 'name', polyglot.t('titles.fee') ), taxable : _.get( fee, 'taxable', true ), tax_class : _.get( fee, 'tax_class', '' ), diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js index 6b9cefa6..4a59d7f3 100644 --- a/assets/js/src/entities/cart/models/product.js +++ b/assets/js/src/entities/cart/models/product.js @@ -26,7 +26,8 @@ module.exports = Model.extend({ type: 'product', defaults: { - quantity: 1 + id : null, + quantity : 1 }, initialize: function(){ diff --git a/assets/js/src/entities/cart/models/shipping.js b/assets/js/src/entities/cart/models/shipping.js index d0dc59bd..038859bd 100644 --- a/assets/js/src/entities/cart/models/shipping.js +++ b/assets/js/src/entities/cart/models/shipping.js @@ -13,6 +13,7 @@ module.exports = Model.extend({ name: 'shipping' }); return { + id : null, method_title : _.get( shipping, 'name', polyglot.t('titles.shipping') ), method_id : _.get( shipping, 'method', '' ), taxable : _.get( shipping, 'taxable', true ), diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index 935e4550..84784038 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -19,7 +19,7 @@ module.exports = Collection.extend({ Collection.prototype.constructor.call(this, settings, options); - this.on( 'change:active', this.onChangeActive ); + this.on( 'change', this.onChangeActive ); if( models ){ this.set( models, { remove: false } ); diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 62592d94..6bd10cef 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -50,8 +50,13 @@ var OrderModel = DualModel.extend({ /** * Order saves on any change to cart, debounce total calcs and db saves + * - options.deferSave allows third party gateways to defer payment processing */ - save: _.debounce( function( attributes, options ){ + /* jshint -W074 */ + save: function( attributes, options ){ + options = options || {}; + options.deferSave = options.deferSave || _.noop; + var self = this; // Safari doesn't like empty keyPath, perhaps an autoincrement problem? // Set local_id as timestamp milliseconds @@ -64,22 +69,14 @@ var OrderModel = DualModel.extend({ this.updateTotals(); } - var self = this; - - // if remote save, let gateway do it's thing - - return $.when( this.deferSave.call(this) ) + return $.when( options.deferSave ) .then( function(){ debug('save order', self); return DualModel.prototype.save.call(self, attributes, options); }); - }, 20), - - /** - * Allow third party plugins to defer the order save - */ - deferSave: function(){}, + }, + /* jshint +W074 */ /** * Attach cart during parse @@ -88,8 +85,9 @@ var OrderModel = DualModel.extend({ parse: function(resp) { resp = DualModel.prototype.parse.call(this, resp); - if( resp && this.isEditable( resp.status ) ){ - resp.taxes = this.parseTaxRates( resp.taxes ); + // if open order with no cart, ie: new from idb or changed status + if( this.isEditable( resp.status ) && ! this.cart ){ + resp.taxes = this.attachTaxes( resp.taxes ); this.attachCart( resp ); this.attachGateways( resp ); } @@ -101,10 +99,6 @@ var OrderModel = DualModel.extend({ * Attach cart during parse, allows updates from server */ attachCart: function( attributes ){ - if( this.cart ){ - return; - } - this.cart = new Cart( null, { order: this } ); // add line_items, shipping_lines and fee_lines @@ -131,10 +125,6 @@ var OrderModel = DualModel.extend({ * Attach gateways */ attachGateways: function( attributes ){ - if( this.gateways ){ - return; - } - this.gateways = new Gateways( attributes.payment_details, { order: this } ); this.gateways.on( 'change', function(){ @@ -142,6 +132,36 @@ var OrderModel = DualModel.extend({ }, this ); }, + /** + * Attach taxes + * - parse tax_rates into bb Collections + * - set enabled = true for each rate + */ + attachTaxes: function( enabled_taxes ){ + var tax_rates = this.getSettings( 'tax_rates' ); + this.tax_rates = {}; + + // parse tax_rates + _.each( tax_rates, function( tax_rate, tax_class ){ + var taxes = new Taxes( tax_rate, { order: this } ); + taxes.toggleTaxes( enabled_taxes ); + this.tax_rates[ tax_class ] = taxes; + }, this); + + // exit early if attribute exists + if( enabled_taxes ){ + return enabled_taxes; + } + + // set enabled taxes + return _.reduce( tax_rates, function( obj, tax_rate ){ + _.each( tax_rate, function( tax, rate_id ){ + obj[ 'rate_' + rate_id ] = true; + } ); + return obj; + }, { all: true } ); + }, + /** * */ @@ -329,36 +349,6 @@ var OrderModel = DualModel.extend({ } }, - /** - * Setup tax data for this order - * - parse tax_rates into bb Collections - * - set enabled = true for each rate - */ - parseTaxRates: function( enabled_taxes ){ - var tax_rates = this.getSettings( 'tax_rates' ); - this.tax_rates = {}; - - // parse tax_rates - _.each( tax_rates, function( tax_rate, tax_class ){ - var taxes = new Taxes( tax_rate, { order: this } ); - taxes.toggleTaxes( enabled_taxes ); - this.tax_rates[ tax_class ] = taxes; - }, this); - - // exit early if attribute exists - if( enabled_taxes ){ - return enabled_taxes; - } - - // set enabled taxes - return _.reduce( tax_rates, function( obj, tax_rate ){ - _.each( tax_rate, function( tax, rate_id ){ - obj[ 'rate_' + rate_id ] = true; - } ); - return obj; - }, { all: true } ); - }, - /** * Check if tax rate is enabled by rate_id */ diff --git a/assets/js/src/entities/settings/collection.js b/assets/js/src/entities/settings/collection.js index 61e04ded..ff1194c9 100644 --- a/assets/js/src/entities/settings/collection.js +++ b/assets/js/src/entities/settings/collection.js @@ -20,12 +20,6 @@ module.exports = Collection.extend({ name: 'settings' }); - // tack on tabsArray, @todo find a better way - this.tabsArray = _.map( settings, - _.partial( _.ary(_.pick, 2), _, ['id', 'label'] ) - ); - - //models = this.parseSettings( settings ); options = _.extend( {}, options, { parse: true } ); return Collection.prototype.constructor.call(this, settings, options); diff --git a/assets/js/src/lib/behaviors/emulateHTTP.js b/assets/js/src/lib/behaviors/emulateHTTP.js index c09a1d1a..d3948ba5 100644 --- a/assets/js/src/lib/behaviors/emulateHTTP.js +++ b/assets/js/src/lib/behaviors/emulateHTTP.js @@ -24,19 +24,12 @@ var EmulateHTTP = Behavior.extend({ name: 'nonce' }); - $.getJSON( window.ajaxurl, { + App.prototype.getJSON( window.ajaxurl, { action: 'wc_pos_toggle_legacy_server', enable: $(e.target).data('action').split('-').pop() === 'enable', security: nonce }, function(){ window.location.reload(); - }) - .fail( function( xhr, statusText, thrownError ) { - Radio.request( 'modal', 'error', { - xhr: xhr, - statusText: statusText, - thrownError: thrownError - } ); }); } diff --git a/assets/js/src/lib/components/modal/error/error.hbs b/assets/js/src/lib/components/modal/error/error.hbs index 953a19e9..cfe10e9e 100644 --- a/assets/js/src/lib/components/modal/error/error.hbs +++ b/assets/js/src/lib/components/modal/error/error.hbs @@ -1,4 +1,12 @@ -

      {{{message}}}

      +{{#unless isArray}} +

      {{{message}}}

      +{{else}} +
        + {{#each message}} +
      • {{{this}}}
        • + {{/each}} +
      +{{/unless}} {{#if raw}}
      {{moreInfo}}
      diff --git a/assets/js/src/lib/components/modal/error/parser.js b/assets/js/src/lib/components/modal/error/parser.js index b41ec747..b310c1e4 100644 --- a/assets/js/src/lib/components/modal/error/parser.js +++ b/assets/js/src/lib/components/modal/error/parser.js @@ -22,7 +22,10 @@ var parseResponseJSON = function( json ){ */ /* jshint -W071, -W074 */ var parseObject = function( obj ){ - var result = {}; + var result = { + title: obj.title || obj.name, + message: obj.message + }; // looks like jqXHR if( obj.promise && obj.setRequestHeader ){ @@ -33,15 +36,7 @@ var parseObject = function( obj ){ }; } - // Error obj, used by idb-wrapper - if( _.isError( obj ) ){ - result = { - title: obj.name, - message: obj.message - }; - } - - // IndexedDB transaction errors and other Events + // Error Events if( obj.target && obj.target.error ){ result = { title: obj.target.error.name, diff --git a/assets/js/src/lib/components/modal/error/view.js b/assets/js/src/lib/components/modal/error/view.js index 64acdf84..076a135a 100644 --- a/assets/js/src/lib/components/modal/error/view.js +++ b/assets/js/src/lib/components/modal/error/view.js @@ -40,7 +40,9 @@ module.exports = ItemView.extend({ }, templateHelpers: function(){ - return this.error; + var isArray = _.isArray( this.error.message ) && + this.error.message.length > 1; + return _.extend( { isArray: isArray }, this.error ); } }); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/service.js b/assets/js/src/lib/components/modal/service.js index 311170af..8df5123b 100644 --- a/assets/js/src/lib/components/modal/service.js +++ b/assets/js/src/lib/components/modal/service.js @@ -68,12 +68,13 @@ module.exports = Service.extend({ opts.layout.render(); }; - return Modal.open( options ); + var modal = Modal.open( options ); + return modal.data().vex.layout; // return the LayoutView }, /* jshint -W074 */ close: function( id ){ - return Modal.close( id ); + Modal.close( id ); }, /** diff --git a/assets/js/src/lib/components/tabs/views/tab.js b/assets/js/src/lib/components/tabs/views/tab.js index c396a5f6..82f5d3bc 100644 --- a/assets/js/src/lib/components/tabs/views/tab.js +++ b/assets/js/src/lib/components/tabs/views/tab.js @@ -7,6 +7,14 @@ module.exports = ItemView.extend({ tagName: 'li', + attributes: function(){ + if( this.tagName === 'a' ){ + return { + href: '#' + }; + } + }, + template: hbs.compile(Tmpl), events: { diff --git a/assets/js/src/lib/components/tabs/views/tabs.hbs b/assets/js/src/lib/components/tabs/views/tabs.hbs index 5487c3f1..e25d301e 100644 --- a/assets/js/src/lib/components/tabs/views/tabs.hbs +++ b/assets/js/src/lib/components/tabs/views/tabs.hbs @@ -1 +1 @@ -
        \ No newline at end of file +<{{tabsTagName}} role="tablist" {{#if tabsClassName}}class="{{tabsClassName}}"{{/if}}> \ No newline at end of file diff --git a/assets/js/src/lib/components/tabs/views/tabs.js b/assets/js/src/lib/components/tabs/views/tabs.js index ab1612c2..8dd043b2 100644 --- a/assets/js/src/lib/components/tabs/views/tabs.js +++ b/assets/js/src/lib/components/tabs/views/tabs.js @@ -15,16 +15,20 @@ var Tabs = CompositeView.extend({ childView: Tab, attributes: { - 'class' : 'tabs' + 'class' : App.prototype.namespace('tabs') }, activeClassName: 'active', + tabsTagName: 'ul', + initialize: function(options){ options = options || {}; // store options this.mergeOptions(options, [ + 'tabsTagName', // childViewContainer tagName + 'tabsClassName', // childViewContainer tagName 'activeId', // current active model id 'activeClassName', // className for active tab 'label' // label string or function @@ -38,10 +42,17 @@ var Tabs = CompositeView.extend({ this.collection = new TabsCollection( options.collection ); }, + templateHelpers: function(){ + return { + tabsTagName: this.tabsTagName, + tabsClassName: this.tabsClassName + }; + }, + /** * Pick options to pass to childview */ - childViewOptions: function( model ){ + childViewOptions: function( model, idx ){ // pass default options var options = { activeClassName : 'active' @@ -53,7 +64,7 @@ var Tabs = CompositeView.extend({ } // init with active class - if( this.activeId === model.id ){ + if( ! this.activeId && idx === 0 || this.activeId === model.id ){ options.className = this.activeClassName; } diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index aedcfcd7..1f851169 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -1,7 +1,7 @@ var DeepModel = require('./deep-model'); var app = require('./application'); var _ = require('lodash'); -var debug = require('debug')('dualModel'); +//var debug = require('debug')('dualModel'); module.exports = app.prototype.DualModel = DeepModel.extend({ @@ -66,11 +66,10 @@ module.exports = app.prototype.DualModel = DeepModel.extend({ var m = method === 'patch' ? 'update' : method; this.setStatus(m); - return DeepModel.prototype.sync.call(this, m, model, opts) .then(function(){ if(options.remote){ - return model.remoteSync(method, model, options); + return model.remoteSync(null, model, options); } }); }, @@ -100,15 +99,7 @@ module.exports = app.prototype.DualModel = DeepModel.extend({ }, getMethod: function(){ - var status = this.get('status'); - var remoteMethod = _.findKey(this.states, function(state) { - return state === status; - }); - if(remoteMethod){ - return remoteMethod; - } else { - debug('No method given for remote sync'); - } + return _.invert( this.states )[ this.get('status') ]; }, merge: function(resp){ diff --git a/assets/js/src/lib/config/router.js b/assets/js/src/lib/config/router.js index 49652025..2175d875 100644 --- a/assets/js/src/lib/config/router.js +++ b/assets/js/src/lib/config/router.js @@ -92,4 +92,5 @@ module.exports = app.prototype.Router = Mn.AppRouter.extend({ }, triggerMethod: Mn.triggerMethod + }); \ No newline at end of file diff --git a/assets/js/src/lib/config/template-cache.js b/assets/js/src/lib/config/template-cache.js index eedf1cc5..380e8fec 100644 --- a/assets/js/src/lib/config/template-cache.js +++ b/assets/js/src/lib/config/template-cache.js @@ -13,8 +13,7 @@ Mn.TemplateCache.prototype.compileTemplate = function(rawTemplate) { try { return hbs.compile(rawTemplate); } catch(e) { - Radio.request('modal', 'error', e); - throw e; + Radio.trigger('global', 'error', e); } }; diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index a2c5e0ce..c599895d 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -56,7 +56,7 @@ public function register_routes( $routes ) { $routes = parent::register_routes( $routes ); # POST /orders//email/ - $routes[ $this->base . '/(?P\d+)/email/(?P.+)'] = array( + $routes[ $this->base . '/(?P\d+)/email/(?P.+)' ] = array( array( array( $this, 'wc_pos_api_email_receipt' ), WC_API_SERVER::CREATABLE | WC_API_Server::ACCEPT_DATA ) ); @@ -141,7 +141,7 @@ public function wc_pos_api_create_order_data(array $data){ * @return array */ public function wc_pos_api_edit_order_data(array $data, $order_id){ -// $this->delete_order_items($order_id); + $this->delete_order_items($order_id); return $this->wc_pos_api_create_order_data($data); } @@ -436,25 +436,25 @@ public function wc_pos_api_edit_order( $order_id ){ * @param $order_id * @param $data */ - public function wc_pos_api_process_payment( $order_id, $data ){ + public function wc_pos_api_process_payment( $order_id, $data ) { - if( !isset($data['payment_details']) ){ + if ( !isset( $data[ 'payment_details' ] ) ) { return; } // some gateways check if a user is signed in, so let's switch to customer $logged_in_user = get_current_user_id(); - $customer_id = isset( $data['customer_id'] ) ? $data['customer_id'] : 0 ; + $customer_id = isset( $data[ 'customer_id' ] ) ? $data[ 'customer_id' ] : 0; wp_set_current_user( $customer_id ); // load the gateways & process payment - $gateway_id = $data['payment_details']['method_id']; - add_filter('option_woocommerce_'. $gateway_id .'_settings', array($this, 'wc_pos_api_force_enable_gateway')); + $gateway_id = $data[ 'payment_details' ][ 'method_id' ]; + add_filter( 'option_woocommerce_' . $gateway_id . '_settings', array( $this, 'wc_pos_api_force_enable_gateway' ) ); $settings = WC_POS_Admin_Settings_Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); - if( isset( $gateways[ $gateway_id ] ) ) { - + if ( isset( $gateways[ $gateway_id ] ) ) { + do_action( 'woocommerce_pos_process_' . strtolower( $gateway_id ) . '_payment', $order_id, $data ); $response = $gateways[ $gateway_id ]->process_payment( $order_id ); if ( isset( $response[ 'result' ] ) && $response[ 'result' ] == 'success' ) { $this->wc_pos_api_payment_success( $gateway_id, $order_id, $response ); @@ -478,10 +478,11 @@ public function wc_pos_api_process_payment( $order_id, $data ){ * @param $data * @return mixed */ - public function wc_pos_api_force_enable_gateway($data){ - if(isset($data['enabled'])){ - $data['enabled'] = 'yes'; + public function wc_pos_api_force_enable_gateway($data) { + if ( isset( $data[ 'enabled' ] ) ) { + $data[ 'enabled' ] = 'yes'; } + return $data; } @@ -765,16 +766,16 @@ private function wc_pos_api_format_id( $id ){ * Delete all order items * @param $order_id */ - private function delete_order_items($order_id){ + private function delete_order_items($order_id) { global $wpdb; $order_item_ids = $wpdb->get_col( $wpdb->prepare( " - SELECT order_item_id - FROM {$wpdb->prefix}woocommerce_order_items - WHERE order_id = %d - ", $order_id ) ); + SELECT order_item_id + FROM {$wpdb->prefix}woocommerce_order_items + WHERE order_id = %d + ", $order_id ) ); - foreach($order_item_ids as $item_id){ - wc_delete_order_item($item_id); + foreach ( $order_item_ids as $item_id ) { + wc_delete_order_item( $item_id ); } } diff --git a/includes/class-wc-pos-api.php b/includes/class-wc-pos-api.php index a5fe41ff..0420ca66 100644 --- a/includes/class-wc-pos-api.php +++ b/includes/class-wc-pos-api.php @@ -91,7 +91,7 @@ public function wc_api_authentication() { } /** - * @todo this is a total hack, need to find a way to customise bb remote sync + * @todo this is a total hack, need to customise bb remote sync * * @param $args * @param $callback diff --git a/readme.txt b/readme.txt index e236e817..866adf6f 100644 --- a/readme.txt +++ b/readme.txt @@ -25,7 +25,7 @@ You can see a demo of the WooCommerce POS plugin in action by going to [http://d = REQUIREMENTS = * WooCommerce >= 2.3.7 -* PHP 5.4+ +* PHP >= 5.4, [PHP 7 or HHVM give best performance](http://talks.php.net/oz15#/wpbench) * [A modern browser](http://woopos.com.au/faq/browser-compatibility/) * [A good web host](http://woopos.com.au/wpe) diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index 4dd44367..d8bb736f 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -118,7 +118,7 @@ public function test_edit_order(){ /** * */ - public function test_order_with_product(){ + public function test_create_order_with_product(){ // get a random product $product = $this->get_random_product(); @@ -140,6 +140,43 @@ public function test_order_with_product(){ $this->assertEquals(1, $data['order']['total_line_items_quantity']); } + /** + * + */ +// public function test_edit_order_with_product(){ +// // get a random product +// $product = $this->get_random_product(); +// +// // filter product +// $product = $this->filter_line_item($product); +// +// // create order +// $response = $this->client->post('', array( +// 'json' => array( +// 'status' => 'CREATE_FAILED', +// 'line_items' => array( +// $product +// ) +// ) +// )); +// $this->assertEquals(201, $response->getStatusCode()); +// +// // now edit order +// $response = $this->client->post('', array( +// 'json' => array( +// 'status' => 'CREATE_FAILED', +// 'line_items' => array( +// $product +// ) +// ) +// )); +// +// $this->assertEquals(201, $response->getStatusCode()); +// $data = $response->json(); +// $this->assertArrayHasKey('order', $data); +// $this->assertEquals(1, $data['order']['total_line_items_quantity']); +// } + /** * Test (int) stock adjustment * - note that payment must be complete to trigger the stock adjustment diff --git a/tests/unit/js/spec/entities/cart/models/product.spec.js b/tests/unit/js/spec/entities/cart/models/product.spec.js index aa36cc00..600c7e46 100644 --- a/tests/unit/js/spec/entities/cart/models/product.spec.js +++ b/tests/unit/js/spec/entities/cart/models/product.spec.js @@ -37,7 +37,7 @@ describe('entities/cart/models/product.js', function () { var model = new Model( product ); - expect(model.id).to.be.undefined; + expect(model.id).to.be.null; expect(model.get('title')).to.be.undefined; expect(model.get('name')).to.equal(product.title); @@ -54,7 +54,7 @@ describe('entities/cart/models/product.js', function () { var model = new Model( variation ); - expect(model.id).to.be.undefined; + expect(model.id).to.be.null; expect(model.get('meta')).to.eql([{ key: 1, label: 'Color', diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index 1d5c9047..4e8d8b1c 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -101,33 +101,33 @@ describe('entities/orders/model.js', function () { }); - it('should debounce save on add items to cart', function( done ){ - - // need to add editable order to attach gateways - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); - var model = new OrderModel( order, { parse: true } ); - - var callCount = 0; - - // Note: stubbing w/ my own function because sinon is weird with debounce - model.sync = function( method ){ - callCount++; - expect( method ).equals( 'update' ); - }; - - // trigger change - for( var i = 0; i < 10; i++ ){ - model.cart.add({ id: i }); - } - - expect( callCount ).equals( 0 ); - - setTimeout(function() { - expect( callCount ).equals( 1 ); - done(); - }, 150); - - }); + //it('should debounce save on add items to cart', function( done ){ + // + // // need to add editable order to attach gateways + // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var model = new OrderModel( order, { parse: true } ); + // + // var callCount = 0; + // + // // Note: stubbing w/ my own function because sinon is weird with debounce + // model.sync = function( method ){ + // callCount++; + // expect( method ).equals( 'update' ); + // }; + // + // // trigger change + // for( var i = 0; i < 10; i++ ){ + // model.cart.add({ id: i }); + // } + // + // expect( callCount ).equals( 0 ); + // + // setTimeout(function() { + // expect( callCount ).equals( 1 ); + // done(); + // }, 150); + // + //}); it('should save on remove item to cart', function( done ){ @@ -145,22 +145,22 @@ describe('entities/orders/model.js', function () { }); - it('should destroy order if cart is empty', function( done ){ - - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); - var model = new OrderModel( order, { parse: true } ); - - // Note: stubbing w/ my own function because sinon is weird with debounce - model.sync = function( method ){ - expect( method ).equals( 'delete' ); - done(); - }; - - while (cart_item = model.cart.first()) { - model.cart.remove(cart_item); - } - - }); + //it('should destroy order if cart is empty', function( done ){ + // + // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var model = new OrderModel( order, { parse: true } ); + // + // // Note: stubbing w/ my own function because sinon is weird with debounce + // model.sync = function( method ){ + // expect( method ).equals( 'delete' ); + // done(); + // }; + // + // while (cart_item = model.cart.first()) { + // model.cart.remove(cart_item); + // } + // + //}); it('should have a convience method to combine itemized taxes', function(){ @@ -305,26 +305,21 @@ describe('entities/orders/model.js', function () { }; // 2 x 546 - model.cart.add( { + model.cart.add( [{ id: 546, price: '21.99', regular_price: '21.99', tax_class: "reduced-rate", taxable: true, title: 'Premium Quality' - }, { parse: true } ); - - model.cart.add( { + }, { id: 546, price: '21.99', regular_price: '21.99', tax_class: 'reduced-rate', taxable: true, title: 'Premium Quality' - }, { parse: true } ); - - // 1 x 613 - model.cart.add( { + }, { id: 613, price: '19.99', regular_price: '19.99', @@ -335,7 +330,7 @@ describe('entities/orders/model.js', function () { name: 'Color', option: 'Black' }] - }, { parse: true } ); + }], { parse: true, silent: true } ); // 1 x shipping model.cart.add( { @@ -355,7 +350,7 @@ describe('entities/orders/model.js', function () { return dummy_tax_GB; } }; - expect( model.parseTaxRates() ).eqls({ + expect( model.attachTaxes() ).eqls({ all: true, rate_1: true, rate_2: true, @@ -371,7 +366,7 @@ describe('entities/orders/model.js', function () { return dummy_tax_GB; } }; - model.parseTaxRates(); + model.attachTaxes(); expect( model.getTaxRates('') ).eqls([{ rate_id: '1', rate: '20.0000', @@ -426,32 +421,32 @@ describe('entities/orders/model.js', function () { }); - it('should debounce save on changes to the gateways', function( done ){ - - // need to add editable order to attach gateways - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); - var model = new OrderModel( order, { parse: true } ); - - var callCount = 0; - - // Note: stubbing w/ my own function because sinon is weird with debounce - model.sync = function( method ){ - callCount++; - expect( method ).equals( 'update' ); - }; - - // trigger change - for( var i = 0; i < 10; i++ ){ - model.gateways.trigger('change'); - } - - expect( callCount ).equals( 0 ); - - setTimeout(function() { - expect( callCount ).equals( 1 ); - done(); - }, 150); - - }); + //it('should debounce save on changes to the gateways', function( done ){ + // + // // need to add editable order to attach gateways + // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var model = new OrderModel( order, { parse: true } ); + // + // var callCount = 0; + // + // // Note: stubbing w/ my own function because sinon is weird with debounce + // model.sync = function( method ){ + // callCount++; + // expect( method ).equals( 'update' ); + // }; + // + // // trigger change + // for( var i = 0; i < 10; i++ ){ + // model.gateways.trigger('change'); + // } + // + // expect( callCount ).equals( 0 ); + // + // setTimeout(function() { + // expect( callCount ).equals( 1 ); + // done(); + // }, 150); + // + //}); }); \ No newline at end of file From b2feb661e8e04b40e213166c31cef61c3dcc12e7 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 13 Feb 2016 21:58:31 +0800 Subject: [PATCH 028/169] fix php 7 test --- .travis.yml | 1 + assets/css/src/scss/partials/_checkout.scss | 13 +- .../css/src/scss/partials/_input-group.scss | 10 +- assets/css/src/scss/partials/_modal.scss | 1 + .../pos/checkout/views/gateways/drawer.js | 137 +++++----- .../pos/checkout/views/gateways/gateway.hbs | 1 + .../pos/checkout/views/gateways/gateway.js | 22 +- .../pos/checkout/views/gateways/layout.js | 37 +-- assets/js/src/apps/support/status/route.js | 6 +- assets/js/src/entities/gateways/collection.js | 11 +- assets/js/src/entities/gateways/model.js | 7 +- assets/js/src/lib/config/dual-collection.js | 4 +- includes/admin/settings/views/checkout.php | 4 +- includes/api/class-wc-pos-coupons.php | 31 ++- includes/api/class-wc-pos-customers.php | 72 ++--- includes/api/class-wc-pos-gateways.php | 45 +++- includes/api/class-wc-pos-orders.php | 247 ++++++++---------- includes/api/class-wc-pos-products.php | 70 ++--- includes/api/class-wc-pos-support.php | 5 +- includes/class-wc-pos-api.php | 20 +- .../js/spec/entities/gateways/model.spec.js | 2 +- 21 files changed, 393 insertions(+), 353 deletions(-) create mode 100644 assets/js/src/apps/pos/checkout/views/gateways/gateway.hbs diff --git a/.travis.yml b/.travis.yml index b7bb3d1e..1423c096 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ install: - 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 cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.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 diff --git a/assets/css/src/scss/partials/_checkout.scss b/assets/css/src/scss/partials/_checkout.scss index 0776ba50..0af624ba 100644 --- a/assets/css/src/scss/partials/_checkout.scss +++ b/assets/css/src/scss/partials/_checkout.scss @@ -38,16 +38,13 @@ checkout { &:hover { color: nth($primaryPalette, 8); } - h5 { + > div { padding: $gateway-padding-y $gateway-padding-x; - margin: 0; - //font-size: 18px; - //line-height: 25px; cursor: pointer; - img { - max-height: 25px; - vertical-align: middle; - margin-left: $gateway-padding-x; + + h5 { + margin: 0 $gateway-padding-x 0 0; + display: inline-block; } } } diff --git a/assets/css/src/scss/partials/_input-group.scss b/assets/css/src/scss/partials/_input-group.scss index baad6a95..da0399a4 100644 --- a/assets/css/src/scss/partials/_input-group.scss +++ b/assets/css/src/scss/partials/_input-group.scss @@ -71,6 +71,11 @@ input-group { position: relative; display: flex; + // give icons the same line-height at the input + i { + line-height: inherit; + } + .form-control { position: relative; z-index: 2; @@ -121,11 +126,6 @@ input-group { font-size: 0; white-space: nowrap; - // give icons the same line-height at the input - i { - line-height: inherit; - } - // Negative margin for spacing, position for bringing hovered/focused/actived // element above the siblings. > .btn { diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index 716624d3..85751691 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -122,6 +122,7 @@ modal { > div { @include display-flex; + @include align-items(stretch); } /** diff --git a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js index 6d7082c3..bd22d8ba 100644 --- a/assets/js/src/apps/pos/checkout/views/gateways/drawer.js +++ b/assets/js/src/apps/pos/checkout/views/gateways/drawer.js @@ -2,9 +2,6 @@ var FormView = require('lib/config/form-view'); var $ = require('jquery'); var _ = require('lodash'); var Numpad = require('lib/components/numpad/behavior'); -var Utils = require('lib/utilities/utils'); -var polyglot = require('lib/utilities/polyglot'); -var hbs = require('handlebars'); var App = require('lib/config/application'); var Radio = require('backbone.radio'); @@ -16,6 +13,9 @@ var View = FormView.extend({ style: 'display:none' // start drawer closed }, + /** + * Trigger event for gateway integrations + */ constructor: function( options ){ options = options || {}; if( options.model ){ @@ -24,15 +24,18 @@ var View = FormView.extend({ FormView.apply( this, arguments ); }, - initialize: function() { - this.template = hbs.compile( this.model.getPaymentFields() ); - this.order_total = this.model.collection.order.get('total'); - this.updateStatusMessage(); - }, + //initialize: function() { + // this.template = hbs.compile( this.model.getPaymentFields() ); + // this.order_total = this.model.collection.order.get('total'); + // this.updateStatusMessage(); + //}, + /** + * Make some order attributes available to gateway templates + */ templateHelpers: function(){ return { - total: this.order_total + total: this.model.collection.order.get('total') }; }, @@ -41,21 +44,21 @@ var View = FormView.extend({ behaviorClass: Numpad } }, - - modelEvents: { - 'change:message': 'updateStatusMessage' - }, + // + //modelEvents: { + // 'change:message': 'updateStatusMessage' + //}, onRender: function(){ var self = this; - if(this.model.id === 'pos_cash'){ - return this.posCashRender(); - } - - if(this.model.id === 'pos_card'){ - return this.posCardRender(); - } + //if(this.model.id === 'pos_cash'){ + // return this.posCashRender(); + //} + // + //if(this.model.id === 'pos_card'){ + // return this.posCardRender(); + //} /** * bind form elements @@ -83,65 +86,65 @@ var View = FormView.extend({ }); }, - posCashRender: function(){ - this.addBinding(null, { - '#pos-cash-tendered': { - observe: 'pos-cash-tendered', - onGet: function(value){ - this.calcChange(value); - return Utils.formatNumber(value); - }, - onSet: function(value){ - var val = Utils.unformat(value); - this.calcChange(val); - return val; - }, - initialize: function($el, model){ - if(!model.get('pos-cash-tendered')){ - model.set({ 'pos-cash-tendered': this.order_total }); - } - } - } - }); - }, - - posCardRender: function(){ - this.addBinding(null, { - '#pos-cashback': { - observe: 'pos-cashback', - onGet: Utils.formatNumber, - onSet: Utils.unformat - } - }); - }, + //posCashRender: function(){ + // this.addBinding(null, { + // '#pos-cash-tendered': { + // observe: 'pos-cash-tendered', + // onGet: function(value){ + // this.calcChange(value); + // return Utils.formatNumber(value); + // }, + // onSet: function(value){ + // var val = Utils.unformat(value); + // this.calcChange(val); + // return val; + // }, + // initialize: function($el, model){ + // if(!model.get('pos-cash-tendered')){ + // model.set({ 'pos-cash-tendered': this.order_total }); + // } + // } + // } + // }); + //}, + // + //posCardRender: function(){ + // this.addBinding(null, { + // '#pos-cashback': { + // observe: 'pos-cashback', + // onGet: Utils.formatNumber, + // onSet: Utils.unformat + // } + // }); + //}, onShow: function() { this.$el.slideDown(250); - if(window.Modernizr.touch){ - this.$('#pos-cash-tendered').attr('readonly', true); - this.$('#pos-cashback').attr('readonly', true); - } + //if(window.Modernizr.touch){ + // this.$('#pos-cash-tendered').attr('readonly', true); + // this.$('#pos-cashback').attr('readonly', true); + //} }, remove: function() { this.$el.slideUp( 250, function() { FormView.prototype.remove.call(this); }.bind(this)); - }, - - calcChange: function(tendered){ - var change = tendered - this.order_total; - var msg = polyglot.t('titles.change') + ': ' + Utils.formatMoney(change); - this.model.set({ message: msg, 'pos-cash-change': change }); - }, - - updateStatusMessage: function() { - this.model.collection.order.set({ - 'payment_details.message': this.model.get('message') - }); } + //calcChange: function(tendered){ + // var change = tendered - this.order_total; + // var msg = polyglot.t('titles.change') + ': ' + Utils.formatMoney(change); + // this.model.set({ message: msg, 'pos-cash-change': change }); + //}, + // + //updateStatusMessage: function() { + // this.model.collection.order.set({ + // 'payment_details.message': this.model.get('message') + // }); + //} + }); module.exports = View; diff --git a/assets/js/src/apps/pos/checkout/views/gateways/gateway.hbs b/assets/js/src/apps/pos/checkout/views/gateways/gateway.hbs new file mode 100644 index 00000000..cd408c9f --- /dev/null +++ b/assets/js/src/apps/pos/checkout/views/gateways/gateway.hbs @@ -0,0 +1 @@ +
        {{method_title}}
        {{#each icons}}{{/each}} \ No newline at end of file diff --git a/assets/js/src/apps/pos/checkout/views/gateways/gateway.js b/assets/js/src/apps/pos/checkout/views/gateways/gateway.js index 95494258..3aaf8293 100644 --- a/assets/js/src/apps/pos/checkout/views/gateways/gateway.js +++ b/assets/js/src/apps/pos/checkout/views/gateways/gateway.js @@ -1,21 +1,21 @@ var ItemView = require('lib/config/item-view'); var hbs = require('handlebars'); -//var $ = require('jquery'); +var Tmpl = require('./gateway.hbs'); module.exports = ItemView.extend({ - tagName: 'h5', - template: hbs.compile('' + - '{{method_title}}' + - '{{#if icon}}{{/if}}' - ), + + template: hbs.compile(Tmpl), events: { - 'click': 'makeActive' + 'click': function(){ + this.model.set({ active: true }); + } }, - makeActive: function(){ - this.model.set({ - active: true - }); + templateHelpers: function(){ + return { + icons: this.model.getIcons() + }; } + }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/checkout/views/gateways/layout.js b/assets/js/src/apps/pos/checkout/views/gateways/layout.js index 43f9dd34..04683c57 100644 --- a/assets/js/src/apps/pos/checkout/views/gateways/layout.js +++ b/assets/js/src/apps/pos/checkout/views/gateways/layout.js @@ -5,24 +5,30 @@ var DrawerView = require('./drawer'); module.exports = LayoutView.extend({ tagName: 'li', + className: function(){ + if( this.model.get('active') ){ + return 'active'; + } + }, + template: function() { return '
        '; }, regions: { - gatewayRegion: '.gateway', - drawerRegion: '.drawer' + gateway: '.gateway', + drawer: '.drawer' }, - initialize: function(){ - this.listenTo(this.model, 'change:active', this.toggleDrawer); + modelEvents: { + 'change:active': 'toggleActive' }, onRender: function(){ var view = new GatewayView({ model: this.model }); - this.gatewayRegion.show(view); + this.getRegion('gateway').show(view); }, onShow: function(){ @@ -33,22 +39,23 @@ module.exports = LayoutView.extend({ openDrawer: function(){ var view = new DrawerView({ - model: this.model + model: this.model, + template: this.model.getPaymentFields() }); - this.drawerRegion.show(view); - this.$el.addClass('active'); + this.getRegion('drawer').show(view); }, closeDrawer: function(){ - this.drawerRegion.empty(); - this.$el.removeClass('active'); + this.getRegion('drawer').empty(); }, - toggleDrawer: function(){ - if( this.drawerRegion.hasView() ){ - this.closeDrawer(); - } else { - this.openDrawer(); + toggleActive: function( model, active ){ + if( active ){ + this.$el.addClass('active'); + return this.openDrawer(); } + this.$el.removeClass('active'); + return this.closeDrawer(); } + }); \ No newline at end of file diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index 1c909563..06e70073 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -80,7 +80,11 @@ var StatusRoute = Route.extend({ collection.clear() .then(function(){ - self.render(); + return self.render(); + }) + .done(function(){ + collection._isNew = true; + collection.queue = []; }); } diff --git a/assets/js/src/entities/gateways/collection.js b/assets/js/src/entities/gateways/collection.js index 84784038..82d6ab62 100644 --- a/assets/js/src/entities/gateways/collection.js +++ b/assets/js/src/entities/gateways/collection.js @@ -19,7 +19,7 @@ module.exports = Collection.extend({ Collection.prototype.constructor.call(this, settings, options); - this.on( 'change', this.onChangeActive ); + this.on( 'change:active', this.onChangeActive ); if( models ){ this.set( models, { remove: false } ); @@ -27,10 +27,11 @@ module.exports = Collection.extend({ }, onChangeActive: function(model, active) { - if(!active){ return; } - this.each( function(tab) { - if( model.id !== tab.id ) { - tab.set({ active: false }); + if( ! active ){ return; } + + this.each( function( gateway ) { + if( model.id !== gateway.id ) { + gateway.set({ active: false }); } }); }, diff --git a/assets/js/src/entities/gateways/model.js b/assets/js/src/entities/gateways/model.js index 6eafd442..c2acbb48 100644 --- a/assets/js/src/entities/gateways/model.js +++ b/assets/js/src/entities/gateways/model.js @@ -13,10 +13,11 @@ module.exports = Model.extend({ attributes = attributes || {}; this.payment_fields = attributes.payment_fields; this.params = attributes.params; + this.icons = attributes.icons; attributes = _.pick( attributes, - ['active', 'icon', 'method_id', 'method_title'] + ['active', 'method_id', 'method_title'] ); Model.call( this, attributes, options ); @@ -28,6 +29,10 @@ module.exports = Model.extend({ getParams: function(){ return this.params; + }, + + getIcons: function(){ + return this.icons; } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 32eee1ab..2f1fe309 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -176,11 +176,12 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ /** * Get array of all entity ids from the server - * @todo remove optimised endpoint + * - optimised endpoint * - optionally get ids modified since last_update */ getRemoteIds: function(last_update){ var self = this; + var url = _.result(this, 'url') + '/ids'; if(last_update){ debug('getting updated ids from server since ' + last_update); @@ -189,6 +190,7 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ } return this.sync('read', this, { + url: url, remote: true, data: { fields: 'id', diff --git a/includes/admin/settings/views/checkout.php b/includes/admin/settings/views/checkout.php index d780ea35..647c4b8f 100644 --- a/includes/admin/settings/views/checkout.php +++ b/includes/admin/settings/views/checkout.php @@ -29,10 +29,10 @@ - +
        - + diff --git a/includes/api/class-wc-pos-coupons.php b/includes/api/class-wc-pos-coupons.php index f6681454..9da64cdf 100644 --- a/includes/api/class-wc-pos-coupons.php +++ b/includes/api/class-wc-pos-coupons.php @@ -14,30 +14,35 @@ exit; // Exit if accessed directly } -class WC_POS_API_Coupons extends WC_API_Coupons { +class WC_POS_API_Coupons extends WC_API_Resource { + + /** @var string $base the route base */ + protected $base = '/coupons'; /** - * Add special case for all coupon ids + * Register routes for POS Coupons * - * @param null $fields - * @param array $filter - * @param int $page + * @param array $routes * @return array */ - public function get_coupons( $fields = null, $filter = array(), $page = 1 ) { - if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ - return array( 'coupons' => $this->wc_pos_api_get_all_ids( $filter ) ); - } - return parent::get_coupons( $fields, $filter, $page ); + public function register_routes( $routes ) { + + # GET /coupons/ids + $routes[ $this->base . '/ids'] = array( + array( array( $this, 'get_all_ids' ), WC_API_Server::READABLE ), + ); + + return $routes; } + /** * Returns array of all coupon ids * * @param array $filter * @return array|void */ - private function wc_pos_api_get_all_ids( $filter = array() ) { + public function get_all_ids( $filter = array() ) { $args = array( 'post_type' => array( 'shop_coupon' ), 'post_status' => array( 'publish' ), @@ -54,7 +59,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ) { } $query = new WP_Query( $args ); - return array_map( array( $this, 'wc_pos_api_format_id' ), $query->posts ); + return array_map( array( $this, 'format_id' ), $query->posts ); } @@ -62,7 +67,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ) { * @param $id * @return array */ - private function wc_pos_api_format_id( $id ) { + private function format_id( $id ) { return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-customers.php b/includes/api/class-wc-pos-customers.php index 5d5188ec..c636ac80 100644 --- a/includes/api/class-wc-pos-customers.php +++ b/includes/api/class-wc-pos-customers.php @@ -14,45 +14,55 @@ exit; // Exit if accessed directly } -class WC_POS_API_Customers extends WC_API_Customers { +class WC_POS_API_Customers extends WC_API_Resource { + + /** @var string $base the route base */ + protected $base = '/customers'; /** - * Get Customers - * - * @param null $fields - * @param array $filter - * @param int $page - * @return array + * @param WC_API_Server $server */ - public function get_customers( $fields = null, $filter = array(), $page = 1 ) { + public function __construct( WC_API_Server $server ) { + parent::__construct( $server ); + add_filter( 'woocommerce_api_customer_response', array( $this, 'customer_response' ), 10, 4 ); - // add query actions - add_action( 'pre_get_users', array( $this, 'wc_pos_api_pre_get_users' ) ); - add_action( 'pre_user_query', array( $this, 'wc_pos_api_pre_user_query' ) ); - - // special case for all customer ids - if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ - return array( 'customers' => $this->wc_pos_api_get_all_ids( $filter ) ); + if( $server->path === $this->base ){ + add_action( 'pre_get_users', array( $this, 'pre_get_users' ) ); + add_action( 'pre_user_query', array( $this, 'pre_user_query' ) ); } + } + - // resume parent - return parent::get_customers( $fields, $filter, $page ); + /** + * Register routes for POS Customers + * + * @param array $routes + * @return array + */ + public function register_routes( $routes ) { + # GET /customers/ids + $routes[ $this->base . '/ids'] = array( + array( array( $this, 'get_all_ids' ), WC_API_Server::READABLE ), + ); + + return $routes; } /** * - add `updated_at` to customer data * - * @param int $id - * @param null $fields - * @return array + * @param $data + * @param $customer + * @param $fields + * @param $server + * @return */ - public function get_customer( $id, $fields = null ){ - $data = parent::get_customer( $id, $fields ); - $timestamp = get_user_meta( $id , '_user_modified_gmt', true); - $data['customer']['updated_at'] = $this->server->format_datetime( $timestamp ); + public function customer_response( $data, $customer, $fields, $server ){ + $timestamp = get_user_meta( $customer->ID , '_user_modified_gmt', true); + $data['updated_at'] = $server->format_datetime( $timestamp ); return $data; } @@ -61,7 +71,7 @@ public function get_customer( $id, $fields = null ){ * * @param $wp_user_query */ - public function wc_pos_api_pre_get_users( $wp_user_query ) { + public function pre_get_users( $wp_user_query ) { global $wp_version; $wp_user_query->query_vars[ 'role' ] = ''; @@ -101,12 +111,12 @@ public function wc_pos_api_pre_get_users( $wp_user_query ) { * * @param $wp_user_query */ - public function wc_pos_api_pre_user_query( $wp_user_query ) { + public function pre_user_query( $wp_user_query ) { // customer search $term = $wp_user_query->query_vars[ 'search' ]; if ( !empty( $term ) ) { - $this->wc_pos_api_customer_search( $term, $wp_user_query ); + $this->customer_search( $term, $wp_user_query ); } } @@ -116,7 +126,7 @@ public function wc_pos_api_pre_user_query( $wp_user_query ) { * @param $term * @param $wp_user_query */ - private function wc_pos_api_customer_search($term, $wp_user_query){ + private function customer_search($term, $wp_user_query){ global $wpdb; // search usermeta table @@ -156,7 +166,7 @@ private function wc_pos_api_customer_search($term, $wp_user_query){ * @param array $filter * @return array|void */ - private function wc_pos_api_get_all_ids( $filter = array() ){ + public function get_all_ids( $filter = array() ){ $args = array( 'fields' => 'ID', 'orderby' => 'ID' @@ -169,7 +179,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ){ } $query = new WP_User_Query( $args ); - return array_map( array( $this, 'wc_pos_api_format_id' ), $query->results ); + return array_map( array( $this, 'format_id' ), $query->results ); } @@ -177,7 +187,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ){ * @param $id * @return array */ - private function wc_pos_api_format_id( $id ) { + private function format_id( $id ) { return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-gateways.php b/includes/api/class-wc-pos-gateways.php index b7dda844..f678ba9a 100644 --- a/includes/api/class-wc-pos-gateways.php +++ b/includes/api/class-wc-pos-gateways.php @@ -53,7 +53,7 @@ public function get_gateways( $wc_pos_admin = null ){ $payload[] = array( 'method_id' => $gateway->id, 'method_title' => esc_html( $gateway->get_title() ), - 'icon' => $this->sanitize_icon( $gateway ), + 'icons' => $this->sanitize_icons( $gateway ), 'active' => $gateway->default, 'payment_fields' => $this->sanitize_payment_fields( $gateway ), 'params' => apply_filters('woocommerce_pos_gateway_' . strtolower( $gateway->id ) . '_params', array(), $gateway, $this ) @@ -70,15 +70,14 @@ public function get_gateways( $wc_pos_admin = null ){ * @param WC_Payment_Gateway $gateway * @return string */ - private function sanitize_icon( WC_Payment_Gateway $gateway ) { - $icon = $gateway->show_icon ? $gateway->get_icon() : ''; - if ( $icon !== '' ) { - // simple preg_match - preg_match( '/< *img[^>]*src *= *["\']?([^"\']*)/i', $icon, $src ); - $icon = $src[ 1 ]; + private function sanitize_icons( WC_Payment_Gateway $gateway ) { + $icons = $gateway->show_icon ? $gateway->get_icon() : ''; + + if ( $icons !== '' ) { + $icons = $this->parseImgSrc($icons); } - return $icon; + return $icons; } /** @@ -101,7 +100,7 @@ private function sanitize_payment_fields( WC_Payment_Gateway $gateway ) { $html = $this->removeDomNodes( $html, '//script' ); } - return wc_pos_trim_html_string( $html ); + return $html; } /** @@ -124,6 +123,7 @@ private function removeDomNodes( $html, $xpathString ) { // Libxml constants not available on all servers (Libxml < 2.7.8) // $html->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); $dom->loadHtml( '' . '
        ' . $html . '
        ' ); + $dom->preserveWhiteSpace = false; // remove removeChild( $dom->doctype ); // remove @@ -140,4 +140,31 @@ private function removeDomNodes( $html, $xpathString ) { return $dom->saveHTML(); } + /** + * @param $html + * @return array + */ + private function parseImgSrc( $html ){ + if( ! class_exists('DOMDocument') ){ + // simple preg_match + preg_match_all( '/< *img[^>]*src *= *["\']?([^"\']*)/i', $html, $matches ); + return $matches[ 1 ]; + } + + $icons = array(); + $dom = new DOMDocument(); + + // suppress warnings for malformed HTML + libxml_use_internal_errors(true); + + $dom->loadHTML($html); + $dom->preserveWhiteSpace = false; + $images = $dom->getElementsByTagName('img'); + foreach ($images as $image) { + $icons[] = $image->getAttribute('src'); + } + + return $icons; + } + } \ No newline at end of file diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index c599895d..242e644a 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -14,50 +14,55 @@ exit; // Exit if accessed directly } -class WC_POS_API_Orders extends WC_API_Orders { +class WC_POS_API_Orders { + + /** @var string $base the route base */ + protected $base = '/orders'; /** @var array Contains the raw order data */ private $data = array(); private $flag = false; + /** * @param WC_API_Server $server */ public function __construct( WC_API_Server $server ) { - parent::__construct( $server ); - - // order data - add_filter( 'woocommerce_api_create_order_data', array( $this, 'wc_pos_api_create_order_data') ); - add_filter( 'woocommerce_api_edit_order_data', array( $this, 'wc_pos_api_edit_order_data'), 10, 2 ); - add_action( 'woocommerce_api_create_order', array( $this, 'wc_pos_api_create_order') ); - add_action( 'woocommerce_api_edit_order', array( $this, 'wc_pos_api_edit_order') ); - - // payment - add_action( 'woocommerce_pos_process_payment', array( $this, 'wc_pos_api_process_payment' ), 10, 2 ); - add_action( 'woocommerce_payment_complete', array( $this, 'wc_pos_api_payment_complete' ), 10, 1 ); // order response - add_filter( 'woocommerce_api_order_response', array( $this, 'wc_pos_api_order_response' ), 10, 4 ); + add_filter( 'woocommerce_api_order_response', array( $this, 'order_response' ), 10, 4 ); // order emails - add_filter( 'woocommerce_email', array( $this, 'wc_pos_api_woocommerce_email' ), 99 ); + add_filter( 'woocommerce_email', array( $this, 'woocommerce_email' ), 99 ); + + if( substr( $server->path, 0, strlen( $this->base ) ) === $this->base ){ + // order data + add_filter( 'woocommerce_api_dispatch_args', array( $this, 'dispatch_args' ), 10, 2 ); + + add_filter( 'woocommerce_api_create_order_data', array( $this, 'create_order_data') ); + add_filter( 'woocommerce_api_edit_order_data', array( $this, 'edit_order_data'), 10, 2 ); + add_action( 'woocommerce_api_create_order', array( $this, 'create_order') ); + add_action( 'woocommerce_api_edit_order', array( $this, 'edit_order') ); + + // payment + add_action( 'woocommerce_pos_process_payment', array( $this, 'process_payment' ), 10, 2 ); + add_action( 'woocommerce_payment_complete', array( $this, 'payment_complete' ), 10, 1 ); + } + } /** * Register routes for POS Orders * - * GET /pos - * * @param array $routes * @return array */ public function register_routes( $routes ) { - $routes = parent::register_routes( $routes ); # POST /orders//email/ $routes[ $this->base . '/(?P\d+)/email/(?P.+)' ] = array( - array( array( $this, 'wc_pos_api_email_receipt' ), WC_API_SERVER::CREATABLE | WC_API_Server::ACCEPT_DATA ) + array( array( $this, 'email_receipt' ), WC_API_SERVER::CREATABLE | WC_API_Server::ACCEPT_DATA ) ); return $routes; @@ -65,19 +70,24 @@ public function register_routes( $routes ) { /** - * Add special case for all product ids + * Parse data sent by POS * - * @param null $fields - * @param array $filter - * @param null $status - * @param int $page + * @param array $args + * @param $callback * @return array */ - public function get_orders( $fields = null, $filter = array(), $status = null, $page = 1 ) { - if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ - return array( 'orders' => $this->wc_pos_api_get_all_ids( $filter ) ); + public function dispatch_args( $args, $callback ){ + if( !isset( $args['data'] ) ){ + return $args; } - return parent::get_orders( $fields, $filter, $status, $page ); + + if( !isset( $args['data']['order'] ) ){ + $args['data'] = array( + 'order' => $args['data'] + ); + } + + return $args; } @@ -87,23 +97,20 @@ public function get_orders( $fields = null, $filter = array(), $status = null, $ * @param array $data * @return array */ - public function wc_pos_api_create_order_data(array $data){ - - // store raw http data - $this->data = $data; + public function create_order_data(array $data){ // add filters & actions for create order - add_filter( 'woocommerce_product_tax_class', array( $this, 'wc_pos_api_product_tax_class' ), 10, 2 ); - add_filter( 'woocommerce_get_product_from_item', array( $this, 'wc_pos_api_get_product_from_item' ), 10, 3 ); - add_filter( 'pre_option_woocommerce_tax_based_on', array( $this, 'wc_pos_api_woocommerce_tax_based_on' ) ); - add_filter( 'woocommerce_find_rates', array( $this, 'wc_pos_api_find_rates'), 10, 2 ); - add_action( 'woocommerce_order_add_product', array( $this, 'wc_pos_api_order_add_product'), 10, 5 ); - add_action( 'updated_order_item_meta', array( $this, 'wc_pos_api_updated_order_item_meta'), 10, 4 ); + add_filter( 'woocommerce_product_tax_class', array( $this, 'product_tax_class' ), 10, 2 ); + add_filter( 'woocommerce_get_product_from_item', array( $this, 'get_product_from_item' ), 10, 3 ); + add_filter( 'pre_option_woocommerce_tax_based_on', array( $this, 'woocommerce_tax_based_on' ) ); + add_filter( 'woocommerce_find_rates', array( $this, 'find_rates'), 10, 2 ); + add_action( 'woocommerce_order_add_product', array( $this, 'order_add_product'), 10, 5 ); + add_action( 'updated_order_item_meta', array( $this, 'updated_order_item_meta'), 10, 4 ); // WC API < 2.4 has a bug if $fee['taxable'] = false // set $fee['taxable'] = true and use random tax_class so not tax is calculated - if( version_compare( WC()->version, '2.4', '<' ) && isset($this->data['fee_lines']) ){ - foreach( $this->data['fee_lines'] as &$fee ){ + if( version_compare( WC()->version, '2.4', '<' ) && isset($data['fee_lines']) ){ + foreach( $data['fee_lines'] as &$fee ){ if( !isset($fee['taxable']) || $fee['taxable'] == false ){ $fee['taxable'] = true; $fee['tax_class'] = 'upgrade-woocommerce-' . time(); @@ -114,22 +121,30 @@ public function wc_pos_api_create_order_data(array $data){ // WC handling of shipping is FUBAR // if order has shipping line, we'll have to calc the tax ourselves // also recalc total tax for negative fee lines - $has_fee = isset($this->data['fee_lines']) && !empty($this->data['fee_lines']); - $has_shipping = isset($this->data['shipping_lines']) && !empty($this->data['shipping_lines']); + $has_fee = isset($data['fee_lines']) && !empty($data['fee_lines']); + $has_shipping = isset($data['shipping_lines']) && !empty($data['shipping_lines']); if( $has_shipping ) - add_action( 'woocommerce_order_add_shipping', array( $this, 'wc_pos_api_order_add_shipping'), 10, 3 ); + add_action( 'woocommerce_order_add_shipping', array( $this, 'order_add_shipping'), 10, 3 ); if( $has_fee || $has_shipping ) - add_filter( 'update_post_metadata', array( $this, 'wc_pos_api_update_post_metadata'), 10, 5 ); + add_filter( 'update_post_metadata', array( $this, 'update_post_metadata'), 10, 5 ); // populate customer data $customer_id = isset( $data['customer_id'] ) ? $data['customer_id'] : 0 ; - if($customer_id){ - $this->data['billing_address'] = $this->wc_pos_api_get_customer_details($customer_id, 'billing'); - $this->data['shipping_address'] = $this->wc_pos_api_get_customer_details($customer_id, 'shipping'); + if( $customer_id ){ + $data['billing_address'] = $this->get_customer_details($customer_id, 'billing'); + $data['shipping_address'] = $this->get_customer_details($customer_id, 'shipping'); + } + + // remove status + if( isset( $data['status'] ) && $data['status'] == 'CREATE_FAILED' ){ + unset( $data['status'] ); } + // store data + $this->data = $data; + return $this->data; } @@ -140,9 +155,16 @@ public function wc_pos_api_create_order_data(array $data){ * @param $order_id * @return array */ - public function wc_pos_api_edit_order_data(array $data, $order_id){ + public function edit_order_data(array $data, $order_id){ + + // remove status + if( isset( $data['status'] ) && $data['status'] == 'UPDATE_FAILED' ){ + unset( $data['status'] ); + } + $this->delete_order_items($order_id); - return $this->wc_pos_api_create_order_data($data); + + return $this->create_order_data($data); } /** @@ -151,13 +173,13 @@ public function wc_pos_api_edit_order_data(array $data, $order_id){ * @param $product * @return string */ - public function wc_pos_api_product_tax_class($tax_class, $product){ + public function product_tax_class($tax_class, $product){ $id = isset($product->id) ? $product->id: false; $id = isset($product->variation_id) ? $product->variation_id: $id; if($id){ - $item = $this->wc_pos_api_get_line_item($id); + $item = $this->get_line_item($id); if( isset( $item['tax_class'] ) ){ $tax_class = sanitize_text_field( $item['tax_class'] ); } @@ -173,13 +195,13 @@ public function wc_pos_api_product_tax_class($tax_class, $product){ * @param $WC_Product * @return mixed */ - public function wc_pos_api_get_product_from_item($product, $item, $WC_Product){ + public function get_product_from_item($product, $item, $WC_Product){ $id = isset($product->id) ? $product->id: false; $id = isset($product->variation_id) ? $product->variation_id: $id; if($id){ - $data = $this->wc_pos_api_get_line_item($id); + $data = $this->get_line_item($id); if( isset( $data['taxable'] ) ){ // api has options true/false // tax_status has options taxable/shipping/none @@ -199,13 +221,13 @@ public function wc_pos_api_get_product_from_item($product, $item, $WC_Product){ * @param $qty * @param $args */ - public function wc_pos_api_order_add_product($order_id, $item_id, $product, $qty, $args){ + public function order_add_product($order_id, $item_id, $product, $qty, $args){ $id = isset($product->id) ? $product->id: false; $id = isset($product->variation_id) ? $product->variation_id: $id; if($id){ - $data = $this->wc_pos_api_get_line_item($id); + $data = $this->get_line_item($id); // update title if( isset( $data['title'] ) ){ @@ -218,7 +240,7 @@ public function wc_pos_api_order_add_product($order_id, $item_id, $product, $qty // update meta if( isset( $data['meta'] ) && !empty( $data['meta'] ) ){ - $this->wc_pos_api_add_product_meta( $item_id, $data['meta'] ); + $this->add_product_meta( $item_id, $data['meta'] ); } } @@ -230,7 +252,7 @@ public function wc_pos_api_order_add_product($order_id, $item_id, $product, $qty * @param $item_id * @param array $meta */ - private function wc_pos_api_add_product_meta($item_id, array $meta){ + private function add_product_meta($item_id, array $meta){ // line meta foreach($meta as $m) { @@ -247,8 +269,8 @@ private function wc_pos_api_add_product_meta($item_id, array $meta){ * @param $item_id * @param $rate */ - public function wc_pos_api_order_add_shipping($order_id, $item_id, $rate){ - $shipping_line = $this->wc_pos_api_get_shipping_line($rate, $item_id); + public function order_add_shipping($order_id, $item_id, $rate){ + $shipping_line = $this->get_shipping_line($rate, $item_id); if($shipping_line && isset($shipping_line['tax'])){ $taxes = array(); @@ -265,7 +287,7 @@ public function wc_pos_api_order_add_shipping($order_id, $item_id, $rate){ * Short circuit get_option('woocommerce_tax_based_on') as shop base * @return string */ - public function wc_pos_api_woocommerce_tax_based_on(){ + public function woocommerce_tax_based_on(){ return 'base'; } @@ -275,7 +297,7 @@ public function wc_pos_api_woocommerce_tax_based_on(){ * @param $args * @return array */ - public function wc_pos_api_find_rates( $matched_tax_rates, $args ){ + public function find_rates( $matched_tax_rates, $args ){ if ( $matched_tax_rates ) { foreach ( $matched_tax_rates as &$rate ) { $rate['shipping'] = 'no'; @@ -288,7 +310,7 @@ public function wc_pos_api_find_rates( $matched_tax_rates, $args ){ * Retrieve line_item from raw data * @param $product_id */ - private function wc_pos_api_get_line_item($product_id){ + private function get_line_item($product_id){ if(!isset($this->data['line_items'])) return; @@ -304,7 +326,7 @@ private function wc_pos_api_get_line_item($product_id){ * @param $rate * @param $item_id */ - private function wc_pos_api_get_shipping_line($rate, $item_id){ + private function get_shipping_line($rate, $item_id){ if(!isset($this->data['shipping_lines'])) return; @@ -328,7 +350,7 @@ private function wc_pos_api_get_shipping_line($rate, $item_id){ * @param $meta_key * @param $meta_value */ - public function wc_pos_api_updated_order_item_meta($meta_id, $order_id, $meta_key, $meta_value){ + public function updated_order_item_meta($meta_id, $order_id, $meta_key, $meta_value){ if($meta_key == '_line_tax_data'){ $line_subtotal_taxes = isset($meta_value['subtotal']) ? $meta_value['subtotal'] : array(); @@ -353,7 +375,7 @@ public function wc_pos_api_updated_order_item_meta($meta_id, $order_id, $meta_ke * @param $prev_value * @return null */ - public function wc_pos_api_update_post_metadata($null, $order_id, $meta_key, $meta_value, $prev_value){ + public function update_post_metadata($null, $order_id, $meta_key, $meta_value, $prev_value){ // we want last update to _order_shipping after $order->calculate_taxes() // set flag true on first pass @@ -410,7 +432,7 @@ public function wc_pos_api_update_post_metadata($null, $order_id, $meta_key, $me * Create order complete * @param $order_id */ - public function wc_pos_api_create_order( $order_id ){ + public function create_order( $order_id ){ // pos meta global $current_user; get_currentuserinfo(); @@ -426,7 +448,7 @@ public function wc_pos_api_create_order( $order_id ){ * Edit order complete * @param $order_id */ - public function wc_pos_api_edit_order( $order_id ){ + public function edit_order( $order_id ){ // payment do_action( 'woocommerce_pos_process_payment', $order_id, $this->data); } @@ -436,7 +458,7 @@ public function wc_pos_api_edit_order( $order_id ){ * @param $order_id * @param $data */ - public function wc_pos_api_process_payment( $order_id, $data ) { + public function process_payment( $order_id, $data ) { if ( !isset( $data[ 'payment_details' ] ) ) { return; @@ -449,7 +471,7 @@ public function wc_pos_api_process_payment( $order_id, $data ) { // load the gateways & process payment $gateway_id = $data[ 'payment_details' ][ 'method_id' ]; - add_filter( 'option_woocommerce_' . $gateway_id . '_settings', array( $this, 'wc_pos_api_force_enable_gateway' ) ); + add_filter( 'option_woocommerce_' . $gateway_id . '_settings', array( $this, 'force_enable_gateway' ) ); $settings = WC_POS_Admin_Settings_Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); @@ -457,13 +479,13 @@ public function wc_pos_api_process_payment( $order_id, $data ) { do_action( 'woocommerce_pos_process_' . strtolower( $gateway_id ) . '_payment', $order_id, $data ); $response = $gateways[ $gateway_id ]->process_payment( $order_id ); if ( isset( $response[ 'result' ] ) && $response[ 'result' ] == 'success' ) { - $this->wc_pos_api_payment_success( $gateway_id, $order_id, $response ); + $this->payment_success( $gateway_id, $order_id, $response ); } else { - $this->wc_pos_api_payment_failure( $gateway_id, $order_id, $response ); + $this->payment_failure( $gateway_id, $order_id, $response ); } } else { - $this->wc_pos_api_payment_failure( $gateway_id, $order_id, '' ); + $this->payment_failure( $gateway_id, $order_id, '' ); } // switch back to logged in user @@ -478,7 +500,7 @@ public function wc_pos_api_process_payment( $order_id, $data ) { * @param $data * @return mixed */ - public function wc_pos_api_force_enable_gateway($data) { + public function force_enable_gateway($data) { if ( isset( $data[ 'enabled' ] ) ) { $data[ 'enabled' ] = 'yes'; } @@ -491,7 +513,7 @@ public function wc_pos_api_force_enable_gateway($data) { * @param $order_id * @param $response */ - private function wc_pos_api_payment_success($gateway_id, $order_id, $response){ + private function payment_success($gateway_id, $order_id, $response){ // capture any instructions ob_start(); @@ -501,7 +523,7 @@ private function wc_pos_api_payment_success($gateway_id, $order_id, $response){ // redirect if( isset($response['redirect']) ){ - $response['messages'] = $this->wc_pos_api_payment_redirect($gateway_id, $order_id, $response); + $response['messages'] = $this->payment_redirect($gateway_id, $order_id, $response); } update_post_meta( $order_id, '_pos_payment_result', 'success' ); @@ -513,7 +535,7 @@ private function wc_pos_api_payment_success($gateway_id, $order_id, $response){ * @param $order_id * @param $response */ - private function wc_pos_api_payment_failure($gateway_id, $order_id, $response){ + private function payment_failure($gateway_id, $order_id, $response){ $message = isset($response['messages']) ? $response['messages'] : wc_get_notices( 'error' ); // if messages empty give generic response @@ -531,7 +553,7 @@ private function wc_pos_api_payment_failure($gateway_id, $order_id, $response){ * @param $response * @return string */ - private function wc_pos_api_payment_redirect($gateway_id, $order_id, $response){ + private function payment_redirect($gateway_id, $order_id, $response){ $message = $response['messages']; // compare url fragments @@ -554,7 +576,7 @@ private function wc_pos_api_payment_redirect($gateway_id, $order_id, $response){ /** * @param $order_id */ - public function wc_pos_api_payment_complete( $order_id ) { + public function payment_complete( $order_id ) { // update order status $order = new WC_Order( $order_id ); @@ -574,23 +596,23 @@ public function wc_pos_api_payment_complete( $order_id ) { * @param $server * @return array */ - public function wc_pos_api_order_response( $order_data, $order, $fields, $server ) { + public function order_response( $order_data, $order, $fields, $server ) { // add cashier data - $order_data['cashier'] = $this->wc_pos_api_add_cashier_details( $order ); + $order_data['cashier'] = $this->add_cashier_details( $order ); // add pos payment info $payment_details = isset( $order_data['payment_details'] ) ? $order_data['payment_details'] : array(); - $order_data['payment_details'] = $this->wc_pos_api_add_payment_details( $order, $payment_details ); + $order_data['payment_details'] = $this->add_payment_details( $order, $payment_details ); // addresses -// $order_data['billing_address'] = $this->wc_pos_api_filter_address($order_data['billing_address'], $order); -// $order_data['shipping_address'] = $this->wc_pos_api_filter_address($order_data['shipping_address'], $order, 'shipping'); +// $order_data['billing_address'] = $this->filter_address($order_data['billing_address'], $order); +// $order_data['shipping_address'] = $this->filter_address($order_data['shipping_address'], $order, 'shipping'); // allow decimal quantity // fixed in WC 2.4+ if( version_compare( WC()->version, '2.4', '<' ) && wc_pos_get_option( 'general', 'decimal_qty' ) ){ - $order_data['line_items'] = $this->wc_pos_api_filter_qty($order_data['line_items']); + $order_data['line_items'] = $this->filter_qty($order_data['line_items']); } // add subtotal_tax @@ -620,7 +642,7 @@ public function wc_pos_api_order_response( $order_data, $order, $fields, $server * @param $order * @return array */ - private function wc_pos_api_add_cashier_details( $order ) { + private function add_cashier_details( $order ) { if ( !$cashier_id = get_post_meta( $order->id, '_pos_user', true ) ) { return; @@ -648,7 +670,7 @@ private function wc_pos_api_add_cashier_details( $order ) { * @param array $payment_details * @return array */ - private function wc_pos_api_add_payment_details( $order, array $payment_details ){ + private function add_payment_details( $order, array $payment_details ){ $payment_details['result'] = get_post_meta( $order->id, '_pos_payment_result', true ); $payment_details['message'] = get_post_meta( $order->id, '_pos_payment_message', true ); @@ -669,7 +691,7 @@ private function wc_pos_api_add_payment_details( $order, array $payment_details * @param string $type * @return array */ - private function wc_pos_api_filter_address( $address, $order, $type = 'billing' ){ + private function filter_address( $address, $order, $type = 'billing' ){ $fields = apply_filters('woocommerce_admin_'.$type.'_fields', false); if( $fields ){ $address = array(); @@ -687,7 +709,7 @@ private function wc_pos_api_filter_address( $address, $order, $type = 'billing' * @param $type_to_load * @return mixed|void */ - private function wc_pos_api_get_customer_details( $user_id, $type_to_load ){ + private function get_customer_details( $user_id, $type_to_load ){ $customer_data = array( $type_to_load . '_first_name' => get_user_meta( $user_id, $type_to_load . '_first_name', true ), $type_to_load . '_last_name' => get_user_meta( $user_id, $type_to_load . '_last_name', true ), @@ -716,7 +738,7 @@ private function wc_pos_api_get_customer_details( $user_id, $type_to_load ){ * @param $line_items * @return mixed */ - private function wc_pos_api_filter_qty($line_items){ + private function filter_qty($line_items){ foreach( $line_items as &$item ){ $qty = wc_get_order_item_meta( $item['id'], '_qty' ); $item['quantity'] = wc_stock_amount( $qty ); @@ -725,43 +747,6 @@ private function wc_pos_api_filter_qty($line_items){ } - /** - * Returns array of all order ids - * optionally return ids updated_at_min - * - * @param array $filter - * @return array|void - */ - private function wc_pos_api_get_all_ids( $filter = array() ){ - $args = array( - 'post_type' => array('shop_order'), - 'post_status' => array('any'), - 'posts_per_page'=> -1, - 'fields' => 'ids' - ); - - if( isset( $filter['updated_at_min'] ) ){ - $args['date_query'][] = array( - 'column' => 'post_modified_gmt', - 'after' => $filter['updated_at_min'], - 'inclusive' => false - ); - } - - $query = new WP_Query( $args ); - return array_map( array( $this, 'wc_pos_api_format_id' ), $query->posts ); - } - - - /** - * @param $id - * @return array - */ - private function wc_pos_api_format_id( $id ){ - return array( 'id' => $id ); - } - - /** * Delete all order items * @param $order_id @@ -783,21 +768,21 @@ private function delete_order_items($order_id) { * WC email notifications * @param WC_Emails $wc_emails */ - public function wc_pos_api_woocommerce_email(WC_Emails $wc_emails) { + public function woocommerce_email(WC_Emails $wc_emails) { if( ! wc_pos_get_option( 'checkout', 'customer_emails' ) ){ - $this->wc_pos_api_remove_customer_emails($wc_emails); + $this->remove_customer_emails($wc_emails); } if( ! wc_pos_get_option( 'checkout', 'admin_emails' ) ){ - $this->wc_pos_api_remove_admin_emails($wc_emails); + $this->remove_admin_emails($wc_emails); } } /** * @param WC_Emails $wc_emails */ - private function wc_pos_api_remove_customer_emails(WC_Emails $wc_emails){ + private function remove_customer_emails(WC_Emails $wc_emails){ remove_action( 'woocommerce_order_status_pending_to_processing_notification', array( @@ -824,7 +809,7 @@ private function wc_pos_api_remove_customer_emails(WC_Emails $wc_emails){ /** * @param WC_Emails $wc_emails */ - private function wc_pos_api_remove_admin_emails(WC_Emails $wc_emails){ + private function remove_admin_emails(WC_Emails $wc_emails){ // send 'woocommerce_low_stock_notification' // send 'woocommerce_no_stock_notification' // send 'woocommerce_product_on_backorder_notification' @@ -880,7 +865,7 @@ private function wc_pos_api_remove_admin_emails(WC_Emails $wc_emails){ * @param $email * @return array */ - static public function wc_pos_api_email_receipt( $order_id, $email ) { + static public function email_receipt( $order_id, $email ) { $order = wc_get_order( absint( $order_id ) ); if ( is_object( $order ) ) { diff --git a/includes/api/class-wc-pos-products.php b/includes/api/class-wc-pos-products.php index 790d2eab..4bf67746 100644 --- a/includes/api/class-wc-pos-products.php +++ b/includes/api/class-wc-pos-products.php @@ -14,7 +14,10 @@ exit; // Exit if accessed directly } -class WC_POS_API_Products extends WC_API_Products { +class WC_POS_API_Products extends WC_API_Resource { + + /** @var string $base the route base */ + protected $base = '/products'; /* @var string Barcode postmeta */ public $barcode_meta_key; @@ -99,31 +102,29 @@ public function __construct( WC_API_Server $server ) { // allow third party plugins to change the barcode postmeta field $this->barcode_meta_key = apply_filters( 'woocommerce_pos_barcode_meta_key', '_sku' ); - add_filter( 'woocommerce_api_product_response', array( $this, 'wc_pos_api_product_response' ), 10, 4 ); + add_filter( 'woocommerce_api_product_response', array( $this, 'product_response' ), 10, 4 ); + if( $server->path === $this->base ){ + add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) ); + add_filter( 'posts_where', array( $this, 'posts_where' ), 10 , 2 ); + } } /** - * Add special case for all product ids + * Register routes for POS Products * - * @param null $fields - * @param null $type - * @param array $filter - * @param int $page + * @param array $routes * @return array */ - public function get_products( $fields = null, $type = null, $filter = array(), $page = 1 ) { + public function register_routes( $routes ) { - if( $fields == 'id' && isset( $filter['limit'] ) && $filter['limit'] == -1 ){ - return array( 'products' => $this->wc_pos_api_get_all_ids( $filter ) ); - } - - // add hooks - add_action( 'pre_get_posts', array( $this, 'wc_pos_api_pre_get_posts' ) ); - add_filter( 'posts_where', array( $this, 'wc_pos_api_posts_where' ), 10 , 2 ); + # GET /products/ids + $routes[ $this->base . '/ids'] = array( + array( array( $this, 'get_all_ids' ), WC_API_Server::READABLE ), + ); - return parent::get_products( $fields, $type, $filter, $page ); + return $routes; } @@ -138,7 +139,7 @@ public function get_products( $fields = null, $type = null, $filter = array(), $ * * @return array modified data array $product_data */ - public function wc_pos_api_product_response( $data, $product, $fields, $server ) { + public function product_response( $data, $product, $fields, $server ) { $type = isset( $data['type'] ) ? $data['type'] : ''; // variable products @@ -146,17 +147,17 @@ public function wc_pos_api_product_response( $data, $product, $fields, $server ) // nested variations foreach( $data['variations'] as &$variation ) : $_product = wc_get_product( $variation['id'] ); - $variation = $this->wc_pos_api_filter_response_data( $variation, $_product ); - $variation['attributes'] = $this->wc_pos_api_patch_variation_attributes( $_product ); + $variation = $this->filter_response_data( $variation, $_product ); + $variation['attributes'] = $this->patch_variation_attributes( $_product ); endforeach; endif; // variation if( $type == 'variation' ) : - $data['attributes'] = $this->wc_pos_api_patch_variation_attributes( $product ); + $data['attributes'] = $this->patch_variation_attributes( $product ); endif; - return $this->wc_pos_api_filter_response_data( $data, $product ); + return $this->filter_response_data( $data, $product ); } @@ -166,7 +167,7 @@ public function wc_pos_api_product_response( $data, $product, $fields, $server ) * @param $product * @return array */ - private function wc_pos_api_patch_variation_attributes( $product ){ + private function patch_variation_attributes( $product ){ $patched_attributes = array(); $attributes = $product->get_attributes(); $variation_attributes = $product->get_variation_attributes(); @@ -182,8 +183,8 @@ private function wc_pos_api_patch_variation_attributes( $product ){ if( isset( $attributes[$slug] ) ){ $patched_attributes[] = array( - 'name' => $this->wc_pos_api_get_variation_name( $attributes[$slug] ), - 'option' => $this->wc_pos_api_get_variation_option( $product, $attributes[$slug], $option ) + 'name' => $this->get_variation_name( $attributes[$slug] ), + 'option' => $this->get_variation_option( $product, $attributes[$slug], $option ) ); } @@ -197,7 +198,7 @@ private function wc_pos_api_patch_variation_attributes( $product ){ * @param $attribute * @return null|string */ - private function wc_pos_api_get_variation_name( $attribute ){ + private function get_variation_name( $attribute ){ if( $attribute['is_taxonomy'] ){ global $wpdb; $name = str_replace( 'pa_', '', $attribute['name'] ); @@ -222,7 +223,7 @@ private function wc_pos_api_get_variation_name( $attribute ){ * @param $attribute * @return mixed */ - private function wc_pos_api_get_variation_option( $product, $attribute, $option ){ + private function get_variation_option( $product, $attribute, $option ){ $name = $option; // taxonomy attributes @@ -253,10 +254,10 @@ private function wc_pos_api_get_variation_option( $product, $attribute, $option * @param $product * @return array */ - private function wc_pos_api_filter_response_data( array $data, $product ){ + private function filter_response_data( array $data, $product ){ $barcode = get_post_meta( $product->id, $this->barcode_meta_key, true ); - $data['featured_src'] = $this->wc_pos_api_get_thumbnail( $product->id ); + $data['featured_src'] = $this->get_thumbnail( $product->id ); $data['barcode'] = apply_filters( 'woocommerce_pos_product_barcode', $barcode, $product->id ); // allow decimal stock quantities, fixed in WC 2.4 @@ -277,7 +278,7 @@ private function wc_pos_api_filter_response_data( array $data, $product ){ * @param int $id * @return string */ - private function wc_pos_api_get_thumbnail($id){ + private function get_thumbnail($id){ $image = false; $thumb_id = get_post_thumbnail_id( $id ); @@ -294,8 +295,7 @@ private function wc_pos_api_get_thumbnail($id){ /** * @param $query */ - public function wc_pos_api_pre_get_posts($query){ - + public function pre_get_posts($query){ // store original meta_query $meta_query = $query->get( 'meta_query' ); @@ -336,7 +336,7 @@ public function wc_pos_api_pre_get_posts($query){ * @param $query * @return mixed */ - public function wc_pos_api_posts_where( $where, $query ) { + public function posts_where( $where, $query ) { global $wpdb; if( isset( $_GET['filter'] ) ){ @@ -379,7 +379,7 @@ public function wc_pos_api_posts_where( $where, $query ) { * @param array $filter * @return array|void */ - private function wc_pos_api_get_all_ids( $filter = array() ){ + public function get_all_ids( $filter = array() ){ $args = array( 'post_type' => array('product'), 'post_status' => array('publish'), @@ -396,7 +396,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ){ } $query = new WP_Query( $args ); - return array_map( array( $this, 'wc_pos_api_format_id' ), $query->posts ); + return array( 'products' => array_map( array( $this, 'format_id' ), $query->posts ) ); } @@ -404,7 +404,7 @@ private function wc_pos_api_get_all_ids( $filter = array() ){ * @param $id * @return array */ - private function wc_pos_api_format_id( $id ){ + private function format_id( $id ){ return array( 'id' => $id ); } diff --git a/includes/api/class-wc-pos-support.php b/includes/api/class-wc-pos-support.php index 6e19019e..c97c33df 100644 --- a/includes/api/class-wc-pos-support.php +++ b/includes/api/class-wc-pos-support.php @@ -19,6 +19,7 @@ class WC_POS_API_Support extends WC_API_Resource { public $support_email = 'support@woopos.com.au'; + /** * Register routes for POS Params * @@ -59,7 +60,9 @@ public function send_support_email( $data ) { $message .= $this->get_active_plugins(); } - if( wp_mail( $this->support_email, 'WooCommerce POS Support', $message, $headers ) ) { + $support_email = apply_filters( 'woocommerce_pos_support_email', $this->support_email ); + + if( wp_mail( $support_email, 'WooCommerce POS Support', $message, $headers ) ) { return array( 'result' => 'success', 'message' => __( 'Email sent', 'woocommerce-pos') diff --git a/includes/class-wc-pos-api.php b/includes/class-wc-pos-api.php index 0420ca66..e5e16332 100644 --- a/includes/class-wc-pos-api.php +++ b/includes/class-wc-pos-api.php @@ -102,22 +102,6 @@ public function dispatch_args($args, $callback){ // note: using headers rather than query params, easier to manage through the js app $args['wc_pos_admin'] = is_pos_admin(); - // parse data from js app - if( ! isset( $args['data'] ) || ! isset( $args['data']['status'] ) ){ - return $args; - } - - if( in_array( $args['data']['status'], array('CREATE_FAILED', 'UPDATE_FAILED') )){ - unset($args['data']['status']); // remove status - - // a hack to put data in the right format - if( substr( $args['_route'], 0, 7 ) == '/orders' ){ - $args['data'] = array( - 'order' => $args['data'] - ); - } - } - return $args; } @@ -151,6 +135,10 @@ public function woocommerce_api_query_args($args, $request_args){ $args['posts_per_page'] = 10; } + // remove relevanssi + remove_filter('posts_request', 'relevanssi_prevent_default_request'); + remove_filter('the_posts', 'relevanssi_query'); + return $args; } diff --git a/tests/unit/js/spec/entities/gateways/model.spec.js b/tests/unit/js/spec/entities/gateways/model.spec.js index d0e3c1eb..1f4bf801 100644 --- a/tests/unit/js/spec/entities/gateways/model.spec.js +++ b/tests/unit/js/spec/entities/gateways/model.spec.js @@ -23,7 +23,7 @@ describe('entities/gateways/model.js', function () { var gateway = new Gateway(settings); // only store necessary data, ie: no need to save templates - var whitelist = ['active', 'icon', 'method_id', 'method_title']; + var whitelist = ['active', 'method_id', 'method_title']; expect( gateway.toJSON() ).eqls( _.pick( settings, whitelist ) ); }); From 499aee6b63ffd52bd46ee09a123176f65789fdf2 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 13 Feb 2016 23:12:17 +0800 Subject: [PATCH 029/169] update deps --- .travis.yml | 6 +-- .../settings/receipts/template/layout-view.js | 11 ++--- assets/js/src/entities/service.js | 6 ++- assets/js/src/lib/behaviors/dropdown.js | 7 ++-- assets/js/src/lib/behaviors/tooltip.js | 7 ++-- .../js/src/lib/components/popover/service.js | 6 +-- includes/admin/class-wc-pos-settings.php | 2 +- includes/class-wc-pos-template.php | 8 ++-- package.json | 42 +++++++++---------- tests/unit/php/spec/api/test-products.php | 2 +- 10 files changed, 49 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1423c096..f2001657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,9 @@ install: # 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 cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf + # enable php-fpm, try both dirs for php5 and php7 + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null || : + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null || : - 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 diff --git a/assets/js/src/apps/settings/receipts/template/layout-view.js b/assets/js/src/apps/settings/receipts/template/layout-view.js index f4672910..153ce221 100644 --- a/assets/js/src/apps/settings/receipts/template/layout-view.js +++ b/assets/js/src/apps/settings/receipts/template/layout-view.js @@ -16,13 +16,14 @@ var View = LayoutView.extend({ editor: '#wc_pos-ace-editor' }, - /* jshint -W101 */ regions: { - editorActions : '.wc_pos-receipt-template-editor .wc_pos-settings-panel-footer', - preview : '.wc_pos-receipt-template-preview .wc_pos-settings-panel-body', - previewActions : '.wc_pos-receipt-template-preview .wc_pos-settings-panel-footer' + editorActions : + '.wc_pos-receipt-template-editor .wc_pos-settings-panel-footer', + preview : + '.wc_pos-receipt-template-preview .wc_pos-settings-panel-body', + previewActions : + '.wc_pos-receipt-template-preview .wc_pos-settings-panel-footer' }, - /* jshint +W101 */ onShow: function(){ var editor = window.ace.edit( this.ui.editor[0] ); diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index 2bd6b7a0..3478b329 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -140,6 +140,7 @@ var EntitiesService = Service.extend({ return value || undefined; }, + /* jshint -W071 */ getLocalStorage: function(options){ options = options || {}; var data; @@ -157,6 +158,7 @@ var EntitiesService = Service.extend({ return obj; }, + /* jshint +W071 */ setLocalStorage: function(options){ options = options || {}; @@ -174,7 +176,7 @@ var EntitiesService = Service.extend({ } }, - /* jshint -W074 */ + /* jshint -W071, -W074 */ remove: function(options){ options = options || {}; @@ -199,7 +201,7 @@ var EntitiesService = Service.extend({ } }, - /* jshint +W074 */ + /* jshint +W071, +W074 */ idbCollections: function(){ return _.reduce( this.getAllCollections(), function(result, col, key){ diff --git a/assets/js/src/lib/behaviors/dropdown.js b/assets/js/src/lib/behaviors/dropdown.js index 91f36f61..cb16cfb8 100644 --- a/assets/js/src/lib/behaviors/dropdown.js +++ b/assets/js/src/lib/behaviors/dropdown.js @@ -1,12 +1,11 @@ var Behavior = require('lib/config/behavior'); -var App = require('lib/config/application'); var $ = require('jquery'); var _ = require('lodash'); -var Drop = require('tether-drop'); +var TetherDrop = require('tether-drop'); var App = require('lib/config/application'); var namespace = App.prototype.namespace('dropdown'); -var _Drop = Drop.createContext({ +var Drop = TetherDrop.createContext({ classPrefix: namespace }); @@ -65,7 +64,7 @@ var Dropdown = Behavior.extend({ target : target, content : content }); - this.drop = new _Drop(options); + this.drop = new Drop(options); // drop events this.drop.on('open', this.onOpen); diff --git a/assets/js/src/lib/behaviors/tooltip.js b/assets/js/src/lib/behaviors/tooltip.js index b395c2c9..5049ecb1 100644 --- a/assets/js/src/lib/behaviors/tooltip.js +++ b/assets/js/src/lib/behaviors/tooltip.js @@ -1,12 +1,11 @@ var Behavior = require('lib/config/behavior'); -var App = require('lib/config/application'); var _ = require('lodash'); var $ = require('jquery'); -var Drop = require('tether-drop'); +var TetherDrop = require('tether-drop'); var App = require('lib/config/application'); var namespace = App.prototype.namespace('tooltip'); -var _Drop = Drop.createContext({ +var Drop = TetherDrop.createContext({ classPrefix: namespace }); @@ -46,7 +45,7 @@ var TooltipBehavior = Behavior.extend({ target : e.target, content : $(e.target).attr('title') }); - var drop = new _Drop(options); + var drop = new Drop(options); this._initialized.push(e.target); // remove the title attribute to prevent browser hover diff --git a/assets/js/src/lib/components/popover/service.js b/assets/js/src/lib/components/popover/service.js index 53566840..c0f7202b 100644 --- a/assets/js/src/lib/components/popover/service.js +++ b/assets/js/src/lib/components/popover/service.js @@ -1,12 +1,12 @@ var Service = require('lib/config/service'); -var Drop = require('tether-drop'); +var TetherDrop = require('tether-drop'); var $ = require('jquery'); var _ = require('lodash'); var Mn = require('backbone.marionette'); var App = require('lib/config/application'); var namespace = App.prototype.namespace('popover'); -var _Drop = Drop.createContext({ +var Drop = TetherDrop.createContext({ classPrefix: namespace }); @@ -39,7 +39,7 @@ module.exports = Service.extend({ this.close(); // new Drop instance - this.drop = new _Drop(options); + this.drop = new Drop(options); // attach region this.drop.region = new Mn.Region({ diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/class-wc-pos-settings.php index a8761c55..63a61bca 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/class-wc-pos-settings.php @@ -80,7 +80,7 @@ public function enqueue_admin_scripts() { wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); - wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js', array( 'jquery' ), null, true ); + wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.1/js/select2.min.js', array( 'jquery' ), null, true ); wp_register_script( 'ace', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.2/ace.js', false, null, true ); // wp_register_script( 'idb-wrapper', $external_libs[ 'idb-wrapper' ], false, null, true ); diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index 560ed70d..63c72bff 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -23,27 +23,27 @@ class WC_POS_Template { /** @var array external libraries */ static public $external_libs = array( 'min' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.min.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.min.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js', // 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', - 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js', + 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.min.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', // 'idb-shim' => 'https://cdn.rawgit.com/axemclion/IndexedDBShim/master/dist/indexeddbshim.min.js' ), 'debug' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js', // 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', - 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.js', + 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.js', // 'idb-shim' => 'https://cdn.rawgit.com/axemclion/IndexedDBShim/master/dist/indexeddbshim.js' diff --git a/package.json b/package.json index 53d8d525..d41762ef 100644 --- a/package.json +++ b/package.json @@ -37,54 +37,54 @@ "debug": "^2.2.0", "handlebars": "^4.0.5", "idb-wrapper": "kilbot/IDBWrapper", - "jquery": "^2.1.4", + "jquery": "^2.2.0", "jquery-color": "^1.0.0", "lodash": "^3.10.1", - "moment": "^2.10.6", + "moment": "^2.11.2", "node-polyglot": "^1.0.0", "normalize.css": "^3.0.3", - "select2": "^4.0.0", + "select2": "^4.0.1", "tether": "^1.1.1", - "tether-drop": "^1.4.1", + "tether-drop": "^1.4.2", "vex-js": "^2.3.4" }, "devDependencies": { - "chai": "^3.4.1", - "chai-as-promised": "^5.1.0", + "chai": "^3.5.0", + "chai-as-promised": "^5.2.0", "chai-backbone": "^0.9.4", "chai-jquery": "^2.0.0", - "coveralls": "^2.11.4", - "exports-loader": "^0.6.2", + "coveralls": "^2.11.6", + "exports-loader": "^0.6.3", "grunt": "^0.4.5", "grunt-contrib-clean": "^0.7.0", "grunt-contrib-compass": "^1.0.4", "grunt-contrib-compress": "^0.14.0", "grunt-contrib-copy": "^0.8.2", "grunt-contrib-cssmin": "^0.14.0", - "grunt-contrib-jshint": "^0.11.3", + "grunt-contrib-jshint": "^0.12.0", "grunt-contrib-symlink": "^0.3.0", - "grunt-contrib-uglify": "^0.11.0", + "grunt-contrib-uglify": "^0.11.1", "grunt-contrib-watch": "^0.6.1", "grunt-mocha-istanbul": "^3.0.1", "grunt-phpunit": "^0.3.6", - "grunt-simple-mocha": "^0.4.0", + "grunt-simple-mocha": "^0.4.1", "grunt-webpack": "^1.0.11", "grunt-wp-i18n": "^0.5.3", "imports-loader": "^0.6.5", - "istanbul": "^0.4.1", - "jsdom": "^7.1.0", + "istanbul": "^0.4.2", + "jsdom": "^8.0.2", "jshint-stylish": "^2.1.0", - "load-grunt-tasks": "^3.3.0", - "mocha": "^2.3.4", - "node-localstorage": "^0.6.0", + "load-grunt-tasks": "^3.4.0", + "mocha": "^2.4.5", + "node-localstorage": "^1.1.2", "pioneer": "^0.11.7", - "proxyquire": "^1.7.3", + "proxyquire": "^1.7.4", "raw-loader": "^0.5.1", - "selenium-webdriver": "^2.48.2", - "sinon": "^1.17.2", + "selenium-webdriver": "^2.52.0", + "sinon": "^1.17.3", "sinon-as-promised": "^4.0.0", "sinon-chai": "^2.8.0", - "webpack": "^1.12.9", - "webpack-dev-server": "^1.14.0" + "webpack": "^1.12.13", + "webpack-dev-server": "^1.14.1" } } diff --git a/tests/unit/php/spec/api/test-products.php b/tests/unit/php/spec/api/test-products.php index e2d3b977..c9768bc5 100644 --- a/tests/unit/php/spec/api/test-products.php +++ b/tests/unit/php/spec/api/test-products.php @@ -34,7 +34,7 @@ function mock_product(){ } function test_product_response(){ - $response = $this->products_api->wc_pos_api_product_response(array(), $this->product, null, null); + $response = $this->products_api->product_response(array(), $this->product, null, null); // $this->assertEquals(0.25, $response['stock_quantity']); $this->assertEquals( $this->sku, $response['barcode'] ); $this->assertEquals( wc_placeholder_img_src(), $response['featured_src'] ); From 42db5d66bc5b0bfcc83d7708565afd487d478b39 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 9 Mar 2016 22:16:42 +0800 Subject: [PATCH 030/169] improve dual-storage (WIP) --- .gitmodules | 18 - .jshintrc | 8 +- .travis.yml | 6 +- Gruntfile.js | 5 +- assets/js/src/admin-settings.js | 3 + assets/js/src/admin-system-status.js | 3 + assets/js/src/app.js | 3 + assets/js/src/apps/pos/cart/route.js | 6 +- assets/js/src/apps/pos/products/route.js | 10 +- assets/js/src/apps/support/status/route.js | 22 +- assets/js/src/entities/orders/model.js | 20 +- .../src/entities/products/models/variable.js | 2 +- assets/js/src/entities/service.js | 7 +- assets/js/src/lib/behaviors/filter.js | 4 +- .../src/lib/components/modal/error/parser.js | 2 +- .../js/src/lib/components/pagination/view.js | 7 +- assets/js/src/lib/config/ajax.js | 14 +- assets/js/src/lib/config/application.js | 4 + assets/js/src/lib/config/collection.js | 10 +- assets/js/src/lib/config/deep-model | 1 - assets/js/src/lib/config/deep-model.js | 2 +- assets/js/src/lib/config/dual-collection.js | 395 +++++------------- assets/js/src/lib/config/dual-model.js | 142 +++---- assets/js/src/lib/config/idb | 1 - assets/js/src/lib/config/idb-adapter.js | 378 +++++++++++++++++ assets/js/src/lib/config/idb-collection.js | 156 ++++--- assets/js/src/lib/config/idb-model.js | 16 + assets/js/src/lib/config/idb-sync.js | 41 ++ .../js/src/lib/config/infinite-list-view.js | 14 +- assets/js/src/lib/config/model-schema.js | 30 ++ assets/js/src/lib/config/model.js | 42 +- assets/js/src/lib/config/obscura.js | 149 ------- assets/js/src/lib/config/obscura/filtered | 1 - assets/js/src/lib/config/obscura/paginated | 1 - .../js/src/lib/config/obscura/proxy-events.js | 13 - assets/js/src/lib/config/obscura/query | 1 - assets/js/src/lib/config/obscura/query.js | 58 --- assets/js/src/lib/config/obscura/sorted | 1 - assets/js/src/lib/config/route.js | 57 +-- assets/js/src/lib/config/sync.js | 26 +- includes/api/class-wc-pos-orders.php | 57 +-- includes/class-wc-pos-template.php | 8 +- includes/views/pos/products/tmpl-product.php | 2 +- includes/views/tmpl-pagination.php | 1 - package.json | 28 +- .../integration/php/spec/api/test-orders.php | 166 ++++---- .../spec/entities/orders/collection.spec.js | 25 +- .../js/spec/entities/orders/model.spec.js | 40 +- .../spec/entities/products/collection.spec.js | 16 +- .../entities/products/models/variable.spec.js | 3 +- .../spec/lib/config/dual-collection.spec.js | 86 +--- .../js/spec/lib/config/dual-model.spec.js | 32 +- tests/unit/js/spec/lib/config/model.spec.js | 28 +- 53 files changed, 1052 insertions(+), 1119 deletions(-) delete mode 160000 assets/js/src/lib/config/deep-model delete mode 160000 assets/js/src/lib/config/idb create mode 100644 assets/js/src/lib/config/idb-adapter.js create mode 100644 assets/js/src/lib/config/idb-model.js create mode 100644 assets/js/src/lib/config/idb-sync.js create mode 100644 assets/js/src/lib/config/model-schema.js delete mode 100644 assets/js/src/lib/config/obscura.js delete mode 160000 assets/js/src/lib/config/obscura/filtered delete mode 160000 assets/js/src/lib/config/obscura/paginated delete mode 100644 assets/js/src/lib/config/obscura/proxy-events.js delete mode 160000 assets/js/src/lib/config/obscura/query delete mode 100644 assets/js/src/lib/config/obscura/query.js delete mode 160000 assets/js/src/lib/config/obscura/sorted diff --git a/.gitmodules b/.gitmodules index 4aeb8349..e0d264bb 100644 --- a/.gitmodules +++ b/.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 diff --git a/.jshintrc b/.jshintrc index 30bd08b5..7ad02fbd 100644 --- a/.jshintrc +++ b/.jshintrc @@ -3,16 +3,14 @@ "require" : true, "module" : true, "exports" : true, - "global" : true + "global" : true, + "Promise" : true }, - "predef": ["-Promise"], - "bitwise" : false, "camelcase" : false, "curly" : true, "eqeqeq" : true, - "es3" : true, "forin" : true, "immed" : true, "indent" : 2, @@ -31,7 +29,7 @@ "maxdepth" : 3, "maxstatements" : 8, "maxcomplexity" : 4, - "maxlen" : 80, + "maxlen" : 100, "asi" : false, "boss" : false, diff --git a/.travis.yml b/.travis.yml index f2001657..6471a122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php php: - '5.4' - - '7.0' +# - '7.0' addons: hosts: @@ -34,8 +34,8 @@ install: - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi # enable php-fpm, try both dirs for php5 and php7 - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null || : - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null || : + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null +# - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null - 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 diff --git a/Gruntfile.js b/Gruntfile.js index 9262ab67..defe6434 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -125,7 +125,8 @@ module.exports = function(grunt) { '!./assets/js/src/lib/config/obscura/query/**/*.js', '!./assets/js/src/lib/config/obscura/sorted/**/*.js', '!./assets/js/src/lib/config/deep-model/**/*.js', - '!./assets/js/src/lib/config/idb/**/*.js' + '!./assets/js/src/lib/config/idb/**/*.js', + '!./assets/js/src/lib/config/dual/**/*.js' ], tests: [ './test/**/*.js' @@ -171,7 +172,7 @@ module.exports = function(grunt) { accounting: 'accounting', moment: 'moment', select2: 'select2', - //'idb-wrapper': 'IDBStore' + 'idb-wrapper': 'IDBStore' }, cache: true, watch: true diff --git a/assets/js/src/admin-settings.js b/assets/js/src/admin-settings.js index 8c43845b..e59ecd91 100644 --- a/assets/js/src/admin-settings.js +++ b/assets/js/src/admin-settings.js @@ -1,6 +1,9 @@ var Application = require('apps/admin/application'); var _ = require('lodash'); +// sync config +require('lib/config/sync'); + /** * Services */ diff --git a/assets/js/src/admin-system-status.js b/assets/js/src/admin-system-status.js index 49ecdce5..4b786b23 100644 --- a/assets/js/src/admin-system-status.js +++ b/assets/js/src/admin-system-status.js @@ -1,6 +1,9 @@ var Application = require('apps/admin/application'); var _ = require('lodash'); +// sync config +require('lib/config/sync'); + /** * Services */ diff --git a/assets/js/src/app.js b/assets/js/src/app.js index c6b49901..51f4ebee 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -12,6 +12,9 @@ var SupportRouter = require('apps/support/router'); var PrintRouter = require('apps/print/router'); var _ = require('lodash'); +// sync config +require('lib/config/sync'); + /** * bootstrap Handlebars Helpers */ diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 310bb7d7..0a299e9b 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -100,8 +100,10 @@ var CartRoute = Route.extend({ * */ onShow: function(){ - this.showCart(); - this._showCart(); + if( this.activeOrder && this.activeOrder.cart ){ + this.showCart(); + this._showCart(); + } }, /** diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 8246a0c1..74a2b772 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -22,15 +22,9 @@ module.exports = Route.extend({ fetch: function() { var collection = this.filtered.superset(); if( collection.isNew() ){ - return collection.fetch() - .then(function(){ - collection.fullSync(); - }); + return collection.firstSync(); } else { - this.filtered - .resetFilters() - .removeSort() - .setPage(0); + this.filtered.removeTransforms(); } }, diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index 06e70073..f4f92167 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -2,7 +2,6 @@ var Route = require('lib/config/route'); var App = require('lib/config/application'); var Layout = require('./layout'); var Status = require('./views/status'); -var $ = require('jquery'); var _ = require('lodash'); var Radio = require('backbone.radio'); var polyglot = require('lib/utilities/polyglot'); @@ -11,6 +10,8 @@ var StatusRoute = Route.extend({ databases: ['products', 'orders', 'customers'], + counts: {}, + initialize: function(options){ this.container = options.container; this.collection = options.collection; @@ -18,11 +19,8 @@ var StatusRoute = Route.extend({ }, fetch: function(){ - // if not fetched, need to fetch all local records - var fetched = _.map(this.databases, this.fetchDB, this); - // add the server tests - //fetched.push( this._fetch() ); - return $.when.apply($, fetched); + var counts = _.map(this.databases, this.getCount, this); + return Promise.all(counts); }, render: function(){ @@ -50,7 +48,7 @@ var StatusRoute = Route.extend({ storageStatus: function(){ return _.map(this.databases, function(db){ var title = polyglot.t('titles.' + db), - count = this[db].length, + count = this[db].db.length, message = title + ': ' + count + ' ' + polyglot.t('plural.records', count); return { @@ -63,15 +61,13 @@ var StatusRoute = Route.extend({ }, this); }, - fetchDB: function(db){ + getCount: function(db){ this[db] = Radio.request('entities', 'get', { type: 'collection', name: db }); - if(this[db].isNew()){ - return this[db].fetch(); - } + return this[db].count(); }, clearDB: function(db){ @@ -81,10 +77,6 @@ var StatusRoute = Route.extend({ collection.clear() .then(function(){ return self.render(); - }) - .done(function(){ - collection._isNew = true; - collection.queue = []; }); } diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 6bd10cef..ebfd508d 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -40,12 +40,11 @@ var OrderModel = DualModel.extend({ }, /** - * can order be changed - * - perhaps check an array of closed stati? + * */ - isEditable: function( status ){ - status = status || this.get('status'); - return status === undefined || this.isDelayed( status ); + isEditable: function( state ){ + state = state || this.get('_state'); + return this.isDelayed( state ); }, /** @@ -83,10 +82,15 @@ var OrderModel = DualModel.extend({ * - allows order to change status, ie: become editable */ parse: function(resp) { - resp = DualModel.prototype.parse.call(this, resp); + resp = DualModel.prototype.parse.apply(this, arguments); + + // if new + if( resp.local_id === 'new' ){ + resp._state = this.collection.states.create; + } - // if open order with no cart, ie: new from idb or changed status - if( this.isEditable( resp.status ) && ! this.cart ){ + // if open order with no cart, ie: new from idb or changed state + if( this.isEditable( resp._state ) && ! this.cart ){ resp.taxes = this.attachTaxes( resp.taxes ); this.attachCart( resp ); this.attachGateways( resp ); diff --git a/assets/js/src/entities/products/models/variable.js b/assets/js/src/entities/products/models/variable.js index 2ceff3ca..e17e03c6 100644 --- a/assets/js/src/entities/products/models/variable.js +++ b/assets/js/src/entities/products/models/variable.js @@ -1,6 +1,6 @@ var Model = require('./abstract'); var Variations = require('../../variations/collection'); -var FilteredCollection = require('lib/config/obscura'); +var FilteredCollection = require('backbone.obscura'); var _ = require('lodash'); module.exports = Model.extend({ diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index 3478b329..a970fbb2 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -6,13 +6,12 @@ var Customers = require('./customers/collection'); var Coupons = require('./coupons/collection'); var Settings = require('./settings/collection'); var Gateways = require('./gateways/collection'); -var FilteredCollection = require('lib/config/obscura'); +var FilteredCollection = require('backbone.obscura'); var debug = require('debug')('entities'); var App = require('lib/config/application'); var _ = require('lodash'); var Radio = require('backbone.radio'); var storage = global.localStorage || window.localStorage; -var JSON = global.JSON || window.JSON; var EntitiesService = Service.extend({ channelName: 'entities', @@ -131,11 +130,11 @@ var EntitiesService = Service.extend({ }, serialize: function(value){ - return JSON.stringify(value); + return window.JSON.stringify(value); }, deserialize: function(value){ - try { value = JSON.parse(value); } + try { value = window.JSON.parse(value); } catch(e) { debug(e); } return value || undefined; }, diff --git a/assets/js/src/lib/behaviors/filter.js b/assets/js/src/lib/behaviors/filter.js index 16deab1a..3910af49 100644 --- a/assets/js/src/lib/behaviors/filter.js +++ b/assets/js/src/lib/behaviors/filter.js @@ -62,9 +62,7 @@ var Filter = Behavior.extend({ * */ _query: _.debounce( function(value){ - this.view.collection - .query(value) - .firstPage(); + this.view.collection.filterBy('search', value); }, 149), /** diff --git a/assets/js/src/lib/components/modal/error/parser.js b/assets/js/src/lib/components/modal/error/parser.js index b310c1e4..081f30fd 100644 --- a/assets/js/src/lib/components/modal/error/parser.js +++ b/assets/js/src/lib/components/modal/error/parser.js @@ -69,7 +69,7 @@ var parseArray = function( arr ){ result.title = arr[1]; } - // error thrown, SyntaxError + // error thrown, eg: SyntaxError if( _.isError( arr[2] ) && ! result.message ){ _.extend( result, parseObject( arr[2] ) ); } diff --git a/assets/js/src/lib/components/pagination/view.js b/assets/js/src/lib/components/pagination/view.js index 068bab59..0e0e6380 100644 --- a/assets/js/src/lib/components/pagination/view.js +++ b/assets/js/src/lib/components/pagination/view.js @@ -27,17 +27,14 @@ var View = ItemView.extend({ initialize: function(){ this.listenTo(this.collection.superset(), { - 'end:fullSync': this.render + 'count': this.render }); }, templateHelpers: function(){ - var queue = this.collection.superset().queue.length; return { showing : this.collection.length, - local : this.collection.superset().length, - queue : queue, - hasQueue: queue > 0 + local : _.max([this.collection.superset().db.length, this.collection.length]) }; } diff --git a/assets/js/src/lib/config/ajax.js b/assets/js/src/lib/config/ajax.js index 2bb8c9e1..d49a1d7f 100644 --- a/assets/js/src/lib/config/ajax.js +++ b/assets/js/src/lib/config/ajax.js @@ -53,7 +53,7 @@ module.exports = { success: callback }); - return $.ajax( options ).fail(onError); + return $.ajax( options ).fail( onError ); }, /* jshint +W072 */ @@ -66,7 +66,15 @@ module.exports = { }, // attach for use by bb.sync config - _ajaxSetup: ajaxSetup, - _onError: onError + ajaxSetup: ajaxSetup, + onError: onError, + + wrapError: function(options){ + var error = options.error; + options.error = function(){ + onError.apply(this, arguments); + error.apply(this, arguments); + }; + } }; \ No newline at end of file diff --git a/assets/js/src/lib/config/application.js b/assets/js/src/lib/config/application.js index d1c7d33e..5fbb8527 100644 --- a/assets/js/src/lib/config/application.js +++ b/assets/js/src/lib/config/application.js @@ -9,6 +9,9 @@ var accounting = require('accounting'); var ajax = require('./ajax'); var templateCache = require('./template-cache'); +/** + * + */ var initDebug = function( debug ){ if( debug ){ debugFunction.enable('*'); @@ -79,6 +82,7 @@ var Application = Mn.Application.extend({ /** * Extend Application prototype + * - custom Backbone.sync */ _.extend( Application.prototype, ajax ); diff --git a/assets/js/src/lib/config/collection.js b/assets/js/src/lib/config/collection.js index 346d18c1..9fdb8f85 100644 --- a/assets/js/src/lib/config/collection.js +++ b/assets/js/src/lib/config/collection.js @@ -1,8 +1,8 @@ var bb = require('backbone'); var app = require('./application'); -var sync = require('lib/config/sync'); module.exports = app.prototype.Collection = bb.Collection.extend({ + constructor: function() { bb.Collection.apply(this, arguments); this._isNew = true; @@ -13,12 +13,6 @@ module.exports = app.prototype.Collection = bb.Collection.extend({ isNew: function() { return this._isNew; - }, - - parse: function (resp){ - return resp && resp[this.name] ? resp[this.name] : resp ; - }, - - sync: sync + } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/deep-model b/assets/js/src/lib/config/deep-model deleted file mode 160000 index e6dbd26b..00000000 --- a/assets/js/src/lib/config/deep-model +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e6dbd26bc4531648c327a4517fa7a8b2f525cacd diff --git a/assets/js/src/lib/config/deep-model.js b/assets/js/src/lib/config/deep-model.js index a7c5aeea..aea2d732 100644 --- a/assets/js/src/lib/config/deep-model.js +++ b/assets/js/src/lib/config/deep-model.js @@ -1,5 +1,5 @@ var app = require('./application'); var Model = require('./model'); -var DeepModel = require('./deep-model/src/index'); +var DeepModel = require('backbone-deep-model/src/index'); module.exports = app.prototype.DeepModel = Model.extend(DeepModel); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 2f1fe309..49aada20 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -3,26 +3,35 @@ * stay in sync. */ -var Backbone = require('backbone'); -var Radio = Backbone.Radio; -var debug = require('debug')('dualCollection'); var IDBCollection = require('./idb-collection'); -var app = require('./application'); +var DualModel = require('./dual-model'); var _ = require('lodash'); -var $ = require('jquery'); -var moment = require('moment'); +var app = require('./application'); +var Radio = require('backbone.radio'); +//var debug = require('debug')('dualCollection'); module.exports = app.prototype.DualCollection = IDBCollection.extend({ + + model: DualModel, + keyPath: 'local_id', - mergeKeyPath: 'id', - _syncDelayed: true, - /** - * Items for download will be placed in queue - * Delay is the pause between the next items in queue - */ - queue: [], - delay: 500, // server breathing spacing, can also be set via radio + indexes: [ + {name: 'id', keyPath: 'id', unique: true}, + {name: 'updated_at', keyPath: 'updated_at'}, + {name: '_state', keyPath: '_state'} + ], + + pageSize: 10, + + // delayed states + states: { + //'patch' : 'UPDATE_FAILED', + 'update': 'UPDATE_FAILED', + 'create': 'CREATE_FAILED', + 'delete': 'DELETE_FAILED', + 'read' : 'READ_FAILED' + }, url: function(){ var wc_api = Radio.request('entities', 'get', { @@ -32,315 +41,125 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ return wc_api + this.name; }, - state: { - pageSize: 10 - }, - - /** - * - */ - fetch: function(options){ + toJSON: function (options) { options = options || {}; - if(options.remote){ - return this.remoteFetch(options); + var json = IDBCollection.prototype.toJSON.apply(this, arguments); + if (options.remote && this.name) { + var nested = {}; + nested[this.name] = json; + return nested; } - return IDBCollection.prototype.fetch.call(this, options); + return json; }, - /** - * - */ - remoteFetch: function(options){ - var self = this; - return this.sync('read', this, options) - .then(function(resp){ - var models = self.parse(resp); - return IDBCollection.prototype.merge.call(self, models); - }) - .then(function(models){ - var ids = _.map(models, function(model){ - return model.get('id'); - }); - self.dequeue(ids); - }); + parse: function (resp, options) { + options = options || {}; + if (options.remote) { + resp = resp && resp[this.name] ? resp[this.name] : resp; + } + return IDBCollection.prototype.parse.call(this, resp, options); }, - /** - * Full sync - * - Get any updated records - * - Audit using full list of remote ids vs local - * - Upload any local changes - */ - fullSync: function(){ + firstSync: function () { var self = this; - - if(this._syncing){ - debug('sync already in progress'); - return; - } - - this._syncing = true; - debug('fullSync started'); - this.trigger('start:fullSync'); - - return this.fetchUpdated() - .then(function(){ - return self.auditRecords(); - }) - .then(function(){ - if(self._syncDelayed){ - return self.syncDelayed(); + return this.fetch() + .then(function(records){ + if(_.isEmpty(records)){ + return self.fetchRemote(); } }) - .done(function(){ debug('fullSync complete'); }) - .fail(function(err){ debug('fullSync failed', err); }) - .always(function(){ - self._syncing = false; - self.trigger('end:fullSync'); + .then(function(){ + self.fullSync(); }); - }, - /** - * Fetch updated - * - if collection is empty, fetch the first page - * - else, get the latest updated_at from local collection - * - check server for any new updates - */ - fetchUpdated: function(){ + fullSync: function () { var self = this; - - // no local records, possibly first fetch - if(this.length === 0){ - return this.fetch({ remote: true }); - } - - //var last_update = this.formatDate( this.getState('last_update') ); - var last_update = _.compact( this.pluck('updated_at') ).sort().pop(); - - // - return this.getRemoteIds(last_update) - .then(function(ids){ - self.enqueue(ids); - return self.processQueue({ - queue: ids, - all : true - }); + return this.fetchRemoteIds() + .then(function () { + return self.count(); }); - }, - /** - * get delayed models and remote create/update - */ - syncDelayed: function(){ - var models = this.getDelayedModels(); - var sync = _.map(models, function(model){ - return model.remoteSync(null, model); - }); - return $.when.apply(this, sync); + fetch: function (options) { + options = options || {}; + if (options.remote) { + return this.fetchRemote(options); + } + return IDBCollection.prototype.fetch.call(this, options); }, - /** - * returns array of all delayed records - */ - getDelayedModels: function() { - return this.filter(function(model){ - return model.isDelayed(); + fetchRemote: function (options) { + options = options || {}; + var self = this; + var opts = _.extend({}, options, { + remove : false, + remote : true, + success: undefined }); - }, - /** - * Audit records - * - get full list of remote ids - * - compare to local ids - * - queue records for remote fetch - * - remove any garbage records - */ - auditRecords: function(){ - var local = this.pluck('id'), - self = this; - - return this.getRemoteIds() - .then(function(remote){ - var add = _.chain(remote).difference(local).compact().value(), - remove = _.chain(local).difference(remote).compact().value(); - self.enqueue(add); - self.dequeue(remove); - return self.removeGarbage(remove); + return this.sync('read', this, opts) + .then(function (response) { + response = self.parse(response, opts); + return self.putBatch(response, { + index: 'id' + }); }) - .done(function(){ debug('audit complete'); }) - .fail(function(err){ debug('audit failed', err); }); - - }, - - /** - * Get array of all entity ids from the server - * - optimised endpoint - * - optionally get ids modified since last_update - */ - getRemoteIds: function(last_update){ - var self = this; - var url = _.result(this, 'url') + '/ids'; - - if(last_update){ - debug('getting updated ids from server since ' + last_update); - } else { - debug('getting all ids from server'); - } - - return this.sync('read', this, { - url: url, - remote: true, - data: { - fields: 'id', - filter: { - limit: -1, - updated_at_min: last_update + .then(function (response) { + self.set(response, {remove: false}); + if (options.success) { + options.success.call(options.context, self, response, options); } - } - }) - // default WC REST API returns { products: [{ id: 1 }, { id: 2 } ... - .then(function(resp){ - return _.pluck( self.parse(resp), 'id' ); - }); - }, - - /** - * Remove garbage records, ie: records deleted on server - */ - removeGarbage: function(ids){ - var models = this.getModelsByRemoteIds(ids); - - if(models.length === 0){ - return; - } - - this.remove(models); - return this.db.removeBatch(_.pluck(models, 'id')); - }, - - /** - * Turn array of remoteIds into array of models - * idAttribute = 'local_id' - * remoteIdAttribute = 'id - */ - getModelsByRemoteIds: function(ids){ - return this.filter(function(model){ - return _(ids).contains(model.get('id')); - }); - }, - - /** - * Add ids to queue for potential download - */ - enqueue: function(ids){ - if(!_.isArray(ids)){ - return this.queue.push(ids); - } - this.queue = _.union(this.queue, ids); - }, - - /** - * Remove ids from queue - */ - dequeue: function(ids){ - if(!_.isArray(ids)){ - this.queue = _.without(this.queue, ids); - } else { - this.queue = _.difference(this.queue, ids); - } - }, - - /** - * - */ - hasAllRecords: function(){ - return (this.queue.length === 0); + return response; + }); }, - /** - * Process queue - * - take slice of ids from queue and remote fetch - * - optionally keep processing queue until empty - */ - /* jshint -W071, -W074 */ - processQueue: function(options){ + fetchRemoteIds: function (last_update, options) { options = options || {}; - var queue = options.queue || _.clone(this.queue); - if(queue.length === 0 || this._processingQueue){ - return; - } - this._processingQueue = true; - this.trigger('start:processQueue'); - - var self = this, - deferred = new $.Deferred(), - ids = queue.splice(0, this.state.pageSize).join(','); + var self = this, url = _.result(this, 'url') + '/ids'; - this.fetch({ + var opts = _.defaults(options, { + url : url, remote: true, - data: { - filter: options.filter || { - limit: -1, - 'in': ids + data : { + fields: ['id', 'updated_at'], + filter: { + limit : -1, + updated_at_min: last_update } } - }) - .done(function(){ - if(!options.all || queue.length === 0){ - deferred.resolve(); - } else { - deferred.progress(ids); - _.delay(self.processQueue.bind(self), self.getDelay(), options); - } - }) - .fail(deferred.reject) - .always(function(){ - self._processingQueue = false; - self.trigger('end:processQueue'); }); - return deferred.promise(); - }, - /* jshint +W071, +W074 */ - - /** - * Allows delay to be added between process queue - * - may be necessary to ease server load - */ - getDelay: function(){ - return Radio.request('entities', 'get', { - type: 'option', - name: 'delay' - }) || this.delay; + opts.success = undefined; + + return this.sync('read', this, opts) + .then(function (response) { + response = self.parse(response, opts); + return self.putBatch(response, { + index: { + keyPath: 'id', + merge : function (local, remote) { + var updated_at = _.has(local, 'updated_at') ? local.updated_at : undefined; + var data = _.merge({}, local, remote); + if (_.isUndefined(data.local_id) || updated_at !== data.updated_at) { + data._state = self.states.read; + } + return data; + } + } + }); + }) + .then(function (response) { + return response; + }); }, - /** - * Clears the IDB storage and resets the collection - */ - clear: function(){ - if(!this.db){ - return; - } - + fetchUpdatedIds: function (options) { var self = this; - return IDBCollection.prototype.clear.call(this) - .then(function(){ - self.queue = []; + return this.db.findHighestIndex('updated_at') + .then(function (last_update) { + return self.fetchRemoteIds(last_update, options); }); - }, - - /* - * Helper function to format Date.now() to RFC3339 - * - returns 2015-03-11T02:30:43.925Z (with milliseconds) - * - undefined if no timestamp - */ - formatDate: function(timestamp) { - if(timestamp){ - //return moment(timestamp).utc().format('YYYY-MM-DDTHH:mm:ss') + 'Z'; - return moment(timestamp).toISOString(); - } } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 1f851169..09c7d1e2 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -1,34 +1,22 @@ -var DeepModel = require('./deep-model'); -var app = require('./application'); +var bb = require('backbone'); +var IDBModel = require('./idb-model'); var _ = require('lodash'); -//var debug = require('debug')('dualModel'); +var app = require('./application'); -module.exports = app.prototype.DualModel = DeepModel.extend({ +module.exports = app.prototype.DualModel = IDBModel.extend({ idAttribute: 'local_id', remoteIdAttribute: 'id', - fields: ['title'], - - defaults: { - status: 'CREATE_FAILED' + isDelayed: function(state){ + state = state || this.get('_state'); + return _.includes(this.collection.states, state); }, -//validate: function(attrs){ -// var obj = {}; -// if(attrs[this.idAttribute]) { -// obj[this.idAttribute] = parseInt(attrs[this.idAttribute], 10); -// } -// if(attrs[this.remoteIdAttribute]){ -// obj[this.remoteIdAttribute] = parseInt(attrs[this.remoteIdAttribute], 10); -// } -// this.set(obj, {silent: true}); -//}, - url: function(){ var remoteId = this.get(this.remoteIdAttribute), - urlRoot = _.result(this.collection, 'url'); + urlRoot = _.result(this.collection, 'url'); if(remoteId){ return '' + urlRoot + '/' + remoteId + '/'; @@ -36,82 +24,72 @@ module.exports = app.prototype.DualModel = DeepModel.extend({ return urlRoot; }, - // delayed states - states: { - //'patch' : 'UPDATE_FAILED', - 'update' : 'UPDATE_FAILED', - 'create' : 'CREATE_FAILED', - 'delete' : 'DELETE_FAILED' + sync: function( method, model, options ){ + options = options || {}; + this.setLocalState( method ); + if( options.remote ){ + return this.remoteSync( method, model, options ); + } + return bb.sync.call( this, method, model, options ); }, - hasRemoteId: function() { - return !!this.get(this.remoteIdAttribute); + remoteSync: function( method, model, options ){ + var self = this, opts = _.extend({}, options, { + remote: false, + success: false + }); + return bb.sync.call( this, method, model, opts ) + .then( function(){ + var remoteMethod = self.getRemoteMethod(); + opts.remote = true; + return bb.sync.call( self, remoteMethod, model, opts ); + }) + .then( function( resp ){ + resp = options.parse ? model.parse(resp, options) : resp; + model.set( resp ); + opts.remote = false; + opts.success = options.success; + return bb.sync.call( self, 'update', model, opts ); + }); }, - isDelayed: function( status ) { - status = status || this.get('status'); - return status === this.states['update'] || - status === this.states['create'] || - status === this.states['delete']; + setLocalState: function( method ){ + method = method === 'patch' ? 'update' : method; + if( method === 'update' && !this.hasRemoteId() ){ + method = 'create'; + } + if( method === 'create' && this.hasRemoteId() ){ + method = 'update'; + } + this.set({ _state: this.collection.states[method] }); }, - /** - * - sync to idb with correct status - * - if remote, sync to remote - */ - sync: function(method, model, options){ - options = options || {}; - var opts = _.clone(options); - opts.remote = undefined; - var m = method === 'patch' ? 'update' : method; - - this.setStatus(m); - return DeepModel.prototype.sync.call(this, m, model, opts) - .then(function(){ - if(options.remote){ - return model.remoteSync(null, model, options); - } - }); + getRemoteMethod: function(){ + return _.invert( this.collection.states )[ this.get('_state') ]; }, - remoteSync: function(method, model, options){ - model = model || this; - options = options || {}; - options.remote = true; - method = method || model.getMethod(); - - return DeepModel.prototype.sync.call(this, method, model, options) - .then(function(resp){ - if(resp){ - var data = model.parse(resp); - return model.merge(data); - } - }); + hasRemoteId: function() { + return !!this.get( this.remoteIdAttribute ); }, - setStatus: function(method){ - if(this.states[method]){ - if(method === 'update' && !this.hasRemoteId()){ - method = 'create'; - } - this.set({ status: this.states[method] }); + toJSON: function( options ){ + options = options || {}; + var json = IDBModel.prototype.toJSON.apply( this, arguments ); + if( options.remote && this.name ) { + var nested = {}; + nested[this.name] = json; + return nested; } + return json; }, - getMethod: function(){ - return _.invert( this.states )[ this.get('status') ]; - }, - - merge: function(resp){ - // todo: merge - // - merge should take bb & json? - this.set(resp); - if(this.isDelayed()){ - this.unset('status'); - } - if(this.collection && this.collection.db){ - return this.collection.merge( this.toJSON() ); + parse: function( resp, options ) { + options = options || {}; + if( options.remote ){ + resp = resp && resp[this.name] ? resp[this.name] : resp; + //resp._state = undefined; } + return IDBModel.prototype.parse.call( this, resp, options ); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/idb b/assets/js/src/lib/config/idb deleted file mode 160000 index 087f53b3..00000000 --- a/assets/js/src/lib/config/idb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 087f53b361c2b5f4b1ee0a67c039317d2653ff29 diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js new file mode 100644 index 00000000..1fa68ce2 --- /dev/null +++ b/assets/js/src/lib/config/idb-adapter.js @@ -0,0 +1,378 @@ +var _ = require('lodash'); +var is_safari = window.navigator.userAgent.indexOf('Safari') !== -1 && + window.navigator.userAgent.indexOf('Chrome') === -1 && + window.navigator.userAgent.indexOf('Android') === -1; + +var indexedDB = window.indexedDB; + +var consts = { + 'READ_ONLY' : 'readonly', + 'READ_WRITE' : 'readwrite', + 'VERSION_CHANGE' : 'versionchange', + 'NEXT' : 'next', + 'NEXT_NO_DUPLICATE' : 'nextunique', + 'PREV' : 'prev', + 'PREV_NO_DUPLICATE' : 'prevunique' +}; + +var defaults = { + storeName : 'store', + storePrefix : 'Prefix_', + dbVersion : 1, + keyPath : 'id', + autoIncrement : true, + indexes : [], + pageSize : 10, + onerror : function(options) { + options = options || {}; + var err = new Error(options._error.message); + err.code = event.target.errorCode; + options._error.callback(err); + } +}; + +function IDBAdapter( options ){ + this.opts = _.defaults( options, defaults ); + this.opts.dbName = this.opts.storePrefix + this.opts.storeName; +} + +IDBAdapter.prototype = { + + constructor: IDBAdapter, + + open: function (options) { + options = options || {}; + if (!this._open) { + var self = this; + + this._open = new Promise(function (resolve, reject) { + var request = indexedDB.open(self.opts.dbName); + + request.onsuccess = function (event) { + self.db = event.target.result; + + // get count & safari hack + self.count() + .then(function () { + if(is_safari){ + return self.findHighestIndex(); + } + }) + .then(function (key) { + if(key){ + self.highestKey = key || 0; + } + resolve(self.db); + }); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'open indexedDB error', callback: reject}; + self.opts.onerror(options); + }; + + request.onupgradeneeded = function (event) { + var store = event.currentTarget.result.createObjectStore(self.opts.storeName, self.opts); + + self.opts.indexes.forEach(function (index) { + store.createIndex(index.name, index.keyPath, { + unique: index.unique + }); + }); + }; + }); + } + + return this._open; + }, + + close: function () { + this.db.close(); + this.db = undefined; + this._open = undefined; + }, + + getTransaction: function (access) { + return this.db.transaction([this.opts.storeName], access); + }, + + getObjectStore: function (access) { + return this.getTransaction(access).objectStore(this.opts.storeName); + }, + + count: function (options) { + options = options || {}; + var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + + return new Promise(function (resolve, reject) { + var request = objectStore.count(); + + request.onsuccess = function (event) { + self.length = event.target.result || 0; + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'count error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + create: function(data, options){ + var self = this; + return this.add(data, options) + .then(function(key){ + return self.get(key, options); + }); + }, + + update: function(data, options){ + var self = this; + return this.put(data, options) + .then(function(key){ + return self.get(key, options); + }); + }, + + put: function (data, options) { + options = options || {}; + var self = this, keyPath = this.opts.keyPath; + var objectStore = this.getObjectStore(consts.READ_WRITE); + + // merge on index keyPath + if (options.index) { + return this.merge(data, options); + } + + if(!data[keyPath]){ + return this.add(data, options); + } + + return new Promise(function (resolve, reject) { + var request = objectStore.put(data); + + request.onsuccess = function (event) { + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'put error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + add: function(data, options){ + options = options || {}; + var self = this, keyPath = this.opts.keyPath; + var objectStore = this.getObjectStore(consts.READ_WRITE); + + if(is_safari){ + data[keyPath] = ++this.highestKey; + } + + return new Promise(function (resolve, reject) { + var request = objectStore.add(data); + + request.onsuccess = function (event) { + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'add error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + get: function (key, options) { + options = options || {}; + var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + + return new Promise(function (resolve, reject) { + var request = objectStore.get(key); + + request.onsuccess = function (event) { + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'get error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + delete: function (key, options) { + options = options || {}; + var self = this, objectStore = this.getObjectStore(consts.READ_WRITE); + + return new Promise(function (resolve, reject) { + var request = objectStore.delete(key); + + request.onsuccess = function (event) { + resolve(event.target.result); // undefined + }; + + request.onerror = function (event) { + var err = new Error('delete error'); + err.code = event.target.errorCode; + reject(err); + }; + request.onerror = function (event) { + options._error = {event: event, message: 'delete error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + putBatch: function (dataArray, options) { + options = options || {}; + var batch = []; + + _.each(dataArray, function (data) { + batch.push(this.update(data, options)); + }.bind(this)); + + return Promise.all(batch); + }, + + merge: function (data, options) { + options = options || {}; + var self = this, keyPath = options.index, + fn = function(result, data){ + return _.merge({}, result, data); // waiting for lodash 4 + }; + + if(_.isObject(options.index)){ + keyPath = _.get(options, ['index', 'keyPath'], this.opts.keyPath); + if(_.isFunction(options.index.merge)){ + fn = options.index.merge; + } + } + + return this.getByIndex(keyPath, data[keyPath], options) + .then(function(result){ + return self.put(fn(result, data)); + }); + }, + + getByIndex: function(keyPath, key, options){ + options = options || {}; + var self = this; + var objectStore = this.getObjectStore(consts.READ_ONLY); + var openIndex = objectStore.index(keyPath); + var request = openIndex.get(key); + + return new Promise(function (resolve, reject) { + request.onsuccess = function (event) { + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'get by index error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + getAll: function (options) { + options = options || {}; + var self = this; + var limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize); + var objectStore = this.getObjectStore(consts.READ_ONLY); + + // getAll fallback + if (objectStore.getAll === undefined) { + return this._getAll(objectStore, limit, options); + } + + return new Promise(function (resolve, reject) { + var request = objectStore.getAll(null, limit); + + request.onsuccess = function (event) { + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'getAll error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + _getAll: function (objectStore, limit, options) { + options = options || {}; + var self = this; + if (limit === -1) { + limit = Infinity; + } + + return new Promise(function (resolve, reject) { + var request = objectStore.openCursor(); + var records = []; + + request.onsuccess = function (event) { + var cursor = event.target.result; + if (cursor && records.length < limit) { + records.push(cursor.value); + return cursor.continue(); + } + resolve(records); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'getAll error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + clear: function (options) { + options = options || {}; + var self = this, objectStore = this.getObjectStore(consts.READ_WRITE); + + return new Promise(function (resolve, reject) { + var request = objectStore.clear(); + + request.onsuccess = function (event) { + self.length = 0; + resolve(event.target.result); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'clear error', callback: reject}; + self.opts.onerror(options); + }; + }); + }, + + findHighestIndex: function (keyPath, options) { + options = options || {}; + var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + + return new Promise(function (resolve, reject) { + var request; + if(keyPath){ + var openIndex = objectStore.index(keyPath); + request = openIndex.openCursor(null, consts.PREV); + } else { + request = objectStore.openCursor(null, consts.PREV); + } + + request.onsuccess = function (event) { + var value = _.get(event, ['target', 'result', 'key']); + resolve(value); + }; + + request.onerror = function (event) { + options._error = {event: event, message: 'find highest key error', callback: reject}; + self.opts.onerror(options); + }; + }); + } + +}; + +module.exports = IDBAdapter; \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index db5e28ac..59f95fc6 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -1,70 +1,110 @@ -/** - * TODO: merge sync/idb.js & sync/idbsync.js? - */ - var Collection = require('./collection'); -//var debug = require('debug')('idbCollection'); var app = require('./application'); -var IndexedDB = require('./idb/src/idb'); var Radio = require('backbone.radio'); +var IDBModel = require('./idb-model'); +var IDBAdapter = require('./idb-adapter'); +var _ = require('lodash'); -module.exports = app.prototype.IndexedDBCollection = Collection.extend({ - name : 'store', - storePrefix : 'wc_pos_', - dbVersion : 4006, - keyPath : 'local_id', - autoIncrement : true, - indexes : [ - {name: 'local_id', keyPath: 'local_id', unique: true}, - {name: 'id', keyPath: 'id', unique: true} - ], +module.exports = app.prototype.IDBCollection = Collection.extend({ - constructor: function() { - Collection.apply(this, arguments); + model: IDBModel, + + name : 'store', + storePrefix: 'wc_pos_', - var options = { - storeName : this.name, - storePrefix : this.storePrefix, - dbVersion : this.dbVersion, - keyPath : this.keyPath, - autoIncrement : this.autoIncrement, - indexes : this.indexes, - defaultErrorHandler : function(error){ - Radio.trigger('global', 'error', error); - } + /** + * + */ + constructor: function () { + var opts = { + storeName : this.name, + storePrefix : this.storePrefix, + dbVersion : this.dbVersion, + keyPath : this.keyPath, + autoIncrement: this.autoIncrement, + indexes : this.indexes, + pageSize : this.pageSize }; - this.db = new IndexedDB(options, this); + this.db = new IDBAdapter(opts); this.versionCheck(); - this.db.open() - // error opening db - .fail(function(error){ - Radio.trigger('global', 'error', error); + + Collection.apply(this, arguments); + }, + + /** + * Clears the IDB storage and resets the collection + */ + clear: function () { + var self = this; + return this.db.open() + .then(function () { + self.reset(); + self._isNew = true; + return self.db.clear(); }); }, - merge: function(models){ + /** + * + */ + count: function () { var self = this; - return this.db.merge(models) - .then(function(){ - var models = Array.prototype.slice.apply(arguments); - return self.add(models, {merge: true}); + return this.db.open() + .then(function () { + return self.db.count(); + }) + .then(function (count) { + self.trigger('count', count); }); }, /** - * Clears the IDB storage and resets the collection + * */ - clear: function(){ - if(!this.db){ + putBatch: function (models, options) { + options = options || {}; + var self = this; + if (_.isEmpty(models)) { + models = this.getChangedModels(); + } + if (!models) { return; } + return this.db.open() + .then(function () { + return self.db.putBatch(models, options); + }); + }, + /** + * + */ + getChangedModels: function () { + return this.filter(function (model) { + return model.isNew() || model.hasChanged(); + }); + }, + + /** + * + */ + removeBatch: function (models, options) { + options = options || {}; var self = this; + if (_.isEmpty(models)) { + return; + } return this.db.open() - .then(function(){ - self.reset(); - return self.db.clear(); + .then(function () { + return self.db.removeBatch(models); + }) + .then(function () { + self.remove(models); + if (options.success) { + options.success(self, models, options); + } + return models; }); }, @@ -74,24 +114,24 @@ module.exports = app.prototype.IndexedDBCollection = Collection.extend({ * this version check will compare the version numbers * idb is flushed on version change */ - versionCheck: function(){ + versionCheck: function () { var name = this.name; - var newVersion = parseInt( Radio.request('entities', 'get', { - type: 'option', - name: 'idbVersion' - }), 10 ) || 0; - var oldVersion = parseInt( Radio.request('entities', 'get', { - type: 'localStorage', - name: name + '_idbVersion' - }), 10 ) || 0; + var newVersion = parseInt(Radio.request('entities', 'get', { + type: 'option', + name: 'idbVersion' + }), 10) || 0; + var oldVersion = parseInt(Radio.request('entities', 'get', { + type: 'localStorage', + name: name + '_idbVersion' + }), 10) || 0; - if( newVersion !== oldVersion ){ - this.clear().then(function(){ + if (newVersion !== oldVersion) { + this.clear().then(function () { Radio.request('entities', 'set', { - type : 'localStorage', - name : name + '_idbVersion', - data : newVersion + type: 'localStorage', + name: name + '_idbVersion', + data: newVersion }); }); } diff --git a/assets/js/src/lib/config/idb-model.js b/assets/js/src/lib/config/idb-model.js new file mode 100644 index 00000000..52fda5ee --- /dev/null +++ b/assets/js/src/lib/config/idb-model.js @@ -0,0 +1,16 @@ +var DeepModel = require('./deep-model'); +var app = require('./application'); +var _ = require('lodash'); + +module.exports = app.prototype.IDBModel = DeepModel.extend({ + + /** + * + */ + constructor: function( attributes, options ){ + this.db = _.get( options, ['collection', 'db'] ); + DeepModel.apply( this, arguments ); + } + + +}); \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js new file mode 100644 index 00000000..d0430887 --- /dev/null +++ b/assets/js/src/lib/config/idb-sync.js @@ -0,0 +1,41 @@ +var bb = require('backbone'); + +/* jshint -W074 */ +module.exports = function(method, entity, options) { + options = options || {}; + var isModel = entity instanceof bb.Model; + var data = entity.toJSON(); + + return entity.db.open() + .then(function(){ + switch(method){ + case 'read': + if( isModel ){ + return entity.db.get( entity.id, options ); + } + return entity.db.getAll( options ); + case 'create': + return entity.db.create( data, options ); + case 'update': + return entity.db.update( data, options ); + case 'delete': + if( isModel ){ + return entity.db.delete( entity.id, options ); + } + return; + } + }) + .then(function(resp){ + if(options.success){ + options.success(resp); + } + return resp; + }) + .catch(function(resp){ + if( options.error ){ + options.error(resp); + } + }); + +}; +/* jshint +W074 */ \ No newline at end of file diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index 60850afc..ef63fcaa 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -8,7 +8,7 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ template: function(){ return '
        ' + '
          ' + - '
          '; + '
          '; }, constructor: function() { @@ -68,14 +68,14 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ loadMore: function() { // get next page from filtered collection - if (this.collection.hasNextPage()) { - return this.collection.appendNextPage(); - } + //if (this.collection.hasNextPage()) { + // return this.collection.appendNextPage(); + //} // load more from queue - if (this.collection.superset().queue.length > 0) { - this.remoteFetchMore(); - } + //if (this.collection.superset().queue.length > 0) { + // this.remoteFetchMore(); + //} }, remoteFetchMore: function(){ diff --git a/assets/js/src/lib/config/model-schema.js b/assets/js/src/lib/config/model-schema.js new file mode 100644 index 00000000..b9ddfeb7 --- /dev/null +++ b/assets/js/src/lib/config/model-schema.js @@ -0,0 +1,30 @@ +/** + * Simple schema parsing for Backbone Models + */ +var _ = require('lodash'); + +var fns = { + 'float' : parseFloat, + 'int' : parseInt, + 'number': function (num) { + num = Number(num); + return _.isNaN(num) ? 0 : num; + } +}; + +module.exports = { + + parse: function( modelParse, options ){ + var parse, resp = modelParse.call(this, options); + + _.each( this.schema, function( value, attr ) { + parse = fns[value]; + if( _.has(resp, attr) && parse ){ + resp[attr] = parse( resp[attr] ); + } + }); + + return resp; + } + +}; \ No newline at end of file diff --git a/assets/js/src/lib/config/model.js b/assets/js/src/lib/config/model.js index 94f51d7f..9cb477db 100644 --- a/assets/js/src/lib/config/model.js +++ b/assets/js/src/lib/config/model.js @@ -1,44 +1,16 @@ var bb = require('backbone'); var app = require('./application'); var _ = require('lodash'); -var sync = require('lib/config/sync'); - -// parsing functions -var parse = { - 'float': parseFloat, - 'int': parseInt, - 'number': function(num){ - num = Number(num); - return _.isNaN(num) ? 0 : num; - } -}; +var schema = require('./model-schema'); module.exports = app.prototype.Model = bb.Model.extend({ - parse: function (resp){ - var data = resp && resp[this.name] ? resp[this.name] : resp; - if( ! data ){ - return; + constructor: function(){ + // model schema + if( this.schema ){ + this.parse = _.wrap( this.parse, schema.parse ); } - - // check data type - _.each( this.schema, function( val, attr ) { - - // if attribute exists - if( ! _.has( data, attr ) ){ - return; - } - - // string, eg: 'float' - if( _.isString(val) && parse[val] ){ - data[attr] = parse[val]( data[attr] ); - } - - }, this); - - return data; - }, - - sync: sync + bb.Model.apply( this, arguments ); + } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/obscura.js b/assets/js/src/lib/config/obscura.js deleted file mode 100644 index c238c9a0..00000000 --- a/assets/js/src/lib/config/obscura.js +++ /dev/null @@ -1,149 +0,0 @@ -/* jshint -W071, -W003, -W021 */ -var _ = require('lodash'); -var Backbone = require('backbone'); -var FilteredCollection = require('./obscura/filtered'); -var SortedCollection = require('./obscura/sorted'); -var PaginatedCollection = require('./obscura/paginated'); -var proxyCollection = require('backbone-collection-proxy'); -var proxyEvents = require('./obscura/proxy-events'); -var query = require('./obscura/query'); -var app = require('./application'); - -// extend FilteredCollection with query methods -_.extend(FilteredCollection.prototype, query); - -function Obscura(superset, options) { - this._superset = superset; - this._filtered = new FilteredCollection(superset, options); - this._sorted = new SortedCollection(this._filtered, options); - this._paginated = new PaginatedCollection(this._sorted, options); - proxyCollection(this._paginated, this); - proxyEvents.call(this, this._filtered, filteredEvents); - proxyEvents.call(this, this._sorted, sortedEvents); - proxyEvents.call(this, this._paginated, paginatedEvents); - this.initialize(options); -} - -var methods = { - superset: function () { - return this._superset; - }, - getFilteredLength: function () { - return this._filtered.length; - }, - removeTransforms: function () { - this._filtered.resetFilters(); - this._sorted.removeSort(); - this._paginated.removePagination(); - return this; - }, - destroy: function () { - this.stopListening(); - this._filtered.destroy(); - this._sorted.destroy(); - this._paginated.destroy(); - this.length = 0; - this.trigger('obscura:destroy'); - } -}; - -var filteredMethods = [ - 'filterBy', - 'removeFilter', - 'resetFilters', - 'refilter', - 'hasFilter', - 'getFilters', - 'query', - 'getQuery', - 'getTokens', - 'getRemoteFilter' -]; -var filteredEvents = [ - 'filtered:add', - 'filtered:remove', - 'filtered:reset' -]; -var sortedMethods = [ - 'setSort', - 'reverseSort', - 'removeSort' -]; -var sortedEvents = [ - 'sorted:add', - 'sorted:remove' -]; -var paginatedMethods = [ - 'setPerPage', - 'setPage', - 'getPerPage', - 'getNumPages', - 'getPage', - 'hasNextPage', - 'hasPrevPage', - 'nextPage', - 'prevPage', - 'movePage', - 'removePagination', - 'firstPage', - 'lastPage', - 'appendNextPage' -]; -var paginatedEvents = [ - 'paginated:change:perPage', - 'paginated:change:page', - 'paginated:change:numPages' -]; -var unsupportedMethods = [ - 'add', - 'create', - 'remove', - 'set', - 'reset', - 'sort', - 'parse', - 'sync', - 'fetch', - 'push', - 'pop', - 'shift', - 'unshift' -]; - -_.each(filteredMethods, function (method) { - methods[method] = function () { - var result = FilteredCollection.prototype[method] - .apply(this._filtered, arguments); - return result === this._filtered ? this : result; - }; -}); -_.each(paginatedMethods, function (method) { - methods[method] = function () { - var result = PaginatedCollection.prototype[method] - .apply(this._paginated, arguments); - return result === this._paginated ? this : result; - }; -}); -_.each(sortedMethods, function (method) { - methods[method] = function () { - var result = SortedCollection.prototype[method] - .apply(this._sorted, arguments); - return result === this._sorted ? this : result; - }; -}); -_.each(unsupportedMethods, function (method) { - methods[method] = function () { - throw new Error( - 'Backbone.Obscura: Unsupported method: ' + - method + ' called on read-only proxy' - ); - }; -}); - -_.extend(Obscura.prototype, methods, Backbone.Events); -Obscura = Backbone.Collection.extend(Obscura.prototype); -Obscura.FilteredCollection = FilteredCollection; -Obscura.SortedCollection = SortedCollection; -Obscura.PaginatedCollection = PaginatedCollection; -module.exports = app.prototype.Obscura = Obscura; -/* jshint +W071, +W003, +W021 */ \ No newline at end of file diff --git a/assets/js/src/lib/config/obscura/filtered b/assets/js/src/lib/config/obscura/filtered deleted file mode 160000 index 674da74d..00000000 --- a/assets/js/src/lib/config/obscura/filtered +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 674da74d5035c6739ed41605d70b20872eda4d9e diff --git a/assets/js/src/lib/config/obscura/paginated b/assets/js/src/lib/config/obscura/paginated deleted file mode 160000 index 7eb152c1..00000000 --- a/assets/js/src/lib/config/obscura/paginated +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7eb152c1b679be2b2c497fa7a919fb916db4e519 diff --git a/assets/js/src/lib/config/obscura/proxy-events.js b/assets/js/src/lib/config/obscura/proxy-events.js deleted file mode 100644 index 86d7395c..00000000 --- a/assets/js/src/lib/config/obscura/proxy-events.js +++ /dev/null @@ -1,13 +0,0 @@ -var _ = require('lodash'); - -function proxyEvents(from, eventNames) { - _.each(eventNames, function (eventName) { - this.listenTo(from, eventName, function () { - var args = _.toArray(arguments); - args.unshift(eventName); - this.trigger.apply(this, args); - }); - }, this); -} - -module.exports = proxyEvents; \ No newline at end of file diff --git a/assets/js/src/lib/config/obscura/query b/assets/js/src/lib/config/obscura/query deleted file mode 160000 index 3f8b7d9f..00000000 --- a/assets/js/src/lib/config/obscura/query +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f8b7d9f311c0a78004cc54e72ce3adc760d5ed1 diff --git a/assets/js/src/lib/config/obscura/query.js b/assets/js/src/lib/config/obscura/query.js deleted file mode 100644 index 66abecd0..00000000 --- a/assets/js/src/lib/config/obscura/query.js +++ /dev/null @@ -1,58 +0,0 @@ -/** - * query methods to extend Filtered Collection - */ - -var _ = require('lodash'); -var query = require('./query/query'); - -module.exports = { - - query: function (filterName, filter) { - if( _.isUndefined(filter) ) { - filter = filterName; - filterName = 'search'; - } - this._query = filter; - if( filter === '' ){ - return this.removeFilter(filterName); - } - return this.filterBy(filterName, - _.bind( query, this, filter ) - ); - }, - - getQuery: function(){ - return this._query; - }, - - getTokens: function(){ - return this._tokens; - }, - - getRemoteFilter: function(){ - if(!this._tokens){ - return; - } - - var filter = { - 'not_in': this.pluck('id').join(',') - }; - - _.each(this._tokens, function(token){ - - // simple search - if(token.type === 'string'){ - filter.q = token.query; - } - - // simple prefix search - if(token.type === 'prefix'){ - filter[token.prefix] = token.query; - } - - }); - - return filter; - } - -}; \ No newline at end of file diff --git a/assets/js/src/lib/config/obscura/sorted b/assets/js/src/lib/config/obscura/sorted deleted file mode 160000 index d7faf2b2..00000000 --- a/assets/js/src/lib/config/obscura/sorted +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7faf2b25fabf77de3f4294cec452dcfab68ed07 diff --git a/assets/js/src/lib/config/route.js b/assets/js/src/lib/config/route.js index c8416604..1e069673 100644 --- a/assets/js/src/lib/config/route.js +++ b/assets/js/src/lib/config/route.js @@ -1,6 +1,5 @@ var bb = require('backbone'); var Mn = require('backbone.marionette'); -var $ = require('jquery'); var _ = require('lodash'); var app = require('./application'); var LoadingService = require('lib/components/loading/service'); @@ -8,12 +7,12 @@ var Radio = require('backbone.radio'); var globalChannel = Radio.channel('global'); module.exports = app.prototype.Route = Mn.Object.extend({ - constructor: function( options ) { - this.mergeOptions( options, ['column'] ); + constructor: function (options) { + this.mergeOptions(options, ['column']); this.initialize.apply(this, arguments); }, - _triggerMethod: function(name, args) { + _triggerMethod: function (name, args) { if (this.router) { this.router.triggerMethod.apply( this.router, @@ -23,13 +22,13 @@ module.exports = app.prototype.Route = Mn.Object.extend({ this.triggerMethod.apply(this, [name].concat(args)); }, - enter: function(args) { + enter: function (args) { var self = this; this.transitioning = true; this._triggerMethod('before:enter', args); this._triggerMethod('before:fetch', args); - _.defer(function() { + _.defer(function () { if (self.transitioning) { self.loading = new LoadingService({ container: self.container @@ -37,35 +36,43 @@ module.exports = app.prototype.Route = Mn.Object.extend({ } }); - return $.when(this.fetch.call(this, args)).then(function() { - self._triggerMethod('fetch', args); - self._triggerMethod('before:render', args); - }).then(function() { - self.transitioning = false; - return self.render.apply(self, args); - }).then(function() { - self._triggerMethod('render', args); - self._triggerMethod('enter', args); - }).fail(function() { - self._triggerMethod('error', args); - }); + return Promise.resolve() + .then(function () { + return self.fetch.call(self, args); + }) + .then(function () { + self._triggerMethod('fetch', args); + self._triggerMethod('before:render', args); + }) + .then(function () { + self.transitioning = false; + return self.render.apply(self, args); + }) + .then(function () { + self._triggerMethod('render', args); + self._triggerMethod('enter', args); + }) + .catch(function (err) { + Radio.trigger('global', 'error', err); + self._triggerMethod('error', args); + }); }, - navigate: function() { + navigate: function () { bb.history.navigate.apply(bb.history, arguments); }, - fetch : function() {}, - render : function() {}, + fetch : function () {}, + render: function () {}, /** * Helper function to set the columned layout tabs */ - setTabLabel: function(label){ - if( this.column ){ + setTabLabel: function (label) { + if (this.column) { globalChannel.trigger('tab:label', { - tab : this.column, - label : label + tab : this.column, + label: label }); } } diff --git a/assets/js/src/lib/config/sync.js b/assets/js/src/lib/config/sync.js index db16c9e9..2e7bfa43 100644 --- a/assets/js/src/lib/config/sync.js +++ b/assets/js/src/lib/config/sync.js @@ -3,29 +3,21 @@ // - retry for server timeouts var bb = require('backbone'); -var App = require('lib/config/application'); -var idbSync = require('./idb/src/sync'); var ajaxSync = bb.sync; +var idbSync = require('./idb-sync'); +var App = require('./application'); -module.exports = function(method, entity, options) { +bb.sync = function(method, entity, options) { - // wrap sync errors, kick to error modal - var onError = options.error; - options.error = function(){ - App.prototype._onError.apply(this, arguments); - if(onError) { - onError.apply(options.context, arguments); - } - }; + // wrap sync errors + App.prototype.wrapError(options); - // idb - if(!options.remote && - (entity.db || (entity.collection && entity.collection.db))){ - return idbSync.apply(this, [method, entity, options]); + if( !options.remote && entity.db ) { + return idbSync.apply(this, arguments); } // add headers, global data etc - App.prototype._ajaxSetup( options ); + App.prototype.ajaxSetup( options ); - return ajaxSync.apply(this, [method, entity, options]); + return ajaxSync.apply(this, arguments); }; \ No newline at end of file diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/class-wc-pos-orders.php index 242e644a..bf4833cc 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/class-wc-pos-orders.php @@ -36,9 +36,6 @@ public function __construct( WC_API_Server $server ) { add_filter( 'woocommerce_email', array( $this, 'woocommerce_email' ), 99 ); if( substr( $server->path, 0, strlen( $this->base ) ) === $this->base ){ - // order data - add_filter( 'woocommerce_api_dispatch_args', array( $this, 'dispatch_args' ), 10, 2 ); - add_filter( 'woocommerce_api_create_order_data', array( $this, 'create_order_data') ); add_filter( 'woocommerce_api_edit_order_data', array( $this, 'edit_order_data'), 10, 2 ); add_action( 'woocommerce_api_create_order', array( $this, 'create_order') ); @@ -69,28 +66,6 @@ public function register_routes( $routes ) { } - /** - * Parse data sent by POS - * - * @param array $args - * @param $callback - * @return array - */ - public function dispatch_args( $args, $callback ){ - if( !isset( $args['data'] ) ){ - return $args; - } - - if( !isset( $args['data']['order'] ) ){ - $args['data'] = array( - 'order' => $args['data'] - ); - } - - return $args; - } - - /** * Create order data * @@ -644,26 +619,26 @@ public function order_response( $order_data, $order, $fields, $server ) { */ private function add_cashier_details( $order ) { - if ( !$cashier_id = get_post_meta( $order->id, '_pos_user', true ) ) { - return; - } + if ( !$cashier_id = get_post_meta( $order->id, '_pos_user', true ) ) { + return; + } - $first_name = get_post_meta( $order->id, '_pos_user_first_name', true ); - $last_name = get_post_meta( $order->id, '_pos_user_last_name', true ); - if ( !$first_name && !$last_name && $user_info = get_userdata( $cashier_id ) ) { - $first_name = $user_info->first_name; - $last_name = $user_info->last_name; - } + $first_name = get_post_meta( $order->id, '_pos_user_first_name', true ); + $last_name = get_post_meta( $order->id, '_pos_user_last_name', true ); + if ( !$first_name && !$last_name && $user_info = get_userdata( $cashier_id ) ) { + $first_name = $user_info->first_name; + $last_name = $user_info->last_name; + } - $cashier = array( - 'id' => $cashier_id, - 'first_name' => $first_name, - 'last_name' => $last_name - ); + $cashier = array( + 'id' => $cashier_id, + 'first_name' => $first_name, + 'last_name' => $last_name + ); - return apply_filters( 'woocommerce_pos_order_response_cashier', $cashier, $order ); + return apply_filters( 'woocommerce_pos_order_response_cashier', $cashier, $order ); - } + } /** * @param $order diff --git a/includes/class-wc-pos-template.php b/includes/class-wc-pos-template.php index 63c72bff..26576095 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/class-wc-pos-template.php @@ -23,30 +23,26 @@ class WC_POS_Template { /** @var array external libraries */ static public $external_libs = array( 'min' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.min.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.min.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js', -// 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.min.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', -// 'idb-shim' => 'https://cdn.rawgit.com/axemclion/IndexedDBShim/master/dist/indexeddbshim.min.js' ), 'debug' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js', -// 'idb-wrapper' => 'https://cdnjs.cloudflare.com/ajax/libs/idbwrapper/1.6.1/idbstore.min.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.js', -// 'idb-shim' => 'https://cdn.rawgit.com/axemclion/IndexedDBShim/master/dist/indexeddbshim.js' ) ); diff --git a/includes/views/pos/products/tmpl-product.php b/includes/views/pos/products/tmpl-product.php index eb777e70..d2d1aff7 100644 --- a/includes/views/pos/products/tmpl-product.php +++ b/includes/views/pos/products/tmpl-product.php @@ -1,4 +1,4 @@ -
          +
          {{#if featured_src}}{{/if}}
          {{title}}  {{#with product_attributes}} diff --git a/includes/views/tmpl-pagination.php b/includes/views/tmpl-pagination.php index cb17ed6b..8774b990 100644 --- a/includes/views/tmpl-pagination.php +++ b/includes/views/tmpl-pagination.php @@ -1,4 +1,3 @@ - {{#if hasQueue}}(){{/if}} \ No newline at end of file diff --git a/package.json b/package.json index d41762ef..b86102c4 100644 --- a/package.json +++ b/package.json @@ -28,23 +28,23 @@ "dependencies": { "accounting": "^0.4.1", "backbone": "^1.2.3", - "backbone-collection-proxy": "^0.2.5", + "backbone-deep-model": "kilbot/backbone-deep-model", "backbone-validation": "^0.11.5", "backbone.marionette": "^2.4.4", + "backbone.obscura": "kilbot/backbone.obscura", "backbone.radio": "^1.0.2", "backbone.stickit": "^0.9.2", "combokeys": "^2.4.4", "debug": "^2.2.0", "handlebars": "^4.0.5", - "idb-wrapper": "kilbot/IDBWrapper", - "jquery": "^2.2.0", + "jquery": "^3.0.0-beta1", "jquery-color": "^1.0.0", "lodash": "^3.10.1", "moment": "^2.11.2", "node-polyglot": "^1.0.0", "normalize.css": "^3.0.3", "select2": "^4.0.1", - "tether": "^1.1.1", + "tether": "^1.2.0", "tether-drop": "^1.4.2", "vex-js": "^2.3.4" }, @@ -53,28 +53,28 @@ "chai-as-promised": "^5.2.0", "chai-backbone": "^0.9.4", "chai-jquery": "^2.0.0", - "coveralls": "^2.11.6", + "coveralls": "^2.11.8", "exports-loader": "^0.6.3", "grunt": "^0.4.5", - "grunt-contrib-clean": "^0.7.0", - "grunt-contrib-compass": "^1.0.4", - "grunt-contrib-compress": "^0.14.0", + "grunt-contrib-clean": "^1.0.0", + "grunt-contrib-compass": "^1.1.0", + "grunt-contrib-compress": "^1.0.0", "grunt-contrib-copy": "^0.8.2", "grunt-contrib-cssmin": "^0.14.0", - "grunt-contrib-jshint": "^0.12.0", - "grunt-contrib-symlink": "^0.3.0", + "grunt-contrib-jshint": "^1.0.0", + "grunt-contrib-symlink": "^1.0.0", "grunt-contrib-uglify": "^0.11.1", "grunt-contrib-watch": "^0.6.1", "grunt-mocha-istanbul": "^3.0.1", "grunt-phpunit": "^0.3.6", "grunt-simple-mocha": "^0.4.1", "grunt-webpack": "^1.0.11", - "grunt-wp-i18n": "^0.5.3", + "grunt-wp-i18n": "^0.5.4", "imports-loader": "^0.6.5", "istanbul": "^0.4.2", - "jsdom": "^8.0.2", + "jsdom": "^8.1.0", "jshint-stylish": "^2.1.0", - "load-grunt-tasks": "^3.4.0", + "load-grunt-tasks": "^3.4.1", "mocha": "^2.4.5", "node-localstorage": "^1.1.2", "pioneer": "^0.11.7", @@ -84,7 +84,7 @@ "sinon": "^1.17.3", "sinon-as-promised": "^4.0.0", "sinon-chai": "^2.8.0", - "webpack": "^1.12.13", + "webpack": "^1.12.14", "webpack-dev-server": "^1.14.1" } } diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index d8bb736f..6f4cc8c9 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -81,7 +81,7 @@ public function test_get_valid_response() { public function test_create_order(){ $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED' + 'order' => array() ) )); // 201 = created @@ -104,8 +104,9 @@ public function test_edit_order(){ // update note $response = $this->client->put($order_id, array( 'json' => array( - 'note' => 'updated', - 'status' => 'UPDATE_FAILED' + 'order' => array( + 'note' => 'updated' + ) ) )); @@ -128,9 +129,10 @@ public function test_create_order_with_product(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product + 'order' => array( + 'line_items' => array( + $product + ) ) ) )); @@ -195,14 +197,15 @@ public function test_integer_stock_adjustment(){ // create order with payment details $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product - ), - 'payment_details' => array( - 'method_id' => 'pos_cash', - 'method_title' => 'Test Cash Payment', - 'paid' => true + 'order' => array( + 'line_items' => array( + $product + ), + 'payment_details' => array( + 'method_id' => 'pos_cash', + 'method_title' => 'Test Cash Payment', + 'paid' => true + ) ) ) )); @@ -240,14 +243,15 @@ public function test_float_stock_adjustment(){ // create order with payment details $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product - ), - 'payment_details' => array( - 'method_id' => 'pos_cash', - 'method_title' => 'Test Cash Payment', - 'paid' => true + 'order' => array( + 'line_items' => array( + $product + ), + 'payment_details' => array( + 'method_id' => 'pos_cash', + 'method_title' => 'Test Cash Payment', + 'paid' => true + ) ) ) )); @@ -277,9 +281,10 @@ public function test_line_item_discount(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product + 'order' => array( + 'line_items' => array( + $product + ) ) ) )); @@ -303,10 +308,11 @@ public function test_line_item_change_title(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product - ) + 'order' => array( + 'line_items' => array( + $product + ) + ), ) )); $this->assertEquals(201, $response->getStatusCode()); @@ -335,9 +341,10 @@ public function test_line_item_exclusive_tax(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product + 'order' => array( + 'line_items' => array( + $product + ) ) ) )); @@ -365,9 +372,10 @@ public function test_line_item_change_taxable(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product + 'order' => array( + 'line_items' => array( + $product + ) ) ) )); @@ -396,9 +404,10 @@ public function test_line_item_change_tax_rate(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product + 'order' => array( + 'line_items' => array( + $product + ) ) ) )); @@ -424,9 +433,10 @@ public function test_order_with_fee(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'fee_lines' => array( - $fee + 'order' => array( + 'fee_lines' => array( + $fee + ) ) ) )); @@ -457,9 +467,10 @@ public function test_order_with_taxable_fee(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'fee_lines' => array( - $fee + 'order' => array( + 'fee_lines' => array( + $fee + ) ) ) )); @@ -490,9 +501,10 @@ public function test_order_with_taxable_fee_change_tax_class(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'fee_lines' => array( - $fee + 'order' => array( + 'fee_lines' => array( + $fee + ) ) ) )); @@ -519,9 +531,10 @@ public function test_order_with_negative_fee(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'fee_lines' => array( - $fee + 'order' => array( + 'fee_lines' => array( + $fee + ) ) ) )); @@ -550,9 +563,10 @@ public function test_order_with_negative_fee_and_tax(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'fee_lines' => array( - $fee + 'order' => array( + 'fee_lines' => array( + $fee + ) ) ) )); @@ -590,12 +604,13 @@ public function test_order_with_product_and_negative_fee(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'line_items' => array( - $product - ), - 'fee_lines' => array( - $fee + 'order' => array( + 'line_items' => array( + $product + ), + 'fee_lines' => array( + $fee + ) ) ) )); @@ -624,9 +639,10 @@ public function test_order_with_shipping(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'shipping_lines' => array( - $shipping + 'order' => array( + 'shipping_lines' => array( + $shipping + ) ) ) )); @@ -659,12 +675,13 @@ public function test_order_with_shipping_change_taxable(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'shipping_lines' => array( - $shipping - ), - // note: shipping_tax required - 'shipping_tax' => 2 + 'order' => array( + 'shipping_lines' => array( + $shipping + ), + // note: shipping_tax required + 'shipping_tax' => 2 + ) ) )); $this->assertEquals(201, $response->getStatusCode()); @@ -698,12 +715,13 @@ public function test_order_with_shipping_change_tax_class(){ // create order $response = $this->client->post('', array( 'json' => array( - 'status' => 'CREATE_FAILED', - 'shipping_lines' => array( - $shipping - ), - // note: shipping_tax required - 'shipping_tax' => 0.5 + 'order' => array( + 'shipping_lines' => array( + $shipping + ), + // note: shipping_tax required + 'shipping_tax' => 0.5 + ) ) )); $this->assertEquals(201, $response->getStatusCode()); diff --git a/tests/unit/js/spec/entities/orders/collection.spec.js b/tests/unit/js/spec/entities/orders/collection.spec.js index b6118924..bc249a5d 100644 --- a/tests/unit/js/spec/entities/orders/collection.spec.js +++ b/tests/unit/js/spec/entities/orders/collection.spec.js @@ -1,30 +1,23 @@ describe('entities/orders/collection.js', function () { var dummy_orders = require('./../../../data/orders.json'); - - beforeEach(function () { - - // @todo idb-wrapper throws an error - //var Collection = require('entities/orders/collection'); - - var Collection = proxyquire('entities/orders/collection',{ - 'lib/config/dual-collection': require('lib/config/collection') - }); - this.collection = new Collection(); - }); + var Collection = require('entities/orders/collection'); it('should be in a valid state', function() { - expect(this.collection).to.be.ok; + var collection = new Collection({}, { disableLocalStorage: true }); + expect(collection).to.be.ok; }); it('should parse orders, with or without \'orders\' node', function() { + var collection = new Collection({}, { disableLocalStorage: true }); + // { parse: true } runs through both Collection and Model parse - this.collection.set( dummy_orders, { parse: true } ); - expect(this.collection.length).to.equal( dummy_orders.orders.length ); + collection.set( dummy_orders, { parse: true, remote: true } ); + expect(collection.length).to.equal( dummy_orders.orders.length ); - this.collection.set( dummy_orders.orders, { parse: true } ); - expect(this.collection.length).to.equal( dummy_orders.orders.length ); + collection.reset( dummy_orders.orders, { parse: true } ); + expect(collection.length).to.equal( dummy_orders.orders.length ); }); diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index 4e8d8b1c..0a5d995c 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -1,9 +1,18 @@ describe('entities/orders/model.js', function () { var dummy_order = require('./../../../data/order.json'); + var OrderCollection = require('entities/orders/collection'); var OrderModel = require('entities/orders/model'); var Utils = require('lib/utilities/utils'); + // order model needs to be part of an order collection + OrderModel = OrderModel.extend({ + collection: { + db: true, + states: OrderCollection.prototype.states + } + }); + var dummy_tax_GB = { '': { 1: {rate: '20.0000', label: 'VAT', shipping: 'yes', compound: 'yes'} @@ -32,7 +41,7 @@ describe('entities/orders/model.js', function () { // parse is not an option on set, only on init .. also automatically on fetch and save //this.model.set( dummy_order, { parse: true } ); - var model = new OrderModel( dummy_order, { parse: true } ); + var model = new OrderModel( dummy_order, { parse: true, remote: true } ); expect(model.attributes).to.have.property('id'); var model = new OrderModel( dummy_order.order, { parse: true } ); @@ -40,18 +49,17 @@ describe('entities/orders/model.js', function () { }); - it('should not change order on export', function(){ - var model = new OrderModel( dummy_order, { parse: true } ); + it('should not change order on export (adds local _state)', function(){ + var model = new OrderModel( dummy_order.order, { parse: true } ); expect( model.toJSON() ).to.eql( dummy_order.order ); }); it('should parse line_items, shipping_lines and fee_lines into a Cart collection (if isEditable)', function(){ - // change status to CREATE_FAILED - var order = _.defaults( { status: 'CREATE_FAILED' }, dummy_order.order ); + // change state to CREATE_FAILED + var order = _.defaults( { _state: 'CREATE_FAILED' }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); expect( model.cart ).to.be.instanceOf( Backbone.Collection ); - expect( model.cart.length ).to.equal( order.line_items.length + order.shipping_lines.length + order.fee_lines.length ); }); @@ -62,7 +70,7 @@ describe('entities/orders/model.js', function () { //it('should export line_items, shipping_lines and fee_lines from Cart collection (if Editable)', function(){ // // // change status to UPDATE_FAILED - // var order = _.defaults( { status: 'UPDATE_FAILED' }, dummy_order.order ); + // var order = _.defaults( { _state: 'UPDATE_FAILED' }, dummy_order.order ); // var model = new OrderModel( order, { parse: true } ); // // expect( model.toJSON() ).to.containSubset( order ); @@ -71,7 +79,7 @@ describe('entities/orders/model.js', function () { it('should save on change to the cart', function( done ){ - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); @@ -88,7 +96,7 @@ describe('entities/orders/model.js', function () { it('should save on add item to cart', function( done ){ - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); // Note: stubbing w/ my own function because sinon is weird with debounce @@ -104,7 +112,7 @@ describe('entities/orders/model.js', function () { //it('should debounce save on add items to cart', function( done ){ // // // need to add editable order to attach gateways - // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); // var model = new OrderModel( order, { parse: true } ); // // var callCount = 0; @@ -131,7 +139,7 @@ describe('entities/orders/model.js', function () { it('should save on remove item to cart', function( done ){ - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); // Note: stubbing w/ my own function because sinon is weird with debounce @@ -147,7 +155,7 @@ describe('entities/orders/model.js', function () { //it('should destroy order if cart is empty', function( done ){ // - // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); // var model = new OrderModel( order, { parse: true } ); // // // Note: stubbing w/ my own function because sinon is weird with debounce @@ -290,7 +298,7 @@ describe('entities/orders/model.js', function () { } }); - var model = new Model(null, { parse: true }); + var model = new Model({ _state: 'CREATE_FAILED' }, { parse: true }); expect( model.cart ).to.be.instanceOf( Backbone.Collection ); @@ -392,7 +400,7 @@ describe('entities/orders/model.js', function () { it('should attach and init gateways (if Editable)', function(){ // need to add editable order to attach gateways - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); model.sync = sinon.stub(); @@ -407,7 +415,7 @@ describe('entities/orders/model.js', function () { it('should save on change to the gateways', function( done ){ // need to add editable order to attach gateways - var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); var model = new OrderModel( order, { parse: true } ); // Note: stubbing w/ my own function because sinon is weird with debounce @@ -424,7 +432,7 @@ describe('entities/orders/model.js', function () { //it('should debounce save on changes to the gateways', function( done ){ // // // need to add editable order to attach gateways - // var order = _.defaults( { status: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); + // var order = _.defaults( { _state: 'UPDATE_FAILED', local_id: 1 }, dummy_order.order ); // var model = new OrderModel( order, { parse: true } ); // // var callCount = 0; diff --git a/tests/unit/js/spec/entities/products/collection.spec.js b/tests/unit/js/spec/entities/products/collection.spec.js index e71be7bc..ba293320 100644 --- a/tests/unit/js/spec/entities/products/collection.spec.js +++ b/tests/unit/js/spec/entities/products/collection.spec.js @@ -1,27 +1,23 @@ describe('entities/products/collection.js', function () { - // @todo idb-wrapper throws an error - var Collection = proxyquire('entities/products/collection',{ - 'lib/config/dual-collection': require('lib/config/collection') - }); - + var Collection = require('entities/products/collection'); var dummy_products = require('../../../data/products.json'); it('should be in a valid state', function() { - var collection = new Collection(); + var collection = new Collection({}, { disableLocalStorage: true }); expect(collection).to.be.ok; }); it('should parse products, with or without \'products\' node', function() { // with node - var collection = new Collection(); - collection.set( dummy_products, { parse: true } ); + var collection = new Collection({}, { disableLocalStorage: true }); + + collection.set( dummy_products, { parse: true, remote: true } ); expect(collection.length).to.equal( dummy_products.products.length ); // without node - var collection = new Collection(); - collection.set( dummy_products.products, { parse: true } ); + collection.reset( dummy_products.products, { parse: true } ); expect(collection.length).to.equal( dummy_products.products.length ); }); diff --git a/tests/unit/js/spec/entities/products/models/variable.spec.js b/tests/unit/js/spec/entities/products/models/variable.spec.js index d670b509..dc7ced62 100644 --- a/tests/unit/js/spec/entities/products/models/variable.spec.js +++ b/tests/unit/js/spec/entities/products/models/variable.spec.js @@ -91,8 +91,7 @@ describe('entities/products/models/variable.js', function () { it('should attach a collection of variations', function() { var variableProduct = _.findWhere(dummy_products.products, { id: 40 }); var product = new Model( variableProduct, { parse: true } ); - expect( product.variations ).to.be.an.instanceof( Backbone.Collection ); - expect( product.variations.length).equals( variableProduct.variations.length ); + expect(product.variations.length).equals( variableProduct.variations.length ); }); it('should return Product variations', function(){ diff --git a/tests/unit/js/spec/lib/config/dual-collection.spec.js b/tests/unit/js/spec/lib/config/dual-collection.spec.js index 37604337..f377ea87 100644 --- a/tests/unit/js/spec/lib/config/dual-collection.spec.js +++ b/tests/unit/js/spec/lib/config/dual-collection.spec.js @@ -1,89 +1,13 @@ describe('lib/config/dual-collection.js', function () { - var localCol = [ - {local_id: 100, id: 1}, - {local_id: 101, id: 2}, - {local_id: 102, id: 3} - ]; + var DualCollection = require('lib/config/dual-collection'); - var remoteCol = { - test: [ // note WC REST API returns collection name parent - {id: 2, title: 'Example 1'}, - {id: 4, title: 'Example 2'}, - {id: 6, title: 'Example 2'} - ] - }; - - var mergedCol = [ - {local_id: 100, id: 1}, - {local_id: 101, id: 2, title: 'Example 1'}, - {local_id: 102, id: 3}, - {local_id: 103, id: 4, title: 'Example 2'}, - {local_id: 104, id: 6, title: 'Example 3'} - ] - - beforeEach(function () { - this.idbSync = stub().resolves(localCol); - this.ajaxSync = stub().resolves(remoteCol); - var DualCollection = proxyquire('lib/config/dual-collection', { - './collection': Backbone.Collection.extend({ - sync: this.ajaxSync - }), - './idb-collection': Backbone.Collection.extend({ - sync: this.idbSync, - mergeRecords: stub().resolves(mergedCol), - db: { - open: stub().resolves(''), - clear: stub().resolves('') - }, - clear: stub().resolves('') - }) - }); - this.collection = new DualCollection(); - this.collection.name = 'test'; - }); - - it('should be in a valid state', function() { - this.collection.should.be.ok; + beforeEach(function(){ + this.collection = new DualCollection({}, { disableLocalStorage: true }); }); - it('should enqueue ids', function() { - this.collection.enqueue([1,2,3]); - this.collection.enqueue(4); - this.collection.enqueue([2,6]); - this.collection.queue.should.eql([1,2,3,4,6]); - }); - - it('should dequeue ids', function() { - this.collection.enqueue([1,2,3,4]); - this.collection.dequeue(2); - this.collection.dequeue([1,2,3]); - this.collection.queue.should.eql([4]); - }); - - it('??should turn an array of remote ids to an array of models', function() { - this.collection.add(remoteCol.test); - var models = this.collection.getModelsByRemoteIds([2,4,6]); - models.should.have.length(3); - models[0].should.be.instanceof(Backbone.Model); - }); - - it('should have a clear method', function(done){ - this.collection.should.respondTo('clear'); - - // add some models & queue - this.collection.add(localCol); - this.collection.enqueue([4,5,6]); - this.collection.length.should.eql( localCol.length ); - this.collection.queue.length.should.eql( 3 ); - - // clear - var col = this.collection; - this.collection.clear().then(function(){ - col.queue.length.should.eql( 0 ); - done(); - }); - + it('should be in a valid state', function(){ + expect( this.collection ).to.be.ok; }); }); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/config/dual-model.spec.js b/tests/unit/js/spec/lib/config/dual-model.spec.js index f41a5d3d..afbfc69b 100644 --- a/tests/unit/js/spec/lib/config/dual-model.spec.js +++ b/tests/unit/js/spec/lib/config/dual-model.spec.js @@ -1,21 +1,29 @@ describe('lib/config/dual-model.js', function () { - beforeEach(function () { - this.ajaxSync = stub().resolves('hi'); - var DualModel = proxyquire('lib/config/dual-model', { - './deep-model': Backbone.Model.extend({ - sync: this.ajaxSync - }) - }); - this.model = new DualModel(); - }); + var Model = require('lib/config/dual-model'); it('should be in a valid state', function() { - this.model.should.be.ok; + var model = new Model(); + model.should.be.ok; }); - it('save with the correct delayed status', function() { - this.model.save({title: 'Foo'}); + it('should have a \'isDelayed\' method', function() { + + var model = new Model({}, { + collection: { + states: { + 'update' : 'UPDATE_FAILED', + 'create' : 'CREATE_FAILED', + 'delete' : 'DELETE_FAILED' + } + } + }); + + expect( model.isDelayed() ).to.be.false; + + model.set({ _state: 'CREATE_FAILED' }); + expect( model.isDelayed() ).to.be.true; + }); }); \ No newline at end of file diff --git a/tests/unit/js/spec/lib/config/model.spec.js b/tests/unit/js/spec/lib/config/model.spec.js index 6eb2b28d..3f756273 100644 --- a/tests/unit/js/spec/lib/config/model.spec.js +++ b/tests/unit/js/spec/lib/config/model.spec.js @@ -2,38 +2,26 @@ describe('lib/config/model.js', function () { var Model = require('lib/config/model.js'); - // WC REST API outputs nested json, mixed data types - var wc_rest_api_output = { - 'product': { - id: 99, // number - price: '9.99', // string - stock_quantity: '', // string or number - managing_stock: false // boolean - } - }; - it('should be in a valid state', function() { var model = new Model(); model.should.be.ok; }); - it('should parse WC REST API data', function() { - var Product = Model.extend({ - name: 'product' - }); - var model = new Product( wc_rest_api_output, { parse: true } ); - model.id.should.eql(99); - }); - it('should convert attributes to given schema', function() { var Product = Model.extend({ - name: 'product', schema: { price: 'number', stock_quantity: 'number' } }); - var model = new Product( wc_rest_api_output, { parse: true } ); + + var model = new Product( { + id: 99, // number + price: '9.99', // string + stock_quantity: '', // string or number + managing_stock: false // boolean + }, { parse: true } ); + model.get('price').should.eql(9.99); model.get('stock_quantity').should.eql(0); }); From 8dc7ddfea22285b78b5f4af0bf260e568c403d7d Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 11:06:40 +0800 Subject: [PATCH 031/169] add php 7.0 test --- .gitignore | 22 +- .travis.yml | 39 +- Gruntfile.js | 2 +- LICENSE.txt | 903 ++++++++++++------ README.md | 8 +- assets/js/src/apps/pos/products/route.js | 12 +- .../js/src/lib/config/infinite-list-view.js | 72 +- composer.json | 22 + phpunit.xml.dist | 4 +- readme.txt | 6 +- tests/integration/php/bootstrap.php | 10 +- .../integration/php/phpunit.xml | 4 +- tests/unit/js/spec/entities/service.spec.js | 8 +- tests/unit/php/bin/install-local-wp-tests.sh | 129 --- ...{install-travis-wp-tests.sh => install.sh} | 54 +- tests/unit/php/bootstrap.php | 23 +- phpunit.xml => tests/unit/php/phpunit.xml | 4 +- 17 files changed, 752 insertions(+), 570 deletions(-) create mode 100644 composer.json rename phpunit.int.xml => tests/integration/php/phpunit.xml (67%) delete mode 100644 tests/unit/php/bin/install-local-wp-tests.sh rename tests/unit/php/bin/{install-travis-wp-tests.sh => install.sh} (72%) mode change 100755 => 100644 rename phpunit.xml => tests/unit/php/phpunit.xml (69%) diff --git a/.gitignore b/.gitignore index a10515c2..4ca2ebc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,21 @@ .sass-cache -node_modules .idea +node_modules +vendor +coverage npm-debug.log assets/css/src/admin.css -assets/css/src/icons.css assets/css/src/pos.css -assets/css/src/admin-icons.css assets/css/admin.min.css assets/css/pos.min.css -assets/css/icons.min.css -assets/css/admin-icons.min.css -assets/js/admin.build.js assets/js/app.build.js -assets/js/core.build.js assets/js/app.min.js -assets/js/admin.min.js -assets/js/vendor.bundle.js assets/js/products.min.js -coverage -assets/js/templates.js - assets/js/admin-settings.build.js - assets/js/admin-settings.min.js - assets/js/admin-system-status.build.js - assets/js/admin-system-status.min.js + + + +composer.lock diff --git a/.travis.yml b/.travis.yml index 6471a122..f6b35349 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,15 @@ language: php -php: - - '5.4' -# - '7.0' +matrix: + include: + - php: "5.4" + env: + - PHP_FPM_DEFAULT=php-fpm.conf.default + - PHP_FPM=php-fpm.conf + - php: "7.0" + env: + - PHP_FPM_DEFAULT=php-fpm.d/www.conf.default + - PHP_FPM=php-fpm.d/www.conf addons: hosts: @@ -11,20 +18,14 @@ addons: 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 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 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 + - bash tests/unit/php/bin/install.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/* ./ @@ -33,9 +34,7 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - # enable php-fpm, try both dirs for php5 and php7 - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null -# - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/$PHP_FPM_DEFAULT ~/.phpenv/versions/$(phpenv version-name)/etc/$PHP_FPM - 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 @@ -65,13 +64,17 @@ before_script: - cd wp-content/plugins/woocommerce-pos/ - npm install -g grunt-cli - npm install + - composer install script: - grunt test - - phpunit -c phpunit.xml.dist - - phpunit -c phpunit.int.xml + - phpunit -c tests/unit/php/phpunit.xml + - phpunit -c tests/integration/php/phpunit.xml # - ./node_modules/.bin/pioneer -after_script: - - php vendor/bin/coveralls -v - - grunt coverage \ No newline at end of file +after_success: + if [ $(phpenv version-name) == "7.0" ]; then + phpunit -c phpunit.xml.dist + php vendor/bin/coveralls -v + grunt coverage + fi \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index defe6434..69a47076 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -339,7 +339,7 @@ module.exports = function(grunt) { options: { coverage: true, root: './assets/js/src', - reportFormats: ['lcovonly'] + reportFormats: ['cobertura'] } } }, diff --git a/LICENSE.txt b/LICENSE.txt index ecbc0593..30ace6a8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,281 +1,622 @@ GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. END OF TERMS AND CONDITIONS @@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. \ No newline at end of file +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/README.md b/README.md index 9127bab6..f2ad7f4c 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ git clone --recursive https://github.com/kilbot/WooCommerce-POS.git woocommerce- Then, navigate into the root directory of the project and install the dependencies. ```sh -cd woocommerce-pos && npm install +cd woocommerce-pos && npm install && composer install ``` ### Building the project @@ -70,4 +70,8 @@ To create a minified version of the project ready to deploy, use: grunt deploy ``` -This will create a zip archive of the plugin which you can then install via your WordPress admin. \ No newline at end of file +This will create a zip archive of the plugin which you can then install via your WordPress admin. + +### We are hiring! + +We are looking for talented PHP and JS developers to work full or part time on WooCommerce POS. To apply simply submit a pull request. \ No newline at end of file diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 74a2b772..56c5e047 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -20,12 +20,12 @@ module.exports = Route.extend({ }, fetch: function() { - var collection = this.filtered.superset(); - if( collection.isNew() ){ - return collection.firstSync(); - } else { - this.filtered.removeTransforms(); - } + //var collection = this.filtered.superset(); + //if( collection.isNew() ){ + // return collection.firstSync(); + //} else { + // this.filtered.removeTransforms(); + //} }, render: function() { diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index ef63fcaa..feefdaf0 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -1,45 +1,25 @@ var Mn = require('backbone.marionette'); var app = require('./application'); var _ = require('lodash'); -//var $ = require('jquery'); module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ + className: 'list-infinite', + template: function(){ - return '
          ' + - '
            ' + - '
            '; + return '
              '; }, - constructor: function() { - Mn.CompositeView.apply(this, arguments); - - this.listenTo(this.collection.superset(), { - 'start:processQueue': this.startLoading, - 'end:processQueue': this.endLoading, - 'end:fullSync': this.checkOverflow - }); - - this.on({ - 'all': _.debounce( this.checkOverflow, 250 ) - }); + constructor: function(){ + Mn.CompositeView.apply(this, arguments); _.bindAll(this, 'onScroll', 'loadMore', 'getOverflow'); }, - // Marionette's default implementation ignores the index, always - // appending the new view to the end. Let's be a little more clever. - //appendHtml: function(collectionView, itemView, index){ - // if (!index) { - // collectionView.$el.prepend(itemView.el); - // } else { - // $(collectionView.$('li')[index - 1]).after(itemView.el); - // } - //}, - onShow: function(){ this.container = this.$el.parent()[0]; this.$el.parent().scroll( _.throttle( this.onScroll, 250 ) ); + this.onScroll(); }, onScroll: function(){ @@ -48,12 +28,6 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ } }, - checkOverflow: function(){ - if(this.getOverflow() < 100){ - this.loadMore(); - } - }, - /** * returns overflow at bottom in px * - added clientHeight check to prevent false trigger when div not drawn @@ -67,33 +41,25 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ }, loadMore: function() { - // get next page from filtered collection - //if (this.collection.hasNextPage()) { - // return this.collection.appendNextPage(); - //} - - // load more from queue - //if (this.collection.superset().queue.length > 0) { - // this.remoteFetchMore(); - //} - }, - - remoteFetchMore: function(){ - this.collection.superset().processQueue({ - filter: this.collection.getRemoteFilter() - }); + if(this.loading){ + return; + } + var self = this; + this.startLoading(); + this.collection.superset().fetch({ remote: true }) + .then(function(){ + self.endLoading(); + }); }, startLoading: function(){ - this.toggleLoading(true); + this.loading = true; + this.$el.addClass('loading'); }, endLoading: function(){ - this.toggleLoading(false); - }, - - toggleLoading: function(loading){ - this.$el.toggleClass('loading', loading); + this.loading = false; + this.$el.removeClass('loading'); } }); \ No newline at end of file diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..511b5be4 --- /dev/null +++ b/composer.json @@ -0,0 +1,22 @@ +{ + "name": "kilbot/woocommerce-pos", + "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", + "homepage": "https://github.com/kilbot/WooCommerce-POS", + "type": "wordpress-plugin", + "license": "GPL-3.0", + "authors": [ + { + "name": "Paul Kilmurray", + "email": "paul@kilbot.com.au", + "homepage": "https://github.com/kilbot" + } + ], + "require": { + "composer/installers": "^1.0" + }, + "require-dev": { + "satooshi/php-coveralls": "^1.0", + "guzzlehttp/guzzle": "~5", + "10up/wp_mock": "dev-master" + } +} diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f8df0118..c575c6d3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,12 +9,12 @@ > - ./tests/unit/php/spec/ + tests/unit/php/spec/ - ./includes + includes diff --git a/readme.txt b/readme.txt index 866adf6f..c0a2a044 100644 --- a/readme.txt +++ b/readme.txt @@ -4,8 +4,8 @@ Tags: cart, e-commerce, ecommerce, inventory, point-of-sale, pos, sales, sell, s Requires at least: 4.0 & WooCommerce 2.3.7 Tested up to: 4.3 Stable tag: 0.4.5 -License: GPLv2 or later -License URI: http://www.gnu.org/licenses/gpl-2.0.html +License: GPL-3.0 +License URI: http://www.gnu.org/licenses/gpl-3.0.html Finally, a Point of Sale plugin for WooCommerce! Sell online and in your physical retail store - no monthly fees, no need to sync inventory. @@ -81,7 +81,7 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c == Changelog == -= 0.4.6 - 2016/01/** = += 0.4.6 - 2016/03/** = * Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6 * New: Receipt print methods for thermal printers (experimental) * New: Receipt templates for epos-print and ESC/POS languages (experimental) diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index cc81be8f..90a333c5 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -18,15 +18,7 @@ public function __construct(){ */ public function includes(){ require_once(__DIR__.'/../../../../../../wp-load.php'); - - if( is_readable( 'vendor/autoload.php' ) ){ - // travis - require_once 'vendor/autoload.php'; - } else { - // vvv - require_once '/home/vagrant/.composer/vendor/autoload.php'; - } - + require_once 'vendor/autoload.php'; } public function setup(){ diff --git a/phpunit.int.xml b/tests/integration/php/phpunit.xml similarity index 67% rename from phpunit.int.xml rename to tests/integration/php/phpunit.xml index fc976e19..93e30e1a 100644 --- a/phpunit.int.xml +++ b/tests/integration/php/phpunit.xml @@ -1,5 +1,5 @@ - ./tests/integration/php/spec/ + spec \ No newline at end of file diff --git a/tests/unit/js/spec/entities/service.spec.js b/tests/unit/js/spec/entities/service.spec.js index a6f5f265..36f8376c 100644 --- a/tests/unit/js/spec/entities/service.spec.js +++ b/tests/unit/js/spec/entities/service.spec.js @@ -1,6 +1,6 @@ describe('entities/service.js', function () { - var Marionette = require('backbone.marionette'); + //var Marionette = require('backbone.marionette'); beforeEach(function () { @@ -199,8 +199,8 @@ describe('entities/service.js', function () { this.module.should.respondTo('idbCollections'); }); - afterEach(function () { - Backbone.Radio.reset(); - }); + //afterEach(function () { + // Backbone.Radio.reset(); + //}); }); \ No newline at end of file diff --git a/tests/unit/php/bin/install-local-wp-tests.sh b/tests/unit/php/bin/install-local-wp-tests.sh deleted file mode 100644 index f5b03e2e..00000000 --- a/tests/unit/php/bin/install-local-wp-tests.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env bash - -if [ $# -lt 3 ]; then - echo "usage: $0 [db-host] [wp-version] [wc-version]" - exit 1 -fi - -DB_NAME=$1 -DB_USER=$2 -DB_PASS=$3 -DB_HOST=${4-localhost} -WP_VERSION=${5-latest} -WC_VERSION=${6-latest} - -#WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib} -#WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/} -WP_TESTS_DIR=/tmp/wordpress-tests-lib -WP_CORE_DIR=/tmp/wordpress/ - -download() { - if [ `which curl` ]; then - curl -s "$1" > "$2"; - elif [ `which wget` ]; then - wget -nv -O "$2" "$1" - fi -} - -if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then - WP_TESTS_TAG="tags/$WP_VERSION" -else - # http serves a single offer, whereas https serves multiple. we only want one - download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json - grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json - LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//') - if [[ -z "$LATEST_VERSION" ]]; then - echo "Latest WordPress version could not be found" - exit 1 - fi - WP_TESTS_TAG="tags/$LATEST_VERSION" -fi - -set -ex - -install_wp() { - - if [ -d $WP_CORE_DIR ]; then - return; - fi - - mkdir -p $WP_CORE_DIR - - if [ $WP_VERSION == 'latest' ]; then - local ARCHIVE_NAME='latest' - else - local ARCHIVE_NAME="wordpress-$WP_VERSION" - fi - - download https://wordpress.org/${ARCHIVE_NAME}.tar.gz /tmp/wordpress.tar.gz - tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR - - download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php -} - -install_test_suite() { - # portable in-place argument for both GNU sed and Mac OSX sed - if [[ $(uname -s) == 'Darwin' ]]; then - local ioption='-i .bak' - else - local ioption='-i' - fi - - # set up testing suite if it doesn't yet exist - if [ ! -d $WP_TESTS_DIR ]; then - # set up testing suite - mkdir -p $WP_TESTS_DIR - svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes - fi - - cd $WP_TESTS_DIR - - if [ ! -f wp-tests-config.php ]; then - download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php - fi - -} - -install_db() { - # parse DB_HOST for port or socket references - local PARTS=(${DB_HOST//\:/ }) - local DB_HOSTNAME=${PARTS[0]}; - local DB_SOCK_OR_PORT=${PARTS[1]}; - local EXTRA="" - - if ! [ -z $DB_HOSTNAME ] ; then - if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then - EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp" - elif ! [ -z $DB_SOCK_OR_PORT ] ; then - EXTRA=" --socket=$DB_SOCK_OR_PORT" - elif ! [ -z $DB_HOSTNAME ] ; then - EXTRA=" --host=$DB_HOSTNAME --protocol=tcp" - fi - fi - - # create database - mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA || true -} - -install_woocommerce() { - - if [ $WC_VERSION == 'latest' ]; then - local ARCHIVE_NAME='woocommerce.zip' - else - local ARCHIVE_NAME="woocommerce.$WC_VERSION.zip" - fi - - download https://downloads.wordpress.org/plugin/${ARCHIVE_NAME} /tmp/woocommerce.zip - unzip -qo /tmp/woocommerce.zip -d $WP_CORE_DIR/wp-content/plugins - -} - -install_wp -install_test_suite -install_db -install_woocommerce \ No newline at end of file diff --git a/tests/unit/php/bin/install-travis-wp-tests.sh b/tests/unit/php/bin/install.sh old mode 100755 new mode 100644 similarity index 72% rename from tests/unit/php/bin/install-travis-wp-tests.sh rename to tests/unit/php/bin/install.sh index e032a5f1..edc72184 --- a/tests/unit/php/bin/install-travis-wp-tests.sh +++ b/tests/unit/php/bin/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ $# -lt 3 ]; then - echo "usage: $0 [db-host] [wp-version]" + echo "usage: $0 [db-host] [wp-version] [wc-version]" exit 1 fi @@ -10,21 +10,17 @@ DB_USER=$2 DB_PASS=$3 DB_HOST=${4-localhost} WP_VERSION=${5-latest} +WC_VERSION=${6-latest} -#WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib} -#WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/} WP_TESTS_DIR=/tmp/wordpress-tests-lib -WP_CORE_DIR=/tmp/wordpress/ -TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR} - -WP_TESTS_DOMAIN=woopos.dev -WP_TESTS_EMAIL=support@woopos.com.au +WP_TEMP_DIR=/tmp/wordpress/ +WP_CORE_DIR=${TRAVIS_BUILD_DIR-/tmp/wordpress/}/ download() { if [ `which curl` ]; then - curl -s "$1" > "$2"; + curl -s "$1" > "$2"; elif [ `which wget` ]; then - wget -nv -O "$2" "$1" + wget -nv -O "$2" "$1" fi } @@ -36,8 +32,8 @@ else grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//') if [[ -z "$LATEST_VERSION" ]]; then - echo "Latest WordPress version could not be found" - exit 1 + echo "Latest WordPress version could not be found" + exit 1 fi WP_TESTS_TAG="tags/$LATEST_VERSION" fi @@ -46,11 +42,11 @@ set -ex install_wp() { - if [ -d $WP_CORE_DIR ]; then + if [ -d $WP_TEMP_DIR ]; then return; fi - mkdir -p $WP_CORE_DIR + mkdir -p $WP_TEMP_DIR if [ $WP_VERSION == 'latest' ]; then local ARCHIVE_NAME='latest' @@ -59,9 +55,9 @@ install_wp() { fi download https://wordpress.org/${ARCHIVE_NAME}.tar.gz /tmp/wordpress.tar.gz - tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR + tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_TEMP_DIR - download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php + download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_TEMP_DIR/wp-content/db.php } install_test_suite() { @@ -83,13 +79,11 @@ install_test_suite() { if [ ! -f wp-tests-config.php ]; then download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s:dirname( __FILE__ ) . '/src/':'$TRAVIS_BUILD_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php + sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/example.org/$WP_TESTS_DOMAIN/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/admin@example.org/$WP_TESTS_EMAIL/" "$WP_TESTS_DIR"/wp-tests-config.php fi } @@ -112,9 +106,29 @@ install_db() { fi # create database + mysqladmin -f drop $DB_NAME || true mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA || true } +install_woocommerce() { + + # set up woocommerce if it doesn't exist && no travis build + if [ ! -d $WP_CORE_DIR/wp-content/plugins/woocommerce ] && [ ! $TRAVIS_BUILD_DIR ]; then + + if [ $WC_VERSION == 'latest' ]; then + local ARCHIVE_NAME='woocommerce.zip' + else + local ARCHIVE_NAME="woocommerce.$WC_VERSION.zip" + fi + + download https://downloads.wordpress.org/plugin/${ARCHIVE_NAME} /tmp/woocommerce.zip + unzip -qo /tmp/woocommerce.zip -d $WP_CORE_DIR/wp-content/plugins + + fi + +} + install_wp install_test_suite -install_db \ No newline at end of file +install_db +install_woocommerce \ No newline at end of file diff --git a/tests/unit/php/bootstrap.php b/tests/unit/php/bootstrap.php index 7f94c8e9..282a19bb 100644 --- a/tests/unit/php/bootstrap.php +++ b/tests/unit/php/bootstrap.php @@ -13,14 +13,11 @@ public function __construct(){ $this->includes(); require_once $this->wp_tests_dir . '/includes/functions.php'; - - tests_add_filter( 'muplugins_loaded', array( $this, 'load_wc_pos' ) ); - + tests_add_filter( 'muplugins_loaded', array( $this, 'load' ) ); require_once $this->wp_tests_dir . '/includes/bootstrap.php'; -// activate_plugin(WP_CONTENT_DIR . '/plugins/woocommerce/woocommerce.php'); } - public function load_wc_pos() { + public function load() { require_once WP_CONTENT_DIR . '/plugins/woocommerce/woocommerce.php'; require_once dirname( __FILE__ ) . '/../../../woocommerce-pos.php'; WC()->api->includes(); @@ -31,24 +28,10 @@ public function load_wc_pos() { * include composer autoloader */ public function includes(){ - - if( is_readable( 'vendor/autoload.php' ) ){ - // travis - require_once 'vendor/autoload.php'; - } else { - // vvv - require_once '/home/vagrant/.composer/vendor/autoload.php'; - } - + require_once 'vendor/autoload.php'; // extra functions and factories - - } -// public function install_wc_pos() { -// WC_POS_Activator::activate(true); -// } - } new Unit_Test_WC_POS(); \ No newline at end of file diff --git a/phpunit.xml b/tests/unit/php/phpunit.xml similarity index 69% rename from phpunit.xml rename to tests/unit/php/phpunit.xml index e53a812b..79dfd622 100644 --- a/phpunit.xml +++ b/tests/unit/php/phpunit.xml @@ -1,5 +1,5 @@ - ./tests/unit/php/spec/ + spec \ No newline at end of file From cc61a1ddf1343f1afe4ce83064c00969fb9772f2 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 11:19:28 +0800 Subject: [PATCH 032/169] fix travis-ci --- .travis.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6b35349..34962577 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,18 @@ language: php -matrix: - include: - - php: "5.4" - env: - - PHP_FPM_DEFAULT=php-fpm.conf.default - - PHP_FPM=php-fpm.conf - - php: "7.0" - env: - - PHP_FPM_DEFAULT=php-fpm.d/www.conf.default - - PHP_FPM=php-fpm.d/www.conf - -addons: - hosts: - - woopos.dev +php: + - "5.4" + - "7.0" 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 + +addons: + hosts: + - woopos.dev 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 @@ -34,7 +29,11 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/$PHP_FPM_DEFAULT ~/.phpenv/versions/$(phpenv version-name)/etc/$PHP_FPM + - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null + else + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null + fi - 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 @@ -73,7 +72,7 @@ script: # - ./node_modules/.bin/pioneer after_success: - if [ $(phpenv version-name) == "7.0" ]; then + - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then phpunit -c phpunit.xml.dist php vendor/bin/coveralls -v grunt coverage From 4dc9c35fb8ea3babc90869ac97ee44d66fca5008 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 15:44:51 +0800 Subject: [PATCH 033/169] namespace plugin --- ...ass-wc-pos-activator.php => activator.php} | 46 ++++---- .../{class-wc-pos-admin.php => admin.php} | 18 +-- ...class-wc-pos-gateways.php => gateways.php} | 4 +- .../admin/{class-wc-pos-menu.php => menu.php} | 16 +-- .../{class-wc-pos-notices.php => notices.php} | 20 ++-- .../{class-wc-pos-orders.php => orders.php} | 8 +- .../{class-wc-pos-abstract.php => page.php} | 14 ++- ...ass-wc-pos-permalink.php => permalink.php} | 4 +- .../{class-wc-pos-plugins.php => plugins.php} | 4 +- ...class-wc-pos-products.php => products.php} | 4 +- ...class-wc-pos-settings.php => settings.php} | 20 ++-- .../{class-wc-pos-access.php => access.php} | 4 +- ...class-wc-pos-checkout.php => checkout.php} | 10 +- ...ass-wc-pos-customers.php => customers.php} | 3 +- ...class-wc-pos-gateways.php => gateways.php} | 6 +- .../{class-wc-pos-general.php => general.php} | 4 +- .../{class-wc-pos-hotkeys.php => hotkeys.php} | 4 +- .../{class-wc-pos-abstract.php => page.php} | 8 +- .../{class-wc-pos-options.php => options.php} | 4 +- ...class-wc-pos-template.php => template.php} | 0 ...class-wc-pos-receipts.php => receipts.php} | 4 +- .../{class-wc-pos-status.php => status.php} | 4 +- .../{class-wc-pos-tools.php => tools.php} | 4 +- .../{class-wc-pos-status.php => status.php} | 6 +- includes/{class-wc-pos-ajax.php => ajax.php} | 8 +- includes/{class-wc-pos-api.php => api.php} | 25 +++-- .../{class-wc-pos-coupons.php => coupons.php} | 9 +- ...ass-wc-pos-customers.php => customers.php} | 10 +- ...class-wc-pos-gateways.php => gateways.php} | 15 ++- .../api/{class-wc-pos-i18n.php => i18n.php} | 9 +- .../{class-wc-pos-orders.php => orders.php} | 21 ++-- .../{class-wc-pos-params.php => params.php} | 22 ++-- .../{class-wc-pos-payload.php => payload.php} | 22 ++-- ...class-wc-pos-products.php => products.php} | 9 +- ...class-wc-pos-settings.php => settings.php} | 23 ++-- .../{class-wc-pos-support.php => support.php} | 13 ++- ...ass-wc-pos-templates.php => templates.php} | 30 +++-- includes/class-wc-pos.php | 105 ------------------ ...ass-wc-pos-customers.php => customers.php} | 4 +- ...wc-pos-deactivator.php => deactivator.php} | 10 +- ...class-wc-pos-gateways.php => gateways.php} | 8 +- .../{class-wc-pos-card.php => card.php} | 10 +- .../{class-wc-pos-cash.php => cash.php} | 10 +- includes/{class-wc-pos-i18n.php => i18n.php} | 16 +-- ...class-wc-pos-bookings.php => bookings.php} | 4 +- ...class-wc-pos-products.php => products.php} | 8 +- ...s-wc-pos-visibility.php => visibility.php} | 10 +- includes/setup.php | 82 ++++++++++++++ .../{class-wc-pos-status.php => status.php} | 12 +- includes/{class-wc-pos-tax.php => tax.php} | 10 +- ...class-wc-pos-template.php => template.php} | 18 +-- includes/views/main.php | 16 +-- includes/views/support/tmpl-status.php | 2 +- includes/wc-pos-functions.php | 4 +- tests/integration/php/bootstrap.php | 10 +- .../integration/php/spec/api/test-orders.php | 14 ++- .../php/spec/api/test-products.php | 22 ++-- .../integration/php/spec/test-activation.php | 7 +- tests/integration/php/spec/test-rest.php | 9 +- tests/unit/php/bootstrap.php | 6 +- tests/unit/php/spec/admin/test-settings.php | 25 +++-- tests/unit/php/spec/api/test-products.php | 9 +- tests/unit/php/spec/api/test-settings.php | 16 ++- tests/unit/php/spec/api/test-templates.php | 13 ++- tests/unit/php/spec/test-ajax.php | 31 ------ tests/unit/php/spec/test-install.php | 9 +- tests/unit/php/spec/test-wc-functions.php | 6 +- woocommerce-pos.php | 47 ++++++-- 68 files changed, 561 insertions(+), 427 deletions(-) rename includes/{class-wc-pos-activator.php => activator.php} (80%) rename includes/{class-wc-pos-admin.php => admin.php} (77%) rename includes/admin/{class-wc-pos-gateways.php => gateways.php} (98%) rename includes/admin/{class-wc-pos-menu.php => menu.php} (94%) rename includes/admin/{class-wc-pos-notices.php => notices.php} (61%) rename includes/admin/{class-wc-pos-orders.php => orders.php} (96%) rename includes/admin/{class-wc-pos-abstract.php => page.php} (92%) rename includes/admin/{class-wc-pos-permalink.php => permalink.php} (97%) rename includes/admin/{class-wc-pos-plugins.php => plugins.php} (97%) rename includes/admin/{class-wc-pos-products.php => products.php} (90%) rename includes/admin/{class-wc-pos-settings.php => settings.php} (87%) rename includes/admin/settings/{class-wc-pos-access.php => access.php} (97%) rename includes/admin/settings/{class-wc-pos-checkout.php => checkout.php} (92%) rename includes/admin/settings/{class-wc-pos-customers.php => customers.php} (87%) rename includes/admin/settings/{class-wc-pos-gateways.php => gateways.php} (91%) rename includes/admin/settings/{class-wc-pos-general.php => general.php} (90%) rename includes/admin/settings/{class-wc-pos-hotkeys.php => hotkeys.php} (95%) rename includes/admin/settings/{class-wc-pos-abstract.php => page.php} (96%) rename includes/admin/settings/receipt/{class-wc-pos-options.php => options.php} (84%) rename includes/admin/settings/receipt/{class-wc-pos-template.php => template.php} (100%) rename includes/admin/settings/{class-wc-pos-receipts.php => receipts.php} (87%) rename includes/admin/settings/{class-wc-pos-status.php => status.php} (85%) rename includes/admin/settings/{class-wc-pos-tools.php => tools.php} (85%) rename includes/admin/{class-wc-pos-status.php => status.php} (96%) rename includes/{class-wc-pos-ajax.php => ajax.php} (94%) rename includes/{class-wc-pos-api.php => api.php} (90%) rename includes/api/{class-wc-pos-coupons.php => coupons.php} (92%) rename includes/api/{class-wc-pos-customers.php => customers.php} (97%) rename includes/api/{class-wc-pos-gateways.php => gateways.php} (94%) rename includes/api/{class-wc-pos-i18n.php => i18n.php} (98%) rename includes/api/{class-wc-pos-orders.php => orders.php} (98%) rename includes/api/{class-wc-pos-params.php => params.php} (94%) rename includes/api/{class-wc-pos-payload.php => payload.php} (56%) rename includes/api/{class-wc-pos-products.php => products.php} (98%) rename includes/api/{class-wc-pos-settings.php => settings.php} (91%) rename includes/api/{class-wc-pos-support.php => support.php} (91%) rename includes/api/{class-wc-pos-templates.php => templates.php} (89%) delete mode 100644 includes/class-wc-pos.php rename includes/{class-wc-pos-customers.php => customers.php} (97%) rename includes/{class-wc-pos-deactivator.php => deactivator.php} (92%) rename includes/{class-wc-pos-gateways.php => gateways.php} (93%) rename includes/gateways/{class-wc-pos-card.php => card.php} (95%) rename includes/gateways/{class-wc-pos-cash.php => cash.php} (95%) rename includes/{class-wc-pos-i18n.php => i18n.php} (95%) rename includes/integrations/{class-wc-pos-bookings.php => bookings.php} (88%) rename includes/{class-wc-pos-products.php => products.php} (94%) rename includes/products/{class-wc-pos-visibility.php => visibility.php} (97%) create mode 100644 includes/setup.php rename includes/{class-wc-pos-status.php => status.php} (92%) rename includes/{class-wc-pos-tax.php => tax.php} (83%) rename includes/{class-wc-pos-template.php => template.php} (89%) delete mode 100644 tests/unit/php/spec/test-ajax.php diff --git a/includes/class-wc-pos-activator.php b/includes/activator.php similarity index 80% rename from includes/class-wc-pos-activator.php rename to includes/activator.php index b3c7bc34..37582339 100644 --- a/includes/class-wc-pos-activator.php +++ b/includes/activator.php @@ -9,20 +9,21 @@ * @link http://www.woopos.com.au */ -class WC_POS_Activator { +namespace WC_POS; + +class Activator { // minimum requirements const WC_MIN_VERSION = '2.3.7'; const PHP_MIN_VERSION = '5.4'; /** - * @param $file + * */ - public function __construct( $file ) { - register_activation_hook( $file, array( $this, 'activate' ) ); + public function __construct() { + register_activation_hook( PLUGIN_FILE, array( $this, 'activate' ) ); add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) ); - - add_action( 'plugins_loaded', array( $this, 'run_woocommerce_pos' ) ); + add_action( 'plugins_loaded', array( $this, 'run' ) ); $this->init(); } @@ -32,27 +33,26 @@ public function __construct( $file ) { */ private function init(){ if( is_admin() && (!defined('DOING_AJAX') || !DOING_AJAX) ){ - require_once WC_POS_PLUGIN_PATH . 'includes/admin/class-wc-pos-notices.php'; - new WC_POS_Admin_Notices(); + new Admin\Notices(); } } /** * Checks for valid install and begins execution of the plugin. */ - public function run_woocommerce_pos(){ + public function run(){ // Check for min requirements to run if( $this->php_check() && $this->woocommerce_check() ){ - require_once WC_POS_PLUGIN_PATH . 'includes/class-wc-pos.php'; - new WC_POS(); // check permalinks - if( is_admin() && (!defined('DOING_AJAX') || !DOING_AJAX) ){ + if( is_admin() && (!defined('\DOING_AJAX') || !\DOING_AJAX) ){ $this->permalink_check(); } // Run update script if required $this->version_check(); + + new Setup(); } } @@ -152,10 +152,10 @@ private function add_pos_capability(){ * Check version number, runs every admin page load */ private function version_check(){ - $old = WC_POS_Admin_Settings::get_db_version(); - if( version_compare( $old, WC_POS_VERSION, '<' ) ){ - WC_POS_Admin_Settings::bump_versions(); - $this->db_upgrade( $old, WC_POS_VERSION ); + $old = Admin\Settings::get_db_version(); + if( version_compare( $old, VERSION, '<' ) ){ + Admin\Settings::bump_versions(); + $this->db_upgrade( $old, VERSION ); } } @@ -180,17 +180,17 @@ private function db_upgrade( $old, $current ) { * Check min version of WooCommerce installed */ private function woocommerce_check() { - if( class_exists( 'WooCommerce' ) && version_compare( WC()->version, self::WC_MIN_VERSION, '>=' ) ) + if( class_exists( '\WooCommerce' ) && version_compare( WC()->version, self::WC_MIN_VERSION, '>=' ) ) return true; - if( class_exists( 'WC_POS_Admin_Notices' ) ){ + if( class_exists( 'Admin\Notices' ) ){ $message = sprintf( __('WooCommerce POS requires WooCommerce %s or higher. Please install and activate WooCommerce', 'woocommerce-pos' ), 'http://wordpress.org/plugins/woocommerce/', self::WC_MIN_VERSION, admin_url('plugins.php') ) . ' »'; - WC_POS_Admin_Notices::add( $message ); + Admin\Notices::add( $message ); } } @@ -202,13 +202,13 @@ private function php_check(){ if( version_compare( $php_version, self::PHP_MIN_VERSION, '>' ) ) return true; - if( class_exists( 'WC_POS_Admin_Notices' ) ) { + if( class_exists( 'Admin\Notices' ) ) { $message = sprintf( __('WooCommerce POS requires PHP %s or higher. Read more information about how you can update', 'woocommerce-pos' ), self::PHP_MIN_VERSION, 'http://www.wpupdatephp.com/update/' ) . ' »'; - WC_POS_Admin_Notices::add( $message ); + Admin\Notices::add( $message ); } } @@ -217,11 +217,11 @@ private function php_check(){ * - requires autoloader, ie: WC_POS() */ private function permalink_check(){ - $fail = WC_POS_Status::permalinks_disabled(); + $fail = Status::permalinks_disabled(); if( $fail ){ $message = $fail['message'] . '. '; $message .= sprintf( '%s', $fail['buttons'][0]['href'], $fail['buttons'][0]['prompt'] ) . ' »'; - WC_POS_Admin_Notices::add( $message ); + Admin\Notices::add( $message ); } } diff --git a/includes/class-wc-pos-admin.php b/includes/admin.php similarity index 77% rename from includes/class-wc-pos-admin.php rename to includes/admin.php index c72ea273..ce65f1c0 100644 --- a/includes/class-wc-pos-admin.php +++ b/includes/admin.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin { +namespace WC_POS; + +class Admin { /** * Constructor @@ -23,10 +25,10 @@ public function __construct() { * Load admin subclasses */ public function init() { - new WC_POS_Admin_Menu(); - new WC_POS_Admin_Settings(); - new WC_POS_Admin_Status(); - new WC_POS_Admin_Gateways(); + new Admin\Menu(); + new Admin\Settings(); + new Admin\Status(); + new Admin\Gateways(); } /** @@ -37,15 +39,15 @@ public function conditional_init( $current_screen ) { // Add setting to permalink page if( $current_screen->id == 'options-permalink' ) - new WC_POS_Admin_Permalink(); + new Admin\Permalink(); // Add POS settings to orders pages if( $current_screen->id == 'shop_order' || $current_screen->id == 'edit-shop_order' ) - new WC_POS_Admin_Orders(); + new Admin\Orders(); // Customise plugins page if( $current_screen->id == 'plugins' ) - new WC_POS_Admin_Plugins(); + new Admin\Plugins(); } diff --git a/includes/admin/class-wc-pos-gateways.php b/includes/admin/gateways.php similarity index 98% rename from includes/admin/class-wc-pos-gateways.php rename to includes/admin/gateways.php index a9c92948..649f2d6a 100644 --- a/includes/admin/class-wc-pos-gateways.php +++ b/includes/admin/gateways.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Gateways { +namespace WC_POS\Admin; + +class Gateways { public function __construct() { add_filter( 'woocommerce_payment_gateways_setting_columns', array( $this, 'woocommerce_payment_gateways_setting_columns' ), 10, 1 ); diff --git a/includes/admin/class-wc-pos-menu.php b/includes/admin/menu.php similarity index 94% rename from includes/admin/class-wc-pos-menu.php rename to includes/admin/menu.php index 63c4ebb3..d7d64c8b 100644 --- a/includes/admin/class-wc-pos-menu.php +++ b/includes/admin/menu.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Menu { +namespace WC_POS\Admin; + +class Menu { /** @vars string Unique menu identifier */ private $toplevel_screen_id; @@ -34,13 +36,13 @@ public function admin_menu() { __( 'POS', 'woocommerce-pos' ), __( 'POS', 'woocommerce-pos' ), 'manage_woocommerce_pos', - WC_POS_PLUGIN_NAME, + PLUGIN_NAME, array( $this, 'display_upgrade_page' ), 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAwIiBoZWlnaHQ9IjEyMDAiIHZpZXdCb3g9IjAgMCAxMjAwIDEyMDAiPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik0xMTE0LjI4NiAwSDg1LjdDMzguMzc1IDAgMCAzOC40IDAgODUuNzE0VjIxNC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzUgODUuNzE0LTg1LjcxM1Y2MGgxNzEuNDN2MTU0LjE0YzAgNDcuMyAzOC40IDg1LjcgODUuNyA4NS43IDQ3LjMzOCAwIDg1LjcxMy0zOC4zNzUgODUuNzEzLTg1LjcxM1Y2MGgxNzEuNDI4djE1NC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzUgODUuNzE0LTg1LjcxM1Y2MGgxNzEuNDI4djE1NC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzQgODUuNzE0LTg1LjcxM1Y4NS43MTRDMTIwMCAzOC40IDExNjEuNiAwIDExMTQuMyAwek0yNzUuODkzIDUzMS43NzdjLTUyLjI5IDAtOTIuNjEgNDAuOTUtOTIuNjEgOTMuMjRzNDAuMzIgOTMuMiA5Mi42IDkzLjI0YzUyLjI5IDAgOTMuMjQtNDAuOTUgOTMuMjQtOTMuMjQuMDEtNTIuMzE3LTQwLjkyMy05My4yMTctOTMuMjIzLTkzLjI0eiIvPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik0xMTE0LjI4NiAzMzkuODU1Yy0zMi4xMDQgMC02Mi4zNjgtMTEuOTUtODUuNzE1LTMzLjc1LTIzLjM0NyAyMS43OTgtNTMuNjEgMzMuNzUtODUuNzEzIDMzLjctMzIuMTA0IDAtNjIuMzY4LTExLjk1LTg1LjcxNS0zMy43NDgtMjMuMzQ4IDIxLjc5Ny01My42MTIgMzMuNzUtODUuNzE1IDMzLjc1cy02Mi4zNjctMTEuOTUyLTg1LjcxNS0zMy43NWMtMjMuMzQ3IDIxLjc5Ny01My42MSAzMy43NS04NS43MTQgMzMuNzUtMzIuMTAyIDAtNjIuMzY3LTExLjk1My04NS43MTQtMzMuNzUtMjMuMzQ3IDIxLjc5Ny01My42MTMgMzMuNzUtODUuNzE0IDMzLjc1LTMyLjEwMiAwLTYyLjM2Ny0xMS45NTMtODUuNzE0LTMzLjc1LTIzLjM0OCAyMS43OTctNTMuNjEyIDMzLjc1LTg1LjcxNCAzMy43NXMtNjIuMzY3LTExLjk1My04NS43MTQtMzMuNzVjLTIzLjM0NyAyMS43OTctNTMuNjEzIDMzLjc1LTg1LjcxNCAzMy43LTMyLjEwNCAwLTYyLjM2Ni0xMS45Ni04NS43MTQtMzMuNzZWMTIwMGwzNDMtMjM4LjY3aDc3MS4xODhjNDcuMzkzIDAgODUuODEyLTM4LjQyIDg1LjgxMi04NS44MTJWMzA2LjA5NGMtMjMuMzQ4IDIxLjgwNi01My42IDMzLjgwNi04NS43IDMzLjc2ek0yNzUuODkzIDc4Ni45M2MtMzUuMjggMC02Ny40MS0xMS4zNC05My4yNC0zMC4yNHYxMTUuMjljMCAyNC41Ny0xNS43NSAzOS4wNjItMzQuNjUgMzkuMDYyLTIxLjQyIDAtMzQuNjUtMTYuMzgtMzQuNjUtMzkuMDZWNTAzLjQyNmMwLTIyLjA1IDE1LjEyLTM4LjQzIDM0LjY1LTM4LjQzIDE0LjQ5IDAgMjcuMSA2LjkgMzEuNSAyOS42MSAyNS44My0xOS41MyA1OS4yMi0zMi4xMyA5Ni4zOS0zMi4xMyA5MC4wOSAwIDE2My4yIDcyLjUgMTYzLjIgMTYyLjVDNDM5LjA2MyA3MTQuNSAzNjYgNzg2LjkgMjc1LjkgNzg2Ljkzem0zODUuNTUuNjNjLTkwLjcyMiAwLTE2My4xNzItNzIuNDUtMTYzLjE3Mi0xNjMuMTcgMC04OS40NjIgNzIuNDUtMTYxLjkxMyAxNjMuMTczLTE2MS45MTMgODkuNDYgMCAxNjEuOSA3Mi41IDE2MS45IDE2MS45MTIuMDEgOTAuNzEtNzIuNDQzIDE2My4yMS0xNjEuOTQzIDE2My4yMXptMzIxLjkyNyAwYy01OS44NTIgMC0xMDIuMDYyLTMxLjUtMTAyLjA2Mi02MyAwLTE2LjM4IDEyLjYwMi0yOS42MSAzMS41LTI5LjYxIDI3LjcyMiAwIDM4LjQgMjguNCA3My4xIDI4LjM1IDIzLjk0IDAgMzQuNjUtMTIuNiAzNC42NS0yNS4yIDAtMTEuOTctOC44Mi0yNS4xOTgtNDEuNTgtNDIuMjFsLTI5LjYxLTE1LjEyYy00OC41MS0yNC41NjgtNjQuODktNTIuOTItNjQuODktOTAuMDkgMC00NC43MyA0MC4zMi04Ny41NyAxMDUuMjEtODcuNTcgNjguMDQgMCA5NS4xIDQxLjYgOTUuMSA2MC41IDAgMTUuNzUtMTEuOTcgMjguMzUtMzAuODcgMjguMzUtMjUuMiAwLTQwLjMxOC0yMi4wNS03MS44Mi0yMi4wNS0xNi4zOCAwLTI0LjU3IDExLjM0LTI0LjU3IDIxLjQgMCAxMy4yIDYuOSAyMC4yIDM0IDM1LjkxbDcuNTYyIDQuNDFjMTAuMDggNi4zIDIyLjcgMTEuMyAzMy40IDE3LjY0IDQ3Ljg4IDI1LjggNTkuOSA1Ni43IDU5LjkgODguMi0uMDMgNDUuMzMtMzUuODkgOTAuMTMtMTA4Ljk5IDkwLjA5eiIvPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik02NjEuNDQzIDUzMi40MDhjLTUyLjI5IDAtOTMuMjQgNDAuOTUtOTMuMjQgOTEuOTggMCA1Mi4zIDQxIDkzLjIgOTMuMiA5My4yNCA1MS4wMyAwIDkxLjk4LTQwLjk1IDkxLjk4LTkzLjI0LjA0Mi01MC45ODgtNDAuODgzLTkxLjk4OC05MS45ODMtOTEuOTh6Ii8+PC9zdmc+' ); add_submenu_page( - WC_POS_PLUGIN_NAME, + PLUGIN_NAME, __( 'View POS', 'woocommerce-pos' ), __( 'View POS', 'woocommerce-pos' ), 'manage_woocommerce_pos', @@ -49,7 +51,7 @@ public function admin_menu() { // adjust submenu global $submenu; - $pos_submenu = &$submenu[WC_POS_PLUGIN_NAME]; + $pos_submenu = &$submenu[PLUGIN_NAME]; $pos_submenu[0][0] = __( 'Upgrade to Pro', 'woocommerce-pos' ); $pos_submenu[1][2] = wc_pos_url(); } @@ -61,16 +63,16 @@ public function admin_menu() { */ public function menu_order( $menu_order ) { $woo = array_search( 'woocommerce', $menu_order ); - $pos = array_search( WC_POS_PLUGIN_NAME, $menu_order ); + $pos = array_search( PLUGIN_NAME, $menu_order ); if( $woo !== false && $pos !== false) { // rearrange menu unset( $menu_order[$pos] ); - array_splice( $menu_order, ++$woo, 0, WC_POS_PLUGIN_NAME ); + array_splice( $menu_order, ++$woo, 0, PLUGIN_NAME ); // rearrange submenu global $submenu; - $pos_submenu = &$submenu[WC_POS_PLUGIN_NAME]; + $pos_submenu = &$submenu[PLUGIN_NAME]; $pos_submenu[500] = $pos_submenu[1]; unset( $pos_submenu[1] ); }; diff --git a/includes/admin/class-wc-pos-notices.php b/includes/admin/notices.php similarity index 61% rename from includes/admin/class-wc-pos-notices.php rename to includes/admin/notices.php index 92b77714..8e54d0cb 100644 --- a/includes/admin/class-wc-pos-notices.php +++ b/includes/admin/notices.php @@ -10,7 +10,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Notices { +namespace WC_POS\Admin; + +class Notices { /* @var */ static private $notices = array(); @@ -18,7 +20,7 @@ class WC_POS_Admin_Notices { /** * Constructor */ - public function __construct() { + public function __construct () { add_action( 'admin_notices', array( $this, 'admin_notices' ) ); } @@ -26,7 +28,7 @@ public function __construct() { * @param $type * @param $message */ - static public function add( $message, $type = 'error' ){ + static public function add ( $message, $type = 'error' ) { self::$notices[] = array( 'type' => $type, 'message' => $message @@ -36,14 +38,14 @@ static public function add( $message, $type = 'error' ){ /** * Display the admin notices */ - public function admin_notices() { + public function admin_notices () { $notices = apply_filters( 'woocommerce_pos_admin_notices', self::$notices ); - if( !empty( $notices ) ) { - foreach( $notices as $notice ) { - echo '
              -

              '. wp_kses( $notice['message'], wp_kses_allowed_html( 'post' ) ) .'

              -
              '; + if ( !empty( $notices ) ) { + foreach ( $notices as $notice ) { + echo '
              +

              ' . wp_kses( $notice[ 'message' ], wp_kses_allowed_html( 'post' ) ) . '

              +
              '; } } } diff --git a/includes/admin/class-wc-pos-orders.php b/includes/admin/orders.php similarity index 96% rename from includes/admin/class-wc-pos-orders.php rename to includes/admin/orders.php index e00116f9..5d4adaa7 100644 --- a/includes/admin/class-wc-pos-orders.php +++ b/includes/admin/orders.php @@ -13,7 +13,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Orders { +namespace WC_POS\Admin; + +class Orders { private $pos_order; @@ -66,7 +68,7 @@ public function save( $post_id, $post ){ */ public function payment_gateways($gateways){ // get checkout settings data - $settings = WC_POS_Admin_Settings_Checkout::get_instance(); + $settings = WC_POS\Admin\Settings\Checkout::get_instance(); $enabled_ids = $settings->get_enabled_gateway_ids(); $loaded_gateways = array(); @@ -179,7 +181,7 @@ public function post_class($classes, $class, $id){ public function enqueue_admin_styles() { $css = ' .widefat .type-wc_pos_order .column-order_status { - background: url( '. WC_POS_PLUGIN_URL .'assets/logo.svg ) no-repeat 75% 9px; + background: url( '. WC_POS\PLUGIN_URL .'assets/logo.svg ) no-repeat 75% 9px; background-size: 18px; fill: #94d31b; } diff --git a/includes/admin/class-wc-pos-abstract.php b/includes/admin/page.php similarity index 92% rename from includes/admin/class-wc-pos-abstract.php rename to includes/admin/page.php index 12e2e651..b739a9c6 100644 --- a/includes/admin/class-wc-pos-abstract.php +++ b/includes/admin/page.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Abstract { +namespace WC_POS\Admin; + +class Page { /* @var string The db prefix for WP Options table */ const DB_PREFIX = 'woocommerce_pos_settings_'; @@ -58,10 +60,10 @@ public function enqueue_admin_scripts(){} */ public function enqueue_admin_styles() { wp_enqueue_style( - WC_POS_PLUGIN_NAME . '-admin', - WC_POS_PLUGIN_URL . 'assets/css/admin.min.css', + \WC_POS\PLUGIN_NAME . '-admin', + \WC_POS\PLUGIN_URL . 'assets/css/admin.min.css', null, - WC_POS_VERSION + \WC_POS\VERSION ); } @@ -97,7 +99,7 @@ static public function get_db_version(){ * bumps the idb version number */ static public function bump_versions(){ - self::update_option( self::DB_PREFIX . 'db_version', WC_POS_VERSION ); + self::update_option( self::DB_PREFIX . 'db_version', \WC_POS\VERSION ); self::bump_idb_version(); } @@ -125,7 +127,7 @@ static public function bump_idb_version(){ * @return bool */ static public function get_option( $id, $key = false ){ - $handlers = (array) WC_POS_Admin_Settings::handlers(); + $handlers = (array) Settings::handlers(); if( !array_key_exists( $id, $handlers ) ) return false; diff --git a/includes/admin/class-wc-pos-permalink.php b/includes/admin/permalink.php similarity index 97% rename from includes/admin/class-wc-pos-permalink.php rename to includes/admin/permalink.php index 55cbbb60..49b15fe7 100644 --- a/includes/admin/class-wc-pos-permalink.php +++ b/includes/admin/permalink.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Permalink { +namespace WC_POS\Admin; + +class Permalink { const DB_KEY = 'woocommerce_pos_settings_permalink'; diff --git a/includes/admin/class-wc-pos-plugins.php b/includes/admin/plugins.php similarity index 97% rename from includes/admin/class-wc-pos-plugins.php rename to includes/admin/plugins.php index c0b3ca2b..bf2945d9 100644 --- a/includes/admin/class-wc-pos-plugins.php +++ b/includes/admin/plugins.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Plugins { +namespace WC_POS\Admin; + +class Plugins { public function __construct() { add_filter( 'plugin_action_links_'. WC_POS_PLUGIN_FILE, array ( $this, 'plugin_action_links' ) ); diff --git a/includes/admin/class-wc-pos-products.php b/includes/admin/products.php similarity index 90% rename from includes/admin/class-wc-pos-products.php rename to includes/admin/products.php index 218039f2..73b81aff 100644 --- a/includes/admin/class-wc-pos-products.php +++ b/includes/admin/products.php @@ -10,7 +10,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Products { +namespace WC_POS\Admin; + +class Products { /** * Constructor diff --git a/includes/admin/class-wc-pos-settings.php b/includes/admin/settings.php similarity index 87% rename from includes/admin/class-wc-pos-settings.php rename to includes/admin/settings.php index 63a61bca..cf906de9 100644 --- a/includes/admin/class-wc-pos-settings.php +++ b/includes/admin/settings.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings extends WC_POS_Admin_Abstract { +namespace WC_POS\Admin; + +class Settings extends Page { /* @var string JS var with page id, used for API requests */ public $wc_pos_adminpage = 'admin_settings'; @@ -18,12 +20,12 @@ class WC_POS_Admin_Settings extends WC_POS_Admin_Abstract { * @var array settings handlers */ static public $handlers = array( - 'general' => 'WC_POS_Admin_Settings_General', - 'customers' => 'WC_POS_Admin_Settings_Customers', - 'checkout' => 'WC_POS_Admin_Settings_Checkout', - 'receipts' => 'WC_POS_Admin_Settings_Receipts', - 'hotkeys' => 'WC_POS_Admin_Settings_HotKeys', - 'access' => 'WC_POS_Admin_Settings_Access' + 'general' => 'WC_POS\Admin\Settings\General', + 'customers' => 'WC_POS\Admin\Settings\Customers', + 'checkout' => 'WC_POS\Admin\Settings\Checkout', + 'receipts' => 'WC_POS\Admin\Settings\Receipts', + 'hotkeys' => 'WC_POS\Admin\Settings\HotKeys', + 'access' => 'WC_POS\Admin\Settings\Access' ); /** @@ -91,7 +93,7 @@ public function enqueue_admin_scripts() { wp_enqueue_script( WC_POS_PLUGIN_NAME . '-admin-settings-app', - WC_POS_PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', + WC_POS\PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2', 'ace' ), WC_POS_VERSION, true @@ -99,7 +101,7 @@ public function enqueue_admin_scripts() { wp_enqueue_script( 'eventsource-polyfill', - WC_POS_PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', + WC_POS\PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', array(), null, true diff --git a/includes/admin/settings/class-wc-pos-access.php b/includes/admin/settings/access.php similarity index 97% rename from includes/admin/settings/class-wc-pos-access.php rename to includes/admin/settings/access.php index e3051429..0a143051 100644 --- a/includes/admin/settings/class-wc-pos-access.php +++ b/includes/admin/settings/access.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Access extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class Access extends Page { protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-checkout.php b/includes/admin/settings/checkout.php similarity index 92% rename from includes/admin/settings/class-wc-pos-checkout.php rename to includes/admin/settings/checkout.php index a8374343..1b63d2af 100644 --- a/includes/admin/settings/class-wc-pos-checkout.php +++ b/includes/admin/settings/checkout.php @@ -9,7 +9,11 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Checkout extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +use WC_Payment_Gateways; + +class Checkout extends Page { protected static $instance; @@ -41,7 +45,7 @@ public function load_gateways() { // some poorly written plugins will init WC_Payment_Gateways before WP init // check to see if POS Cash Gateway is present, if not: re-init WC_Payment_Gateways - if( ! in_array( 'WC_POS_Gateways_Cash', array_map( 'get_class', $gateways ) ) ){ + if( ! in_array( 'WC_POS\Gateways\Cash', array_map( 'get_class', $gateways ) ) ){ WC_Payment_Gateways::instance()->init(); $gateways = WC_Payment_Gateways::instance()->payment_gateways; } @@ -54,7 +58,7 @@ public function load_gateways() { } else { $ordered_gateways[ ++$i ] = $gateway; } - $settings = new WC_POS_Admin_Settings_Gateways($gateway->id); + $settings = new Gateways($gateway->id); $settings->merge_settings($gateway); // @todo remove this, use get_title() etc } diff --git a/includes/admin/settings/class-wc-pos-customers.php b/includes/admin/settings/customers.php similarity index 87% rename from includes/admin/settings/class-wc-pos-customers.php rename to includes/admin/settings/customers.php index 764712ea..f58f7e67 100644 --- a/includes/admin/settings/class-wc-pos-customers.php +++ b/includes/admin/settings/customers.php @@ -8,8 +8,9 @@ * @link http://www.woopos.com.au */ +namespace WC_POS\Admin\Settings; -class WC_POS_Admin_Settings_Customers extends WC_POS_Admin_Settings_Abstract { +class Customers extends Page { protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-gateways.php b/includes/admin/settings/gateways.php similarity index 91% rename from includes/admin/settings/class-wc-pos-gateways.php rename to includes/admin/settings/gateways.php index 97bc67af..d2cbb0e5 100644 --- a/includes/admin/settings/class-wc-pos-gateways.php +++ b/includes/admin/settings/gateways.php @@ -9,7 +9,11 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Gateways extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +use WC_Payment_Gateway; + +class Gateways extends Page { // note: should be init as new, not Singleton // protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-general.php b/includes/admin/settings/general.php similarity index 90% rename from includes/admin/settings/class-wc-pos-general.php rename to includes/admin/settings/general.php index c7d5b936..f2df179c 100644 --- a/includes/admin/settings/class-wc-pos-general.php +++ b/includes/admin/settings/general.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_General extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class General extends Page { protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-hotkeys.php b/includes/admin/settings/hotkeys.php similarity index 95% rename from includes/admin/settings/class-wc-pos-hotkeys.php rename to includes/admin/settings/hotkeys.php index 562c35ed..62c4802e 100644 --- a/includes/admin/settings/class-wc-pos-hotkeys.php +++ b/includes/admin/settings/hotkeys.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_HotKeys extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class HotKeys extends Page { protected static $instance; private $labels; diff --git a/includes/admin/settings/class-wc-pos-abstract.php b/includes/admin/settings/page.php similarity index 96% rename from includes/admin/settings/class-wc-pos-abstract.php rename to includes/admin/settings/page.php index ceb52c39..b2889f74 100644 --- a/includes/admin/settings/class-wc-pos-abstract.php +++ b/includes/admin/settings/page.php @@ -9,7 +9,11 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +use WC_POS\Admin\Settings; + +class Page { protected static $instance; @@ -83,7 +87,7 @@ public function get_template(){ * @return string */ public function option_name(){ - return WC_POS_Admin_Settings::DB_PREFIX . $this->id; + return Settings::DB_PREFIX . $this->id; } /** diff --git a/includes/admin/settings/receipt/class-wc-pos-options.php b/includes/admin/settings/receipt/options.php similarity index 84% rename from includes/admin/settings/receipt/class-wc-pos-options.php rename to includes/admin/settings/receipt/options.php index 2d1fe82d..7a3968c5 100644 --- a/includes/admin/settings/receipt/class-wc-pos-options.php +++ b/includes/admin/settings/receipt/options.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Receipt_Options extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings\Receipt; + +class Options extends WC_POS\Admin\Settings\Page { protected static $instance; diff --git a/includes/admin/settings/receipt/class-wc-pos-template.php b/includes/admin/settings/receipt/template.php similarity index 100% rename from includes/admin/settings/receipt/class-wc-pos-template.php rename to includes/admin/settings/receipt/template.php diff --git a/includes/admin/settings/class-wc-pos-receipts.php b/includes/admin/settings/receipts.php similarity index 87% rename from includes/admin/settings/class-wc-pos-receipts.php rename to includes/admin/settings/receipts.php index 7b12e608..5692b0d1 100644 --- a/includes/admin/settings/class-wc-pos-receipts.php +++ b/includes/admin/settings/receipts.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Receipts extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class Receipts extends Page { protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-status.php b/includes/admin/settings/status.php similarity index 85% rename from includes/admin/settings/class-wc-pos-status.php rename to includes/admin/settings/status.php index 7c8aa723..f5d7d45f 100644 --- a/includes/admin/settings/class-wc-pos-status.php +++ b/includes/admin/settings/status.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Status extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class Status extends Page { protected static $instance; diff --git a/includes/admin/settings/class-wc-pos-tools.php b/includes/admin/settings/tools.php similarity index 85% rename from includes/admin/settings/class-wc-pos-tools.php rename to includes/admin/settings/tools.php index 1c5c7eb5..8a6b3fe0 100644 --- a/includes/admin/settings/class-wc-pos-tools.php +++ b/includes/admin/settings/tools.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Tools extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings; + +class Tools extends Page { protected static $instance; diff --git a/includes/admin/class-wc-pos-status.php b/includes/admin/status.php similarity index 96% rename from includes/admin/class-wc-pos-status.php rename to includes/admin/status.php index 4c80cb41..edbd4761 100644 --- a/includes/admin/class-wc-pos-status.php +++ b/includes/admin/status.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Status extends WC_POS_Admin_Abstract { +namespace WC_POS\Admin; + +class Status extends Page { /* @var string JS var with page id, used for API requests */ public $wc_pos_adminpage = 'admin_system_status'; @@ -87,7 +89,7 @@ public function enqueue_admin_scripts() { wp_enqueue_script( WC_POS_PLUGIN_NAME . '-admin-system-status-app', - WC_POS_PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', + WC_POS\PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), WC_POS_VERSION, true diff --git a/includes/class-wc-pos-ajax.php b/includes/ajax.php similarity index 94% rename from includes/class-wc-pos-ajax.php rename to includes/ajax.php index 1937db28..37573513 100644 --- a/includes/class-wc-pos-ajax.php +++ b/includes/ajax.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Ajax { +namespace WC_POS; + +class Ajax { /** * Constructor @@ -17,7 +19,7 @@ class WC_POS_Ajax { public function __construct() { $ajax_events = array( - 'toggle_legacy_server' => 'WC_POS_Status' + 'toggle_legacy_server' => '\WC_POS\Status' ); foreach ( $ajax_events as $ajax_event => $class ) { @@ -34,7 +36,7 @@ public function __construct() { static public function check_ajax_referer(){ $pass = check_ajax_referer( WC_POS_PLUGIN_NAME, 'security', false ); if(!$pass){ - $result = new WP_Error( + $result = new \WP_Error( 'woocommerce_pos_invalid_nonce', __( 'Invalid security nonce', 'woocommerce-pos' ), array( 'status' => 401 ) diff --git a/includes/class-wc-pos-api.php b/includes/api.php similarity index 90% rename from includes/class-wc-pos-api.php rename to includes/api.php index e5e16332..9374d0cd 100644 --- a/includes/class-wc-pos-api.php +++ b/includes/api.php @@ -9,8 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_API { +namespace WC_POS; +class API { /** * @@ -45,24 +46,24 @@ public function api_classes( array $classes ){ // common classes array_push( $classes, - 'WC_POS_API_Products', - 'WC_POS_API_Orders', - 'WC_POS_API_Customers', - 'WC_POS_API_Coupons', - 'WC_POS_API_Payload', - 'WC_POS_API_Params', - 'WC_POS_API_i18n', - 'WC_POS_API_Templates' + 'WC_POS\API\Products', + 'WC_POS\API\Orders', + 'WC_POS\API\Customers', + 'WC_POS\API\Coupons', + 'WC_POS\API\Payload', + 'WC_POS\API\Params', + 'WC_POS\API\i18n', + 'WC_POS\API\Templates' ); // frontend only if( current_user_can('access_woocommerce_pos') ){ - array_push( $classes, 'WC_POS_API_Gateways', 'WC_POS_API_Support' ); + array_push( $classes, 'WC_POS\API\Gateways', 'WC_POS\API\Support' ); } // admin only if( current_user_can('manage_woocommerce_pos') ){ - array_push( $classes, 'WC_POS_API_Settings' ); + array_push( $classes, 'WC_POS\API\Settings' ); } return $classes; @@ -83,7 +84,7 @@ public function wc_api_authentication() { return $user; } - return new WP_Error( + return new \WP_Error( 'woocommerce_pos_authentication_error', __( 'User not authorized to access WooCommerce POS', 'woocommerce-pos' ), array( 'status' => 401 ) diff --git a/includes/api/class-wc-pos-coupons.php b/includes/api/coupons.php similarity index 92% rename from includes/api/class-wc-pos-coupons.php rename to includes/api/coupons.php index 9da64cdf..6c435833 100644 --- a/includes/api/class-wc-pos-coupons.php +++ b/includes/api/coupons.php @@ -10,11 +10,12 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Coupons extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; + +class Coupons extends WC_API_Resource { /** @var string $base the route base */ protected $base = '/coupons'; diff --git a/includes/api/class-wc-pos-customers.php b/includes/api/customers.php similarity index 97% rename from includes/api/class-wc-pos-customers.php rename to includes/api/customers.php index c636ac80..198dda6b 100644 --- a/includes/api/class-wc-pos-customers.php +++ b/includes/api/customers.php @@ -10,11 +10,13 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Customers extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; +use WP_User_Query; + +class Customers extends WC_API_Resource { /** @var string $base the route base */ protected $base = '/customers'; diff --git a/includes/api/class-wc-pos-gateways.php b/includes/api/gateways.php similarity index 94% rename from includes/api/class-wc-pos-gateways.php rename to includes/api/gateways.php index f678ba9a..73a33d3e 100644 --- a/includes/api/class-wc-pos-gateways.php +++ b/includes/api/gateways.php @@ -9,11 +9,16 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Gateways extends WC_API_Resource { +use DOMDocument; +use DOMXPath; +use WC_API_Resource; +use WC_API_Server; +use WC_Payment_Gateway; +use WC_POS\Admin\Settings\Checkout; + +class Gateways extends WC_API_Resource { protected $base = '/pos/gateways'; @@ -45,7 +50,7 @@ public function get_gateways( $wc_pos_admin = null ){ return; } - $settings = WC_POS_Admin_Settings_Checkout::get_instance(); + $settings = Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); $payload = array(); diff --git a/includes/api/class-wc-pos-i18n.php b/includes/api/i18n.php similarity index 98% rename from includes/api/class-wc-pos-i18n.php rename to includes/api/i18n.php index ef48921d..1294214a 100644 --- a/includes/api/class-wc-pos-i18n.php +++ b/includes/api/i18n.php @@ -9,11 +9,12 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_i18n extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; + +class i18n extends WC_API_Resource { protected $base = '/pos/i18n'; diff --git a/includes/api/class-wc-pos-orders.php b/includes/api/orders.php similarity index 98% rename from includes/api/class-wc-pos-orders.php rename to includes/api/orders.php index bf4833cc..25d87cc6 100644 --- a/includes/api/class-wc-pos-orders.php +++ b/includes/api/orders.php @@ -10,11 +10,16 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Orders { +use WC_API_Server; +use WC_Emails; +use WC_Order; +use WC_POS\Admin\Settings\Checkout; +use WC_POS\Gateways\Cash; +use WP_Error; + +class Orders { /** @var string $base the route base */ protected $base = '/orders'; @@ -59,7 +64,7 @@ public function register_routes( $routes ) { # POST /orders//email/ $routes[ $this->base . '/(?P\d+)/email/(?P.+)' ] = array( - array( array( $this, 'email_receipt' ), WC_API_SERVER::CREATABLE | WC_API_Server::ACCEPT_DATA ) + array( array( $this, 'email_receipt' ), WC_API_Server::CREATABLE | WC_API_Server::ACCEPT_DATA ) ); return $routes; @@ -447,7 +452,7 @@ public function process_payment( $order_id, $data ) { // load the gateways & process payment $gateway_id = $data[ 'payment_details' ][ 'method_id' ]; add_filter( 'option_woocommerce_' . $gateway_id . '_settings', array( $this, 'force_enable_gateway' ) ); - $settings = WC_POS_Admin_Settings_Checkout::get_instance(); + $settings = Checkout::get_instance(); $gateways = $settings->load_enabled_gateways(); if ( isset( $gateways[ $gateway_id ] ) ) { @@ -652,7 +657,7 @@ private function add_payment_details( $order, array $payment_details ){ $payment_details['redirect'] = get_post_meta( $order->id, '_pos_payment_redirect', true ); if( isset( $payment_details['method_id'] ) && $payment_details['method_id'] == 'pos_cash' ){ - $payment_details['method_pos_cash'] = WC_POS_Gateways_Cash::payment_details( $order ); + $payment_details['method_pos_cash'] = Cash::payment_details( $order ); } return apply_filters( 'woocommerce_pos_order_response_payment_details', $payment_details, $order ); @@ -784,7 +789,7 @@ private function remove_customer_emails(WC_Emails $wc_emails){ /** * @param WC_Emails $wc_emails */ - private function remove_admin_emails(WC_Emails $wc_emails){ + private function remove_admin_emails( WC_Emails $wc_emails){ // send 'woocommerce_low_stock_notification' // send 'woocommerce_no_stock_notification' // send 'woocommerce_product_on_backorder_notification' diff --git a/includes/api/class-wc-pos-params.php b/includes/api/params.php similarity index 94% rename from includes/api/class-wc-pos-params.php rename to includes/api/params.php index 6b798f73..f66e9454 100644 --- a/includes/api/class-wc-pos-params.php +++ b/includes/api/params.php @@ -9,11 +9,15 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Params extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; +use WC_POS\Admin\Settings; +use WC_POS\i18n; +use WC_POS\Tax; + +class Params extends WC_API_Resource { protected $base = '/pos/params'; @@ -56,9 +60,9 @@ private function common_params(){ return array( 'accounting' => $this->accounting(), 'customers' => $this->customers(), - 'debug' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG, + 'debug' => defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG, 'emulateHTTP' => get_option( 'woocommerce_pos_emulateHTTP' ) === '1', - 'idbVersion' => WC_POS_Admin_Settings::get_idb_version(), + 'idbVersion' => Settings::get_idb_version(), 'store' => array( 'name' => get_bloginfo( 'name' ) ) ); } @@ -69,7 +73,7 @@ private function common_params(){ private function frontend_params(){ return array( 'auto_print' => wc_pos_get_option( 'checkout', 'auto_print_receipt' ), - 'denominations' => WC_POS_i18n::currency_denominations(), + 'denominations' => i18n::currency_denominations(), 'discount_keys' => wc_pos_get_option( 'general', 'discount_quick_keys' ), 'fee' => wc_pos_get_option( 'general', 'fee' ), 'hotkeys' => wc_pos_get_option( 'hotkeys', 'hotkeys' ), @@ -77,8 +81,8 @@ private function frontend_params(){ 'shipping' => $this->shipping(), 'tabs' => $this->product_tabs(), 'tax' => $this->tax(), - 'tax_classes' => WC_POS_Tax::tax_classes(), - 'tax_rates' => WC_POS_Tax::tax_rates(), + 'tax_classes' => Tax::tax_classes(), + 'tax_rates' => Tax::tax_rates(), 'user' => $this->user() ); } diff --git a/includes/api/class-wc-pos-payload.php b/includes/api/payload.php similarity index 56% rename from includes/api/class-wc-pos-payload.php rename to includes/api/payload.php index 4f6c3aae..92c8f3e7 100644 --- a/includes/api/class-wc-pos-payload.php +++ b/includes/api/payload.php @@ -9,11 +9,12 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Payload extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; + +class Payload extends WC_API_Resource { protected $base = '/pos'; @@ -38,21 +39,22 @@ public function register_routes( array $routes ) { /** - * + * @param null $wc_pos_admin + * @return array */ public function get_payload( $wc_pos_admin = null ) { $wc_api = WC()->api; $payload = array( - 'i18n' => $wc_api->WC_POS_API_i18n->get_translations( $wc_pos_admin ), - 'params' => $wc_api->WC_POS_API_Params->get_params( $wc_pos_admin ), - 'templates' => $wc_api->WC_POS_API_Templates->get_templates( $wc_pos_admin ), + 'i18n' => $wc_api->{'WC_POS\API\i18n'}->get_translations( $wc_pos_admin ), + 'params' => $wc_api->{'WC_POS\API\Params'}->get_params( $wc_pos_admin ), + 'templates' => $wc_api->{'WC_POS\API\Templates'}->get_templates( $wc_pos_admin ), ); if( $wc_pos_admin ){ - $payload['params']['settings'] = $wc_api->WC_POS_API_Settings->get_settings( '', $wc_pos_admin ); + $payload['params']['settings'] = $wc_api->{'WC_POS\API\Settings'}->get_settings( '', $wc_pos_admin ); } else { - $payload['params']['gateways'] = $wc_api->WC_POS_API_Gateways->get_gateways(); + $payload['params']['gateways'] = $wc_api->{'WC_POS\API\Gateways'}->get_gateways(); } return $payload; diff --git a/includes/api/class-wc-pos-products.php b/includes/api/products.php similarity index 98% rename from includes/api/class-wc-pos-products.php rename to includes/api/products.php index 4bf67746..ea413668 100644 --- a/includes/api/class-wc-pos-products.php +++ b/includes/api/products.php @@ -10,11 +10,12 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Products extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; + +class Products extends WC_API_Resource { /** @var string $base the route base */ protected $base = '/products'; diff --git a/includes/api/class-wc-pos-settings.php b/includes/api/settings.php similarity index 91% rename from includes/api/class-wc-pos-settings.php rename to includes/api/settings.php index ad2d45c3..b30804d7 100644 --- a/includes/api/class-wc-pos-settings.php +++ b/includes/api/settings.php @@ -9,11 +9,14 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Settings extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; +use WC_POS\Admin\Settings as Admin_Settings; +use WC_POS\Admin\Status; + +class Settings extends WC_API_Resource { protected $base = '/pos/settings'; @@ -62,10 +65,10 @@ public function get_settings( $id = '', $wc_pos_admin = null, $defaults = false switch ($wc_pos_admin) { case 'admin_settings': - $handlers = WC_POS_Admin_Settings::handlers(); + $handlers = Admin_Settings::handlers(); break; case 'admin_system_status': - $handlers = WC_POS_Admin_Status::handlers(); + $handlers = Status::handlers(); break; } @@ -139,7 +142,7 @@ public function delete_all_settings() { DELETE FROM {$wpdb->options} WHERE option_name LIKE '%s'", - WC_POS_Admin_Settings::DB_PREFIX . '%' + Admin_Settings::DB_PREFIX . '%' ) ); } @@ -151,7 +154,7 @@ public function delete_all_settings() { private function get_settings_handler( $id ){ if( ! $id ){ - return new WP_Error( + return new \WP_Error( 'woocommerce_pos_settings_error', __( 'There is no settings id', 'woocommerce-pos' ), array( 'status' => 400 ) @@ -173,12 +176,12 @@ private function get_settings_handler( $id ){ // else, find handler by id else { - $handlers = (array) WC_POS_Admin_Settings::handlers(); + $handlers = (array) Admin_Settings::handlers(); if( isset( $handlers[$id] ) ) return new $handlers[$id](); } - return new WP_Error( + return new \WP_Error( 'woocommerce_pos_settings_error', sprintf( __( 'No handler found for %s settings', 'woocommerce-pos' ), $id), array( 'status' => 400 ) diff --git a/includes/api/class-wc-pos-support.php b/includes/api/support.php similarity index 91% rename from includes/api/class-wc-pos-support.php rename to includes/api/support.php index c97c33df..859a6e6f 100644 --- a/includes/api/class-wc-pos-support.php +++ b/includes/api/support.php @@ -9,11 +9,12 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Support extends WC_API_Resource { +use WC_API_Resource; +use WC_API_Server; + +class Support extends WC_API_Resource { protected $base = '/pos/support'; @@ -69,7 +70,7 @@ public function send_support_email( $data ) { ); } - return new WP_Error( + return new \WP_Error( 'woocommerce_pos_email_error', __( 'There was an error sending the email', 'woocommerce-pos' ), array( 'status' => 400 ) @@ -90,7 +91,7 @@ public function get_active_plugins(){ } foreach ( $active_plugins as $plugin ) { - $plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); + $plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); if( ! empty( $plugin_data['Name'] ) ){ $plugins .= $plugin_data['Name'] . ': by ' . $plugin_data['Author'] . ' - ' . $plugin_data['Version'] . "\n"; } diff --git a/includes/api/class-wc-pos-templates.php b/includes/api/templates.php similarity index 89% rename from includes/api/class-wc-pos-templates.php rename to includes/api/templates.php index 4aa1b281..fd2bbdde 100644 --- a/includes/api/class-wc-pos-templates.php +++ b/includes/api/templates.php @@ -9,11 +9,16 @@ * @link http://www.woopos.com.au */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +namespace WC_POS\API; -class WC_POS_API_Templates extends WC_API_Resource { +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; +use RecursiveRegexIterator; +use RegexIterator; +use WC_API_Resource; +use WC_API_Server; + +class Templates extends WC_API_Resource { protected $base = '/pos/templates'; @@ -52,7 +57,7 @@ public function register_routes( array $routes ) { * @return string */ public function get_template_dir() { - return WC_POS_PLUGIN_PATH . 'includes/views'; + return \WC_POS\PLUGIN_PATH . 'includes/views'; } /** @@ -109,17 +114,8 @@ public function locate_default_template_files( $partials_dir = '' ) { $partials_dir = $this->get_template_dir(); $Directory = new RecursiveDirectoryIterator( $partials_dir ); - - $Iterator = new RecursiveIteratorIterator( - $Directory, - RecursiveIteratorIterator::SELF_FIRST - ); - - $Regex = new RegexIterator( - $Iterator, - '/^.+tmpl-[a-z-]+\.php$/i', - RecursiveRegexIterator::GET_MATCH - ); + $Iterator = new RecursiveIteratorIterator( $Directory, RecursiveIteratorIterator::SELF_FIRST ); + $Regex = new RegexIterator( $Iterator, '/^.+tmpl-[a-z-]+\.php$/i', RecursiveRegexIterator::GET_MATCH ); $paths = array_keys( iterator_to_array( $Regex ) ); $templates = array(); @@ -180,7 +176,7 @@ public function template_output( $file, $trim = true ) { * Returns path of print receipt template */ public function locate_print_receipt_template() { - $receipt_path = $this->locate_template_file( WC_POS_PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); + $receipt_path = $this->locate_template_file( \WC_POS\PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); return apply_filters( 'woocommerce_pos_print_receipt_path', $receipt_path ); } diff --git a/includes/class-wc-pos.php b/includes/class-wc-pos.php deleted file mode 100644 index a608b60c..00000000 --- a/includes/class-wc-pos.php +++ /dev/null @@ -1,105 +0,0 @@ - - * @link http://www.woopos.com.au - */ - -class WC_POS { - - /** - * Constructor - */ - public function __construct() { - - // auto load classes - if ( function_exists( 'spl_autoload_register' ) ) { - spl_autoload_register( array( $this, 'autoload' ) ); - } - - // global helper functions - require_once WC_POS_PLUGIN_PATH . 'includes/wc-pos-functions.php'; - - add_action( 'init', array( $this, 'init' ) ); - add_action( 'woocommerce_api_loaded', array( $this, 'load_woocommerce_pos_api') ); - do_action( 'woocommerce_pos_loaded' ); - - } - - /** - * Autoload classes + pseudo namespacing - * turns WC_POS_i18n into includes/class-wc-pos-i18n.php and - * WC_POS_Admin_Settings into includes/admin/class-wc-pos-settings.php - * - * @param $class - */ - private function autoload( $class ) { - $cn = preg_replace( '/^wc_pos_/', '', strtolower( $class ), 1, $count ); - if( $count ) { - $path = explode('_', $cn); - if( $path[0] == 'pro' ) return; - $last = 'class-wc-pos-'. array_pop( $path ) .'.php'; - array_push( $path, $last ); - $file = WC_POS_PLUGIN_PATH . 'includes/' . implode( '/', $path ); - if( is_readable( $file ) ) - require_once $file; - } - } - - /** - * Load the required resources - */ - public function init() { - - // common classes - new WC_POS_i18n(); - new WC_POS_Gateways(); - new WC_POS_Products(); - new WC_POS_Customers(); - - // ajax only - if( is_admin() && (defined('DOING_AJAX') && DOING_AJAX) ){ - new WC_POS_AJAX(); - } - - // admin only - if( is_admin() && !(defined('DOING_AJAX') && DOING_AJAX) ){ - new WC_POS_Admin(); - } - - // frontend only - else { - new WC_POS_Template(); - } - - // load integrations - $this->integrations(); - - } - - /** - * Loads the POS API and patches to the WC REST API - */ - public function load_woocommerce_pos_api(){ - if( is_pos() ){ - new WC_POS_API(); - } - } - - /** - * Loads POS integrations with third party plugins - */ - private function integrations(){ - - // WooCommerce Bookings - http://www.woothemes.com/products/woocommerce-bookings/ - if( class_exists( 'WC-Bookings' ) ){ - new WC_POS_Integrations_Bookings(); - } - - } - -} \ No newline at end of file diff --git a/includes/class-wc-pos-customers.php b/includes/customers.php similarity index 97% rename from includes/class-wc-pos-customers.php rename to includes/customers.php index 7280bee9..786a92b4 100644 --- a/includes/class-wc-pos-customers.php +++ b/includes/customers.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Customers { +namespace WC_POS; + +class Customers { // whitelist of usermeta which triggers _user_modified_gmt update private $usermeta = array( diff --git a/includes/class-wc-pos-deactivator.php b/includes/deactivator.php similarity index 92% rename from includes/class-wc-pos-deactivator.php rename to includes/deactivator.php index e1768f45..7ba7fad0 100644 --- a/includes/class-wc-pos-deactivator.php +++ b/includes/deactivator.php @@ -11,13 +11,15 @@ * @link http://www.woopos.com.au */ -class WC_POS_Deactivator { +namespace WC_POS; + +class Deactivator { /** - * @param $file + * */ - public function __construct( $file ){ - register_deactivation_hook( $file, array( $this, 'deactivate' ) ); + public function __construct(){ + register_deactivation_hook( PLUGIN_FILE, array( $this, 'deactivate' ) ); } /** diff --git a/includes/class-wc-pos-gateways.php b/includes/gateways.php similarity index 93% rename from includes/class-wc-pos-gateways.php rename to includes/gateways.php index 28786daa..9bf816f9 100644 --- a/includes/class-wc-pos-gateways.php +++ b/includes/gateways.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Gateways { +namespace WC_POS; + +class Gateways { protected static $instance; @@ -49,8 +51,8 @@ public function payment_gateways( array $gateways ) { } return array_merge($gateways, array( - 'WC_POS_Gateways_Cash', - 'WC_POS_Gateways_Card' + 'WC_POS\Gateways\Cash', + 'WC_POS\Gateways\Card' )); } diff --git a/includes/gateways/class-wc-pos-card.php b/includes/gateways/card.php similarity index 95% rename from includes/gateways/class-wc-pos-card.php rename to includes/gateways/card.php index a928328f..24760e8d 100644 --- a/includes/gateways/class-wc-pos-card.php +++ b/includes/gateways/card.php @@ -10,7 +10,13 @@ * @extends WC_Payment_Gateway */ -class WC_POS_Gateways_Card extends WC_Payment_Gateway { +namespace WC_POS\Gateways; + +use WC_Order; +use WC_Payment_Gateway; +use WC_POS\API; + +class Card extends WC_Payment_Gateway { /** * Constructor for the gateway. @@ -70,7 +76,7 @@ public function process_payment( $order_id ) { $order = new WC_Order( $order_id ); // update pos_cash data - $data = WC_POS_API::get_raw_data(); + $data = API::get_raw_data(); $cashback = isset( $data['payment_details']['pos-cashback'] ) ? wc_format_decimal( $data['payment_details']['pos-cashback'] ) : 0 ; if( $cashback !== 0 ) { diff --git a/includes/gateways/class-wc-pos-cash.php b/includes/gateways/cash.php similarity index 95% rename from includes/gateways/class-wc-pos-cash.php rename to includes/gateways/cash.php index af6c6f12..6e80855d 100644 --- a/includes/gateways/class-wc-pos-cash.php +++ b/includes/gateways/cash.php @@ -10,7 +10,13 @@ * @extends WC_Payment_Gateway */ -class WC_POS_Gateways_Cash extends WC_Payment_Gateway { +namespace WC_POS\Gateways; + +use WC_Order; +use WC_Payment_Gateway; +use WC_POS\API; + +class Cash extends WC_Payment_Gateway { /** * Constructor for the gateway. @@ -66,7 +72,7 @@ public function process_payment( $order_id ) { $order = new WC_Order( $order_id ); // update pos_cash data - $data = WC_POS_API::get_raw_data(); + $data = API::get_raw_data(); $tendered = isset( $data['payment_details']['pos-cash-tendered'] ) ? wc_format_decimal( $data['payment_details']['pos-cash-tendered'] ) : 0 ; $change = isset( $data['payment_details']['pos-cash-change'] ) ? wc_format_decimal( $data['payment_details']['pos-cash-change'] ) : 0 ; update_post_meta( $order_id, '_pos_cash_amount_tendered', $tendered ); diff --git a/includes/class-wc-pos-i18n.php b/includes/i18n.php similarity index 95% rename from includes/class-wc-pos-i18n.php rename to includes/i18n.php index ce7378ca..a85fb786 100755 --- a/includes/class-wc-pos-i18n.php +++ b/includes/i18n.php @@ -12,7 +12,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_i18n { +namespace WC_POS; + +class i18n { private $github_url; @@ -102,7 +104,7 @@ public function update_check( $transient, $force = false ) { 'type' => 'plugin', 'slug' => 'woocommerce-pos', 'language' => $locale, - 'version' => WC_POS_VERSION, + 'version' => VERSION, 'updated' => date( 'Y-m-d H:i:s', $new ), 'package' => $this->github_url . 'packages/woocommerce-pos-' . $locale . '.zip', 'autoupdate' => 1 @@ -144,7 +146,7 @@ public function upgrader_pre_download( $reply, $package, $upgrader ) { */ public function update_translations() { // security - WC_POS_AJAX::check_ajax_referer(); + AJAX::check_ajax_referer(); header( "Content-Type: text/event-stream" ); header( "Cache-Control: no-cache" ); @@ -265,9 +267,9 @@ private function flush( $data ) { * @return string */ public function js_locale( array $scripts ) { - $locale = apply_filters( 'plugin_locale', get_locale(), WC_POS_PLUGIN_NAME ); - $dir = WC_POS_PLUGIN_PATH . 'languages/js/'; - $url = WC_POS_PLUGIN_URL . 'languages/js/'; + $locale = apply_filters( 'plugin_locale', get_locale(), PLUGIN_NAME ); + $dir = PLUGIN_PATH . 'languages/js/'; + $url = PLUGIN_URL . 'languages/js/'; list( $country ) = explode( '_', $locale ); if ( is_readable( $dir . $locale . '.js' ) ) { @@ -289,7 +291,7 @@ static public function currency_denominations( $code = '' ) { if ( !$code ) { $code = get_woocommerce_currency(); } - $denominations = json_decode( file_get_contents( WC_POS_PLUGIN_PATH . 'includes/denominations.json' ) ); + $denominations = json_decode( file_get_contents( PLUGIN_PATH . 'includes/denominations.json' ) ); return isset( $denominations->$code ) ? $denominations->$code : $denominations; } diff --git a/includes/integrations/class-wc-pos-bookings.php b/includes/integrations/bookings.php similarity index 88% rename from includes/integrations/class-wc-pos-bookings.php rename to includes/integrations/bookings.php index 0c217de9..0f2ecf75 100644 --- a/includes/integrations/class-wc-pos-bookings.php +++ b/includes/integrations/bookings.php @@ -9,11 +9,13 @@ * @link http://www.woopos.com.au */ +namespace WC_POS\Integrations; + if ( ! defined( 'ABSPATH' ) ) { exit; // Exit if accessed directly } -class WC_POS_Integrations_Bookings { +class Bookings { /** * Constructor diff --git a/includes/class-wc-pos-products.php b/includes/products.php similarity index 94% rename from includes/class-wc-pos-products.php rename to includes/products.php index 171e9661..9322397c 100644 --- a/includes/class-wc-pos-products.php +++ b/includes/products.php @@ -10,15 +10,17 @@ * @link http://www.woopos.com.au */ -class WC_POS_Products { +namespace WC_POS; + +class Products { /** * Constructor */ public function __construct() { - $this->init(); add_action( 'woocommerce_product_set_stock', array( $this, 'product_set_stock') ); add_action( 'woocommerce_variation_set_stock', array( $this, 'product_set_stock') ); + $this->init(); } /** @@ -28,7 +30,7 @@ private function init() { // pos only products if( wc_pos_get_option( 'general', 'pos_only_products' ) ) { - new WC_POS_Products_Visibility(); + new Products\Visibility(); } // decimal quantities diff --git a/includes/products/class-wc-pos-visibility.php b/includes/products/visibility.php similarity index 97% rename from includes/products/class-wc-pos-visibility.php rename to includes/products/visibility.php index 7b87d6f0..72480ee8 100644 --- a/includes/products/class-wc-pos-visibility.php +++ b/includes/products/visibility.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Products_Visibility { +namespace WC_POS\Products; + +class Visibility { protected $options; @@ -227,10 +229,10 @@ public function admin_enqueue_scripts( $hook ) { if( !in_array( $hook, $pages ) || $screen->post_type != 'product' ) return; - if(defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG){ - $script = WC_POS_PLUGIN_URL . 'assets/js/src/products.js'; + if(defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG){ + $script = WC_POS\PLUGIN_URL . 'assets/js/src/products.js'; } else { - $script = WC_POS_PLUGIN_URL . 'assets/js/products.min.js'; + $script = WC_POS\PLUGIN_URL . 'assets/js/products.min.js'; } wp_enqueue_script( diff --git a/includes/setup.php b/includes/setup.php new file mode 100644 index 00000000..eec83654 --- /dev/null +++ b/includes/setup.php @@ -0,0 +1,82 @@ + + * @link http://www.woopos.com.au + */ + +namespace WC_POS; + +class Setup { + + /** + * Constructor + */ + public function __construct() { + + // global helper functions + require_once PLUGIN_PATH . 'includes/wc-pos-functions.php'; + + add_action( 'init', array( $this, 'init' ) ); + add_action( 'woocommerce_api_loaded', array( $this, 'load_woocommerce_pos_api') ); + do_action( 'woocommerce_pos_loaded' ); + + } + + /** + * Load the required resources + */ + public function init() { + + // common classes + new i18n(); + new Gateways(); + new Products(); + new Customers(); + + // ajax only + if( is_admin() && (defined('\DOING_AJAX') && \DOING_AJAX) ){ + new AJAX(); + } + + // admin only + if( is_admin() && !(defined('\DOING_AJAX') && \DOING_AJAX) ){ + new Admin(); + } + + // frontend only + else { + new Template(); + } + + // load integrations + $this->integrations(); + + } + + /** + * Loads the POS API and patches to the WC REST API + */ + public function load_woocommerce_pos_api(){ + if( is_pos() ){ + new API(); + } + } + + /** + * Loads POS integrations with third party plugins + */ + private function integrations(){ + + // WooCommerce Bookings - http://www.woothemes.com/products/woocommerce-bookings/ + if( class_exists( 'WC-Bookings' ) ){ + new Integrations\Bookings(); + } + + } + +} \ No newline at end of file diff --git a/includes/class-wc-pos-status.php b/includes/status.php similarity index 92% rename from includes/class-wc-pos-status.php rename to includes/status.php index 901c008c..02333269 100644 --- a/includes/class-wc-pos-status.php +++ b/includes/status.php @@ -8,7 +8,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Status { +namespace WC_POS; + +class Status { public function output() { $results = array( @@ -26,13 +28,13 @@ public function output() { private function test_wc_version() { $result = array( 'title' => __( 'WC Version', 'woocommerce-pos' ), - 'pass' => version_compare( WC()->version, WC_POS_Activator::WC_MIN_VERSION, '>=' ), + 'pass' => version_compare( WC()->version, Activator::WC_MIN_VERSION, '>=' ), 'message' => esc_html( WC()->version ) ); if( ! $result['pass'] ){ $result = array_merge( $result, array( - 'message' => sprintf( __( 'WooCommerce >= %s required', 'woocommerce-pos' ), WC_POS_Activator::WC_MIN_VERSION), + 'message' => sprintf( __( 'WooCommerce >= %s required', 'woocommerce-pos' ), Activator::WC_MIN_VERSION), 'buttons' => array( array( 'href' => admin_url( 'update-core.php' ), @@ -58,13 +60,13 @@ private function test_php_version() { $result = array( 'title' => /* translators: woocommerce */ __( 'PHP Version', 'woocommerce' ), - 'pass' => version_compare( $php_version, WC_POS_Activator::PHP_MIN_VERSION, '>' ), + 'pass' => version_compare( $php_version, Activator::PHP_MIN_VERSION, '>' ), 'message' => esc_html( $php_version ) ); if( ! $result['pass'] ){ $result = array_merge( $result, array( - 'message' => sprintf( __( 'PHP >= %s required', 'woocommerce-pos' ), WC_POS_Activator::PHP_MIN_VERSION ), + 'message' => sprintf( __( 'PHP >= %s required', 'woocommerce-pos' ), Activator::PHP_MIN_VERSION ), 'buttons' => array( array( 'href' => 'http://docs.woothemes.com/document/how-to-update-your-php-version/', diff --git a/includes/class-wc-pos-tax.php b/includes/tax.php similarity index 83% rename from includes/class-wc-pos-tax.php rename to includes/tax.php index bbaef338..61da8a6b 100644 --- a/includes/class-wc-pos-tax.php +++ b/includes/tax.php @@ -8,7 +8,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Tax { +namespace WC_POS; + +class Tax { /** * Returns all tax classes, class => label @@ -21,8 +23,8 @@ static public function tax_classes() { ); // get_tax_classes method introduced in WC 2.3 - if( method_exists( 'WC_Tax','get_tax_classes' ) ){ - $labels = WC_Tax::get_tax_classes(); + if( method_exists( '\WC_Tax','get_tax_classes' ) ){ + $labels = \WC_Tax::get_tax_classes(); } else { $labels = array_filter( array_map( 'trim', explode( "\n", get_option( 'woocommerce_tax_classes' ) ) ) ); } @@ -42,7 +44,7 @@ static public function tax_rates() { $rates = array(); foreach( self::tax_classes() as $class => $label ) { - if( $rate = WC_Tax::get_base_tax_rates( $class ) ){ + if( $rate = \WC_Tax::get_base_tax_rates( $class ) ){ $rates[$class] = $rate; } } diff --git a/includes/class-wc-pos-template.php b/includes/template.php similarity index 89% rename from includes/class-wc-pos-template.php rename to includes/template.php index 26576095..4f9002f0 100644 --- a/includes/class-wc-pos-template.php +++ b/includes/template.php @@ -9,7 +9,9 @@ * @link http://www.woopos.com.au */ -class WC_POS_Template { +namespace WC_POS; + +class Template { /** @var POS url slug */ private $slug; @@ -50,7 +52,7 @@ class WC_POS_Template { * Constructor */ public function __construct() { - $this->slug = WC_POS_Admin_Permalink::get_slug(); + $this->slug = Admin\Permalink::get_slug(); $this->regex = '^' . $this->slug . '/?$'; add_rewrite_tag( '%pos%', '([^&]+)' ); @@ -132,7 +134,7 @@ private function no_cache() { * @return array */ static public function get_external_js_libraries() { - return defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? self::$external_libs[ 'debug' ] : self::$external_libs[ 'min' ]; + return defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? self::$external_libs[ 'debug' ] : self::$external_libs[ 'min' ]; } /** @@ -142,7 +144,7 @@ public function head() { // enqueue and print javascript $styles = apply_filters( 'woocommerce_pos_enqueue_head_css', array( - 'pos-css' => WC_POS_PLUGIN_URL . 'assets/css/pos.min.css?ver=' . WC_POS_VERSION + 'pos-css' => PLUGIN_URL . 'assets/css/pos.min.css?ver=' . VERSION ) ); foreach ( $styles as $style ) { @@ -151,7 +153,7 @@ public function head() { // enqueue and print javascript $js = array( - 'modernizr' => WC_POS_PLUGIN_URL . 'assets/js/vendor/modernizr.custom.min.js?ver=' . WC_POS_VERSION, + 'modernizr' => PLUGIN_URL . 'assets/js/vendor/modernizr.custom.min.js?ver=' . VERSION, ); $scripts = apply_filters( 'woocommerce_pos_enqueue_head_js', $js ); @@ -164,11 +166,11 @@ public function head() { * Output the footer scripts */ public function footer() { - $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; + $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; $js = self::get_external_js_libraries(); - $js[ 'scrollIntoView' ] = WC_POS_PLUGIN_URL . 'assets/js/vendor/jquery.scrollIntoView.' . $build . '.js?ver=' . WC_POS_VERSION; - $js[ 'app' ] = WC_POS_PLUGIN_URL . 'assets/js/app.' . $build . '.js?ver=' . WC_POS_VERSION; + $js[ 'scrollIntoView' ] = PLUGIN_URL . 'assets/js/vendor/jquery.scrollIntoView.' . $build . '.js?ver=' . VERSION; + $js[ 'app' ] = PLUGIN_URL . 'assets/js/app.' . $build . '.js?ver=' . VERSION; $scripts = apply_filters( 'woocommerce_pos_enqueue_footer_js', $js ); foreach ( $scripts as $script ) { diff --git a/includes/views/main.php b/includes/views/main.php index f21d6336..39fa51b1 100644 --- a/includes/views/main.php +++ b/includes/views/main.php @@ -12,27 +12,27 @@ - - + + - + - + - + - + - + - + diff --git a/includes/views/support/tmpl-status.php b/includes/views/support/tmpl-status.php index 7a5bc6e7..9bfb42ff 100644 --- a/includes/views/support/tmpl-status.php +++ b/includes/views/support/tmpl-status.php @@ -1,5 +1,5 @@ output() as $test ): $args = wp_parse_args( $test, array( 'pass' => false, diff --git a/includes/wc-pos-functions.php b/includes/wc-pos-functions.php index bd29e10c..29e9127f 100644 --- a/includes/wc-pos-functions.php +++ b/includes/wc-pos-functions.php @@ -17,7 +17,7 @@ * @return string|void */ function wc_pos_url( $page = '' ) { - $slug = WC_POS_Admin_Permalink::get_slug(); + $slug = WC_POS\Admin\Permalink::get_slug(); return home_url( $slug . '/' .$page ); } @@ -133,7 +133,7 @@ function wc_pos_locate_template($path = ''){ * @return bool */ function wc_pos_get_option( $id, $key = false ){ - $handlers = (array) WC_POS_Admin_Settings::handlers(); + $handlers = (array) WC_POS\Admin\Settings::handlers(); if( ! array_key_exists( $id, $handlers ) ) return false; diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index 90a333c5..a98685c3 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -1,6 +1,10 @@ query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rates"); $wpdb->query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations"); - $file = WC_POS_PLUGIN_PATH . 'tests/data/sample_tax_rates.csv'; + $file = \WC_POS\PLUGIN_PATH . 'tests/data/sample_tax_rates.csv'; $delimiter = ','; $loop = 0; @@ -81,4 +85,4 @@ public function shutdown(){ } -new Integration_Test_WC_POS(); \ No newline at end of file +new Integration_Tests(); \ No newline at end of file diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index 6f4cc8c9..2e27d7e0 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -1,11 +1,17 @@ client = new GuzzleHttp\Client([ + $this->client = new Client([ 'base_url' => get_woocommerce_api_url( 'orders/' ), 'defaults' => [ 'exceptions' => false, @@ -209,6 +215,7 @@ public function test_integer_stock_adjustment(){ ) ) )); + $this->assertEquals(201, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('order', $data); @@ -233,7 +240,7 @@ public function test_float_stock_adjustment(){ $product['quantity'] = $random_qty; // set the decimal_qty option - $option_key = WC_POS_Admin_Settings::DB_PREFIX . 'general'; + $option_key = Settings::DB_PREFIX . 'general'; update_option( $option_key, array('decimal_qty' => true) ); // inject stock value to db @@ -255,6 +262,7 @@ public function test_float_stock_adjustment(){ ) ) )); + $this->assertEquals(201, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('order', $data); diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index bbf71d20..39b83434 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -1,6 +1,12 @@ client = new GuzzleHttp\Client([ + $this->client = new Client([ 'base_url' => get_woocommerce_api_url( 'products/' ), 'defaults' => [ 'exceptions' => false, @@ -90,7 +96,7 @@ public function test_simple_product_decimal_quantity(){ $random_qty = rand(0, 999) / 100; // set the decimal_qty option - $option_key = WC_POS_Admin_Settings::DB_PREFIX . 'general'; + $option_key = Settings::DB_PREFIX . 'general'; update_option( $option_key, array('decimal_qty' => true) ); // change the stock to decimal @@ -123,7 +129,7 @@ public function test_variable_product_decimal_quantity(){ $random_qty = rand(0, 999) / 100; // set the decimal_qty option - $option_key = WC_POS_Admin_Settings::DB_PREFIX . 'general'; + $option_key = Settings::DB_PREFIX . 'general'; update_option( $option_key, array('decimal_qty' => true) ); // change the stock to decimal @@ -152,7 +158,7 @@ public function test_variable_product_decimal_quantity(){ public function test_pos_only_products(){ // activate POS Only products - $option_key = WC_POS_Admin_Settings::DB_PREFIX . 'general'; + $option_key = Settings::DB_PREFIX . 'general'; update_option( $option_key, array('pos_only_products' => true) ); // get random product @@ -168,7 +174,7 @@ public function test_pos_only_products(){ $this->assertEquals(200, $response->getStatusCode()); // get product via website - $client = new GuzzleHttp\Client(); + $client = new Client(); $response = $client->get( get_home_url(), array( 'query' => array( 'p' => $product['id'] @@ -187,7 +193,7 @@ public function test_pos_only_products(){ public function test_online_only_products(){ // activate POS Only products - $option_key = WC_POS_Admin_Settings::DB_PREFIX . 'general'; + $option_key = Settings::DB_PREFIX . 'general'; update_option( $option_key, array('pos_only_products' => true) ); // get random product @@ -215,7 +221,7 @@ public function test_online_only_products(){ // $this->assertEmpty($data['product']); // get product via website - $client = new GuzzleHttp\Client(); + $client = new Client(); $response = $client->get( get_home_url(), array( 'query' => array( 'p' => $product['id'] diff --git a/tests/integration/php/spec/test-activation.php b/tests/integration/php/spec/test-activation.php index 9a4c7a80..0f435637 100644 --- a/tests/integration/php/spec/test-activation.php +++ b/tests/integration/php/spec/test-activation.php @@ -1,11 +1,16 @@ client = new GuzzleHttp\Client([ + $this->client = new Client([ 'defaults' => ['exceptions' => false], ]); } diff --git a/tests/integration/php/spec/test-rest.php b/tests/integration/php/spec/test-rest.php index 788f81c2..915b6e2a 100644 --- a/tests/integration/php/spec/test-rest.php +++ b/tests/integration/php/spec/test-rest.php @@ -1,11 +1,16 @@ client = new GuzzleHttp\Client([ + $this->client = new Client([ 'base_url' => get_woocommerce_api_url( '' ), 'defaults' => ['exceptions' => false] ]); diff --git a/tests/unit/php/bootstrap.php b/tests/unit/php/bootstrap.php index 282a19bb..43d6f727 100644 --- a/tests/unit/php/bootstrap.php +++ b/tests/unit/php/bootstrap.php @@ -1,6 +1,8 @@ db_version_option = WC_POS_Admin_Settings::DB_PREFIX . 'db_version'; - $this->idb_version_option = WC_POS_Admin_Settings::DB_PREFIX . 'idb_version'; + $this->db_version_option = Settings::DB_PREFIX . 'db_version'; + $this->idb_version_option = Settings::DB_PREFIX . 'idb_version'; delete_option( $this->db_version_option ); delete_option( $this->idb_version_option ); } @@ -20,31 +25,31 @@ public function tearDown() { public function test_get_db_version(){ // should init with 0 - $this->assertEquals( 0, WC_POS_Admin_Settings::get_db_version() ); + $this->assertEquals( 0, Settings::get_db_version() ); // bump versions - WC_POS_Admin_Settings::bump_versions(); - $this->assertEquals( WC_POS_VERSION, WC_POS_Admin_Settings::get_db_version() ); + Settings::bump_versions(); + $this->assertEquals( \WC_POS\VERSION, Settings::get_db_version() ); } public function test_get_idb_version(){ // should init with 1 - $this->assertEquals( 1, WC_POS_Admin_Settings::get_idb_version() ); + $this->assertEquals( 1, Settings::get_idb_version() ); // should handle non integers update_option( $this->idb_version_option, 'corrupt' ); - $this->assertEquals( 1, WC_POS_Admin_Settings::get_idb_version() ); + $this->assertEquals( 1, Settings::get_idb_version() ); } public function test_bump_idb_version(){ // should init with 1 - $this->assertEquals( 1, WC_POS_Admin_Settings::bump_idb_version() ); + $this->assertEquals( 1, Settings::bump_idb_version() ); // should increment version numbers - $this->assertEquals( 2, WC_POS_Admin_Settings::bump_idb_version() ); + $this->assertEquals( 2, Settings::bump_idb_version() ); } diff --git a/tests/unit/php/spec/api/test-products.php b/tests/unit/php/spec/api/test-products.php index c9768bc5..43c03f17 100644 --- a/tests/unit/php/spec/api/test-products.php +++ b/tests/unit/php/spec/api/test-products.php @@ -1,6 +1,11 @@ products_api = new WC_POS_API_Products( $this->mock_api_server() ); + $this->products_api = new Products( $this->mock_api_server() ); // create product $this->product = wc_get_product( $this->mock_product() ); diff --git a/tests/unit/php/spec/api/test-settings.php b/tests/unit/php/spec/api/test-settings.php index 5cbf362d..b32aef3e 100644 --- a/tests/unit/php/spec/api/test-settings.php +++ b/tests/unit/php/spec/api/test-settings.php @@ -1,11 +1,17 @@ settings_api = new WC_POS_API_Settings( $this->mock_api_server() ); + $this->settings_api = new Settings( $this->mock_api_server() ); } function mock_api_server(){ @@ -24,12 +30,12 @@ function mock_api_server(){ // } function test_delete_all_settings(){ - update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test1', 'dummy' ); - update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test2', 'dummy' ); + update_option( Admin_Settings::DB_PREFIX . 'test1', 'dummy' ); + update_option( Admin_Settings::DB_PREFIX . 'test2', 'dummy' ); $this->settings_api->delete_all_settings(); global $wpdb; - $prefix = WC_POS_Admin_Settings::DB_PREFIX; + $prefix = Admin_Settings::DB_PREFIX; $rows = $wpdb->get_var( " SELECT COUNT(*) FROM {$wpdb->options} WHERE option_name diff --git a/tests/unit/php/spec/api/test-templates.php b/tests/unit/php/spec/api/test-templates.php index 56b77838..dde23471 100644 --- a/tests/unit/php/spec/api/test-templates.php +++ b/tests/unit/php/spec/api/test-templates.php @@ -1,11 +1,16 @@ template = new WC_POS_API_Templates( $this->mock_api_server() ); + $this->template = new Templates( $this->mock_api_server() ); } function mock_api_server(){ @@ -19,7 +24,7 @@ function mock_api_server(){ public function test_locate_default_template_files(){ // create test template - $test_dir = WC_POS_PLUGIN_PATH . 'includes/views/test'; + $test_dir = \WC_POS\PLUGIN_PATH . 'includes/views/test'; $test_file = $test_dir. '/tmpl-test.php'; if( !is_dir( $test_dir ) ) @@ -37,7 +42,7 @@ public function test_locate_default_template_files(){ public function test_locate_template_files(){ // create test template - $test_dir = WC_POS_PLUGIN_PATH . 'includes/views/test'; + $test_dir = \WC_POS\PLUGIN_PATH . 'includes/views/test'; $test_file = $test_dir. '/tmpl-test.php'; if( !is_dir( $test_dir ) ) diff --git a/tests/unit/php/spec/test-ajax.php b/tests/unit/php/spec/test-ajax.php deleted file mode 100644 index 7628caff..00000000 --- a/tests/unit/php/spec/test-ajax.php +++ /dev/null @@ -1,31 +0,0 @@ - 'value', -// 'nested' => array( -// 'key' => 'value' -// ) -// ); -// -// // insert to db -// update_option( WC_POS_Admin_Settings::DB_PREFIX . 'test', $data ); -// -// // get full data array -// $settings = WC_POS_Admin_Settings::get_settings('test'); -// $this->assertEquals( $settings, $data ); -// -// // get specific key -// $settings = WC_POS_Admin_Settings::get_settings('test', 'nested'); -// $this->assertEquals( $settings, array('key' => 'value') ); -// -// WC_POS_Admin_Settings::delete_settings('test'); -// -// } - -//} - diff --git a/tests/unit/php/spec/test-install.php b/tests/unit/php/spec/test-install.php index 6079fb08..eb967f98 100644 --- a/tests/unit/php/spec/test-install.php +++ b/tests/unit/php/spec/test-install.php @@ -1,11 +1,16 @@ activator = new WC_POS_Activator(''); + $this->activator = new Activator(); wp_set_current_user(1); } diff --git a/tests/unit/php/spec/test-wc-functions.php b/tests/unit/php/spec/test-wc-functions.php index eea4b66f..b790ded1 100644 --- a/tests/unit/php/spec/test-wc-functions.php +++ b/tests/unit/php/spec/test-wc-functions.php @@ -1,6 +1,10 @@ Date: Thu, 10 Mar 2016 15:58:18 +0800 Subject: [PATCH 034/169] fix travis.yml --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34962577..8cd1f484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,10 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf 2>/dev/null - else - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf 2>/dev/null - fi + - test $(phpenv version-name) == "5.4" + && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf + - test $(phpenv version-name) == "7.0" + && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.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 @@ -72,8 +71,7 @@ script: # - ./node_modules/.bin/pioneer after_success: - - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then - phpunit -c phpunit.xml.dist - php vendor/bin/coveralls -v - grunt coverage - fi \ No newline at end of file + - test $(phpenv version-name) == "7.0" + && phpunit -c phpunit.xml.dist; + && php vendor/bin/coveralls -v; + && grunt coverage; \ No newline at end of file From 3cf1e6b5d71ff525edb737be5a7784909238a8b2 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 16:05:30 +0800 Subject: [PATCH 035/169] fix travis.yml --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cd1f484..664214af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,9 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - test $(phpenv version-name) == "5.4" + - test $(phpenv version-name) == "5.4" \ && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - - test $(phpenv version-name) == "7.0" + - test $(phpenv version-name) == "7.0" \ && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf - sudo a2enmod rewrite actions fastcgi alias - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini @@ -71,7 +71,7 @@ script: # - ./node_modules/.bin/pioneer after_success: - - test $(phpenv version-name) == "7.0" - && phpunit -c phpunit.xml.dist; - && php vendor/bin/coveralls -v; - && grunt coverage; \ No newline at end of file + - test $(phpenv version-name) == "7.0" \ + && phpunit -c phpunit.xml.dist \ + && php vendor/bin/coveralls -v \ + && grunt coverage \ No newline at end of file From 767722f964c6f94cdf87511a012151116d99f3d5 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 16:09:26 +0800 Subject: [PATCH 036/169] fix travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 664214af..063e8b69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,9 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - test $(phpenv version-name) == "5.4" \ + - test $(phpenv version-name) = "5.4" \ && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - - test $(phpenv version-name) == "7.0" \ + - test $(phpenv version-name) = "7.0" \ && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf - sudo a2enmod rewrite actions fastcgi alias - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini @@ -71,7 +71,7 @@ script: # - ./node_modules/.bin/pioneer after_success: - - test $(phpenv version-name) == "7.0" \ + - test $(phpenv version-name) = "7.0" \ && phpunit -c phpunit.xml.dist \ && php vendor/bin/coveralls -v \ && grunt coverage \ No newline at end of file From 86eca17281c905f2cd06555084a4b62d022f41c9 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 16:23:17 +0800 Subject: [PATCH 037/169] fix travis.yml --- .travis.yml | 18 ++++++++++-------- woocommerce-pos.php | 7 ------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 063e8b69..75146ec9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,11 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - test $(phpenv version-name) = "5.4" \ - && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - - test $(phpenv version-name) = "7.0" \ - && sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf + - if [ $(phpenv version-name) = "7.0" ] ; then + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf; + else + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; + fi - 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 @@ -71,7 +72,8 @@ script: # - ./node_modules/.bin/pioneer after_success: - - test $(phpenv version-name) = "7.0" \ - && phpunit -c phpunit.xml.dist \ - && php vendor/bin/coveralls -v \ - && grunt coverage \ No newline at end of file + - if [ $(phpenv version-name) = "7.0" ] ; then + phpunit -c phpunit.xml.dist + && php vendor/bin/coveralls -v + && grunt coverage; + fi \ No newline at end of file diff --git a/woocommerce-pos.php b/woocommerce-pos.php index e0063cde..5f474e70 100644 --- a/woocommerce-pos.php +++ b/woocommerce-pos.php @@ -20,11 +20,6 @@ namespace WC_POS; -// If this file is called directly, abort. -if ( ! defined( '\WPINC' ) ) { - die; -} - /** * Define plugin constants. */ @@ -52,8 +47,6 @@ function autoload( $cls ) { $file = PLUGIN_PATH . 'includes' . str_replace( '\\', DIRECTORY_SEPARATOR, strtolower( $cls ) ) . '.php'; if(is_readable($file)){ require_once( $file ); - } else { - $break = ''; } } From 66147f312e7263e157f4d280db6fc2a08e3bdc21 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 16:35:22 +0800 Subject: [PATCH 038/169] fix travis.yml --- .travis.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75146ec9..89a92923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - "5.4" - - "7.0" + - 5.4 + - 7.0 env: - WP_VERSION=latest WP_MULTISITE=0 @@ -29,11 +29,8 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - if [ $(phpenv version-name) = "7.0" ] ; then - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf; - else - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; - fi + - if [ "`phpenv version-name`" != "7.0" ] ; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; fi + - if [ "`phpenv version-name`" == "7.0" ] ; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf; fi - 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 @@ -72,8 +69,4 @@ script: # - ./node_modules/.bin/pioneer after_success: - - if [ $(phpenv version-name) = "7.0" ] ; then - phpunit -c phpunit.xml.dist - && php vendor/bin/coveralls -v - && grunt coverage; - fi \ No newline at end of file + - if [ "`phpenv version-name`" == "7.0" ] ; then phpunit -c phpunit.xml.dist && php vendor/bin/coveralls -v && grunt coverage; fi \ No newline at end of file From 97540e37b21ffe47b6c5157b031bfe18d33f0fa2 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 20:59:29 +0800 Subject: [PATCH 039/169] fix php 7 tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89a92923..bbb5c49f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ install: # apache - sudo apt-get update - sudo apt-get install apache2 libapache2-mod-fastcgi - - if [ "`phpenv version-name`" != "7.0" ] ; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; fi + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; - if [ "`phpenv version-name`" == "7.0" ] ; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf; fi - sudo a2enmod rewrite actions fastcgi alias - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini From e6908976756ea1d09bcd5883100e2b26ba4c2bbd Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 10 Mar 2016 23:35:52 +0800 Subject: [PATCH 040/169] namespacing fixes --- .travis.yml | 3 +- includes/admin/menu.php | 14 ++++---- includes/admin/plugins.php | 4 +-- includes/admin/settings.php | 35 ++++++++++---------- includes/admin/settings/receipt/options.php | 4 ++- includes/admin/settings/receipt/template.php | 6 +++- includes/admin/settings/receipts.php | 4 +-- includes/admin/settings/views/general.php | 10 ++++-- includes/admin/settings/views/status.php | 5 ++- includes/admin/status.php | 24 ++++++++------ includes/ajax.php | 2 +- includes/api.php | 20 +++++------ includes/api/params.php | 2 +- includes/api/payload.php | 10 +++--- includes/api/settings.php | 11 +++--- includes/i18n.php | 18 +++++----- includes/products/visibility.php | 10 +++--- 17 files changed, 100 insertions(+), 82 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbb5c49f..24d29bd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,4 +69,5 @@ script: # - ./node_modules/.bin/pioneer after_success: - - if [ "`phpenv version-name`" == "7.0" ] ; then phpunit -c phpunit.xml.dist && php vendor/bin/coveralls -v && grunt coverage; fi \ No newline at end of file +# - if [ "`phpenv version-name`" == "7.0" ] ; then phpunit -c phpunit.xml.dist && php vendor/bin/coveralls -v && grunt coverage; fi + - if [ "`phpenv version-name`" == "7.0" ] ; then grunt coverage; fi \ No newline at end of file diff --git a/includes/admin/menu.php b/includes/admin/menu.php index d7d64c8b..0cb5a919 100644 --- a/includes/admin/menu.php +++ b/includes/admin/menu.php @@ -36,13 +36,13 @@ public function admin_menu() { __( 'POS', 'woocommerce-pos' ), __( 'POS', 'woocommerce-pos' ), 'manage_woocommerce_pos', - PLUGIN_NAME, + \WC_POS\PLUGIN_NAME, array( $this, 'display_upgrade_page' ), 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAwIiBoZWlnaHQ9IjEyMDAiIHZpZXdCb3g9IjAgMCAxMjAwIDEyMDAiPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik0xMTE0LjI4NiAwSDg1LjdDMzguMzc1IDAgMCAzOC40IDAgODUuNzE0VjIxNC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzUgODUuNzE0LTg1LjcxM1Y2MGgxNzEuNDN2MTU0LjE0YzAgNDcuMyAzOC40IDg1LjcgODUuNyA4NS43IDQ3LjMzOCAwIDg1LjcxMy0zOC4zNzUgODUuNzEzLTg1LjcxM1Y2MGgxNzEuNDI4djE1NC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzUgODUuNzE0LTg1LjcxM1Y2MGgxNzEuNDI4djE1NC4xNGMwIDQ3LjMgMzguNCA4NS43IDg1LjcgODUuNyA0Ny4zNCAwIDg1LjcxNC0zOC4zNzQgODUuNzE0LTg1LjcxM1Y4NS43MTRDMTIwMCAzOC40IDExNjEuNiAwIDExMTQuMyAwek0yNzUuODkzIDUzMS43NzdjLTUyLjI5IDAtOTIuNjEgNDAuOTUtOTIuNjEgOTMuMjRzNDAuMzIgOTMuMiA5Mi42IDkzLjI0YzUyLjI5IDAgOTMuMjQtNDAuOTUgOTMuMjQtOTMuMjQuMDEtNTIuMzE3LTQwLjkyMy05My4yMTctOTMuMjIzLTkzLjI0eiIvPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik0xMTE0LjI4NiAzMzkuODU1Yy0zMi4xMDQgMC02Mi4zNjgtMTEuOTUtODUuNzE1LTMzLjc1LTIzLjM0NyAyMS43OTgtNTMuNjEgMzMuNzUtODUuNzEzIDMzLjctMzIuMTA0IDAtNjIuMzY4LTExLjk1LTg1LjcxNS0zMy43NDgtMjMuMzQ4IDIxLjc5Ny01My42MTIgMzMuNzUtODUuNzE1IDMzLjc1cy02Mi4zNjctMTEuOTUyLTg1LjcxNS0zMy43NWMtMjMuMzQ3IDIxLjc5Ny01My42MSAzMy43NS04NS43MTQgMzMuNzUtMzIuMTAyIDAtNjIuMzY3LTExLjk1My04NS43MTQtMzMuNzUtMjMuMzQ3IDIxLjc5Ny01My42MTMgMzMuNzUtODUuNzE0IDMzLjc1LTMyLjEwMiAwLTYyLjM2Ny0xMS45NTMtODUuNzE0LTMzLjc1LTIzLjM0OCAyMS43OTctNTMuNjEyIDMzLjc1LTg1LjcxNCAzMy43NXMtNjIuMzY3LTExLjk1My04NS43MTQtMzMuNzVjLTIzLjM0NyAyMS43OTctNTMuNjEzIDMzLjc1LTg1LjcxNCAzMy43LTMyLjEwNCAwLTYyLjM2Ni0xMS45Ni04NS43MTQtMzMuNzZWMTIwMGwzNDMtMjM4LjY3aDc3MS4xODhjNDcuMzkzIDAgODUuODEyLTM4LjQyIDg1LjgxMi04NS44MTJWMzA2LjA5NGMtMjMuMzQ4IDIxLjgwNi01My42IDMzLjgwNi04NS43IDMzLjc2ek0yNzUuODkzIDc4Ni45M2MtMzUuMjggMC02Ny40MS0xMS4zNC05My4yNC0zMC4yNHYxMTUuMjljMCAyNC41Ny0xNS43NSAzOS4wNjItMzQuNjUgMzkuMDYyLTIxLjQyIDAtMzQuNjUtMTYuMzgtMzQuNjUtMzkuMDZWNTAzLjQyNmMwLTIyLjA1IDE1LjEyLTM4LjQzIDM0LjY1LTM4LjQzIDE0LjQ5IDAgMjcuMSA2LjkgMzEuNSAyOS42MSAyNS44My0xOS41MyA1OS4yMi0zMi4xMyA5Ni4zOS0zMi4xMyA5MC4wOSAwIDE2My4yIDcyLjUgMTYzLjIgMTYyLjVDNDM5LjA2MyA3MTQuNSAzNjYgNzg2LjkgMjc1LjkgNzg2Ljkzem0zODUuNTUuNjNjLTkwLjcyMiAwLTE2My4xNzItNzIuNDUtMTYzLjE3Mi0xNjMuMTcgMC04OS40NjIgNzIuNDUtMTYxLjkxMyAxNjMuMTczLTE2MS45MTMgODkuNDYgMCAxNjEuOSA3Mi41IDE2MS45IDE2MS45MTIuMDEgOTAuNzEtNzIuNDQzIDE2My4yMS0xNjEuOTQzIDE2My4yMXptMzIxLjkyNyAwYy01OS44NTIgMC0xMDIuMDYyLTMxLjUtMTAyLjA2Mi02MyAwLTE2LjM4IDEyLjYwMi0yOS42MSAzMS41LTI5LjYxIDI3LjcyMiAwIDM4LjQgMjguNCA3My4xIDI4LjM1IDIzLjk0IDAgMzQuNjUtMTIuNiAzNC42NS0yNS4yIDAtMTEuOTctOC44Mi0yNS4xOTgtNDEuNTgtNDIuMjFsLTI5LjYxLTE1LjEyYy00OC41MS0yNC41NjgtNjQuODktNTIuOTItNjQuODktOTAuMDkgMC00NC43MyA0MC4zMi04Ny41NyAxMDUuMjEtODcuNTcgNjguMDQgMCA5NS4xIDQxLjYgOTUuMSA2MC41IDAgMTUuNzUtMTEuOTcgMjguMzUtMzAuODcgMjguMzUtMjUuMiAwLTQwLjMxOC0yMi4wNS03MS44Mi0yMi4wNS0xNi4zOCAwLTI0LjU3IDExLjM0LTI0LjU3IDIxLjQgMCAxMy4yIDYuOSAyMC4yIDM0IDM1LjkxbDcuNTYyIDQuNDFjMTAuMDggNi4zIDIyLjcgMTEuMyAzMy40IDE3LjY0IDQ3Ljg4IDI1LjggNTkuOSA1Ni43IDU5LjkgODguMi0uMDMgNDUuMzMtMzUuODkgOTAuMTMtMTA4Ljk5IDkwLjA5eiIvPjxwYXRoIGZpbGw9IiM5OTkiIGQ9Ik02NjEuNDQzIDUzMi40MDhjLTUyLjI5IDAtOTMuMjQgNDAuOTUtOTMuMjQgOTEuOTggMCA1Mi4zIDQxIDkzLjIgOTMuMiA5My4yNCA1MS4wMyAwIDkxLjk4LTQwLjk1IDkxLjk4LTkzLjI0LjA0Mi01MC45ODgtNDAuODgzLTkxLjk4OC05MS45ODMtOTEuOTh6Ii8+PC9zdmc+' ); add_submenu_page( - PLUGIN_NAME, + \WC_POS\PLUGIN_NAME, __( 'View POS', 'woocommerce-pos' ), __( 'View POS', 'woocommerce-pos' ), 'manage_woocommerce_pos', @@ -51,7 +51,7 @@ public function admin_menu() { // adjust submenu global $submenu; - $pos_submenu = &$submenu[PLUGIN_NAME]; + $pos_submenu = &$submenu[\WC_POS\PLUGIN_NAME]; $pos_submenu[0][0] = __( 'Upgrade to Pro', 'woocommerce-pos' ); $pos_submenu[1][2] = wc_pos_url(); } @@ -63,16 +63,16 @@ public function admin_menu() { */ public function menu_order( $menu_order ) { $woo = array_search( 'woocommerce', $menu_order ); - $pos = array_search( PLUGIN_NAME, $menu_order ); + $pos = array_search( \WC_POS\PLUGIN_NAME, $menu_order ); if( $woo !== false && $pos !== false) { // rearrange menu unset( $menu_order[$pos] ); - array_splice( $menu_order, ++$woo, 0, PLUGIN_NAME ); + array_splice( $menu_order, ++$woo, 0, \WC_POS\PLUGIN_NAME ); // rearrange submenu global $submenu; - $pos_submenu = &$submenu[PLUGIN_NAME]; + $pos_submenu = &$submenu[\WC_POS\PLUGIN_NAME]; $pos_submenu[500] = $pos_submenu[1]; unset( $pos_submenu[1] ); }; @@ -100,7 +100,7 @@ public function display_upgrade_page() { return; } // Store remote HTML file in transient, expire after 24 hours - set_transient( 'remote_pro_page', $upgrade, 24 * HOUR_IN_SECONDS ); + set_transient( 'remote_pro_page', $upgrade, 24 * \HOUR_IN_SECONDS ); } include_once 'views/upgrade.php'; } diff --git a/includes/admin/plugins.php b/includes/admin/plugins.php index bf2945d9..75e5b2e8 100644 --- a/includes/admin/plugins.php +++ b/includes/admin/plugins.php @@ -14,8 +14,8 @@ class Plugins { public function __construct() { - add_filter( 'plugin_action_links_'. WC_POS_PLUGIN_FILE, array ( $this, 'plugin_action_links' ) ); - add_action( 'in_plugin_update_message-' . WC_POS_PLUGIN_FILE, array ( $this, 'plugin_update_message' ), 10, 2 ); + add_filter( 'plugin_action_links_'. \WC_POS\PLUGIN_FILE, array ( $this, 'plugin_action_links' ) ); + add_action( 'in_plugin_update_message-' . \WC_POS\PLUGIN_FILE, array ( $this, 'plugin_update_message' ), 10, 2 ); } /** diff --git a/includes/admin/settings.php b/includes/admin/settings.php index cf906de9..e176a158 100644 --- a/includes/admin/settings.php +++ b/includes/admin/settings.php @@ -11,6 +11,8 @@ namespace WC_POS\Admin; +use WC_POS\Template; + class Settings extends Page { /* @var string JS var with page id, used for API requests */ @@ -20,12 +22,12 @@ class Settings extends Page { * @var array settings handlers */ static public $handlers = array( - 'general' => 'WC_POS\Admin\Settings\General', - 'customers' => 'WC_POS\Admin\Settings\Customers', - 'checkout' => 'WC_POS\Admin\Settings\Checkout', - 'receipts' => 'WC_POS\Admin\Settings\Receipts', - 'hotkeys' => 'WC_POS\Admin\Settings\HotKeys', - 'access' => 'WC_POS\Admin\Settings\Access' + 'general' => '\WC_POS\Admin\Settings\General', + 'customers' => '\WC_POS\Admin\Settings\Customers', + 'checkout' => '\WC_POS\Admin\Settings\Checkout', + 'receipts' => '\WC_POS\Admin\Settings\Receipts', + 'hotkeys' => '\WC_POS\Admin\Settings\HotKeys', + 'access' => '\WC_POS\Admin\Settings\Access' ); /** @@ -33,7 +35,7 @@ class Settings extends Page { */ public function admin_menu() { $this->screen_id = add_submenu_page( - WC_POS_PLUGIN_NAME, + \WC_POS\PLUGIN_NAME, /* translators: wordpress */ __( 'Settings' ), /* translators: wordpress */ @@ -74,7 +76,7 @@ public function enqueue_admin_scripts() { wp_deregister_script( 'backbone' ); // register - $external_libs = WC_POS_Template::get_external_js_libraries(); + $external_libs = Template::get_external_js_libraries(); wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); @@ -84,24 +86,23 @@ public function enqueue_admin_scripts() { wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.1/js/select2.min.js', array( 'jquery' ), null, true ); wp_register_script( 'ace', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.2/ace.js', false, null, true ); -// wp_register_script( 'idb-wrapper', $external_libs[ 'idb-wrapper' ], false, null, true ); // enqueue wp_enqueue_script( 'jquery-ui-sortable' ); - $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; + $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-admin-settings-app', - WC_POS\PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', + \WC_POS\PLUGIN_NAME . '-admin-settings-app', + \WC_POS\PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2', 'ace' ), - WC_POS_VERSION, + \WC_POS\VERSION, true ); wp_enqueue_script( 'eventsource-polyfill', - WC_POS\PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', + \WC_POS\PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', array(), null, true @@ -110,10 +111,10 @@ public function enqueue_admin_scripts() { $scripts = apply_filters( 'woocommerce_pos_admin_enqueue_scripts', array() ); if ( isset( $scripts[ 'locale' ] ) ) { wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-js-locale', + \WC_POS\PLUGIN_NAME . '-js-locale', $scripts[ 'locale' ], - array( WC_POS_PLUGIN_NAME . '-admin-settings-app' ), - WC_POS_VERSION, + array( \WC_POS\PLUGIN_NAME . '-admin-settings-app' ), + \WC_POS\VERSION, true ); } diff --git a/includes/admin/settings/receipt/options.php b/includes/admin/settings/receipt/options.php index 7a3968c5..1f1145e8 100644 --- a/includes/admin/settings/receipt/options.php +++ b/includes/admin/settings/receipt/options.php @@ -11,7 +11,9 @@ namespace WC_POS\Admin\Settings\Receipt; -class Options extends WC_POS\Admin\Settings\Page { +use WC_POS\Admin\Settings\Page; + +class Options extends Page { protected static $instance; diff --git a/includes/admin/settings/receipt/template.php b/includes/admin/settings/receipt/template.php index cee219c0..9e91b63f 100644 --- a/includes/admin/settings/receipt/template.php +++ b/includes/admin/settings/receipt/template.php @@ -9,7 +9,11 @@ * @link http://www.woopos.com.au */ -class WC_POS_Admin_Settings_Receipt_Template extends WC_POS_Admin_Settings_Abstract { +namespace WC_POS\Admin\Settings\Receipt; + +use WC_POS\Admin\Settings\Page; + +class Template extends Page { protected static $instance; diff --git a/includes/admin/settings/receipts.php b/includes/admin/settings/receipts.php index 5692b0d1..c6b9abe1 100644 --- a/includes/admin/settings/receipts.php +++ b/includes/admin/settings/receipts.php @@ -23,8 +23,8 @@ public function __construct() { $this->label = __( 'Receipts', 'woocommerce-pos' ); $this->section_handlers = array( - 'WC_POS_Admin_Settings_Receipt_Options', - 'WC_POS_Admin_Settings_Receipt_Template' + '\WC_POS\Admin\Settings\Receipt\Options', + '\WC_POS\Admin\Settings\Receipt\Template' ); } diff --git a/includes/admin/settings/views/general.php b/includes/admin/settings/views/general.php index 3aa27a52..2c605e72 100644 --- a/includes/admin/settings/views/general.php +++ b/includes/admin/settings/views/general.php @@ -2,6 +2,10 @@ /** * Template for the general settings */ + +use WC_POS\API\Params; +use WC_POS\Tax; + ?>

              @@ -64,7 +68,7 @@ @@ -78,7 +82,7 @@ @@ -119,7 +123,7 @@ diff --git a/includes/admin/settings/views/status.php b/includes/admin/settings/views/status.php index 4b02d057..54709640 100644 --- a/includes/admin/settings/views/status.php +++ b/includes/admin/settings/views/status.php @@ -2,6 +2,9 @@ /** * Template for the admin tools */ + +use WC_POS\Status; + ?>

              @@ -9,7 +12,7 @@ output() as $test ): $args = wp_parse_args( $test, array( 'pass' => false, diff --git a/includes/admin/status.php b/includes/admin/status.php index edbd4761..338461c5 100644 --- a/includes/admin/status.php +++ b/includes/admin/status.php @@ -11,6 +11,8 @@ namespace WC_POS\Admin; +use WC_POS\Template; + class Status extends Page { /* @var string JS var with page id, used for API requests */ @@ -20,8 +22,8 @@ class Status extends Page { * @var array settings handlers */ static public $handlers = array( - 'tools' => 'WC_POS_Admin_Settings_Tools', - 'status' => 'WC_POS_Admin_Settings_Status' + 'tools' => '\WC_POS\Admin\Settings\Tools', + 'status' => '\WC_POS\Admin\Settings\Status' ); /** @@ -29,7 +31,7 @@ class Status extends Page { */ public function admin_menu() { $this->screen_id = add_submenu_page( - WC_POS_PLUGIN_NAME, + \WC_POS\PLUGIN_NAME, /* translators: woocommerce */ __( 'System Status', 'woocommerce' ), /* translators: woocommerce */ @@ -72,7 +74,7 @@ public function enqueue_admin_scripts() { wp_deregister_script( 'backbone' ); // register - $external_libs = WC_POS_Template::get_external_js_libraries(); + $external_libs = Template::get_external_js_libraries(); wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); @@ -85,23 +87,23 @@ public function enqueue_admin_scripts() { // enqueue wp_enqueue_script( 'jquery-ui-sortable' ); - $build = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'build' : 'min'; + $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-admin-system-status-app', - WC_POS\PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', + \WC_POS\PLUGIN_NAME . '-admin-system-status-app', + \WC_POS\PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), - WC_POS_VERSION, + \WC_POS\VERSION, true ); $scripts = apply_filters( 'woocommerce_pos_admin_enqueue_scripts', array() ); if ( isset( $scripts[ 'locale' ] ) ) { wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-js-locale', + \WC_POS\PLUGIN_NAME . '-js-locale', $scripts[ 'locale' ], - array( WC_POS_PLUGIN_NAME . '-admin-system-status-app' ), - WC_POS_VERSION, + array( \WC_POS\PLUGIN_NAME . '-admin-system-status-app' ), + \WC_POS\VERSION, true ); } diff --git a/includes/ajax.php b/includes/ajax.php index 37573513..4fb55fd8 100644 --- a/includes/ajax.php +++ b/includes/ajax.php @@ -34,7 +34,7 @@ public function __construct() { * Verifies the AJAX request */ static public function check_ajax_referer(){ - $pass = check_ajax_referer( WC_POS_PLUGIN_NAME, 'security', false ); + $pass = check_ajax_referer( PLUGIN_NAME, 'security', false ); if(!$pass){ $result = new \WP_Error( 'woocommerce_pos_invalid_nonce', diff --git a/includes/api.php b/includes/api.php index 9374d0cd..302cf3df 100644 --- a/includes/api.php +++ b/includes/api.php @@ -46,24 +46,24 @@ public function api_classes( array $classes ){ // common classes array_push( $classes, - 'WC_POS\API\Products', - 'WC_POS\API\Orders', - 'WC_POS\API\Customers', - 'WC_POS\API\Coupons', - 'WC_POS\API\Payload', - 'WC_POS\API\Params', - 'WC_POS\API\i18n', - 'WC_POS\API\Templates' + '\WC_POS\API\Products', + '\WC_POS\API\Orders', + '\WC_POS\API\Customers', + '\WC_POS\API\Coupons', + '\WC_POS\API\Payload', + '\WC_POS\API\Params', + '\WC_POS\API\i18n', + '\WC_POS\API\Templates' ); // frontend only if( current_user_can('access_woocommerce_pos') ){ - array_push( $classes, 'WC_POS\API\Gateways', 'WC_POS\API\Support' ); + array_push( $classes, '\WC_POS\API\Gateways', '\WC_POS\API\Support' ); } // admin only if( current_user_can('manage_woocommerce_pos') ){ - array_push( $classes, 'WC_POS\API\Settings' ); + array_push( $classes, '\WC_POS\API\Settings' ); } return $classes; diff --git a/includes/api/params.php b/includes/api/params.php index f66e9454..4c7b0634 100644 --- a/includes/api/params.php +++ b/includes/api/params.php @@ -93,7 +93,7 @@ private function frontend_params(){ private function admin_params(){ return array( 'search_customers_nonce' => wp_create_nonce( 'search-customers' ), - 'nonce' => wp_create_nonce( WC_POS_PLUGIN_NAME ), + 'nonce' => wp_create_nonce( \WC_POS\PLUGIN_NAME ), ); } diff --git a/includes/api/payload.php b/includes/api/payload.php index 92c8f3e7..6f07b4a4 100644 --- a/includes/api/payload.php +++ b/includes/api/payload.php @@ -46,15 +46,15 @@ public function get_payload( $wc_pos_admin = null ) { $wc_api = WC()->api; $payload = array( - 'i18n' => $wc_api->{'WC_POS\API\i18n'}->get_translations( $wc_pos_admin ), - 'params' => $wc_api->{'WC_POS\API\Params'}->get_params( $wc_pos_admin ), - 'templates' => $wc_api->{'WC_POS\API\Templates'}->get_templates( $wc_pos_admin ), + 'i18n' => $wc_api->{'\WC_POS\API\i18n'}->get_translations( $wc_pos_admin ), + 'params' => $wc_api->{'\WC_POS\API\Params'}->get_params( $wc_pos_admin ), + 'templates' => $wc_api->{'\WC_POS\API\Templates'}->get_templates( $wc_pos_admin ), ); if( $wc_pos_admin ){ - $payload['params']['settings'] = $wc_api->{'WC_POS\API\Settings'}->get_settings( '', $wc_pos_admin ); + $payload['params']['settings'] = $wc_api->{'\WC_POS\API\Settings'}->get_settings( '', $wc_pos_admin ); } else { - $payload['params']['gateways'] = $wc_api->{'WC_POS\API\Gateways'}->get_gateways(); + $payload['params']['gateways'] = $wc_api->{'\WC_POS\API\Gateways'}->get_gateways(); } return $payload; diff --git a/includes/api/settings.php b/includes/api/settings.php index b30804d7..f1d986b7 100644 --- a/includes/api/settings.php +++ b/includes/api/settings.php @@ -14,6 +14,7 @@ use WC_API_Resource; use WC_API_Server; use WC_POS\Admin\Settings as Admin_Settings; +use WC_POS\Admin\Settings\Gateways; use WC_POS\Admin\Status; class Settings extends WC_API_Resource { @@ -106,7 +107,7 @@ public function edit_settings( $id = '', $data ){ } if( $handler->flush_local_data($data) ){ - WC_POS_Admin_Settings::bump_idb_version(); + Admin_Settings::bump_idb_version(); } return $handler->set( $data ); @@ -126,7 +127,7 @@ public function delete_settings( $id = '' ){ } if( $handler->flush_local_data() ){ - WC_POS_Admin_Settings::bump_idb_version(); + Admin_Settings::bump_idb_version(); } return $handler->delete(); @@ -149,7 +150,7 @@ public function delete_all_settings() { /** * @param $id - * @return WC_POS_Admin_Settings_Gateways|WP_Error + * @return Gateways|\WP_Error */ private function get_settings_handler( $id ){ @@ -164,13 +165,13 @@ private function get_settings_handler( $id ){ // special case: gateway_ $gateway_id = preg_replace( '/^gateway_/', '', strtolower( $id ), 1, $count ); if($count) { - return new WC_POS_Admin_Settings_Gateways( $gateway_id ); + return new Gateways( $gateway_id ); } // special case: receipt_ $receipts_section = preg_replace( '/^receipt_/', '', strtolower( $id ), 1, $count ); if($count) { - $class = 'WC_POS_Admin_Settings_Receipt_' . ucfirst( $receipts_section ); + $class = '\WC_POS\Admin\Settings\Receipt\\' . ucfirst( $receipts_section ); return new $class(); } diff --git a/includes/i18n.php b/includes/i18n.php index a85fb786..db053926 100755 --- a/includes/i18n.php +++ b/includes/i18n.php @@ -46,13 +46,13 @@ public function load_plugin_textdomain() { $locale = apply_filters( 'plugin_locale', get_locale(), 'woocommerce-pos' ); - load_textdomain( 'woocommerce-pos', WP_LANG_DIR . '/woocommerce-pos/woocommerce-pos-' . $locale . '.mo' ); - load_textdomain( 'woocommerce-pos', WP_LANG_DIR . '/plugins/woocommerce-pos-' . $locale . '.mo' ); + load_textdomain( 'woocommerce-pos', \WP_LANG_DIR . '/woocommerce-pos/woocommerce-pos-' . $locale . '.mo' ); + load_textdomain( 'woocommerce-pos', \WP_LANG_DIR . '/plugins/woocommerce-pos-' . $locale . '.mo' ); // load woocommerce admin translations if ( ! is_admin() && is_pos() ) { - load_textdomain( 'woocommerce', WP_LANG_DIR . '/woocommerce/woocommerce-admin-' . $locale . '.mo' ); - load_textdomain( 'woocommerce', WP_LANG_DIR . '/plugins/woocommerce-admin-' . $locale . '.mo' ); + load_textdomain( 'woocommerce', \WP_LANG_DIR . '/woocommerce/woocommerce-admin-' . $locale . '.mo' ); + load_textdomain( 'woocommerce', \WP_LANG_DIR . '/plugins/woocommerce-admin-' . $locale . '.mo' ); } } @@ -152,7 +152,7 @@ public function update_translations() { header( "Cache-Control: no-cache" ); header( "Access-Control-Allow-Origin: *" ); - echo ":" . str_repeat( " ", 2048 ) . PHP_EOL; // 2 kB padding for IE + echo ":" . str_repeat( " ", 2048 ) . \PHP_EOL; // 2 kB padding for IE $this->manual_update(); @@ -211,14 +211,14 @@ public function manual_update() { $file = trailingslashit( $upload_dir[ 'path' ] ) . $locale . '.zip'; // Save the zip file - if ( !$wp_filesystem->put_contents( $file, $response[ 'body' ], FS_CHMOD_FILE ) ) { + if ( !$wp_filesystem->put_contents( $file, $response[ 'body' ], \FS_CHMOD_FILE ) ) { /* translators: wordpress */ $this->flush( __( 'Translation update failed.' ) ); continue; } // Unzip the file to wp-content/languages/plugins directory - $dir = trailingslashit( WP_LANG_DIR ) . 'plugins/'; + $dir = trailingslashit( \WP_LANG_DIR ) . 'plugins/'; $unzip = unzip_file( $file, $dir ); if ( true !== $unzip ) { /* translators: wordpress */ @@ -254,8 +254,8 @@ public function manual_update() { * @param $data */ private function flush( $data ) { - echo 'data:' . $data . PHP_EOL; - echo PHP_EOL; + echo 'data:' . $data . \PHP_EOL; + echo \PHP_EOL; ob_flush(); flush(); } diff --git a/includes/products/visibility.php b/includes/products/visibility.php index 72480ee8..eb99eb89 100644 --- a/includes/products/visibility.php +++ b/includes/products/visibility.php @@ -174,7 +174,7 @@ public function quick_edit($column_name, $post_type){ public function save_post( $post_id, $post ) { // If this is an autosave, our form has not been submitted, so we don't want to do anything. - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { + if ( defined( '\DOING_AUTOSAVE' ) && \DOING_AUTOSAVE ) { return; } @@ -230,16 +230,16 @@ public function admin_enqueue_scripts( $hook ) { return; if(defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG){ - $script = WC_POS\PLUGIN_URL . 'assets/js/src/products.js'; + $script = \WC_POS\PLUGIN_URL . 'assets/js/src/products.js'; } else { - $script = WC_POS\PLUGIN_URL . 'assets/js/products.min.js'; + $script = \WC_POS\PLUGIN_URL . 'assets/js/products.min.js'; } wp_enqueue_script( - WC_POS_PLUGIN_NAME . '-admin-edit', + \WC_POS\PLUGIN_NAME . '-admin-edit', $script, false, - WC_POS_VERSION, + \WC_POS\VERSION, true ); } From 9db119052c8f64fdb9c477e398d70a37ad1abd75 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 17 Mar 2016 21:25:33 +0800 Subject: [PATCH 041/169] refactor dual collection --- assets/css/src/scss/partials/_loading.scss | 6 - assets/js/src/apps/pos/cart/route.js | 13 +- assets/js/src/apps/pos/products/route.js | 21 +-- .../js/src/apps/pos/products/views/actions.js | 2 +- assets/js/src/apps/pos/receipt/route.js | 7 - assets/js/src/apps/pos/router.js | 50 +++--- assets/js/src/entities/orders/model.js | 88 +++++----- .../src/entities/products/models/variable.js | 8 +- assets/js/src/entities/service.js | 32 +--- assets/js/src/lib/behaviors/filter.js | 25 +-- .../js/src/lib/components/pagination/view.js | 4 +- assets/js/src/lib/config/collection.js | 9 + assets/js/src/lib/config/dual-collection.js | 141 +++++++++++----- assets/js/src/lib/config/dual-model.js | 11 +- assets/js/src/lib/config/idb-adapter.js | 156 ++++++++++++------ assets/js/src/lib/config/idb-collection.js | 82 +++++---- assets/js/src/lib/config/idb-sync.js | 37 +++-- .../js/src/lib/config/infinite-list-view.js | 64 +++---- includes/api/coupons.php | 2 +- includes/api/customers.php | 2 +- includes/api/orders.php | 12 -- includes/api/products.php | 5 +- package.json | 3 +- 23 files changed, 436 insertions(+), 344 deletions(-) diff --git a/assets/css/src/scss/partials/_loading.scss b/assets/css/src/scss/partials/_loading.scss index 26109017..8499065a 100644 --- a/assets/css/src/scss/partials/_loading.scss +++ b/assets/css/src/scss/partials/_loading.scss @@ -11,12 +11,6 @@ loading { margin: 0; padding: $loading-padding-y $loading-padding-x; color: $secondary-text-color; - &:not(:first-child) { - padding-top: 0; - } - &:not(:last-child) { - padding-bottom: 0; - } .icon-fail { font-size: 40px; } diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 0a299e9b..6e06d324 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -14,11 +14,10 @@ var CartRoute = Route.extend({ initialize: function( options ) { options = options || {}; this.container = options.container; - this.filtered = options.filtered; - this.collection = options.filtered.superset(); + this.collection = options.collection; this.setTabLabel( polyglot.t('titles.cart') ); - this.listenTo( this.filtered, { + this.listenTo( this.collection, { destroy: function(){ this.render(); } @@ -51,9 +50,9 @@ var CartRoute = Route.extend({ * Fetch orders from idb if new */ fetch: function() { - if (this.collection.isNew()) { - return this.collection.fetch(); - } + //if (this.collection.isNew()) { + // return this.collection.fetch(); + //} }, /** @@ -78,7 +77,7 @@ var CartRoute = Route.extend({ this.activeOrder = this.collection.get(id); if( ! this.activeOrder ){ - this.activeOrder = this.filtered.first(); + this.activeOrder = this.collection.first(); } if( ! this.activeOrder.isEditable() ){ diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 56c5e047..6b93854e 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -11,11 +11,7 @@ module.exports = Route.extend({ initialize: function (options) { this.container = options.container; - this.filtered = Radio.request('entities', 'get', { - type : 'filtered', - name : 'products', - perPage : 10 - }); + this.collection = Radio.request('entities', 'get', 'products'); this.setTabLabel( polyglot.t('titles.products') ); }, @@ -42,10 +38,7 @@ module.exports = Route.extend({ }, showActions: function() { - var view = new Actions({ - collection: this.filtered - }); - + var view = new Actions({ collection: this.collection }); this.layout.getRegion('actions').show(view); }, @@ -62,23 +55,19 @@ module.exports = Route.extend({ }); this.listenTo(view, 'childview:click', function(tab) { - this.filtered.query('tab', tab.model.id); + this.collection.filterBy('tab', tab.model.id); }); this.layout.getRegion('tabs').show(view); }, showProducts: function() { - var view = new List({ - collection: this.filtered - }); + var view = new List({ collection: this.collection }); this.layout.getRegion('list').show(view); }, showPagination: function(){ - var view = new Pagination({ - collection: this.filtered - }); + var view = new Pagination({ collection: this.collection }); this.layout.getRegion('footer').show(view); } diff --git a/assets/js/src/apps/pos/products/views/actions.js b/assets/js/src/apps/pos/products/views/actions.js index 8304dec8..e75766f5 100644 --- a/assets/js/src/apps/pos/products/views/actions.js +++ b/assets/js/src/apps/pos/products/views/actions.js @@ -18,7 +18,7 @@ var Actions = View.extend({ * this affects the filtered collection pagination * todo: refactor and fix this */ - this.listenTo(products.superset(), 'match:barcode', function(model){ + this.listenTo(products, 'match:barcode', function(model){ products.once('paginated:change:page', function(){ self.triggerMethod('clear'); self.ui.searchField.blur(); diff --git a/assets/js/src/apps/pos/receipt/route.js b/assets/js/src/apps/pos/receipt/route.js index f5ad4fb2..b346db81 100644 --- a/assets/js/src/apps/pos/receipt/route.js +++ b/assets/js/src/apps/pos/receipt/route.js @@ -39,13 +39,6 @@ var ReceiptRoute = Route.extend({ if(redirect && redirect !== ''){ window.open(redirect, '_blank'); } - - // update products - var products = Radio.request('entities', 'get', { - type: 'collection', - name: 'products' - }); - products.fetchUpdated(); }, render: function() { diff --git a/assets/js/src/apps/pos/router.js b/assets/js/src/apps/pos/router.js index 99ce91d1..9a761f2d 100644 --- a/assets/js/src/apps/pos/router.js +++ b/assets/js/src/apps/pos/router.js @@ -27,7 +27,7 @@ var POSRouter = Router.extend({ 'add:to:cart' : this.addToCart }, this); - this.initOrders(); + this.orders = Radio.request('entities', 'get', 'orders'); }, onBeforeEnter: function() { @@ -37,29 +37,25 @@ var POSRouter = Router.extend({ /** * init a filtered collection of open orders */ - initOrders: function(){ - if(this.openOrders){ - return; - } - - // attach orders - this.openOrders = Radio.request('entities', 'get', { - type: 'filtered', - name: 'orders', - perPage : 10 // max open carts - }); - - // show only open orders - this.openOrders.filterBy('openOrders', function(model) { - return model.isEditable(); - }); - - // listen to order collection - //this.listenTo(this.openOrders, { - // add : this.addOrder, - // destroy : this.removeOrder - //}); - }, + //initOrders: function(){ + // if(this.openOrders){ + // return; + // } + // + // // attach orders + // this.orders = Radio.request('entities', 'get', 'orders'); + // + // // show only open orders + // //this.openOrders.filterBy('openOrders', function(model) { + // // return model.isEditable(); + // //}); + // + // // listen to order collection + // //this.listenTo(this.openOrders, { + // // add : this.addOrder, + // // destroy : this.removeOrder + // //}); + //}, onBeforeRoute: function(){ this.setActiveTab(); @@ -99,7 +95,7 @@ var POSRouter = Router.extend({ showCart: function() { return new CartRoute({ container : this.layout.getRegion('right'), - filtered : this.openOrders, + collection: this.orders, column : this.columns[1] }); }, @@ -107,7 +103,7 @@ var POSRouter = Router.extend({ showCheckout: function() { return new CheckoutRoute({ container : this.layout.getRegion('right'), - collection: this.openOrders.superset(), + collection: this.orders, column : this.columns[1] }); }, @@ -120,7 +116,7 @@ var POSRouter = Router.extend({ return new ReceiptRoute({ container : this.layout.getRegion('right'), - collection: this.openOrders.superset(), + collection: this.orders, autoPrint : autoPrint, column : this.columns[1] }); diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index ebfd508d..6f11635f 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -169,48 +169,14 @@ var OrderModel = DualModel.extend({ /** * */ - /* jshint -W071 */ + /* jshint -W071, -W074 */ toJSON: function(options) { + options = options || {}; var attrs = _.clone(this.attributes); // process cart collection if( this.isEditable() && this.cart ){ - var taxes = [], - shipping_taxes = []; - - attrs.line_items = []; - attrs.shipping_lines = []; - attrs.fee_lines = []; - - /* jshint -W074 */ - this.cart.each( function(model) { - - switch( model.type ) { - case 'shipping': - attrs.shipping_lines.push( model.toJSON(options) ); - if( model.taxes ){ - shipping_taxes.push( model.taxes.toJSON() ); - } - break; - case 'fee': - attrs.fee_lines.push( model.toJSON(options) ); - break; - case 'product': - attrs.line_items.push( model.toJSON(options) ); - break; - } - - if( model.taxes ){ - taxes.push( model.taxes.toJSON() ); - } - - }); - /* jshint +W074 */ - - attrs.tax_lines = this.mergeItemizedTaxes( taxes ); - attrs.shipping_tax = this.sumItemizedTaxes( - this.mergeItemizedTaxes( shipping_taxes ) - ); + attrs = this.prepareCartJSON(attrs, options); } // process gateways @@ -218,9 +184,55 @@ var OrderModel = DualModel.extend({ attrs.payment_details = this.gateways.getPaymentDetails(); } + // prepare remote JSON + if( options.remote && this.name ) { + attrs = this.prepareRemoteJSON(attrs, options); + } + + return attrs; + }, + /* jshint +W071, +W074 */ + + prepareCartJSON: function(attrs, options){ + var taxes = [], + shipping_taxes = []; + + attrs.line_items = []; + attrs.shipping_lines = []; + attrs.fee_lines = []; + + /* jshint -W074 */ + this.cart.each( function(model) { + + switch( model.type ) { + case 'shipping': + attrs.shipping_lines.push( model.toJSON(options) ); + if( model.taxes ){ + shipping_taxes.push( model.taxes.toJSON(options) ); + } + break; + case 'fee': + attrs.fee_lines.push( model.toJSON(options) ); + break; + case 'product': + attrs.line_items.push( model.toJSON(options) ); + break; + } + + if( model.taxes ){ + taxes.push( model.taxes.toJSON(options) ); + } + + }); + /* jshint +W074 */ + + attrs.tax_lines = this.mergeItemizedTaxes( taxes ); + attrs.shipping_tax = this.sumItemizedTaxes( + this.mergeItemizedTaxes( shipping_taxes ) + ); + return attrs; }, - /* jshint +W071 */ /** * @todo this could be part of model.save( attributes )? diff --git a/assets/js/src/entities/products/models/variable.js b/assets/js/src/entities/products/models/variable.js index e17e03c6..ff0aafc2 100644 --- a/assets/js/src/entities/products/models/variable.js +++ b/assets/js/src/entities/products/models/variable.js @@ -1,6 +1,5 @@ var Model = require('./abstract'); var Variations = require('../../variations/collection'); -var FilteredCollection = require('backbone.obscura'); var _ = require('lodash'); module.exports = Model.extend({ @@ -23,11 +22,10 @@ module.exports = Model.extend({ */ attachVariations: function( parent ){ var attributes = _.defaults( parent.variations ); - var variations = new Variations(attributes, { + this.variations = new Variations(attributes, { title: parent.title, parent: this // a reference to the parent model }); - this.variations = new FilteredCollection( variations ); }, /** @@ -41,14 +39,14 @@ module.exports = Model.extend({ * Wrapper for variation options */ getVariationOptions: function(){ - return this.variations.superset().getVariationOptions(); + return this.variations.getVariationOptions(); }, /** * Wrapper for variations range */ getRange: function( attribute ){ - return this.variations.superset().range( attribute ); + return this.variations.range( attribute ); } /** diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index a970fbb2..19afb8b2 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -6,7 +6,6 @@ var Customers = require('./customers/collection'); var Coupons = require('./coupons/collection'); var Settings = require('./settings/collection'); var Gateways = require('./gateways/collection'); -var FilteredCollection = require('backbone.obscura'); var debug = require('debug')('entities'); var App = require('lib/config/application'); var _ = require('lodash'); @@ -36,7 +35,6 @@ var EntitiesService = Service.extend({ getMethods: { collection : 'getCollection', model : 'getModel', - filtered : 'getFiltered', option : 'getOption', localStorage: 'getLocalStorage' }, @@ -47,11 +45,16 @@ var EntitiesService = Service.extend({ get: function(options){ options = options || {}; - var method = this.getMethods[options.type]; + var type = 'collection'; + if(_.isString(options)){ + options = { name: options }; + } else { + type = options.type; + } + var method = this.getMethods[type]; if( this[method] ){ return this[method](options); } - debug('request needs a type, eg: "collection" or "option"'); }, set: function(options){ @@ -101,19 +104,6 @@ var EntitiesService = Service.extend({ return ( this[prop] || this.attach(options) ); }, - /** - * return a filtered collection and attach to this - */ - getFiltered: function(options){ - var prop = '_' + options.name; - var filteredProp = '_filtered' + options.name; - if( this[filteredProp] ){ return this[filteredProp]; } - if( !this[prop] ){ this.attach(options); } - - this[filteredProp] = new FilteredCollection(this[prop], options); - return this[filteredProp]; - }, - /** * return an option set during app.start(options) */ @@ -121,14 +111,6 @@ var EntitiesService = Service.extend({ return _.get( this.options, options.name ); }, - setFilter: function(options){ - options = options || {}; - var filteredProp = '_filtered' + options.name; - if( this[filteredProp] ){ - this[filteredProp].filterBy('search', options.filter); - } - }, - serialize: function(value){ return window.JSON.stringify(value); }, diff --git a/assets/js/src/lib/behaviors/filter.js b/assets/js/src/lib/behaviors/filter.js index 3910af49..8de91340 100644 --- a/assets/js/src/lib/behaviors/filter.js +++ b/assets/js/src/lib/behaviors/filter.js @@ -7,20 +7,13 @@ var Radio = require('backbone.radio'); var Filter = Behavior.extend({ initialize: function(){ - - this.listenTo(this.view.options.collection.superset(), { - 'start:fullSync': this.syncStart, - 'end:fullSync': this.syncEnd - }); - this.hotkeys = Radio.request('entities', 'get', { type: 'option', name: 'hotkeys' }) || {}; this.combokeys = new Combokeys(document.documentElement); - this.combokeys.bind(this.hotkeys.sync.key, _.bind( this.sync, this )); - + this.combokeys.bind(this.hotkeys.sync.key, this.sync.bind(this)); }, ui: { @@ -70,7 +63,7 @@ var Filter = Behavior.extend({ */ clear: function(e) { if(e) { e.preventDefault(); } - this.view.collection.removeFilter('search'); + //this.view.collection.removeFilter('search'); this.ui.searchField.val(''); this.ui.clearBtn.hide(); }, @@ -79,17 +72,17 @@ var Filter = Behavior.extend({ * */ onRender: function(){ - if(this.view.collection.hasFilter('search')){ - var queryStr = this.view.collection._filtered._query; - if(queryStr){ - this.ui.searchField.val(queryStr).trigger('keyup'); - } - } + //if(this.view.collection.hasFilter('search')){ + // var queryStr = this.view.collection._filtered._query; + // if(queryStr){ + // this.ui.searchField.val(queryStr).trigger('keyup'); + // } + //} }, sync: function(e){ if(e) { e.preventDefault(); } - this.view.collection.superset().fullSync(); + this.view.collection.fullSync(); }, syncStart: function(){ diff --git a/assets/js/src/lib/components/pagination/view.js b/assets/js/src/lib/components/pagination/view.js index 0e0e6380..07b7f517 100644 --- a/assets/js/src/lib/components/pagination/view.js +++ b/assets/js/src/lib/components/pagination/view.js @@ -26,7 +26,7 @@ var View = ItemView.extend({ }, initialize: function(){ - this.listenTo(this.collection.superset(), { + this.listenTo(this.collection, { 'count': this.render }); }, @@ -34,7 +34,7 @@ var View = ItemView.extend({ templateHelpers: function(){ return { showing : this.collection.length, - local : _.max([this.collection.superset().db.length, this.collection.length]) + local : _.max([this.collection.db.length, this.collection.length]) }; } diff --git a/assets/js/src/lib/config/collection.js b/assets/js/src/lib/config/collection.js index 9fdb8f85..4c09a1b4 100644 --- a/assets/js/src/lib/config/collection.js +++ b/assets/js/src/lib/config/collection.js @@ -5,6 +5,10 @@ module.exports = app.prototype.Collection = bb.Collection.extend({ constructor: function() { bb.Collection.apply(this, arguments); + this.registerSyncEvent(); + }, + + registerSyncEvent: function(){ this._isNew = true; this.once('sync', function() { this._isNew = false; @@ -13,6 +17,11 @@ module.exports = app.prototype.Collection = bb.Collection.extend({ isNew: function() { return this._isNew; + }, + + clear: function(){ + this.reset(); + this.registerSyncEvent(); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 49aada20..5d0f6d8d 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -60,57 +60,56 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ return IDBCollection.prototype.parse.call(this, resp, options); }, - firstSync: function () { - var self = this; - return this.fetch() - .then(function(records){ - if(_.isEmpty(records)){ - return self.fetchRemote(); + fetch: function (options) { + options = _.extend({parse: true}, options); + var self = this, _fetch = options.remote ? this.fetchRemote : this.fetchLocal; + + return _fetch.apply(this, arguments) + .then(function (response) { + var method = options.reset ? 'reset' : 'set'; + self[method](response, options); + if (options.success) { + options.success.call(options.context, self, response, options); } - }) - .then(function(){ - self.fullSync(); + self.trigger('sync', self, response, options); + return response; }); }, - fullSync: function () { + /** + * + */ + fetchLocal: function (options) { var self = this; - return this.fetchRemoteIds() - .then(function () { - return self.count(); - }); - }, - - fetch: function (options) { options = options || {}; - if (options.remote) { - return this.fetchRemote(options); - } - return IDBCollection.prototype.fetch.call(this, options); + + return IDBCollection.prototype.getBatch.call(this, null, options.data) + .then(function (response) { + if(_.size(response) > 0){ + return self.fetchDelayed(response); + } + if(self.isNew()){ + return self.firstSync(); + } + }); }, + /** + * Get remote data and merge with local data on id + * returns merged data + */ fetchRemote: function (options) { - options = options || {}; - var self = this; - var opts = _.extend({}, options, { - remove : false, - remote : true, - success: undefined - }); + var self = this, opts = _.clone(options) || {}; + opts.remote = true; + opts.success = undefined; return this.sync('read', this, opts) .then(function (response) { response = self.parse(response, opts); - return self.putBatch(response, { - index: 'id' - }); + return self.putBatch(response, { index: 'id' }); }) - .then(function (response) { - self.set(response, {remove: false}); - if (options.success) { - options.success.call(options.context, self, response, options); - } - return response; + .then(function (keys) { + return self.getBatch(keys); }); }, @@ -122,7 +121,7 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ url : url, remote: true, data : { - fields: ['id', 'updated_at'], + fields: 'id', filter: { limit : -1, updated_at_min: last_update @@ -139,12 +138,11 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ index: { keyPath: 'id', merge : function (local, remote) { - var updated_at = _.has(local, 'updated_at') ? local.updated_at : undefined; - var data = _.merge({}, local, remote); - if (_.isUndefined(data.local_id) || updated_at !== data.updated_at) { - data._state = self.states.read; + if(!local || local.updated_at < remote.updated_at){ + local = local || remote; + local._state = self.states.read; } - return data; + return local; } } }); @@ -156,10 +154,65 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ fetchUpdatedIds: function (options) { var self = this; - return this.db.findHighestIndex('updated_at') + return this.findHighestIndex('updated_at') .then(function (last_update) { return self.fetchRemoteIds(last_update, options); }); + }, + + firstSync: function(options){ + var self = this, response; + return this.fetchRemote() + .then(function (resp) { + response = resp; + return self.fullSync(options); + }) + .then(function () { + return response; + }); + }, + + fullSync: function(options){ + var self = this; + return this.fetchRemoteIds(options) + .then(function () { + return self.count(); + }); + }, + + fetchDelayed: function(response){ + var delayed = this.getDelayed('read', response); + if(delayed){ + var ids = _.map(delayed, 'id'); + return this.fetchRemote({ + data: { + filter: { + 'in': ids.join(',') + } + } + }) + .then(function(resp){ + _.each(resp, function(attrs){ + var key = _.findKey(response, {id: attrs.id}); + if(key){ + response[key] = attrs; + } else { + response.push(resp); + } + }); + return response; + }); + } + return response; + }, + + getDelayed: function(state, collection){ + var delayed, _state = this.states[state]; + collection = collection || this; + delayed = _.filter(collection, {_state: _state}); + if(!_.isEmpty(delayed)){ + return delayed; + } } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 09c7d1e2..a44fdf98 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -76,13 +76,18 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ options = options || {}; var json = IDBModel.prototype.toJSON.apply( this, arguments ); if( options.remote && this.name ) { - var nested = {}; - nested[this.name] = json; - return nested; + json = this.prepareRemoteJSON(json); } return json; }, + prepareRemoteJSON: function(json){ + json._state = undefined; + var nested = {}; + nested[this.name] = json; + return nested; + }, + parse: function( resp, options ) { options = options || {}; if( options.remote ){ diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js index 1fa68ce2..329f7f79 100644 --- a/assets/js/src/lib/config/idb-adapter.js +++ b/assets/js/src/lib/config/idb-adapter.js @@ -1,3 +1,4 @@ +/* jshint -W071, -W074 */ var _ = require('lodash'); var is_safari = window.navigator.userAgent.indexOf('Safari') !== -1 && window.navigator.userAgent.indexOf('Chrome') === -1 && @@ -32,7 +33,10 @@ var defaults = { }; function IDBAdapter( options ){ - this.opts = _.defaults( options, defaults ); + options = options || {}; + this.parent = options.collection; + this.opts = _.defaults(_.pick(this.parent, _.keys(defaults)), defaults); + this.opts.storeName = this.parent.name || defaults.storeName; this.opts.dbName = this.opts.storePrefix + this.opts.storeName; } @@ -59,7 +63,7 @@ IDBAdapter.prototype = { } }) .then(function (key) { - if(key){ + if(is_safari){ self.highestKey = key || 0; } resolve(self.db); @@ -102,7 +106,7 @@ IDBAdapter.prototype = { count: function (options) { options = options || {}; - var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); return new Promise(function (resolve, reject) { var request = objectStore.count(); @@ -119,26 +123,10 @@ IDBAdapter.prototype = { }); }, - create: function(data, options){ - var self = this; - return this.add(data, options) - .then(function(key){ - return self.get(key, options); - }); - }, - - update: function(data, options){ - var self = this; - return this.put(data, options) - .then(function(key){ - return self.get(key, options); - }); - }, - put: function (data, options) { options = options || {}; + var objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); var self = this, keyPath = this.opts.keyPath; - var objectStore = this.getObjectStore(consts.READ_WRITE); // merge on index keyPath if (options.index) { @@ -165,8 +153,8 @@ IDBAdapter.prototype = { add: function(data, options){ options = options || {}; + var objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); var self = this, keyPath = this.opts.keyPath; - var objectStore = this.getObjectStore(consts.READ_WRITE); if(is_safari){ data[keyPath] = ++this.highestKey; @@ -188,7 +176,7 @@ IDBAdapter.prototype = { get: function (key, options) { options = options || {}; - var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); return new Promise(function (resolve, reject) { var request = objectStore.get(key); @@ -206,7 +194,7 @@ IDBAdapter.prototype = { delete: function (key, options) { options = options || {}; - var self = this, objectStore = this.getObjectStore(consts.READ_WRITE); + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); return new Promise(function (resolve, reject) { var request = objectStore.delete(key); @@ -229,24 +217,33 @@ IDBAdapter.prototype = { putBatch: function (dataArray, options) { options = options || {}; + options.objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); var batch = []; _.each(dataArray, function (data) { - batch.push(this.update(data, options)); + batch.push(this.put(data, options)); }.bind(this)); return Promise.all(batch); }, + /** + * 4/3/2016: Chrome can do a fast merge on one transaction, but other browsers can't + */ merge: function (data, options) { options = options || {}; - var self = this, keyPath = options.index, - fn = function(result, data){ - return _.merge({}, result, data); // waiting for lodash 4 - }; + var self = this, keyPath = options.index; + var primaryKey = this.opts.keyPath; + + var fn = function(local, remote, keyPath){ + if(local){ + remote[keyPath] = local[keyPath]; + } + return remote; + }; if(_.isObject(options.index)){ - keyPath = _.get(options, ['index', 'keyPath'], this.opts.keyPath); + keyPath = _.get(options, ['index', 'keyPath'], primaryKey); if(_.isFunction(options.index.merge)){ fn = options.index.merge; } @@ -254,16 +251,16 @@ IDBAdapter.prototype = { return this.getByIndex(keyPath, data[keyPath], options) .then(function(result){ - return self.put(fn(result, data)); + return self.put(fn(result, data, primaryKey)); }); }, getByIndex: function(keyPath, key, options){ options = options || {}; - var self = this; - var objectStore = this.getObjectStore(consts.READ_ONLY); - var openIndex = objectStore.index(keyPath); - var request = openIndex.get(key); + var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), + openIndex = objectStore.index(keyPath), + request = openIndex.get(key), + self = this; return new Promise(function (resolve, reject) { request.onsuccess = function (event) { @@ -277,15 +274,24 @@ IDBAdapter.prototype = { }); }, - getAll: function (options) { - options = options || {}; - var self = this; - var limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize); - var objectStore = this.getObjectStore(consts.READ_ONLY); + getBatch: function (keyArray, options) { + options = options || keyArray || {}; + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); - // getAll fallback - if (objectStore.getAll === undefined) { - return this._getAll(objectStore, limit, options); + if(_.isArray(keyArray)){ + options.filter = _.merge({in: keyArray}, options.filter); + } + + if (objectStore.getAll === undefined || this.hasGetParams(options)) { + if(!options.objectStore){ + options.objectStore = objectStore; + } + return this.getAll(options); + } + + var limit = _.get(options, ['filter', 'limit'], this.opts.pageSize); + if (limit === -1) { + limit = null; // firefox doesn't like -1 or Infinity } return new Promise(function (resolve, reject) { @@ -302,21 +308,44 @@ IDBAdapter.prototype = { }); }, - _getAll: function (objectStore, limit, options) { + getAll: function (options) { options = options || {}; - var self = this; + var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), + limit = _.get(options, ['filter', 'limit'], this.opts.pageSize), + offset = _.get(options, ['filter', 'offset'], 0), + include = _.get(options, ['filter', 'in']), + query = _.get(options, ['filter', 'q']), + keyPath = options.index || this.opts.keyPath, + page = options.page, + self = this; + + if(_.isObject(keyPath)){ + keyPath = keyPath.keyPath; + } + if (limit === -1) { limit = Infinity; } + if(page){ + offset = (page - 1) * limit; + } + return new Promise(function (resolve, reject) { - var request = objectStore.openCursor(); - var records = []; + var records = [], idx = 0; + var request = (keyPath === self.opts.keyPath) ? + objectStore.openCursor() : objectStore.index(keyPath).openCursor(); request.onsuccess = function (event) { var cursor = event.target.result; if (cursor && records.length < limit) { - records.push(cursor.value); + if( + (!include || _.includes(include, cursor.value[keyPath])) && + (!query || self._match(query, cursor.value, keyPath, options)) && + ++idx > offset + ){ + records.push(cursor.value); + } return cursor.continue(); } resolve(records); @@ -331,7 +360,7 @@ IDBAdapter.prototype = { clear: function (options) { options = options || {}; - var self = this, objectStore = this.getObjectStore(consts.READ_WRITE); + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); return new Promise(function (resolve, reject) { var request = objectStore.clear(); @@ -350,7 +379,7 @@ IDBAdapter.prototype = { findHighestIndex: function (keyPath, options) { options = options || {}; - var self = this, objectStore = this.getObjectStore(consts.READ_ONLY); + var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); return new Promise(function (resolve, reject) { var request; @@ -371,8 +400,35 @@ IDBAdapter.prototype = { self.opts.onerror(options); }; }); + }, + + /** + * data: { + * filter: { + * limit: -1, + * offset: 10, + * q: 'term' + * ... + * }, + * fields: ['id', '_state'], + * page: 2 + * } + */ + hasGetParams: function(options){ + options = options || {}; + if(options.page || options.fields || _.size(options.filter) > 1 || + (_.size(options.filter) === 1 && options.filter.limit === undefined)){ + return true; + } + return false; + }, + + _match: function(query, json, keyPath, options){ + var fields = _.get(options, ['filter', 'fields'], keyPath); + return this.parent.matchMaker(json, query, {fields: fields}); } }; -module.exports = IDBAdapter; \ No newline at end of file +module.exports = IDBAdapter; +/* jshint +W071, +W074 */ \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index 59f95fc6..bf6bb889 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -12,23 +12,9 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ name : 'store', storePrefix: 'wc_pos_', - /** - * - */ constructor: function () { - var opts = { - storeName : this.name, - storePrefix : this.storePrefix, - dbVersion : this.dbVersion, - keyPath : this.keyPath, - autoIncrement: this.autoIncrement, - indexes : this.indexes, - pageSize : this.pageSize - }; - - this.db = new IDBAdapter(opts); + this.db = new IDBAdapter({ collection: this }); this.versionCheck(); - Collection.apply(this, arguments); }, @@ -39,9 +25,10 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ var self = this; return this.db.open() .then(function () { - self.reset(); - self._isNew = true; return self.db.clear(); + }) + .then(function(){ + Collection.prototype.clear.call(self); }); }, @@ -56,6 +43,7 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ }) .then(function (count) { self.trigger('count', count); + return count; }); }, @@ -63,7 +51,7 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ * */ putBatch: function (models, options) { - options = options || {}; + options = _.clone(options) || {}; var self = this; if (_.isEmpty(models)) { models = this.getChangedModels(); @@ -80,34 +68,58 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ /** * */ - getChangedModels: function () { - return this.filter(function (model) { - return model.isNew() || model.hasChanged(); - }); + getBatch: function (keyArray, options) { + options = _.clone(options) || {}; + var self = this; + return this.db.open() + .then(function () { + return self.db.getBatch(keyArray, options); + }); }, /** * */ - removeBatch: function (models, options) { - options = options || {}; + findHighestIndex: function (keyPath, options) { + options = _.clone(options) || {}; var self = this; - if (_.isEmpty(models)) { - return; - } return this.db.open() .then(function () { - return self.db.removeBatch(models); - }) - .then(function () { - self.remove(models); - if (options.success) { - options.success(self, models, options); - } - return models; + return self.db.findHighestIndex(keyPath, options); }); }, + /** + * + */ + getChangedModels: function () { + return this.filter(function (model) { + return model.isNew() || model.hasChanged(); + }); + }, + + /** + * + */ + //removeBatch: function (models, options) { + // options = options || {}; + // var self = this; + // if (_.isEmpty(models)) { + // return; + // } + // return this.db.open() + // .then(function () { + // return self.db.removeBatch(models); + // }) + // .then(function () { + // self.remove(models); + // if (options.success) { + // options.success(self, models, options); + // } + // return models; + // }); + //}, + /** * Each website will have a unique idbVersion number * the version number is incremented on plugin update and some user actions diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js index d0430887..ec21ba97 100644 --- a/assets/js/src/lib/config/idb-sync.js +++ b/assets/js/src/lib/config/idb-sync.js @@ -1,38 +1,45 @@ var bb = require('backbone'); +var _ = require('lodash'); /* jshint -W074 */ module.exports = function(method, entity, options) { options = options || {}; var isModel = entity instanceof bb.Model; - var data = entity.toJSON(); return entity.db.open() - .then(function(){ - switch(method){ + .then(function () { + var data; + switch (method) { case 'read': - if( isModel ){ - return entity.db.get( entity.id, options ); + if (isModel) { + return entity.db.get(entity.id); } - return entity.db.getAll( options ); + data = _.clone(options.data); + return entity.db.getBatch(data); case 'create': - return entity.db.create( data, options ); + return entity.db.add(entity.toJSON()) + .then(function (key) { + return entity.db.get(key); + }); case 'update': - return entity.db.update( data, options ); + return entity.db.put(entity.toJSON()) + .then(function (key) { + return entity.db.get(key); + }); case 'delete': - if( isModel ){ - return entity.db.delete( entity.id, options ); + if (isModel) { + return entity.db.delete(entity.id); } return; } }) - .then(function(resp){ - if(options.success){ + .then(function (resp) { + if (options.success) { options.success(resp); } - return resp; }) - .catch(function(resp){ - if( options.error ){ + .catch(function (resp) { + if (options.error) { options.error(resp); } }); diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index feefdaf0..6957d1ad 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -1,8 +1,9 @@ var Mn = require('backbone.marionette'); -var app = require('./application'); var _ = require('lodash'); -module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ +module.exports = Mn.CompositeView.extend({ + + _page: 0, className: 'list-infinite', @@ -10,56 +11,63 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ return '
                '; }, - - constructor: function(){ - Mn.CompositeView.apply(this, arguments); - _.bindAll(this, 'onScroll', 'loadMore', 'getOverflow'); + collectionEvents: { + 'loading:start': 'startLoading', + 'loading:end': 'endLoading', + reset: 'reset' }, - onShow: function(){ + onShow: function () { this.container = this.$el.parent()[0]; - this.$el.parent().scroll( _.throttle( this.onScroll, 250 ) ); - this.onScroll(); + this.$el.parent().on('scroll', _.throttle(this.onScroll.bind(this), 1000/60)); + this.appendNextPage(); }, onScroll: function(){ - if(this.getOverflow() < 100){ - this.loadMore(); + if(!this.loading && this.collection.length < this.collection.db.length && this.triggerEvent()){ + this.appendNextPage(); } }, /** - * returns overflow at bottom in px + * Is user scrolling down && overflow < 100 * - added clientHeight check to prevent false trigger when div not drawn - * @returns {number} + * @returns {boolean} */ - getOverflow: function(){ + triggerEvent: function () { var sH = this.container.scrollHeight, cH = this.container.clientHeight, sT = this.container.scrollTop; - return sH - cH - sT; + var down = sT > (this._sT || 0); + this._sT = sT; + + return down && (sH - cH - sT < 100); }, - loadMore: function() { - if(this.loading){ - return; - } - var self = this; - this.startLoading(); - this.collection.superset().fetch({ remote: true }) - .then(function(){ - self.endLoading(); - }); + appendNextPage: function () { + var collection = this.collection, page = ++this._page; + collection.trigger('loading:start'); + + return collection.fetch({ + remove: false, + data: { page: page } + }) + .then(function () { + collection.trigger('loading:end'); + }); }, - startLoading: function(){ + startLoading: function () { this.loading = true; this.$el.addClass('loading'); }, - endLoading: function(){ + endLoading: function () { this.loading = false; this.$el.removeClass('loading'); - } + }, + reset: function(){ + this._page = 1; + } }); \ No newline at end of file diff --git a/includes/api/coupons.php b/includes/api/coupons.php index 6c435833..06b035b7 100644 --- a/includes/api/coupons.php +++ b/includes/api/coupons.php @@ -59,7 +59,7 @@ public function get_all_ids( $filter = array() ) { ); } - $query = new WP_Query( $args ); + $query = new \WP_Query( $args ); return array_map( array( $this, 'format_id' ), $query->posts ); } diff --git a/includes/api/customers.php b/includes/api/customers.php index 198dda6b..9ba6359d 100644 --- a/includes/api/customers.php +++ b/includes/api/customers.php @@ -180,7 +180,7 @@ public function get_all_ids( $filter = array() ){ $args['meta_compare'] = '>'; } - $query = new WP_User_Query( $args ); + $query = new \WP_User_Query( $args ); return array_map( array( $this, 'format_id' ), $query->results ); } diff --git a/includes/api/orders.php b/includes/api/orders.php index 25d87cc6..45523d86 100644 --- a/includes/api/orders.php +++ b/includes/api/orders.php @@ -117,11 +117,6 @@ public function create_order_data(array $data){ $data['shipping_address'] = $this->get_customer_details($customer_id, 'shipping'); } - // remove status - if( isset( $data['status'] ) && $data['status'] == 'CREATE_FAILED' ){ - unset( $data['status'] ); - } - // store data $this->data = $data; @@ -136,14 +131,7 @@ public function create_order_data(array $data){ * @return array */ public function edit_order_data(array $data, $order_id){ - - // remove status - if( isset( $data['status'] ) && $data['status'] == 'UPDATE_FAILED' ){ - unset( $data['status'] ); - } - $this->delete_order_items($order_id); - return $this->create_order_data($data); } diff --git a/includes/api/products.php b/includes/api/products.php index ea413668..7bea7578 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -384,7 +384,7 @@ public function get_all_ids( $filter = array() ){ $args = array( 'post_type' => array('product'), 'post_status' => array('publish'), - 'posts_per_page'=> -1, + 'posts_per_page'=> -1, 'fields' => 'ids' ); @@ -396,11 +396,10 @@ public function get_all_ids( $filter = array() ){ ); } - $query = new WP_Query( $args ); + $query = new \WP_Query( $args ); return array( 'products' => array_map( array( $this, 'format_id' ), $query->posts ) ); } - /** * @param $id * @return array diff --git a/package.json b/package.json index b86102c4..aaeacff7 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "marionette" ], "author": "kilbot", - "license": "GPLv2", + "license": "GPL-3.0+", "homepage": "http://woopos.com.au", "bugs": { "url": "https://github.com/kilbot/WooCommerce-POS/issues" @@ -31,7 +31,6 @@ "backbone-deep-model": "kilbot/backbone-deep-model", "backbone-validation": "^0.11.5", "backbone.marionette": "^2.4.4", - "backbone.obscura": "kilbot/backbone.obscura", "backbone.radio": "^1.0.2", "backbone.stickit": "^0.9.2", "combokeys": "^2.4.4", From 7bf8974cc41b69ab4fc6dcd6fa7c4bc5795c142a Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Fri, 18 Mar 2016 00:30:19 +0800 Subject: [PATCH 042/169] filtered collection --- assets/js/src/apps/pos/products/route.js | 2 +- assets/js/src/entities/products/collection.js | 5 +- .../src/entities/products/models/abstract.js | 3 - assets/js/src/lib/behaviors/filter.js | 4 +- assets/js/src/lib/config/dual-collection.js | 3 +- .../js/src/lib/config/filtered-collection.js | 67 +++++++++++++++++++ assets/js/src/lib/config/idb-collection.js | 8 +-- .../js/src/lib/config/infinite-list-view.js | 11 +-- includes/admin/orders.php | 6 +- package.json | 2 + 10 files changed, 93 insertions(+), 18 deletions(-) create mode 100644 assets/js/src/lib/config/filtered-collection.js diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 6b93854e..a62710ba 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -55,7 +55,7 @@ module.exports = Route.extend({ }); this.listenTo(view, 'childview:click', function(tab) { - this.collection.filterBy('tab', tab.model.id); + this.collection.setFilter('tab', tab.model.id); }); this.layout.getRegion('tabs').show(view); diff --git a/assets/js/src/entities/products/collection.js b/assets/js/src/entities/products/collection.js index a1efbba3..a86efdbd 100644 --- a/assets/js/src/entities/products/collection.js +++ b/assets/js/src/entities/products/collection.js @@ -16,6 +16,9 @@ module.exports = DualCollection.extend({ return new Subclass(attributes, options); }, - name: 'products' + name: 'products', + + // this is an array of fields used by FilterCollection.matchmaker() + fields: ['title'], }); \ No newline at end of file diff --git a/assets/js/src/entities/products/models/abstract.js b/assets/js/src/entities/products/models/abstract.js index f362c2c7..741437d7 100644 --- a/assets/js/src/entities/products/models/abstract.js +++ b/assets/js/src/entities/products/models/abstract.js @@ -5,9 +5,6 @@ module.exports = DualModel.extend({ name: 'product', - // this is an array of fields used by FilterCollection.matchmaker() - fields: ['title'], - // data types schema: { price : 'number', diff --git a/assets/js/src/lib/behaviors/filter.js b/assets/js/src/lib/behaviors/filter.js index 8de91340..8e194e36 100644 --- a/assets/js/src/lib/behaviors/filter.js +++ b/assets/js/src/lib/behaviors/filter.js @@ -55,7 +55,7 @@ var Filter = Behavior.extend({ * */ _query: _.debounce( function(value){ - this.view.collection.filterBy('search', value); + this.view.collection.setFilter('search', value); }, 149), /** @@ -63,7 +63,7 @@ var Filter = Behavior.extend({ */ clear: function(e) { if(e) { e.preventDefault(); } - //this.view.collection.removeFilter('search'); + this.view.collection.removeFilter('search'); this.ui.searchField.val(''); this.ui.clearBtn.hide(); }, diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 5d0f6d8d..4c81591b 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -64,7 +64,7 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ options = _.extend({parse: true}, options); var self = this, _fetch = options.remote ? this.fetchRemote : this.fetchLocal; - return _fetch.apply(this, arguments) + return _fetch.call(this, options) .then(function (response) { var method = options.reset ? 'reset' : 'set'; self[method](response, options); @@ -91,6 +91,7 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ if(self.isNew()){ return self.firstSync(); } + return response; }); }, diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js new file mode 100644 index 00000000..47d41857 --- /dev/null +++ b/assets/js/src/lib/config/filtered-collection.js @@ -0,0 +1,67 @@ +var Collection = require('./collection'); +var app = require('./application'); +var _ = require('lodash'); +var defaultFilterName = '__default'; +var Parser = require('query-parser'); +var parse = new Parser(); +var matchMaker = require('json-query'); + +module.exports = app.prototype.FilteredCollection = Collection.extend({ + _filters: {}, + + setFilter: function(filterName, filter) { + if(filter === undefined) { + filter = filterName; + filterName = defaultFilterName; + } + if(!filter){ + return this.removeFilter(filterName); + } + this._filters[filterName] = _.isString(filter) ? parse(filter) : filter; + return this.fetch(this.fetchFilters()); + }, + + removeFilter: function(filterName) { + if (!filterName) { + filterName = defaultFilterName; + } + delete this._filters[filterName]; + return this.fetch(this.fetchFilters()); + }, + + getFilters: function() { + return _.keys(this._filters); + }, + + hasFilter: function(name) { + return _.includes(this.getFilters(), name); + }, + + resetFilters: function() { + this._filters = {}; + }, + + fetchFilters: function() { + if (_.size(this._filters) === 0) { + return; + } + var query = _.reduce(this._filters, function (result, value) { + if (!result) { + return value; + } + if (result.length === 1) { + result.push(value[0]); + return [{ + type : 'and', + queries: result + }]; + } + result[0].queries.push(value[0]); + return result; + }); + return {data: {filter: {fields: this.fields, q: query}}}; + }, + + matchMaker: matchMaker + +}); \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index bf6bb889..f39fba67 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -1,11 +1,11 @@ -var Collection = require('./collection'); +var FilteredCollection = require('./filtered-collection'); var app = require('./application'); var Radio = require('backbone.radio'); var IDBModel = require('./idb-model'); var IDBAdapter = require('./idb-adapter'); var _ = require('lodash'); -module.exports = app.prototype.IDBCollection = Collection.extend({ +module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ model: IDBModel, @@ -15,7 +15,7 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ constructor: function () { this.db = new IDBAdapter({ collection: this }); this.versionCheck(); - Collection.apply(this, arguments); + FilteredCollection.apply(this, arguments); }, /** @@ -28,7 +28,7 @@ module.exports = app.prototype.IDBCollection = Collection.extend({ return self.db.clear(); }) .then(function(){ - Collection.prototype.clear.call(self); + FilteredCollection.prototype.clear.call(self); }); }, diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index 6957d1ad..b38cdfb9 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -11,10 +11,13 @@ module.exports = Mn.CompositeView.extend({ return '
                  '; }, - collectionEvents: { - 'loading:start': 'startLoading', - 'loading:end': 'endLoading', - reset: 'reset' + constructor: function(){ + Mn.CompositeView.apply(this, arguments); + this.listenTo(this.collection, { + 'loading:start': this.startLoading, + 'loading:end' : this.endLoading, + reset : this.reset + }); }, onShow: function () { diff --git a/includes/admin/orders.php b/includes/admin/orders.php index 5d4adaa7..b62fc5c9 100644 --- a/includes/admin/orders.php +++ b/includes/admin/orders.php @@ -15,6 +15,8 @@ namespace WC_POS\Admin; +use WC_POS\Admin\Settings\Checkout; + class Orders { private $pos_order; @@ -68,7 +70,7 @@ public function save( $post_id, $post ){ */ public function payment_gateways($gateways){ // get checkout settings data - $settings = WC_POS\Admin\Settings\Checkout::get_instance(); + $settings = Checkout::get_instance(); $enabled_ids = $settings->get_enabled_gateway_ids(); $loaded_gateways = array(); @@ -181,7 +183,7 @@ public function post_class($classes, $class, $id){ public function enqueue_admin_styles() { $css = ' .widefat .type-wc_pos_order .column-order_status { - background: url( '. WC_POS\PLUGIN_URL .'assets/logo.svg ) no-repeat 75% 9px; + background: url( '. \WC_POS\PLUGIN_URL .'assets/logo.svg ) no-repeat 75% 9px; background-size: 18px; fill: #94d31b; } diff --git a/package.json b/package.json index aaeacff7..72c96209 100644 --- a/package.json +++ b/package.json @@ -38,10 +38,12 @@ "handlebars": "^4.0.5", "jquery": "^3.0.0-beta1", "jquery-color": "^1.0.0", + "json-query": "kilbot/JSON-Query", "lodash": "^3.10.1", "moment": "^2.11.2", "node-polyglot": "^1.0.0", "normalize.css": "^3.0.3", + "query-parser": "kilbot/Query-Parser", "select2": "^4.0.1", "tether": "^1.2.0", "tether-drop": "^1.4.2", From 5c2390bb2d344efeabd537c38e515c5e4a1181fb Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 23 Mar 2016 00:11:32 +0800 Subject: [PATCH 043/169] update dual collection --- assets/js/src/apps/pos/products/route.js | 1 + .../js/src/apps/pos/products/views/actions.js | 4 - assets/js/src/apps/support/status/route.js | 1 + assets/js/src/entities/products/collection.js | 2 +- .../js/src/lib/components/pagination/view.js | 23 ++-- assets/js/src/lib/config/collection.js | 9 +- assets/js/src/lib/config/dual-collection.js | 87 ++++++------ assets/js/src/lib/config/dual-model.js | 2 +- .../js/src/lib/config/filtered-collection.js | 90 ++++++++----- assets/js/src/lib/config/idb-adapter.js | 126 ++++++------------ assets/js/src/lib/config/idb-collection.js | 6 +- assets/js/src/lib/config/idb-sync.js | 7 +- .../js/src/lib/config/infinite-list-view.js | 50 +++---- package.json | 3 + 14 files changed, 188 insertions(+), 223 deletions(-) diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index a62710ba..602f4c05 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -22,6 +22,7 @@ module.exports = Route.extend({ //} else { // this.filtered.removeTransforms(); //} + this.collection.fetch(); }, render: function() { diff --git a/assets/js/src/apps/pos/products/views/actions.js b/assets/js/src/apps/pos/products/views/actions.js index e75766f5..51582c1a 100644 --- a/assets/js/src/apps/pos/products/views/actions.js +++ b/assets/js/src/apps/pos/products/views/actions.js @@ -51,10 +51,6 @@ var Actions = View.extend({ searchField : 'input[type=search]' }, - onRender: function(){ - this.barcodeModeOff(); - }, - onDropdownSelect: function(e){ if( $(e.currentTarget).data('action') === 'barcode' ){ return this.barcodeModeOn(); diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index f4f92167..82e6acf5 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -76,6 +76,7 @@ var StatusRoute = Route.extend({ collection.clear() .then(function(){ + collection.resetNew(); return self.render(); }); } diff --git a/assets/js/src/entities/products/collection.js b/assets/js/src/entities/products/collection.js index a86efdbd..3a629637 100644 --- a/assets/js/src/entities/products/collection.js +++ b/assets/js/src/entities/products/collection.js @@ -19,6 +19,6 @@ module.exports = DualCollection.extend({ name: 'products', // this is an array of fields used by FilterCollection.matchmaker() - fields: ['title'], + fields: ['title'] }); \ No newline at end of file diff --git a/assets/js/src/lib/components/pagination/view.js b/assets/js/src/lib/components/pagination/view.js index 07b7f517..79a21596 100644 --- a/assets/js/src/lib/components/pagination/view.js +++ b/assets/js/src/lib/components/pagination/view.js @@ -1,6 +1,5 @@ var ItemView = require('lib/config/item-view'); var App = require('lib/config/application'); -var _ = require('lodash'); var View = ItemView.extend({ template: 'pagination', @@ -15,26 +14,26 @@ var View = ItemView.extend({ // 'click @ui.next': 'onNext' //}, - // todo: improve this - collectionEvents: { - 'add remove paginated:change:page paginated:change:numPages reset': - _.debounce(function(){ - if(!this.isDestroyed){ - this.render(); - } - }, 10) - }, + // // todo: improve this + // collectionEvents: { + // 'add remove paginated:change:page paginated:change:numPages reset': + // _.debounce(function(){ + // if(!this.isDestroyed){ + // this.render(); + // } + // }, 10) + // }, initialize: function(){ this.listenTo(this.collection, { - 'count': this.render + 'sync': this.render }); }, templateHelpers: function(){ return { showing : this.collection.length, - local : _.max([this.collection.db.length, this.collection.length]) + local : this.collection.total || 0 }; } diff --git a/assets/js/src/lib/config/collection.js b/assets/js/src/lib/config/collection.js index 4c09a1b4..9c13a665 100644 --- a/assets/js/src/lib/config/collection.js +++ b/assets/js/src/lib/config/collection.js @@ -5,10 +5,10 @@ module.exports = app.prototype.Collection = bb.Collection.extend({ constructor: function() { bb.Collection.apply(this, arguments); - this.registerSyncEvent(); + this.resetNew(); }, - registerSyncEvent: function(){ + resetNew: function(){ this._isNew = true; this.once('sync', function() { this._isNew = false; @@ -17,11 +17,6 @@ module.exports = app.prototype.Collection = bb.Collection.extend({ isNew: function() { return this._isNew; - }, - - clear: function(){ - this.reset(); - this.registerSyncEvent(); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 4c81591b..7746ef43 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -60,21 +60,37 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ return IDBCollection.prototype.parse.call(this, resp, options); }, + /* jshint -W071, -W074 */ fetch: function (options) { options = _.extend({parse: true}, options); - var self = this, _fetch = options.remote ? this.fetchRemote : this.fetchLocal; + var self = this, success = options.success; + var _fetch = options.remote ? this.fetchRemote : this.fetchLocal; + + if(success){ + options.success = undefined; + } return _fetch.call(this, options) .then(function (response) { var method = options.reset ? 'reset' : 'set'; self[method](response, options); - if (options.success) { - options.success.call(options.context, self, response, options); + if (success) { + success.call(options.context, self, response, options); + } + if(options.idb){ + self.total = options.idb.total; + self.delayed = options.idb.delayed; + self._hasNextPage = self.length < self.total || self.delayed > 0; + } + if(options.xhr){ + self.total = options.xhr.getResponseHeader('X-WC-Total'); + self._hasNextPage = self.length < self.total; } self.trigger('sync', self, response, options); return response; }); }, + /* jshint +W071, +W074 */ /** * @@ -83,15 +99,15 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ var self = this; options = options || {}; - return IDBCollection.prototype.getBatch.call(this, null, options.data) + return IDBCollection.prototype.getBatch.call(this, options) .then(function (response) { if(_.size(response) > 0){ return self.fetchDelayed(response); } if(self.isNew()){ - return self.firstSync(); + return self.firstSync(options); } - return response; + return self.fetchRemote(options); }); }, @@ -100,13 +116,15 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ * returns merged data */ fetchRemote: function (options) { - var self = this, opts = _.clone(options) || {}; - opts.remote = true; - opts.success = undefined; + // options = _.extend({remote: true}, options); + options = options || {}; + options.remote = true; + var self = this; - return this.sync('read', this, opts) + this.trigger('request', this, null, options); + return this.sync('read', this, options) .then(function (response) { - response = self.parse(response, opts); + response = self.parse(response, options); return self.putBatch(response, { index: 'id' }); }) .then(function (keys) { @@ -162,23 +180,16 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ }, firstSync: function(options){ - var self = this, response; - return this.fetchRemote() - .then(function (resp) { - response = resp; - return self.fullSync(options); - }) - .then(function () { + var self = this; + return this.fetchRemote(options) + .then(function (response) { + self.fullSync(); return response; }); }, fullSync: function(options){ - var self = this; - return this.fetchRemoteIds(options) - .then(function () { - return self.count(); - }); + return this.fetchRemoteIds(options); }, fetchDelayed: function(response){ @@ -186,23 +197,23 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ if(delayed){ var ids = _.map(delayed, 'id'); return this.fetchRemote({ - data: { - filter: { - 'in': ids.join(',') - } - } - }) - .then(function(resp){ - _.each(resp, function(attrs){ - var key = _.findKey(response, {id: attrs.id}); - if(key){ - response[key] = attrs; - } else { - response.push(resp); + data: { + filter: { + 'in': ids.join(',') + } } + }) + .then(function(resp){ + _.each(resp, function(attrs){ + var key = _.findKey(response, {id: attrs.id}); + if(key){ + response[key] = attrs; + } else { + response.push(resp); + } + }); + return response; }); - return response; - }); } return response; }, diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index a44fdf98..7fb9f445 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -92,7 +92,7 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ options = options || {}; if( options.remote ){ resp = resp && resp[this.name] ? resp[this.name] : resp; - //resp._state = undefined; + resp._state = undefined; } return IDBModel.prototype.parse.call( this, resp, options ); } diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js index 47d41857..e4c3db4b 100644 --- a/assets/js/src/lib/config/filtered-collection.js +++ b/assets/js/src/lib/config/filtered-collection.js @@ -1,67 +1,89 @@ var Collection = require('./collection'); var app = require('./application'); var _ = require('lodash'); -var defaultFilterName = '__default'; var Parser = require('query-parser'); var parse = new Parser(); -var matchMaker = require('json-query'); + +var defaultFilterName = '__default'; module.exports = app.prototype.FilteredCollection = Collection.extend({ _filters: {}, - setFilter: function(filterName, filter) { - if(filter === undefined) { + setFilter: function (filterName, filter) { + if (filter === undefined) { filter = filterName; filterName = defaultFilterName; } - if(!filter){ + if (!filter) { return this.removeFilter(filterName); } - this._filters[filterName] = _.isString(filter) ? parse(filter) : filter; - return this.fetch(this.fetchFilters()); + this._filters[filterName] = { + string: filter, + query : _.isString(filter) ? parse(filter) : filter + }; + this.trigger('filtered:set'); + + return this.fetch({data: {filter: this.getFilterOptions()}}); }, - removeFilter: function(filterName) { + removeFilter: function (filterName) { if (!filterName) { filterName = defaultFilterName; } delete this._filters[filterName]; - return this.fetch(this.fetchFilters()); + this.trigger('filtered:remove'); + + return this.fetch({data: {filter: this.getFilterOptions()}}); }, - getFilters: function() { - return _.keys(this._filters); + resetFilters: function () { + this._filters = {}; + this.trigger('filtered:reset'); + return this.fetch(); }, - hasFilter: function(name) { - return _.includes(this.getFilters(), name); + getFilters: function (name) { + if (name) { + return this._filters[name]; + } + return this._filters; }, - resetFilters: function() { - this._filters = {}; + hasFilter: function (name) { + return _.includes(_.keys(this.getFilters()), name); }, - fetchFilters: function() { - if (_.size(this._filters) === 0) { - return; + hasFilters: function () { + return _.size(this.getFilters()) > 0; + }, + + getFilterOptions: function () { + if (this.hasFilters()) { + return {q: this.getFilterQueries(), fields: this.fields}; } - var query = _.reduce(this._filters, function (result, value) { - if (!result) { - return value; - } - if (result.length === 1) { - result.push(value[0]); - return [{ - type : 'and', - queries: result - }]; - } - result[0].queries.push(value[0]); - return result; - }); - return {data: {filter: {fields: this.fields, q: query}}}; }, - matchMaker: matchMaker + getFilterQueries: function () { + var queries = _(this.getFilters()).map('query').flattenDeep().value(); + + // compact + if (queries.length > 1) { + queries = _.reduce(queries, function (result, next) { + if (!_.some(result, function (val) { + return _.isEqual(val, next); + })) { + result.push(next); + } + return result; + }, []); + } + + // extra compact for common simple query + if (queries.length === 1 && _.get(queries, [0, 'type']) === 'string') { + queries = _.get(queries, [0, 'query']); + } + + return queries; + } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js index 329f7f79..33a59091 100644 --- a/assets/js/src/lib/config/idb-adapter.js +++ b/assets/js/src/lib/config/idb-adapter.js @@ -1,5 +1,7 @@ /* jshint -W071, -W074 */ var _ = require('lodash'); +var matchMaker = require('json-query'); + var is_safari = window.navigator.userAgent.indexOf('Safari') !== -1 && window.navigator.userAgent.indexOf('Chrome') === -1 && window.navigator.userAgent.indexOf('Android') === -1; @@ -16,32 +18,33 @@ var consts = { 'PREV_NO_DUPLICATE' : 'prevunique' }; -var defaults = { - storeName : 'store', - storePrefix : 'Prefix_', - dbVersion : 1, - keyPath : 'id', - autoIncrement : true, - indexes : [], - pageSize : 10, - onerror : function(options) { - options = options || {}; - var err = new Error(options._error.message); - err.code = event.target.errorCode; - options._error.callback(err); - } -}; - function IDBAdapter( options ){ options = options || {}; this.parent = options.collection; - this.opts = _.defaults(_.pick(this.parent, _.keys(defaults)), defaults); - this.opts.storeName = this.parent.name || defaults.storeName; + this.opts = _.defaults(_.pick(this.parent, _.keys(this.default)), this.default); + this.opts.storeName = this.parent.name || this.default.storeName; this.opts.dbName = this.opts.storePrefix + this.opts.storeName; } IDBAdapter.prototype = { + default: { + storeName : 'store', + storePrefix : 'Prefix_', + dbVersion : 1, + keyPath : 'id', + autoIncrement : true, + indexes : [], + pageSize : 10, + matchMaker : matchMaker, + onerror : function(options) { + options = options || {}; + var err = new Error(options._error.message); + err.code = event.target.errorCode; + options._error.callback(err); + } + }, + constructor: IDBAdapter, open: function (options) { @@ -275,49 +278,19 @@ IDBAdapter.prototype = { }, getBatch: function (keyArray, options) { - options = options || keyArray || {}; - var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); - - if(_.isArray(keyArray)){ - options.filter = _.merge({in: keyArray}, options.filter); + if(!options && !_.isArray(keyArray)){ + options = keyArray; } - - if (objectStore.getAll === undefined || this.hasGetParams(options)) { - if(!options.objectStore){ - options.objectStore = objectStore; - } - return this.getAll(options); - } - - var limit = _.get(options, ['filter', 'limit'], this.opts.pageSize); - if (limit === -1) { - limit = null; // firefox doesn't like -1 or Infinity - } - - return new Promise(function (resolve, reject) { - var request = objectStore.getAll(null, limit); - - request.onsuccess = function (event) { - resolve(event.target.result); - }; - - request.onerror = function (event) { - options._error = {event: event, message: 'getAll error', callback: reject}; - self.opts.onerror(options); - }; - }); - }, - - getAll: function (options) { options = options || {}; + var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), - limit = _.get(options, ['filter', 'limit'], this.opts.pageSize), - offset = _.get(options, ['filter', 'offset'], 0), - include = _.get(options, ['filter', 'in']), - query = _.get(options, ['filter', 'q']), + include = _.isArray(keyArray) ? keyArray: _.get(options, ['data', 'filter', 'in']), + limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize), + offset = _.get(options, ['data', 'filter', 'offset'], 0), + query = _.get(options, ['data', 'filter', 'q']), keyPath = options.index || this.opts.keyPath, - page = options.page, - self = this; + page = _.get(options, ['data', 'page']), + self = this; if(_.isObject(keyPath)){ keyPath = keyPath.keyPath; @@ -332,23 +305,27 @@ IDBAdapter.prototype = { } return new Promise(function (resolve, reject) { - var records = [], idx = 0; + var records = [], delayed = 0; var request = (keyPath === self.opts.keyPath) ? objectStore.openCursor() : objectStore.index(keyPath).openCursor(); request.onsuccess = function (event) { var cursor = event.target.result; - if (cursor && records.length < limit) { + if (cursor) { + if(cursor.value._state === 'READ_FAILED'){ + delayed++; + } if( (!include || _.includes(include, cursor.value[keyPath])) && - (!query || self._match(query, cursor.value, keyPath, options)) && - ++idx > offset + (!query || self._match(query, cursor.value, keyPath, options)) ){ records.push(cursor.value); } return cursor.continue(); } - resolve(records); + _.set(options, 'idb.total', records.length); + _.set(options, 'idb.delayed', delayed); + resolve(_.slice(records, offset, offset + limit)); }; request.onerror = function (event) { @@ -402,30 +379,9 @@ IDBAdapter.prototype = { }); }, - /** - * data: { - * filter: { - * limit: -1, - * offset: 10, - * q: 'term' - * ... - * }, - * fields: ['id', '_state'], - * page: 2 - * } - */ - hasGetParams: function(options){ - options = options || {}; - if(options.page || options.fields || _.size(options.filter) > 1 || - (_.size(options.filter) === 1 && options.filter.limit === undefined)){ - return true; - } - return false; - }, - _match: function(query, json, keyPath, options){ - var fields = _.get(options, ['filter', 'fields'], keyPath); - return this.parent.matchMaker(json, query, {fields: fields}); + var fields = _.get(options, ['data', 'filter', 'fields'], keyPath); + return this.opts.matchMaker.call(this, json, query, {fields: fields}); } }; diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index f39fba67..ff05be1f 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -25,10 +25,8 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ var self = this; return this.db.open() .then(function () { + self.reset(); return self.db.clear(); - }) - .then(function(){ - FilteredCollection.prototype.clear.call(self); }); }, @@ -51,7 +49,6 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ * */ putBatch: function (models, options) { - options = _.clone(options) || {}; var self = this; if (_.isEmpty(models)) { models = this.getChangedModels(); @@ -69,7 +66,6 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ * */ getBatch: function (keyArray, options) { - options = _.clone(options) || {}; var self = this; return this.db.open() .then(function () { diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js index ec21ba97..4e48ffbf 100644 --- a/assets/js/src/lib/config/idb-sync.js +++ b/assets/js/src/lib/config/idb-sync.js @@ -1,21 +1,17 @@ var bb = require('backbone'); -var _ = require('lodash'); /* jshint -W074 */ module.exports = function(method, entity, options) { - options = options || {}; var isModel = entity instanceof bb.Model; return entity.db.open() .then(function () { - var data; switch (method) { case 'read': if (isModel) { return entity.db.get(entity.id); } - data = _.clone(options.data); - return entity.db.getBatch(data); + return entity.db.getBatch(options); case 'create': return entity.db.add(entity.toJSON()) .then(function (key) { @@ -37,6 +33,7 @@ module.exports = function(method, entity, options) { if (options.success) { options.success(resp); } + return resp; }) .catch(function (resp) { if (options.error) { diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index b38cdfb9..ac2803c4 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -3,8 +3,6 @@ var _ = require('lodash'); module.exports = Mn.CompositeView.extend({ - _page: 0, - className: 'list-infinite', template: function(){ @@ -13,53 +11,46 @@ module.exports = Mn.CompositeView.extend({ constructor: function(){ Mn.CompositeView.apply(this, arguments); - this.listenTo(this.collection, { - 'loading:start': this.startLoading, - 'loading:end' : this.endLoading, - reset : this.reset + + this.on('show', function(){ + this.container = this.$el.parent()[0]; + this.$el.parent().on('scroll', _.throttle(this.onScroll.bind(this), 1000/60)); }); - }, - onShow: function () { - this.container = this.$el.parent()[0]; - this.$el.parent().on('scroll', _.throttle(this.onScroll.bind(this), 1000/60)); - this.appendNextPage(); + this.listenTo(this.collection, { + request : this.startLoading, + sync : this.endLoading + }); }, onScroll: function(){ - if(!this.loading && this.collection.length < this.collection.db.length && this.triggerEvent()){ + if(!this.loading && this.hasNextPage() && this.triggerEvent()){ this.appendNextPage(); } }, - /** - * Is user scrolling down && overflow < 100 - * - added clientHeight check to prevent false trigger when div not drawn - * @returns {boolean} - */ triggerEvent: function () { var sH = this.container.scrollHeight, cH = this.container.clientHeight, sT = this.container.scrollTop; var down = sT > (this._sT || 0); this._sT = sT; - - return down && (sH - cH - sT < 100); + return down ? sH - cH - sT < 100 : sH - cH - sT === 0; }, appendNextPage: function () { - var collection = this.collection, page = ++this._page; - collection.trigger('loading:start'); - - return collection.fetch({ + return this.collection.fetch({ remove: false, - data: { page: page } - }) - .then(function () { - collection.trigger('loading:end'); + data: { + filter: _.merge({offset: this.collection.length}, this.collection.getFilterOptions()) + } }); }, + hasNextPage: function () { + return this.collection._hasNextPage; + }, + startLoading: function () { this.loading = true; this.$el.addClass('loading'); @@ -68,9 +59,6 @@ module.exports = Mn.CompositeView.extend({ endLoading: function () { this.loading = false; this.$el.removeClass('loading'); - }, - - reset: function(){ - this._page = 1; + this.onScroll(); } }); \ No newline at end of file diff --git a/package.json b/package.json index 72c96209..d54fa19b 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,9 @@ "accounting": "^0.4.1", "backbone": "^1.2.3", "backbone-deep-model": "kilbot/backbone-deep-model", + "backbone-dual-storage": "kilbot/Backbone-Dual-Storage", + "backbone-indexeddb": "kilbot/Backbone-IndexedDB", + "backbone-marionette-infinite-list": "kilbot/Backbone-Marionette-Infinite-List", "backbone-validation": "^0.11.5", "backbone.marionette": "^2.4.4", "backbone.radio": "^1.0.2", From 0b9c4ec9e168cdcf20d7f16fe04ee540b49b797e Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Thu, 24 Mar 2016 21:42:17 +0800 Subject: [PATCH 044/169] improve customer search --- assets/js/src/apps/pos/cart/route.js | 10 +- .../src/apps/pos/cart/views/customer-list.js | 21 +- assets/js/src/apps/pos/cart/views/customer.js | 14 +- .../js/src/apps/pos/cart/views/line/layout.js | 2 +- .../js/src/entities/customers/collection.js | 13 +- assets/js/src/entities/customers/model.js | 4 +- assets/js/src/entities/orders/model.js | 257 ++++++++++-------- assets/js/src/lib/config/dual-collection.js | 3 + assets/js/src/lib/config/dual-model.js | 4 +- .../js/src/lib/config/filtered-collection.js | 9 +- assets/js/src/lib/config/idb-adapter.js | 109 ++++---- assets/js/src/lib/config/idb-sync.js | 6 +- includes/api/customers.php | 139 +++++++--- includes/api/products.php | 8 +- includes/template.php | 1 - package.json | 3 - .../php/spec/api/test-customers.php | 215 +++++++++++++++ .../php/spec/api/test-products.php | 2 + 18 files changed, 568 insertions(+), 252 deletions(-) create mode 100644 tests/integration/php/spec/api/test-customers.php diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 6e06d324..e4b45179 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -50,9 +50,13 @@ var CartRoute = Route.extend({ * Fetch orders from idb if new */ fetch: function() { - //if (this.collection.isNew()) { - // return this.collection.fetch(); - //} + return this.collection.fetch({ + remote: false, + index: { + keyPath: '_state', + value: this.collection.states.create + } + }); }, /** diff --git a/assets/js/src/apps/pos/cart/views/customer-list.js b/assets/js/src/apps/pos/cart/views/customer-list.js index 2b03e5e3..d4a51d43 100644 --- a/assets/js/src/apps/pos/cart/views/customer-list.js +++ b/assets/js/src/apps/pos/cart/views/customer-list.js @@ -38,17 +38,16 @@ var Customers = InfiniteListView.extend({ initialize: function(options){ options = options || {}; - var filtered = this.collection; - var customers = this.collection.superset(); - - if( customers.isNew() ){ - return customers.fetch() - .then(function(){ - customers.fullSync(); - }); - } else { - filtered.query(options.filter); - } + this.collection.fetch(); + + // if( customers.isNew() ){ + // return customers.fetch() + // .then(function(){ + // customers.fullSync(); + // }); + // } else { + // filtered.query(options.filter); + // } }, childEvents: { diff --git a/assets/js/src/apps/pos/cart/views/customer.js b/assets/js/src/apps/pos/cart/views/customer.js index 291d0c99..54945162 100644 --- a/assets/js/src/apps/pos/cart/views/customer.js +++ b/assets/js/src/apps/pos/cart/views/customer.js @@ -12,20 +12,16 @@ var View = View.extend({ className: 'list-row', initialize: function(){ - this.customers = Radio.request('entities', 'get', { - type: 'filtered', - name: 'customers', - perPage : 10 - }); + this.customers = Radio.request('entities', 'get', 'customers'); this.mergeOptions({ - guest: this.customers.superset().getGuestCustomer() + guest: this.customers.getGuestCustomer() }, ['guest']); /** * @todo customer attr relation direct to customer model */ - this.listenTo(this.customers.superset(), 'modal:save', this.onModalSave); + this.listenTo(this.customers, 'modal:save', this.onModalSave); _.bindAll( this, 'dropdownContent' ); }, @@ -52,9 +48,7 @@ var View = View.extend({ }, _query: _.debounce( function(value){ - this.customers - .query(value) - .firstPage(); + this.customers.setFilter(value); }, 149), modelEvents: { diff --git a/assets/js/src/apps/pos/cart/views/line/layout.js b/assets/js/src/apps/pos/cart/views/line/layout.js index 09ad5e60..39d6eaf2 100644 --- a/assets/js/src/apps/pos/cart/views/line/layout.js +++ b/assets/js/src/apps/pos/cart/views/line/layout.js @@ -80,7 +80,7 @@ module.exports = LayoutView.extend({ var el = this.$el, type = this.model.get( 'type' ); // @todo: do a better scrollTo for multiple pulses - el.scrollIntoView(); + // el.scrollIntoView(); el.addClass('pulse-in') .animate({backgroundColor: 'transparent'}, 500, function() { diff --git a/assets/js/src/entities/customers/collection.js b/assets/js/src/entities/customers/collection.js index fc1dbed6..28042fe7 100644 --- a/assets/js/src/entities/customers/collection.js +++ b/assets/js/src/entities/customers/collection.js @@ -5,9 +5,15 @@ var Radio = require('backbone.radio'); module.exports = DualCollection.extend({ model: Model, name: 'customers', - indexes: [ - {name: 'local_id', keyPath: 'local_id', unique: true}, - {name: 'id', keyPath: 'id', unique: true} + + // this is an array of fields used by FilterCollection.matchmaker() + fields: [ + 'email', + 'username', // required + 'first_name', + 'last_name', + 'billing_address.phone', + 'billing_address.company' ], initialize: function(){ @@ -28,5 +34,4 @@ module.exports = DualCollection.extend({ getDefaultCustomer: function(){ return this._default; } - }); \ No newline at end of file diff --git a/assets/js/src/entities/customers/model.js b/assets/js/src/entities/customers/model.js index be16a268..00000ec5 100644 --- a/assets/js/src/entities/customers/model.js +++ b/assets/js/src/entities/customers/model.js @@ -2,9 +2,7 @@ var DualModel = require('lib/config/dual-model'); var App = require('lib/config/application'); var CustomersModel = DualModel.extend({ - name: 'customer', - // this is an array of fields used by FilterCollection.matchmaker() - fields: ['email', 'username', 'first_name', 'last_name'] + name: 'customer' }); module.exports = CustomersModel; diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 6f11635f..df633574 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -23,16 +23,16 @@ var OrderModel = DualModel.extend({ * add tax settings early for use by cart * - always be parsin' */ - constructor: function( attributes, options ){ + constructor: function (attributes, options) { // clone tax settings - this.tax = _.clone( this.getSettings( 'tax' ) ); - DualModel.call( this, attributes, _.extend( { parse: true }, options ) ); + this.tax = _.clone(this.getSettings('tax')); + DualModel.call(this, attributes, _.extend({parse: true}, options)); }, /** * convenience method to get settings */ - getSettings: function(name){ + getSettings: function (name) { return Radio.request('entities', 'get', { type: 'option', name: name @@ -42,9 +42,9 @@ var OrderModel = DualModel.extend({ /** * */ - isEditable: function( state ){ + isEditable: function (state) { state = state || this.get('_state'); - return this.isDelayed( state ); + return this.isDelayed(state); }, /** @@ -52,24 +52,24 @@ var OrderModel = DualModel.extend({ * - options.deferSave allows third party gateways to defer payment processing */ /* jshint -W074 */ - save: function( attributes, options ){ + save: function (attributes, options) { options = options || {}; options.deferSave = options.deferSave || _.noop; var self = this; // Safari doesn't like empty keyPath, perhaps an autoincrement problem? // Set local_id as timestamp milliseconds - if( this.id === 'new' ){ + if (this.id === 'new') { //this.set({ local_id: Date.now() }); this.unset('local_id'); } - if( this.cart ){ + if (this.cart) { this.updateTotals(); } - return $.when( options.deferSave ) - .then( function(){ + return $.when(options.deferSave) + .then(function () { debug('save order', self); return DualModel.prototype.save.call(self, attributes, options); }); @@ -81,19 +81,20 @@ var OrderModel = DualModel.extend({ * Attach cart during parse * - allows order to change status, ie: become editable */ - parse: function(resp) { + parse: function (resp) { resp = DualModel.prototype.parse.apply(this, arguments); // if new - if( resp.local_id === 'new' ){ + if (resp.local_id === 'new') { resp._state = this.collection.states.create; } // if open order with no cart, ie: new from idb or changed state - if( this.isEditable( resp._state ) && ! this.cart ){ - resp.taxes = this.attachTaxes( resp.taxes ); - this.attachCart( resp ); - this.attachGateways( resp ); + if (this.isEditable(resp._state) && !this.cart) { + resp.taxes = this.attachTaxes(resp.taxes); + this.attachCart(resp); + this.attachGateways(resp); + this.attachCustomer(resp); } return resp; @@ -102,38 +103,38 @@ var OrderModel = DualModel.extend({ /** * Attach cart during parse, allows updates from server */ - attachCart: function( attributes ){ - this.cart = new Cart( null, { order: this } ); + attachCart: function (attributes) { + this.cart = new Cart(null, {order: this}); // add line_items, shipping_lines and fee_lines - this.cart.set( attributes.line_items, - { parse: true, remove: false } + this.cart.set(attributes.line_items, + {parse: true, remove: false} ); - this.cart.set( attributes.shipping_lines, - { parse: true, remove: false, type: 'shipping' } + this.cart.set(attributes.shipping_lines, + {parse: true, remove: false, type: 'shipping'} ); - this.cart.set( attributes.fee_lines, - { parse: true, remove: false, type: 'fee' } + this.cart.set(attributes.fee_lines, + {parse: true, remove: false, type: 'fee'} ); - this.cart.on( 'change add remove', function(){ - if( this.cart && this.cart.length === 0 ){ + this.cart.on('change add remove', function () { + if (this.cart && this.cart.length === 0) { this.destroy(); } else { this.save(); } - }, this ); + }, this); }, /** * Attach gateways */ - attachGateways: function( attributes ){ - this.gateways = new Gateways( attributes.payment_details, { order: this } ); + attachGateways: function (attributes) { + this.gateways = new Gateways(attributes.payment_details, {order: this}); - this.gateways.on( 'change', function(){ + this.gateways.on('change', function () { this.save(); - }, this ); + }, this); }, /** @@ -141,51 +142,51 @@ var OrderModel = DualModel.extend({ * - parse tax_rates into bb Collections * - set enabled = true for each rate */ - attachTaxes: function( enabled_taxes ){ - var tax_rates = this.getSettings( 'tax_rates' ); + attachTaxes: function (enabled_taxes) { + var tax_rates = this.getSettings('tax_rates'); this.tax_rates = {}; // parse tax_rates - _.each( tax_rates, function( tax_rate, tax_class ){ - var taxes = new Taxes( tax_rate, { order: this } ); - taxes.toggleTaxes( enabled_taxes ); - this.tax_rates[ tax_class ] = taxes; + _.each(tax_rates, function (tax_rate, tax_class) { + var taxes = new Taxes(tax_rate, {order: this}); + taxes.toggleTaxes(enabled_taxes); + this.tax_rates[tax_class] = taxes; }, this); // exit early if attribute exists - if( enabled_taxes ){ + if (enabled_taxes) { return enabled_taxes; } // set enabled taxes - return _.reduce( tax_rates, function( obj, tax_rate ){ - _.each( tax_rate, function( tax, rate_id ){ - obj[ 'rate_' + rate_id ] = true; - } ); + return _.reduce(tax_rates, function (obj, tax_rate) { + _.each(tax_rate, function (tax, rate_id) { + obj['rate_' + rate_id] = true; + }); return obj; - }, { all: true } ); + }, {all: true}); }, /** * */ /* jshint -W071, -W074 */ - toJSON: function(options) { + toJSON: function (options) { options = options || {}; var attrs = _.clone(this.attributes); // process cart collection - if( this.isEditable() && this.cart ){ + if (this.isEditable() && this.cart) { attrs = this.prepareCartJSON(attrs, options); } // process gateways - if( this.isEditable() && this.gateways ){ + if (this.isEditable() && this.gateways) { attrs.payment_details = this.gateways.getPaymentDetails(); } // prepare remote JSON - if( options.remote && this.name ) { + if (options.remote && this.name) { attrs = this.prepareRemoteJSON(attrs, options); } @@ -193,8 +194,8 @@ var OrderModel = DualModel.extend({ }, /* jshint +W071, +W074 */ - prepareCartJSON: function(attrs, options){ - var taxes = [], + prepareCartJSON: function (attrs, options) { + var taxes = [], shipping_taxes = []; attrs.line_items = []; @@ -202,33 +203,33 @@ var OrderModel = DualModel.extend({ attrs.fee_lines = []; /* jshint -W074 */ - this.cart.each( function(model) { + this.cart.each(function (model) { - switch( model.type ) { + switch (model.type) { case 'shipping': - attrs.shipping_lines.push( model.toJSON(options) ); - if( model.taxes ){ - shipping_taxes.push( model.taxes.toJSON(options) ); + attrs.shipping_lines.push(model.toJSON(options)); + if (model.taxes) { + shipping_taxes.push(model.taxes.toJSON(options)); } break; case 'fee': - attrs.fee_lines.push( model.toJSON(options) ); + attrs.fee_lines.push(model.toJSON(options)); break; case 'product': - attrs.line_items.push( model.toJSON(options) ); + attrs.line_items.push(model.toJSON(options)); break; } - if( model.taxes ){ - taxes.push( model.taxes.toJSON(options) ); + if (model.taxes) { + taxes.push(model.taxes.toJSON(options)); } }); /* jshint +W074 */ - attrs.tax_lines = this.mergeItemizedTaxes( taxes ); + attrs.tax_lines = this.mergeItemizedTaxes(taxes); attrs.shipping_tax = this.sumItemizedTaxes( - this.mergeItemizedTaxes( shipping_taxes ) + this.mergeItemizedTaxes(shipping_taxes) ); return attrs; @@ -237,23 +238,23 @@ var OrderModel = DualModel.extend({ /** * @todo this could be part of model.save( attributes )? */ - updateTotals: function(){ - var total = this.cart.sum('total'), - subtotal = this.cart.sum('subtotal'), - total_tax = this.cart.sum('total_tax'), - subtotal_tax = this.cart.sum('subtotal_tax'), - cart_discount = subtotal - total, + updateTotals: function () { + var total = this.cart.sum('total'), + subtotal = this.cart.sum('subtotal'), + total_tax = this.cart.sum('total_tax'), + subtotal_tax = this.cart.sum('subtotal_tax'), + cart_discount = subtotal - total, cart_discount_tax = subtotal_tax - total_tax; total += total_tax; var totals = { - 'total' : Utils.round( total, 4 ), - 'subtotal' : Utils.round( subtotal, 4 ), - 'total_tax' : Utils.round( total_tax, 4 ), - 'subtotal_tax' : Utils.round( subtotal_tax, 4 ), - 'cart_discount' : Utils.round( cart_discount, 4 ), - 'cart_discount_tax' : Utils.round( cart_discount_tax, 4 ) + 'total' : Utils.round(total, 4), + 'subtotal' : Utils.round(subtotal, 4), + 'total_tax' : Utils.round(total_tax, 4), + 'subtotal_tax' : Utils.round(subtotal_tax, 4), + 'cart_discount' : Utils.round(cart_discount, 4), + 'cart_discount_tax': Utils.round(cart_discount_tax, 4) }; this.set(totals); @@ -263,28 +264,28 @@ var OrderModel = DualModel.extend({ * Takes an array of itemized taxes and merges them into one combined array * - model.taxes.toJSON() ensures a shallow clone */ - mergeItemizedTaxes: function( taxes ){ - return _.reduce( taxes, function( merged, line_taxes ){ - _.each( line_taxes, function( tax ){ - var orig = _.find( merged, { rate_id: tax.rate_id } ); - if( orig ){ - orig.total = _.sum([ orig.total, tax.total ]); - orig.subtotal = _.sum([ orig.subtotal, tax.subtotal ]); - } else { - merged.push( tax ); - } - } ); - return merged; - }) || []; + mergeItemizedTaxes: function (taxes) { + return _.reduce(taxes, function (merged, line_taxes) { + _.each(line_taxes, function (tax) { + var orig = _.find(merged, {rate_id: tax.rate_id}); + if (orig) { + orig.total = _.sum([orig.total, tax.total]); + orig.subtotal = _.sum([orig.subtotal, tax.subtotal]); + } else { + merged.push(tax); + } + }); + return merged; + }) || []; }, /** * */ - sumItemizedTaxes: function( taxes, attr ){ + sumItemizedTaxes: function (taxes, attr) { attr = attr || 'total'; - return _.chain( taxes ) - .map( function( tax ) { + return _.chain(taxes) + .map(function (tax) { return tax[attr]; }) .sum() @@ -294,8 +295,8 @@ var OrderModel = DualModel.extend({ /** * Value displayed in cart */ - getDisplayTotal: function(){ - if( this.tax.tax_display_cart === 'incl' ) { + getDisplayTotal: function () { + if (this.tax.tax_display_cart === 'incl') { return this.sum(['total', 'total_tax']); } else { return this.get('total'); @@ -305,7 +306,7 @@ var OrderModel = DualModel.extend({ /** * Convenience method to sum attributes */ - sum: function(array){ + sum: function (array) { var sum = 0; for (var i = 0; i < array.length; i++) { sum += this.get(array[i]); @@ -316,8 +317,8 @@ var OrderModel = DualModel.extend({ /** * Value displayed in cart */ - getDisplaySubtotal: function(){ - if( this.tax.tax_display_cart === 'incl' ) { + getDisplaySubtotal: function () { + if (this.tax.tax_display_cart === 'incl') { return this.sum(['subtotal', 'subtotal_tax']); } else { return this.get('subtotal'); @@ -327,8 +328,8 @@ var OrderModel = DualModel.extend({ /** * Value displayed in cart */ - getDisplayCartDiscount: function(){ - if( this.tax.tax_display_cart === 'incl' ) { + getDisplayCartDiscount: function () { + if (this.tax.tax_display_cart === 'incl') { return this.sum(['cart_discount', 'cart_discount_tax']); } else { return this.get('cart_discount'); @@ -338,16 +339,16 @@ var OrderModel = DualModel.extend({ /** * Email receipt via ajax */ - emailReceipt: function(email){ - return App.prototype.post( this.url() + 'email/' + email ); + emailReceipt: function (email) { + return App.prototype.post(this.url() + 'email/' + email); }, /** * Clean up attached cart */ - destroy: function(){ - if( this.cart ){ - this.cart.reset( null, { silent: true } ); + destroy: function () { + if (this.cart) { + this.cart.reset(null, {silent: true}); this.cart.stopListening(); } DualModel.prototype.destroy.apply(this, arguments); @@ -356,30 +357,30 @@ var OrderModel = DualModel.extend({ /** * Toggle taxes */ - toggleTax: function( rate_id ){ - if( rate_id ){ - var val = ! this.get( 'taxes.rate_' + rate_id ); - this.set( 'taxes.rate_' + rate_id, val ); + toggleTax: function (rate_id) { + if (rate_id) { + var val = !this.get('taxes.rate_' + rate_id); + this.set('taxes.rate_' + rate_id, val); } else { - this.set( 'taxes.all', ! this.get( 'taxes.all' ) ); + this.set('taxes.all', !this.get('taxes.all')); } }, /** * Check if tax rate is enabled by rate_id */ - taxRateEnabled: function( rate_id ){ - if( ! this.get( 'taxes.all' ) ){ + taxRateEnabled: function (rate_id) { + if (!this.get('taxes.all')) { return false; } - return this.get( 'taxes.rate_' + rate_id ); + return this.get('taxes.rate_' + rate_id); }, /** * Returns parsed tax rates for a given tax_rate */ - getTaxRates: function( tax_class ){ - if( this.tax_rates ){ + getTaxRates: function (tax_class) { + if (this.tax_rates) { var taxes = this.tax_rates[tax_class]; return taxes.toJSON(); } @@ -389,12 +390,40 @@ var OrderModel = DualModel.extend({ * Helper function to construct the tab label * @todo: give users options on what to display, eg: customer name */ - getLabel: function(){ + getLabel: function () { var title = polyglot.t('titles.cart'); - if( this.id !== 'new' ){ - title += ' ' + Utils.formatMoney( this.get('total') ); + if (this.id !== 'new') { + title += ' ' + Utils.formatMoney(this.get('total')); } return title; + }, + + attachCustomer: function (attributes) { + var customers = Radio.request('entities', 'get', 'customers'); + if (attributes.customer_id || !customers) { + return; + } + + var self = this; + var defaultCustomer = customers.getDefaultCustomer(); + var model = customers.findWhere({id: defaultCustomer.id}); + attributes.customer_id = defaultCustomer.id; + attributes.customer = model ? model.toJSON() : defaultCustomer; + + if (!model) { + var isNew = customers.isNew(); + model = customers.add(defaultCustomer); + model.fetch({index: 'id'}) + .then(function (response) { + return response ? response : model.fetch({remote: true}); + }) + .then(function (response) { + self.set({customer: response}); + if(isNew){ + customers.fullSync(); + } + }); + } } }); diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 7746ef43..62d0518f 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -101,6 +101,9 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ return IDBCollection.prototype.getBatch.call(this, options) .then(function (response) { + if(options.remote === false){ + return response; + } if(_.size(response) > 0){ return self.fetchDelayed(response); } diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 7fb9f445..c8eb6fae 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -26,7 +26,9 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ sync: function( method, model, options ){ options = options || {}; - this.setLocalState( method ); + if( method !== 'read' ){ + this.setLocalState( method ); + } if( options.remote ){ return this.remoteSync( method, model, options ); } diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js index e4c3db4b..d2ae3c9e 100644 --- a/assets/js/src/lib/config/filtered-collection.js +++ b/assets/js/src/lib/config/filtered-collection.js @@ -7,7 +7,11 @@ var parse = new Parser(); var defaultFilterName = '__default'; module.exports = app.prototype.FilteredCollection = Collection.extend({ - _filters: {}, + + constructor: function(){ + this._filters = {}; + Collection.apply(this, arguments); + }, setFilter: function (filterName, filter) { if (filter === undefined) { @@ -59,7 +63,8 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ getFilterOptions: function () { if (this.hasFilters()) { - return {q: this.getFilterQueries(), fields: this.fields}; + var fields = _.isArray(this.fields) ? this.fields.join(',') : this.fields; + return {q: this.getFilterQueries(), fields: fields}; } }, diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js index 33a59091..2f5f4bae 100644 --- a/assets/js/src/lib/config/idb-adapter.js +++ b/assets/js/src/lib/config/idb-adapter.js @@ -7,6 +7,7 @@ var is_safari = window.navigator.userAgent.indexOf('Safari') !== -1 && window.navigator.userAgent.indexOf('Android') === -1; var indexedDB = window.indexedDB; +var IDBKeyRange = window.IDBKeyRange; var consts = { 'READ_ONLY' : 'readonly', @@ -29,15 +30,15 @@ function IDBAdapter( options ){ IDBAdapter.prototype = { default: { - storeName : 'store', - storePrefix : 'Prefix_', - dbVersion : 1, - keyPath : 'id', - autoIncrement : true, - indexes : [], - pageSize : 10, - matchMaker : matchMaker, - onerror : function(options) { + storeName : 'store', + storePrefix : 'Prefix_', + dbVersion : 1, + keyPath : 'id', + autoIncrement: true, + indexes : [], + pageSize : 10, + matchMaker : matchMaker, + onerror : function (options) { options = options || {}; var err = new Error(options._error.message); err.code = event.target.errorCode; @@ -61,12 +62,12 @@ IDBAdapter.prototype = { // get count & safari hack self.count() .then(function () { - if(is_safari){ + if (is_safari) { return self.findHighestIndex(); } }) .then(function (key) { - if(is_safari){ + if (is_safari) { self.highestKey = key || 0; } resolve(self.db); @@ -136,7 +137,7 @@ IDBAdapter.prototype = { return this.merge(data, options); } - if(!data[keyPath]){ + if (!data[keyPath]) { return this.add(data, options); } @@ -154,12 +155,12 @@ IDBAdapter.prototype = { }); }, - add: function(data, options){ + add: function (data, options) { options = options || {}; var objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); var self = this, keyPath = this.opts.keyPath; - if(is_safari){ + if (is_safari) { data[keyPath] = ++this.highestKey; } @@ -179,10 +180,17 @@ IDBAdapter.prototype = { get: function (key, options) { options = options || {}; - var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); + var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), + keyPath = options.index || this.opts.keyPath, + self = this; + + if (_.isObject(keyPath)) { + keyPath = keyPath.keyPath; + } return new Promise(function (resolve, reject) { - var request = objectStore.get(key); + var request = (keyPath === self.opts.keyPath) ? + objectStore.get(key) : objectStore.index(keyPath).get(key); request.onsuccess = function (event) { resolve(event.target.result); @@ -238,61 +246,46 @@ IDBAdapter.prototype = { var self = this, keyPath = options.index; var primaryKey = this.opts.keyPath; - var fn = function(local, remote, keyPath){ - if(local){ + var fn = function (local, remote, keyPath) { + if (local) { remote[keyPath] = local[keyPath]; } return remote; }; - if(_.isObject(options.index)){ + if (_.isObject(options.index)) { keyPath = _.get(options, ['index', 'keyPath'], primaryKey); - if(_.isFunction(options.index.merge)){ + if (_.isFunction(options.index.merge)) { fn = options.index.merge; } } - return this.getByIndex(keyPath, data[keyPath], options) - .then(function(result){ + return this.get(data[keyPath], {index: keyPath, objectStore: options.objectStore}) + .then(function (result) { return self.put(fn(result, data, primaryKey)); }); }, - getByIndex: function(keyPath, key, options){ - options = options || {}; - var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), - openIndex = objectStore.index(keyPath), - request = openIndex.get(key), - self = this; - - return new Promise(function (resolve, reject) { - request.onsuccess = function (event) { - resolve(event.target.result); - }; - - request.onerror = function (event) { - options._error = {event: event, message: 'get by index error', callback: reject}; - self.opts.onerror(options); - }; - }); - }, - getBatch: function (keyArray, options) { - if(!options && !_.isArray(keyArray)){ + if (!options && !_.isArray(keyArray)) { options = keyArray; } options = options || {}; var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), - include = _.isArray(keyArray) ? keyArray: _.get(options, ['data', 'filter', 'in']), - limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize), - offset = _.get(options, ['data', 'filter', 'offset'], 0), - query = _.get(options, ['data', 'filter', 'q']), - keyPath = options.index || this.opts.keyPath, - page = _.get(options, ['data', 'page']), - self = this; - - if(_.isObject(keyPath)){ + include = _.isArray(keyArray) ? keyArray : _.get(options, ['data', 'filter', 'in']), + limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize), + offset = _.get(options, ['data', 'filter', 'offset'], 0), + query = _.get(options, ['data', 'filter', 'q']), + keyPath = options.index || this.opts.keyPath, + page = _.get(options, ['data', 'page']), + self = this, + range = null; + + if (_.isObject(keyPath)) { + if(keyPath.value){ + range = IDBKeyRange.only(keyPath.value); + } keyPath = keyPath.keyPath; } @@ -300,25 +293,25 @@ IDBAdapter.prototype = { limit = Infinity; } - if(page){ + if (page) { offset = (page - 1) * limit; } return new Promise(function (resolve, reject) { var records = [], delayed = 0; var request = (keyPath === self.opts.keyPath) ? - objectStore.openCursor() : objectStore.index(keyPath).openCursor(); + objectStore.openCursor() : objectStore.index(keyPath).openCursor(range); request.onsuccess = function (event) { var cursor = event.target.result; if (cursor) { - if(cursor.value._state === 'READ_FAILED'){ + if (cursor.value._state === 'READ_FAILED') { delayed++; } - if( + if ( (!include || _.includes(include, cursor.value[keyPath])) && (!query || self._match(query, cursor.value, keyPath, options)) - ){ + ) { records.push(cursor.value); } return cursor.continue(); @@ -360,7 +353,7 @@ IDBAdapter.prototype = { return new Promise(function (resolve, reject) { var request; - if(keyPath){ + if (keyPath) { var openIndex = objectStore.index(keyPath); request = openIndex.openCursor(null, consts.PREV); } else { @@ -379,7 +372,7 @@ IDBAdapter.prototype = { }); }, - _match: function(query, json, keyPath, options){ + _match: function (query, json, keyPath, options) { var fields = _.get(options, ['data', 'filter', 'fields'], keyPath); return this.opts.matchMaker.call(this, json, query, {fields: fields}); } diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js index 4e48ffbf..bf496f92 100644 --- a/assets/js/src/lib/config/idb-sync.js +++ b/assets/js/src/lib/config/idb-sync.js @@ -2,14 +2,16 @@ var bb = require('backbone'); /* jshint -W074 */ module.exports = function(method, entity, options) { + options = options || {}; var isModel = entity instanceof bb.Model; + var key = isModel && options.index ? entity.get(options.index) : entity.id; return entity.db.open() .then(function () { switch (method) { case 'read': if (isModel) { - return entity.db.get(entity.id); + return entity.db.get(key, options); } return entity.db.getBatch(options); case 'create': @@ -24,7 +26,7 @@ module.exports = function(method, entity, options) { }); case 'delete': if (isModel) { - return entity.db.delete(entity.id); + return entity.db.delete(key, options); } return; } diff --git a/includes/api/customers.php b/includes/api/customers.php index 9ba6359d..b3c6f302 100644 --- a/includes/api/customers.php +++ b/includes/api/customers.php @@ -29,8 +29,8 @@ public function __construct( WC_API_Server $server ) { parent::__construct( $server ); add_filter( 'woocommerce_api_customer_response', array( $this, 'customer_response' ), 10, 4 ); - if( $server->path === $this->base ){ - add_action( 'pre_get_users', array( $this, 'pre_get_users' ) ); + if( $server->path === $this->base || $server->path === $this->base . '/ids' ){ + add_action( 'pre_get_users', array( $this, 'pre_get_users' ), 5 ); add_action( 'pre_user_query', array( $this, 'pre_user_query' ) ); } } @@ -79,15 +79,15 @@ public function pre_get_users( $wp_user_query ) { $wp_user_query->query_vars[ 'role' ] = ''; // WordPress 4.4 allows role__in and role__not_in - if( version_compare($wp_version, '4.4', '>=') ) { + if ( version_compare( $wp_version, '4.4', '>=' ) ) { $roles = wc_pos_get_option( 'customers', 'customer_roles' ); - if( is_array( $roles ) && ! in_array( 'all', $roles ) ){ + if ( is_array( $roles ) && !in_array( 'all', $roles ) ) { $wp_user_query->query_vars[ 'role__in' ] = $roles; } // special case: no customer roles - if( is_null( $roles ) ){ + if ( is_null( $roles ) ) { // ? } } @@ -104,6 +104,37 @@ public function pre_get_users( $wp_user_query ) { $wp_user_query->query_vars[ 'exclude' ] = explode( ',', $_GET[ 'filter' ][ 'not_in' ] ); } + // wildcard by default + if ( isset( $_GET[ 'filter' ][ 'q' ] ) ) { + $query = $_GET[ 'filter' ][ 'q' ]; + if(is_string($query)){ + $wp_user_query->query_vars[ 'search' ] = '*' . trim( $_GET[ 'filter' ][ 'q' ], '*' ) . '*'; + } + if(is_array($query)){ + $wp_user_query->query_vars[ 'search' ] = ''; + $wp_user_query->query_vars[ '_pos_query' ] = $query; + } + } + + // search columns: 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' + if ( isset( $_GET[ 'filter' ][ 'fields' ] ) ) { + $fields = $_GET[ 'filter' ][ 'fields' ]; + $fields = is_string($fields) ? explode(',', $fields) : $fields; + $search_columns = array(); + $translate = array( + 'id' => 'ID', + 'email' => 'user_email', + 'username' => 'user_login' + ); + foreach( $fields as $field ) { + $search_columns[] = isset($translate[$field]) ? $translate[$field] : $field; + } + if(!in_array('user_login', $search_columns)){ + $search_columns[] = 'user_login'; // required + } + $wp_user_query->query_vars[ 'search_columns' ] = $search_columns; + } + } } @@ -115,11 +146,20 @@ public function pre_get_users( $wp_user_query ) { */ public function pre_user_query( $wp_user_query ) { - // customer search - $term = $wp_user_query->query_vars[ 'search' ]; + if(!isset($wp_user_query->query_vars[ 'search' ])) + return; + + $term = trim( $wp_user_query->query_vars[ 'search' ], '*' ); + if ( !empty( $term ) ) { - $this->customer_search( $term, $wp_user_query ); + $this->simple_search( $term, $wp_user_query ); } + + if( isset($wp_user_query->query_vars[ '_pos_query' ]) ){ + $queries = $wp_user_query->query_vars[ '_pos_query' ]; + $this->complex_search( $queries, $wp_user_query ); + } + } /** @@ -128,40 +168,69 @@ public function pre_user_query( $wp_user_query ) { * @param $term * @param $wp_user_query */ - private function customer_search($term, $wp_user_query){ + private function simple_search($term, $wp_user_query) { global $wpdb; + $meta_keys = array(); + $ids = array(); + + foreach ( $wp_user_query->query_vars[ 'search_columns' ] as $field ) { + if ( $field == 'first_name' ) $meta_keys[] = "meta_key='$field'"; + if ( $field == 'last_name' ) $meta_keys[] = "meta_key='$field'"; + if ( substr( $field, 0, 16 ) == 'billing_address.' ) { + $field = str_replace( 'billing_address.', 'billing_', $field ); + $meta_keys[] = "meta_key='$field'"; + } + if ( substr( $field, 0, 17 ) == 'shipping_address.' ) { + $field = str_replace( 'shipping_address.', 'shipping_', $field ); + $meta_keys[] = "meta_key='$field'"; + } + } // search usermeta table - $usermeta_ids = $wpdb->get_col(" - SELECT DISTINCT user_id - FROM $wpdb->usermeta - WHERE (meta_key='first_name' OR meta_key='last_name') - AND LOWER(meta_value) - LIKE '%".$term."%' - "); - - // search users table - $users_ids = $wpdb->get_col(" - SELECT DISTINCT ID - FROM $wpdb->users - WHERE LOWER(user_nicename) - LIKE '%".$term."%' - OR LOWER(user_login) - LIKE '%".$term."%' - "); - - $ids = array_unique(array_merge($usermeta_ids,$users_ids)); - $ids_str = implode(',', $ids); - - if (!empty($ids_str)){ + if ( !empty( $meta_keys ) ) { + $ids = $wpdb->get_col( " + SELECT DISTINCT user_id + FROM $wpdb->usermeta + WHERE (" . implode( ' OR ', $meta_keys ) . ") + AND LOWER(meta_value) + LIKE '%" . $term . "%' + " ); + } + + + if ( !empty( $ids ) ) { $wp_user_query->query_where = str_replace( - "user_nicename LIKE '".$term."'", - "ID IN(".$ids_str.")", + "user_login LIKE '%$term%'", + "user_login LIKE '%$term%' OR ID IN(" . implode( ',', $ids ) . ")", $wp_user_query->query_where ); } } + /** + * @param array $queries + * @param $wp_user_query + */ + private function complex_search(array $queries, $wp_user_query){ + $ORs = array(); + + foreach($queries as $query){ + $type = isset($query['type']) ? $query['type'] : ''; + $term = isset($query['query']) ? $query['query'] : ''; + if($type == 'prefix'){ + $prefix = isset($query['prefix']) ? $query['prefix'] : ''; + if($prefix == 'id'){ + $ORs[] = 'ID = ' . $term; + } + } + }; + + if(!empty($ORs)){ + $wp_user_query->query_where .= ' AND (' . implode(' OR ', $ORs) .') '; + } + + } + /** * Returns array of all user ids * @@ -181,7 +250,7 @@ public function get_all_ids( $filter = array() ){ } $query = new \WP_User_Query( $args ); - return array_map( array( $this, 'format_id' ), $query->results ); + return array( 'customers' => array_map( array( $this, 'format_id' ), $query->results ) ); } @@ -190,7 +259,7 @@ public function get_all_ids( $filter = array() ){ * @return array */ private function format_id( $id ) { - return array( 'id' => $id ); + return array( 'id' => (int) $id ); } diff --git a/includes/api/products.php b/includes/api/products.php index 7bea7578..931dd67d 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -401,11 +401,11 @@ public function get_all_ids( $filter = array() ){ } /** - * @param $id - * @return array - */ + * @param $id + * @return array + */ private function format_id( $id ){ - return array( 'id' => $id ); + return array( 'id' => (int) $id ); } } \ No newline at end of file diff --git a/includes/template.php b/includes/template.php index 4f9002f0..1d43bdc6 100644 --- a/includes/template.php +++ b/includes/template.php @@ -169,7 +169,6 @@ public function footer() { $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; $js = self::get_external_js_libraries(); - $js[ 'scrollIntoView' ] = PLUGIN_URL . 'assets/js/vendor/jquery.scrollIntoView.' . $build . '.js?ver=' . VERSION; $js[ 'app' ] = PLUGIN_URL . 'assets/js/app.' . $build . '.js?ver=' . VERSION; $scripts = apply_filters( 'woocommerce_pos_enqueue_footer_js', $js ); diff --git a/package.json b/package.json index d54fa19b..72c96209 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,6 @@ "accounting": "^0.4.1", "backbone": "^1.2.3", "backbone-deep-model": "kilbot/backbone-deep-model", - "backbone-dual-storage": "kilbot/Backbone-Dual-Storage", - "backbone-indexeddb": "kilbot/Backbone-IndexedDB", - "backbone-marionette-infinite-list": "kilbot/Backbone-Marionette-Infinite-List", "backbone-validation": "^0.11.5", "backbone.marionette": "^2.4.4", "backbone.radio": "^1.0.2", diff --git a/tests/integration/php/spec/api/test-customers.php b/tests/integration/php/spec/api/test-customers.php new file mode 100644 index 00000000..68a531ff --- /dev/null +++ b/tests/integration/php/spec/api/test-customers.php @@ -0,0 +1,215 @@ +client = new Client([ + 'base_url' => get_woocommerce_api_url( 'customers/' ), + 'defaults' => [ + 'exceptions' => false, + 'headers' => [ 'X-WC-POS' => '1' ] + ] + ]); + } + + private function generate_random_string($length=10) { + $string = ''; + $characters = "ABCDEFHJKLMNPRTVWXYZabcdefghijklmnopqrstuvwxyz"; + for ($p = 0; $p < $length; $p++) { + $string .= $characters[mt_rand(0, strlen($characters)-1)]; + } + return $string; + } + + /** + * + */ + public function test_get_valid_response() { + $response = $this->client->get(); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('customers', $data); + } + + /** + * + */ + public function test_customer_roles_settings(){ + + // set the decimal_qty option + $option_key = Settings::DB_PREFIX . 'customers'; + update_option( $option_key, array('customer_roles' => array('all')) ); + + $response = $this->client->get(); + $data = $response->json(); + $this->assertArrayHasKey('customers', $data); + + $this->assertEquals('administrator', $data['customers'][0]['role']); // admin + $this->assertEquals('subscriber', $data['customers'][1]['role']); // wooteam + + update_option( $option_key, array('customer_roles' => array('subscriber')) ); + + $response = $this->client->get(); + $data = $response->json(); + + $this->assertEquals('subscriber', $data['customers'][0]['role']); + + update_option( $option_key, array('customer_roles' => array('all')) ); + + } + + /** + * + */ + public function test_customer_simple_username_search(){ + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => 'wootea', + 'filter[fields]' => 'username' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals('wooteam', $data['customers'][0]['username']); + } + + /** + * + */ + public function test_customer_simple_email_search(){ + $email = 'woo@' . $this->generate_random_string() . '.com'; + + add_filter('send_email_change_email', '__return_false'); + wp_update_user( array( + 'ID' => 2, + 'user_email' => $email + )); + + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => substr($email, 0, 6), + 'filter[fields]' => 'email' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals($email, $data['customers'][0]['email']); + } + + /** + * + */ + public function test_customer_simple_first_name_search(){ + $first_name = $this->generate_random_string(); + wp_update_user( array( + 'ID' => 2, + 'first_name' => $first_name + )); + + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => substr($first_name, 0, 6), + 'filter[fields]' => 'first_name' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals($first_name, $data['customers'][0]['first_name']); + } + + /** + * + */ + public function test_customer_simple_last_name_search(){ + $last_name = $this->generate_random_string(); + wp_update_user( array( + 'ID' => 2, + 'last_name' => $last_name + )); + + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => substr($last_name, 0, 6), + 'filter[fields]' => 'last_name' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals($last_name, $data['customers'][0]['last_name']); + } + + /** + * + */ + public function test_customer_simple_company_search(){ + $company = $this->generate_random_string(); + update_user_meta( 2, 'billing_company', $company ); + + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => substr($company, 0, 6), + 'filter[fields]' => 'billing_address.company' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals($company, $data['customers'][0]['billing_address']['company']); + } + + /** + * + */ + public function test_customer_simple_phone_search(){ + $phone = $this->generate_random_string(); + update_user_meta( 2, 'billing_phone', $phone ); + + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => substr($phone, 0, 6), + 'filter[fields]' => 'billing_address.phone' + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals($phone, $data['customers'][0]['billing_address']['phone']); + } + + /** + * + */ + public function test_customer_complex_id_search(){ + $response = $this->client->get('', [ + 'query' => [ + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'id', + 'query' => '2' + ) + ) + ] + ]); + $data = $response->json(); + + $this->assertCount(1, $data['customers']); + $this->assertEquals(2, $data['customers'][0]['id']); + } + +} \ No newline at end of file diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index 39b83434..4a2b45e0 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -345,4 +345,6 @@ public function test_variation_barcode_filter(){ } + + } \ No newline at end of file From f9d80c78ca53d3a8bc6b2bca08cc61ee7373a772 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sun, 27 Mar 2016 16:40:12 +0800 Subject: [PATCH 045/169] improve product search --- README.md | 2 +- assets/js/src/entities/orders/model.js | 20 +- assets/js/src/lib/config/dual-model.js | 18 + includes/api/products.php | 136 +++--- includes/products/visibility.php | 2 +- package.json | 4 +- tests/integration/php/bin/install.sh | 48 ++ tests/integration/php/bootstrap.php | 53 ++- .../php/spec/api/test-products.php | 435 ++++++++++++++---- .../js/spec/entities/orders/model.spec.js | 10 +- 10 files changed, 525 insertions(+), 203 deletions(-) create mode 100644 tests/integration/php/bin/install.sh diff --git a/README.md b/README.md index f2ad7f4c..2c2e95f0 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ If this is your first time setting up a local development environment you may wa ### Installation -The following installation instructions assume you have `git`, `nodejs` and `npm` installed. +The following installation instructions assume you have `git`, `nodejs` and `grunt cli` installed. VVV comes bundled with these and a bunch of other goodies so it is the recommended development environment for WooCommerce POS. If you have VVV intalled you should use `vagarnt ssh` to enter the virtual machine and then continue with the instructions. diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index df633574..0ba3f2fa 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -380,9 +380,8 @@ var OrderModel = DualModel.extend({ * Returns parsed tax rates for a given tax_rate */ getTaxRates: function (tax_class) { - if (this.tax_rates) { - var taxes = this.tax_rates[tax_class]; - return taxes.toJSON(); + if (this.tax_rates && this.tax_rates[tax_class]) { + return this.tax_rates[tax_class].toJSON(); } }, @@ -406,22 +405,21 @@ var OrderModel = DualModel.extend({ var self = this; var defaultCustomer = customers.getDefaultCustomer(); - var model = customers.findWhere({id: defaultCustomer.id}); attributes.customer_id = defaultCustomer.id; + attributes.customer = defaultCustomer; + + if(attributes.customer_id === 0){ + return; + } + + var model = customers.findWhere({id: defaultCustomer.id}); attributes.customer = model ? model.toJSON() : defaultCustomer; if (!model) { - var isNew = customers.isNew(); model = customers.add(defaultCustomer); model.fetch({index: 'id'}) - .then(function (response) { - return response ? response : model.fetch({remote: true}); - }) .then(function (response) { self.set({customer: response}); - if(isNew){ - customers.fullSync(); - } }); } } diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index c8eb6fae..63e9a671 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -24,6 +24,24 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ return urlRoot; }, + fetch: function(options){ + var self = this, isNew = this.collection.isNew(); + return this.sync('read', this, options) + .then(function(response){ + if(!response) { + options.remote = true; + return self.sync('read', this, options); + } + return response; + }) + .then(function(response){ + if(isNew){ + self.collection.fullSync(); + } + return response; + }); + }, + sync: function( method, model, options ){ options = options || {}; if( method !== 'read' ){ diff --git a/includes/api/products.php b/includes/api/products.php index 931dd67d..17619caa 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -107,7 +107,6 @@ public function __construct( WC_API_Server $server ) { if( $server->path === $this->base ){ add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) ); - add_filter( 'posts_where', array( $this, 'posts_where' ), 10 , 2 ); } } @@ -292,86 +291,97 @@ private function get_thumbnail($id){ return wc_placeholder_img_src(); } - /** - * @param $query + * @param \WP_Query $wp_query */ - public function pre_get_posts($query){ - // store original meta_query - $meta_query = $query->get( 'meta_query' ); + public function pre_get_posts(\WP_Query $wp_query){ + $query_array = isset($wp_query->query['s']) ? $wp_query->query['s'] : ''; - if( isset( $_GET['filter'] ) ){ - - $filter = $_GET['filter']; + if(!is_array($query_array)){ + return; + } - // featured - // todo: more general meta_key test using $query_args_whitelist - if( isset($filter['featured']) ) { - $meta_query[] = array( - 'key' => '_featured', - 'value' => $filter[ 'featured' ] ? 'yes' : 'no', - 'compare' => '=' - ); - } + foreach( $query_array as $query ){ + $this->parse_query_array($query, $wp_query); + } + } - // on sale - // - no easy way to get on_sale items - // - wc_get_product_ids_on_sale uses cached data, includes variations - if( isset($filter['on_sale']) ){ - $sale_ids = array_filter( wc_get_product_ids_on_sale() ); - $exclude = isset($query->query['post__not_in']) ? $query->query['post__not_in'] : array(); - $ids = array_diff($sale_ids, $exclude); - $query->set( 'post__not_in', array() ); - $query->set( 'post__in', $ids ); - } + /** + * @param array $query + * @param \WP_Query $wp_query + */ + private function parse_query_array( array $query, \WP_Query $wp_query){ + $type = isset($query['type']) ? $query['type'] : 'string'; + if($type == 'prefix' && isset($query['prefix']) && isset($query['query'])){ + $prefix = isset($query['prefix']) ? $query['prefix'] : ''; + $term = isset($query['query']) ? $query['query'] : ''; + $this->prefix_query($prefix, $term, $wp_query); } - // update the meta_query - $query->set( 'meta_query', $meta_query ); - } /** - * @param $where - * @param $query - * @return mixed + * @param $prefix + * @param $term + * @param \WP_Query $wp_query */ - public function posts_where( $where, $query ) { - global $wpdb; - - if( isset( $_GET['filter'] ) ){ - - $filter = $_GET['filter']; - - if( isset($filter['barcode']) ){ - - // gets post ids and parent ids - $result = $wpdb->get_results( - $wpdb->prepare(" - SELECT p.ID, p.post_parent - FROM $wpdb->posts AS p - JOIN $wpdb->postmeta AS pm - ON p.ID = pm.post_id - WHERE pm.meta_key = %s - AND pm.meta_value LIKE %s - ", $this->barcode_meta_key, '%'.$filter['barcode'].'%' ), - ARRAY_N - ); + private function prefix_query( $prefix, $term, \WP_Query $wp_query){ + // store original meta_query + $meta_query = $wp_query->get( 'meta_query' ); + $tax_query = $wp_query->get( 'tax_query' ); + + // featured + if($prefix == 'featured'){ + $meta_query[] = array( + 'key' => '_featured', + 'value' => $term == 'true' ? 'yes' : 'no', + 'compare' => '=' + ); + } + + // sku + if($prefix == 'sku'){ + $meta_query[] = array( + 'key' => '_sku', + 'value' => $term, + 'compare' => 'LIKE' + ); + } - if($result){ - $ids = call_user_func_array('array_merge', $result); - $where .= " AND ID IN (" . implode( ',', array_unique($ids) ) . ")"; - } else { - // no matches - $where .= " AND 1=0"; - } + // barcode + if($prefix == 'barcode'){ + $meta_query[] = array( + 'key' => $this->barcode_meta_key, + 'value' => $term, + 'compare' => 'LIKE' + ); + } + // on_sale + if($prefix == 'on_sale'){ + $sale_ids = array_filter( wc_get_product_ids_on_sale() ); + if($term == 'true'){ + $include = isset($wp_query->query['post__in']) ? $wp_query->query['post__in'] : array(); + $wp_query->set( 'post__in', array_merge($include, $sale_ids) ); + } else { + $exclude = isset($wp_query->query['post__not_in']) ? $wp_query->query['post__not_in'] : array(); + $wp_query->set( 'post__not_in', array_merge($exclude, $sale_ids) ); } + } + // categories and cat (abbr) + if($prefix == 'categories' || $prefix == 'cat'){ + $tax_query[] = array( + 'taxonomy' => 'product_cat', + 'field' => 'slug', + 'terms' => array( $term ) + ); } - return $where; + $wp_query->set('meta_query', $meta_query); + $wp_query->set('tax_query', $tax_query); + } /** diff --git a/includes/products/visibility.php b/includes/products/visibility.php index eb99eb89..23115519 100644 --- a/includes/products/visibility.php +++ b/includes/products/visibility.php @@ -27,9 +27,9 @@ public function __construct() { 'online_only' => __( 'Online Only', 'woocommerce-pos' ) ); + add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 ); add_filter( 'posts_where', array( $this, 'posts_where' ), 10 , 2 ); add_filter( 'views_edit-product', array( $this, 'pos_visibility_filters' ), 10, 1 ); - add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 ); add_action( 'bulk_edit_custom_box', array( $this, 'bulk_edit' ), 10, 2 ); add_action( 'quick_edit_custom_box', array( $this, 'quick_edit'), 10, 2 ); add_action( 'save_post', array( $this, 'save_post' ), 10, 2 ); diff --git a/package.json b/package.json index 72c96209..51f723e1 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "scripts": { "test": "grunt test", "dev": "grunt dev", - "deploy": "grunt deploy" + "deploy": "grunt deploy", + "clean-install": "bash tests/integration/php/bin/install.sh", + "test-php-integration": "phpunit -c tests/integration/php/phpunit.xml" }, "repository": { "type": "git", diff --git a/tests/integration/php/bin/install.sh b/tests/integration/php/bin/install.sh new file mode 100644 index 00000000..09f76b1b --- /dev/null +++ b/tests/integration/php/bin/install.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +DB_NAME=${1-woopos_integration_tests} +DB_USER=${2-root} +DB_PASS=${2-root} + +if [ -f ../../../wp-config.php ]; then + rm -f ../../../wp-config.php; +fi + +# create database +mysqladmin -f drop $DB_NAME || true +mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS" || true + +wp core config --dbname=$DB_NAME --dbuser=$DB_USER --dbpass=$DB_USER --extra-php <query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rates"); $wpdb->query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations"); - $file = \WC_POS\PLUGIN_PATH . 'tests/data/sample_tax_rates.csv'; - $delimiter = ','; + $taxes = array( + array('GB','*','*','*','20.0000','VAT',1,1,1,''), + array('GB','*','*','*','5.0000','VAT',1,1,1,'reduced-rate'), + array('GB','*','*','*','0.0000','VAT',1,1,1,'zero-rate'), + array('US','*','*','*','10.0000','US',1,1,1,''), + array('US','AL','12345; 123456','*','2.0000','US AL',2,1,1,'') + ); $loop = 0; - if ( ( $handle = fopen( $file, "r" ) ) !== false ) { - $header = fgetcsv( $handle, 0, $delimiter ); - if ( 10 === sizeof( $header ) ) { - while ( ( $row = fgetcsv( $handle, 0, $delimiter ) ) !== false ) { - list( $country, $state, $postcode, $city, $rate, $name, $priority, $compound, $shipping, $class ) = $row; - $tax_rate = array( - 'tax_rate_country' => $country, - 'tax_rate_state' => $state, - 'tax_rate' => $rate, - 'tax_rate_name' => $name, - 'tax_rate_priority' => $priority, - 'tax_rate_compound' => $compound ? 1 : 0, - 'tax_rate_shipping' => $shipping ? 1 : 0, - 'tax_rate_order' => $loop ++, - 'tax_rate_class' => $class - ); - $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); - WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, wc_clean( $postcode ) ); - WC_Tax::_update_tax_rate_cities( $tax_rate_id, wc_clean( $city ) ); - } - } - fclose( $handle ); + + foreach ( $taxes as $tax ) { + list( $country, $state, $postcode, $city, $rate, $name, $priority, $compound, $shipping, $class ) = $tax; + $tax_rate = array( + 'tax_rate_country' => $country, + 'tax_rate_state' => $state, + 'tax_rate' => $rate, + 'tax_rate_name' => $name, + 'tax_rate_priority' => $priority, + 'tax_rate_compound' => $compound ? 1 : 0, + 'tax_rate_shipping' => $shipping ? 1 : 0, + 'tax_rate_order' => $loop ++, + 'tax_rate_class' => $class + ); + $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); + WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, wc_clean( $postcode ) ); + WC_Tax::_update_tax_rate_cities( $tax_rate_id, wc_clean( $city ) ); } + } /** @@ -81,6 +82,10 @@ private function import_dummy_tax(){ */ public function shutdown(){ switch_theme('twentyfifteen', 'twentyfifteen'); + update_option('active_plugins', array( + 'woocommerce-pos/woocommerce-pos.php', + 'woocommerce/woocommerce.php' + )); } } diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index 4a2b45e0..d1b3b8f4 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -27,23 +27,26 @@ public function setUp() { } /** - * Helper functions + * @return mixed */ - private function log_in_user(){ - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce-pos-test/index.php', - 'woocommerce/woocommerce.php' - )); - update_option('woocommerce_pos_test_logged_in_user', 1); + private function get_random_product_id() { + $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); + $data = $response->json(); + $key = array_rand( $data['products'] ); + return $data['products'][$key]['id']; } - private function log_out_user(){ - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce/woocommerce.php' - )); - delete_option('woocommerce_pos_test_logged_in_user'); + /** + * @param int $length + * @return string + */ + private function generate_random_string($length=10) { + $string = ''; + $characters = "ABCDEFHJKLMNPRTVWXYZabcdefghijklmnopqrstuvwxyz"; + for ($p = 0; $p < $length; $p++) { + $string .= $characters[mt_rand(0, strlen($characters)-1)]; + } + return $string; } /** @@ -185,10 +188,12 @@ public function test_pos_only_products(){ // delete POS visibility setting delete_post_meta($product['id'], '_pos_visibility'); + update_option( $option_key, array('pos_only_products' => false) ); + } /** - * TODO: get_product in WC REST API does not trigger posts_where filter + * */ public function test_online_only_products(){ @@ -197,154 +202,382 @@ public function test_online_only_products(){ update_option( $option_key, array('pos_only_products' => true) ); // get random product - $response = $this->client->get(); - $data = $response->json(); - $product = $data['products'][ array_rand( $data['products'] ) ]; + $product_id = $this->get_random_product_id(); // set to POS only - update_post_meta($product['id'], '_pos_visibility', 'online_only'); + update_post_meta($product_id, '_pos_visibility', 'online_only'); // get all product ids - $this->log_in_user(); - $response = $this->client->get('', [ - 'query' => [ - 'filter[fields]' => 'id', - 'filter[limit]'=> '-1' - ] - ]); - $this->log_out_user(); - $this->assertNotContains( $product['id'], $response->json() ); - - // get single product via API -// $response = $this->client->get($product['id']); -// $data = $response->json(); -// $this->assertEmpty($data['product']); + $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); + $data = $response->json(); + $this->assertGreaterThan(10, count($data['products'])); + $ids = wp_list_pluck( $data['products'], 'id' ); + $this->assertNotContains( $product_id, $ids ); // get product via website $client = new Client(); $response = $client->get( get_home_url(), array( 'query' => array( - 'p' => $product['id'] + 'p' => $product_id ), 'exceptions' => false )); $this->assertEquals(200, $response->getStatusCode()); // delete POS visibility setting - delete_post_meta($product['id'], '_pos_visibility'); + delete_post_meta($product_id, '_pos_visibility'); + update_option( $option_key, array('pos_only_products' => false) ); + } /** * */ - public function test_barcode_filter(){ - $sku = 'SKU-12345'; - - // update product sku - update_post_meta(40, '_sku', $sku); - update_post_meta(41, '_sku', 'foo'); - update_post_meta(42, '_sku', 'bar'); +// public function test_barcode_filter(){ +// $sku = 'SKU-12345'; +// +// // update product sku +// update_post_meta(40, '_sku', $sku); +// update_post_meta(41, '_sku', 'foo'); +// update_post_meta(42, '_sku', 'bar'); +// +// // search for barcode +// $response = $this->client->get('', [ +// 'query' => [ +// 'filter[barcode]' => $sku +// ] +// ]); +// +// // should return one product +// $this->assertEquals(200, $response->getStatusCode()); +// $data = $response->json(); +// $this->assertArrayHasKey('products', $data); +// $this->assertCount(1, $data['products']); +// +// $product = $data['products'][0]; +// $this->assertEquals(40, $product['id']); +// $this->assertEquals($sku, $product['barcode']); +// +// // variations should be present +// $this->assertCount(2, $product['variations']); +// +// // delete product sku +// delete_post_meta(40, '_sku'); +// delete_post_meta(41, '_sku'); +// delete_post_meta(42, '_sku'); +// +// } +// +// /** +// * +// */ +// public function test_partial_barcode_filter(){ +// $sku = 'SKU-12345'; +// +// // update product sku +// update_post_meta(40, '_sku', $sku); +// update_post_meta(41, '_sku', 'foo'); +// update_post_meta(42, '_sku', 'bar'); +// +// // search for barcode +// $response = $this->client->get('', [ +// 'query' => [ +// 'filter[barcode]' => '123' +// ] +// ]); +// +// // should return one product +// $this->assertEquals(200, $response->getStatusCode()); +// $data = $response->json(); +// $this->assertArrayHasKey('products', $data); +// $this->assertCount(1, $data['products']); +// +// $product = $data['products'][0]; +// $this->assertEquals(40, $product['id']); +// $this->assertEquals($sku, $product['barcode']); +// +// // variations should be present +// $this->assertCount(2, $product['variations']); +// +// // delete product sku +// delete_post_meta(40, '_sku'); +// delete_post_meta(41, '_sku'); +// delete_post_meta(42, '_sku'); +// +// } +// +// /** +// * +// */ +// public function test_variation_barcode_filter(){ +// $sku = 'SKU-12345'; +// +// // update product sku +// update_post_meta(40, '_sku', 'foo'); +// update_post_meta(41, '_sku', $sku); +// +// // search for barcode +// $response = $this->client->get('', [ +// 'query' => [ +// 'filter[barcode]' => $sku +// ] +// ]); +// +// // should return the parent product +// $this->assertEquals(200, $response->getStatusCode()); +// $data = $response->json(); +// $this->assertArrayHasKey('products', $data); +// $this->assertCount(1, $data['products']); +// +// $product = $data['products'][0]; +// $this->assertEquals(40, $product['id']); +// +// // variations should be present +// $this->assertCount(2, $product['variations']); +// +// // update product sku +// delete_post_meta(40, '_sku'); +// delete_post_meta(41, '_sku'); +// +// } - // search for barcode + /** + * + */ + public function test_title_search(){ $response = $this->client->get('', [ - 'query' => [ - 'filter[barcode]' => $sku - ] + 'query' => array( + 'filter[q]' => 'prem' + ) ]); - // should return one product $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('products', $data); - $this->assertCount(1, $data['products']); - - $product = $data['products'][0]; - $this->assertEquals(40, $product['id']); - $this->assertEquals($sku, $product['barcode']); - - // variations should be present - $this->assertCount(2, $product['variations']); - - // delete product sku - delete_post_meta(40, '_sku'); - delete_post_meta(41, '_sku'); - delete_post_meta(42, '_sku'); + $this->assertCount(2, $data['products']); + $this->assertEquals('Premium Quality', $data['products'][0]['title']); + $this->assertEquals('Premium Quality', $data['products'][1]['title']); } /** * */ - public function test_partial_barcode_filter(){ - $sku = 'SKU-12345'; + public function test_featured_search(){ + + global $wpdb; + $wpdb->update($wpdb->postmeta, array('meta_value' => 'no'), array('meta_key' => '_featured')); + + $response = $this->client->get('', [ + 'query' => array( + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'featured', + 'query' => 'true' + ) + ) + ) + ]); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertCount(0, $data['products']); - // update product sku - update_post_meta(40, '_sku', $sku); - update_post_meta(41, '_sku', 'foo'); - update_post_meta(42, '_sku', 'bar'); + // add _featured + $product_id = $this->get_random_product_id(); + update_post_meta($product_id, '_featured', 'yes'); - // search for barcode $response = $this->client->get('', [ - 'query' => [ - 'filter[barcode]' => '123' - ] + 'query' => array( + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'featured', + 'query' => 'true' + ) + ) + ) ]); - // should return one product $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('products', $data); $this->assertCount(1, $data['products']); - $product = $data['products'][0]; - $this->assertEquals(40, $product['id']); - $this->assertEquals($sku, $product['barcode']); + $this->assertEquals($product_id, $data['products'][0]['id']); + + // remove _featured + update_post_meta($product_id, '_featured', 'no'); + + } + + public function test_sku_search(){ + $sku = $this->generate_random_string(); + $product_id = $this->get_random_product_id(); + update_post_meta($product_id, '_sku', $sku); - // variations should be present - $this->assertCount(2, $product['variations']); + $response = $this->client->get('', [ + 'query' => array( + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'sku', + 'query' => substr($sku, 0, 6) + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertCount(1, $data['products']); + $this->assertEquals($product_id, $data['products'][0]['id']); + $this->assertEquals($sku, $data['products'][0]['sku']); + $this->assertEquals($sku, $data['products'][0]['barcode']); - // delete product sku - delete_post_meta(40, '_sku'); - delete_post_meta(41, '_sku'); - delete_post_meta(42, '_sku'); + delete_post_meta($product_id, '_sku'); } - /** - * - */ - public function test_variation_barcode_filter(){ - $sku = 'SKU-12345'; + public function test_barcode_search(){ + $barcode = $this->generate_random_string(); + $product_id = $this->get_random_product_id(); + update_post_meta($product_id, '_sku', $barcode); - // update product sku - update_post_meta(40, '_sku', 'foo'); - update_post_meta(41, '_sku', $sku); +// todo: why doesn't this work? +// add_filter('woocommerce_pos_barcode_meta_key', function(){ +// return '_barcode'; +// }); - // search for barcode $response = $this->client->get('', [ - 'query' => [ - 'filter[barcode]' => $sku - ] + 'query' => array( + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'barcode', + 'query' => substr($barcode, 0, 6) + ) + ) + ) ]); - // should return the parent product $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('products', $data); $this->assertCount(1, $data['products']); + $this->assertEquals($product_id, $data['products'][0]['id']); + $this->assertEquals($barcode, $data['products'][0]['barcode']); - $product = $data['products'][0]; - $this->assertEquals(40, $product['id']); + delete_post_meta($product_id, '_sku'); + + } + + public function test_on_sale_search() { + + // on_sale = true + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'on_sale', + 'query' => 'true' + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertGreaterThan(1, count($data['products'])); + + $on_sale = wp_list_pluck( $data['products'], 'on_sale' ); + $this->assertEquals([true], array_unique($on_sale)); + + // on_sale = false + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'on_sale', + 'query' => 'false' + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertGreaterThan(1, count($data['products'])); + + $on_sale = wp_list_pluck( $data['products'], 'on_sale' ); + $this->assertEquals([false], array_unique($on_sale)); + + } + + public function test_categories_search() { + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[category]' => 'music' + ) + ]); + $music_category = $response->json(); - // variations should be present - $this->assertCount(2, $product['variations']); + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'categories', + 'query' => 'Music' + ) + ) + ) + ]); - // update product sku - delete_post_meta(40, '_sku'); - delete_post_meta(41, '_sku'); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertEquals($music_category, $data); } - + public function test_cat_search() { + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[category]' => 't-shirts' + ) + ]); + $music_category = $response->json(); + + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'cat', + 'query' => 'T-Shirts' + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + + $this->assertEquals($music_category, $data); + } } \ No newline at end of file diff --git a/tests/unit/js/spec/entities/orders/model.spec.js b/tests/unit/js/spec/entities/orders/model.spec.js index 0a5d995c..e64fad28 100644 --- a/tests/unit/js/spec/entities/orders/model.spec.js +++ b/tests/unit/js/spec/entities/orders/model.spec.js @@ -51,7 +51,7 @@ describe('entities/orders/model.js', function () { it('should not change order on export (adds local _state)', function(){ var model = new OrderModel( dummy_order.order, { parse: true } ); - expect( model.toJSON() ).to.eql( dummy_order.order ); + expect( _.extend( {_state: undefined}, model.toJSON() ) ).to.eql( dummy_order.order ); }); it('should parse line_items, shipping_lines and fee_lines into a Cart collection (if isEditable)', function(){ @@ -369,12 +369,19 @@ describe('entities/orders/model.js', function () { it('should return an array of tax rates for a given tax_class', function(){ var model = new OrderModel(); + + //no taxes + model.attachTaxes(); + expect( model.getTaxRates('') ).to.be.undefined; + + // GB taxes model.getSettings = function(name){ if( name === 'tax_rates' ){ return dummy_tax_GB; } }; model.attachTaxes(); + expect( model.getTaxRates('') ).eqls([{ rate_id: '1', rate: '20.0000', @@ -385,6 +392,7 @@ describe('entities/orders/model.js', function () { total: 0, subtotal: 0 }]); + expect( model.getTaxRates('reduced-rate') ).eqls([{ rate_id: '2', rate: '5.0000', From 6c04056df0309f0ae3960dbc2c472392233bc88d Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sun, 27 Mar 2016 22:59:03 +0800 Subject: [PATCH 046/169] improve product search --- includes/api/products.php | 70 +++- .../php/spec/api/test-products.php | 314 +++++++++++------- 2 files changed, 264 insertions(+), 120 deletions(-) diff --git a/includes/api/products.php b/includes/api/products.php index 17619caa..84098e25 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -72,9 +72,9 @@ class Products extends WC_API_Resource { // 'cross_sell_ids', 'parent_id', 'categories', -// 'tags', + 'tags', // 'images', - 'featured_src', +// 'featured_src', // replaced by thumbnail 'attributes', // 'downloads', // 'download_limit', @@ -107,6 +107,7 @@ public function __construct( WC_API_Server $server ) { if( $server->path === $this->base ){ add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) ); + add_filter( 'posts_search', array( $this, 'posts_search'), 10, 2 ); } } @@ -313,6 +314,11 @@ public function pre_get_posts(\WP_Query $wp_query){ private function parse_query_array( array $query, \WP_Query $wp_query){ $type = isset($query['type']) ? $query['type'] : 'string'; + if($type == 'string' && isset($query)){ + $term = isset($query['query']) ? $query['query'] : ''; + $this->string_query($term, $wp_query); + } + if($type == 'prefix' && isset($query['prefix']) && isset($query['query'])){ $prefix = isset($query['prefix']) ? $query['prefix'] : ''; $term = isset($query['query']) ? $query['query'] : ''; @@ -321,12 +327,35 @@ private function parse_query_array( array $query, \WP_Query $wp_query){ } + /** + * @param $term + * @param \WP_Query $wp_query + */ + private function string_query( $term, \WP_Query $wp_query ){ + global $wpdb; + $search_ids = $wpdb->get_col( + $wpdb->prepare(" + SELECT ID + FROM $wpdb->posts + WHERE post_type = 'product' + AND post_status = 'publish' + AND post_title LIKE %s + ", '%' . $term . '%') + ); + $post__in = $wp_query->get('post__in'); + $include = empty($post__in) ? $search_ids : array_intersect($post__in, $search_ids); + if(empty($include)){ + $include = array(0); + } + $wp_query->set( 'post__in', $include ); + } + /** * @param $prefix * @param $term * @param \WP_Query $wp_query */ - private function prefix_query( $prefix, $term, \WP_Query $wp_query){ + private function prefix_query( $prefix, $term, \WP_Query $wp_query ){ // store original meta_query $meta_query = $wp_query->get( 'meta_query' ); $tax_query = $wp_query->get( 'tax_query' ); @@ -362,10 +391,14 @@ private function prefix_query( $prefix, $term, \WP_Query $wp_query){ if($prefix == 'on_sale'){ $sale_ids = array_filter( wc_get_product_ids_on_sale() ); if($term == 'true'){ - $include = isset($wp_query->query['post__in']) ? $wp_query->query['post__in'] : array(); - $wp_query->set( 'post__in', array_merge($include, $sale_ids) ); + $post__in = $wp_query->get('post__in'); + $include = empty($post__in) ? $sale_ids : array_intersect($post__in, $sale_ids); + if(empty($include)){ + $include = array(0); + } + $wp_query->set( 'post__in', $include ); } else { - $exclude = isset($wp_query->query['post__not_in']) ? $wp_query->query['post__not_in'] : array(); + $exclude = $wp_query->get('post__not_in'); $wp_query->set( 'post__not_in', array_merge($exclude, $sale_ids) ); } } @@ -374,7 +407,16 @@ private function prefix_query( $prefix, $term, \WP_Query $wp_query){ if($prefix == 'categories' || $prefix == 'cat'){ $tax_query[] = array( 'taxonomy' => 'product_cat', - 'field' => 'slug', + 'field' => 'name', + 'terms' => array( $term ) + ); + } + + // tags and tag + if($prefix == 'tags' || $prefix == 'tag'){ + $tax_query[] = array( + 'taxonomy' => 'product_tag', + 'field' => 'name', 'terms' => array( $term ) ); } @@ -384,6 +426,20 @@ private function prefix_query( $prefix, $term, \WP_Query $wp_query){ } + /** + * @param $search + * @param \WP_Query $wp_query + * @return string + */ + public function posts_search( $search, \WP_Query $wp_query ){ + global $wpdb; + if(!empty($search)){ + $term = isset($wp_query->query['s']) ? $wp_query->query['s'] : ''; + $search = " AND ($wpdb->posts.post_title LIKE '%$term%')"; + } + return $search; + } + /** * Returns array of all product ids * diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index d1b3b8f4..ea8c9283 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -230,117 +230,6 @@ public function test_online_only_products(){ } - /** - * - */ -// public function test_barcode_filter(){ -// $sku = 'SKU-12345'; -// -// // update product sku -// update_post_meta(40, '_sku', $sku); -// update_post_meta(41, '_sku', 'foo'); -// update_post_meta(42, '_sku', 'bar'); -// -// // search for barcode -// $response = $this->client->get('', [ -// 'query' => [ -// 'filter[barcode]' => $sku -// ] -// ]); -// -// // should return one product -// $this->assertEquals(200, $response->getStatusCode()); -// $data = $response->json(); -// $this->assertArrayHasKey('products', $data); -// $this->assertCount(1, $data['products']); -// -// $product = $data['products'][0]; -// $this->assertEquals(40, $product['id']); -// $this->assertEquals($sku, $product['barcode']); -// -// // variations should be present -// $this->assertCount(2, $product['variations']); -// -// // delete product sku -// delete_post_meta(40, '_sku'); -// delete_post_meta(41, '_sku'); -// delete_post_meta(42, '_sku'); -// -// } -// -// /** -// * -// */ -// public function test_partial_barcode_filter(){ -// $sku = 'SKU-12345'; -// -// // update product sku -// update_post_meta(40, '_sku', $sku); -// update_post_meta(41, '_sku', 'foo'); -// update_post_meta(42, '_sku', 'bar'); -// -// // search for barcode -// $response = $this->client->get('', [ -// 'query' => [ -// 'filter[barcode]' => '123' -// ] -// ]); -// -// // should return one product -// $this->assertEquals(200, $response->getStatusCode()); -// $data = $response->json(); -// $this->assertArrayHasKey('products', $data); -// $this->assertCount(1, $data['products']); -// -// $product = $data['products'][0]; -// $this->assertEquals(40, $product['id']); -// $this->assertEquals($sku, $product['barcode']); -// -// // variations should be present -// $this->assertCount(2, $product['variations']); -// -// // delete product sku -// delete_post_meta(40, '_sku'); -// delete_post_meta(41, '_sku'); -// delete_post_meta(42, '_sku'); -// -// } -// -// /** -// * -// */ -// public function test_variation_barcode_filter(){ -// $sku = 'SKU-12345'; -// -// // update product sku -// update_post_meta(40, '_sku', 'foo'); -// update_post_meta(41, '_sku', $sku); -// -// // search for barcode -// $response = $this->client->get('', [ -// 'query' => [ -// 'filter[barcode]' => $sku -// ] -// ]); -// -// // should return the parent product -// $this->assertEquals(200, $response->getStatusCode()); -// $data = $response->json(); -// $this->assertArrayHasKey('products', $data); -// $this->assertCount(1, $data['products']); -// -// $product = $data['products'][0]; -// $this->assertEquals(40, $product['id']); -// -// // variations should be present -// $this->assertCount(2, $product['variations']); -// -// // update product sku -// delete_post_meta(40, '_sku'); -// delete_post_meta(41, '_sku'); -// -// } - /** * */ @@ -358,6 +247,19 @@ public function test_title_search(){ $this->assertEquals('Premium Quality', $data['products'][0]['title']); $this->assertEquals('Premium Quality', $data['products'][1]['title']); + + $response = $this->client->get('', [ + 'query' => array( + 'filter[q]' => 'libero', + 'filter[fields]' => 'title' + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertCount(0, $data['products']); + } /** @@ -412,6 +314,9 @@ public function test_featured_search(){ } + /** + * + */ public function test_sku_search(){ $sku = $this->generate_random_string(); $product_id = $this->get_random_product_id(); @@ -441,6 +346,9 @@ public function test_sku_search(){ } + /** + * + */ public function test_barcode_search(){ $barcode = $this->generate_random_string(); $product_id = $this->get_random_product_id(); @@ -474,6 +382,9 @@ public function test_barcode_search(){ } + /** + * + */ public function test_on_sale_search() { // on_sale = true @@ -522,6 +433,9 @@ public function test_on_sale_search() { } + /** + * + */ public function test_categories_search() { $response = $this->client->get('', [ 'query' => array( @@ -551,11 +465,18 @@ public function test_categories_search() { $this->assertEquals($music_category, $data); } + /** + * + */ public function test_cat_search() { + // update to a two word category + $term = get_term_by('slug', 'posters', 'product_cat'); + wp_update_term($term->term_id, 'product_cat', array('name' => 'Woo Posters')); + $response = $this->client->get('', [ 'query' => array( 'limit' => -1, - 'filter[category]' => 't-shirts' + 'filter[category]' => 'posters' ) ]); $music_category = $response->json(); @@ -567,7 +488,7 @@ public function test_cat_search() { array( 'type' => 'prefix', 'prefix' => 'cat', - 'query' => 'T-Shirts' + 'query' => 'woo posters' ) ) ) @@ -578,6 +499,173 @@ public function test_cat_search() { $this->assertArrayHasKey('products', $data); $this->assertEquals($music_category, $data); + wp_update_term($term->term_id, 'product_cat', array('name' => 'Posters')); + + } + + /** + * + */ + public function test_tag_search() { + $tag = $this->generate_random_string(); + $term = wp_insert_term($tag, 'product_tag'); + $product_id = $this->get_random_product_id(); + wp_set_object_terms( $product_id, $tag, 'product_tag' ); + + + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[tag]' => $tag + ) + ]); + $tagged_product = $response->json(); + + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'tag', + 'query' => $tag + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertEquals($tagged_product, $data); + + wp_remove_object_terms( $product_id, $tag, 'product_tag' ); + wp_delete_term( $term['term_id'], 'product_tag' ); + } + + /** + * + */ + public function test_title_and_cat_search(){ + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[category]' => 'posters', + 'filter[q]' => 'ninja' + ) + ]); + $ninja_posters = $response->json(); + + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'cat', + 'query' => 'posters' + ), + array( + 'type' => 'string', + 'query' => 'ninja' + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertEquals($ninja_posters, $data); + + } + + /** + * + */ + public function test_title_and_title_search() { + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => 'woo ninja' + ) + ]); + $woo_ninja = $response->json(); + + $response = $this->client->get('', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'string', + 'query' => 'woo' + ), + array( + 'type' => 'string', + 'query' => 'ninja' + ) + ) + ) + ]); + + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertEquals($woo_ninja, $data); + } + + /** + * + */ + public function test_prefix_and_title_search() { + $response = $this->client->get( '', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'string', + 'query' => 'woo' + ), + array( + 'type' => 'prefix', + 'prefix' => 'on_sale', + 'query' => 'true' + ) + ) + ) + ] ); + + $this->assertEquals( 200, $response->getStatusCode() ); + $data = $response->json(); + $this->assertArrayHasKey( 'products', $data ); + $this->assertCount(2, $data['products']); + + $response = $this->client->get( '', [ + 'query' => array( + 'limit' => -1, + 'filter[q]' => array( + array( + 'type' => 'string', + 'query' => 'woo' + ), + array( + 'type' => 'string', + 'query' => 'ninja' + ), + array( + 'type' => 'prefix', + 'prefix' => 'on_sale', + 'query' => 'false' + ) + ) + ) + ] ); + + $this->assertEquals( 200, $response->getStatusCode() ); + $data = $response->json(); + $this->assertArrayHasKey( 'products', $data ); + $this->assertCount(3, $data['products']); + } } \ No newline at end of file From c94338301708a442c758b516c3803ffbe3228910 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Mon, 4 Apr 2016 20:55:37 +0800 Subject: [PATCH 047/169] allow 'Any ...' variations --- assets/css/src/scss/partials/_cart.scss | 11 ++ assets/css/src/scss/partials/_list.scss | 25 +++- assets/css/src/scss/partials/_main.scss | 2 +- assets/css/src/scss/partials/_modal.scss | 5 + assets/css/src/scss/partials/_products.scss | 19 ++- assets/css/src/scss/partials/_reboot.scss | 2 +- assets/js/src/apps/pos/cart/route.js | 1 + assets/js/src/apps/pos/cart/views/customer.js | 3 +- .../apps/pos/cart/views/line/views/item.js | 4 +- .../js/src/apps/pos/products/views/actions.js | 14 +- .../apps/pos/products/views/item/layout.js | 37 ++--- .../views/item/views/drawer/variations.js | 35 +---- .../views/item/views/popover/variations.js | 82 +++++------ .../pos/products/views/item/views/product.js | 52 +++---- assets/js/src/entities/cart/models/product.js | 4 +- assets/js/src/entities/orders/collection.js | 9 +- assets/js/src/entities/orders/model.js | 10 +- .../src/entities/products/models/variable.js | 10 +- .../js/src/entities/variations/collection.js | 62 ++++---- assets/js/src/entities/variations/model.js | 36 +++-- assets/js/src/lib/behaviors/toggle.js | 41 ++++++ .../lib/components/modal/header/header.hbs | 3 + .../src/lib/components/modal/header/view.js | 8 +- assets/js/src/lib/components/modal/layout.js | 3 + assets/js/src/lib/config/dual-collection.js | 33 ++--- .../js/src/lib/config/filtered-collection.js | 27 +++- .../js/src/lib/config/infinite-list-view.js | 5 +- includes/activator.php | 44 ++---- includes/admin.php | 18 ++- includes/api/products.php | 11 ++ includes/views/pos/cart/tmpl-item.php | 2 +- includes/views/pos/products/tmpl-product.php | 26 ++-- tests/integration/php/bootstrap.php | 14 +- tests/integration/php/framework/testcase.php | 113 ++++++++++++++ .../php/spec/api/test-customers.php | 49 ++----- .../integration/php/spec/api/test-orders.php | 71 +++------ .../php/spec/api/test-products.php | 138 ++++++++---------- .../php/spec/api/test-variations.php | 9 ++ .../integration/php/spec/test-activation.php | 39 +---- tests/integration/php/spec/test-api.php | 38 +++++ tests/integration/php/spec/test-rest.php | 31 ---- .../entities/variations/collection.spec.js | 41 ++++-- .../js/spec/entities/variations/model.spec.js | 4 +- 43 files changed, 672 insertions(+), 519 deletions(-) create mode 100644 assets/js/src/lib/behaviors/toggle.js create mode 100644 tests/integration/php/framework/testcase.php create mode 100644 tests/integration/php/spec/api/test-variations.php create mode 100644 tests/integration/php/spec/test-api.php delete mode 100644 tests/integration/php/spec/test-rest.php diff --git a/assets/css/src/scss/partials/_cart.scss b/assets/css/src/scss/partials/_cart.scss index 513d2d44..dda0278e 100644 --- a/assets/css/src/scss/partials/_cart.scss +++ b/assets/css/src/scss/partials/_cart.scss @@ -158,6 +158,17 @@ cart { display: inline-block; } + // meta + ul.meta { + list-style: none; + padding: 0; + margin: 0; + font-size: $font-size-sm; + strong { + font-weight: 600; + } + } + // drawer btn a { position: absolute; diff --git a/assets/css/src/scss/partials/_list.scss b/assets/css/src/scss/partials/_list.scss index 83c28cad..b9dd6514 100644 --- a/assets/css/src/scss/partials/_list.scss +++ b/assets/css/src/scss/partials/_list.scss @@ -44,13 +44,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 { @@ -79,9 +79,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; + } + } + } @@ -106,7 +112,6 @@ list { > div { @include flex(1); padding: $list-header-padding-y $list-header-padding-x; - } } @@ -176,6 +181,10 @@ list { background: #fff; } + .empty { + padding: $list-item-padding-y $list-item-drawer-padding-x; + } + } @@ -332,7 +341,6 @@ list { background: $list-actions-background; > div { - border-top: 2px solid $input-border-color; padding: $list-actions-padding-y $list-actions-padding-x; text-align: right; @@ -354,8 +362,11 @@ list { border-top: 0; } - } + &:not(:first-of-type) { + border-top: 2px solid $input-border-color; + } + } } } \ No newline at end of file diff --git a/assets/css/src/scss/partials/_main.scss b/assets/css/src/scss/partials/_main.scss index 7ddd3f41..7e6d5199 100644 --- a/assets/css/src/scss/partials/_main.scss +++ b/assets/css/src/scss/partials/_main.scss @@ -46,7 +46,7 @@ main { height: 100%; > section { - @include flex(1); + @include flex(1 0 380px); height: 100%; } diff --git a/assets/css/src/scss/partials/_modal.scss b/assets/css/src/scss/partials/_modal.scss index 85751691..45289b40 100644 --- a/assets/css/src/scss/partials/_modal.scss +++ b/assets/css/src/scss/partials/_modal.scss @@ -246,6 +246,11 @@ modal { } } + .#{current-module()}-fullscreen { + max-width: inherit; + height: 100%; + } + // keyframes @include keyframes($modal-fade-in-name) { 0% { opacity: 0; } diff --git a/assets/css/src/scss/partials/_products.scss b/assets/css/src/scss/partials/_products.scss index 9e49b839..26483bb1 100644 --- a/assets/css/src/scss/partials/_products.scss +++ b/assets/css/src/scss/partials/_products.scss @@ -11,7 +11,7 @@ products { } .drawer-open { .close-all { - display: block; + display: inline-block; } .expand-all { display: none; @@ -68,11 +68,26 @@ products { } .title { - @include flex(1); + //min-width: 1px; /* layout hack, force ul to overflow */ 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 { diff --git a/assets/css/src/scss/partials/_reboot.scss b/assets/css/src/scss/partials/_reboot.scss index a685c60c..b192cec3 100644 --- a/assets/css/src/scss/partials/_reboot.scss +++ b/assets/css/src/scss/partials/_reboot.scss @@ -67,7 +67,7 @@ dl { dt { font-weight: normal; float: left; - padding-right: 5px; + padding-right: $padding-base-horizontal; clear: left; font-weight: 600; } diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index e4b45179..30ea4123 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -52,6 +52,7 @@ var CartRoute = Route.extend({ fetch: function() { return this.collection.fetch({ remote: false, + fullSync: false, index: { keyPath: '_state', value: this.collection.states.create diff --git a/assets/js/src/apps/pos/cart/views/customer.js b/assets/js/src/apps/pos/cart/views/customer.js index 54945162..c902c7f2 100644 --- a/assets/js/src/apps/pos/cart/views/customer.js +++ b/assets/js/src/apps/pos/cart/views/customer.js @@ -94,7 +94,8 @@ var View = View.extend({ this.customersRegion.currentView.moveFocus(e.which); }, - removeCustomer: function(){ + removeCustomer: function(e){ + e.preventDefault(); this.saveCustomer( this.getOption('guest') ); }, diff --git a/assets/js/src/apps/pos/cart/views/line/views/item.js b/assets/js/src/apps/pos/cart/views/line/views/item.js index 55502fa2..bb62491a 100644 --- a/assets/js/src/apps/pos/cart/views/line/views/item.js +++ b/assets/js/src/apps/pos/cart/views/line/views/item.js @@ -73,13 +73,13 @@ module.exports = FormView.extend({ '*[data-name="method_title"]' : {observe: 'method_title' }, '*[data-name="title"]' : { observe: 'title' }, - 'dl.meta': { + 'ul.meta': { observe: 'meta', updateMethod: 'html', onGet: function(val){ var row = ''; _.each(val, function(meta){ - row += '
                  ' + meta.label + ':
                  ' + meta.value + '
                  '; + row += '
                • ' + meta.label + ': ' + meta.value + '
                  • '; }); return row; } diff --git a/assets/js/src/apps/pos/products/views/actions.js b/assets/js/src/apps/pos/products/views/actions.js index 51582c1a..f00afab8 100644 --- a/assets/js/src/apps/pos/products/views/actions.js +++ b/assets/js/src/apps/pos/products/views/actions.js @@ -11,7 +11,7 @@ var Actions = View.extend({ initialize: function(){ var products = this.collection; - var self = this; + // var self = this; /** * match:barcode is triggered before filter is complete @@ -19,10 +19,10 @@ var Actions = View.extend({ * todo: refactor and fix this */ this.listenTo(products, 'match:barcode', function(model){ - products.once('paginated:change:page', function(){ - self.triggerMethod('clear'); - self.ui.searchField.blur(); - }); + // products.once('paginated:change:page', function(){ + // self.triggerMethod('clear'); + // self.ui.searchField.blur(); + // }); Radio.request('router', 'add:to:cart', model); }); }, @@ -51,6 +51,10 @@ var Actions = View.extend({ searchField : 'input[type=search]' }, + onRender: function(){ + this.ui.searchField.attr('placeholder', this.ui.searchBtn.text()); + }, + onDropdownSelect: function(e){ if( $(e.currentTarget).data('action') === 'barcode' ){ return this.barcodeModeOn(); diff --git a/assets/js/src/apps/pos/products/views/item/layout.js b/assets/js/src/apps/pos/products/views/item/layout.js index 556de294..7921e47a 100644 --- a/assets/js/src/apps/pos/products/views/item/layout.js +++ b/assets/js/src/apps/pos/products/views/item/layout.js @@ -1,7 +1,7 @@ var App = require('lib/config/application'); var LayoutView = require('lib/config/layout-view'); var Product = require('./views/product'); -var Variations = require('./views/drawer/variations'); +var DrawerView = require('./views/drawer/variations'); /** * @todo Abstract ListItemView @@ -33,46 +33,31 @@ var Layout = LayoutView.extend({ this.listenTo( view, { 'open:drawer' : this.openDrawer, - 'close:drawer' : this.closeDrawer, - 'toggle:drawer' : this.toggleDrawer + 'close:drawer' : this.closeDrawer }); this.getRegion('item').show(view); }, openDrawer: function(options){ - options = options || {}; - options.model = this.model; - options.className = 'variations'; - var view = new Variations(options); + if(this.getRegion('drawer').currentView){ + return; + } + var variations = this.model.getVariations(); + if(!options.filter){ + variations.resetFilters(); + } + var view = new DrawerView({ collection: variations }); this.getRegion('drawer').show(view); this.$el.addClass('drawer-open'); }, closeDrawer: function(){ var drawer = this.getRegion('drawer'); - - drawer.$el.slideUp( 250, function(){ + drawer.currentView.$el.slideUp( 250, function(){ drawer.empty(); - drawer.$el.show(); }); - this.$el.removeClass('drawer-open'); - }, - - toggleDrawer: function(options){ - var drawer = this.getRegion('drawer'), - open = drawer.hasView(); - - if(open && options.filter){ - return drawer.currentView.filterVariations(options.filter); - } - - if(open){ - this.closeDrawer(); - } else { - this.openDrawer(options); - } } }); diff --git a/assets/js/src/apps/pos/products/views/item/views/drawer/variations.js b/assets/js/src/apps/pos/products/views/item/views/drawer/variations.js index 20c5eae6..3ad4205d 100644 --- a/assets/js/src/apps/pos/products/views/item/views/drawer/variations.js +++ b/assets/js/src/apps/pos/products/views/item/views/drawer/variations.js @@ -1,44 +1,25 @@ var ItemView = require('lib/config/item-view'); var CollectionView = require('lib/config/collection-view'); var Variation = require('./variation'); -var _ = require('lodash'); +var polyglot = require('lib/utilities/polyglot'); var Empty = ItemView.extend({ - tagName: 'li', className: 'empty', - template: 'pos.products.empty' + template: function(){ + return polyglot.t('messages.no-products'); + } }); module.exports = CollectionView.extend({ childView: Variation, emptyView: Empty, - childViewContainer: 'ul', - - initialize: function(options){ - options = options || {}; - - this.collection = this.model.getVariations(); - this.collection.resetFilters(); - this.filterVariations(options.filter); + className: 'variations', + attributes: { + style: 'display:none' // start drawer closed }, onShow: function() { - this.$el.hide().slideDown(250); - }, - - filterVariations: function(filter){ - if(filter){ - filter = filter || {}; - var matchMaker = function(model){ - var attributes = model.get('attributes'); - return _.any(attributes, function(attribute){ - return attribute.name === filter.name && - attribute.option === filter.option; - }); - - }; - this.collection.filterBy('variation', matchMaker); - } + this.$el.slideDown(250); } }); \ No newline at end of file diff --git a/assets/js/src/apps/pos/products/views/item/views/popover/variations.js b/assets/js/src/apps/pos/products/views/item/views/popover/variations.js index 3ae00570..3bc1d1d2 100644 --- a/assets/js/src/apps/pos/products/views/item/views/popover/variations.js +++ b/assets/js/src/apps/pos/products/views/item/views/popover/variations.js @@ -5,13 +5,14 @@ var hbs = require('handlebars'); var _ = require('lodash'); var $ = require('jquery'); var polyglot = require('lib/utilities/polyglot'); +var Radio = require('backbone.radio'); // rough calculation of variation option size -var hasManyOptions = function(variation){ - var opts = variation.options.length, - chars = variation.options.reduce(function(total, opt){ - return total + opt.length; - }, 0); +var hasManyOptions = function(options){ + var opts = options.length, + chars = options.reduce(function(total, opt){ + return total + opt.length; + }, 0); return (opts * 26) + (chars * 5) > 220; }; @@ -22,59 +23,56 @@ var Variations = ItemView.extend({ classes: 'popover-theme-arrows popover-variations' }, - initialize: function(){ - this.collection = this.model.getVariations(); - this.collection.resetFilters(); - }, - templateHelpers: function(){ var data = {}; - data.variations = _.chain( this.model.getVariationOptions() ) - .each(function(variation){ - if(hasManyOptions(variation)){ - variation.select = true; - variation.emptyOption = polyglot.t('messages.choose'); - } - }) - .value(); + data.variations = _.each(this.collection.getVariationOptions(), function(variation){ + if(hasManyOptions(variation.options)){ + variation.select = true; + variation.emptyOption = polyglot.t('messages.choose'); + } + }); return data; }, ui: { - add: '*[data-action="add"]', - btn: '.btn-group .btn', + add : '*[data-action="add"]', + btn : '.btn-group .btn', select: 'select' }, - triggers: { - 'click @ui.add': 'add:to:cart' - }, - events: { 'click @ui.btn' : 'onVariationSelect', - 'change @ui.select' : 'onVariationSelect' + 'change @ui.select' : 'onVariationSelect', + 'click @ui.add' : 'addToCart' }, - onVariationSelect: function(e){ - var target = $(e.currentTarget); - - // toggle - if( target.is('button') ){ - target - .addClass('active') - .siblings('.btn') - .removeClass('active'); + collectionEvents: { + 'reset' : function(){ + this.ui.add.prop('disabled', this.collection.length !== 1); } + }, + + onVariationSelect: function(e){ + e.preventDefault(); + var target = $(e.target); + this.collection.setVariantFilter(target.data('name'), target.val()); + }, - // filter - var name = target.data('name'); - var option = target.val(); - this.collection.filterBy(name, function(model){ - return _.some(model.get('attributes'), function(obj){ - return obj.name === name && obj.option === option; - }); + addToCart: function(){ + var self = this; + var product = this.collection.first().toJSON(); + // special case: array of options + _.each(product.attributes, function(variant){ + if(_.isArray(variant.option)){ + var filter = self.collection.getFilters(variant.name); + if(filter){ + var query = _.find(filter.query, {prefix: 'attributes.option'}); + variant.option = query.query; + } + } }); - this.ui.add.prop('disabled', this.collection.length !== 1); + Radio.request('router', 'add:to:cart', product); + Radio.request('popover', 'close'); } }); diff --git a/assets/js/src/apps/pos/products/views/item/views/product.js b/assets/js/src/apps/pos/products/views/item/views/product.js index 258ec3dd..84486596 100644 --- a/assets/js/src/apps/pos/products/views/item/views/product.js +++ b/assets/js/src/apps/pos/products/views/item/views/product.js @@ -3,6 +3,7 @@ var App = require('lib/config/application'); var $ = require('jquery'); var _ = require('lodash'); var Tooltip = require('lib/behaviors/tooltip'); +var Toggle = require('lib/behaviors/toggle'); var Radio = require('backbone.radio'); var Variations = require('./popover/variations'); @@ -13,14 +14,21 @@ var Item = ItemView.extend({ ui: { add : 'a[data-action="add"]', - vpopover : 'a[data-action="variations"]', - vdrawer : '.title dl.variations dd a' + popover : 'a[data-action="variations"]', + filter : '.title ul.variations li a', + open : 'a[data-action="expand"]', + close : 'a[data-action="close"]', }, events: { - 'click @ui.add' : 'addToCart', - 'click @ui.vpopover' : 'variationsPopover', - 'click @ui.vdrawer' : 'variationsDrawer' + 'click @ui.add' : 'addToCart', + 'click @ui.popover' : 'variationsPopover', + 'click @ui.filter' : 'variationsDrawer' + }, + + triggers: { + 'click @ui.open' : 'open:drawer', + 'click @ui.close' : 'close:drawer toggle:reset' }, modelEvents: { @@ -31,6 +39,9 @@ var Item = ItemView.extend({ Tooltip: { behaviorClass: Tooltip, html: true + }, + Toggle: { + behaviorClass: Toggle } }, @@ -41,39 +52,24 @@ var Item = ItemView.extend({ variationsPopover: function(e){ e.preventDefault(); - - var view = new Variations({ - model: this.model - }); - - this.listenTo(view, 'add:to:cart', function(args){ - var product = args.collection.models[0].toJSON(); - Radio.request('router', 'add:to:cart', product); - Radio.request('popover', 'close'); - }); - + var variations = this.model.getVariations(); + variations.resetFilters(); + this.trigger('toggle:reset'); + var view = new Variations({ collection: variations }); var options = _.extend({ view : view, target : e.target, position : 'right middle' }, view.popover); - Radio.request('popover', 'open', options); }, variationsDrawer: function(e){ e.preventDefault(); - var options = {}; - - var name = $(e.target).data('name'); - if(name){ - options.filter = { - name: name, - option: $(e.target).text() - }; - } - - this.trigger('toggle:drawer', options); + var target = $(e.currentTarget); + var variations = this.model.getVariations(); + variations.setVariantFilter(target.data('name'), target.text()); + this.trigger('open:drawer', {filter: true}); }, templateHelpers: function(){ diff --git a/assets/js/src/entities/cart/models/product.js b/assets/js/src/entities/cart/models/product.js index 4a59d7f3..116fbbdb 100644 --- a/assets/js/src/entities/cart/models/product.js +++ b/assets/js/src/entities/cart/models/product.js @@ -91,9 +91,9 @@ module.exports = Model.extend({ if(attributes.type === 'variation'){ attrs.meta = _.map(attributes.attributes, function(variant, idx){ return { - key: ++idx, + key : ++idx, label: variant.name, - value: variant.option + value: _.isArray(variant.option) ? variant.option.join(', ') : variant.option }; }); } diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index e2f9aaa7..f52be693 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -7,6 +7,13 @@ module.exports = DualCollection.extend({ name: 'orders', - _syncDelayed: false + _syncDelayed: false, + + // search fields + fields: [ + 'billing_address.first_name', + 'billing_address.last_name', + 'billing_address.email' + ] }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 0ba3f2fa..0cdc8f28 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -13,12 +13,6 @@ var Utils = require('lib/utilities/utils'); var OrderModel = DualModel.extend({ name: 'order', - fields: [ - 'customer.first_name', - 'customer.last_name', - 'customer.email' - ], - /** * add tax settings early for use by cart * - always be parsin' @@ -81,6 +75,7 @@ var OrderModel = DualModel.extend({ * Attach cart during parse * - allows order to change status, ie: become editable */ + /* jshint -W071 */ parse: function (resp) { resp = DualModel.prototype.parse.apply(this, arguments); @@ -99,6 +94,7 @@ var OrderModel = DualModel.extend({ return resp; }, + /* jshint +W071 */ /** * Attach cart during parse, allows updates from server @@ -397,6 +393,7 @@ var OrderModel = DualModel.extend({ return title; }, + /* jshint -W071, -W074 */ attachCustomer: function (attributes) { var customers = Radio.request('entities', 'get', 'customers'); if (attributes.customer_id || !customers) { @@ -423,6 +420,7 @@ var OrderModel = DualModel.extend({ }); } } + /* jshint +W071, +W074 */ }); diff --git a/assets/js/src/entities/products/models/variable.js b/assets/js/src/entities/products/models/variable.js index ff0aafc2..7034f625 100644 --- a/assets/js/src/entities/products/models/variable.js +++ b/assets/js/src/entities/products/models/variable.js @@ -1,6 +1,5 @@ var Model = require('./abstract'); var Variations = require('../../variations/collection'); -var _ = require('lodash'); module.exports = Model.extend({ @@ -20,11 +19,10 @@ module.exports = Model.extend({ /** * attach Filtered Collection of variations */ - attachVariations: function( parent ){ - var attributes = _.defaults( parent.variations ); - this.variations = new Variations(attributes, { - title: parent.title, - parent: this // a reference to the parent model + attachVariations: function( attributes ){ + this.variations = new Variations(attributes.variations, { + parent: this, // a reference to the parent model + parentAttrs: attributes }); }, diff --git a/assets/js/src/entities/variations/collection.js b/assets/js/src/entities/variations/collection.js index 4d80b88b..db97210c 100644 --- a/assets/js/src/entities/variations/collection.js +++ b/assets/js/src/entities/variations/collection.js @@ -1,42 +1,41 @@ -var Collection = require('lib/config/collection'); +var FilterCollection = require('lib/config/filtered-collection'); var Model = require('./model'); var _ = require('lodash'); -module.exports = Collection.extend({ +module.exports = FilterCollection.extend({ model: Model, + superset: true, + + initialize: function(models, options){ + options = options || {}; + this.parent = options.parent; + }, + /** * Returns an array of options for the variation collection * - caches on first run */ getVariationOptions: function(){ - if( this._variationOptions ) { - return this._variationOptions; - } - - // pluck all options, eg: - // { Color: ['Black', 'Blue'], Size: ['Small', 'Large'] } - var result = this.pluck('attributes') - .reduce(function(result, attrs){ - _.each(attrs, function(attr){ - if(result[attr.name]){ - return result[attr.name].push(attr.option); - } - result[attr.name] = [attr.option]; - }); - return result; - }, {}); + if( !this._variationOptions ) { - // map options with consistent keys - // { name: 'Color', options: ['Black', 'Blue'] }, - // { name: 'Size', options: ['Small', 'Large'] } - this._variationOptions = _.map(result, function(options, name){ - return { - 'name': name, - 'options': _.uniq( options ) - }; - }); + this._variationOptions = _.chain( this.pluck('attributes') ) + .reduce(function(result, attrs){ + _.each(attrs, function(attr){ + result[attr.name] = result[attr.name] || []; + result[attr.name] = result[attr.name].concat(attr.option); + }); + return result; + }, {}) + .map(function(options, name){ + return { + 'name': name, + 'options': _.uniq( options ) + }; + }) + .value(); + } return this._variationOptions; }, @@ -71,6 +70,15 @@ module.exports = Collection.extend({ max = parseFloat( _(attrs).max() ); } return _.uniq([min, max]); + }, + + setVariantFilter: function(name, option){ + var query = [ + {type: 'prefix', prefix: 'attributes.name', query: name }, + {type: 'prefix', prefix: 'attributes.option', query: option }, + ]; + + this.setFilter(name, query); } }); \ No newline at end of file diff --git a/assets/js/src/entities/variations/model.js b/assets/js/src/entities/variations/model.js index 6f5dbff4..26aad057 100644 --- a/assets/js/src/entities/variations/model.js +++ b/assets/js/src/entities/variations/model.js @@ -1,4 +1,5 @@ var Model = require('lib/config/deep-model'); +var _ = require('lodash'); module.exports = Model.extend({ @@ -10,19 +11,36 @@ module.exports = Model.extend({ stock_quantity: 'number' }, - /** - * Attach parent product, add defaults - */ + defaults: { + type: 'variation' + }, + constructor: function(attributes, options){ + options = _.extend({parse: true}, options); // parse by default + Model.call(this, attributes, options); + }, + + parse: function(data, options){ options = options || {}; - this.parent = options.parent; + var parentAttrs = options.parentAttrs || {}; + if( _.isEmpty(parentAttrs) && this.collection && this.collection.parent ){ + parentAttrs = this.collection.parent.toJSON(); + } + + // use parent title + data.title = parentAttrs.title; - this.defaults = { - type : 'variation', - title : options.title - }; + // special case, empty option + _(data.attributes).chain() + .filter({option: ''}) + .each(function(empty){ + empty.option = _(parentAttrs.attributes).chain() + .find({ name: empty.name, variation: true }) + .get(['options']).value(); + }) + .value(); - Model.apply( this, arguments ); + return data; } }); \ No newline at end of file diff --git a/assets/js/src/lib/behaviors/toggle.js b/assets/js/src/lib/behaviors/toggle.js new file mode 100644 index 00000000..415af72f --- /dev/null +++ b/assets/js/src/lib/behaviors/toggle.js @@ -0,0 +1,41 @@ +var Behavior = require('lib/config/behavior'); +var $ = require('jquery'); +var App = require('lib/config/application'); +var namespace = App.prototype.namespace('buttons'); + +var ToggleBehavior = Behavior.extend({ + + initialize: function(){ + this.listenTo(this.view, 'toggle:reset', this.reset); + }, + + ui: { + buttons: '*[data-toggle="' + namespace + '"]' + }, + + events: { + 'click @ui.buttons': 'onClick' + }, + + onClick: function(e){ + e.preventDefault(); + var target = $(e.target); + var nodeName = e.target.nodeName; + + if(nodeName !== 'A' && nodeName !== 'BUTTON'){ + return; + } + + $(e.currentTarget).find(nodeName).removeClass('active'); + target.addClass('active'); + this.view.trigger('toggle', target); + }, + + reset: function(){ + $('a, button', this.ui.buttons).removeClass('active'); + } + +}); + +module.exports = ToggleBehavior; +App.prototype.set('Behaviors.Toggle', ToggleBehavior); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/header/header.hbs b/assets/js/src/lib/components/modal/header/header.hbs index f32c32f3..a15d66bf 100644 --- a/assets/js/src/lib/components/modal/header/header.hbs +++ b/assets/js/src/lib/components/modal/header/header.hbs @@ -1,6 +1,9 @@

                  {{{title}}}

                  + + fullscreen + {{#if close}} diff --git a/assets/js/src/lib/components/modal/header/view.js b/assets/js/src/lib/components/modal/header/view.js index 2632c658..817b7826 100644 --- a/assets/js/src/lib/components/modal/header/view.js +++ b/assets/js/src/lib/components/modal/header/view.js @@ -21,12 +21,14 @@ module.exports = ItemView.extend({ }, ui: { - close: '[data-action="close"]', - title: 'h4' + close : '[data-action="close"]', + fullscreen : '[data-action="fullscreen"]', + title : 'h4' }, triggers: { - 'click @ui.close': 'action:close' + 'click @ui.close' : 'action:close', + 'click @ui.fullscreen': 'action:fullscreen' }, // helper method to update title diff --git a/assets/js/src/lib/components/modal/layout.js b/assets/js/src/lib/components/modal/layout.js index 9287f198..e23fb1ea 100644 --- a/assets/js/src/lib/components/modal/layout.js +++ b/assets/js/src/lib/components/modal/layout.js @@ -36,6 +36,9 @@ module.exports = LayoutView.extend({ childEvents: { 'action:close' : function(){ Radio.request( 'modal', 'close', this.$el.data().vex.id ); + }, + 'action:fullscreen' : function(){ + this.$el.toggleClass(this.prefix + '-fullscreen'); } }, diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 62d0518f..04ff4d31 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -98,19 +98,26 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ fetchLocal: function (options) { var self = this; options = options || {}; + if(options.fullSync !== false){ + options.fullSync = this.isNew(); + } return IDBCollection.prototype.getBatch.call(this, options) .then(function (response) { if(options.remote === false){ return response; } - if(_.size(response) > 0){ + var createDelayed = self.getDelayed('create', response); + if(_.size(response) > 0 && _.size(response) > createDelayed.length){ return self.fetchDelayed(response); } - if(self.isNew()){ - return self.firstSync(options); - } return self.fetchRemote(options); + }) + .then(function(response){ + if(options.fullSync){ + self.fullSync(); + } + return response; }); }, @@ -182,22 +189,13 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ }); }, - firstSync: function(options){ - var self = this; - return this.fetchRemote(options) - .then(function (response) { - self.fullSync(); - return response; - }); - }, - fullSync: function(options){ return this.fetchRemoteIds(options); }, fetchDelayed: function(response){ var delayed = this.getDelayed('read', response); - if(delayed){ + if(!_.isEmpty(delayed)){ var ids = _.map(delayed, 'id'); return this.fetchRemote({ data: { @@ -222,12 +220,9 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ }, getDelayed: function(state, collection){ - var delayed, _state = this.states[state]; + var _state = this.states[state]; collection = collection || this; - delayed = _.filter(collection, {_state: _state}); - if(!_.isEmpty(delayed)){ - return delayed; - } + return _.filter(collection, {_state: _state}); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js index d2ae3c9e..5024591e 100644 --- a/assets/js/src/lib/config/filtered-collection.js +++ b/assets/js/src/lib/config/filtered-collection.js @@ -3,16 +3,23 @@ var app = require('./application'); var _ = require('lodash'); var Parser = require('query-parser'); var parse = new Parser(); +var matchMaker = require('json-query'); var defaultFilterName = '__default'; module.exports = app.prototype.FilteredCollection = Collection.extend({ constructor: function(){ - this._filters = {}; Collection.apply(this, arguments); + this._filters = {}; + if(this.superset === true){ + this.superset = this.toJSON(); + } }, + matchMaker: matchMaker, + + /* jshint: -W071 -W074 */ setFilter: function (filterName, filter) { if (filter === undefined) { filter = filterName; @@ -27,8 +34,12 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ }; this.trigger('filtered:set'); + if(this.superset){ + return this.supersetFetch(); + } return this.fetch({data: {filter: this.getFilterOptions()}}); }, + /* jshint: +W071 +W074 */ removeFilter: function (filterName) { if (!filterName) { @@ -37,12 +48,18 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ delete this._filters[filterName]; this.trigger('filtered:remove'); + if(this.superset){ + return this.supersetFetch(); + } return this.fetch({data: {filter: this.getFilterOptions()}}); }, resetFilters: function () { this._filters = {}; this.trigger('filtered:reset'); + if(this.superset){ + return this.reset(this.superset); + } return this.fetch(); }, @@ -89,6 +106,14 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ } return queries; + }, + + supersetFetch: function(){ + var self = this; + var models = _.filter(this.superset, function(model){ + return matchMaker(model, self.getFilterQueries(), {fields: self.fields}); + }); + return this.reset(models); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index ac2803c4..63003680 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -1,7 +1,8 @@ var Mn = require('backbone.marionette'); var _ = require('lodash'); +var app = require('./application'); -module.exports = Mn.CompositeView.extend({ +module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ className: 'list-infinite', @@ -35,7 +36,7 @@ module.exports = Mn.CompositeView.extend({ sT = this.container.scrollTop; var down = sT > (this._sT || 0); this._sT = sT; - return down ? sH - cH - sT < 100 : sH - cH - sT === 0; + return down ? sH - cH - sT < 100 : sH - cH - sT <= 0; }, appendNextPage: function () { diff --git a/includes/activator.php b/includes/activator.php index 37582339..ac5c0933 100644 --- a/includes/activator.php +++ b/includes/activator.php @@ -24,17 +24,6 @@ public function __construct() { register_activation_hook( PLUGIN_FILE, array( $this, 'activate' ) ); add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) ); add_action( 'plugins_loaded', array( $this, 'run' ) ); - $this->init(); - } - - /** - * init subclasses - * - WC_POS_Admin_Notices required in cases where WooCommerce POS fails to run - */ - private function init(){ - if( is_admin() && (!defined('DOING_AJAX') || !DOING_AJAX) ){ - new Admin\Notices(); - } } /** @@ -183,15 +172,14 @@ private function woocommerce_check() { if( class_exists( '\WooCommerce' ) && version_compare( WC()->version, self::WC_MIN_VERSION, '>=' ) ) return true; - if( class_exists( 'Admin\Notices' ) ){ - $message = sprintf( - __('WooCommerce POS requires WooCommerce %s or higher. Please install and activate WooCommerce', 'woocommerce-pos' ), - 'http://wordpress.org/plugins/woocommerce/', - self::WC_MIN_VERSION, - admin_url('plugins.php') - ) . ' »'; - Admin\Notices::add( $message ); - } + $message = sprintf( + __('WooCommerce POS requires WooCommerce %s or higher. Please install and activate WooCommerce', 'woocommerce-pos' ), + 'http://wordpress.org/plugins/woocommerce/', + self::WC_MIN_VERSION, + admin_url('plugins.php') + ) . ' »'; + + Admin\Notices::add( $message ); } /** @@ -202,14 +190,13 @@ private function php_check(){ if( version_compare( $php_version, self::PHP_MIN_VERSION, '>' ) ) return true; - if( class_exists( 'Admin\Notices' ) ) { - $message = sprintf( - __('WooCommerce POS requires PHP %s or higher. Read more information about how you can update', 'woocommerce-pos' ), - self::PHP_MIN_VERSION, - 'http://www.wpupdatephp.com/update/' - ) . ' »'; - Admin\Notices::add( $message ); - } + $message = sprintf( + __('WooCommerce POS requires PHP %s or higher. Read more information about how you can update', 'woocommerce-pos' ), + self::PHP_MIN_VERSION, + 'http://www.wpupdatephp.com/update/' + ) . ' »'; + + Admin\Notices::add( $message ); } /** @@ -221,6 +208,7 @@ private function permalink_check(){ if( $fail ){ $message = $fail['message'] . '. '; $message .= sprintf( '%s', $fail['buttons'][0]['href'], $fail['buttons'][0]['prompt'] ) . ' »'; + Admin\Notices::add( $message ); } } diff --git a/includes/admin.php b/includes/admin.php index ce65f1c0..6c54c911 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -1,13 +1,14 @@ -* @link http://www.woopos.com.au -*/ + * WP Admin Class + * conditionally loads classes for WP Admin + * + * @class \WC_POS\Admin + * @package WooCommerce POS + * @author Paul Kilmurray + * @link http://www.woopos.com.au + */ namespace WC_POS; @@ -24,7 +25,8 @@ public function __construct() { /** * Load admin subclasses */ - public function init() { + private function init() { + new Admin\Notices(); new Admin\Menu(); new Admin\Settings(); new Admin\Status(); diff --git a/includes/api/products.php b/includes/api/products.php index 84098e25..44ba53d9 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -360,6 +360,17 @@ private function prefix_query( $prefix, $term, \WP_Query $wp_query ){ $meta_query = $wp_query->get( 'meta_query' ); $tax_query = $wp_query->get( 'tax_query' ); + // id + if($prefix == 'id'){ + $term = (int) $term; + $post__in = $wp_query->get('post__in'); + $include = empty($post__in) ? array($term) : array_intersect($post__in, array($term)); + if(empty($include)){ + $include = array(0); + } + $wp_query->set( 'post__in', $include ); + } + // featured if($prefix == 'featured'){ $meta_query[] = array( diff --git a/includes/views/pos/cart/tmpl-item.php b/includes/views/pos/cart/tmpl-item.php index 67487ae1..f78862f6 100644 --- a/includes/views/pos/cart/tmpl-item.php +++ b/includes/views/pos/cart/tmpl-item.php @@ -4,7 +4,7 @@
                  {{name}} -
                  +
                    diff --git a/includes/views/pos/products/tmpl-product.php b/includes/views/pos/products/tmpl-product.php index d2d1aff7..bbfefcdf 100644 --- a/includes/views/pos/products/tmpl-product.php +++ b/includes/views/pos/products/tmpl-product.php @@ -12,24 +12,26 @@ "> {{/with}} {{#with product_variations}} -
                    +
                      {{#each this}} -
                      {{name}}:
                      -
                      {{#list options ', '}}{{this}}{{/list}}
                      +
                    • + {{name}}: {{#list options ', '}}{{this}}{{/list}} +
                      • {{/each}} -
                      - - -
                      -
                    + + + + + {{/with}} {{#is type 'variation'}} -
                    +
                      {{#each attributes}} -
                      {{name}}:
                      -
                      {{option}}
                      +
                    • + {{name}}: {{#list option ', '}}{{this}}{{/list}} +
                      • {{/each}} -
                    + {{/is}} {{#if managing_stock}} diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index 1c5aae8c..1d7f4518 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -23,16 +23,10 @@ public function __construct(){ public function includes(){ require_once(__DIR__.'/../../../../../../wp-load.php'); require_once 'vendor/autoload.php'; + require_once 'framework/testcase.php'; } public function setup(){ - switch_theme('WooCommerce-POS-Test-Theme', 'WooCommerce-POS-Test-Theme'); - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce-pos-test/index.php', - 'woocommerce/woocommerce.php' - )); - $this->import_dummy_tax(); } @@ -81,11 +75,7 @@ private function import_dummy_tax(){ * runs after all tests are complete */ public function shutdown(){ - switch_theme('twentyfifteen', 'twentyfifteen'); - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce/woocommerce.php' - )); + } } diff --git a/tests/integration/php/framework/testcase.php b/tests/integration/php/framework/testcase.php new file mode 100644 index 00000000..a84d0a1e --- /dev/null +++ b/tests/integration/php/framework/testcase.php @@ -0,0 +1,113 @@ +login(); + + $this->client = new Client([ + 'base_url' => get_woocommerce_api_url( '' ), + 'defaults' => [ + 'exceptions' => false, + 'cookies' => true, + 'headers' => [ + 'X-WC-POS' => '1' + ] + ] + ]); + } + + /** + * Login through wp-login.php, sets cookie + */ + protected function login(){ + + $client = new Client([ + 'base_url' => wp_login_url(), + 'defaults' => [ + 'exceptions' => false, + 'cookies' => true + ] + ]); + + $client->post('', [ + 'body' => [ + 'log' => 'admin', + 'pwd' => 'password', + ] + ]); + + } + + /** + * Logout + */ + protected function logout(){ + $client = new Client([ + 'base_url' => wp_logout_url(), + 'defaults' => [ + 'exceptions' => false, + 'cookies' => true + ] + ]); + + $client->get(''); + } + + /** + * @param int $length + * @return string + */ + protected function generate_random_string($length=10) { + $string = ''; + $characters = "ABCDEFHJKLMNPRTVWXYZabcdefghijklmnopqrstuvwxyz"; + for ($p = 0; $p < $length; $p++) { + $string .= $characters[mt_rand(0, strlen($characters)-1)]; + } + return $string; + } + + /** + * @param int $id + * @return mixed + */ + protected function get_product( $id ){ + $response = $this->client->get( get_woocommerce_api_url( 'products/' . $id ) ); + $data = $response->json(); + return $data['product'][0]; + } + + /** + * @return mixed + */ + protected function get_random_product_id() { + $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); + $data = $response->json(); + $key = array_rand( $data['products'] ); + return $data['products'][$key]['id']; + } + + /** + * @return mixed + */ + protected function get_random_product() { + $product_id = $this->get_random_product_id(); + return $this->get_product($product_id); + } + +} \ No newline at end of file diff --git a/tests/integration/php/spec/api/test-customers.php b/tests/integration/php/spec/api/test-customers.php index 68a531ff..19b84cab 100644 --- a/tests/integration/php/spec/api/test-customers.php +++ b/tests/integration/php/spec/api/test-customers.php @@ -2,41 +2,16 @@ namespace WC_POS\Integration_Tests\API; -use GuzzleHttp\Client; -use PHPUnit_Framework_TestCase; use WC_POS\Admin\Settings; +use WC_POS\Framework\TestCase; -class CustomersTest extends PHPUnit_Framework_TestCase { - - protected $client; - - /** - * - */ - public function setUp() { - $this->client = new Client([ - 'base_url' => get_woocommerce_api_url( 'customers/' ), - 'defaults' => [ - 'exceptions' => false, - 'headers' => [ 'X-WC-POS' => '1' ] - ] - ]); - } - - private function generate_random_string($length=10) { - $string = ''; - $characters = "ABCDEFHJKLMNPRTVWXYZabcdefghijklmnopqrstuvwxyz"; - for ($p = 0; $p < $length; $p++) { - $string .= $characters[mt_rand(0, strlen($characters)-1)]; - } - return $string; - } +class CustomersTest extends TestCase { /** * */ public function test_get_valid_response() { - $response = $this->client->get(); + $response = $this->client->get('customers'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('customers', $data); @@ -51,7 +26,7 @@ public function test_customer_roles_settings(){ $option_key = Settings::DB_PREFIX . 'customers'; update_option( $option_key, array('customer_roles' => array('all')) ); - $response = $this->client->get(); + $response = $this->client->get('customers'); $data = $response->json(); $this->assertArrayHasKey('customers', $data); @@ -60,7 +35,7 @@ public function test_customer_roles_settings(){ update_option( $option_key, array('customer_roles' => array('subscriber')) ); - $response = $this->client->get(); + $response = $this->client->get('customers'); $data = $response->json(); $this->assertEquals('subscriber', $data['customers'][0]['role']); @@ -73,7 +48,7 @@ public function test_customer_roles_settings(){ * */ public function test_customer_simple_username_search(){ - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => 'wootea', 'filter[fields]' => 'username' @@ -97,7 +72,7 @@ public function test_customer_simple_email_search(){ 'user_email' => $email )); - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => substr($email, 0, 6), 'filter[fields]' => 'email' @@ -119,7 +94,7 @@ public function test_customer_simple_first_name_search(){ 'first_name' => $first_name )); - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => substr($first_name, 0, 6), 'filter[fields]' => 'first_name' @@ -141,7 +116,7 @@ public function test_customer_simple_last_name_search(){ 'last_name' => $last_name )); - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => substr($last_name, 0, 6), 'filter[fields]' => 'last_name' @@ -160,7 +135,7 @@ public function test_customer_simple_company_search(){ $company = $this->generate_random_string(); update_user_meta( 2, 'billing_company', $company ); - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => substr($company, 0, 6), 'filter[fields]' => 'billing_address.company' @@ -179,7 +154,7 @@ public function test_customer_simple_phone_search(){ $phone = $this->generate_random_string(); update_user_meta( 2, 'billing_phone', $phone ); - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => substr($phone, 0, 6), 'filter[fields]' => 'billing_address.phone' @@ -195,7 +170,7 @@ public function test_customer_simple_phone_search(){ * */ public function test_customer_complex_id_search(){ - $response = $this->client->get('', [ + $response = $this->client->get('customers', [ 'query' => [ 'filter[q]' => array( array( diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index 2e27d7e0..84203a16 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -2,23 +2,10 @@ namespace WC_POS\Integration_Tests\API; -use GuzzleHttp\Client; -use PHPUnit_Framework_TestCase; use WC_POS\Admin\Settings; +use WC_POS\Framework\TestCase; -class OrdersTest extends PHPUnit_Framework_TestCase { - - protected $client; - - public function setUp() { - $this->client = new Client([ - 'base_url' => get_woocommerce_api_url( 'orders/' ), - 'defaults' => [ - 'exceptions' => false, - 'headers' => [ 'X-WC-POS' => '1' ] - ] - ]); - } +class OrdersTest extends TestCase { /** * Helper functions @@ -43,18 +30,6 @@ private function filter_line_item($product){ return $product; } - private function get_product( int $id ){ - $response = $this->client->get( get_woocommerce_api_url( 'products/'.$id ) ); - $data = $response->json(); - return $data['product'][0]; - } - - private function get_random_product() { - $response = $this->client->get( get_woocommerce_api_url( 'products/' ) ); - $data = $response->json(); - return $data['products'][ array_rand( $data['products'] ) ]; - } - private function update_tax_settings($args = array()){ $args = wp_parse_args($args, array( 'calc_taxes' => 'yes', @@ -75,7 +50,7 @@ private function update_tax_settings($args = array()){ * */ public function test_get_valid_response() { - $response = $this->client->get(); + $response = $this->client->get('orders'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('orders', $data); @@ -85,7 +60,7 @@ public function test_get_valid_response() { * */ public function test_create_order(){ - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array() ) @@ -103,12 +78,12 @@ public function test_create_order(){ */ public function test_edit_order(){ // get last order - $response = $this->client->get(); + $response = $this->client->get('orders'); $data = $response->json(); $order_id = $data['orders'][0]['id']; // update note - $response = $this->client->put($order_id, array( + $response = $this->client->put('orders/' . $order_id, array( 'json' => array( 'order' => array( 'note' => 'updated' @@ -133,7 +108,7 @@ public function test_create_order_with_product(){ $product = $this->filter_line_item($product); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -201,7 +176,7 @@ public function test_integer_stock_adjustment(){ update_post_meta($product['product_id'], '_stock', 3); // create order with payment details - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -248,7 +223,7 @@ public function test_float_stock_adjustment(){ update_post_meta($product['product_id'], '_stock', $random_stock); // create order with payment details - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -287,7 +262,7 @@ public function test_line_item_discount(){ $product['total'] = $price; // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -314,7 +289,7 @@ public function test_line_item_change_title(){ $product['title'] = 'Foo'; // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -347,7 +322,7 @@ public function test_line_item_exclusive_tax(){ $product['total_tax'] = 2; // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -378,7 +353,7 @@ public function test_line_item_change_taxable(){ $product['total_tax'] = 2; // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -410,7 +385,7 @@ public function test_line_item_change_tax_rate(){ $product['tax_class'] = 'reduced-rate'; // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -439,7 +414,7 @@ public function test_order_with_fee(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'fee_lines' => array( @@ -473,7 +448,7 @@ public function test_order_with_taxable_fee(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'fee_lines' => array( @@ -507,7 +482,7 @@ public function test_order_with_taxable_fee_change_tax_class(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'fee_lines' => array( @@ -537,7 +512,7 @@ public function test_order_with_negative_fee(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'fee_lines' => array( @@ -569,7 +544,7 @@ public function test_order_with_negative_fee_and_tax(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'fee_lines' => array( @@ -610,7 +585,7 @@ public function test_order_with_product_and_negative_fee(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'line_items' => array( @@ -645,7 +620,7 @@ public function test_order_with_shipping(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'shipping_lines' => array( @@ -681,7 +656,7 @@ public function test_order_with_shipping_change_taxable(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'shipping_lines' => array( @@ -721,7 +696,7 @@ public function test_order_with_shipping_change_tax_class(){ ); // create order - $response = $this->client->post('', array( + $response = $this->client->post('orders', array( 'json' => array( 'order' => array( 'shipping_lines' => array( diff --git a/tests/integration/php/spec/api/test-products.php b/tests/integration/php/spec/api/test-products.php index ea8c9283..fc9a12d9 100644 --- a/tests/integration/php/spec/api/test-products.php +++ b/tests/integration/php/spec/api/test-products.php @@ -2,58 +2,17 @@ namespace WC_POS\Integration_Tests\API; -use GuzzleHttp\Client; -use PHPUnit_Framework_TestCase; use WC_POS\Admin\Settings; +use WC_POS\Framework\TestCase; +use GuzzleHttp\Client; -class ProductsTest extends PHPUnit_Framework_TestCase { - - protected $client; - - /** - * - */ - public function setUp() { - $this->client = new Client([ - 'base_url' => get_woocommerce_api_url( 'products/' ), - 'defaults' => [ - 'exceptions' => false, - 'headers' => [ 'X-WC-POS' => '1' ] - ] - // 'cookies' => true - // Could not get cookies to work using GuzzleHTTP - // instead using theme functions.php for access - ]); - } - - /** - * @return mixed - */ - private function get_random_product_id() { - $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); - $data = $response->json(); - $key = array_rand( $data['products'] ); - return $data['products'][$key]['id']; - } - - /** - * @param int $length - * @return string - */ - private function generate_random_string($length=10) { - $string = ''; - $characters = "ABCDEFHJKLMNPRTVWXYZabcdefghijklmnopqrstuvwxyz"; - for ($p = 0; $p < $length; $p++) { - $string .= $characters[mt_rand(0, strlen($characters)-1)]; - } - return $string; - } +class ProductsTest extends TestCase { /** * */ public function test_get_valid_response() { - $response = $this->client->get(); + $response = $this->client->get('products'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('products', $data); @@ -63,7 +22,7 @@ public function test_get_valid_response() { * */ public function test_get_simple_products() { - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => [ 'filter[type]' => 'simple', 'filter[limit]'=> '1' @@ -86,7 +45,7 @@ public function test_get_simple_products() { * */ public function test_get_single_simple_product() { - $response = $this->client->get('99'); + $response = $this->client->get('products/99'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('product', $data); @@ -107,7 +66,7 @@ public function test_simple_product_decimal_quantity(){ update_post_meta(99, '_stock', $random_qty); // update product and check response - $response = $this->client->get('99'); + $response = $this->client->get('products/99'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('product', $data); @@ -118,7 +77,7 @@ public function test_simple_product_decimal_quantity(){ * */ public function test_get_single_variable_product() { - $response = $this->client->get('41'); + $response = $this->client->get('products/41'); $this->assertEquals(200, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('product', $data); @@ -140,7 +99,7 @@ public function test_variable_product_decimal_quantity(){ update_post_meta(41, '_stock', $random_qty); // also need to check the parent output - $response = $this->client->get('40'); + $response = $this->client->get('products/40'); $data = $response->json(); $parent = $data['product']; $this->assertArrayHasKey('variations', $parent); @@ -165,29 +124,27 @@ public function test_pos_only_products(){ update_option( $option_key, array('pos_only_products' => true) ); // get random product - $response = $this->client->get(); - $data = $response->json(); - $product = $data['products'][ array_rand( $data['products'] ) ]; + $product_id = $this->get_random_product_id(); // set to POS only - update_post_meta($product['id'], '_pos_visibility', 'pos_only'); + update_post_meta($product_id, '_pos_visibility', 'pos_only'); // get product via API - $response = $this->client->get($product['id']); + $response = $this->client->get('products/' . $product_id); $this->assertEquals(200, $response->getStatusCode()); // get product via website $client = new Client(); $response = $client->get( get_home_url(), array( 'query' => array( - 'p' => $product['id'] + 'p' => $product_id ), 'exceptions' => false )); $this->assertEquals(404, $response->getStatusCode()); // delete POS visibility setting - delete_post_meta($product['id'], '_pos_visibility'); + delete_post_meta($product_id, '_pos_visibility'); update_option( $option_key, array('pos_only_products' => false) ); } @@ -208,7 +165,7 @@ public function test_online_only_products(){ update_post_meta($product_id, '_pos_visibility', 'online_only'); // get all product ids - $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); + $response = $this->client->get('products/ids'); $data = $response->json(); $this->assertGreaterThan(10, count($data['products'])); $ids = wp_list_pluck( $data['products'], 'id' ); @@ -234,7 +191,7 @@ public function test_online_only_products(){ * */ public function test_title_search(){ - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => 'prem' ) @@ -248,7 +205,7 @@ public function test_title_search(){ $this->assertEquals('Premium Quality', $data['products'][0]['title']); $this->assertEquals('Premium Quality', $data['products'][1]['title']); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => 'libero', 'filter[fields]' => 'title' @@ -262,6 +219,31 @@ public function test_title_search(){ } + /** + * + */ + public function test_id_search(){ + $product_id = $this->get_random_product_id(); + + $response = $this->client->get('products', [ + 'query' => array( + 'filter[q]' => array( + array( + 'type' => 'prefix', + 'prefix' => 'id', + 'query' => $product_id + ) + ) + ) + ]); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + $this->assertCount(1, $data['products']); + $this->assertEquals($product_id, $data['products'][0]['id']); + + } + /** * */ @@ -270,7 +252,7 @@ public function test_featured_search(){ global $wpdb; $wpdb->update($wpdb->postmeta, array('meta_value' => 'no'), array('meta_key' => '_featured')); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => array( array( @@ -290,7 +272,7 @@ public function test_featured_search(){ $product_id = $this->get_random_product_id(); update_post_meta($product_id, '_featured', 'yes'); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => array( array( @@ -322,7 +304,7 @@ public function test_sku_search(){ $product_id = $this->get_random_product_id(); update_post_meta($product_id, '_sku', $sku); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => array( array( @@ -359,7 +341,7 @@ public function test_barcode_search(){ // return '_barcode'; // }); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'filter[q]' => array( array( @@ -388,7 +370,7 @@ public function test_barcode_search(){ public function test_on_sale_search() { // on_sale = true - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -410,7 +392,7 @@ public function test_on_sale_search() { $this->assertEquals([true], array_unique($on_sale)); // on_sale = false - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -437,7 +419,7 @@ public function test_on_sale_search() { * */ public function test_categories_search() { - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[category]' => 'music' @@ -445,7 +427,7 @@ public function test_categories_search() { ]); $music_category = $response->json(); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -473,7 +455,7 @@ public function test_cat_search() { $term = get_term_by('slug', 'posters', 'product_cat'); wp_update_term($term->term_id, 'product_cat', array('name' => 'Woo Posters')); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[category]' => 'posters' @@ -481,7 +463,7 @@ public function test_cat_search() { ]); $music_category = $response->json(); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -513,7 +495,7 @@ public function test_tag_search() { wp_set_object_terms( $product_id, $tag, 'product_tag' ); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[tag]' => $tag @@ -521,7 +503,7 @@ public function test_tag_search() { ]); $tagged_product = $response->json(); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -547,7 +529,7 @@ public function test_tag_search() { * */ public function test_title_and_cat_search(){ - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[category]' => 'posters', @@ -556,7 +538,7 @@ public function test_title_and_cat_search(){ ]); $ninja_posters = $response->json(); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -584,7 +566,7 @@ public function test_title_and_cat_search(){ * */ public function test_title_and_title_search() { - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => 'woo ninja' @@ -592,7 +574,7 @@ public function test_title_and_title_search() { ]); $woo_ninja = $response->json(); - $response = $this->client->get('', [ + $response = $this->client->get('products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -618,7 +600,7 @@ public function test_title_and_title_search() { * */ public function test_prefix_and_title_search() { - $response = $this->client->get( '', [ + $response = $this->client->get( 'products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( @@ -640,7 +622,7 @@ public function test_prefix_and_title_search() { $this->assertArrayHasKey( 'products', $data ); $this->assertCount(2, $data['products']); - $response = $this->client->get( '', [ + $response = $this->client->get( 'products', [ 'query' => array( 'limit' => -1, 'filter[q]' => array( diff --git a/tests/integration/php/spec/api/test-variations.php b/tests/integration/php/spec/api/test-variations.php new file mode 100644 index 00000000..5d41aafb --- /dev/null +++ b/tests/integration/php/spec/api/test-variations.php @@ -0,0 +1,9 @@ +client = new Client([ - 'defaults' => ['exceptions' => false], - ]); - } +class ActivationTest extends TestCase { public function test_load() { - $response = $this->client->get( wc_pos_url(), [ + $client = new Client(); + $response = $client->get( wc_pos_url(), [ 'allow_redirects' => false ]); // expect 302 redirect to login $this->assertEquals(302, $response->getStatusCode()); } - public function test_load_order() { - // reverse plugin load order - update_option('active_plugins', array( - 'woocommerce/woocommerce.php', - 'woocommerce-pos/woocommerce-pos.php' - )); - - $response = $this->client->get( wc_pos_url(), [ - 'allow_redirects' => false - ]); - // expect 302 redirect to login - $this->assertEquals(302, $response->getStatusCode()); - - // restore plugin load order - update_option('active_plugins', array( - 'woocommerce-pos/woocommerce-pos.php', - 'woocommerce/woocommerce.php' - )); - } - - public function tearDown(){ - - } - } \ No newline at end of file diff --git a/tests/integration/php/spec/test-api.php b/tests/integration/php/spec/test-api.php new file mode 100644 index 00000000..fcc79b96 --- /dev/null +++ b/tests/integration/php/spec/test-api.php @@ -0,0 +1,38 @@ +client->get(get_site_url()); + $this->assertEquals(200, $response->getStatusCode()); + } + + /** + * Make sure rest is enabled and working + */ + public function test_get_valid_api_response() { + $response = $this->client->get(); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('store', $data); + } + + /** + * Test authentication + * todo: logout + */ + public function test_get_api_authentication() { + $response = $this->client->get('products'); + $this->assertEquals(200, $response->getStatusCode()); + $data = $response->json(); + $this->assertArrayHasKey('products', $data); + } + +} \ No newline at end of file diff --git a/tests/integration/php/spec/test-rest.php b/tests/integration/php/spec/test-rest.php deleted file mode 100644 index 915b6e2a..00000000 --- a/tests/integration/php/spec/test-rest.php +++ /dev/null @@ -1,31 +0,0 @@ -client = new Client([ - 'base_url' => get_woocommerce_api_url( '' ), - 'defaults' => ['exceptions' => false] - ]); - } - - public function test_get_valid_http_response() { - $response = $this->client->get(get_site_url()); - $this->assertEquals(200, $response->getStatusCode()); - } - - public function test_get_valid_api_response() { - $response = $this->client->get(); - $this->assertEquals(200, $response->getStatusCode()); - $data = $response->json(); - $this->assertArrayHasKey('store', $data); - } - -} \ No newline at end of file diff --git a/tests/unit/js/spec/entities/variations/collection.spec.js b/tests/unit/js/spec/entities/variations/collection.spec.js index 6c00d099..1194f921 100644 --- a/tests/unit/js/spec/entities/variations/collection.spec.js +++ b/tests/unit/js/spec/entities/variations/collection.spec.js @@ -1,16 +1,11 @@ describe('entities/variations/collection.js', function () { - var Collection, variableProduct, variations; var dummy = require('../../../data/products.json'); - - before(function () { - Collection = proxyquire('entities/variations/collection',{ - './model': Backbone.Model - }); - variableProduct = _.findWhere(dummy.products, { id: 40 }); - }); + var Collection = require('entities/variations/collection'); + var variations; beforeEach(function(){ + var variableProduct = _.findWhere(dummy.products, { id: 40 }); variations = new Collection( variableProduct.variations ); }); @@ -33,8 +28,36 @@ describe('entities/variations/collection.js', function () { it('should return an array of the available variation options', function(){ variations.getVariationOptions().should.eql([{ name: 'Color', - options: [ "Black", "Blue" ] + options: [ 'Black', 'Blue' ] }]); }); + it('should handle WooCommerce \'Any ...\' option', function(){ + var collection = new Collection([ + { + attributes: [ + { name: 'Size', option: 'Small' }, + { name: 'Color', option: '' } + ] + }, { + attributes: [ + { name: 'Size', option: 'Large' }, + { name: 'Color', option: '' } + ] + } + ], { + parentAttrs: { + attributes: [ + { name: 'Size', options: ['Small', 'Medium', 'Large'], variation: true}, + { name: 'Color', options: ['Black', 'Blue'], variation: true } + ] + } + }); + + collection.getVariationOptions().should.eql([ + { name: 'Size', options: [ 'Small', 'Large' ] }, + { name: 'Color', options: [ 'Black', 'Blue' ] } + ]); + }); + }); \ No newline at end of file diff --git a/tests/unit/js/spec/entities/variations/model.spec.js b/tests/unit/js/spec/entities/variations/model.spec.js index 617dd93c..9d12b17d 100644 --- a/tests/unit/js/spec/entities/variations/model.spec.js +++ b/tests/unit/js/spec/entities/variations/model.spec.js @@ -16,9 +16,9 @@ describe('entities/variations/model.js', function () { model.get('type').should.equal('variation'); }); - it('should parse the title from the parent product', function(){ + it('should init with parent title (passed via options)', function(){ var variable = _.find( dummy_products.products, { id: 40 } ); - var model = new Model( variable.variations[0], { title: variable.title } ); + var model = new Model( variable.variations[0], { parentAttrs: variable } ); model.get('title').should.equal(variable.title); }); From af674e5be541975df39d3ec593fa6b60adf8c663 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 6 Apr 2016 23:29:21 +0800 Subject: [PATCH 048/169] update DualModel --- assets/css/src/scss/partials/_list.scss | 4 +- assets/js/src/apps/pos/cart/route.js | 64 +++++++++++-------- assets/js/src/apps/pos/checkout/route.js | 19 ++++-- assets/js/src/apps/pos/receipt/route.js | 46 ++++++------- assets/js/src/apps/status/router.js | 2 +- .../status/tools/modal/translation-update.js | 6 +- assets/js/src/entities/orders/collection.js | 13 +++- assets/js/src/entities/orders/model.js | 5 -- assets/js/src/lib/behaviors/dropdown.js | 1 + .../js/src/lib/components/tabs/views/tabs.js | 4 +- assets/js/src/lib/config/dual-model.js | 36 +++++++++-- assets/js/src/lib/config/model-schema.js | 30 --------- assets/js/src/lib/config/model.js | 27 ++++++-- assets/js/src/lib/config/route.js | 2 +- readme.txt | 3 +- 15 files changed, 150 insertions(+), 112 deletions(-) delete mode 100644 assets/js/src/lib/config/model-schema.js diff --git a/assets/css/src/scss/partials/_list.scss b/assets/css/src/scss/partials/_list.scss index b9dd6514..84c80274 100644 --- a/assets/css/src/scss/partials/_list.scss +++ b/assets/css/src/scss/partials/_list.scss @@ -363,7 +363,9 @@ list { } &:not(:first-of-type) { - border-top: 2px solid $input-border-color; + > div { + border-top: 2px solid $input-border-color; + } } } diff --git a/assets/js/src/apps/pos/cart/route.js b/assets/js/src/apps/pos/cart/route.js index 30ea4123..a74677ef 100644 --- a/assets/js/src/apps/pos/cart/route.js +++ b/assets/js/src/apps/pos/cart/route.js @@ -8,6 +8,7 @@ var Buttons = require('lib/components/buttons/view'); //var debug = require('debug')('cart'); var App = require('lib/config/application'); var polyglot = require('lib/utilities/polyglot'); +var _ = require('lodash'); var CartRoute = Route.extend({ @@ -19,6 +20,7 @@ var CartRoute = Route.extend({ this.listenTo( this.collection, { destroy: function(){ + this.setActiveOrder(); this.render(); } }); @@ -31,12 +33,12 @@ var CartRoute = Route.extend({ if( this.activeOrder ){ // if new, wait for save to complete, then: - // - update the url + // - add new order // - re-render - if( this.activeOrder.id === 'new' ) { + if( this.activeOrder.isNew() ) { this.listenToOnce(this.activeOrder, { 'sync': function ( model ) { - this.navigate( 'cart/' + model.id ); + this.collection.add({ _state: this.collection.states.create }); this.render( model.id ); } }); @@ -47,49 +49,55 @@ var CartRoute = Route.extend({ }, /** - * Fetch orders from idb if new + * Fetch open orders from idb */ fetch: function() { - return this.collection.fetch({ - remote: false, - fullSync: false, - index: { - keyPath: '_state', - value: this.collection.states.create - } - }); + return this.collection.fetchOpenOrders(); }, /** * */ - render: function(id) { - this.setActiveOrder( id ); - this.updateTabLabel(); - this.layout = new LayoutView(); - this.listenTo( this.layout, 'show', this.onShow ); - this.container.show( this.layout ); + onFetch: function(id){ + this.setActiveOrder(id); + + if( ! this.activeOrder.isNew() && ! this.activeOrder.isEditable() ){ + this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + } }, /** * */ setActiveOrder: function(id){ - if( ! this.collection.get('new') ){ - this.collection.add({ local_id: 'new' }); - } - - this.activeOrder = this.collection.get(id); + var order = this.collection.get(id); + this.ensureNewOrder(); + this.activeOrder = order ? order : this.collection.first(); + }, - if( ! this.activeOrder ){ - this.activeOrder = this.collection.first(); - } + /** + * Ensure new editable order exists + */ + ensureNewOrder: function(){ + var newOrder = _.some(this.collection.models, function(model){ + return model.isNew(); + }); - if( ! this.activeOrder.isEditable() ){ - this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + if(!newOrder){ + this.collection.add({ _state: this.collection.states.create }); } }, + /** + * + */ + render: function() { + this.updateTabLabel(); + this.layout = new LayoutView(); + this.listenTo( this.layout, 'show', this.onShow ); + this.container.show( this.layout ); + }, + /** * */ diff --git a/assets/js/src/apps/pos/checkout/route.js b/assets/js/src/apps/pos/checkout/route.js index 6620c526..09d4f67c 100644 --- a/assets/js/src/apps/pos/checkout/route.js +++ b/assets/js/src/apps/pos/checkout/route.js @@ -19,7 +19,7 @@ var CheckoutRoute = Route.extend({ fetch: function(){ if(this.collection.isNew()){ - return this.collection.fetch(); + return this.collection.fetchOpenOrders(); } }, @@ -29,13 +29,13 @@ var CheckoutRoute = Route.extend({ render: function( id ){ this.activeOrder = this.collection.get(id); + // return to cart if( ! this.activeOrder ){ - // return to cart return this.navigate('cart', { trigger: true }); } + // go to receipts if( ! this.activeOrder.isEditable() ){ - // go to receipts return this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); } @@ -114,12 +114,17 @@ var CheckoutRoute = Route.extend({ * */ onProcessPayment: function(){ - - if( this.activeOrder.get('status') !== 'failed' ){ - // order has been processed, go to receipt - return this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + if( this.activeOrder.get('status') === 'failed' ){ + return this.onFailedPayment(); } + this.navigate('receipt/' + this.activeOrder.id, { trigger: true }); + }, + + /** + * + */ + onFailedPayment: function(){ // silently save, will change status to UPDATE_FAILED this.activeOrder.save( {}, { silent: true } ); diff --git a/assets/js/src/apps/pos/receipt/route.js b/assets/js/src/apps/pos/receipt/route.js index b346db81..0056d66a 100644 --- a/assets/js/src/apps/pos/receipt/route.js +++ b/assets/js/src/apps/pos/receipt/route.js @@ -9,7 +9,6 @@ var TotalsView = require('./views/totals'); var EmailView = require('./views/modals/email'); var polyglot = require('lib/utilities/polyglot'); var Buttons = require('lib/components/buttons/view'); -var $ = require('jquery'); var ReceiptRoute = Route.extend({ @@ -25,23 +24,31 @@ var ReceiptRoute = Route.extend({ }) || {}; }, - fetch: function() { - if(this.collection.isNew()){ - return this.collection.fetch(); - } - }, + fetch: function(id) { + id = parseInt(id); - onFetch: function(id){ this.order = this.collection.get(id); - // redirect, ie: offsite payment - var redirect = this.order.get('payment_details.redirect'); - if(redirect && redirect !== ''){ - window.open(redirect, '_blank'); + if(!this.order){ + var self = this; + var order = this.collection.add({ local_id: id }); + return order.fetch({ remote: false }) + .then(function(response){ + if(response){ + self.order = order; + } else { + order.destroy(); + } + }); } }, render: function() { + + if(!this.order){ + return this.navigate('cart', { trigger: true }); + } + this.layout = new LayoutView({ model: this.order }); @@ -60,25 +67,18 @@ var ReceiptRoute = Route.extend({ }, showStatus: function(){ - var view = new StatusView({ - model: this.order - }); + var view = new StatusView({ model: this.order }); + this.listenTo(view, 'open:modal', this.openExternalGateway); this.layout.getRegion('status').show(view); }, showItems: function(){ - var view = new ItemsView({ - model: this.order - }); - + var view = new ItemsView({ model: this.order }); this.layout.getRegion('list').show(view); }, showTotals: function(){ - var view = new TotalsView({ - model: this.order - }); - + var view = new TotalsView({ model: this.order }); this.layout.getRegion('totals').show(view); }, @@ -159,7 +159,7 @@ var ReceiptRoute = Route.extend({ btn.trigger('state', ['error', message]); } - $.getJSON( ajaxurl, { + App.prototype.getJSON( ajaxurl, { action: 'wc_pos_email_receipt', order_id: order_id, email : email diff --git a/assets/js/src/apps/status/router.js b/assets/js/src/apps/status/router.js index 8d7f1f25..25a21ece 100644 --- a/assets/js/src/apps/status/router.js +++ b/assets/js/src/apps/status/router.js @@ -39,7 +39,7 @@ var StatusRouter = Router.extend({ }); // get active tab from url fragment - var activeId = bb.history.getHash().split('/')[0] || 'general'; + var activeId = bb.history.getHash().split('/')[0] || 'tools'; // pass id & label collection to tabs var view = Radio.request('tabs', 'view', { diff --git a/assets/js/src/apps/status/tools/modal/translation-update.js b/assets/js/src/apps/status/tools/modal/translation-update.js index 4d68ee59..ea205099 100644 --- a/assets/js/src/apps/status/tools/modal/translation-update.js +++ b/assets/js/src/apps/status/tools/modal/translation-update.js @@ -7,9 +7,9 @@ var constructURL = function(){ type: 'option', name: 'nonce' }); - return window.ajaxurl + - '?action=wc_pos_update_translations&security=' + - nonce; + + return window.ajaxurl + (window.ajaxurl.indexOf('?') === -1 ? '?' : '&') + + 'action=wc_pos_update_translations&security=' + nonce; }; module.exports = ItemView.extend({ diff --git a/assets/js/src/entities/orders/collection.js b/assets/js/src/entities/orders/collection.js index f52be693..e6e052d6 100644 --- a/assets/js/src/entities/orders/collection.js +++ b/assets/js/src/entities/orders/collection.js @@ -14,6 +14,17 @@ module.exports = DualCollection.extend({ 'billing_address.first_name', 'billing_address.last_name', 'billing_address.email' - ] + ], + + fetchOpenOrders: function(){ + return this.fetch({ + remote: false, + fullSync: false, + index: { + keyPath: '_state', + value: this.states.create + } + }); + } }); \ No newline at end of file diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 0cdc8f28..04ca660f 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -79,11 +79,6 @@ var OrderModel = DualModel.extend({ parse: function (resp) { resp = DualModel.prototype.parse.apply(this, arguments); - // if new - if (resp.local_id === 'new') { - resp._state = this.collection.states.create; - } - // if open order with no cart, ie: new from idb or changed state if (this.isEditable(resp._state) && !this.cart) { resp.taxes = this.attachTaxes(resp.taxes); diff --git a/assets/js/src/lib/behaviors/dropdown.js b/assets/js/src/lib/behaviors/dropdown.js index cb16cfb8..5ad82226 100644 --- a/assets/js/src/lib/behaviors/dropdown.js +++ b/assets/js/src/lib/behaviors/dropdown.js @@ -41,6 +41,7 @@ var Dropdown = Behavior.extend({ }, onClick: function(e){ + e.preventDefault(); var target = e.currentTarget; if(this._initialized.indexOf(target) !== -1) { diff --git a/assets/js/src/lib/components/tabs/views/tabs.js b/assets/js/src/lib/components/tabs/views/tabs.js index 8dd043b2..d95befe1 100644 --- a/assets/js/src/lib/components/tabs/views/tabs.js +++ b/assets/js/src/lib/components/tabs/views/tabs.js @@ -52,7 +52,7 @@ var Tabs = CompositeView.extend({ /** * Pick options to pass to childview */ - childViewOptions: function( model, idx ){ + childViewOptions: function( model ){ // pass default options var options = { activeClassName : 'active' @@ -64,7 +64,7 @@ var Tabs = CompositeView.extend({ } // init with active class - if( ! this.activeId && idx === 0 || this.activeId === model.id ){ + if( this.activeId === model.id ){ options.className = this.activeClassName; } diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 63e9a671..09a6735e 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -25,13 +25,33 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ }, fetch: function(options){ - var self = this, isNew = this.collection.isNew(); + options = _.extend({parse: true}, options); + var self = this, success = options.success; + var _fetch = options.remote ? this.fetchRemote : this.fetchLocal; + + if(success){ + options.success = undefined; + } + + return _fetch.call(this, options) + .then(function (response) { + self.set(response, options); + if (success) { + success.call(options.context, self, response, options); + } + self.trigger('sync', self, response, options); + return response; + }); + }, + + fetchLocal: function(options){ + var self = this, isNew = this.isNew(); return this.sync('read', this, options) .then(function(response){ - if(!response) { - options.remote = true; - return self.sync('read', this, options); - } + // if(!response) { + // options.remote = true; + // return self.sync('read', this, options); + // } return response; }) .then(function(response){ @@ -42,6 +62,12 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ }); }, + fetchRemote: function(options){ + options = options || {}; + options.remote = true; + return this.sync('read', this, options); + }, + sync: function( method, model, options ){ options = options || {}; if( method !== 'read' ){ diff --git a/assets/js/src/lib/config/model-schema.js b/assets/js/src/lib/config/model-schema.js deleted file mode 100644 index b9ddfeb7..00000000 --- a/assets/js/src/lib/config/model-schema.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Simple schema parsing for Backbone Models - */ -var _ = require('lodash'); - -var fns = { - 'float' : parseFloat, - 'int' : parseInt, - 'number': function (num) { - num = Number(num); - return _.isNaN(num) ? 0 : num; - } -}; - -module.exports = { - - parse: function( modelParse, options ){ - var parse, resp = modelParse.call(this, options); - - _.each( this.schema, function( value, attr ) { - parse = fns[value]; - if( _.has(resp, attr) && parse ){ - resp[attr] = parse( resp[attr] ); - } - }); - - return resp; - } - -}; \ No newline at end of file diff --git a/assets/js/src/lib/config/model.js b/assets/js/src/lib/config/model.js index 9cb477db..f6aa9ef1 100644 --- a/assets/js/src/lib/config/model.js +++ b/assets/js/src/lib/config/model.js @@ -1,16 +1,35 @@ var bb = require('backbone'); var app = require('./application'); var _ = require('lodash'); -var schema = require('./model-schema'); + +var fns = { + 'float' : parseFloat, + 'integer': parseInt, + 'int' : parseInt, + 'number' : function (num) { + num = Number(num); + return _.isNaN(num) ? 0 : num; + } +}; module.exports = app.prototype.Model = bb.Model.extend({ - constructor: function(){ + constructor: function(attributes, options){ // model schema if( this.schema ){ - this.parse = _.wrap( this.parse, schema.parse ); + _.extend(options, {parse: true}); } - bb.Model.apply( this, arguments ); + bb.Model.call( this, attributes, options ); + }, + + parse: function(resp){ + _.each( this.schema, function( value, attr ) { + if( _.has(resp, attr) && fns[value] ){ + resp[attr] = fns[value]( resp[attr] ); + } + }); + + return resp; } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/route.js b/assets/js/src/lib/config/route.js index 1e069673..6fff3d2d 100644 --- a/assets/js/src/lib/config/route.js +++ b/assets/js/src/lib/config/route.js @@ -38,7 +38,7 @@ module.exports = app.prototype.Route = Mn.Object.extend({ return Promise.resolve() .then(function () { - return self.fetch.call(self, args); + return self.fetch.apply(self, args); }) .then(function () { self._triggerMethod('fetch', args); diff --git a/readme.txt b/readme.txt index c0a2a044..e423372e 100644 --- a/readme.txt +++ b/readme.txt @@ -81,7 +81,7 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c == Changelog == -= 0.4.6 - 2016/03/** = += 0.4.6 - 2016/04/** = * Important: Pro users should update [WooCommerce POS Pro](http://woopos.com.au/pro) to version 0.4.6 * New: Receipt print methods for thermal printers (experimental) * New: Receipt templates for epos-print and ESC/POS languages (experimental) @@ -90,6 +90,7 @@ Bugs can be reported on the [WooCommerce POS GitHub repository](https://github.c * New: Setting for which customer roles to display in the POS * New: Split products into multiple lines in the cart * New: Toggle order taxes +* New: support for 'Any ...' variations * Fix: Checkout settings not showing for some users * Fix: issue with some product variation names, e.g.: 000, 00 and 0 * Tweak: Add Reply-To header to support emails From 9f367e7d8ec85c3297800bc98d149ac6433c9857 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Sat, 9 Apr 2016 17:16:04 +0800 Subject: [PATCH 049/169] improve dual collection --- assets/js/src/apps/pos/products/route.js | 8 +- assets/js/src/apps/support/status/route.js | 3 +- .../js/src/lib/components/pagination/view.js | 2 +- assets/js/src/lib/config/dual-collection.js | 164 +++++++++--------- .../js/src/lib/config/filtered-collection.js | 1 + assets/js/src/lib/config/idb-adapter.js | 86 +++++---- assets/js/src/lib/config/idb-collection.js | 117 ++++++------- assets/js/src/lib/config/idb-model.js | 10 -- assets/js/src/lib/config/idb-sync.js | 43 ++--- .../js/src/lib/config/infinite-list-view.js | 6 +- assets/js/src/lib/config/sync.js | 5 +- includes/api/coupons.php | 1 + includes/api/customers.php | 1 + includes/api/products.php | 1 + 14 files changed, 198 insertions(+), 250 deletions(-) diff --git a/assets/js/src/apps/pos/products/route.js b/assets/js/src/apps/pos/products/route.js index 602f4c05..350f54a2 100644 --- a/assets/js/src/apps/pos/products/route.js +++ b/assets/js/src/apps/pos/products/route.js @@ -16,13 +16,7 @@ module.exports = Route.extend({ }, fetch: function() { - //var collection = this.filtered.superset(); - //if( collection.isNew() ){ - // return collection.firstSync(); - //} else { - // this.filtered.removeTransforms(); - //} - this.collection.fetch(); + this.collection.resetFilters(); }, render: function() { diff --git a/assets/js/src/apps/support/status/route.js b/assets/js/src/apps/support/status/route.js index 82e6acf5..3eb51020 100644 --- a/assets/js/src/apps/support/status/route.js +++ b/assets/js/src/apps/support/status/route.js @@ -74,9 +74,8 @@ var StatusRoute = Route.extend({ var collection = this[db], self = this; - collection.clear() + collection.destroy() .then(function(){ - collection.resetNew(); return self.render(); }); } diff --git a/assets/js/src/lib/components/pagination/view.js b/assets/js/src/lib/components/pagination/view.js index 79a21596..85e77b5c 100644 --- a/assets/js/src/lib/components/pagination/view.js +++ b/assets/js/src/lib/components/pagination/view.js @@ -33,7 +33,7 @@ var View = ItemView.extend({ templateHelpers: function(){ return { showing : this.collection.length, - local : this.collection.total || 0 + local : this.collection._total || 0 }; } diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 04ff4d31..6be0ce35 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -41,6 +41,7 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ return wc_api + this.name; }, + toJSON: function (options) { options = options || {}; var json = IDBCollection.prototype.toJSON.apply(this, arguments); @@ -63,30 +64,24 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ /* jshint -W071, -W074 */ fetch: function (options) { options = _.extend({parse: true}, options); - var self = this, success = options.success; + var collection = this, success = options.success; var _fetch = options.remote ? this.fetchRemote : this.fetchLocal; + options.success = undefined; - if(success){ - options.success = undefined; + if(this.pageSize){ + var limit = _.get(options, ['data', 'filter', 'limit']); + if(!limit) { _.set(options, 'data.filter.limit', this.pageSize); } } return _fetch.call(this, options) .then(function (response) { var method = options.reset ? 'reset' : 'set'; - self[method](response, options); + collection._parseFetchOptions(options); + collection[method](response, options); if (success) { - success.call(options.context, self, response, options); - } - if(options.idb){ - self.total = options.idb.total; - self.delayed = options.idb.delayed; - self._hasNextPage = self.length < self.total || self.delayed > 0; - } - if(options.xhr){ - self.total = options.xhr.getResponseHeader('X-WC-Total'); - self._hasNextPage = self.length < self.total; + success.call(options.context, collection, response, options); } - self.trigger('sync', self, response, options); + collection.trigger('sync', collection, response, options); return response; }); }, @@ -96,27 +91,18 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ * */ fetchLocal: function (options) { - var self = this; - options = options || {}; - if(options.fullSync !== false){ - options.fullSync = this.isNew(); - } - - return IDBCollection.prototype.getBatch.call(this, options) + var collection = this, isNew = this.isNew(); + _.extend(options, {set: false}); + return this.sync('read', this, options) .then(function (response) { - if(options.remote === false){ - return response; - } - var createDelayed = self.getDelayed('create', response); - if(_.size(response) > 0 && _.size(response) > createDelayed.length){ - return self.fetchDelayed(response); + if(options.remote === false) { return response; } + if(_.size(response) === 0 && (isNew || collection._delayed !== 0)) { + return collection.fetchRemote(options); } - return self.fetchRemote(options); + return collection.fetchReadDelayed(response); }) .then(function(response){ - if(options.fullSync){ - self.fullSync(); - } + if(isNew && options.fullSync !== false) { collection.fullSync(); } return response; }); }, @@ -126,92 +112,85 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ * returns merged data */ fetchRemote: function (options) { - // options = _.extend({remote: true}, options); - options = options || {}; - options.remote = true; - var self = this; + var collection = this; + _.extend(options, { remote: true, set: false }); - this.trigger('request', this, null, options); return this.sync('read', this, options) .then(function (response) { - response = self.parse(response, options); - return self.putBatch(response, { index: 'id' }); - }) - .then(function (keys) { - return self.getBatch(keys); + response = collection.parse(response, options); + options.index = options.index || 'id'; + _.extend(options, { remote: false }); + return collection.save(response, options); }); }, + /** + * + */ fetchRemoteIds: function (last_update, options) { options = options || {}; - var self = this, url = _.result(this, 'url') + '/ids'; + var collection = this, url = _.result(this, 'url') + '/ids'; - var opts = _.defaults(options, { + _.extend(options, { url : url, - remote: true, data : { fields: 'id', filter: { limit : -1, updated_at_min: last_update } - } + }, + index: { + keyPath: 'id', + merge : function (local, remote) { + if(!local || local.updated_at < remote.updated_at){ + local = local || remote; + local._state = collection.states.read; + } + return local; + } + }, + success: undefined }); - opts.success = undefined; - - return this.sync('read', this, opts) - .then(function (response) { - response = self.parse(response, opts); - return self.putBatch(response, { - index: { - keyPath: 'id', - merge : function (local, remote) { - if(!local || local.updated_at < remote.updated_at){ - local = local || remote; - local._state = self.states.read; - } - return local; - } - } - }); - }) - .then(function (response) { - return response; - }); + return this.fetchRemote(options); }, + /** + * + */ fetchUpdatedIds: function (options) { - var self = this; - return this.findHighestIndex('updated_at') - .then(function (last_update) { - return self.fetchRemoteIds(last_update, options); + var collection = this; + return this.fetchLocal({ + index : 'updated_at', + data : { filter: { limit: 1, order: 'DESC' } }, + fullSync : false + }) + .then(function (response) { + var last_update = _.get(response, [0, 'updated_at']); + return collection.fetchRemoteIds(last_update, options); }); }, fullSync: function(options){ - return this.fetchRemoteIds(options); + options = options || {}; + var collection = this; + return this.fetchRemoteIds(null, options) + .then(function(response){ + collection._parseFetchOptions(options); + collection.trigger('sync', collection, response, options); + }); }, - fetchDelayed: function(response){ + fetchReadDelayed: function(response){ var delayed = this.getDelayed('read', response); if(!_.isEmpty(delayed)){ var ids = _.map(delayed, 'id'); - return this.fetchRemote({ - data: { - filter: { - 'in': ids.join(',') - } - } - }) + return this.fetchRemote({ data: { filter: { 'in': ids.join(',') } } }) .then(function(resp){ _.each(resp, function(attrs){ var key = _.findKey(response, {id: attrs.id}); - if(key){ - response[key] = attrs; - } else { - response.push(resp); - } + if(key){ response[key] = attrs; } else { response.push(resp); } }); return response; }); @@ -223,6 +202,21 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ var _state = this.states[state]; collection = collection || this; return _.filter(collection, {_state: _state}); + }, + + _parseFetchOptions: function(options){ + options = options || {}; + if(options.idb){ + this._total = options.idb.total; + this._delayed = options.idb.delayed; + } + if(options.xhr){ + this._total = parseInt( options.xhr.getResponseHeader('X-WC-Total') ); + } + }, + + hasNextPage: function(){ + return this.length < this._total; } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js index 5024591e..156f3095 100644 --- a/assets/js/src/lib/config/filtered-collection.js +++ b/assets/js/src/lib/config/filtered-collection.js @@ -60,6 +60,7 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ if(this.superset){ return this.reset(this.superset); } + this.reset(); return this.fetch(); }, diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js index 2f5f4bae..fd711ad5 100644 --- a/assets/js/src/lib/config/idb-adapter.js +++ b/assets/js/src/lib/config/idb-adapter.js @@ -36,7 +36,6 @@ IDBAdapter.prototype = { keyPath : 'id', autoIncrement: true, indexes : [], - pageSize : 10, matchMaker : matchMaker, onerror : function (options) { options = options || {}; @@ -63,12 +62,12 @@ IDBAdapter.prototype = { self.count() .then(function () { if (is_safari) { - return self.findHighestIndex(); + return self.getBatch(null, { data: { filter: { limit: 1, order: 'DESC' } } }); } }) - .then(function (key) { - if (is_safari) { - self.highestKey = key || 0; + .then(function (resp) { + if(is_safari){ + self.highestKey = _.isEmpty(resp) ? 0 : resp[0][self.opts.keyPath]; } resolve(self.db); }); @@ -100,6 +99,26 @@ IDBAdapter.prototype = { this._open = undefined; }, + read: function(key, options){ + var get = key ? this.get : this.getBatch; + return get.call(this, key, options); + }, + + update: function(data, options){ + var put = _.isArray(data) ? this.putBatch : this.put; + var get = _.isArray(data) ? this.getBatch : this.get; + var self = this; + return put.call(this, data, options) + .then(function (resp) { + return get.call(self, resp); + }); + }, + + delete: function(key, options){ + var remove = key ? this.remove : this.removeBatch; + return remove.call(this, key, options); + }, + getTransaction: function (access) { return this.db.transaction([this.opts.storeName], access); }, @@ -203,7 +222,7 @@ IDBAdapter.prototype = { }); }, - delete: function (key, options) { + remove: function (key, options) { options = options || {}; var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); @@ -267,20 +286,20 @@ IDBAdapter.prototype = { }, getBatch: function (keyArray, options) { - if (!options && !_.isArray(keyArray)) { - options = keyArray; - } options = options || {}; var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), include = _.isArray(keyArray) ? keyArray : _.get(options, ['data', 'filter', 'in']), - limit = _.get(options, ['data', 'filter', 'limit'], this.opts.pageSize), - offset = _.get(options, ['data', 'filter', 'offset'], 0), + limit = _.get(options, ['data', 'filter', 'limit'], -1), + start = _.get(options, ['data', 'filter', 'offset'], 0), + order = _.get(options, ['data', 'filter', 'order'], 'ASC'), + direction = order === 'DESC' ? consts.PREV : consts.NEXT, query = _.get(options, ['data', 'filter', 'q']), keyPath = options.index || this.opts.keyPath, page = _.get(options, ['data', 'page']), self = this, - range = null; + range = null, + end; if (_.isObject(keyPath)) { if(keyPath.value){ @@ -289,18 +308,15 @@ IDBAdapter.prototype = { keyPath = keyPath.keyPath; } - if (limit === -1) { - limit = Infinity; - } - - if (page) { - offset = (page - 1) * limit; + if (page && limit !== -1) { + start = (page - 1) * limit; } return new Promise(function (resolve, reject) { var records = [], delayed = 0; var request = (keyPath === self.opts.keyPath) ? - objectStore.openCursor() : objectStore.index(keyPath).openCursor(range); + objectStore.openCursor(range, direction) : + objectStore.index(keyPath).openCursor(range, direction); request.onsuccess = function (event) { var cursor = event.target.result; @@ -318,7 +334,8 @@ IDBAdapter.prototype = { } _.set(options, 'idb.total', records.length); _.set(options, 'idb.delayed', delayed); - resolve(_.slice(records, offset, offset + limit)); + end = limit !== -1 ? start + limit : records.length; + resolve(_.slice(records, start, end)); }; request.onerror = function (event) { @@ -328,6 +345,10 @@ IDBAdapter.prototype = { }); }, + removeBatch: function(keyArray, options) { + return this.clear(options); + }, + clear: function (options) { options = options || {}; var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); @@ -347,31 +368,6 @@ IDBAdapter.prototype = { }); }, - findHighestIndex: function (keyPath, options) { - options = options || {}; - var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY); - - return new Promise(function (resolve, reject) { - var request; - if (keyPath) { - var openIndex = objectStore.index(keyPath); - request = openIndex.openCursor(null, consts.PREV); - } else { - request = objectStore.openCursor(null, consts.PREV); - } - - request.onsuccess = function (event) { - var value = _.get(event, ['target', 'result', 'key']); - resolve(value); - }; - - request.onerror = function (event) { - options._error = {event: event, message: 'find highest key error', callback: reject}; - self.opts.onerror(options); - }; - }); - }, - _match: function (query, json, keyPath, options) { var fields = _.get(options, ['data', 'filter', 'fields'], keyPath); return this.opts.matchMaker.call(this, json, query, {fields: fields}); diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index ff05be1f..aa30a9fe 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -4,6 +4,7 @@ var Radio = require('backbone.radio'); var IDBModel = require('./idb-model'); var IDBAdapter = require('./idb-adapter'); var _ = require('lodash'); +var bb = require('backbone'); module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ @@ -13,75 +14,77 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ storePrefix: 'wc_pos_', constructor: function () { + FilteredCollection.apply(this, arguments); this.db = new IDBAdapter({ collection: this }); this.versionCheck(); - FilteredCollection.apply(this, arguments); - }, - - /** - * Clears the IDB storage and resets the collection - */ - clear: function () { - var self = this; - return this.db.open() - .then(function () { - self.reset(); - return self.db.clear(); - }); }, /** * */ - count: function () { - var self = this; - return this.db.open() - .then(function () { - return self.db.count(); - }) - .then(function (count) { - self.trigger('count', count); - return count; - }); - }, + /* jshint -W071, -W074 */ + save: function(models, options){ + options = options || {}; + var collection = this, + wait = options.wait, + success = options.success, + setAttrs = options.set !== false; - /** - * - */ - putBatch: function (models, options) { - var self = this; - if (_.isEmpty(models)) { + if(models === null){ models = this.getChangedModels(); } - if (!models) { - return; + + var attrsArray = _.map(models, function(model){ + return model instanceof bb.Model ? model.toJSON() : model; + }); + + if(!wait && setAttrs){ + this.set(attrsArray, options); } - return this.db.open() - .then(function () { - return self.db.putBatch(models, options); - }); + + options.success = function(resp) { + var serverAttrs = options.parse ? collection.parse(resp, options) : resp; + if (serverAttrs && setAttrs) { collection.set(serverAttrs, options); } + if (success) { success.call(options.context, collection, resp, options); } + collection.trigger('sync', collection, resp, options); + }; + + return this.sync('update', this, _.extend(options, {attrsArray: attrsArray})); }, + /* jshint +W071, +W074 */ /** * */ - getBatch: function (keyArray, options) { - var self = this; - return this.db.open() - .then(function () { - return self.db.getBatch(keyArray, options); - }); + destroy: function(options){ + options = options || {}; + var collection = this, + wait = options.wait, + success = options.success; + + options.success = function(resp) { + if (wait) { collection.reset(); } + if (success) { success.call(options.context, collection, resp, options); } + collection.trigger('sync', collection, resp, options); + collection.resetNew(); + }; + + if(!wait) { collection.reset(); } + return this.sync('delete', this, options); }, /** * */ - findHighestIndex: function (keyPath, options) { - options = _.clone(options) || {}; + count: function () { var self = this; return this.db.open() .then(function () { - return self.db.findHighestIndex(keyPath, options); + return self.db.count(); + }) + .then(function (count) { + self.trigger('count', count); + return count; }); }, @@ -94,28 +97,6 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ }); }, - /** - * - */ - //removeBatch: function (models, options) { - // options = options || {}; - // var self = this; - // if (_.isEmpty(models)) { - // return; - // } - // return this.db.open() - // .then(function () { - // return self.db.removeBatch(models); - // }) - // .then(function () { - // self.remove(models); - // if (options.success) { - // options.success(self, models, options); - // } - // return models; - // }); - //}, - /** * Each website will have a unique idbVersion number * the version number is incremented on plugin update and some user actions @@ -135,7 +116,7 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ }), 10) || 0; if (newVersion !== oldVersion) { - this.clear().then(function () { + this.destroy().then(function () { Radio.request('entities', 'set', { type: 'localStorage', name: name + '_idbVersion', diff --git a/assets/js/src/lib/config/idb-model.js b/assets/js/src/lib/config/idb-model.js index 52fda5ee..6b39d623 100644 --- a/assets/js/src/lib/config/idb-model.js +++ b/assets/js/src/lib/config/idb-model.js @@ -1,16 +1,6 @@ var DeepModel = require('./deep-model'); var app = require('./application'); -var _ = require('lodash'); module.exports = app.prototype.IDBModel = DeepModel.extend({ - /** - * - */ - constructor: function( attributes, options ){ - this.db = _.get( options, ['collection', 'db'] ); - DeepModel.apply( this, arguments ); - } - - }); \ No newline at end of file diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js index bf496f92..e5c00a13 100644 --- a/assets/js/src/lib/config/idb-sync.js +++ b/assets/js/src/lib/config/idb-sync.js @@ -3,44 +3,35 @@ var bb = require('backbone'); /* jshint -W074 */ module.exports = function(method, entity, options) { options = options || {}; - var isModel = entity instanceof bb.Model; - var key = isModel && options.index ? entity.get(options.index) : entity.id; + var isModel = entity instanceof bb.Model, + data = options.attrsArray, + db = entity.db, + key; - return entity.db.open() + if(isModel){ + db = entity.collection.db; + key = options.index ? entity.get(options.index) : entity.id; + data = entity.toJSON(); + } + + return db.open() .then(function () { switch (method) { - case 'read': - if (isModel) { - return entity.db.get(key, options); - } - return entity.db.getBatch(options); case 'create': - return entity.db.add(entity.toJSON()) - .then(function (key) { - return entity.db.get(key); - }); case 'update': - return entity.db.put(entity.toJSON()) - .then(function (key) { - return entity.db.get(key); - }); + return db.update(data, options); + case 'read': + return db.read(key, options); case 'delete': - if (isModel) { - return entity.db.delete(key, options); - } - return; + return db.delete(key, options); } }) .then(function (resp) { - if (options.success) { - options.success(resp); - } + if (options.success) { options.success(resp); } return resp; }) .catch(function (resp) { - if (options.error) { - options.error(resp); - } + if (options.error) { options.error(resp); } }); }; diff --git a/assets/js/src/lib/config/infinite-list-view.js b/assets/js/src/lib/config/infinite-list-view.js index 63003680..5012d0a8 100644 --- a/assets/js/src/lib/config/infinite-list-view.js +++ b/assets/js/src/lib/config/infinite-list-view.js @@ -25,7 +25,7 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ }, onScroll: function(){ - if(!this.loading && this.hasNextPage() && this.triggerEvent()){ + if(!this.loading && this.collection.hasNextPage() && this.triggerEvent()){ this.appendNextPage(); } }, @@ -48,10 +48,6 @@ module.exports = app.prototype.InfiniteListView = Mn.CompositeView.extend({ }); }, - hasNextPage: function () { - return this.collection._hasNextPage; - }, - startLoading: function () { this.loading = true; this.$el.addClass('loading'); diff --git a/assets/js/src/lib/config/sync.js b/assets/js/src/lib/config/sync.js index 2e7bfa43..d3fdcc76 100644 --- a/assets/js/src/lib/config/sync.js +++ b/assets/js/src/lib/config/sync.js @@ -6,13 +6,16 @@ var bb = require('backbone'); var ajaxSync = bb.sync; var idbSync = require('./idb-sync'); var App = require('./application'); +var _ = require('lodash'); bb.sync = function(method, entity, options) { // wrap sync errors App.prototype.wrapError(options); - if( !options.remote && entity.db ) { + var idb = _.get(entity, ['collection', 'db'], entity.db); + + if( !options.remote && idb ) { return idbSync.apply(this, arguments); } diff --git a/includes/api/coupons.php b/includes/api/coupons.php index 06b035b7..11c1377e 100644 --- a/includes/api/coupons.php +++ b/includes/api/coupons.php @@ -60,6 +60,7 @@ public function get_all_ids( $filter = array() ) { } $query = new \WP_Query( $args ); + $this->server->add_pagination_headers($query); return array_map( array( $this, 'format_id' ), $query->posts ); } diff --git a/includes/api/customers.php b/includes/api/customers.php index b3c6f302..6cf954c6 100644 --- a/includes/api/customers.php +++ b/includes/api/customers.php @@ -250,6 +250,7 @@ public function get_all_ids( $filter = array() ){ } $query = new \WP_User_Query( $args ); + $this->server->add_pagination_headers($query); return array( 'customers' => array_map( array( $this, 'format_id' ), $query->results ) ); } diff --git a/includes/api/products.php b/includes/api/products.php index 44ba53d9..23523566 100644 --- a/includes/api/products.php +++ b/includes/api/products.php @@ -474,6 +474,7 @@ public function get_all_ids( $filter = array() ){ } $query = new \WP_Query( $args ); + $this->server->add_pagination_headers($query); return array( 'products' => array_map( array( $this, 'format_id' ), $query->posts ) ); } From 2d9da7820a76f90cd51eda3f030b4917a8c7051f Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Wed, 15 Jun 2016 14:20:00 +0800 Subject: [PATCH 050/169] fix gateway check for online store --- assets/css/src/scss/partials/_numpad.scss | 2 +- .../apps/settings/receipts/options/view.js | 10 +- .../settings/receipts/template/layout-view.js | 27 ++-- .../settings/receipts/template/preview.js | 41 ++++- .../apps/settings/receipts/template/route.js | 125 ++++++++-------- assets/js/src/entities/products/collection.js | 46 +++++- .../src/entities/products/models/abstract.js | 48 ------ assets/js/src/entities/service.js | 4 +- .../js/src/entities/templates/collection.js | 17 +++ assets/js/src/entities/templates/model.js | 5 + .../lib/components/modal/header/header.hbs | 4 +- assets/js/src/lib/config/ajax.js | 12 +- assets/js/src/lib/config/dual-collection.js | 21 ++- assets/js/src/lib/config/dual-model.js | 140 +++++++----------- .../js/src/lib/config/filtered-collection.js | 8 +- assets/js/src/lib/config/idb-adapter.js | 41 ++++- assets/js/src/lib/config/idb-collection.js | 40 ++++- assets/js/src/lib/config/idb-sync.js | 1 + assets/js/src/lib/config/sync.js | 20 +-- includes/activator.php | 17 +++ includes/admin/settings.php | 13 +- includes/admin/settings/page.php | 4 +- includes/admin/settings/receipts.php | 30 +++- .../admin/settings/views/receipt_options.php | 1 + includes/admin/status.php | 19 ++- includes/api/i18n.php | 4 - includes/api/orders.php | 2 +- includes/api/templates.php | 129 ++++++++++++++-- includes/gateways.php | 5 +- includes/template.php | 8 +- includes/views/print/receipt-epos-print.php | 69 +++++++++ includes/views/print/receipt-escp.php | 25 ++++ .../{tmpl-receipt.php => receipt-html.php} | 0 .../views/print/tmpl-receipt-epos-print.php | 8 - includes/views/print/tmpl-receipt-escp.php | 33 ----- package.json | 54 +++---- .../js/spec/entities/orders/model.spec.js | 4 +- tests/unit/php/spec/api/test-templates.php | 104 +++++++++++++ 38 files changed, 778 insertions(+), 363 deletions(-) create mode 100644 assets/js/src/entities/templates/collection.js create mode 100644 assets/js/src/entities/templates/model.js create mode 100644 includes/views/print/receipt-epos-print.php create mode 100644 includes/views/print/receipt-escp.php rename includes/views/print/{tmpl-receipt.php => receipt-html.php} (100%) delete mode 100644 includes/views/print/tmpl-receipt-epos-print.php delete mode 100644 includes/views/print/tmpl-receipt-escp.php diff --git a/assets/css/src/scss/partials/_numpad.scss b/assets/css/src/scss/partials/_numpad.scss index c4cfd4ab..4a16dd42 100644 --- a/assets/css/src/scss/partials/_numpad.scss +++ b/assets/css/src/scss/partials/_numpad.scss @@ -1,5 +1,5 @@ $numpad-key-spacing : $padding-base-horizontal / 3; -$numpad-key-height : 4rem; +$numpad-key-height : 2rem; /** * @name Numpad Spec diff --git a/assets/js/src/apps/settings/receipts/options/view.js b/assets/js/src/apps/settings/receipts/options/view.js index 1e6ba0d6..90fff507 100644 --- a/assets/js/src/apps/settings/receipts/options/view.js +++ b/assets/js/src/apps/settings/receipts/options/view.js @@ -4,19 +4,21 @@ var App = require('lib/config/application'); var View = SettingsView.extend({ ui: { - networkAddress: '#network_printer_address' + networkAddress: '#network_printer_address', + qzTrayOptions : '#qz_tray_options' }, modelEvents: { - 'change:print_method': 'maybeShowNetworkAddress' + 'change:print_method': 'maybeShowMethodExtras' }, onShow: function(){ - this.maybeShowNetworkAddress( this, this.model.get('print_method') ); + this.maybeShowMethodExtras( this, this.model.get('print_method') ); }, - maybeShowNetworkAddress: function( view, value ){ + maybeShowMethodExtras: function( view, value ){ this.ui.networkAddress.toggle( value === 'network' ); + this.ui.qzTrayOptions.toggle( value === 'qz-tray' ); } }); diff --git a/assets/js/src/apps/settings/receipts/template/layout-view.js b/assets/js/src/apps/settings/receipts/template/layout-view.js index 153ce221..03a85f39 100644 --- a/assets/js/src/apps/settings/receipts/template/layout-view.js +++ b/assets/js/src/apps/settings/receipts/template/layout-view.js @@ -2,14 +2,17 @@ var LayoutView = require('lib/config/layout-view'); var App = require('lib/config/application'); var hbs = require('handlebars'); -var View = LayoutView.extend({ +var languageMap = { + 'html' : 'html', + 'epos-print': 'xml', + 'escp' : 'javascript' +}; - initialize: function(){ - this.template = hbs.compile( this.model.template ); - }, +var View = LayoutView.extend({ - templateHelpers: function(){ - return this.options.template_data; + initialize: function(options){ + options = options || {}; + this.template = hbs.compile( options._template ); }, ui: { @@ -26,13 +29,11 @@ var View = LayoutView.extend({ }, onShow: function(){ - var editor = window.ace.edit( this.ui.editor[0] ); - editor.$blockScrolling = Infinity; - editor.getSession().setMode('ace/mode/html'); - editor.setValue( this.options.template_data.template, 1 ); - if( ! this.options.template_data.custom ){ - editor.setReadOnly(true); - } + this.editor = window.ace.edit( this.ui.editor[0] ); + var mode = 'ace/mode/' + languageMap[this.model.get('type')]; + this.editor.$blockScrolling = Infinity; + this.editor.getSession().setMode(mode); + this.editor.setValue( this.model.get('template'), 1 ); } }); diff --git a/assets/js/src/apps/settings/receipts/template/preview.js b/assets/js/src/apps/settings/receipts/template/preview.js index eaa36cc8..69eb3700 100644 --- a/assets/js/src/apps/settings/receipts/template/preview.js +++ b/assets/js/src/apps/settings/receipts/template/preview.js @@ -1,5 +1,7 @@ var ReceiptView = require('lib/config/receipt-view'); var hbs = require('handlebars'); +// var App = require('lib/config/application'); +var $ = require('jquery'); module.exports = ReceiptView.extend({ @@ -8,9 +10,46 @@ module.exports = ReceiptView.extend({ template: function(){}, onShow: function(){ - var template = hbs.compile( this.options.receipt_template ) ; + var template = hbs.compile( this.options.template_model.get('template') ) ; this.window = this.el.contentWindow; this.window.document.write(template( this.data )); + }, + + print: function(){ + var method = this.options.template_model.get('method'); + switch(method){ + case 'browser': + this.browserPrint(); + break; + case 'network': + this.networkPrint(); + break; + case 'qz-tray': + this.qzTrayPrint(); + break; + } + }, + + browserPrint: function(){ + this.el.contentWindow.print(); + }, + + networkPrint: function(){ + $.ajax({ + type : 'post', + url : this.options.template_model.get('network_address'), + contentType: 'text/xml', + data : this.el, + dataType : 'xml', + processData: false, + beforeSend : function (xhr) { + xhr.setRequestHeader('SOAPAction', '""'); + } + }); + }, + + qzTrayPrint: function(){ + } }); \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/template/route.js b/assets/js/src/apps/settings/receipts/template/route.js index a9747dbd..0ce9f209 100644 --- a/assets/js/src/apps/settings/receipts/template/route.js +++ b/assets/js/src/apps/settings/receipts/template/route.js @@ -3,7 +3,6 @@ var Radio = require('backbone.radio'); var LayoutView = require('./layout-view'); var Preview = require('./preview'); var PreviewActions = require('./actions'); -var App = require('lib/config/application'); var $ = require('jquery'); var polyglot = require('lib/utilities/polyglot'); @@ -13,11 +12,6 @@ var ReceiptRoute = Route.extend({ options = options || {}; this.container = options.container; this.model = options.model; - - this.collection = Radio.request('entities', 'get', { - name: 'orders', - type: 'collection' - }); }, fetch: function(){ @@ -25,33 +19,51 @@ var ReceiptRoute = Route.extend({ }, fetchOrder: function(){ - return this.collection.fetch({ + var self = this; + var orders = Radio.request('entities', 'get', { + name: 'orders', + type: 'collection', + init: true + }); + + return orders.fetch({ remote: true, data: { filter: { limit: 1 } } + }) + .then(function(){ + self.dummy_order = orders.first(); }); }, fetchTemplate: function(){ var self = this; - var wc_api = Radio.request('entities', 'get', { - type: 'option', - name: 'wc_api' + var templates = Radio.request('entities', 'get', { + name: 'templates', + type: 'collection', + init: true }); - return App.prototype.getJSON( wc_api + 'pos/templates/receipt') - .done( function( data ) { - self.template = data; - }); + return templates.fetch({ + data: { + filter: { + limit: 1, + type: 'receipt' + } + } + }) + .then(function(){ + self.template_model = templates.first(); + }); }, render: function() { this.layout = new LayoutView({ - model: this.model, - template_data: this.template + model: this.template_model, + _template: this.model.template }); this.listenTo( this.layout, 'show', this.showReceiptTemplate ); this.container.show(this.layout); @@ -65,8 +77,8 @@ var ReceiptRoute = Route.extend({ showReceiptTemplatePreview: function(){ var view = new Preview({ - model: this.collection.at(0), - receipt_template: this.template.template + model: this.dummy_order, + template_model: this.template_model }); this.layout.getRegion('preview').show(view); }, @@ -78,7 +90,7 @@ var ReceiptRoute = Route.extend({ }, print: function(){ - this.layout.getRegion('preview').currentView.el.contentWindow.print(); + this.layout.getRegion('preview').currentView.print(); }, showReceiptTemplateEditorActions: function(){ @@ -90,24 +102,31 @@ var ReceiptRoute = Route.extend({ this.listenTo(view, { 'action:save': function(btn){ btn.trigger('state', [ 'loading', '' ]); - self.enter(); - //options.model.save() - // .done( function(){ - // btn.trigger('state', [ 'success', null ]); - // }) - // .fail( function(){ - // btn.trigger('state', ['error', null ]); - // }); + + Promise.resolve() + .then(function(){ + return self.template_model.save({ + template: self.layout.editor.getValue() + }); + }) + .then( function() { + btn.trigger('state', [ 'success', null ]); + self.enter(); + }) + .catch(function(){ + btn.trigger('state', ['error', null ]); + }); }, - 'action:delete': function(btn){ + 'action:restore': function(btn){ btn.trigger('state', [ 'loading', '' ]); - //options.model.fetch({ data: { defaults: true } }) - // .done( function(){ - // btn.trigger('state', [ 'success', null ]); - // }) - // .fail( function(){ - // btn.trigger('state', ['error', null ]); - // }); + self.template_model.destroy() + .then( function() { + btn.trigger('state', [ 'success', null ]); + self.enter(); + }) + .catch(function(){ + btn.trigger('state', ['error', null ]); + }); } }); @@ -115,31 +134,21 @@ var ReceiptRoute = Route.extend({ }, getEditorActions: function(){ - if( this.template.custom ){ - return [ - { - action : 'save', - className : 'button-primary', - icon : 'append' - },{ - // type: 'message' - //},{ - action : 'delete', - label : polyglot.t('buttons.delete-template'), - className : 'button-secondary alignright', - icon : 'prepend' - } - ]; + var btns = [{ + action : 'save', + className: 'button-primary', + icon : 'append' + }]; + + if( this.template_model.id ){ + btns.push({ + action : 'restore', + className : 'button-secondary alignright', + icon : 'prepend' + }); } - return [ - { - action : 'copy', - label : polyglot.t('buttons.copy-file'), - className : 'button-primary', - icon : 'append' - } - ]; + return btns; } }); diff --git a/assets/js/src/entities/products/collection.js b/assets/js/src/entities/products/collection.js index 3a629637..4246b600 100644 --- a/assets/js/src/entities/products/collection.js +++ b/assets/js/src/entities/products/collection.js @@ -1,10 +1,22 @@ var DualCollection = require('lib/config/dual-collection'); +var _ = require('lodash'); var subclasses = { simple : require('./models/simple'), variable : require('./models/variable') }; +var replaceCat = function(query){ + _.each(query, function(q){ + if(_.has(q, 'queries')){ + return replaceCat(q.queries); + } + if(_.has(q, 'prefix') && q.prefix === 'cat'){ + q.prefix = 'categories'; + } + }); +}; + module.exports = DualCollection.extend({ /** @@ -18,7 +30,39 @@ module.exports = DualCollection.extend({ name: 'products', + defaultFilterOptions: { + fields : ['title'], + order : 'ASC', + orderby: 'title' + }, + // this is an array of fields used by FilterCollection.matchmaker() - fields: ['title'] + fields: ['title'], + + /** + * Special cases for product model filter + */ + matchMaker: function(json, query, options){ + var matchMaker = this.default.matchMaker; + if(_.isArray(query)){ + replaceCat(query); + } + + // parent match + var parentMatch = matchMaker.call(this, json, query, options); + if(parentMatch){ + return true; + } + + // any variation match + if(!_.isEmpty(json.variations)){ + var variationMatch = _.some(json.variations, function(variation){ + return matchMaker(variation, query, options); + }); + if(variationMatch){ + return true; + } + } + } }); \ No newline at end of file diff --git a/assets/js/src/entities/products/models/abstract.js b/assets/js/src/entities/products/models/abstract.js index 741437d7..3a1a2ad5 100644 --- a/assets/js/src/entities/products/models/abstract.js +++ b/assets/js/src/entities/products/models/abstract.js @@ -23,54 +23,6 @@ module.exports = DualModel.extend({ .where({variation: false}) .where({visible: true}) .value(); - }, - - /** - * Special cases for product model filter - */ - matchMaker: function(tokens, methods, callback){ - - var match = _.all(tokens, function(token){ - - // barcode - if( token.type === 'prefix' && token.prefix === 'barcode' ){ - if(token.query){ return this.barcodeMatch(token.query); } - } - - // cat - if( token.type === 'prefix' && token.prefix === 'cat' ){ - token.prefix = 'categories'; - return methods.prefix(token, this); - } - - }, this); - - //if(match){ - // return match; - //} - - // the original matchMaker - return match ? match : callback(tokens, this); - - }, - - barcodeMatch: function(barcode){ - var type = this.get('type'), - test = this.get('barcode').toLowerCase(), - value = barcode.toString().toLowerCase(); - - if(test === value) { - if(type !== 'variable'){ - this.trigger('match:barcode', this); - } - return true; - } - - if(type !== 'variable'){ - return this.partialBarcodeMatch(test, value); - } - - return this.variableBarcodeMatch(test, value); } }); \ No newline at end of file diff --git a/assets/js/src/entities/service.js b/assets/js/src/entities/service.js index 19afb8b2..3da88b7e 100644 --- a/assets/js/src/entities/service.js +++ b/assets/js/src/entities/service.js @@ -6,6 +6,7 @@ var Customers = require('./customers/collection'); var Coupons = require('./coupons/collection'); var Settings = require('./settings/collection'); var Gateways = require('./gateways/collection'); +var Templates = require('./templates/collection'); var debug = require('debug')('entities'); var App = require('lib/config/application'); var _ = require('lodash'); @@ -29,7 +30,8 @@ var EntitiesService = Service.extend({ customers : Customers, coupons : Coupons, gateways : Gateways, - settings : Settings + settings : Settings, + templates : Templates }, getMethods: { diff --git a/assets/js/src/entities/templates/collection.js b/assets/js/src/entities/templates/collection.js new file mode 100644 index 00000000..736c5cab --- /dev/null +++ b/assets/js/src/entities/templates/collection.js @@ -0,0 +1,17 @@ +var bb = require('backbone'); +var Model = require('./model'); +var Radio = require('backbone.radio'); + +module.exports = bb.Collection.extend({ + + model: Model, + + url: function(){ + var wc_api = Radio.request('entities', 'get', { + type: 'option', + name: 'wc_api' + }); + return wc_api + 'pos/templates'; + } + +}); diff --git a/assets/js/src/entities/templates/model.js b/assets/js/src/entities/templates/model.js new file mode 100644 index 00000000..d647629b --- /dev/null +++ b/assets/js/src/entities/templates/model.js @@ -0,0 +1,5 @@ +var bb = require('backbone'); + +module.exports = bb.Model.extend({ + +}); \ No newline at end of file diff --git a/assets/js/src/lib/components/modal/header/header.hbs b/assets/js/src/lib/components/modal/header/header.hbs index a15d66bf..de8d4cd7 100644 --- a/assets/js/src/lib/components/modal/header/header.hbs +++ b/assets/js/src/lib/components/modal/header/header.hbs @@ -1,9 +1,11 @@

                    {{{title}}}

                    - + {{#if close}} diff --git a/assets/js/src/lib/config/ajax.js b/assets/js/src/lib/config/ajax.js index d49a1d7f..d5efee5b 100644 --- a/assets/js/src/lib/config/ajax.js +++ b/assets/js/src/lib/config/ajax.js @@ -53,7 +53,7 @@ module.exports = { success: callback }); - return $.ajax( options ).fail( onError ); + return $.ajax( options ).catch( onError ); }, /* jshint +W072 */ @@ -67,14 +67,6 @@ module.exports = { // attach for use by bb.sync config ajaxSetup: ajaxSetup, - onError: onError, - - wrapError: function(options){ - var error = options.error; - options.error = function(){ - onError.apply(this, arguments); - error.apply(this, arguments); - }; - } + onError: onError }; \ No newline at end of file diff --git a/assets/js/src/lib/config/dual-collection.js b/assets/js/src/lib/config/dual-collection.js index 6be0ce35..c8b6f358 100644 --- a/assets/js/src/lib/config/dual-collection.js +++ b/assets/js/src/lib/config/dual-collection.js @@ -172,13 +172,28 @@ module.exports = app.prototype.DualCollection = IDBCollection.extend({ }); }, + // fullSync: function(options){ + // options = options || {}; + // var collection = this; + // return this.fetchRemoteIds(null, options) + // .then(function(response){ + // collection._parseFetchOptions(options); + // collection.trigger('sync', collection, response, options); + // }); + // }, + fullSync: function(options){ - options = options || {}; var collection = this; return this.fetchRemoteIds(null, options) .then(function(response){ - collection._parseFetchOptions(options); - collection.trigger('sync', collection, response, options); + return collection.destroy(null, { + index: 'id', + data: { + filter: { + not_in: _.map(response, 'id') + } + } + }); }); }, diff --git a/assets/js/src/lib/config/dual-model.js b/assets/js/src/lib/config/dual-model.js index 09a6735e..cb70e7be 100644 --- a/assets/js/src/lib/config/dual-model.js +++ b/assets/js/src/lib/config/dual-model.js @@ -1,4 +1,3 @@ -var bb = require('backbone'); var IDBModel = require('./idb-model'); var _ = require('lodash'); var app = require('./application'); @@ -24,123 +23,90 @@ module.exports = app.prototype.DualModel = IDBModel.extend({ return urlRoot; }, - fetch: function(options){ - options = _.extend({parse: true}, options); - var self = this, success = options.success; - var _fetch = options.remote ? this.fetchRemote : this.fetchLocal; - - if(success){ - options.success = undefined; + /* jshint -W071, -W074, -W116 */ + save: function(key, val, options){ + var attrs; + if (key == null || typeof key === 'object') { + attrs = key; + options = val; + } else { + (attrs = {})[key] = val; } - return _fetch.call(this, options) - .then(function (response) { - self.set(response, options); - if (success) { - success.call(options.context, self, response, options); - } - self.trigger('sync', self, response, options); - return response; - }); - }, - - fetchLocal: function(options){ - var self = this, isNew = this.isNew(); - return this.sync('read', this, options) - .then(function(response){ - // if(!response) { - // options.remote = true; - // return self.sync('read', this, options); - // } - return response; - }) - .then(function(response){ - if(isNew){ - self.collection.fullSync(); - } - return response; - }); - }, - - fetchRemote: function(options){ options = options || {}; - options.remote = true; - return this.sync('read', this, options); - }, + var method = this.hasRemoteId() ? 'update' : 'create'; + this.set({ _state: this.collection.states[method] }); - sync: function( method, model, options ){ - options = options || {}; - if( method !== 'read' ){ - this.setLocalState( method ); + if(!options.remote){ + return IDBModel.prototype.save.apply(this, arguments); } - if( options.remote ){ - return this.remoteSync( method, model, options ); + + var model = this, success = options.success, local_id; + _.extend(options, { success: undefined, remote: false }); + if (options.patch && !options.attrs) { + options.attrs = this.prepareRemoteJSON(attrs); } - return bb.sync.call( this, method, model, options ); - }, - remoteSync: function( method, model, options ){ - var self = this, opts = _.extend({}, options, { - remote: false, - success: false - }); - return bb.sync.call( this, method, model, opts ) - .then( function(){ - var remoteMethod = self.getRemoteMethod(); - opts.remote = true; - return bb.sync.call( self, remoteMethod, model, opts ); + return this.sync(method, this, options) + .then(function(resp){ + local_id = resp.local_id; + _.extend(options, { remote: true }); + return model.sync(method, model, options); }) - .then( function( resp ){ - resp = options.parse ? model.parse(resp, options) : resp; - model.set( resp ); - opts.remote = false; - opts.success = options.success; - return bb.sync.call( self, 'update', model, opts ); + .then(function(resp){ + resp = model.parse(resp, options); + model.set({ _state: undefined }); + _.extend(options, { remote: false, success: success }); + return IDBModel.prototype.save.call(model, resp, options); }); }, + /* jshint +W071, +W074, +W116 */ - setLocalState: function( method ){ - method = method === 'patch' ? 'update' : method; - if( method === 'update' && !this.hasRemoteId() ){ - method = 'create'; - } - if( method === 'create' && this.hasRemoteId() ){ - method = 'update'; + fetch: function(options){ + options = _.extend({parse: true}, options); + + if(!options.remote){ + return IDBModel.prototype.fetch.call(this, options); } - this.set({ _state: this.collection.states[method] }); - }, - getRemoteMethod: function(){ - return _.invert( this.collection.states )[ this.get('_state') ]; + var model = this; + + return this.sync('read', this, options) + .then(function (resp) { + resp = model.parse(resp, options); + _.extend(options, { remote: false }); + return IDBModel.prototype.save.call(model, resp, options); + }); }, - hasRemoteId: function() { - return !!this.get( this.remoteIdAttribute ); + hasRemoteId: function () { + return !!this.get(this.remoteIdAttribute); }, - toJSON: function( options ){ + toJSON: function (options) { options = options || {}; - var json = IDBModel.prototype.toJSON.apply( this, arguments ); - if( options.remote && this.name ) { + var json = IDBModel.prototype.toJSON.apply(this, arguments); + if (options.remote && this.name) { json = this.prepareRemoteJSON(json); } return json; }, - prepareRemoteJSON: function(json){ - json._state = undefined; + prepareRemoteJSON: function (json) { + if(_.has(json, '_state')){ + delete json._state; + } var nested = {}; nested[this.name] = json; return nested; }, - parse: function( resp, options ) { + parse: function (resp, options) { options = options || {}; - if( options.remote ){ + if (options.remote) { resp = resp && resp[this.name] ? resp[this.name] : resp; - resp._state = undefined; } - return IDBModel.prototype.parse.call( this, resp, options ); + return IDBModel.prototype.parse.call(this, resp, options); } }); \ No newline at end of file diff --git a/assets/js/src/lib/config/filtered-collection.js b/assets/js/src/lib/config/filtered-collection.js index 156f3095..4f4b3610 100644 --- a/assets/js/src/lib/config/filtered-collection.js +++ b/assets/js/src/lib/config/filtered-collection.js @@ -37,7 +37,13 @@ module.exports = app.prototype.FilteredCollection = Collection.extend({ if(this.superset){ return this.supersetFetch(); } - return this.fetch({data: {filter: this.getFilterOptions()}}); + + if(this._filterOptions && this._filterOptions.xhr){ + debugger; + } + + this._filterOptions = {data: {filter: this.getFilterOptions()}}; + return this.fetch(this._filterOptions); }, /* jshint: +W071 +W074 */ diff --git a/assets/js/src/lib/config/idb-adapter.js b/assets/js/src/lib/config/idb-adapter.js index fd711ad5..c9854117 100644 --- a/assets/js/src/lib/config/idb-adapter.js +++ b/assets/js/src/lib/config/idb-adapter.js @@ -224,10 +224,17 @@ IDBAdapter.prototype = { remove: function (key, options) { options = options || {}; - var self = this, objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE); + var objectStore = options.objectStore || this.getObjectStore(consts.READ_WRITE), + keyPath = options.index || this.opts.keyPath, + self = this; + + if(_.isObject(key)){ + key = key[keyPath]; + } return new Promise(function (resolve, reject) { - var request = objectStore.delete(key); + var request = (keyPath === self.opts.keyPath) ? + objectStore.delete(key) : objectStore.index(keyPath).delete(key); request.onsuccess = function (event) { resolve(event.target.result); // undefined @@ -238,6 +245,7 @@ IDBAdapter.prototype = { err.code = event.target.errorCode; reject(err); }; + request.onerror = function (event) { options._error = {event: event, message: 'delete error', callback: reject}; self.opts.onerror(options); @@ -290,6 +298,7 @@ IDBAdapter.prototype = { var objectStore = options.objectStore || this.getObjectStore(consts.READ_ONLY), include = _.isArray(keyArray) ? keyArray : _.get(options, ['data', 'filter', 'in']), + exclude = _.get(options, ['data', 'filter', 'not_in']), limit = _.get(options, ['data', 'filter', 'limit'], -1), start = _.get(options, ['data', 'filter', 'offset'], 0), order = _.get(options, ['data', 'filter', 'order'], 'ASC'), @@ -326,6 +335,7 @@ IDBAdapter.prototype = { } if ( (!include || _.includes(include, cursor.value[keyPath])) && + (!exclude || !_.includes(exclude, cursor.value[keyPath])) && (!query || self._match(query, cursor.value, keyPath, options)) ) { records.push(cursor.value); @@ -345,8 +355,31 @@ IDBAdapter.prototype = { }); }, - removeBatch: function(keyArray, options) { - return this.clear(options); + removeBatch: function(dataArray, options) { + var batch = []; + options = options || {}; + dataArray = dataArray || options.attrsArray; + + if(_.isEmpty(dataArray) && !options.data){ + return this.clear(options); + } + + if(options.data){ + var self = this; + return this.getBatch(null, options) + .then(function(response){ + options.attrsArray = _.map(response, self.opts.keyPath); + if(!_.isEmpty(options.attrsArray)){ + return self.removeBatch(options.attrsArray); + } + }); + } + + _.each(dataArray, function (data) { + batch.push(this.remove(data, options)); + }.bind(this)); + + return Promise.all(batch); }, clear: function (options) { diff --git a/assets/js/src/lib/config/idb-collection.js b/assets/js/src/lib/config/idb-collection.js index aa30a9fe..c64315ba 100644 --- a/assets/js/src/lib/config/idb-collection.js +++ b/assets/js/src/lib/config/idb-collection.js @@ -51,27 +51,55 @@ module.exports = app.prototype.IDBCollection = FilteredCollection.extend({ return this.sync('update', this, _.extend(options, {attrsArray: attrsArray})); }, - /* jshint +W071, +W074 */ /** * */ - destroy: function(options){ - options = options || {}; + destroy: function(models, options){ + if(!options && models && !_.isArray(models)){ + options = models; + models = undefined; + } else { + options = options || {}; + } + var collection = this, wait = options.wait, success = options.success; + if(models){ + options.attrsArray = _.map(models, function(model){ + return model instanceof bb.Model ? model.toJSON() : model; + }); + } + + if(options.data){ + wait = true; + } + options.success = function(resp) { - if (wait) { collection.reset(); } + if(wait && !options.attrsArray) { + collection.resetNew(); + collection.reset(); + } + if(wait && options.attrsArray) { + collection.remove(options.attrsArray); + } if (success) { success.call(options.context, collection, resp, options); } collection.trigger('sync', collection, resp, options); - collection.resetNew(); }; - if(!wait) { collection.reset(); } + if(!wait && !options.attrsArray) { + collection.reset(); + } + + if(!wait && options.attrsArray) { + collection.remove(options.attrsArray); + } + return this.sync('delete', this, options); }, + /* jshint +W071, +W074 */ /** * diff --git a/assets/js/src/lib/config/idb-sync.js b/assets/js/src/lib/config/idb-sync.js index e5c00a13..54fa530a 100644 --- a/assets/js/src/lib/config/idb-sync.js +++ b/assets/js/src/lib/config/idb-sync.js @@ -19,6 +19,7 @@ module.exports = function(method, entity, options) { switch (method) { case 'create': case 'update': + case 'patch': return db.update(data, options); case 'read': return db.read(key, options); diff --git a/assets/js/src/lib/config/sync.js b/assets/js/src/lib/config/sync.js index d3fdcc76..1723eb11 100644 --- a/assets/js/src/lib/config/sync.js +++ b/assets/js/src/lib/config/sync.js @@ -7,20 +7,22 @@ var ajaxSync = bb.sync; var idbSync = require('./idb-sync'); var App = require('./application'); var _ = require('lodash'); +var Radio = require('backbone.radio'); bb.sync = function(method, entity, options) { - - // wrap sync errors - App.prototype.wrapError(options); - - var idb = _.get(entity, ['collection', 'db'], entity.db); + var promise, idb = _.get(entity, ['collection', 'db'], entity.db); if( !options.remote && idb ) { - return idbSync.apply(this, arguments); + promise = idbSync.apply(this, arguments); + } else { + App.prototype.ajaxSetup( options ); + promise = ajaxSync.apply(this, arguments); } - // add headers, global data etc - App.prototype.ajaxSetup( options ); + promise.catch(function(){ + var args = Array.prototype.slice.call(arguments); + Radio.trigger('global', 'error', args); + }); - return ajaxSync.apply(this, arguments); + return promise; }; \ No newline at end of file diff --git a/includes/activator.php b/includes/activator.php index ac5c0933..87bc92ef 100644 --- a/includes/activator.php +++ b/includes/activator.php @@ -40,6 +40,9 @@ public function run(){ // Run update script if required $this->version_check(); + + // resolve plugin plugins + $this->plugin_check(); new Setup(); } @@ -213,4 +216,18 @@ private function permalink_check(){ } } + /** + * Plugin conflicts + * + * - NextGEN Gallery is a terrible plugin. It buffers all content on 'init' action, priority -1 and inserts junk code. + * + */ + private function plugin_check(){ + + // disable NextGEN Gallery resource manager + if( !defined('NGG_DISABLE_RESOURCE_MANAGER') ) + define( 'NGG_DISABLE_RESOURCE_MANAGER', true ); + + } + } \ No newline at end of file diff --git a/includes/admin/settings.php b/includes/admin/settings.php index e176a158..fb215cc1 100644 --- a/includes/admin/settings.php +++ b/includes/admin/settings.php @@ -71,12 +71,14 @@ public function enqueue_admin_scripts() { $wp_scripts->queue = array(); // deregister scripts + wp_deregister_script( 'jquery' ); wp_deregister_script( 'underscore' ); wp_deregister_script( 'select2' ); wp_deregister_script( 'backbone' ); // register $external_libs = Template::get_external_js_libraries(); + wp_register_script( 'jquery', $external_libs[ 'jquery' ], false, null, true ); wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); @@ -87,9 +89,6 @@ public function enqueue_admin_scripts() { wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.1/js/select2.min.js', array( 'jquery' ), null, true ); wp_register_script( 'ace', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.2/ace.js', false, null, true ); - // enqueue - wp_enqueue_script( 'jquery-ui-sortable' ); - $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; wp_enqueue_script( @@ -100,14 +99,6 @@ public function enqueue_admin_scripts() { true ); - wp_enqueue_script( - 'eventsource-polyfill', - \WC_POS\PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', - array(), - null, - true - ); - $scripts = apply_filters( 'woocommerce_pos_admin_enqueue_scripts', array() ); if ( isset( $scripts[ 'locale' ] ) ) { wp_enqueue_script( diff --git a/includes/admin/settings/page.php b/includes/admin/settings/page.php index b2889f74..93b490b6 100644 --- a/includes/admin/settings/page.php +++ b/includes/admin/settings/page.php @@ -92,10 +92,10 @@ public function option_name(){ /** * Get options - * @param bool|false $key + * @param null $key * @return bool|mixed|void */ - public function get($key = false){ + public function get($key = null){ $data = get_option( $this->option_name() ); if(!$data){ $data = apply_filters( 'woocommerce_pos_' . $this->id . '_settings_defaults', $this->get_defaults() ); diff --git a/includes/admin/settings/receipts.php b/includes/admin/settings/receipts.php index c6b9abe1..dac1fdf9 100644 --- a/includes/admin/settings/receipts.php +++ b/includes/admin/settings/receipts.php @@ -23,9 +23,35 @@ public function __construct() { $this->label = __( 'Receipts', 'woocommerce-pos' ); $this->section_handlers = array( - '\WC_POS\Admin\Settings\Receipt\Options', - '\WC_POS\Admin\Settings\Receipt\Template' + 'receipt_options' => '\WC_POS\Admin\Settings\Receipt\Options', + 'receipt_template' => '\WC_POS\Admin\Settings\Receipt\Template' ); } + /** + * @param null $args + * @return array|bool|mixed|void + */ + public function get( $args = null ) { + $section = isset( $args[ 'section' ] ) ? $args[ 'section' ] : $args; + $key = isset( $args[ 'key' ] ) ? $args[ 'key' ] : null; + + if ( $section ) { + $handler = $this->section_handlers[ $section ]; + if ( $handler ) { + $settings = $handler::get_instance(); + return $settings->get( $key ); + } + return false; + } + + $data = array(); + foreach ( $this->section_handlers as $id => $handler ) { + $settings = $handler::get_instance(); + $data[ $key ] = $settings->get(); + } + return $data; + + } + } \ No newline at end of file diff --git a/includes/admin/settings/views/receipt_options.php b/includes/admin/settings/views/receipt_options.php index ae49bfc2..db7a291e 100644 --- a/includes/admin/settings/views/receipt_options.php +++ b/includes/admin/settings/views/receipt_options.php @@ -29,6 +29,7 @@ + Open QZ Tray Demo

                    %1$s', 'woocommerce-pos' ), 'http://woopos.com.au/docs/receipts/print-method' ); ?>

                    diff --git a/includes/admin/status.php b/includes/admin/status.php index 338461c5..73db854f 100644 --- a/includes/admin/status.php +++ b/includes/admin/status.php @@ -63,18 +63,18 @@ static public function handlers(){ * Settings scripts */ public function enqueue_admin_scripts() { - - // global $wp_scripts; $wp_scripts->queue = array(); // deregister scripts + wp_deregister_script( 'jquery' ); wp_deregister_script( 'underscore' ); wp_deregister_script( 'select2' ); wp_deregister_script( 'backbone' ); // register $external_libs = Template::get_external_js_libraries(); + wp_register_script( 'jquery', $external_libs[ 'jquery' ], false, null, true ); wp_register_script( 'lodash', $external_libs[ 'lodash' ], array( 'jquery' ), null, true ); wp_register_script( 'backbone', $external_libs[ 'backbone' ], array( 'jquery', 'lodash' ), null, true ); wp_register_script( 'backbone.radio', $external_libs[ 'radio' ], array( 'jquery', 'backbone', 'lodash' ), null, true ); @@ -82,17 +82,22 @@ public function enqueue_admin_scripts() { wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); - wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js', array( 'jquery' ), null, true ); - - // enqueue - wp_enqueue_script( 'jquery-ui-sortable' ); +// wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js', array( 'jquery' ), null, true ); $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; + wp_enqueue_script( + 'eventsource-polyfill', + \WC_POS\PLUGIN_URL . 'assets/js/vendor/eventsource.min.js', + array(), + null, + true + ); + wp_enqueue_script( \WC_POS\PLUGIN_NAME . '-admin-system-status-app', \WC_POS\PLUGIN_URL . 'assets/js/admin-system-status.' . $build . '.js', - array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment', 'select2' ), + array( 'backbone', 'backbone.radio', 'marionette', 'handlebars', 'accounting', 'moment' ), \WC_POS\VERSION, true ); diff --git a/includes/api/i18n.php b/includes/api/i18n.php index 1294214a..69c42332 100644 --- a/includes/api/i18n.php +++ b/includes/api/i18n.php @@ -164,10 +164,6 @@ private function common_buttons() { private function admin_buttons(){ return array( 'restore' => _x( 'Restore defaults', 'restore default settings', 'woocommerce-pos' ), - /* translators: woocommerce */ - 'delete-template' => __( 'Delete template file', 'woocommerce' ), - /* translators: woocommerce */ - 'copy-file' => __( 'Copy file to theme', 'woocommerce' ), ); } diff --git a/includes/api/orders.php b/includes/api/orders.php index 45523d86..65244e75 100644 --- a/includes/api/orders.php +++ b/includes/api/orders.php @@ -596,7 +596,7 @@ public function order_response( $order_data, $order, $fields, $server ) { foreach( $order_data['shipping_lines'] as &$item ) { if(isset( $item['id'] )) { $taxes = wc_get_order_item_meta( $item['id'], 'taxes' ); - $item['total_tax'] = wc_format_decimal( array_sum($taxes) ); + $item['total_tax'] = is_array($taxes) ? wc_format_decimal( array_sum($taxes) ) : 0 ; } } diff --git a/includes/api/templates.php b/includes/api/templates.php index fd2bbdde..08c94355 100644 --- a/includes/api/templates.php +++ b/includes/api/templates.php @@ -34,12 +34,14 @@ public function register_routes( array $routes ) { # GET /pos/templates $routes[ $this->base ] = array( - array( array( $this, 'get_templates' ), WC_API_Server::READABLE ) + array( array( $this, 'get_templates' ), WC_API_Server::READABLE ), + array( array( $this, 'create_receipt_template' ), WC_API_Server::CREATABLE | WC_API_Server::ACCEPT_DATA ) ); - # GET /pos/templates - $routes[ $this->base . '/receipt' ] = array( - array( array( $this, 'get_receipt_template' ), WC_API_Server::READABLE ) + # PUT, DELETE /pos/templates/ + $routes[ $this->base . '/(?P\d+)' ] = array( + array( array( $this, 'update_receipt_template' ), WC_API_Server::EDITABLE | WC_API_Server::ACCEPT_DATA ), + array( array( $this, 'delete_receipt_template' ), WC_API_Server::DELETABLE ), ); # GET /pos/templates/modal/ @@ -64,10 +66,16 @@ public function get_template_dir() { * @param null $wc_pos_admin * @return array */ - public function get_templates( $wc_pos_admin = null ){ + public function get_templates( $wc_pos_admin = null, $filter = array() ){ + + if(isset($filter['type']) && $filter['type'] == 'receipt'){ + return $this->get_receipt_template(); + } + if( $wc_pos_admin ){ return; } + return apply_filters( 'woocommerce_pos_templates', $this->create_templates_array(), $this ); } @@ -174,9 +182,11 @@ public function template_output( $file, $trim = true ) { /** * Returns path of print receipt template + * @param $file + * @return */ - public function locate_print_receipt_template() { - $receipt_path = $this->locate_template_file( \WC_POS\PLUGIN_PATH . 'includes/views/print/tmpl-receipt.php' ); + public function locate_print_receipt_template($file) { + $receipt_path = $this->locate_template_file( \WC_POS\PLUGIN_PATH . 'includes/views/print/' . $file ); return apply_filters( 'woocommerce_pos_print_receipt_path', $receipt_path ); } @@ -196,15 +206,108 @@ public function get_modal( $id = '' ){ * */ public function get_receipt_template() { - $default_path = ''; - $path = $this->locate_print_receipt_template(); + $this->register_receipt_status(); + + $options = wc_pos_get_option('receipts', 'receipt_options'); + $type = isset($options['template_language']) ? $options['template_language'] : 'html'; + $method = isset($options['print_method']) ? $options['print_method'] : 'browser'; + $network_address = isset($options['network_printer_address']) ? $options['network_printer_address'] : ''; + + $posts = get_posts( array( + 'posts_per_page' => 1, + 'post_type' => 'wc-print-template', + 'post_status' => $type + )); + + if(!empty($posts)){ + $template = $posts[0]; + return array( + array( + 'id' => $template->ID, + 'type' => $type, + 'method' => $method, + 'network_address' => $network_address, + 'template' => $template->post_content + ) + ); + } + + $path = $this->locate_print_receipt_template('receipt-' . $type . '.php'); + + // backwards compat + if(!$path && $type == 'html'){ + $path = $this->locate_print_receipt_template('tmpl-receipt.php'); + } return array( - 'path' => $path, - 'default_path' => $default_path, - 'custom' => $path != $default_path, - 'template' => $this->template_output( $path, false ) + array( + 'type' => $type, + 'method' => $method, + 'network_address' => $network_address, + 'template' => $this->template_output( $path, false ) + ) + ); + } + + /** + * + */ + public function create_receipt_template( array $data ) { + $this->update_receipt_template(null, $data); + } + + /** + * + */ + public function update_receipt_template( $id, array $data ) { + $template = isset($data['template']) ? $data['template'] : ''; + $post_status = wc_pos_get_option('receipts', array( + 'section' => 'receipt_options', + 'key' => 'template_language' + )); + + $args = array( + 'ID' => (int) $id, + 'post_type' => 'wc-print-template', + 'post_status' => $post_status, + 'post_title' => 'Receipt Template', + 'post_content' => $template, + 'comment_status' => 'closed', + 'ping_status' => 'closed' ); + + wp_insert_post($args); + + return $this->get_receipt_template(); + } + + /** + * @param $id + * @return array + */ + public function delete_receipt_template( $id ) { + $post = get_post($id); + + if($post && $post->post_type == 'wc-print-template'){ + wp_delete_post($id); + } + + return $this->get_receipt_template(); + } + + /** + * + */ + private function register_receipt_status(){ + $receipt_types = array( + 'html' => array(), + 'epos-print' => array(), + 'escp' => array() + ); + + foreach ( $receipt_types as $type => $values ) { + register_post_status( $type, $values ); + } } } \ No newline at end of file diff --git a/includes/gateways.php b/includes/gateways.php index 9bf816f9..7c8baa50 100644 --- a/includes/gateways.php +++ b/includes/gateways.php @@ -44,9 +44,10 @@ public static function get_instance() { * @return array */ public function payment_gateways( array $gateways ) { - // don't show POS gateways on WC settings page global $plugin_page; - if( $plugin_page == 'wc-settings' ){ + + // don't show POS gateways on WC settings page or online checkout + if( is_admin() && $plugin_page == 'wc-settings' || !is_admin() && !is_pos() ){ return $gateways; } diff --git a/includes/template.php b/includes/template.php index 1d43bdc6..5e061267 100644 --- a/includes/template.php +++ b/includes/template.php @@ -25,24 +25,24 @@ class Template { /** @var array external libraries */ static public $external_libs = array( 'min' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-rc1/jquery.min.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.min.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.min.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js', - 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js', + 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.min.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', ), 'debug' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-rc1/jquery.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.js', 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js', - 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.js', + 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.js', ) diff --git a/includes/views/print/receipt-epos-print.php b/includes/views/print/receipt-epos-print.php new file mode 100644 index 00000000..341bea51 --- /dev/null +++ b/includes/views/print/receipt-epos-print.php @@ -0,0 +1,69 @@ + + + + + + + + : {{order_number}} + : {{formatDate completed_at format="MMMM Do YYYY, h:mm:ss a"}} + {{#if cashier}} + : {{cashier.first_name}} {{cashier.last_name}} + {{/if}} + : {{payment_details.method_title}} + + + + {{#each line_items}} + {{number quantity precision="auto"}} {{name}} + {{#with meta}} + {{#each []}}{{label}}: {{value}}{{/each}} + {{/with}} + {{#if on_sale}} + ({{{money subtotal}}}) {{{money total}}} + {{else}} + {{{money total}}} + {{/if}} + {{/each}} + + : {{{money subtotal}}} + {{#if has_discount}} + : {{{money cart_discount negative=true}}} + {{/if}} + {{#each shipping_lines}} + {{method_title}}: {{{money total}}} + {{/each}} + {{#each fee_lines}} + {{title}}: {{{money total}}} + {{/each}} + {{#if has_tax}} + {{#if itemized}} + {{#each tax_lines}} + {{#if has_tax}} + + {{#if ../../incl_tax}}(){{/if}} + {{title}}: {{{money total}}} + + {{/if}} + {{/each}} + {{else}} + + {{#if incl_tax}}(){{/if}} + countries->tax_or_vat() ); ?> + {{{money total_tax}}} + + {{/if}} + {{/if}} + : {{{money total}}} + {{#if payment_details.method_pos_cash}} + : {{{money payment_details.method_pos_cash.tendered}}} + : {{{money payment_details.method_pos_cash.change}}} + {{/if}} + + + + {{note}} + + + + \ No newline at end of file diff --git a/includes/views/print/receipt-escp.php b/includes/views/print/receipt-escp.php new file mode 100644 index 00000000..a86e38f9 --- /dev/null +++ b/includes/views/print/receipt-escp.php @@ -0,0 +1,25 @@ +append('\x1B' + '\x40'); // init +append('\x1B' + '\x61' + '\x31'); // center align +append('Hello world!' + '\x0A'); +append('\x0A'); // line break +append('\x1B' + '\x61' + '\x30'); // left align +append('This is a test...' + '\x0A'); +append('\x0A'); +append('\x1B' + '\x45' + '\x0D'); // bold on +append('Here\'s some bold text!'); +append('\x1B' + '\x45' + '\x0A'); // bold off +append('\x0A' + '\x0A'); +append('\x1B' + '\x61' + '\x32'); // right align +append('\x1B' + '\x21' + '\x30'); // em mode on +append('DRINK ME'); +append('\x1B' + '\x21' + '\x0A' + '\x1B' + '\x45' + '\x0A'); // em mode off +append('\x0A' + '\x0A'); +append('\x1B' + '\x61' + '\x30'); // left align +append('------------------------------------------' + '\x0A'); +append('\x1B' + '\x4D' + '\x31'); // small text +append('EAT ME' + '\x0A'); +append('\x1B' + '\x4D' + '\x30'); // normal text +append('------------------------------------------' + '\x0A'); +append('\x1B' + '\x61' + '\x30'); // left align +append('\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A'); +append('\x1B' + '\x69'); // cut paper \ No newline at end of file diff --git a/includes/views/print/tmpl-receipt.php b/includes/views/print/receipt-html.php similarity index 100% rename from includes/views/print/tmpl-receipt.php rename to includes/views/print/receipt-html.php diff --git a/includes/views/print/tmpl-receipt-epos-print.php b/includes/views/print/tmpl-receipt-epos-print.php deleted file mode 100644 index 7be1f9cd..00000000 --- a/includes/views/print/tmpl-receipt-epos-print.php +++ /dev/null @@ -1,8 +0,0 @@ - - - Intelligent Printer - 201234567890 - - 8PDw8A8PDw/w8PDwDw8PD/Dw8PAPDw8P8PDw8A8PDw/w8PDwDw8PD/Dw8PAPDw8P - - \ No newline at end of file diff --git a/includes/views/print/tmpl-receipt-escp.php b/includes/views/print/tmpl-receipt-escp.php deleted file mode 100644 index 5ffd84da..00000000 --- a/includes/views/print/tmpl-receipt-escp.php +++ /dev/null @@ -1,33 +0,0 @@ -generate_random_string(); + + $this->template->create_receipt_template( array( + 'template' => $content + ) ); + + $posts = get_posts( array( + 'posts_per_page' => 1, + 'post_type' => 'wc-print-template', + 'post_status' => 'html, epos-print, escp' + )); + + $template = $posts[0]; + + $this->assertEquals($content, $template->post_content); + $this->assertEquals('html', $template->post_status); + } + + /** + * + */ + public function test_update_receipt_template() { + $content = $this->generate_random_string(); + + $posts = get_posts( array( + 'posts_per_page' => 1, + 'post_type' => 'wc-print-template', + 'post_status' => 'html, epos-print, escp' + )); + + $template = $posts[0]; + $post_id = $template->ID; + + update_option( Settings::DB_PREFIX . 'receipt_options', array( + 'template_language' => 'epos-print' + ) ); + + $this->template->update_receipt_template( $post_id, array( + 'template' => $content + ) ); + + $posts = get_posts( array( + 'posts_per_page' => 1, + 'post_type' => 'wc-print-template', + 'post_status' => 'html, epos-print, escp' + )); + + $template = $posts[0]; + + $this->assertEquals($content, $template->post_content); + $this->assertEquals('epos-print', $template->post_status); + + delete_option( Settings::DB_PREFIX . 'receipt_options' ); + } + + /** + * + */ + public function test_delete_receipt_template() { + + $posts = get_posts( array( + 'posts_per_page' => 1, + 'post_type' => 'wc-print-template', + 'post_status' => 'html, epos-print, escp' + )); + + $template = $posts[0]; + $post_id = $template->ID; + + $this->template->delete_receipt_template( $post_id ); + + $posts = get_posts( array( + 'posts_per_page' => -1, + 'post_type' => 'wc-print-template', + 'post_status' => 'html, epos-print, escp' + )); + + $this->assertEmpty($posts); + } + } \ No newline at end of file From 292687577a04d728efa5112bca2264bfbb4b65c4 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Mon, 20 Jun 2016 12:20:32 +0800 Subject: [PATCH 051/169] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2c2e95f0..95c6d037 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Code Climate](https://codeclimate.com/github/kilbot/WooCommerce-POS/badges/gpa.svg)](https://codeclimate.com/github/kilbot/WooCommerce-POS) [![Coverage Status](https://coveralls.io/repos/kilbot/WooCommerce-POS/badge.svg)](https://coveralls.io/r/kilbot/WooCommerce-POS) [![Dependency Status](https://david-dm.org/kilbot/WooCommerce-POS.svg)](https://david-dm.org/kilbot/WooCommerce-POS) +[![Join the chat at https://gitter.im/kilbot/WooCommerce-POS](https://badges.gitter.im/kilbot/WooCommerce-POS.svg)](https://gitter.im/kilbot/WooCommerce-Software-License-Manager?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Development repository for WooCommerce POS - the Point of Sale plugin for [WooCommerce](http://woothemes.com/woocommerce/). @@ -11,13 +12,13 @@ Development repository for WooCommerce POS - the Point of Sale plugin for [WooCo * **Website:** [http://woopos.com.au](http://woopos.com.au)

                    - Screenshot + Screenshot

                    ## Browser Compatibility

                    - Browser Compatibility + Browser Compatibility

                    Browser testing by [BrowserStack](http://browserstack.com). @@ -74,4 +75,4 @@ This will create a zip archive of the plugin which you can then install via your ### We are hiring! -We are looking for talented PHP and JS developers to work full or part time on WooCommerce POS. To apply simply submit a pull request. \ No newline at end of file +We are looking for talented PHP and JS developers to work full or part time on WooCommerce POS. To apply simply submit a pull request. From b0402f97c471a62d21980b431db41f64b70a14e8 Mon Sep 17 00:00:00 2001 From: Paul Kilmurray Date: Mon, 20 Jun 2016 12:21:33 +0800 Subject: [PATCH 052/169] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95c6d037..c582dd53 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Code Climate](https://codeclimate.com/github/kilbot/WooCommerce-POS/badges/gpa.svg)](https://codeclimate.com/github/kilbot/WooCommerce-POS) [![Coverage Status](https://coveralls.io/repos/kilbot/WooCommerce-POS/badge.svg)](https://coveralls.io/r/kilbot/WooCommerce-POS) [![Dependency Status](https://david-dm.org/kilbot/WooCommerce-POS.svg)](https://david-dm.org/kilbot/WooCommerce-POS) -[![Join the chat at https://gitter.im/kilbot/WooCommerce-POS](https://badges.gitter.im/kilbot/WooCommerce-POS.svg)](https://gitter.im/kilbot/WooCommerce-Software-License-Manager?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/kilbot/WooCommerce-POS](https://badges.gitter.im/kilbot/WooCommerce-POS.svg)](https://gitter.im/kilbot/WooCommerce-POS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Development repository for WooCommerce POS - the Point of Sale plugin for [WooCommerce](http://woothemes.com/woocommerce/). From 7ce934b31e07fe8ac5e0d3e8ec05fede8fdf1f67 Mon Sep 17 00:00:00 2001 From: Travis Date: Sat, 2 Jul 2016 12:48:06 +0800 Subject: [PATCH 053/169] 0.5-beta --- .travis.yml | 14 +++++--- apigen/generate-api.sh | 21 ++++++++++++ .../apps/settings/receipts/template/route.js | 2 +- assets/js/src/entities/cart/collection.js | 2 +- assets/js/src/entities/orders/model.js | 2 +- .../src/entities/products/models/abstract.js | 4 +-- assets/js/src/entities/tax/collection.js | 2 +- composer.json | 2 +- includes/activator.php | 3 +- includes/admin/settings/views/customers.php | 2 +- includes/api/orders.php | 13 ++++++-- includes/template.php | 16 ++++----- includes/updates/update-0.4.6.php | 33 +++++++++++++++---- package.json | 26 +++++++-------- .../entities/products/models/variable.spec.js | 4 +-- .../entities/variations/collection.spec.js | 2 +- woocommerce-pos.php | 4 +-- 17 files changed, 103 insertions(+), 49 deletions(-) create mode 100644 apigen/generate-api.sh diff --git a/.travis.yml b/.travis.yml index 24d29bd8..473fe226 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,13 @@ php: - 7.0 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: + - 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 + global: + - secure: SccpWdqY0BXjqH9075hcdunMpjxdk+mo5dTtFNzmlbJf/y+VuQOF8zezYdPbJOvTtNjRTeMzn3F5on0fa+RlXkt+VjbNRBR1slGwPB71ncQDFIbPR/qht81Jkg/SXZMde0rVdhHdYfGfB7HPAbcD42OiAeNxsj8n2pkmzYXRxj0= addons: hosts: @@ -70,4 +73,5 @@ script: after_success: # - if [ "`phpenv version-name`" == "7.0" ] ; then phpunit -c phpunit.xml.dist && php vendor/bin/coveralls -v && grunt coverage; fi - - if [ "`phpenv version-name`" == "7.0" ] ; then grunt coverage; fi \ No newline at end of file + - if [ "`phpenv version-name`" == "7.0" ] ; then grunt coverage; fi + - if [ $TRAVIS_PHP_VERSION = '7.0' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh apigen/generate-api.sh; fi \ No newline at end of file diff --git a/apigen/generate-api.sh b/apigen/generate-api.sh new file mode 100644 index 00000000..89d15ea1 --- /dev/null +++ b/apigen/generate-api.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# Get ApiGen.phar +wget http://www.apigen.org/apigen.phar + +# Generate Api +php apigen.phar generate -s includes -d gh-pages +cd gh-pages + +# Set identity +git config --global user.email "travis@travis-ci.org" +git config --global user.name "Travis" + +# Add branch +git init +git remote add origin https://${GH_TOKEN}@github.com/kilbot/WooCommerce-POS-API.git > /dev/null +git checkout -B gh-pages + +# Push generated files +git add . +git commit -m "API updated" +git push origin gh-pages -fq > /dev/null \ No newline at end of file diff --git a/assets/js/src/apps/settings/receipts/template/route.js b/assets/js/src/apps/settings/receipts/template/route.js index 0ce9f209..6cfcc830 100644 --- a/assets/js/src/apps/settings/receipts/template/route.js +++ b/assets/js/src/apps/settings/receipts/template/route.js @@ -4,7 +4,7 @@ var LayoutView = require('./layout-view'); var Preview = require('./preview'); var PreviewActions = require('./actions'); var $ = require('jquery'); -var polyglot = require('lib/utilities/polyglot'); +// var polyglot = require('lib/utilities/polyglot'); var ReceiptRoute = Route.extend({ diff --git a/assets/js/src/entities/cart/collection.js b/assets/js/src/entities/cart/collection.js index a0b6bb48..456e23ef 100644 --- a/assets/js/src/entities/cart/collection.js +++ b/assets/js/src/entities/cart/collection.js @@ -60,7 +60,7 @@ module.exports = bb.Collection.extend({ } return parsedAttrs.push(attrs); - }, this); + }.bind(this)); models = bb.Collection.prototype.add.call(this, parsedAttrs, options); if( ! options.split ){ diff --git a/assets/js/src/entities/orders/model.js b/assets/js/src/entities/orders/model.js index 04ca660f..d6d0e355 100644 --- a/assets/js/src/entities/orders/model.js +++ b/assets/js/src/entities/orders/model.js @@ -142,7 +142,7 @@ var OrderModel = DualModel.extend({ var taxes = new Taxes(tax_rate, {order: this}); taxes.toggleTaxes(enabled_taxes); this.tax_rates[tax_class] = taxes; - }, this); + }.bind(this)); // exit early if attribute exists if (enabled_taxes) { diff --git a/assets/js/src/entities/products/models/abstract.js b/assets/js/src/entities/products/models/abstract.js index 3a1a2ad5..cf5e77e5 100644 --- a/assets/js/src/entities/products/models/abstract.js +++ b/assets/js/src/entities/products/models/abstract.js @@ -20,8 +20,8 @@ module.exports = DualModel.extend({ */ getProductAttributes: function(){ return _.chain(this.get('attributes')) - .where({variation: false}) - .where({visible: true}) + .filter({variation: false}) + .filter({visible: true}) .value(); } diff --git a/assets/js/src/entities/tax/collection.js b/assets/js/src/entities/tax/collection.js index 1fd058ee..2580da38 100644 --- a/assets/js/src/entities/tax/collection.js +++ b/assets/js/src/entities/tax/collection.js @@ -167,7 +167,7 @@ module.exports = bb.Collection.extend({ if( model ){ model.set({ enabled: enabled }); } - }, this); + }.bind(this)); } }); \ No newline at end of file diff --git a/composer.json b/composer.json index 511b5be4..a9af0e65 100644 --- a/composer.json +++ b/composer.json @@ -19,4 +19,4 @@ "guzzlehttp/guzzle": "~5", "10up/wp_mock": "dev-master" } -} +} \ No newline at end of file diff --git a/includes/activator.php b/includes/activator.php index 87bc92ef..7c12667f 100644 --- a/includes/activator.php +++ b/includes/activator.php @@ -158,7 +158,8 @@ private function version_check(){ */ private function db_upgrade( $old, $current ) { $db_updates = array( - '0.4' => 'updates/update-0.4.php' + '0.4' => 'updates/update-0.4.php', + '0.4.6' => 'updates/update-0.4.6.php' ); foreach ( $db_updates as $version => $updater ) { if ( version_compare( $version, $old, '>' ) && diff --git a/includes/admin/settings/views/customers.php b/includes/admin/settings/views/customers.php index 2ada68eb..cf380898 100644 --- a/includes/admin/settings/views/customers.php +++ b/includes/admin/settings/views/customers.php @@ -11,7 +11,7 @@                     -
                    - +   diff --git a/includes/api/orders.php b/includes/api/orders.php index 65244e75..a135661f 100644 --- a/includes/api/orders.php +++ b/includes/api/orders.php @@ -402,12 +402,21 @@ public function update_post_metadata($null, $order_id, $meta_key, $meta_value, $ */ public function create_order( $order_id ){ // pos meta - global $current_user; - get_currentuserinfo(); + $current_user = wp_get_current_user(); + update_post_meta( $order_id, '_pos', 1 ); update_post_meta( $order_id, '_pos_user', $current_user->ID ); update_post_meta( $order_id, '_pos_user_name', $current_user->user_firstname . ' ' . $current_user->user_lastname ); + // check _order_tax and _order_shipping_tax for reports + if( ! get_post_meta( $order_id, '_order_tax', true ) ){ + update_post_meta( $order_id, '_order_tax', 0 ); + } + + if( ! get_post_meta( $order_id, '_order_shipping_tax', true ) ){ + update_post_meta( $order_id, '_order_shipping_tax', 0 ); + } + // payment do_action( 'woocommerce_pos_process_payment', $order_id, $this->data); } diff --git a/includes/template.php b/includes/template.php index 5e061267..3609d384 100644 --- a/includes/template.php +++ b/includes/template.php @@ -25,22 +25,22 @@ class Template { /** @var array external libraries */ static public $external_libs = array( 'min' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-rc1/jquery.min.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', - 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone-min.js', - 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.min.js', - 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.min.js', + 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.3.3/backbone-min.js', + 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.5/backbone.radio.min.js', + 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.7/backbone.marionette.min.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.min.js', 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', ), 'debug' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-rc1/jquery.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', - 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.2.3/backbone.js', - 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.2/backbone.radio.js', - 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.4/backbone.marionette.js', + 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.3.3/backbone.js', + 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.5/backbone.radio.js', + 'marionette' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.marionette/2.4.7/backbone.marionette.js', 'handlebars' => 'https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.js', 'moment' => 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.js', 'accounting' => 'https://cdnjs.cloudflare.com/ajax/libs/accounting.js/0.4.1/accounting.js', diff --git a/includes/updates/update-0.4.6.php b/includes/updates/update-0.4.6.php index 78cf347f..2c5bac51 100644 --- a/includes/updates/update-0.4.6.php +++ b/includes/updates/update-0.4.6.php @@ -1,17 +1,38 @@ wc_pos_get_option( 'customers', 'default_customer' ); +// fix pos orders +$args = array( + 'post_type' => array('shop_order'), + 'post_status' => array('any'), + 'posts_per_page'=> -1, + 'fields' => 'ids', + 'meta_query' => array( + array( + 'key' => '_pos', + 'value' => 1, + 'compare' => '=', + ), + ) +); -// wc_pos_get_option( 'general', 'logged_in_user' ) -// => wc_pos_get_option( 'customers', 'logged_in_user' ) \ No newline at end of file +$query = new WP_Query( $args ); + +foreach( $query->posts as $order_id ){ + // check _order_tax and _order_shipping_tax for reports + if( ! get_post_meta( $order_id, '_order_tax', true ) ){ + update_post_meta( $order_id, '_order_tax', 0 ); + } + if( ! get_post_meta( $order_id, '_order_shipping_tax', true ) ){ + update_post_meta( $order_id, '_order_shipping_tax', 0 ); + } +} \ No newline at end of file diff --git a/package.json b/package.json index a2f2b3d6..ef06fbe5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "woocommerce-pos", "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", - "version": "0.4.6-beta", + "version": "0.5.0-beta", "scripts": { "test": "grunt test", "dev": "grunt dev", @@ -31,24 +31,24 @@ }, "dependencies": { "accounting": "^0.4.1", - "backbone": "^1.2.3", + "backbone": "^1.3.3", "backbone-deep-model": "kilbot/backbone-deep-model", "backbone-validation": "^0.11.5", - "backbone.marionette": "^2.4.4", + "backbone.marionette": "^2.4.7", "backbone.radio": "^1.0.4", "backbone.stickit": "^0.9.2", "combokeys": "^2.4.6", "debug": "^2.2.0", "handlebars": "^4.0.5", - "jquery": "^3.0.0-rc1", + "jquery": "^3.0.0", "jquery-color": "^1.0.0", "json-query": "kilbot/JSON-Query", "lodash": "^3.10.1", "moment": "^2.13.0", "node-polyglot": "^2.0.0", - "normalize.css": "^4.1.1", + "normalize.css": "^4.2.0", "query-parser": "kilbot/Query-Parser", - "select2": "^4.0.2", + "select2": "^4.0.3", "tether": "^1.3.2", "tether-drop": "^1.4.2", "vex-js": "^2.3.4" @@ -63,33 +63,31 @@ "grunt": "^1.0.1", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-compass": "^1.1.1", - "grunt-contrib-compress": "^1.2.0", + "grunt-contrib-compress": "^1.3.0", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-jshint": "^1.0.0", "grunt-contrib-symlink": "^1.0.0", "grunt-contrib-uglify": "^1.0.1", "grunt-contrib-watch": "^1.0.0", - "grunt-mocha-istanbul": "^4.0.2", + "grunt-mocha-istanbul": "^5.0.1", "grunt-phpunit": "^0.3.6", "grunt-simple-mocha": "^0.4.1", "grunt-webpack": "^1.0.11", "grunt-wp-i18n": "^0.5.4", "imports-loader": "^0.6.5", - "istanbul": "^0.4.3", - "jsdom": "^8.5.0", + "istanbul": "^0.4.4", + "jsdom": "^9.3.0", "jshint-stylish": "^2.2.0", "load-grunt-tasks": "^3.5.0", "mocha": "^2.4.5", "node-localstorage": "^1.3.0", - "pioneer": "^0.11.7", - "proxyquire": "^1.7.4", + "proxyquire": "^1.7.10", "raw-loader": "^0.5.1", - "selenium-webdriver": "^2.53.2", "sinon": "^1.17.4", "sinon-as-promised": "^4.0.0", "sinon-chai": "^2.8.0", - "webpack": "^1.13.0", + "webpack": "^1.13.1", "webpack-dev-server": "^1.14.1" } } diff --git a/tests/unit/js/spec/entities/products/models/variable.spec.js b/tests/unit/js/spec/entities/products/models/variable.spec.js index dc7ced62..cbd621ed 100644 --- a/tests/unit/js/spec/entities/products/models/variable.spec.js +++ b/tests/unit/js/spec/entities/products/models/variable.spec.js @@ -83,13 +83,13 @@ describe('entities/products/models/variable.js', function () { }; it('should be in a valid state', function() { - var variableProduct = _.findWhere(dummy_products.products, { id: 40 }); + var variableProduct = _.find(dummy_products.products, { id: 40 }); var product = new Model( variableProduct ); expect(product).to.be.ok; }); it('should attach a collection of variations', function() { - var variableProduct = _.findWhere(dummy_products.products, { id: 40 }); + var variableProduct = _.find(dummy_products.products, { id: 40 }); var product = new Model( variableProduct, { parse: true } ); expect(product.variations.length).equals( variableProduct.variations.length ); }); diff --git a/tests/unit/js/spec/entities/variations/collection.spec.js b/tests/unit/js/spec/entities/variations/collection.spec.js index 1194f921..3732473f 100644 --- a/tests/unit/js/spec/entities/variations/collection.spec.js +++ b/tests/unit/js/spec/entities/variations/collection.spec.js @@ -5,7 +5,7 @@ describe('entities/variations/collection.js', function () { var variations; beforeEach(function(){ - var variableProduct = _.findWhere(dummy.products, { id: 40 }); + var variableProduct = _.find(dummy.products, { id: 40 }); variations = new Collection( variableProduct.variations ); }); diff --git a/woocommerce-pos.php b/woocommerce-pos.php index 5f474e70..61c29c3c 100644 --- a/woocommerce-pos.php +++ b/woocommerce-pos.php @@ -4,7 +4,7 @@ * Plugin Name: WooCommerce POS * Plugin URI: https://wordpress.org/plugins/woocommerce-pos/ * Description: A simple front-end for taking WooCommerce orders at the Point of Sale. Requires WooCommerce. - * Version: 0.4.6-beta + * Version: 0.5.0-beta * Author: kilbot * Author URI: http://woopos.com.au * Text Domain: woocommerce-pos @@ -23,7 +23,7 @@ /** * Define plugin constants. */ -define( __NAMESPACE__ . '\VERSION', '0.4.6-beta' ); +define( __NAMESPACE__ . '\VERSION', '0.5.0-beta' ); define( __NAMESPACE__ . '\PLUGIN_NAME', 'woocommerce-pos' ); define( __NAMESPACE__ . '\PLUGIN_FILE', plugin_basename( __FILE__ ) ); // 'woocommerce-pos/woocommerce-pos.php' define( __NAMESPACE__ . '\PLUGIN_PATH', trailingslashit( plugin_dir_path( __FILE__ ) ) ); From d2cb6009ae829ebe0841b502793eb55b6eb13b73 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sat, 2 Jul 2016 13:37:25 +0800 Subject: [PATCH 054/169] fix tests --- tests/integration/php/framework/testcase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/php/framework/testcase.php b/tests/integration/php/framework/testcase.php index a84d0a1e..a3e08d76 100644 --- a/tests/integration/php/framework/testcase.php +++ b/tests/integration/php/framework/testcase.php @@ -89,7 +89,7 @@ protected function generate_random_string($length=10) { protected function get_product( $id ){ $response = $this->client->get( get_woocommerce_api_url( 'products/' . $id ) ); $data = $response->json(); - return $data['product'][0]; + return $data['product']; } /** From de84d9ec60f295ea1a5f60bcfe3ce4c5cc0cbb75 Mon Sep 17 00:00:00 2001 From: kilbot Date: Wed, 13 Jul 2016 23:17:13 +0800 Subject: [PATCH 055/169] add docker dev environment --- .docker | 1 + .gitignore | 5 +- .gitmodules | 3 + .travis.yml | 80 ++---------- Gruntfile.js | 5 +- includes/api/settings.php | 4 +- package.json | 22 ++-- tests/integration/php/bin/install.sh | 48 -------- tests/integration/php/bin/travis-ci-apache | 22 ---- tests/integration/php/bin/wp-cli.yml | 2 - tests/integration/php/bootstrap.php | 50 +------- tests/unit/php/bin/install.sh | 134 --------------------- tests/unit/php/bootstrap.php | 18 +-- 13 files changed, 45 insertions(+), 349 deletions(-) create mode 160000 .docker delete mode 100644 tests/integration/php/bin/install.sh delete mode 100644 tests/integration/php/bin/travis-ci-apache delete mode 100644 tests/integration/php/bin/wp-cli.yml delete mode 100644 tests/unit/php/bin/install.sh diff --git a/.docker b/.docker new file mode 160000 index 00000000..d492ff6a --- /dev/null +++ b/.docker @@ -0,0 +1 @@ +Subproject commit d492ff6a77d2c284bd75b0dd01d0628cd8d8864e diff --git a/.gitignore b/.gitignore index 4ca2ebc9..7a76b7a1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ assets/js/admin-settings.build.js assets/js/admin-settings.min.js assets/js/admin-system-status.build.js assets/js/admin-system-status.min.js - - - composer.lock +.data +.html \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index e0d264bb..ce37a1d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "styleguide"] path = styleguide url = https://github.com/kilbot/WooCommerce-POS-StyleGuide.git +[submodule ".docker"] + path = .docker + url = git@github.com:kilbot/WooCommerce-Dev-Docker.git diff --git a/.travis.yml b/.travis.yml index 473fe226..4dbf3bc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,77 +1,21 @@ -language: php +sudo: required -php: - - 5.4 - - 7.0 +language: node + +services: + - docker env: matrix: - - 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 - global: - - secure: SccpWdqY0BXjqH9075hcdunMpjxdk+mo5dTtFNzmlbJf/y+VuQOF8zezYdPbJOvTtNjRTeMzn3F5on0fa+RlXkt+VjbNRBR1slGwPB71ncQDFIbPR/qht81Jkg/SXZMde0rVdhHdYfGfB7HPAbcD42OiAeNxsj8n2pkmzYXRxj0= + - PHP_VERSION=54 WP_VERSION=latest WP_MULTISITE=0 + - PHP_VERSION=55 WP_VERSION=latest WP_MULTISITE=0 + - PHP_VERSION=56 WP_VERSION=latest WP_MULTISITE=0 + - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 -addons: - hosts: - - woopos.dev 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 - -install: - # install wordpress & woocommerce & test theme - - bash tests/unit/php/bin/install.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 - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf; - - if [ "`phpenv version-name`" == "7.0" ] ; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf; fi - - 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 - -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 - - composer install + - npm run build script: - - grunt test - - phpunit -c tests/unit/php/phpunit.xml - - phpunit -c tests/integration/php/phpunit.xml - # - ./node_modules/.bin/pioneer - -after_success: -# - if [ "`phpenv version-name`" == "7.0" ] ; then phpunit -c phpunit.xml.dist && php vendor/bin/coveralls -v && grunt coverage; fi - - if [ "`phpenv version-name`" == "7.0" ] ; then grunt coverage; fi - - if [ $TRAVIS_PHP_VERSION = '7.0' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh apigen/generate-api.sh; fi \ No newline at end of file + - npm run unittest:js + - npm run composer && npm run unittest:php$PHP_VERSION \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 69a47076..01dbf34c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -419,8 +419,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']); diff --git a/includes/api/settings.php b/includes/api/settings.php index f1d986b7..4480e2da 100644 --- a/includes/api/settings.php +++ b/includes/api/settings.php @@ -14,7 +14,7 @@ use WC_API_Resource; use WC_API_Server; use WC_POS\Admin\Settings as Admin_Settings; -use WC_POS\Admin\Settings\Gateways; +use WC_POS\Admin\Settings\Gateways as Admin_Settings_Gateways; use WC_POS\Admin\Status; class Settings extends WC_API_Resource { @@ -165,7 +165,7 @@ private function get_settings_handler( $id ){ // special case: gateway_ $gateway_id = preg_replace( '/^gateway_/', '', strtolower( $id ), 1, $count ); if($count) { - return new Gateways( $gateway_id ); + return new Admin_Settings_Gateways( $gateway_id ); } // special case: receipt_ diff --git a/package.json b/package.json index ef06fbe5..ad8a6a8c 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,21 @@ "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", "version": "0.5.0-beta", "scripts": { - "test": "grunt test", - "dev": "grunt dev", - "deploy": "grunt deploy", - "tests-install": "bash tests/unit/php/bin/install.sh", - "clean-install": "bash tests/integration/php/bin/install.sh", - "test-php-unit": "phpunit -c tests/unit/php/phpunit.xml", - "test-php-integration": "phpunit -c tests/integration/php/phpunit.xml" + "start": "docker-compose -f .docker/docker-compose.yml up -d", + "stop": "docker-compose -f .docker/docker-compose.yml kill", + "build": "npm run build-assets && npm run build-docker", + "dev": "npm run build && node_modules/.bin/grunt dev --force", + "deploy": "npm install && node_modules/.bin/grunt grunt deploy", + "unittest:js": "npm install && node_modules/.bin/grunt test", + "unittest:php54": "docker exec php54 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unittest:php55": "docker exec php55 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unittest:php56": "docker exec php56 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unittest:php70": "docker exec php70 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "tests-db": "docker exec mysql57 mysql --password=$MYSQL_ROOT_PASSWORD -Bse \"CREATE DATABASE IF NOT EXISTS $MYSQL_TESTS_DATABASE;\"", + "build-assets": "npm install && node_modules/.bin/grunt build --force", + "build-docker": "docker-compose -f .docker/docker-compose.yml build && npm run start", + "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html", + "composer": "docker exec php56 composer install -d latest/wp-content/plugins/woocommerce-pos/" }, "repository": { "type": "git", diff --git a/tests/integration/php/bin/install.sh b/tests/integration/php/bin/install.sh deleted file mode 100644 index 09f76b1b..00000000 --- a/tests/integration/php/bin/install.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -DB_NAME=${1-woopos_integration_tests} -DB_USER=${2-root} -DB_PASS=${2-root} - -if [ -f ../../../wp-config.php ]; then - rm -f ../../../wp-config.php; -fi - -# create database -mysqladmin -f drop $DB_NAME || true -mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS" || true - -wp core config --dbname=$DB_NAME --dbuser=$DB_USER --dbpass=$DB_USER --extra-php < - - DocumentRoot %TRAVIS_BUILD_DIR% - ServerName www.woopos.dev - ServerAlias woopos.dev - - - Options FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order deny,allow - Allow from all - - - # Wire up Apache to use Travis CI's php-fpm. - - AddHandler php5-fcgi .php - Action php5-fcgi /php5-fcgi - Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization - - - \ No newline at end of file diff --git a/tests/integration/php/bin/wp-cli.yml b/tests/integration/php/bin/wp-cli.yml deleted file mode 100644 index 650427f8..00000000 --- a/tests/integration/php/bin/wp-cli.yml +++ /dev/null @@ -1,2 +0,0 @@ -apache_modules: - - mod_rewrite \ No newline at end of file diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index 1d7f4518..60ed04c9 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -2,8 +2,6 @@ namespace WC_POS; -use WC_Tax; - class Integration_Tests { public function __construct(){ @@ -12,7 +10,6 @@ public function __construct(){ error_reporting( E_ALL ); $this->includes(); - $this->setup(); register_shutdown_function( array( $this, 'shutdown' ) ); } @@ -22,55 +19,10 @@ public function __construct(){ */ public function includes(){ require_once(__DIR__.'/../../../../../../wp-load.php'); - require_once 'vendor/autoload.php'; + require_once 'vendor/autoload.php'; // required to load Guzzle require_once 'framework/testcase.php'; } - public function setup(){ - $this->import_dummy_tax(); - } - - /** - * copy of import function: WC_Tax_Rate_Importer->import() - * https://github.com/woothemes/woocommerce/blob/master/includes/admin/importers/class-wc-tax-rate-importer.php - */ - private function import_dummy_tax(){ - - // clear tax rate tables - global $wpdb; - $wpdb->query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rates"); - $wpdb->query("TRUNCATE TABLE {$wpdb->prefix}woocommerce_tax_rate_locations"); - - $taxes = array( - array('GB','*','*','*','20.0000','VAT',1,1,1,''), - array('GB','*','*','*','5.0000','VAT',1,1,1,'reduced-rate'), - array('GB','*','*','*','0.0000','VAT',1,1,1,'zero-rate'), - array('US','*','*','*','10.0000','US',1,1,1,''), - array('US','AL','12345; 123456','*','2.0000','US AL',2,1,1,'') - ); - - $loop = 0; - - foreach ( $taxes as $tax ) { - list( $country, $state, $postcode, $city, $rate, $name, $priority, $compound, $shipping, $class ) = $tax; - $tax_rate = array( - 'tax_rate_country' => $country, - 'tax_rate_state' => $state, - 'tax_rate' => $rate, - 'tax_rate_name' => $name, - 'tax_rate_priority' => $priority, - 'tax_rate_compound' => $compound ? 1 : 0, - 'tax_rate_shipping' => $shipping ? 1 : 0, - 'tax_rate_order' => $loop ++, - 'tax_rate_class' => $class - ); - $tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate ); - WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, wc_clean( $postcode ) ); - WC_Tax::_update_tax_rate_cities( $tax_rate_id, wc_clean( $city ) ); - } - - } - /** * runs after all tests are complete */ diff --git a/tests/unit/php/bin/install.sh b/tests/unit/php/bin/install.sh deleted file mode 100644 index edc72184..00000000 --- a/tests/unit/php/bin/install.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/env bash - -if [ $# -lt 3 ]; then - echo "usage: $0 [db-host] [wp-version] [wc-version]" - exit 1 -fi - -DB_NAME=$1 -DB_USER=$2 -DB_PASS=$3 -DB_HOST=${4-localhost} -WP_VERSION=${5-latest} -WC_VERSION=${6-latest} - -WP_TESTS_DIR=/tmp/wordpress-tests-lib -WP_TEMP_DIR=/tmp/wordpress/ -WP_CORE_DIR=${TRAVIS_BUILD_DIR-/tmp/wordpress/}/ - -download() { - if [ `which curl` ]; then - curl -s "$1" > "$2"; - elif [ `which wget` ]; then - wget -nv -O "$2" "$1" - fi -} - -if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then - WP_TESTS_TAG="tags/$WP_VERSION" -else - # http serves a single offer, whereas https serves multiple. we only want one - download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json - grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json - LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//') - if [[ -z "$LATEST_VERSION" ]]; then - echo "Latest WordPress version could not be found" - exit 1 - fi - WP_TESTS_TAG="tags/$LATEST_VERSION" -fi - -set -ex - -install_wp() { - - if [ -d $WP_TEMP_DIR ]; then - return; - fi - - mkdir -p $WP_TEMP_DIR - - if [ $WP_VERSION == 'latest' ]; then - local ARCHIVE_NAME='latest' - else - local ARCHIVE_NAME="wordpress-$WP_VERSION" - fi - - download https://wordpress.org/${ARCHIVE_NAME}.tar.gz /tmp/wordpress.tar.gz - tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_TEMP_DIR - - download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_TEMP_DIR/wp-content/db.php -} - -install_test_suite() { - # portable in-place argument for both GNU sed and Mac OSX sed - if [[ $(uname -s) == 'Darwin' ]]; then - local ioption='-i .bak' - else - local ioption='-i' - fi - - # set up testing suite if it doesn't yet exist - if [ ! -d $WP_TESTS_DIR ]; then - # set up testing suite - mkdir -p $WP_TESTS_DIR - svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes - fi - - cd $WP_TESTS_DIR - - if [ ! -f wp-tests-config.php ]; then - download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php - sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php - fi - -} - -install_db() { - # parse DB_HOST for port or socket references - local PARTS=(${DB_HOST//\:/ }) - local DB_HOSTNAME=${PARTS[0]}; - local DB_SOCK_OR_PORT=${PARTS[1]}; - local EXTRA="" - - if ! [ -z $DB_HOSTNAME ] ; then - if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then - EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp" - elif ! [ -z $DB_SOCK_OR_PORT ] ; then - EXTRA=" --socket=$DB_SOCK_OR_PORT" - elif ! [ -z $DB_HOSTNAME ] ; then - EXTRA=" --host=$DB_HOSTNAME --protocol=tcp" - fi - fi - - # create database - mysqladmin -f drop $DB_NAME || true - mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA || true -} - -install_woocommerce() { - - # set up woocommerce if it doesn't exist && no travis build - if [ ! -d $WP_CORE_DIR/wp-content/plugins/woocommerce ] && [ ! $TRAVIS_BUILD_DIR ]; then - - if [ $WC_VERSION == 'latest' ]; then - local ARCHIVE_NAME='woocommerce.zip' - else - local ARCHIVE_NAME="woocommerce.$WC_VERSION.zip" - fi - - download https://downloads.wordpress.org/plugin/${ARCHIVE_NAME} /tmp/woocommerce.zip - unzip -qo /tmp/woocommerce.zip -d $WP_CORE_DIR/wp-content/plugins - - fi - -} - -install_wp -install_test_suite -install_db -install_woocommerce \ No newline at end of file diff --git a/tests/unit/php/bootstrap.php b/tests/unit/php/bootstrap.php index 43d6f727..99569f2e 100644 --- a/tests/unit/php/bootstrap.php +++ b/tests/unit/php/bootstrap.php @@ -11,8 +11,7 @@ public function __construct(){ ini_set( 'display_errors','on' ); error_reporting( E_ALL ); - $this->wp_tests_dir = '/tmp/wordpress-tests-lib'; - $this->includes(); + $this->wp_tests_dir = '/var/www/html/latest/wordpress-tests-lib'; require_once $this->wp_tests_dir . '/includes/functions.php'; tests_add_filter( 'muplugins_loaded', array( $this, 'load' ) ); @@ -20,18 +19,11 @@ public function __construct(){ } public function load() { - require_once WP_CONTENT_DIR . '/plugins/woocommerce/woocommerce.php'; - require_once dirname( __FILE__ ) . '/../../../woocommerce-pos.php'; - WC()->api->includes(); - } + require_once WP_PLUGIN_DIR . '/woocommerce-pos/vendor/autoload.php'; + require_once WP_PLUGIN_DIR . '/woocommerce/woocommerce.php'; + require_once WP_PLUGIN_DIR . '/woocommerce-pos/woocommerce-pos.php'; - /** - * include wp-load - * include composer autoloader - */ - public function includes(){ - require_once 'vendor/autoload.php'; - // extra functions and factories + WC()->api->includes(); } } From c525ab56cbfa882246db5b84f2949a7ec4c09720 Mon Sep 17 00:00:00 2001 From: kilbot Date: Wed, 13 Jul 2016 23:25:38 +0800 Subject: [PATCH 056/169] fix submodule url --- .gitmodules | 2 +- .travis.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ce37a1d9..e2f73a70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/kilbot/WooCommerce-POS-StyleGuide.git [submodule ".docker"] path = .docker - url = git@github.com:kilbot/WooCommerce-Dev-Docker.git + url = https://github.com/kilbot/WooCommerce-Dev-Docker.git diff --git a/.travis.yml b/.travis.yml index 4dbf3bc1..67e27d47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ sudo: required -language: node +language: node_js services: - docker @@ -12,7 +12,6 @@ env: - PHP_VERSION=56 WP_VERSION=latest WP_MULTISITE=0 - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 - before_install: - npm run build From 9f21ca9e7e21b8002ab41fdc296b4946208b2ef4 Mon Sep 17 00:00:00 2001 From: kilbot Date: Thu, 14 Jul 2016 00:02:06 +0800 Subject: [PATCH 057/169] update travis --- .travis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67e27d47..033a7f16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ sudo: required language: node_js +node_js: + - "node" + services: - docker @@ -13,8 +16,17 @@ env: - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 before_install: + - sudo apt-get update -qq + - sudo apt-get install docker-engine --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.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose + - chmod +x /usr/local/bin/docker-compose + - docker-compose -v + - docker -v + +install: - npm run build script: - npm run unittest:js - - npm run composer && npm run unittest:php$PHP_VERSION \ No newline at end of file + - npm run composer && npm run unittest:php${PHP_VERSION} \ No newline at end of file From 4643966844f10e26b38bf496f08878cac52dc178 Mon Sep 17 00:00:00 2001 From: kilbot Date: Thu, 14 Jul 2016 00:14:41 +0800 Subject: [PATCH 058/169] fix travis --- .docker | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker b/.docker index d492ff6a..327d495f 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit d492ff6a77d2c284bd75b0dd01d0628cd8d8864e +Subproject commit 327d495fa47a4bb7f83e9ef495ebb35e61fbacb6 diff --git a/.travis.yml b/.travis.yml index 033a7f16..658fdc27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ before_install: - sudo apt-get update -qq - sudo apt-get install docker-engine --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.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose - - chmod +x /usr/local/bin/docker-compose + - sudo curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose + - sudo chmod +x /usr/local/bin/docker-compose - docker-compose -v - docker -v From 09a486f81fdc55de4b86aa210755666709ec9590 Mon Sep 17 00:00:00 2001 From: kilbot Date: Thu, 14 Jul 2016 00:26:00 +0800 Subject: [PATCH 059/169] fix travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 658fdc27..d37f1c18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,9 @@ before_install: - sudo apt-get update -qq - sudo apt-get install docker-engine --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 - - sudo curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose - - sudo chmod +x /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.8.0-rc2/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin/ - docker-compose -v - docker -v From 5210d050f3a558f828406d9abf0a7c9863b2e26a Mon Sep 17 00:00:00 2001 From: kilbot Date: Fri, 15 Jul 2016 21:55:26 +0800 Subject: [PATCH 060/169] update docker --- .docker | 2 +- .travis.yml | 8 ++++---- package.json | 22 ++++++++++++---------- tests/unit/php/bootstrap.php | 4 ++-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.docker b/.docker index 327d495f..ab3df576 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 327d495fa47a4bb7f83e9ef495ebb35e61fbacb6 +Subproject commit ab3df576711f6baafc4457b21435094b37909ada diff --git a/.travis.yml b/.travis.yml index d37f1c18..b1739113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ services: env: matrix: - - PHP_VERSION=54 WP_VERSION=latest WP_MULTISITE=0 - - PHP_VERSION=55 WP_VERSION=latest WP_MULTISITE=0 - - PHP_VERSION=56 WP_VERSION=latest WP_MULTISITE=0 - - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 + - PHP_VERSION=54 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=55 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=56 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest before_install: - sudo apt-get update -qq diff --git a/package.json b/package.json index ad8a6a8c..d5c751da 100644 --- a/package.json +++ b/package.json @@ -3,19 +3,21 @@ "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", "version": "0.5.0-beta", "scripts": { - "start": "docker-compose -f .docker/docker-compose.yml up -d", - "stop": "docker-compose -f .docker/docker-compose.yml kill", - "build": "npm run build-assets && npm run build-docker", + "build": "npm install && node_modules/.bin/grunt build --force && npm run start", + "start": "docker-compose -f .docker/docker.yml build && docker-compose -f .docker/docker.yml up -d", + "start:php54": "docker-compose -f .docker/docker-php54.yml build && docker-compose -f .docker/docker-php54.yml up -d", + "start:php55": "docker-compose -f .docker/docker-php55.yml build && docker-compose -f .docker/docker-php55.yml up -d", + "start:php56": "docker-compose -f .docker/docker-php56.yml build && docker-compose -f .docker/docker-php56.yml up -d", + "start:php70": "docker-compose -f .docker/docker-php70.yml build && docker-compose -f .docker/docker-php70.yml up -d", + "stop": "docker-compose -f .docker/docker.yml kill", "dev": "npm run build && node_modules/.bin/grunt dev --force", "deploy": "npm install && node_modules/.bin/grunt grunt deploy", - "unittest:js": "npm install && node_modules/.bin/grunt test", - "unittest:php54": "docker exec php54 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", - "unittest:php55": "docker exec php55 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", - "unittest:php56": "docker exec php56 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", - "unittest:php70": "docker exec php70 phpunit -c latest/wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unit-test:js": "npm install && node_modules/.bin/grunt test", + "unit-test:php54": "docker exec php54 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unit-test:php55": "docker exec php55 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unit-test:php56": "docker exec php56 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "unit-test:php70": "docker exec php70 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "tests-db": "docker exec mysql57 mysql --password=$MYSQL_ROOT_PASSWORD -Bse \"CREATE DATABASE IF NOT EXISTS $MYSQL_TESTS_DATABASE;\"", - "build-assets": "npm install && node_modules/.bin/grunt build --force", - "build-docker": "docker-compose -f .docker/docker-compose.yml build && npm run start", "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html", "composer": "docker exec php56 composer install -d latest/wp-content/plugins/woocommerce-pos/" }, diff --git a/tests/unit/php/bootstrap.php b/tests/unit/php/bootstrap.php index 99569f2e..cac9fdce 100644 --- a/tests/unit/php/bootstrap.php +++ b/tests/unit/php/bootstrap.php @@ -11,7 +11,7 @@ public function __construct(){ ini_set( 'display_errors','on' ); error_reporting( E_ALL ); - $this->wp_tests_dir = '/var/www/html/latest/wordpress-tests-lib'; + $this->wp_tests_dir = '/var/www/html/wordpress-tests-lib'; require_once $this->wp_tests_dir . '/includes/functions.php'; tests_add_filter( 'muplugins_loaded', array( $this, 'load' ) ); @@ -19,7 +19,7 @@ public function __construct(){ } public function load() { - require_once WP_PLUGIN_DIR . '/woocommerce-pos/vendor/autoload.php'; +// require_once WP_PLUGIN_DIR . '/woocommerce-pos/vendor/autoload.php'; require_once WP_PLUGIN_DIR . '/woocommerce/woocommerce.php'; require_once WP_PLUGIN_DIR . '/woocommerce-pos/woocommerce-pos.php'; From 3267fdb3f710422879dc983e1aea5e4115799c56 Mon Sep 17 00:00:00 2001 From: kilbot Date: Fri, 15 Jul 2016 22:49:29 +0800 Subject: [PATCH 061/169] update travis --- .travis.yml | 16 +++++++++------- package.json | 2 -- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1739113..7be7ef16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ services: env: matrix: - - PHP_VERSION=54 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=55 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=56 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=70 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=php54 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=php55 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=php56 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - PHP_VERSION=php70 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest before_install: - sudo apt-get update -qq @@ -26,8 +26,10 @@ before_install: - docker -v install: - - npm run build + - npm install && node_modules/.bin/grunt build + - npm run start:${PHP_VERSION} + - until [ "`docker inspect -f {{.State.Running}} ${PHP_VERSION}`" == "true" ]; do sleep 2; done script: - - npm run unittest:js - - npm run composer && npm run unittest:php${PHP_VERSION} \ No newline at end of file + - npm run unit-test:js + - npm run unit-test:${PHP_VERSION} \ No newline at end of file diff --git a/package.json b/package.json index d5c751da..88c673f3 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,7 @@ "unit-test:php55": "docker exec php55 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php56": "docker exec php56 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php70": "docker exec php70 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", - "tests-db": "docker exec mysql57 mysql --password=$MYSQL_ROOT_PASSWORD -Bse \"CREATE DATABASE IF NOT EXISTS $MYSQL_TESTS_DATABASE;\"", "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html", - "composer": "docker exec php56 composer install -d latest/wp-content/plugins/woocommerce-pos/" }, "repository": { "type": "git", From 1522be8d25733c29d478ad69468d8354a3e0d66d Mon Sep 17 00:00:00 2001 From: kilbot Date: Fri, 15 Jul 2016 22:55:25 +0800 Subject: [PATCH 062/169] fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 88c673f3..f5e3f04b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "unit-test:php55": "docker exec php55 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php56": "docker exec php56 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php70": "docker exec php70 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", - "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html", + "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html" }, "repository": { "type": "git", From 252f3cf12fa08f3ce2ac2aaf3d3517eaa3ca58d4 Mon Sep 17 00:00:00 2001 From: kilbot Date: Fri, 15 Jul 2016 23:50:44 +0800 Subject: [PATCH 063/169] update docker --- .docker | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker b/.docker index ab3df576..88b7c8c4 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit ab3df576711f6baafc4457b21435094b37909ada +Subproject commit 88b7c8c4a482174064c8cd7ee1e2ea3c31e1910b diff --git a/.travis.yml b/.travis.yml index 7be7ef16..8667cfad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: - docker -v install: - - npm install && node_modules/.bin/grunt build + - npm install && node_modules/.bin/grunt build --force - npm run start:${PHP_VERSION} - until [ "`docker inspect -f {{.State.Running}} ${PHP_VERSION}`" == "true" ]; do sleep 2; done From 1d4f9d422957d87239ae62a2cbf5ffffd8e0ba7f Mon Sep 17 00:00:00 2001 From: kilbot Date: Sat, 16 Jul 2016 00:32:50 +0800 Subject: [PATCH 064/169] update readme --- .travis.yml | 4 +++- README.md | 6 +++--- package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8667cfad..31c48b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,9 @@ before_install: install: - npm install && node_modules/.bin/grunt build --force - npm run start:${PHP_VERSION} - - until [ "`docker inspect -f {{.State.Running}} ${PHP_VERSION}`" == "true" ]; do sleep 2; done + +before_script: + - sleep 30 script: - npm run unit-test:js diff --git a/README.md b/README.md index c582dd53..ca00733f 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Development repository for WooCommerce POS - the Point of Sale plugin for [WooCommerce](http://woothemes.com/woocommerce/). * **Download:** [http://wordpress.org/plugins/woocommerce-pos](http://wordpress.org/plugins/woocommerce-pos) -* **Demo:** [http://demo.woopos.com.au/pos](http://demo.woopos.com.au/pos) -* **Website:** [http://woopos.com.au](http://woopos.com.au) +* **Demo:** [http://demo.wcpos.com/pos](http://demo.wcpos.com/pos) +* **Website:** [http://wcpos.com](http://wcpos.com)

                    Screenshot @@ -25,7 +25,7 @@ Browser testing by [BrowserStack](http://browserstack.com). ## Report a bug -Please report all bugs [here](https://github.com/kilbot/WooCommerce-POS/issues) or contact support via [support@woopos.com.au](mailto:support@woopos.com.au) +Please report all bugs [here](https://github.com/kilbot/WooCommerce-POS/issues) or contact support via [support@woopos.com.au](mailto:support@wcpos.com) ## Translations diff --git a/package.json b/package.json index f5e3f04b..435d6951 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "start:php56": "docker-compose -f .docker/docker-php56.yml build && docker-compose -f .docker/docker-php56.yml up -d", "start:php70": "docker-compose -f .docker/docker-php70.yml build && docker-compose -f .docker/docker-php70.yml up -d", "stop": "docker-compose -f .docker/docker.yml kill", - "dev": "npm run build && node_modules/.bin/grunt dev --force", + "dev": "npm install && npm run start && node_modules/.bin/grunt dev --force", "deploy": "npm install && node_modules/.bin/grunt grunt deploy", "unit-test:js": "npm install && node_modules/.bin/grunt test", "unit-test:php54": "docker exec php54 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", From f80376cf8a6d81e9399647dea111e8bb3597c796 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sat, 16 Jul 2016 00:43:32 +0800 Subject: [PATCH 065/169] increase travis sleep --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 31c48b8a..b8b87e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ install: - npm run start:${PHP_VERSION} before_script: - - sleep 30 + - sleep 60 script: - npm run unit-test:js From 83e47b5621fd9c1403a8cdfaee27cb5aed768982 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sat, 16 Jul 2016 15:25:19 +0800 Subject: [PATCH 066/169] update docker --- .docker | 2 +- .env | 2 ++ package.json | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 .env diff --git a/.docker b/.docker index 88b7c8c4..85f232b0 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 88b7c8c4a482174064c8cd7ee1e2ea3c31e1910b +Subproject commit 85f232b08dbc724d9893918b7cf3295d15f2c168 diff --git a/.env b/.env new file mode 100644 index 00000000..ca79e8ba --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +# project name used by docker +PROJECT_NAME=woocommerce-pos \ No newline at end of file diff --git a/package.json b/package.json index 435d6951..403f8208 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,12 @@ "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", "version": "0.5.0-beta", "scripts": { - "build": "npm install && node_modules/.bin/grunt build --force && npm run start", - "start": "docker-compose -f .docker/docker.yml build && docker-compose -f .docker/docker.yml up -d", - "start:php54": "docker-compose -f .docker/docker-php54.yml build && docker-compose -f .docker/docker-php54.yml up -d", - "start:php55": "docker-compose -f .docker/docker-php55.yml build && docker-compose -f .docker/docker-php55.yml up -d", - "start:php56": "docker-compose -f .docker/docker-php56.yml build && docker-compose -f .docker/docker-php56.yml up -d", - "start:php70": "docker-compose -f .docker/docker-php70.yml build && docker-compose -f .docker/docker-php70.yml up -d", + "build": "npm install && node_modules/.bin/grunt build --force && npm docker-compose -f .docker/docker.yml build", + "start": "docker-compose -f .docker/docker.yml up -d", + "start:php54": "docker-compose -f .docker/docker-php54.yml up -d", + "start:php55": "docker-compose -f .docker/docker-php55.yml up -d", + "start:php56": "docker-compose -f .docker/docker-php56.yml up -d", + "start:php70": "docker-compose -f .docker/docker-php70.yml up -d", "stop": "docker-compose -f .docker/docker.yml kill", "dev": "npm install && npm run start && node_modules/.bin/grunt dev --force", "deploy": "npm install && node_modules/.bin/grunt grunt deploy", From 5855fd282ecf6f91bc1d645c7c931f1e09df3725 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sat, 16 Jul 2016 22:49:35 +0800 Subject: [PATCH 067/169] add integration tests to travis --- .docker | 2 +- .travis.yml | 15 ++++++++++----- package.json | 6 +++++- tests/integration/php/bootstrap.php | 4 ++-- tests/integration/php/framework/testcase.php | 9 ++++++++- tests/integration/php/spec/api/test-orders.php | 1 + 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.docker b/.docker index 85f232b0..7b4b91f7 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 85f232b08dbc724d9893918b7cf3295d15f2c168 +Subproject commit 7b4b91f7bf9e4a3a1a10407e9a004906f75a925e diff --git a/.travis.yml b/.travis.yml index b8b87e6c..99de3ce0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,14 @@ services: env: matrix: - - PHP_VERSION=php54 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=php55 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=php56 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest - - PHP_VERSION=php70 WP_VERSION=latest WP_MULTISITE=0 WC_VERSION=latest + - 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.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: - sudo apt-get update -qq @@ -34,4 +38,5 @@ before_script: script: - npm run unit-test:js - - npm run unit-test:${PHP_VERSION} \ No newline at end of file + - npm run unit-test:${PHP_VERSION} + - npm run integration-test:${PHP_VERSION} \ No newline at end of file diff --git a/package.json b/package.json index 403f8208..fa476406 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", "version": "0.5.0-beta", "scripts": { - "build": "npm install && node_modules/.bin/grunt build --force && npm docker-compose -f .docker/docker.yml build", + "build": "npm install && node_modules/.bin/grunt build --force && docker-compose -f .docker/docker.yml build", "start": "docker-compose -f .docker/docker.yml up -d", "start:php54": "docker-compose -f .docker/docker-php54.yml up -d", "start:php55": "docker-compose -f .docker/docker-php55.yml up -d", @@ -17,6 +17,10 @@ "unit-test:php55": "docker exec php55 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php56": "docker exec php56 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", "unit-test:php70": "docker exec php70 phpunit -c wp-content/plugins/woocommerce-pos/tests/unit/php/phpunit.xml", + "integration-test:php54": "docker exec php54 phpunit -c wp-content/plugins/woocommerce-pos/tests/integration/php/phpunit.xml", + "integration-test:php55": "docker exec php55 phpunit -c wp-content/plugins/woocommerce-pos/tests/integration/php/phpunit.xml", + "integration-test:php56": "docker exec php56 phpunit -c wp-content/plugins/woocommerce-pos/tests/integration/php/phpunit.xml", + "integration-test:php70": "docker exec php70 phpunit -c wp-content/plugins/woocommerce-pos/tests/integration/php/phpunit.xml", "teardown-docker": "npm run stop && docker rm $(docker ps -a -q) && rm -rf .data && rm -rf .html" }, "repository": { diff --git a/tests/integration/php/bootstrap.php b/tests/integration/php/bootstrap.php index 60ed04c9..d0a46432 100644 --- a/tests/integration/php/bootstrap.php +++ b/tests/integration/php/bootstrap.php @@ -18,8 +18,8 @@ public function __construct(){ * include composer autoloader */ public function includes(){ - require_once(__DIR__.'/../../../../../../wp-load.php'); - require_once 'vendor/autoload.php'; // required to load Guzzle + require_once( __DIR__.'/../../../../../../wp-load.php' ); + require_once '/root/.composer/vendor/autoload.php'; // required to load Guzzle require_once 'framework/testcase.php'; } diff --git a/tests/integration/php/framework/testcase.php b/tests/integration/php/framework/testcase.php index a3e08d76..11dbd5f8 100644 --- a/tests/integration/php/framework/testcase.php +++ b/tests/integration/php/framework/testcase.php @@ -96,7 +96,7 @@ protected function get_product( $id ){ * @return mixed */ protected function get_random_product_id() { - $response = $this->client->get(get_woocommerce_api_url( 'products/ids' )); + $response = $this->client->get( get_woocommerce_api_url( 'products/ids' ) ); $data = $response->json(); $key = array_rand( $data['products'] ); return $data['products'][$key]['id']; @@ -110,4 +110,11 @@ protected function get_random_product() { return $this->get_product($product_id); } + /** + * @param $response + */ + protected function print_response_body( $response ) { + echo $response->getBody(); + } + } \ No newline at end of file diff --git a/tests/integration/php/spec/api/test-orders.php b/tests/integration/php/spec/api/test-orders.php index 84203a16..ce0ec047 100644 --- a/tests/integration/php/spec/api/test-orders.php +++ b/tests/integration/php/spec/api/test-orders.php @@ -629,6 +629,7 @@ public function test_order_with_shipping(){ ) ) )); + $this->assertEquals(201, $response->getStatusCode()); $data = $response->json(); $this->assertArrayHasKey('order', $data); From 68187ac69ac000ee234a0359d1072a2055f7f639 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sun, 17 Jul 2016 16:41:28 +0800 Subject: [PATCH 068/169] update docker --- .docker | 2 +- .env | 6 +++++- composer.json | 22 ---------------------- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 composer.json diff --git a/.docker b/.docker index 7b4b91f7..71555b1e 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 7b4b91f7bf9e4a3a1a10407e9a004906f75a925e +Subproject commit 71555b1e6b8014fb27a853c5f189d3acec026e81 diff --git a/.env b/.env index ca79e8ba..87af627f 100644 --- a/.env +++ b/.env @@ -1,2 +1,6 @@ # project name used by docker -PROJECT_NAME=woocommerce-pos \ No newline at end of file +PROJECT_NAME=woocommerce-pos + +# xdebug.remote_host = your ip address +# cat ~/Library/Containers/com.docker.docker/Data/database/com.docker.driver.amd64-linux/slirp/host +XDEBUG_REMOTE_HOST=192.168.65.1 \ No newline at end of file diff --git a/composer.json b/composer.json deleted file mode 100644 index a9af0e65..00000000 --- a/composer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "kilbot/woocommerce-pos", - "description": "A simple front-end for taking WooCommerce orders at the Point of Sale.", - "homepage": "https://github.com/kilbot/WooCommerce-POS", - "type": "wordpress-plugin", - "license": "GPL-3.0", - "authors": [ - { - "name": "Paul Kilmurray", - "email": "paul@kilbot.com.au", - "homepage": "https://github.com/kilbot" - } - ], - "require": { - "composer/installers": "^1.0" - }, - "require-dev": { - "satooshi/php-coveralls": "^1.0", - "guzzlehttp/guzzle": "~5", - "10up/wp_mock": "dev-master" - } -} \ No newline at end of file From eca7bba4f1667bc58246c5cc9007bf100a32d2c4 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sun, 17 Jul 2016 17:38:42 +0800 Subject: [PATCH 069/169] add version checks for travis --- .docker | 2 +- .travis.yml | 2 ++ README.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.docker b/.docker index 71555b1e..51cbb021 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 71555b1e6b8014fb27a853c5f189d3acec026e81 +Subproject commit 51cbb0217a36fc1804a0e7f4902ee440e69007a3 diff --git a/.travis.yml b/.travis.yml index 99de3ce0..1c1980e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,8 @@ before_script: - sleep 60 script: + - docker exec ${PHP_VERSION} wp core version --allow-root + - docker exec ${PHP_VERSION} wp plugin list --allow-root --status=active - npm run unit-test:js - npm run unit-test:${PHP_VERSION} - npm run integration-test:${PHP_VERSION} \ No newline at end of file diff --git a/README.md b/README.md index ca00733f..81b1c2d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [WooCommerce POS](http://woopos.com.au) +# [WooCommerce POS](http://wcpos.com) [![Build Status](https://travis-ci.org/kilbot/WooCommerce-POS.svg)](https://travis-ci.org/kilbot/WooCommerce-POS) [![Code Climate](https://codeclimate.com/github/kilbot/WooCommerce-POS/badges/gpa.svg)](https://codeclimate.com/github/kilbot/WooCommerce-POS) [![Coverage Status](https://coveralls.io/repos/kilbot/WooCommerce-POS/badge.svg)](https://coveralls.io/r/kilbot/WooCommerce-POS) From 02bd324550ae4cadb8cae5e986958267dc432981 Mon Sep 17 00:00:00 2001 From: kilbot Date: Sun, 17 Jul 2016 21:02:04 +0800 Subject: [PATCH 070/169] update docker --- .docker | 2 +- .env | 7 ++++++- .travis.yml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.docker b/.docker index 51cbb021..5cd0ee5f 160000 --- a/.docker +++ b/.docker @@ -1 +1 @@ -Subproject commit 51cbb0217a36fc1804a0e7f4902ee440e69007a3 +Subproject commit 5cd0ee5f3121c61759a169d095c23b472b254636 diff --git a/.env b/.env index 87af627f..dc706601 100644 --- a/.env +++ b/.env @@ -3,4 +3,9 @@ PROJECT_NAME=woocommerce-pos # xdebug.remote_host = your ip address # cat ~/Library/Containers/com.docker.docker/Data/database/com.docker.driver.amd64-linux/slirp/host -XDEBUG_REMOTE_HOST=192.168.65.1 \ No newline at end of file +XDEBUG_REMOTE_HOST=192.168.65.1 + +# wordpress & woocommerce versions +# WP_VERSION=latest +# WP_MULTISITE=0 +# WC_VERSION=latest \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1c1980e9..baa41b38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,10 +35,10 @@ install: before_script: - sleep 60 - -script: - docker exec ${PHP_VERSION} wp core version --allow-root - docker exec ${PHP_VERSION} wp plugin list --allow-root --status=active + +script: - npm run unit-test:js - npm run unit-test:${PHP_VERSION} - npm run integration-test:${PHP_VERSION} \ No newline at end of file From 17884d7c1a5d6f2a2d0567273308ac82bf1638db Mon Sep 17 00:00:00 2001 From: kilbot Date: Tue, 9 Aug 2016 13:25:38 +0700 Subject: [PATCH 071/169] add cart settings page --- README.md | 51 +++++++--- assets/js/src/apps/settings/cart/route.js | 21 +++++ assets/js/src/apps/settings/cart/view.js | 39 ++++++++ assets/js/src/apps/settings/router.js | 11 +++ includes/admin.php | 2 +- includes/admin/settings.php | 4 + includes/admin/settings/cart.php | 31 ++++++ includes/admin/settings/views/cart.php | 104 +++++++++++++++++++++ includes/admin/settings/views/general.php | 96 +------------------ includes/admin/settings/views/products.php | 7 ++ package.json | 6 +- woocommerce-pos.php | 1 + 12 files changed, 265 insertions(+), 108 deletions(-) create mode 100644 assets/js/src/apps/settings/cart/route.js create mode 100644 assets/js/src/apps/settings/cart/view.js create mode 100644 includes/admin/settings/cart.php create mode 100644 includes/admin/settings/views/cart.php create mode 100644 includes/admin/settings/views/products.php diff --git a/README.md b/README.md index 81b1c2d4..9d0ee757 100644 --- a/README.md +++ b/README.md @@ -35,16 +35,19 @@ If you would like to help translate WooCommerce POS into your language please ch WooCommerce POS is a WordPress plugin which requires [WordPress](http://wordpress.org) 3.8+ and [WooCommerce](wordpress.org/plugins/woocommerce) 2.2+. -To develop the plugin locally you will first have to set up a local server with WordPress and WooCommerce installed. -If this is your first time setting up a local development environment you may want to check out [Varying Vagrant Vagrants (VVV)](https://github.com/Varying-Vagrant-Vagrants/VVV) or [Chassis](https://github.com/Chassis/Chassis). +This project includes configuration files for creating a consistent development environment for WooCommerce plugins. -### Installation +### Requirements + +* [Docker](https://www.docker.com/products/docker) - download Docker for Mac, Windows or Linux +* [Node](https://nodejs.org/) -The following installation instructions assume you have `git`, `nodejs` and `grunt cli` installed. -VVV comes bundled with these and a bunch of other goodies so it is the recommended development environment for WooCommerce POS. -If you have VVV intalled you should use `vagarnt ssh` to enter the virtual machine and then continue with the instructions. +Docker provides a virtual local server with WordPress and WooCommerce pre-installed. +Node provides a package manager which simplifies tasks such as building and deploying the project. + +### Installation -Navigate to your local `wp-content/plugins` directory and clone the project. +Navigate to your local projects directory and clone the project. The recursive flag will init and update any submodules. ```sh @@ -54,21 +57,45 @@ git clone --recursive https://github.com/kilbot/WooCommerce-POS.git woocommerce- Then, navigate into the root directory of the project and install the dependencies. ```sh -cd woocommerce-pos && npm install && composer install +cd woocommerce-pos && npm run build ``` -### Building the project +Now, get a coffee :coffee: + +The first build will take some time as it prepares the virtual server. +While waiting for the first build to complete, add the following domains to your `/etc/hosts` file. + +```sh +# /etc/hosts +127.0.0.1 php54.local +127.0.0.1 php55.local +127.0.0.1 php56.local +127.0.0.1 php70.local +``` + +Once the build is complete you can start the virtual server using: + +``` +npm run start +``` + +Open your browser and navigate to `http://php56.local`, you should see a WordPress + WooCommerce + WooCommerce POS site running on PHP 5.6.x. +Login with `admin/password` to access the WordPress admin. + +### Developing and Deploying + +The `package.json` file contains some helpful commands for common tasks. -Once you have installed the project you will have all the files necessary to build and customise the plugin. Build tasks are automated by [Grunt](http://gruntjs.com). +When developing you should use the following command, this will watch the asset files and rebuild if necessary. ```sh -grunt dev +npm run dev ``` To create a minified version of the project ready to deploy, use: ```sh -grunt deploy +npm run deploy ``` This will create a zip archive of the plugin which you can then install via your WordPress admin. diff --git a/assets/js/src/apps/settings/cart/route.js b/assets/js/src/apps/settings/cart/route.js new file mode 100644 index 00000000..0cca7b08 --- /dev/null +++ b/assets/js/src/apps/settings/cart/route.js @@ -0,0 +1,21 @@ +var Route = require('lib/config/route'); +var App = require('lib/config/application'); +var View = require('./view'); + +var Cart = Route.extend({ + + initialize: function( options ) { + options = options || {}; + this.container = options.container; + this.model = options.model; + }, + + render: function() { + var view = new View({ model: this.model }); + this.container.show(view); + } + +}); + +module.exports = Cart; +App.prototype.set('SettingsApp.Cart.Route', Cart); \ No newline at end of file diff --git a/assets/js/src/apps/settings/cart/view.js b/assets/js/src/apps/settings/cart/view.js new file mode 100644 index 00000000..8bbdd3d9 --- /dev/null +++ b/assets/js/src/apps/settings/cart/view.js @@ -0,0 +1,39 @@ +var SettingsView = require('lib/config/settings-view'); +var App = require('lib/config/application'); +var Tooltip = require('lib/behaviors/tooltip'); + +var View = SettingsView.extend({ + + behaviors: { + Tooltip: { + behaviorClass: Tooltip + } + }, + + modelEvents: { + 'change:shipping.taxable': function(model, toggle){ + this.ui.shippingTaxClass.prop('disabled', !toggle); + }, + 'change:fee.taxable': function(model, toggle){ + this.ui.feeTaxClass.prop('disabled', !toggle); + } + }, + + ui: { + shippingTaxClass: 'select[name="shipping.tax_class"]', + feeTaxClass : 'select[name="fee.tax_class"]' + }, + + onShow: function(){ + if( ! this.model.get('shipping.taxable') ){ + this.ui.shippingTaxClass.prop('disabled', true); + } + if( ! this.model.get('fee.taxable') ){ + this.ui.feeTaxClass.prop('disabled', true); + } + } + +}); + +module.exports = View; +App.prototype.set('SettingsApp.Cart.View', View); \ No newline at end of file diff --git a/assets/js/src/apps/settings/router.js b/assets/js/src/apps/settings/router.js index 71a05fbb..538edcb1 100644 --- a/assets/js/src/apps/settings/router.js +++ b/assets/js/src/apps/settings/router.js @@ -2,6 +2,7 @@ var App = require('lib/config/application'); var Router = require('lib/config/router'); var LayoutView = require('./layout-view'); var General = require('./general/route'); +var Cart = require('./cart/route'); var Customers = require('./customers/route'); var Checkout = require('./checkout/route'); var Receipts = require('./receipts/route'); @@ -30,6 +31,7 @@ var SettingsRouter = Router.extend({ routes: { '' : 'showGeneral', 'general' : 'showGeneral', + 'cart' : 'showCart', 'customers' : 'showCustomers', 'checkout' : 'showCheckout', 'receipts' : 'showReceipts', @@ -87,6 +89,15 @@ var SettingsRouter = Router.extend({ }); }, + showCart: function(){ + var model = this.collection.get('cart'); + this.showFooter({model: model}); + return new Cart({ + container : this.layout.getRegion('settings'), + model: model + }); + }, + showCustomers: function(){ var model = this.collection.get('customers'); this.showFooter({model: model}); diff --git a/includes/admin.php b/includes/admin.php index 6c54c911..664a61c5 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -26,7 +26,7 @@ public function __construct() { * Load admin subclasses */ private function init() { - new Admin\Notices(); +// new Admin\Notices(); // early init for sanity checks new Admin\Menu(); new Admin\Settings(); new Admin\Status(); diff --git a/includes/admin/settings.php b/includes/admin/settings.php index fb215cc1..65f2373b 100644 --- a/includes/admin/settings.php +++ b/includes/admin/settings.php @@ -23,6 +23,7 @@ class Settings extends Page { */ static public $handlers = array( 'general' => '\WC_POS\Admin\Settings\General', + 'cart' => '\WC_POS\Admin\Settings\Cart', 'customers' => '\WC_POS\Admin\Settings\Customers', 'checkout' => '\WC_POS\Admin\Settings\Checkout', 'receipts' => '\WC_POS\Admin\Settings\Receipts', @@ -91,6 +92,9 @@ public function enqueue_admin_scripts() { $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; + // enqueue jquery UI sortable + wp_enqueue_script ('jquery-ui-sortable'); + wp_enqueue_script( \WC_POS\PLUGIN_NAME . '-admin-settings-app', \WC_POS\PLUGIN_URL . 'assets/js/admin-settings.' . $build . '.js', diff --git a/includes/admin/settings/cart.php b/includes/admin/settings/cart.php new file mode 100644 index 00000000..a55ccdf4 --- /dev/null +++ b/includes/admin/settings/cart.php @@ -0,0 +1,31 @@ + + * @link http://www.woopos.com.au + */ + +namespace WC_POS\Admin\Settings; + +class Cart extends Page { + + protected static $instance; + + public function __construct() { + $this->id = 'cart'; + $this->label = /* translators: woocommerce */ __( 'Cart', 'woocommerce' ); + + $this->defaults = array( + 'shipping' => array( + 'taxable' => true + ), + 'fee' => array( + 'taxable' => true + ) + ); + } + +} \ No newline at end of file diff --git a/includes/admin/settings/views/cart.php b/includes/admin/settings/views/cart.php new file mode 100644 index 00000000..e48f4ca6 --- /dev/null +++ b/includes/admin/settings/views/cart.php @@ -0,0 +1,104 @@ + + +

                    + + + + + + + + + + + + + + + + + + + + + + + +
                    + + + +
                    + + + +
                    + + + + +
                    + + + +
                    + +

                    + + + + + + + + + + + + + + + + + + +
                    + + + +
                    + + + + +
                    + + + +
                    \ No newline at end of file diff --git a/includes/admin/settings/views/general.php b/includes/admin/settings/views/general.php index 2c605e72..39780d7a 100644 --- a/includes/admin/settings/views/general.php +++ b/includes/admin/settings/views/general.php @@ -2,10 +2,6 @@ /** * Template for the general settings */ - -use WC_POS\API\Params; -use WC_POS\Tax; - ?>

                    @@ -47,98 +43,14 @@
                    - -

                    - - - - - - - - - - - - - - - - - - - - - - - -
                    - - - -
                    - - - -
                    - - - - -
                    - - - -
                    - -

                    - - - - - - - - - - - - - diff --git a/includes/admin/settings/views/products.php b/includes/admin/settings/views/products.php new file mode 100644 index 00000000..090a1e00 --- /dev/null +++ b/includes/admin/settings/views/products.php @@ -0,0 +1,7 @@ + + +

                    \ No newline at end of file diff --git a/package.json b/package.json index fa476406..09ad5996 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "combokeys": "^2.4.6", "debug": "^2.2.0", "handlebars": "^4.0.5", - "jquery": "^3.0.0", + "jquery": "^3.1.0", "jquery-color": "^1.0.0", "json-query": "kilbot/JSON-Query", "lodash": "^3.10.1", @@ -80,7 +80,7 @@ "grunt-contrib-cssmin": "^1.0.1", "grunt-contrib-jshint": "^1.0.0", "grunt-contrib-symlink": "^1.0.0", - "grunt-contrib-uglify": "^1.0.1", + "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", "grunt-mocha-istanbul": "^5.0.1", "grunt-phpunit": "^0.3.6", @@ -97,7 +97,7 @@ "proxyquire": "^1.7.10", "raw-loader": "^0.5.1", "sinon": "^1.17.4", - "sinon-as-promised": "^4.0.0", + "sinon-as-promised": "^4.0.2", "sinon-chai": "^2.8.0", "webpack": "^1.13.1", "webpack-dev-server": "^1.14.1" diff --git a/woocommerce-pos.php b/woocommerce-pos.php index 61c29c3c..c84b2397 100644 --- a/woocommerce-pos.php +++ b/woocommerce-pos.php @@ -53,6 +53,7 @@ function autoload( $cls ) { /** * Activate plugin */ +new Admin\Notices(); // init notices for sanity checks new Activator(); /** From e1dc0517fc45dd3b49d34de0dc22b0ea42ddd725 Mon Sep 17 00:00:00 2001 From: kilbot Date: Wed, 10 Aug 2016 18:25:50 +0700 Subject: [PATCH 072/169] add force_ssl setting --- assets/js/src/apps/settings/general/view.js | 23 --------------------- includes/admin/settings.php | 2 +- includes/template.php | 10 +++++++-- includes/wc-pos-functions.php | 3 ++- package.json | 12 +++++------ 5 files changed, 17 insertions(+), 33 deletions(-) diff --git a/assets/js/src/apps/settings/general/view.js b/assets/js/src/apps/settings/general/view.js index 4725cd75..6ac1a56c 100644 --- a/assets/js/src/apps/settings/general/view.js +++ b/assets/js/src/apps/settings/general/view.js @@ -14,29 +14,6 @@ var View = SettingsView.extend({ 'discount_quick_keys': { maximumSelectionLength: 4 } - }, - - modelEvents: { - 'change:shipping.taxable': function(model, toggle){ - this.ui.shippingTaxClass.prop('disabled', !toggle); - }, - 'change:fee.taxable': function(model, toggle){ - this.ui.feeTaxClass.prop('disabled', !toggle); - } - }, - - ui: { - shippingTaxClass: 'select[name="shipping.tax_class"]', - feeTaxClass : 'select[name="fee.tax_class"]' - }, - - onShow: function(){ - if( ! this.model.get('shipping.taxable') ){ - this.ui.shippingTaxClass.prop('disabled', true); - } - if( ! this.model.get('fee.taxable') ){ - this.ui.feeTaxClass.prop('disabled', true); - } } }); diff --git a/includes/admin/settings.php b/includes/admin/settings.php index 65f2373b..67a6f5f1 100644 --- a/includes/admin/settings.php +++ b/includes/admin/settings.php @@ -87,7 +87,7 @@ public function enqueue_admin_scripts() { wp_register_script( 'handlebars', $external_libs[ 'handlebars' ], false, null, true ); wp_register_script( 'moment', $external_libs[ 'moment' ], false, null, true ); wp_register_script( 'accounting', $external_libs[ 'accounting' ], false, null, true ); - wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.1/js/select2.min.js', array( 'jquery' ), null, true ); + wp_register_script( 'select2', 'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.full.min.js', array( 'jquery' ), null, true ); wp_register_script( 'ace', 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.2/ace.js', false, null, true ); $build = defined( '\SCRIPT_DEBUG' ) && \SCRIPT_DEBUG ? 'build' : 'min'; diff --git a/includes/template.php b/includes/template.php index 3609d384..c44e8592 100644 --- a/includes/template.php +++ b/includes/template.php @@ -25,7 +25,7 @@ class Template { /** @var array external libraries */ static public $external_libs = array( 'min' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.3.3/backbone-min.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.5/backbone.radio.min.js', @@ -36,7 +36,7 @@ class Template { 'jquery.color' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-color/2.1.2/jquery.color.min.js', ), 'debug' => array( - 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.js', + 'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.js', 'lodash' => 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js', 'backbone' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.3.3/backbone.js', 'radio' => 'https://cdnjs.cloudflare.com/ajax/libs/backbone.radio/1.0.5/backbone.radio.js', @@ -79,6 +79,12 @@ public function template_redirect() { if ( !is_pos( 'template' ) ) return; + // force ssl + if(!is_ssl() && wc_pos_get_option('general', 'force_ssl')){ + wp_safe_redirect( wc_pos_url() ); + exit; + } + // check auth if ( !is_user_logged_in() ) { add_filter( 'login_url', array( $this, 'login_url' ) ); diff --git a/includes/wc-pos-functions.php b/includes/wc-pos-functions.php index 29e9127f..f7f317a2 100644 --- a/includes/wc-pos-functions.php +++ b/includes/wc-pos-functions.php @@ -18,7 +18,8 @@ */ function wc_pos_url( $page = '' ) { $slug = WC_POS\Admin\Permalink::get_slug(); - return home_url( $slug . '/' .$page ); + $scheme = wc_pos_get_option('general', 'force_ssl') == true ? 'https' : null; + return home_url( $slug . '/' .$page, $scheme ); } diff --git a/package.json b/package.json index 09ad5996..ae7aa182 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "normalize.css": "^4.2.0", "query-parser": "kilbot/Query-Parser", "select2": "^4.0.3", - "tether": "^1.3.2", + "tether": "^1.3.4", "tether-drop": "^1.4.2", "vex-js": "^2.3.4" }, @@ -70,7 +70,7 @@ "chai-as-promised": "^5.3.0", "chai-backbone": "^0.9.4", "chai-jquery": "^2.0.0", - "coveralls": "^2.11.9", + "coveralls": "^2.11.12", "exports-loader": "^0.6.3", "grunt": "^1.0.1", "grunt-contrib-clean": "^1.0.0", @@ -82,21 +82,21 @@ "grunt-contrib-symlink": "^1.0.0", "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", - "grunt-mocha-istanbul": "^5.0.1", + "grunt-mocha-istanbul": "^5.0.2", "grunt-phpunit": "^0.3.6", "grunt-simple-mocha": "^0.4.1", - "grunt-webpack": "^1.0.11", + "grunt-webpack": "^1.0.14", "grunt-wp-i18n": "^0.5.4", "imports-loader": "^0.6.5", "istanbul": "^0.4.4", "jsdom": "^9.3.0", "jshint-stylish": "^2.2.0", "load-grunt-tasks": "^3.5.0", - "mocha": "^2.4.5", + "mocha": "^3.0.2", "node-localstorage": "^1.3.0", "proxyquire": "^1.7.10", "raw-loader": "^0.5.1", - "sinon": "^1.17.4", + "sinon": "^1.17.5", "sinon-as-promised": "^4.0.2", "sinon-chai": "^2.8.0", "webpack": "^1.13.1", From b324a85aff71ea274d57e27d43fb1519c825282a Mon Sep 17 00:00:00 2001 From: kilbot Date: Thu, 11 Aug 2016 19:07:16 +0700 Subject: [PATCH 073/169] update print service --- assets/js/src/app.js | 3 + assets/js/src/apps/pos/receipt/route.js | 6 +- assets/js/src/lib/components/print/escp.js | 0 assets/js/src/lib/components/print/service.js | 142 ++++++------------ .../print/{ => views}/epos-print.js | 16 ++ .../js/src/lib/components/print/views/escp.js | 15 ++ .../js/src/lib/components/print/views/html.js | 98 ++++++++++++ includes/admin/settings/views/cart.php | 63 ++++---- 8 files changed, 205 insertions(+), 138 deletions(-) delete mode 100644 assets/js/src/lib/components/print/escp.js rename assets/js/src/lib/components/print/{ => views}/epos-print.js (95%) create mode 100644 assets/js/src/lib/components/print/views/escp.js create mode 100644 assets/js/src/lib/components/print/views/html.js diff --git a/assets/js/src/app.js b/assets/js/src/app.js index 51f4ebee..2255a1d7 100644 --- a/assets/js/src/app.js +++ b/assets/js/src/app.js @@ -55,6 +55,9 @@ app.on('before:start', function(options){ }) } ); + // start services + this.printService.start(); + }); /** diff --git a/assets/js/src/apps/pos/receipt/route.js b/assets/js/src/apps/pos/receipt/route.js index 0056d66a..c170ff1f 100644 --- a/assets/js/src/apps/pos/receipt/route.js +++ b/assets/js/src/apps/pos/receipt/route.js @@ -108,10 +108,10 @@ var ReceiptRoute = Route.extend({ }, print: function(){ - Radio.request('print', 'print', { - template: 'receipt', - model: this.order + var view = Radio.request('print', 'receipt', { + order: this.order }); + view.print(); }, email: function(){ diff --git a/assets/js/src/lib/components/print/escp.js b/assets/js/src/lib/components/print/escp.js deleted file mode 100644 index e69de29b..00000000 diff --git a/assets/js/src/lib/components/print/service.js b/assets/js/src/lib/components/print/service.js index 85c96bc8..574fa10c 100644 --- a/assets/js/src/lib/components/print/service.js +++ b/assets/js/src/lib/components/print/service.js @@ -1,120 +1,64 @@ var Service = require('lib/config/service'); -var hbs = require('handlebars'); -var $ = require('jquery'); -var _ = require('lodash'); -var debug = require('debug')('print'); var Radio = require('backbone.radio'); -var App = require('lib/config/application'); +var HTML = require('./views/html'); +var ESCP = require('./views/escp'); +var ePOS = require('./views/epos-print'); module.exports = Service.extend({ channelName: 'print', - initialize: function(){ - _.bindAll(this, 'mediaQueryListener', 'beforePrint', 'afterPrint'); - this.start(); - }, - - onStart: function(){ + initialize: function () { this.channel.reply({ - 'print' : this.print + 'receipt': this.receipt }, this); }, - onStop: function(){ - this.channel.reset(); - }, - - /* jshint -W071 */ - print: function(options){ - var template = this.template(options), - iframe = this.init(); - - this.deferred = $.Deferred(); - - // insert template - iframe.document.write(template); - - // print once loaded - var loaded = function(){ - iframe.focus(); // required for IE - iframe.print(); - }; - - // get the first image, ie: logo - var logo = iframe.document.getElementsByTagName('img')[0]; - - if( logo ){ - logo.onload = loaded; - } else { - loaded(); - } - - return this.deferred; + onStart: function(){ + this.fetchReceiptTemplates(); }, - /* jshint +W071 */ /** - * creates an iframe and stores reference - * returns a reference to the iframe window + * Call to API to get receipt template data\ + * - todo: consistent handling of templates */ - init: function(){ - if(this.iframe){ - this.iframe.remove(); - } - - this.iframe = $('
                    - - - -
                    - - - - -
                    - + + - + +