spree_backend 4.1.12 → 4.2.0.rc3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/backend-add.svg +5 -0
- data/app/assets/images/backend-adjust.svg +5 -0
- data/app/assets/images/backend-approve.svg +3 -0
- data/app/assets/images/backend-arrow-down.svg +1 -0
- data/app/assets/images/backend-arrow-left.svg +1 -0
- data/app/assets/images/backend-arrow-right.svg +1 -0
- data/app/assets/images/backend-arrow-up.svg +1 -0
- data/app/assets/images/backend-calendar.svg +9 -0
- data/app/assets/images/backend-cancel.svg +7 -0
- data/app/assets/images/backend-capture.svg +3 -0
- data/app/assets/images/backend-cart.svg +1 -0
- data/app/assets/images/backend-chevron-down.svg +1 -0
- data/app/assets/images/backend-chevron-left.svg +1 -0
- data/app/assets/images/backend-chevron-right.svg +1 -0
- data/app/assets/images/backend-chevron-up.svg +1 -0
- data/app/assets/images/backend-clone.svg +7 -0
- data/app/assets/images/backend-close.svg +7 -0
- data/app/assets/images/backend-delete.svg +6 -0
- data/app/assets/images/backend-double-chevron-left.svg +15 -0
- data/app/assets/images/backend-double-chevron-right.svg +17 -0
- data/app/assets/images/backend-edit.svg +14 -0
- data/app/assets/images/backend-enter.svg +6 -0
- data/app/assets/images/backend-envelope.svg +3 -0
- data/app/assets/images/backend-exit.svg +13 -0
- data/app/assets/images/backend-extensions.svg +4 -0
- data/app/assets/images/backend-eye-open.svg +8 -0
- data/app/assets/images/backend-file.svg +6 -0
- data/app/assets/images/backend-filter.svg +3 -0
- data/app/assets/images/backend-folder.svg +4 -0
- data/app/assets/images/backend-images.svg +7 -0
- data/app/assets/images/backend-info.svg +7 -0
- data/app/assets/images/backend-items.svg +5 -0
- data/app/assets/images/backend-leaf.svg +7 -0
- data/app/assets/images/backend-list.svg +5 -0
- data/app/assets/images/backend-location.svg +4 -0
- data/app/assets/images/backend-menu.svg +5 -0
- data/app/assets/images/backend-money.svg +1 -0
- data/app/assets/images/backend-move.svg +5 -0
- data/app/assets/images/backend-ok.svg +3 -0
- data/app/assets/images/backend-pagination-double-arrow-right.svg +8 -0
- data/app/assets/images/backend-payments.svg +8 -0
- data/app/assets/images/backend-pencil.svg +1 -0
- data/app/assets/images/backend-products.svg +5 -0
- data/app/assets/images/backend-promotion.svg +8 -0
- data/app/assets/images/backend-recycle.svg +5 -0
- data/app/assets/images/backend-remove.svg +6 -0
- data/app/assets/images/backend-report.svg +6 -0
- data/app/assets/images/backend-resume.svg +5 -0
- data/app/assets/images/backend-returns.svg +3 -0
- data/app/assets/images/backend-save.svg +3 -0
- data/app/assets/images/backend-search.svg +1 -0
- data/app/assets/images/backend-settings.svg +6 -0
- data/app/assets/images/backend-shipping.svg +3 -0
- data/app/assets/images/backend-slack.svg +3 -0
- data/app/assets/images/backend-sort.svg +5 -0
- data/app/assets/images/backend-split.svg +3 -0
- data/app/assets/images/backend-store.svg +14 -0
- data/app/assets/images/backend-tick.svg +3 -0
- data/app/assets/images/backend-update.svg +3 -0
- data/app/assets/images/backend-user.svg +3 -0
- data/app/assets/images/backend-users.svg +6 -0
- data/app/assets/images/backend-view.svg +8 -0
- data/app/assets/images/backend-void.svg +7 -0
- data/app/assets/javascripts/spree/backend.js +5 -3
- data/app/assets/javascripts/spree/backend/address_states.js +20 -9
- data/app/assets/javascripts/spree/backend/admin.js +160 -149
- data/app/assets/javascripts/spree/backend/calculator.js +2 -0
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +99 -70
- data/app/assets/javascripts/spree/backend/flatpickr_locals.js +37 -0
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +1 -1
- data/app/assets/javascripts/spree/backend/multi_currency.js +38 -0
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +31 -37
- data/app/assets/javascripts/spree/backend/option_value_picker.js +50 -23
- data/app/assets/javascripts/spree/backend/payments/edit.js +4 -3
- data/app/assets/javascripts/spree/backend/payments/new.js +18 -18
- data/app/assets/javascripts/spree/backend/product_picker.js +35 -19
- data/app/assets/javascripts/spree/backend/promotions.js +33 -28
- data/app/assets/javascripts/spree/backend/shipments.js +28 -37
- data/app/assets/javascripts/spree/backend/spree-select2.js +38 -5
- data/app/assets/javascripts/spree/backend/stock_management.js +2 -1
- data/app/assets/javascripts/spree/backend/stock_transfer.js +32 -13
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +30 -43
- data/app/assets/javascripts/spree/backend/taxon_tree_menu.js +4 -4
- data/app/assets/javascripts/spree/backend/taxonomy.js +8 -1
- data/app/assets/javascripts/spree/backend/taxons.js +85 -63
- data/app/assets/javascripts/spree/backend/user_picker.js +16 -18
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js +23 -22
- data/app/assets/javascripts/spree/backend/variant_management.js +2 -1
- data/app/assets/stylesheets/spree/backend.css +1 -1
- data/app/assets/stylesheets/spree/backend/components/_badges.scss +1 -1
- data/app/assets/stylesheets/spree/backend/components/_buttons.scss +27 -11
- data/app/assets/stylesheets/spree/backend/components/_filters.scss +35 -5
- data/app/assets/stylesheets/spree/backend/components/_icons.scss +39 -4
- data/app/assets/stylesheets/spree/backend/components/_main.scss +32 -6
- data/app/assets/stylesheets/spree/backend/components/_navbar.scss +16 -8
- data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +119 -55
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +62 -19
- data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss +26 -63
- data/app/assets/stylesheets/spree/backend/global/_variables.scss +6 -2
- data/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss +95 -0
- data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss +0 -117
- data/app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss +11 -0
- data/app/assets/stylesheets/spree/backend/plugins/select2_bootstrap4.scss +622 -0
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +40 -0
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +38 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +7 -1
- data/app/assets/stylesheets/spree/backend/views/_order_payments.scss +12 -0
- data/app/assets/stylesheets/spree/backend/views/_product_properties.scss +11 -0
- data/app/assets/stylesheets/spree/backend/views/prototypes.scss +42 -0
- data/app/controllers/spree/admin/adjustments_controller.rb +8 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +27 -0
- data/app/controllers/spree/admin/orders_controller.rb +15 -2
- data/app/controllers/spree/admin/prices_controller.rb +39 -0
- data/app/controllers/spree/admin/products_controller.rb +2 -2
- data/app/controllers/spree/admin/states_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_transfers_controller.rb +8 -1
- data/app/controllers/spree/admin/stores_controller.rb +66 -1
- data/app/controllers/spree/admin/taxons_controller.rb +20 -6
- data/app/helpers/spree/admin/base_helper.rb +46 -13
- data/app/helpers/spree/admin/navigation_helper.rb +61 -20
- data/app/helpers/spree/admin/orders_helper.rb +2 -2
- data/app/helpers/spree/admin/payments_helper.rb +3 -3
- data/app/helpers/spree/admin/stock_movements_helper.rb +2 -0
- data/app/helpers/spree/admin/stores_helper.rb +9 -0
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_first_page.html.erb +1 -1
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_gap.html.erb +1 -1
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_last_page.html.erb +1 -1
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_next_page.html.erb +1 -1
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_page.html.erb +0 -0
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_paginator.html.erb +1 -1
- data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_prev_page.html.erb +1 -1
- data/app/views/spree/admin/adjustments/_adjustment.html.erb +2 -2
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +16 -16
- data/app/views/spree/admin/adjustments/edit.html.erb +2 -2
- data/app/views/spree/admin/adjustments/index.html.erb +3 -3
- data/app/views/spree/admin/adjustments/new.html.erb +1 -1
- data/app/views/spree/admin/countries/_form.html.erb +9 -4
- data/app/views/spree/admin/countries/index.html.erb +27 -24
- data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +37 -35
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +5 -1
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +47 -43
- data/app/views/spree/admin/customer_returns/index.html.erb +5 -3
- data/app/views/spree/admin/customer_returns/new.html.erb +2 -2
- data/app/views/spree/admin/general_settings/edit.html.erb +28 -4
- data/app/views/spree/admin/images/edit.html.erb +2 -2
- data/app/views/spree/admin/images/index.html.erb +7 -7
- data/app/views/spree/admin/images/new.html.erb +2 -2
- data/app/views/spree/admin/log_entries/index.html.erb +4 -3
- data/app/views/spree/admin/option_types/_form.html.erb +9 -0
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +22 -20
- data/app/views/spree/admin/option_types/index.html.erb +29 -25
- data/app/views/spree/admin/orders/_add_line_item.html.erb +1 -1
- data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +26 -26
- data/app/views/spree/admin/orders/_channel_form.html.erb +18 -0
- data/app/views/spree/admin/orders/_line_items.html.erb +7 -7
- data/app/views/spree/admin/orders/_order_actions.html.erb +1 -1
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +44 -42
- data/app/views/spree/admin/orders/_shipment.html.erb +9 -7
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +5 -5
- data/app/views/spree/admin/orders/_store_form.html.erb +4 -4
- data/app/views/spree/admin/orders/channel.html.erb +7 -0
- data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb +35 -12
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +3 -3
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/index.html.erb +139 -132
- data/app/views/spree/admin/payment_methods/_form.html.erb +65 -46
- data/app/views/spree/admin/payment_methods/index.html.erb +7 -5
- data/app/views/spree/admin/payments/_capture_events.html.erb +18 -16
- data/app/views/spree/admin/payments/_form.html.erb +1 -1
- data/app/views/spree/admin/payments/_list.html.erb +39 -37
- data/app/views/spree/admin/payments/index.html.erb +2 -3
- data/app/views/spree/admin/payments/new.html.erb +1 -1
- data/app/views/spree/admin/payments/show.html.erb +1 -1
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +30 -30
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +20 -18
- data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +28 -26
- data/app/views/spree/admin/prices/_variant_prices.html.erb +43 -0
- data/app/views/spree/admin/prices/index.html.erb +21 -0
- data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +16 -4
- data/app/views/spree/admin/product_properties/index.html.erb +24 -19
- data/app/views/spree/admin/products/_add_stock_form.html.erb +1 -1
- data/app/views/spree/admin/products/_autocomplete.js.erb +27 -21
- data/app/views/spree/admin/products/_form.html.erb +44 -13
- data/app/views/spree/admin/products/edit.html.erb +1 -1
- data/app/views/spree/admin/products/index.html.erb +26 -20
- data/app/views/spree/admin/products/new.html.erb +12 -3
- data/app/views/spree/admin/products/stock.html.erb +3 -3
- data/app/views/spree/admin/promotion_categories/index.html.erb +4 -1
- data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -2
- data/app/views/spree/admin/promotions/_form.html.erb +45 -18
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +1 -1
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
- data/app/views/spree/admin/promotions/_rules.html.erb +4 -4
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +1 -1
- data/app/views/spree/admin/promotions/edit.html.erb +2 -2
- data/app/views/spree/admin/promotions/index.html.erb +5 -3
- data/app/views/spree/admin/promotions/new.html.erb +7 -6
- data/app/views/spree/admin/promotions/rules/_country.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +5 -5
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +13 -19
- data/app/views/spree/admin/promotions/rules/_product.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_user.html.erb +1 -1
- data/app/views/spree/admin/properties/index.html.erb +5 -3
- data/app/views/spree/admin/prototypes/_prototypes.html.erb +30 -28
- data/app/views/spree/admin/prototypes/index.html.erb +21 -19
- data/app/views/spree/admin/prototypes/show.html.erb +21 -8
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +3 -3
- data/app/views/spree/admin/reimbursement_types/_form.html.erb +4 -4
- data/app/views/spree/admin/reimbursement_types/index.html.erb +4 -2
- data/app/views/spree/admin/reimbursements/edit.html.erb +68 -63
- data/app/views/spree/admin/reimbursements/index.html.erb +21 -20
- data/app/views/spree/admin/reimbursements/show.html.erb +68 -60
- data/app/views/spree/admin/reports/index.html.erb +18 -17
- data/app/views/spree/admin/reports/sales_total.html.erb +20 -19
- data/app/views/spree/admin/return_authorizations/_form.html.erb +10 -7
- data/app/views/spree/admin/return_authorizations/edit.html.erb +3 -3
- data/app/views/spree/admin/return_authorizations/index.html.erb +5 -3
- data/app/views/spree/admin/return_authorizations/new.html.erb +2 -2
- data/app/views/spree/admin/return_index/customer_returns.html.erb +6 -6
- data/app/views/spree/admin/return_index/return_authorizations.html.erb +6 -6
- data/app/views/spree/admin/roles/index.html.erb +21 -19
- data/app/views/spree/admin/shared/_account_nav.html.erb +51 -65
- data/app/views/spree/admin/shared/_address_form.html.erb +31 -73
- data/app/views/spree/admin/shared/_cal_close.html.erb +10 -0
- data/app/views/spree/admin/shared/_content_header.html.erb +40 -21
- data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_head.html.erb +4 -0
- data/app/views/spree/admin/shared/_header.html.erb +14 -11
- data/app/views/spree/admin/shared/_index_table_options.html.erb +5 -7
- data/app/views/spree/admin/shared/_main_menu.html.erb +25 -14
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_order_summary.html.erb +27 -21
- data/app/views/spree/admin/shared/_order_tabs.html.erb +18 -9
- data/app/views/spree/admin/shared/_product_tabs.html.erb +13 -5
- data/app/views/spree/admin/shared/_refunds.html.erb +31 -29
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +27 -6
- data/app/views/spree/admin/shared/_sidebar.html.erb +19 -1
- data/app/views/spree/admin/shared/_table_filter.html.erb +3 -3
- data/app/views/spree/admin/shared/_translations.html.erb +34 -1
- data/app/views/spree/admin/shared/_update_order_state.js.erb +6 -2
- data/app/views/spree/admin/shared/_version.html.erb +1 -1
- data/app/views/spree/admin/shared/named_types/_index.html.erb +4 -2
- data/app/views/spree/admin/shipping_categories/index.html.erb +3 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/index.html.erb +8 -2
- data/app/views/spree/admin/state_changes/index.html.erb +5 -2
- data/app/views/spree/admin/states/_state_list.html.erb +25 -24
- data/app/views/spree/admin/states/index.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/index.html.erb +5 -3
- data/app/views/spree/admin/stock_movements/index.html.erb +28 -26
- data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +20 -18
- data/app/views/spree/admin/stock_transfers/index.html.erb +46 -39
- data/app/views/spree/admin/stock_transfers/new.html.erb +4 -4
- data/app/views/spree/admin/stock_transfers/show.html.erb +3 -3
- data/app/views/spree/admin/store_credit_categories/index.html.erb +3 -1
- data/app/views/spree/admin/store_credits/index.html.erb +3 -1
- data/app/views/spree/admin/stores/_form.html.erb +199 -70
- data/app/views/spree/admin/stores/edit.html.erb +1 -1
- data/app/views/spree/admin/stores/index.html.erb +14 -7
- data/app/views/spree/admin/tax_categories/index.html.erb +29 -27
- data/app/views/spree/admin/tax_rates/index.html.erb +5 -3
- data/app/views/spree/admin/taxonomies/_list.html.erb +24 -22
- data/app/views/spree/admin/taxonomies/edit.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/index.html.erb +1 -1
- data/app/views/spree/admin/taxons/_form.html.erb +40 -36
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +24 -22
- data/app/views/spree/admin/taxons/edit.html.erb +6 -2
- data/app/views/spree/admin/taxons/index.html.erb +2 -2
- data/app/views/spree/admin/users/_addresses_form.html.erb +4 -6
- data/app/views/spree/admin/users/_lifetime_stats.html.erb +24 -23
- data/app/views/spree/admin/users/_sidebar.html.erb +5 -5
- data/app/views/spree/admin/users/_user_page_actions.html.erb +1 -1
- data/app/views/spree/admin/users/edit.html.erb +2 -2
- data/app/views/spree/admin/users/index.html.erb +25 -23
- data/app/views/spree/admin/users/items.html.erb +3 -2
- data/app/views/spree/admin/users/orders.html.erb +30 -29
- data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +3 -3
- data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +2 -2
- data/app/views/spree/admin/variants/_form.html.erb +16 -4
- data/app/views/spree/admin/variants/_split.js.erb +2 -2
- data/app/views/spree/admin/variants/index.html.erb +7 -5
- data/app/views/spree/admin/zones/index.html.erb +5 -5
- data/app/views/spree/layouts/admin.html.erb +33 -27
- data/config/initializers/ransack.rb +31 -0
- data/config/routes.rb +8 -1
- data/lib/spree/backend.rb +2 -0
- data/lib/spree_backend.rb +0 -1
- data/spec/fixtures/thinking-cat.jpg +0 -0
- data/spree_backend.gemspec +7 -5
- data/vendor/assets/javascripts/js.cookie.js +154 -156
- data/vendor/assets/javascripts/purify.js +1217 -0
- data/vendor/assets/javascripts/sortable.js +3709 -0
- data/vendor/assets/stylesheets/animate.css +7 -3156
- data/vendor/assets/stylesheets/jquery.jstree/themes/spree/style.scss +23 -9
- metadata +141 -26
- data/app/assets/javascripts/spree/backend/tag_picker.js +0 -52
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +0 -141
@@ -95,8 +95,8 @@ jQuery(function ($) {
|
|
95
95
|
}
|
96
96
|
|
97
97
|
PaymentView.prototype.$new_button = function (action) {
|
98
|
-
return $('<a><
|
99
|
-
'class': 'payment-action-' + action + ' btn btn-
|
98
|
+
return $('<a><i class="icon icon-' + action + '"></i></a>').attr({
|
99
|
+
'class': 'payment-action-' + action + ' btn btn-outline-secondary btn-sm no-filter',
|
100
100
|
title: Spree.translations[action]
|
101
101
|
}).data({
|
102
102
|
action: action
|
@@ -203,8 +203,9 @@ jQuery(function ($) {
|
|
203
203
|
var amount = this.constructor.normalize_amount(this.payment.display_amount())
|
204
204
|
return $('<input />').prop({
|
205
205
|
id: 'amount',
|
206
|
+
class: 'form-control',
|
206
207
|
value: amount
|
207
|
-
}).width(width).css({
|
208
|
+
}).width(width * 2).css({
|
208
209
|
'text-align': 'right'
|
209
210
|
})
|
210
211
|
}
|
@@ -1,12 +1,23 @@
|
|
1
|
-
|
1
|
+
/* global Cleave */
|
2
|
+
|
2
3
|
$(document).ready(function () {
|
3
4
|
if ($('#new_payment').length) {
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
5
|
+
/* eslint-disable no-new */
|
6
|
+
new Cleave('.cardNumber', {
|
7
|
+
creditCard: true,
|
8
|
+
onCreditCardTypeChanged: function (type) {
|
9
|
+
$('.ccType').val(type)
|
10
|
+
}
|
11
|
+
})
|
12
|
+
/* eslint-disable no-new */
|
13
|
+
new Cleave('.cardExpiry', {
|
14
|
+
date: true,
|
15
|
+
datePattern: ['m', 'Y']
|
16
|
+
})
|
17
|
+
/* eslint-disable no-new */
|
18
|
+
new Cleave('.cardCode', {
|
19
|
+
numericOnly: true,
|
20
|
+
blocks: [3]
|
10
21
|
})
|
11
22
|
|
12
23
|
$('.payment_methods_radios').click(
|
@@ -35,16 +46,5 @@ $(document).ready(function () {
|
|
35
46
|
}
|
36
47
|
}
|
37
48
|
)
|
38
|
-
|
39
|
-
$('.cvvLink').click(function (event) {
|
40
|
-
var windowName = 'cvv_info'
|
41
|
-
var windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
|
42
|
-
window.open($(this).prop('href'), windowName, windowOptions)
|
43
|
-
event.preventDefault()
|
44
|
-
})
|
45
|
-
|
46
|
-
$('select.jump_menu').change(function () {
|
47
|
-
window.location = this.options[this.selectedIndex].value
|
48
|
-
})
|
49
49
|
}
|
50
50
|
})
|
@@ -4,45 +4,61 @@ $.fn.productAutocomplete = function (options) {
|
|
4
4
|
// Default options
|
5
5
|
options = options || {}
|
6
6
|
var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
|
7
|
+
var values = typeof (options.values) !== 'undefined' ? options.values : null
|
7
8
|
|
8
|
-
function
|
9
|
-
return
|
9
|
+
function formatProductList(products) {
|
10
|
+
return products.map(function(obj) {
|
11
|
+
return { id: obj.id, text: obj.name }
|
12
|
+
})
|
13
|
+
}
|
14
|
+
|
15
|
+
function addOptions(select, values) {
|
16
|
+
$.ajax({
|
17
|
+
url: Spree.routes.products_api,
|
18
|
+
dataType: 'json',
|
19
|
+
data: {
|
20
|
+
q: {
|
21
|
+
id_in: values
|
22
|
+
},
|
23
|
+
token: Spree.api_key
|
24
|
+
}
|
25
|
+
}).then(function (data) {
|
26
|
+
select.addSelect2Options(data.products)
|
27
|
+
})
|
10
28
|
}
|
11
29
|
|
12
30
|
this.select2({
|
13
|
-
minimumInputLength: 3,
|
14
31
|
multiple: multiple,
|
15
|
-
|
16
|
-
$.get(Spree.routes.products_api, {
|
17
|
-
ids: element.val().split(','),
|
18
|
-
token: Spree.api_key
|
19
|
-
}, function (data) {
|
20
|
-
callback(multiple ? data.products : data.products[0])
|
21
|
-
})
|
22
|
-
},
|
32
|
+
minimumInputLength: 3,
|
23
33
|
ajax: {
|
24
34
|
url: Spree.routes.products_api,
|
25
|
-
|
26
|
-
|
27
|
-
data: function (term, page) {
|
35
|
+
dataType: 'json',
|
36
|
+
data: function (params) {
|
28
37
|
return {
|
29
38
|
q: {
|
30
|
-
name_or_master_sku_cont: term
|
39
|
+
name_or_master_sku_cont: params.term
|
31
40
|
},
|
32
41
|
m: 'OR',
|
33
42
|
token: Spree.api_key
|
34
43
|
}
|
35
44
|
},
|
36
|
-
|
45
|
+
processResults: function(data) {
|
37
46
|
var products = data.products ? data.products : []
|
47
|
+
var results = formatProductList(products)
|
48
|
+
|
38
49
|
return {
|
39
|
-
results:
|
50
|
+
results: results
|
40
51
|
}
|
41
52
|
}
|
42
53
|
},
|
43
|
-
|
44
|
-
|
54
|
+
templateSelection: function(data, _container) {
|
55
|
+
return data.text
|
56
|
+
}
|
45
57
|
})
|
58
|
+
|
59
|
+
if (values) {
|
60
|
+
addOptions(this, values)
|
61
|
+
}
|
46
62
|
}
|
47
63
|
|
48
64
|
$(document).ready(function () {
|
@@ -1,15 +1,6 @@
|
|
1
1
|
function initProductActions () {
|
2
2
|
'use strict'
|
3
3
|
|
4
|
-
// Add classes on promotion items for design
|
5
|
-
$(document).on('mouseover mouseout', 'a.delete', function (event) {
|
6
|
-
if (event.type === 'mouseover') {
|
7
|
-
$(this).parent().addClass('action-remove')
|
8
|
-
} else {
|
9
|
-
$(this).parent().removeClass('action-remove')
|
10
|
-
}
|
11
|
-
})
|
12
|
-
|
13
4
|
$('#promotion-filters').find('.variant_autocomplete').variantAutocomplete()
|
14
5
|
|
15
6
|
$('.calculator-fields').each(function () {
|
@@ -39,20 +30,36 @@ function initProductActions () {
|
|
39
30
|
if ($('#promo-rule-option-value-template').length) {
|
40
31
|
var optionValueSelectNameTemplate = Handlebars.compile($('#promo-rule-option-value-option-values-select-name-template').html())
|
41
32
|
var optionValueTemplate = Handlebars.compile($('#promo-rule-option-value-template').html())
|
33
|
+
var optionValuesList = $('.js-promo-rule-option-values')
|
42
34
|
|
43
|
-
var addOptionValue = function (
|
44
|
-
|
45
|
-
|
46
|
-
optionValuesSelect: { value: values }
|
47
|
-
}))
|
48
|
-
var optionValue = $('.js-promo-rule-option-values .promo-rule-option-value').last()
|
49
|
-
optionValue.find('.js-promo-rule-option-value-product-select').productAutocomplete({ multiple: false })
|
50
|
-
optionValue.find('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({
|
51
|
-
productSelect: '.js-promo-rule-option-value-product-select'
|
35
|
+
var addOptionValue = function (productId, values) {
|
36
|
+
var template = optionValueTemplate({
|
37
|
+
productId: productId
|
52
38
|
})
|
53
|
-
|
54
|
-
|
39
|
+
|
40
|
+
optionValuesList.append(template)
|
41
|
+
|
42
|
+
var optionValueId = '#promo-rule-option-value-'
|
43
|
+
if (productId) {
|
44
|
+
optionValueId += productId.toString()
|
55
45
|
}
|
46
|
+
var optionValue = optionValuesList.find(optionValueId)
|
47
|
+
|
48
|
+
var productSelect = optionValue.find('.js-promo-rule-option-value-product-select')
|
49
|
+
var valuesSelect = optionValue.find('.js-promo-rule-option-value-option-values-select')
|
50
|
+
|
51
|
+
productSelect.productAutocomplete({ multiple: false, values: productId })
|
52
|
+
productSelect.on('select2:select', function(e) {
|
53
|
+
valuesSelect.attr('disabled', false).removeClass('d-none').addClass('d-block')
|
54
|
+
valuesSelect.attr('name', optionValueSelectNameTemplate({ productId: productSelect.val() }).trim())
|
55
|
+
valuesSelect.optionValueAutocomplete({
|
56
|
+
productId: productId,
|
57
|
+
productSelect: productSelect,
|
58
|
+
multiple: true,
|
59
|
+
values: values,
|
60
|
+
clearSelection: productId != productSelect.val()
|
61
|
+
})
|
62
|
+
})
|
56
63
|
}
|
57
64
|
|
58
65
|
var originalOptionValues = $('.js-original-promo-rule-option-values').data('original-option-values')
|
@@ -73,12 +80,6 @@ function initProductActions () {
|
|
73
80
|
$(document).on('click', '.js-remove-promo-rule-option-value', function () {
|
74
81
|
$(this).parents('.promo-rule-option-value').remove()
|
75
82
|
})
|
76
|
-
|
77
|
-
$(document).on('change', '.js-promo-rule-option-value-product-select', function () {
|
78
|
-
var optionValueSelect = $(this).parents('.promo-rule-option-value').find('.js-promo-rule-option-value-option-values-select')
|
79
|
-
optionValueSelect.attr('name', optionValueSelectNameTemplate({ productId: $(this).val() }).trim())
|
80
|
-
optionValueSelect.prop('disabled', $(this).val() === '').select2('val', '')
|
81
|
-
})
|
82
83
|
}
|
83
84
|
|
84
85
|
//
|
@@ -147,7 +148,7 @@ function initProductActions () {
|
|
147
148
|
var quantity = $container.find('input[name="add_quantity"]').val()
|
148
149
|
if (variant_id) {
|
149
150
|
// Add to the table
|
150
|
-
var newRow = '<tr><td>' +
|
151
|
+
var newRow = '<tr><td>' + product_name + '</td><td>' + quantity + '</td><td><i class="icon icon-cancel"></i></td></tr>'
|
151
152
|
$container.find('table').append(newRow)
|
152
153
|
// Add to serialized string in hidden text field
|
153
154
|
var $hiddenField = $container.find('.line_items_string')
|
@@ -161,5 +162,9 @@ function initProductActions () {
|
|
161
162
|
}
|
162
163
|
|
163
164
|
$(document).ready(function () {
|
164
|
-
|
165
|
+
var promotion_form = $('form.edit_promotion')
|
166
|
+
|
167
|
+
if (promotion_form.length) {
|
168
|
+
initProductActions()
|
169
|
+
}
|
165
170
|
})
|
@@ -6,7 +6,6 @@ $(document).ready(function () {
|
|
6
6
|
// handle variant selection, show stock level.
|
7
7
|
$('#add_variant_id').change(function () {
|
8
8
|
var variantId = parseInt($(this).val())
|
9
|
-
|
10
9
|
var variant = _.find(window.variants, function (variant) {
|
11
10
|
return variant.id === variantId
|
12
11
|
})
|
@@ -284,48 +283,40 @@ function completeItemSplit(event) {
|
|
284
283
|
var stockLocationId = stockItemRow.find('#item_stock_location').val()
|
285
284
|
var originalShipmentNumber = link.closest('tbody').data('shipment-number')
|
286
285
|
|
287
|
-
var selectedShipment = stockItemRow.find(
|
286
|
+
var selectedShipment = stockItemRow.find('#item_stock_location option:selected')
|
288
287
|
var targetShipmentNumber = selectedShipment.data('shipment-number')
|
289
288
|
var newShipment = selectedShipment.data('new-shipment')
|
289
|
+
|
290
290
|
// eslint-disable-next-line eqeqeq
|
291
291
|
if (stockLocationId != 'new_shipment') {
|
292
|
+
var path, additionalData
|
292
293
|
if (newShipment !== undefined) {
|
293
|
-
//
|
294
|
-
|
295
|
-
|
296
|
-
async: false,
|
297
|
-
url: Spree.url(Spree.routes.shipments_api + '/transfer_to_location'),
|
298
|
-
data: {
|
299
|
-
original_shipment_number: originalShipmentNumber,
|
300
|
-
variant_id: variantId,
|
301
|
-
quantity: quantity,
|
302
|
-
stock_location_id: stockLocationId,
|
303
|
-
token: Spree.api_key
|
304
|
-
}
|
305
|
-
}).fail(function (msg) {
|
306
|
-
alert(msg.responseJSON.message || msg.responseJSON.exception)
|
307
|
-
}).done(function (msg) {
|
308
|
-
window.location.reload()
|
309
|
-
})
|
294
|
+
// transfer to a new location data
|
295
|
+
path = '/transfer_to_location'
|
296
|
+
additionalData = { stock_location_id: stockLocationId }
|
310
297
|
} else {
|
311
|
-
//
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
token: Spree.api_key
|
322
|
-
}
|
323
|
-
}).fail(function (msg) {
|
324
|
-
alert(msg.responseJSON.message || msg.responseJSON.exception)
|
325
|
-
}).done(function (msg) {
|
326
|
-
window.location.reload()
|
327
|
-
})
|
298
|
+
// transfer to an existing shipment data
|
299
|
+
path = '/transfer_to_shipment'
|
300
|
+
additionalData = { target_shipment_number: targetShipmentNumber }
|
301
|
+
}
|
302
|
+
|
303
|
+
var data = {
|
304
|
+
original_shipment_number: originalShipmentNumber,
|
305
|
+
variant_id: variantId,
|
306
|
+
quantity: quantity,
|
307
|
+
token: Spree.api_key
|
328
308
|
}
|
309
|
+
|
310
|
+
$.ajax({
|
311
|
+
type: 'POST',
|
312
|
+
async: false,
|
313
|
+
url: Spree.url(Spree.routes.shipments_api + path),
|
314
|
+
data: $.extend(data, additionalData)
|
315
|
+
}).fail(function (msg) {
|
316
|
+
alert(msg.responseJSON.message || msg.responseJSON.exception)
|
317
|
+
}).done(function (msg) {
|
318
|
+
window.location.reload()
|
319
|
+
})
|
329
320
|
}
|
330
321
|
}
|
331
322
|
|
@@ -344,7 +335,7 @@ function addVariantFromStockLocation(event) {
|
|
344
335
|
|
345
336
|
$('#stock_details').hide()
|
346
337
|
|
347
|
-
var variantId = $('
|
338
|
+
var variantId = $('select.variant_autocomplete').val()
|
348
339
|
var stockLocationId = $(this).data('stock-location-id')
|
349
340
|
var quantity = $("input.quantity[data-stock-location-id='" + stockLocationId + "']").val()
|
350
341
|
|
@@ -1,7 +1,40 @@
|
|
1
|
-
|
2
|
-
//
|
3
|
-
|
4
|
-
|
5
|
-
|
1
|
+
document.addEventListener('DOMContentLoaded', function() {
|
2
|
+
// Initiate a standard Select2 on any select element with the class .select2
|
3
|
+
// Remember to add a place holder in the HTML as needed.
|
4
|
+
$('select.select2').select2({})
|
5
|
+
|
6
|
+
// Initiate a Select2 with the option to clear, on any select element with the class .select2-clear
|
7
|
+
// Set: include_blank: true in the ERB.
|
8
|
+
// A placeholder is auto-added here as it is required to clear the Select2.
|
9
|
+
$('select.select2-clear').select2({
|
10
|
+
placeholder: Spree.translations.select_an_option,
|
11
|
+
allowClear: true
|
6
12
|
})
|
7
13
|
})
|
14
|
+
|
15
|
+
$.fn.addSelect2Options = function (data) {
|
16
|
+
var select = this
|
17
|
+
|
18
|
+
function appendOption(select, data) {
|
19
|
+
var option = new Option(data.name, data.id, true, true)
|
20
|
+
select.append(option).trigger('change')
|
21
|
+
}
|
22
|
+
|
23
|
+
if (Array.isArray(data)) {
|
24
|
+
data.map(function(row) {
|
25
|
+
appendOption(select, row)
|
26
|
+
})
|
27
|
+
} else {
|
28
|
+
appendOption(select, data)
|
29
|
+
}
|
30
|
+
select.trigger({
|
31
|
+
type: 'select2:select',
|
32
|
+
params: {
|
33
|
+
data: data
|
34
|
+
}
|
35
|
+
})
|
36
|
+
}
|
37
|
+
|
38
|
+
$.fn.select2.defaults.set('width', 'style')
|
39
|
+
$.fn.select2.defaults.set('dropdownAutoWidth', false)
|
40
|
+
$.fn.select2.defaults.set('theme', 'bootstrap4')
|
@@ -1,8 +1,9 @@
|
|
1
1
|
$(function () {
|
2
2
|
function TransferVariant (variant1) {
|
3
|
+
// refactor variant1
|
3
4
|
this.variant = variant1
|
4
|
-
this.id = this.variant.id
|
5
|
-
this.name = this.variant.name + ' - ' + this.variant.sku
|
5
|
+
this.id = this.variant[0].variant.id
|
6
|
+
this.name = this.variant[0].variant.name + ' - ' + this.variant[0].variant.sku
|
6
7
|
this.quantity = 0
|
7
8
|
}
|
8
9
|
TransferVariant.prototype.add = function (quantity) {
|
@@ -126,35 +127,53 @@ $(function () {
|
|
126
127
|
}
|
127
128
|
}
|
128
129
|
|
130
|
+
function formattedVariantList(obj) {
|
131
|
+
return { id: obj.id, text: obj.name, name: obj.name, sku: obj.sku, options_text: obj.options_text, variant: obj }
|
132
|
+
}
|
133
|
+
|
134
|
+
function formattedStockItemsList(obj) {
|
135
|
+
return { id: obj.variant.id, text: obj.variant.name, name: obj.variant.name, sku: obj.variant.sku, options_text: obj.variant.options_text, variant: obj.variant }
|
136
|
+
}
|
137
|
+
|
129
138
|
TransferVariants.prototype.build_select = function (url, query) {
|
130
139
|
return $('#transfer_variant').select2({
|
131
140
|
minimumInputLength: 3,
|
132
141
|
ajax: {
|
133
142
|
url: url,
|
134
143
|
datatype: 'json',
|
135
|
-
data: function (
|
144
|
+
data: function (params) {
|
136
145
|
var q = {}
|
137
|
-
q[query] = term
|
146
|
+
q[query] = params.term
|
138
147
|
return {
|
139
148
|
q: q,
|
140
149
|
token: Spree.api_key
|
141
150
|
}
|
142
151
|
},
|
143
|
-
|
144
|
-
var result = data
|
145
|
-
if (data
|
146
|
-
|
147
|
-
return variant
|
152
|
+
processResults: function (data) {
|
153
|
+
var result = data.variants || data.stock_items
|
154
|
+
if (data.variants != null) {
|
155
|
+
var res = (result).map(function (variant) {
|
156
|
+
return formattedVariantList(variant)
|
157
|
+
})
|
158
|
+
} else {
|
159
|
+
var res = (result).map(function (variant) {
|
160
|
+
return formattedStockItemsList(variant)
|
148
161
|
})
|
149
162
|
}
|
150
|
-
|
163
|
+
|
151
164
|
return {
|
152
|
-
results:
|
165
|
+
results: res
|
153
166
|
}
|
154
167
|
}
|
155
168
|
},
|
156
|
-
|
157
|
-
|
169
|
+
templateResult: function(variant) {
|
170
|
+
if (variant.options_text !== "") {
|
171
|
+
return variant.name + ' - ' + variant.sku + ' (' + variant.options_text + ')'
|
172
|
+
} else {
|
173
|
+
return variant.name + ' - ' + variant.sku
|
174
|
+
}
|
175
|
+
},
|
176
|
+
templateSelection: function (variant) {
|
158
177
|
// eslint-disable-next-line no-extra-boolean-cast
|
159
178
|
if (!!variant.options_text) {
|
160
179
|
return variant.name + (' (' + variant.options_text + ')') + (' - ' + variant.sku)
|