solidus_backend 1.2.3 → 1.3.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_backend might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +3 -3
- data/Rakefile +1 -1
- data/app/assets/javascripts/spree/backend.js +5 -4
- data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -1
- data/app/assets/javascripts/spree/backend/{admin.js.erb → admin.js} +13 -44
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +36 -25
- data/app/assets/javascripts/spree/backend/components/tabs.coffee +79 -0
- data/app/assets/javascripts/spree/backend/components/tooltips.js +31 -0
- data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -3
- data/app/assets/javascripts/spree/backend/{line_items_on_order_edit.js.erb → line_items_on_order_edit.js} +3 -10
- data/app/assets/javascripts/spree/backend/{option_type_autocomplete.js.erb → option_type_autocomplete.js} +0 -0
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +32 -147
- data/app/assets/javascripts/spree/backend/routes.js +1 -0
- data/app/assets/javascripts/spree/backend/shipments.js +314 -0
- data/app/assets/javascripts/spree/backend/{spree-select2.js.erb → spree-select2.js} +2 -11
- data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee +52 -73
- data/app/assets/javascripts/spree/backend/stock_management/index_update_forms.coffee +54 -52
- data/app/assets/javascripts/spree/backend/stock_management/stock_item.coffee +4 -37
- data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -1
- data/app/assets/javascripts/spree/backend/stock_transfers/edit.coffee +0 -10
- data/app/assets/javascripts/spree/backend/stock_transfers/receive.coffee +0 -10
- data/app/assets/javascripts/spree/backend/{taxon_autocomplete.js.erb → taxon_autocomplete.js} +10 -6
- data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +25 -19
- data/app/assets/javascripts/spree/backend/user_picker.js +8 -5
- data/app/assets/javascripts/spree/backend/{variant_autocomplete.js.coffee.erb → variant_autocomplete.js.coffee} +2 -4
- data/app/assets/stylesheets/spree/backend.css +0 -3
- data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +666 -0
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +17 -0
- data/app/assets/stylesheets/spree/backend/components/_progress.scss +1 -0
- data/app/assets/stylesheets/spree/backend/components/_tabs.scss +108 -0
- data/app/assets/stylesheets/spree/backend/plugins/_bootstrap_tooltip.scss +47 -0
- data/app/assets/stylesheets/spree/backend/sections/_orders.scss +1 -1
- data/app/assets/stylesheets/spree/backend/sections/_payments.scss +14 -0
- data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss +11 -9
- data/app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss +0 -49
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +11 -14
- data/app/assets/stylesheets/spree/backend/shared/_header.scss +30 -0
- data/app/assets/stylesheets/spree/backend/shared/_layout.scss +0 -105
- data/app/assets/stylesheets/spree/backend/shared/_skeleton.scss +242 -0
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +2 -0
- data/app/assets/stylesheets/spree/backend/shared/_typography.scss +5 -1
- data/app/assets/stylesheets/spree/backend/shared/_utilities.scss +35 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.scss +9 -5
- data/app/controllers/spree/admin/adjustments_controller.rb +2 -3
- data/app/controllers/spree/admin/base_controller.rb +46 -56
- data/app/controllers/spree/admin/cancellations_controller.rb +1 -1
- data/app/controllers/spree/admin/countries_controller.rb +0 -2
- data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
- data/app/controllers/spree/admin/general_settings_controller.rb +6 -8
- data/app/controllers/spree/admin/images_controller.rb +16 -17
- data/app/controllers/spree/admin/log_entries_controller.rb +1 -2
- data/app/controllers/spree/admin/option_types_controller.rb +17 -21
- data/app/controllers/spree/admin/option_values_controller.rb +1 -1
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +21 -22
- data/app/controllers/spree/admin/orders_controller.rb +41 -42
- data/app/controllers/spree/admin/payment_methods_controller.rb +18 -18
- data/app/controllers/spree/admin/payments_controller.rb +11 -11
- data/app/controllers/spree/admin/product_properties_controller.rb +13 -13
- data/app/controllers/spree/admin/products_controller.rb +4 -4
- data/app/controllers/spree/admin/promotion_actions_controller.rb +15 -11
- data/app/controllers/spree/admin/promotion_codes_controller.rb +0 -1
- data/app/controllers/spree/admin/promotion_rules_controller.rb +15 -15
- data/app/controllers/spree/admin/promotions_controller.rb +35 -35
- data/app/controllers/spree/admin/prototypes_controller.rb +2 -3
- data/app/controllers/spree/admin/reports_controller.rb +11 -5
- data/app/controllers/spree/admin/resource_controller.rb +130 -133
- data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -2
- data/app/controllers/spree/admin/return_items_controller.rb +0 -1
- data/app/controllers/spree/admin/search_controller.rb +1 -3
- data/app/controllers/spree/admin/shipping_methods_controller.rb +3 -3
- data/app/controllers/spree/admin/states_controller.rb +10 -10
- data/app/controllers/spree/admin/stock_items_controller.rb +42 -42
- data/app/controllers/spree/admin/stock_locations_controller.rb +4 -12
- data/app/controllers/spree/admin/stock_movements_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_transfers_controller.rb +7 -4
- data/app/controllers/spree/admin/store_credits_controller.rb +4 -4
- data/app/controllers/spree/admin/style_guide_controller.rb +3 -0
- data/app/controllers/spree/admin/taxonomies_controller.rb +0 -6
- data/app/controllers/spree/admin/taxons_controller.rb +13 -36
- data/app/controllers/spree/admin/users_controller.rb +54 -72
- data/app/controllers/spree/admin/variants_controller.rb +22 -35
- data/app/controllers/spree/admin/variants_including_master_controller.rb +0 -2
- data/app/controllers/spree/admin/zones_controller.rb +11 -11
- data/app/helpers/spree/admin/adjustments_helper.rb +4 -5
- data/app/helpers/spree/admin/base_helper.rb +32 -34
- data/app/helpers/spree/admin/general_settings_helper.rb +1 -1
- data/app/helpers/spree/admin/images_helper.rb +0 -1
- data/app/helpers/spree/admin/navigation_helper.rb +41 -35
- data/app/helpers/spree/admin/orders_helper.rb +5 -6
- data/app/helpers/spree/admin/payments_helper.rb +1 -1
- data/app/helpers/spree/admin/products_helper.rb +7 -7
- data/app/helpers/spree/admin/stock_locations_helper.rb +1 -1
- data/app/helpers/spree/admin/store_credit_events_helper.rb +6 -6
- data/app/helpers/spree/admin/tables_helper.rb +0 -2
- data/app/helpers/spree/admin/taxons_helper.rb +1 -1
- data/app/helpers/spree/promotion_rules_helper.rb +1 -4
- data/app/models/spree/backend_configuration.rb +1 -0
- data/app/views/kaminari/solidus_admin/_first_page.html.erb +3 -0
- data/app/views/kaminari/solidus_admin/_gap.html.erb +3 -0
- data/app/views/kaminari/solidus_admin/_last_page.html.erb +3 -0
- data/app/views/kaminari/solidus_admin/_next_page.html.erb +3 -0
- data/app/views/kaminari/solidus_admin/_page.html.erb +9 -0
- data/app/views/kaminari/solidus_admin/_paginator.html.erb +15 -0
- data/app/views/kaminari/solidus_admin/_prev_page.html.erb +3 -0
- data/app/views/spree/admin/adjustment_reasons/edit.html.erb +2 -0
- data/app/views/spree/admin/adjustment_reasons/index.html.erb +7 -6
- data/app/views/spree/admin/adjustment_reasons/new.html.erb +2 -0
- data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +3 -3
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +4 -4
- data/app/views/spree/admin/adjustments/_form.html.erb +5 -5
- data/app/views/spree/admin/adjustments/edit.html.erb +1 -2
- data/app/views/spree/admin/adjustments/new.html.erb +0 -1
- data/app/views/spree/admin/cancellations/index.html.erb +6 -6
- data/app/views/spree/admin/countries/_form.html.erb +3 -3
- data/app/views/spree/admin/countries/edit.html.erb +1 -1
- data/app/views/spree/admin/countries/index.html.erb +4 -4
- data/app/views/spree/admin/countries/new.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +4 -4
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +10 -10
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +11 -11
- data/app/views/spree/admin/customer_returns/edit.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/index.html.erb +9 -10
- data/app/views/spree/admin/customer_returns/new.html.erb +2 -3
- data/app/views/spree/admin/general_settings/edit.html.erb +37 -26
- data/app/views/spree/admin/images/_form.html.erb +2 -2
- data/app/views/spree/admin/images/edit.html.erb +0 -1
- data/app/views/spree/admin/images/index.html.erb +2 -2
- data/app/views/spree/admin/images/new.html.erb +0 -3
- data/app/views/spree/admin/log_entries/index.html.erb +2 -2
- data/app/views/spree/admin/option_types/_form.html.erb +3 -3
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +7 -5
- data/app/views/spree/admin/option_types/index.html.erb +6 -7
- data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +4 -2
- data/app/views/spree/admin/orders/_carton.html.erb +7 -7
- data/app/views/spree/admin/orders/_carton_manifest.html.erb +3 -5
- data/app/views/spree/admin/orders/_form.html.erb +0 -1
- data/app/views/spree/admin/orders/_line_items.html.erb +10 -8
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +0 -2
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +3 -1
- data/app/views/spree/admin/orders/_shipment.html.erb +99 -100
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +4 -9
- data/app/views/spree/admin/orders/confirm/_line_items.html.erb +4 -4
- data/app/views/spree/admin/orders/confirm/_payments.html.erb +7 -7
- data/app/views/spree/admin/orders/confirm/_shipment.html.erb +10 -7
- data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +2 -2
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -5
- data/app/views/spree/admin/orders/index.html.erb +15 -14
- data/app/views/spree/admin/payment_methods/_form.html.erb +9 -10
- data/app/views/spree/admin/payment_methods/edit.html.erb +1 -1
- data/app/views/spree/admin/payment_methods/index.html.erb +18 -17
- data/app/views/spree/admin/payment_methods/new.html.erb +2 -2
- data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
- data/app/views/spree/admin/payments/_form.html.erb +3 -3
- data/app/views/spree/admin/payments/_list.html.erb +29 -17
- data/app/views/spree/admin/payments/credit.html.erb +3 -3
- data/app/views/spree/admin/payments/index.html.erb +3 -3
- data/app/views/spree/admin/payments/new.html.erb +2 -2
- data/app/views/spree/admin/payments/show.html.erb +3 -3
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +4 -4
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +4 -4
- data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +5 -5
- data/app/views/spree/admin/product_properties/index.html.erb +6 -8
- data/app/views/spree/admin/products/_form.html.erb +33 -33
- data/app/views/spree/admin/products/_properties_form.erb +1 -1
- data/app/views/spree/admin/products/index.html.erb +10 -9
- data/app/views/spree/admin/products/new.html.erb +6 -5
- data/app/views/spree/admin/promotion_codes/index.csv.ruby +2 -2
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -2
- data/app/views/spree/admin/promotions/_form.html.erb +2 -2
- data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +1 -1
- data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +1 -1
- data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +15 -16
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +5 -2
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +3 -3
- data/app/views/spree/admin/properties/_form.html.erb +2 -2
- data/app/views/spree/admin/properties/index.html.erb +8 -9
- data/app/views/spree/admin/prototypes/_form.html.erb +4 -4
- data/app/views/spree/admin/prototypes/_prototypes.html.erb +2 -2
- data/app/views/spree/admin/prototypes/index.html.erb +7 -10
- data/app/views/spree/admin/prototypes/new.js.erb +1 -1
- data/app/views/spree/admin/prototypes/show.html.erb +1 -1
- data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -0
- data/app/views/spree/admin/refund_reasons/index.html.erb +7 -8
- data/app/views/spree/admin/refund_reasons/new.html.erb +2 -0
- data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +2 -2
- data/app/views/spree/admin/refunds/edit.html.erb +3 -4
- data/app/views/spree/admin/refunds/new.html.erb +4 -5
- data/app/views/spree/admin/reimbursement_types/index.html.erb +4 -4
- data/app/views/spree/admin/reimbursements/edit.html.erb +10 -11
- data/app/views/spree/admin/reimbursements/index.html.erb +4 -6
- data/app/views/spree/admin/reimbursements/show.html.erb +12 -12
- data/app/views/spree/admin/return_authorizations/_form.html.erb +15 -15
- data/app/views/spree/admin/return_authorizations/edit.html.erb +1 -2
- data/app/views/spree/admin/return_authorizations/index.html.erb +5 -5
- data/app/views/spree/admin/return_authorizations/new.html.erb +1 -2
- data/app/views/spree/admin/return_reasons/index.html.erb +2 -2
- data/app/views/spree/admin/shared/_address_form.html.erb +10 -10
- data/app/views/spree/admin/shared/_areas_tabs.html.erb +19 -0
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +2 -2
- data/app/views/spree/admin/shared/_configuration_menu.html.erb +9 -64
- data/app/views/spree/admin/shared/_destroy.js.erb +0 -2
- data/app/views/spree/admin/shared/_edit_resource_links.html.erb +0 -1
- data/app/views/spree/admin/shared/_flash.html.erb +11 -0
- data/app/views/spree/admin/shared/_general_tabs.html.erb +2 -0
- data/app/views/spree/admin/shared/_head.html.erb +10 -1
- data/app/views/spree/admin/shared/_header.html.erb +13 -5
- data/app/views/spree/admin/shared/_navigation.html.erb +1 -1
- data/app/views/spree/admin/shared/_navigation_header.html.erb +5 -0
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +0 -1
- data/app/views/spree/admin/shared/_no_objects_found.html.erb +4 -0
- data/app/views/spree/admin/shared/_order_submenu.html.erb +18 -18
- data/app/views/spree/admin/shared/_order_summary.html.erb +12 -12
- data/app/views/spree/admin/shared/_order_tabs.html.erb +4 -1
- data/app/views/spree/admin/shared/_payments_tabs.html.erb +9 -0
- data/app/views/spree/admin/shared/_product_sub_menu.html.erb +2 -2
- data/app/views/spree/admin/shared/_product_tabs.html.erb +9 -14
- data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +1 -1
- data/app/views/spree/admin/shared/_refunds.html.erb +6 -6
- data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb +21 -0
- data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +26 -0
- data/app/views/spree/admin/shared/_shipping_tabs.html.erb +17 -0
- data/app/views/spree/admin/shared/_spinner.html.erb +6 -0
- data/app/views/spree/admin/shared/_stock_sub_menu.html.erb +3 -3
- data/app/views/spree/admin/shared/_table_filter.html.erb +1 -1
- data/app/views/spree/admin/shared/_tabs.html.erb +4 -2
- data/app/views/spree/admin/shared/_taxes_tabs.html.erb +13 -0
- data/app/views/spree/admin/shared/_variant_search.html.erb +2 -2
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +2 -0
- data/app/views/spree/admin/shared/named_types/_form.html.erb +3 -5
- data/app/views/spree/admin/shared/named_types/_index.html.erb +4 -5
- data/app/views/spree/admin/shared/named_types/_new.html.erb +2 -0
- data/app/views/spree/admin/shipping_categories/_form.html.erb +2 -2
- data/app/views/spree/admin/shipping_categories/edit.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +6 -7
- data/app/views/spree/admin/shipping_categories/new.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +26 -8
- data/app/views/spree/admin/shipping_methods/edit.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/index.html.erb +10 -11
- data/app/views/spree/admin/shipping_methods/new.html.erb +1 -1
- data/app/views/spree/admin/states/_form.html.erb +2 -2
- data/app/views/spree/admin/states/_state_list.html.erb +3 -3
- data/app/views/spree/admin/states/edit.html.erb +1 -1
- data/app/views/spree/admin/states/index.html.erb +3 -3
- data/app/views/spree/admin/states/new.html.erb +1 -1
- data/app/views/spree/admin/stock_items/_stock_management.html.erb +15 -27
- data/app/views/spree/admin/stock_items/index.html.erb +1 -3
- data/app/views/spree/admin/stock_locations/_form.html.erb +17 -18
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +2 -3
- data/app/views/spree/admin/stock_locations/edit.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/index.html.erb +9 -10
- data/app/views/spree/admin/stock_locations/new.html.erb +1 -1
- data/app/views/spree/admin/stock_movements/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_movements/index.html.erb +8 -9
- data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +4 -4
- data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/edit.html.erb +8 -21
- data/app/views/spree/admin/stock_transfers/index.html.erb +8 -6
- data/app/views/spree/admin/stock_transfers/new.html.erb +2 -3
- data/app/views/spree/admin/stock_transfers/receive.html.erb +6 -21
- data/app/views/spree/admin/stock_transfers/show.html.erb +8 -8
- data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +10 -23
- data/app/views/spree/admin/store_credits/_form.html.erb +3 -3
- data/app/views/spree/admin/store_credits/_update_reason_field.html.erb +1 -1
- data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -1
- data/app/views/spree/admin/store_credits/edit_validity.html.erb +0 -1
- data/app/views/spree/admin/store_credits/index.html.erb +11 -12
- data/app/views/spree/admin/store_credits/show.html.erb +11 -11
- data/app/views/spree/admin/style_guide/topics/components/_tabs.html.erb +17 -0
- data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +2 -2
- data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/_form.html.erb +5 -7
- data/app/views/spree/admin/tax_categories/edit.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/index.html.erb +8 -9
- data/app/views/spree/admin/tax_categories/new.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/show.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/_form.html.erb +4 -4
- data/app/views/spree/admin/tax_rates/edit.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/index.html.erb +12 -13
- data/app/views/spree/admin/tax_rates/new.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/_list.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.erb +0 -3
- data/app/views/spree/admin/taxonomies/index.html.erb +4 -7
- data/app/views/spree/admin/taxonomies/new.html.erb +1 -3
- data/app/views/spree/admin/taxons/_form.html.erb +8 -7
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
- data/app/views/spree/admin/taxons/edit.html.erb +1 -4
- data/app/views/spree/admin/taxons/index.html.erb +1 -1
- data/app/views/spree/admin/trackers/_form.html.erb +3 -3
- data/app/views/spree/admin/trackers/edit.html.erb +1 -1
- data/app/views/spree/admin/trackers/index.html.erb +7 -8
- data/app/views/spree/admin/trackers/new.html.erb +1 -1
- data/app/views/spree/admin/users/_addresses_form.html.erb +2 -4
- data/app/views/spree/admin/users/_form.html.erb +6 -6
- data/app/views/spree/admin/users/_sidebar.html.erb +5 -5
- data/app/views/spree/admin/users/addresses.html.erb +1 -1
- data/app/views/spree/admin/users/edit.html.erb +0 -2
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +11 -12
- data/app/views/spree/admin/users/orders.html.erb +9 -10
- data/app/views/spree/admin/variants/_form.html.erb +60 -34
- data/app/views/spree/admin/variants/_table.html.erb +47 -0
- data/app/views/spree/admin/variants/_table_filter.html.erb +25 -0
- data/app/views/spree/admin/variants/edit.html.erb +6 -1
- data/app/views/spree/admin/variants/index.html.erb +28 -112
- data/app/views/spree/admin/variants/new.html.erb +1 -1
- data/app/views/spree/admin/variants/new.js.erb +2 -3
- data/app/views/spree/admin/zones/_country_members.html.erb +2 -2
- data/app/views/spree/admin/zones/_form.html.erb +3 -3
- data/app/views/spree/admin/zones/_state_members.html.erb +2 -2
- data/app/views/spree/admin/zones/edit.html.erb +1 -1
- data/app/views/spree/admin/zones/index.html.erb +9 -10
- data/app/views/spree/admin/zones/new.html.erb +1 -1
- data/app/views/spree/layouts/admin.html.erb +15 -33
- data/config/initializers/assets.rb +7 -1
- data/config/initializers/form_builder.rb +2 -3
- data/config/routes.rb +12 -11
- data/lib/spree/backend.rb +1 -0
- data/lib/spree/backend/action_callbacks.rb +0 -1
- data/lib/spree/backend/callbacks.rb +3 -5
- data/lib/spree/backend/engine.rb +1 -14
- data/script/rails +0 -1
- data/solidus_backend.gemspec +1 -0
- data/spec/controllers/spree/admin/base_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/cancellations_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +6 -7
- data/spec/controllers/spree/admin/general_settings_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/missing_products_controller_spec.rb +2 -4
- data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +0 -1
- data/spec/controllers/spree/admin/orders_controller_spec.rb +27 -91
- data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +38 -13
- data/spec/controllers/spree/admin/payments_controller_spec.rb +108 -104
- data/spec/controllers/spree/admin/products_controller_spec.rb +7 -7
- data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +3 -3
- data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +3 -3
- data/spec/controllers/spree/admin/promotions_controller_spec.rb +6 -9
- data/spec/controllers/spree/admin/refunds_controller_spec.rb +0 -1
- data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +3 -3
- data/spec/controllers/spree/admin/reports_controller_spec.rb +14 -9
- data/spec/controllers/spree/admin/resource_controller_spec.rb +6 -6
- data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +13 -13
- data/spec/controllers/spree/admin/return_items_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/search_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +3 -3
- data/spec/controllers/spree/admin/stock_items_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +8 -7
- data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +13 -25
- data/spec/controllers/spree/admin/store_credits_controller_spec.rb +3 -4
- data/spec/controllers/spree/admin/users_controller_spec.rb +19 -19
- data/spec/controllers/spree/admin/variants_controller_spec.rb +7 -6
- data/spec/features/admin/configuration/analytics_tracker_spec.rb +3 -3
- data/spec/features/admin/configuration/countries_spec.rb +1 -1
- data/spec/features/admin/configuration/general_settings_spec.rb +12 -2
- data/spec/features/admin/configuration/payment_methods_spec.rb +13 -12
- data/spec/features/admin/configuration/shipping_methods_spec.rb +7 -7
- data/spec/features/admin/configuration/states_spec.rb +12 -12
- data/spec/features/admin/configuration/stock_locations_spec.rb +5 -4
- data/spec/features/admin/configuration/tax_categories_spec.rb +6 -6
- data/spec/features/admin/configuration/tax_rates_spec.rb +4 -4
- data/spec/features/admin/configuration/taxonomies_spec.rb +6 -6
- data/spec/features/admin/configuration/zones_spec.rb +6 -6
- data/spec/features/admin/homepage_spec.rb +2 -5
- data/spec/features/admin/locale_spec.rb +9 -7
- data/spec/features/admin/orders/adjustments_promotions_spec.rb +15 -15
- data/spec/features/admin/orders/adjustments_spec.rb +17 -18
- data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +1 -2
- data/spec/features/admin/orders/cancelling_inventory_spec.rb +1 -1
- data/spec/features/admin/orders/customer_details_spec.rb +12 -12
- data/spec/features/admin/orders/line_items_spec.rb +3 -3
- data/spec/features/admin/orders/listing_spec.rb +21 -1
- data/spec/features/admin/orders/log_entries_spec.rb +7 -7
- data/spec/features/admin/orders/new_order_spec.rb +7 -7
- data/spec/features/admin/orders/order_details_spec.rb +41 -29
- data/spec/features/admin/orders/payments_spec.rb +20 -28
- data/spec/features/admin/orders/risk_analysis_spec.rb +2 -2
- data/spec/features/admin/orders/shipments_spec.rb +11 -6
- data/spec/features/admin/products/edit/images_spec.rb +14 -14
- data/spec/features/admin/products/edit/products_spec.rb +10 -10
- data/spec/features/admin/products/edit/taxons_spec.rb +2 -2
- data/spec/features/admin/products/edit/variants_spec.rb +9 -9
- data/spec/features/admin/products/option_types_spec.rb +11 -12
- data/spec/features/admin/products/products_spec.rb +66 -68
- data/spec/features/admin/products/properties_spec.rb +14 -14
- data/spec/features/admin/products/prototypes_spec.rb +3 -3
- data/spec/features/admin/products/stock_management_spec.rb +16 -11
- data/spec/features/admin/products/variant_spec.rb +4 -4
- data/spec/features/admin/promotion_adjustments_spec.rb +41 -41
- data/spec/features/admin/reports_spec.rb +9 -9
- data/spec/features/admin/stock_transfer_spec.rb +8 -22
- data/spec/features/admin/store_credits_spec.rb +0 -1
- data/spec/features/admin/taxons_spec.rb +5 -6
- data/spec/features/admin/users_spec.rb +6 -9
- data/spec/helpers/admin/base_helper_spec.rb +1 -2
- data/spec/helpers/admin/navigation_helper_spec.rb +15 -18
- data/spec/helpers/admin/reimbursements_helper_spec.rb +3 -3
- data/spec/helpers/admin/stock_movements_helper_spec.rb +1 -3
- data/spec/helpers/admin/store_credit_events_helper_spec.rb +3 -3
- data/spec/helpers/promotion_rules_helper_spec.rb +1 -1
- data/spec/spec_helper.rb +7 -4
- data/spec/support/feature/base_feature_helper.rb +3 -3
- data/vendor/assets/javascripts/{backbone.js → solidus_admin/backbone.js} +764 -452
- data/vendor/assets/javascripts/solidus_admin/bind-polyfill.js +28 -0
- data/vendor/assets/javascripts/solidus_admin/bootstrap.js +3560 -0
- data/vendor/assets/javascripts/solidus_admin/tether.js +1726 -0
- data/vendor/assets/javascripts/solidus_admin/underscore.js +1548 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +65 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_animation.scss +27 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +23 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +224 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +173 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +292 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +252 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +28 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_code.scss +58 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +226 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +193 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +452 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +76 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +53 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +189 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_jumbotron.scss +20 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_labels.scss +77 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +140 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_media.scss +90 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +55 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +146 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +162 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +230 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_normalize.scss +428 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pager.scss +57 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +73 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +140 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +88 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +156 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +347 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_responsive-embed.scss +39 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +193 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +85 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +157 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-background.scss +24 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-responsive.scss +49 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-spacing.scss +39 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities.scss +95 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +666 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-flex.scss +8 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +62 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +10 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +56 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_alert.scss +14 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_background-variant.scss +13 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_border-radius.scss +35 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +86 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +100 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_cards.scss +38 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_center-block.scss +7 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_clearfix.scss +7 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +89 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +43 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +44 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +75 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +59 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_image.scss +34 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_label.scss +11 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +30 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_lists.scss +7 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_nav-divider.scss +10 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_navbar-align.scss +9 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pagination.scss +22 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_progress.scss +18 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pulls.scss +6 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-filter.scss +8 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +18 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_resize.scss +6 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +32 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_size.scss +6 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_tab-focus.scss +9 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_table-row.scss +30 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-emphasis.scss +12 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-hide.scss +8 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-truncate.scss +8 -0
- metadata +140 -35
- data/app/assets/javascripts/spree/backend/orders/edit_form.js +0 -20
- data/app/assets/javascripts/spree/backend/shipments.js.erb +0 -353
- data/app/assets/javascripts/spree/backend/stock_management/index.coffee +0 -4
- data/app/assets/javascripts/spree/backend/stock_transfers/ship.js.coffee +0 -10
- data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +0 -21
- data/app/assets/javascripts/spree/frontend/backend.js +0 -1
- data/app/assets/stylesheets/spree/backend/components/_pagination.scss +0 -17
- data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +0 -87
- data/app/assets/stylesheets/spree/backend/plugins/_token-input.scss +0 -110
- data/app/assets/stylesheets/spree/frontend/backend.css +0 -1
- data/app/views/spree/admin/orders/_line_item.html.erb +0 -9
- data/app/views/spree/admin/shared/_content_header.html.erb +0 -23
- data/app/views/spree/admin/shared/_show_resource_links.html.erb +0 -5
- data/app/views/spree/admin/shared/_update_order_state.js +0 -7
- data/vendor/assets/javascripts/jquery.cookie.js +0 -41
- data/vendor/assets/javascripts/jquery.powertip.js +0 -1165
- data/vendor/assets/javascripts/underscore-min.js +0 -1227
- data/vendor/assets/stylesheets/bootstrap/components/_media.scss +0 -61
- data/vendor/assets/stylesheets/jquery.powertip.css +0 -85
@@ -13,6 +13,7 @@ Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
|
|
13
13
|
Spree.routes.taxons_search = Spree.pathFor('api/taxons')
|
14
14
|
Spree.routes.user_search = Spree.pathFor('admin/search/users')
|
15
15
|
Spree.routes.variants_api = Spree.pathFor('api/variants')
|
16
|
+
Spree.routes.users_api = Spree.pathFor('api/users')
|
16
17
|
|
17
18
|
Spree.routes.line_items_api = function(order_id) {
|
18
19
|
return Spree.pathFor('api/orders/' + order_id + '/line_items')
|
@@ -0,0 +1,314 @@
|
|
1
|
+
// Shipments AJAX API
|
2
|
+
|
3
|
+
var ShipmentAddVariantView = Backbone.View.extend({
|
4
|
+
events: {
|
5
|
+
"change #add_variant_id": "onSelect",
|
6
|
+
"click .add_variant": "onAdd"
|
7
|
+
},
|
8
|
+
onSelect: function(e) {
|
9
|
+
var variant_id = this.$("#add_variant_id").val();
|
10
|
+
var template = HandlebarsTemplates["variants/autocomplete_stock"];
|
11
|
+
var $stock_details = this.$('#stock_details');
|
12
|
+
Spree.ajax({
|
13
|
+
url: Spree.routes.variants_api + "/" + variant_id,
|
14
|
+
success: function(variant){
|
15
|
+
$stock_details.html(template({variant: variant})).show()
|
16
|
+
}
|
17
|
+
});
|
18
|
+
},
|
19
|
+
onAdd: function(e){
|
20
|
+
e.preventDefault();
|
21
|
+
|
22
|
+
this.$('#stock_details').hide();
|
23
|
+
|
24
|
+
var variant_id = this.$('input.variant_autocomplete').val();
|
25
|
+
var stock_location_id = $(e.target).data('stock-location-id');
|
26
|
+
var quantity = this.$("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
|
27
|
+
|
28
|
+
addVariantFromStockLocation(stock_location_id, variant_id, quantity)
|
29
|
+
}
|
30
|
+
});
|
31
|
+
|
32
|
+
$(function(){
|
33
|
+
$(".js-shipment-add-variant").each(function(){
|
34
|
+
new ShipmentAddVariantView({el: this});
|
35
|
+
});
|
36
|
+
});
|
37
|
+
|
38
|
+
var ShipShipmentView = Backbone.View.extend({
|
39
|
+
initialize: function(options){
|
40
|
+
this.shipment_number = options.shipment_number;
|
41
|
+
},
|
42
|
+
events: {
|
43
|
+
"submit": "onSubmit"
|
44
|
+
},
|
45
|
+
onSubmit: function(e){
|
46
|
+
Spree.ajax({
|
47
|
+
type: "PUT",
|
48
|
+
url: Spree.routes.shipments_api + "/" + this.shipment_number + "/ship",
|
49
|
+
data: {
|
50
|
+
send_mailer: this.$("[name='send_mailer']").val()
|
51
|
+
},
|
52
|
+
success: function(){
|
53
|
+
window.location.reload()
|
54
|
+
}
|
55
|
+
});
|
56
|
+
return false;
|
57
|
+
}
|
58
|
+
});
|
59
|
+
|
60
|
+
updateShipment = function(shipment_number, attributes) {
|
61
|
+
var url = Spree.routes.shipments_api + '/' + shipment_number;
|
62
|
+
|
63
|
+
return Spree.ajax({
|
64
|
+
type: 'PUT',
|
65
|
+
url: url,
|
66
|
+
data: {
|
67
|
+
shipment: attributes
|
68
|
+
}
|
69
|
+
});
|
70
|
+
};
|
71
|
+
|
72
|
+
adjustShipmentItems = function(shipment_number, variant_id, quantity){
|
73
|
+
var shipment = _.findWhere(shipments, {number: shipment_number});
|
74
|
+
var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
|
75
|
+
|
76
|
+
var url = Spree.routes.shipments_api + "/" + shipment_number;
|
77
|
+
|
78
|
+
var new_quantity = 0;
|
79
|
+
if(inventory_units.length<quantity){
|
80
|
+
url += "/add";
|
81
|
+
new_quantity = (quantity - inventory_units.length);
|
82
|
+
}else if(inventory_units.length>quantity){
|
83
|
+
url += "/remove";
|
84
|
+
new_quantity = (inventory_units.length - quantity);
|
85
|
+
}
|
86
|
+
|
87
|
+
if(new_quantity!=0){
|
88
|
+
Spree.ajax({
|
89
|
+
type: "PUT",
|
90
|
+
url: url,
|
91
|
+
data: {
|
92
|
+
variant_id: variant_id,
|
93
|
+
quantity: new_quantity,
|
94
|
+
},
|
95
|
+
success: function() {
|
96
|
+
window.location.reload();
|
97
|
+
},
|
98
|
+
error: function(response) {
|
99
|
+
window.show_flash('error', response.responseJSON.message);
|
100
|
+
}
|
101
|
+
});
|
102
|
+
}
|
103
|
+
};
|
104
|
+
|
105
|
+
startItemSplit = function(event){
|
106
|
+
event.preventDefault();
|
107
|
+
var link = $(this);
|
108
|
+
link.parent().find('a.split-item').toggle();
|
109
|
+
link.parent().find('a.delete-item').toggle();
|
110
|
+
var variant_id = link.data('variant-id');
|
111
|
+
|
112
|
+
Spree.ajax({
|
113
|
+
type: "GET",
|
114
|
+
url: Spree.routes.variants_api + "/" + variant_id,
|
115
|
+
}).success(function(variant){
|
116
|
+
var max_quantity = link.closest('tr').data('item-quantity');
|
117
|
+
var split_item_template = HandlebarsTemplates['variants/split'];
|
118
|
+
link.closest('tr').after(split_item_template({ variant: variant, shipments: shipments, max_quantity: max_quantity }));
|
119
|
+
|
120
|
+
$('#item_stock_location').select2({
|
121
|
+
width: 'resolve',
|
122
|
+
placeholder: Spree.translations.item_stock_placeholder,
|
123
|
+
minimumResultsForSearch: 8
|
124
|
+
});
|
125
|
+
});
|
126
|
+
};
|
127
|
+
|
128
|
+
completeItemSplit = function(event) {
|
129
|
+
event.preventDefault();
|
130
|
+
|
131
|
+
if($('#item_stock_location').val() === ""){
|
132
|
+
alert('Please select the split destination.');
|
133
|
+
return false;
|
134
|
+
}
|
135
|
+
|
136
|
+
var link = $(this);
|
137
|
+
var stock_item_row = link.closest('tr');
|
138
|
+
var variant_id = stock_item_row.data('variant-id');
|
139
|
+
var quantity = stock_item_row.find('#item_quantity').val();
|
140
|
+
|
141
|
+
var stock_location_id = stock_item_row.find('#item_stock_location').val();
|
142
|
+
var original_shipment_number = link.closest('tbody').data('shipment-number');
|
143
|
+
|
144
|
+
var selected_shipment = stock_item_row.find($('#item_stock_location').select2('data').element);
|
145
|
+
var target_shipment_number = selected_shipment.data('shipment-number');
|
146
|
+
var new_shipment = selected_shipment.data('new-shipment');
|
147
|
+
|
148
|
+
if (stock_location_id != 'new_shipment') {
|
149
|
+
if (new_shipment != undefined) {
|
150
|
+
// TRANSFER TO A NEW LOCATION
|
151
|
+
Spree.ajax({
|
152
|
+
type: "POST",
|
153
|
+
url: Spree.routes.shipments_api + "/transfer_to_location",
|
154
|
+
data: {
|
155
|
+
original_shipment_number: original_shipment_number,
|
156
|
+
variant_id: variant_id,
|
157
|
+
quantity: quantity,
|
158
|
+
stock_location_id: stock_location_id
|
159
|
+
}
|
160
|
+
}).error(function(msg) {
|
161
|
+
alert(msg.responseJSON['message']);
|
162
|
+
}).done(function() {
|
163
|
+
window.Spree.advanceOrder();
|
164
|
+
});
|
165
|
+
} else {
|
166
|
+
// TRANSFER TO AN EXISTING SHIPMENT
|
167
|
+
Spree.ajax({
|
168
|
+
type: "POST",
|
169
|
+
url: Spree.routes.shipments_api + "/transfer_to_shipment",
|
170
|
+
data: {
|
171
|
+
original_shipment_number: original_shipment_number,
|
172
|
+
target_shipment_number: target_shipment_number,
|
173
|
+
variant_id: variant_id,
|
174
|
+
quantity: quantity
|
175
|
+
}
|
176
|
+
}).error(function(msg) {
|
177
|
+
alert(msg.responseJSON['message']);
|
178
|
+
}).done(function() {
|
179
|
+
window.Spree.advanceOrder();
|
180
|
+
});
|
181
|
+
}
|
182
|
+
}
|
183
|
+
};
|
184
|
+
|
185
|
+
addVariantFromStockLocation = function(stock_location_id, variant_id, quantity) {
|
186
|
+
var shipment = _.find(shipments, function(shipment){
|
187
|
+
return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
|
188
|
+
});
|
189
|
+
|
190
|
+
if(shipment==undefined){
|
191
|
+
Spree.ajax({
|
192
|
+
type: "POST",
|
193
|
+
url: Spree.routes.shipments_api,
|
194
|
+
data: {
|
195
|
+
shipment: {
|
196
|
+
order_id: order_number
|
197
|
+
},
|
198
|
+
variant_id: variant_id,
|
199
|
+
quantity: quantity,
|
200
|
+
stock_location_id: stock_location_id,
|
201
|
+
}
|
202
|
+
}).done(function(){
|
203
|
+
window.location.reload();
|
204
|
+
});
|
205
|
+
}else{
|
206
|
+
//add to existing shipment
|
207
|
+
adjustShipmentItems(shipment.number, variant_id, quantity);
|
208
|
+
}
|
209
|
+
};
|
210
|
+
|
211
|
+
var ShipmentEditView = Backbone.View.extend({
|
212
|
+
initialize: function(){
|
213
|
+
var tbody = this.$("tbody[data-order-number][data-shipment-number]");
|
214
|
+
var shipment_number = tbody.data("shipment-number");
|
215
|
+
this.shipment_number = shipment_number;
|
216
|
+
this.order_number = tbody.data("order-number");
|
217
|
+
|
218
|
+
this.$("form.admin-ship-shipment").each(function(){
|
219
|
+
new ShipShipmentView({
|
220
|
+
el: this,
|
221
|
+
shipment_number: shipment_number
|
222
|
+
});
|
223
|
+
});
|
224
|
+
},
|
225
|
+
|
226
|
+
events: {
|
227
|
+
"click a.delete-item": "deleteItem",
|
228
|
+
|
229
|
+
"click a.split-item": "startItemSplit",
|
230
|
+
"click a.cancel-split": "cancelItemSplit",
|
231
|
+
"click a.save-split": "completeItemSplit",
|
232
|
+
|
233
|
+
"click a.edit-method": "toggleMethodEdit",
|
234
|
+
"click a.cancel-method": "toggleMethodEdit",
|
235
|
+
"click a.save-method": "saveMethod",
|
236
|
+
|
237
|
+
"click a.edit-tracking": "toggleTrackingEdit",
|
238
|
+
"click a.cancel-tracking": "toggleTrackingEdit",
|
239
|
+
"click a.save-tracking": "saveTracking",
|
240
|
+
},
|
241
|
+
|
242
|
+
deleteItem: function(e){
|
243
|
+
e.preventDefault();
|
244
|
+
if (confirm(Spree.translations.are_you_sure_delete)) {
|
245
|
+
var del = $(e.currentTarget);
|
246
|
+
var variant_id = del.data('variant-id');
|
247
|
+
|
248
|
+
adjustShipmentItems(this.shipment_number, variant_id, 0);
|
249
|
+
}
|
250
|
+
},
|
251
|
+
|
252
|
+
startItemSplit: function(e){
|
253
|
+
e.preventDefault();
|
254
|
+
startItemSplit.apply(e.currentTarget, [e]);
|
255
|
+
},
|
256
|
+
|
257
|
+
cancelItemSplit: function(e){
|
258
|
+
e.preventDefault();
|
259
|
+
|
260
|
+
this.$('tr.stock-item-split').remove();
|
261
|
+
this.$('a.split-item').show();
|
262
|
+
this.$('a.delete-item').show();
|
263
|
+
},
|
264
|
+
|
265
|
+
completeItemSplit: function(e){
|
266
|
+
completeItemSplit.apply(e.currentTarget, [e]);
|
267
|
+
},
|
268
|
+
|
269
|
+
toggleMethodEdit: function(e){
|
270
|
+
e.preventDefault();
|
271
|
+
this.$('tr.edit-method').toggle();
|
272
|
+
this.$('tr.show-method').toggle();
|
273
|
+
},
|
274
|
+
|
275
|
+
saveMethod: function(e) {
|
276
|
+
e.preventDefault();
|
277
|
+
var selected_shipping_rate_id = this.$("select#selected_shipping_rate_id").val();
|
278
|
+
updateShipment(this.shipment_number, {
|
279
|
+
selected_shipping_rate_id: selected_shipping_rate_id
|
280
|
+
}).done(function () {
|
281
|
+
window.location.reload();
|
282
|
+
});
|
283
|
+
},
|
284
|
+
|
285
|
+
toggleTrackingEdit: function(e) {
|
286
|
+
e.preventDefault();
|
287
|
+
this.$("tr.edit-tracking").toggle();
|
288
|
+
this.$("tr.show-tracking").toggle();
|
289
|
+
},
|
290
|
+
|
291
|
+
saveTracking: function(e) {
|
292
|
+
e.preventDefault();
|
293
|
+
var tracking = this.$('input#tracking').val();
|
294
|
+
var _this = this;
|
295
|
+
updateShipment(this.shipment_number, {
|
296
|
+
tracking: tracking
|
297
|
+
}).done(function (data) {
|
298
|
+
_this.$('tr.edit-tracking').toggle();
|
299
|
+
|
300
|
+
var show = _this.$('tr.show-tracking');
|
301
|
+
show.toggle()
|
302
|
+
.find('.tracking-value')
|
303
|
+
.html($("<strong>")
|
304
|
+
.html(Spree.translations.tracking + ": "))
|
305
|
+
.append(document.createTextNode(data.tracking));
|
306
|
+
});
|
307
|
+
}
|
308
|
+
});
|
309
|
+
|
310
|
+
$(function(){
|
311
|
+
$(".js-shipment-edit").each(function(){
|
312
|
+
new ShipmentEditView({ el: this });
|
313
|
+
});
|
314
|
+
});
|
@@ -3,21 +3,12 @@ jQuery(function($) {
|
|
3
3
|
// Make select beautiful
|
4
4
|
$('select.select2').select2({
|
5
5
|
allowClear: true,
|
6
|
-
dropdownAutoWidth: true
|
6
|
+
dropdownAutoWidth: true,
|
7
|
+
minimumResultsForSearch: 8
|
7
8
|
});
|
8
9
|
|
9
10
|
function format_taxons(taxon) {
|
10
11
|
new_taxon = taxon.text.replace('->', '<i class="fa fa-arrow-right">')
|
11
12
|
return new_taxon;
|
12
13
|
}
|
13
|
-
|
14
|
-
$("#product_taxon_ids").on({
|
15
|
-
change: function(e){
|
16
|
-
$('.select2-search-choice .with-tip').powerTip({
|
17
|
-
smartPlacement: true,
|
18
|
-
fadeInTime: 50,
|
19
|
-
fadeOutTime: 50
|
20
|
-
})
|
21
|
-
}
|
22
|
-
})
|
23
14
|
})
|
@@ -1,82 +1,61 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
countInput = $("#variant-count-on-hand-#{variantId}")
|
7
|
-
locationSelect = $("#variant-stock-location-#{variantId}")
|
8
|
-
locationSelectContainer = locationSelect.siblings('.select2-container')
|
9
|
-
resetErrors(locationSelectContainer, countInput)
|
10
|
-
validate(locationSelect, locationSelectContainer, countInput)
|
11
|
-
return if hasErrors(locationSelectContainer, countInput)
|
1
|
+
Spree.AddStockItemView = Backbone.View.extend
|
2
|
+
initialize: ->
|
3
|
+
@$countInput = @$("[name='count_on_hand']")
|
4
|
+
@$locationSelect = @$("[name='stock_location_id']")
|
5
|
+
@$backorderable = @$("[name='backorderable']")
|
12
6
|
|
13
|
-
|
14
|
-
|
15
|
-
stockItem = new Spree.StockItem
|
16
|
-
variantId: variantId
|
17
|
-
backorderable: backorderable
|
18
|
-
countOnHand: countInput.val()
|
19
|
-
stockLocationId: stockLocationId
|
20
|
-
stockItem.save(successHandler, errorHandler)
|
7
|
+
events:
|
8
|
+
"click .submit": "onSubmit"
|
21
9
|
|
22
|
-
|
23
|
-
|
24
|
-
locationSelectContainer.
|
10
|
+
validate: ->
|
11
|
+
locationSelectContainer = @$locationSelect.siblings('.select2-container')
|
12
|
+
locationSelectContainer.toggleClass('error', !@$locationSelect.val())
|
13
|
+
@$countInput.toggleClass('error', !@$countInput.val())
|
25
14
|
|
26
|
-
|
27
|
-
if locationSelect.val() is ""
|
28
|
-
locationSelectContainer.addClass('error')
|
15
|
+
locationSelectContainer.hasClass('error') || @$countInput.hasClass('error')
|
29
16
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
hasErrors = (locationSelectContainer, countInput) ->
|
34
|
-
locationSelectContainer.hasClass('error') or countInput.hasClass('error')
|
35
|
-
|
36
|
-
successHandler = (stockItem) =>
|
37
|
-
variantId = stockItem.variant_id
|
38
|
-
stockLocationId = stockItem.stock_location_id
|
39
|
-
stockLocationSelect = $("#variant-stock-location-#{variantId}")
|
40
|
-
|
41
|
-
selectedStockLocationOption = stockLocationSelect.find("option[value='#{stockLocationId}']")
|
17
|
+
onSuccess: ->
|
18
|
+
selectedStockLocationOption = @$locationSelect.find('option:selected')
|
42
19
|
stockLocationName = selectedStockLocationOption.text().trim()
|
43
20
|
selectedStockLocationOption.remove()
|
44
21
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
variantId: variantId
|
50
|
-
stockLocationId: stockLocationId
|
51
|
-
stockLocationName: stockLocationName
|
52
|
-
countOnHand: stockItem.count_on_hand
|
53
|
-
backorderable: stockItem.backorderable
|
54
|
-
)
|
55
|
-
resetTableRowStyling(variantId)
|
56
|
-
|
57
|
-
if stockLocationSelect.find('option').length is 1 # blank value
|
58
|
-
stockLocationSelect.parents('tr:first').remove()
|
59
|
-
else
|
60
|
-
stockLocationSelect.select2()
|
61
|
-
$("#variant-count-on-hand-#{variantId}").val("")
|
62
|
-
$("#variant-backorderable-#{variantId}").prop("checked", false)
|
22
|
+
editView = new Spree.EditStockItemView
|
23
|
+
model: @model
|
24
|
+
stockLocationName: stockLocationName
|
25
|
+
editView.$el.insertBefore(@$el)
|
63
26
|
|
64
|
-
|
65
|
-
|
27
|
+
@model = new Spree.StockItem
|
28
|
+
variant_id: @model.get('variant_id')
|
29
|
+
stock_location_id: @model.get('stock_location_id')
|
66
30
|
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
31
|
+
if @$locationSelect.find('option').length is 1 # blank value
|
32
|
+
@remove()
|
33
|
+
else
|
34
|
+
@$locationSelect.select2()
|
35
|
+
@$countInput.val("")
|
36
|
+
@$backorderable.prop("checked", false)
|
37
|
+
|
38
|
+
onSubmit: (ev) ->
|
39
|
+
ev.preventDefault()
|
40
|
+
return if @validate()
|
41
|
+
|
42
|
+
@model.set
|
43
|
+
backorderable: @$backorderable.prop("checked")
|
44
|
+
count_on_hand: @$countInput.val()
|
45
|
+
stock_location_id: @$locationSelect.val()
|
46
|
+
options =
|
47
|
+
success: =>
|
48
|
+
@onSuccess()
|
49
|
+
show_flash("success", Spree.translations.created_successfully)
|
50
|
+
error: (model, response, options) =>
|
51
|
+
show_flash("error", response.responseText)
|
52
|
+
@model.save(null, options)
|
53
|
+
|
54
|
+
$ ->
|
55
|
+
$('.js-add-stock-item').each ->
|
56
|
+
$el = $(this)
|
57
|
+
model = new Spree.StockItem
|
58
|
+
variant_id: $el.data('variant-id')
|
59
|
+
new Spree.AddStockItemView
|
60
|
+
el: $el
|
61
|
+
model: model
|