solidus_backend 2.1.1 → 2.2.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/.eslintrc +21 -0
- data/Gemfile +3 -0
- data/Rakefile +30 -1
- data/app/assets/config/solidus_backend_manifest.js +6 -0
- data/app/assets/javascripts/spree/backend.js +11 -7
- data/app/assets/javascripts/spree/backend/address_states.js +1 -1
- data/app/assets/javascripts/spree/backend/admin.js +11 -11
- data/app/assets/javascripts/spree/backend/calculator.js +24 -14
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +9 -96
- data/app/assets/javascripts/spree/backend/collections/index.js +2 -0
- data/app/assets/javascripts/spree/backend/collections/line_items.js +9 -0
- data/app/assets/javascripts/spree/backend/collections/states.js +13 -0
- data/app/assets/javascripts/spree/backend/components/number_with_currency.js +12 -0
- data/app/assets/javascripts/spree/backend/components/tooltips.js +2 -1
- data/app/assets/javascripts/spree/backend/format_money.js +11 -0
- data/app/assets/javascripts/spree/backend/handlebars_extensions.js +18 -0
- data/app/assets/javascripts/spree/backend/images/upload.js +1 -1
- data/app/assets/javascripts/spree/backend/models/address.js +2 -0
- data/app/assets/javascripts/spree/backend/models/index.js +2 -0
- data/app/assets/javascripts/spree/backend/models/line_item.js +7 -0
- data/app/assets/javascripts/spree/backend/models/order.js +37 -0
- data/app/assets/javascripts/spree/backend/namespaces.js +9 -0
- data/app/assets/javascripts/spree/backend/orders/cart.js +55 -0
- data/app/assets/javascripts/spree/backend/orders/index.js +2 -0
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +0 -1
- data/app/assets/javascripts/spree/backend/payments/new.js +0 -11
- data/app/assets/javascripts/spree/backend/promotions.js.coffee +48 -50
- data/app/assets/javascripts/spree/backend/promotions/activation.js +26 -0
- data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +16 -16
- data/app/assets/javascripts/spree/backend/shipments.js +1 -1
- data/app/assets/javascripts/spree/backend/spree-select2.js +1 -6
- data/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee +1 -1
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +0 -5
- data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +9 -9
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +7 -7
- data/app/assets/javascripts/spree/backend/templates/_image.hbs +5 -0
- data/app/assets/javascripts/spree/backend/templates/index.js +3 -0
- data/app/assets/javascripts/spree/backend/templates/orders/details_adjustment_row.hbs +4 -0
- data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +42 -0
- data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs +2 -2
- data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs +2 -2
- data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs +2 -2
- data/app/assets/javascripts/spree/backend/templates/stock_transfers/{transfer_item.hbs.erb → transfer_item.hbs} +1 -5
- data/app/assets/javascripts/spree/backend/templates/variants/{autocomplete.hbs.erb → autocomplete.hbs} +1 -5
- data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +18 -59
- data/app/assets/javascripts/spree/backend/translation.js +29 -0
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee +5 -4
- data/app/assets/javascripts/spree/backend/views/cart/add_line_item_button.js +19 -0
- data/app/assets/javascripts/spree/backend/views/cart/line_item_row.js +88 -0
- data/app/assets/javascripts/spree/backend/views/cart/line_item_table.js +11 -0
- data/app/assets/javascripts/spree/backend/views/index.js +12 -0
- data/app/assets/javascripts/spree/backend/views/number_with_currency.js +31 -0
- data/app/assets/javascripts/spree/backend/views/order/address.js +52 -0
- data/app/assets/javascripts/spree/backend/views/order/customer_details.js +68 -0
- data/app/assets/javascripts/spree/backend/views/order/customer_select.js +55 -0
- data/app/assets/javascripts/spree/backend/views/order/details_adjustments.js +39 -0
- data/app/assets/javascripts/spree/backend/views/order/details_total.js +12 -0
- data/app/assets/javascripts/spree/backend/views/order/summary.js +36 -0
- data/app/assets/javascripts/spree/backend/views/state_select.js +71 -0
- data/app/assets/javascripts/spree/backend/views/zones/form.js +16 -0
- data/app/assets/javascripts/spree/backend/zone.js +8 -0
- data/app/assets/stylesheets/spree/backend.css +1 -1
- data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +542 -246
- data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +5 -7
- data/app/assets/stylesheets/spree/backend/components/_image_placeholder.scss +24 -0
- data/app/assets/stylesheets/spree/backend/components/_messages.scss +8 -8
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +6 -15
- data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss +39 -0
- data/app/assets/stylesheets/spree/backend/components/_progress.scss +5 -5
- data/app/assets/stylesheets/spree/backend/components/_states.scss +6 -6
- data/app/assets/stylesheets/spree/backend/components/_stock_table.scss +1 -2
- data/app/assets/stylesheets/spree/backend/components/_tabs.scss +9 -9
- data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss +17 -0
- data/app/assets/stylesheets/spree/backend/globals/_variables.scss +25 -4
- data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss +1 -1
- data/app/assets/stylesheets/spree/backend/plugins/_bootstrap_tooltip.scss +4 -4
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +64 -187
- data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +3 -3
- data/app/assets/stylesheets/spree/backend/sections/_orders.scss +16 -20
- data/app/assets/stylesheets/spree/backend/sections/_products.scss +2 -2
- data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +7 -2
- data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +0 -14
- data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss +2 -2
- data/app/assets/stylesheets/spree/backend/sections/_store_credits.scss +0 -6
- data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +6 -6
- data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +1 -1
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +31 -123
- data/app/assets/stylesheets/spree/backend/shared/_header.scss +5 -4
- data/app/assets/stylesheets/spree/backend/shared/_icons.scss +1 -1
- data/app/assets/stylesheets/spree/backend/shared/_images.scss +7 -0
- data/app/assets/stylesheets/spree/backend/shared/_layout.scss +4 -14
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +21 -32
- data/app/assets/stylesheets/spree/backend/shared/_typography.scss +14 -47
- data/app/assets/stylesheets/spree/backend/spree_admin.scss +4 -0
- data/app/controllers/spree/admin/adjustments_controller.rb +1 -1
- data/app/controllers/spree/admin/base_controller.rb +1 -1
- data/app/controllers/spree/admin/cancellations_controller.rb +1 -1
- data/app/controllers/spree/admin/customer_returns_controller.rb +2 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +1 -27
- data/app/controllers/spree/admin/images_controller.rb +1 -1
- data/app/controllers/spree/admin/option_types_controller.rb +4 -4
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
- data/app/controllers/spree/admin/orders_controller.rb +2 -2
- data/app/controllers/spree/admin/payment_methods_controller.rb +1 -1
- data/app/controllers/spree/admin/payments_controller.rb +4 -4
- data/app/controllers/spree/admin/products_controller.rb +6 -6
- data/app/controllers/spree/admin/promotion_code_batches_controller.rb +28 -0
- data/app/controllers/spree/admin/promotion_codes_controller.rb +7 -3
- data/app/controllers/spree/admin/promotions_controller.rb +13 -23
- data/app/controllers/spree/admin/refunds_controller.rb +1 -1
- data/app/controllers/spree/admin/reimbursements_controller.rb +4 -2
- data/app/controllers/spree/admin/search_controller.rb +2 -2
- data/app/controllers/spree/admin/shipping_methods_controller.rb +2 -2
- data/app/controllers/spree/admin/states_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_items_controller.rb +3 -3
- data/app/controllers/spree/admin/stock_transfers_controller.rb +2 -2
- data/app/controllers/spree/admin/store_credits_controller.rb +8 -2
- data/app/controllers/spree/admin/stores_controller.rb +23 -0
- data/app/controllers/spree/admin/tax_rates_controller.rb +3 -3
- data/app/controllers/spree/admin/taxons_controller.rb +5 -5
- data/app/controllers/spree/admin/users_controller.rb +1 -8
- data/app/controllers/spree/admin/variants_controller.rb +9 -2
- data/app/controllers/spree/admin/zones_controller.rb +3 -3
- data/app/helpers/spree/admin/base_helper.rb +2 -1
- data/app/helpers/spree/admin/navigation_helper.rb +2 -2
- data/app/models/spree/backend_configuration.rb +3 -3
- data/app/views/spree/admin/adjustment_reasons/edit.html.erb +3 -3
- data/app/views/spree/admin/adjustment_reasons/index.html.erb +1 -1
- data/app/views/spree/admin/adjustment_reasons/new.html.erb +3 -3
- data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +3 -3
- data/app/views/spree/admin/adjustments/_adjustment.html.erb +2 -2
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +1 -1
- data/app/views/spree/admin/adjustments/_form.html.erb +3 -3
- data/app/views/spree/admin/adjustments/edit.html.erb +5 -5
- data/app/views/spree/admin/adjustments/index.html.erb +4 -4
- data/app/views/spree/admin/adjustments/new.html.erb +4 -4
- data/app/views/spree/admin/cancellations/index.html.erb +1 -1
- data/app/views/spree/admin/countries/_form.html.erb +5 -5
- data/app/views/spree/admin/countries/edit.html.erb +3 -3
- data/app/views/spree/admin/countries/index.html.erb +3 -3
- data/app/views/spree/admin/countries/new.html.erb +3 -3
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +6 -6
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +5 -5
- data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/new.html.erb +5 -5
- data/app/views/spree/admin/images/_form.html.erb +2 -2
- data/app/views/spree/admin/images/_image_row.html.erb +5 -3
- data/app/views/spree/admin/images/edit.html.erb +7 -7
- data/app/views/spree/admin/images/index.html.erb +3 -3
- data/app/views/spree/admin/images/new.html.erb +3 -3
- data/app/views/spree/admin/log_entries/index.html.erb +1 -1
- data/app/views/spree/admin/option_types/_form.html.erb +4 -4
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +5 -5
- data/app/views/spree/admin/option_types/index.html.erb +4 -4
- data/app/views/spree/admin/option_types/new.html.erb +3 -3
- data/app/views/spree/admin/option_types/new.js.erb +1 -1
- data/app/views/spree/admin/orders/_add_line_item.html.erb +2 -2
- data/app/views/spree/admin/orders/_add_product.html.erb +3 -6
- data/app/views/spree/admin/orders/_adjustments.html.erb +18 -20
- data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_form.html.erb +5 -29
- data/app/views/spree/admin/orders/_line_items.html.erb +22 -48
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +6 -31
- data/app/views/spree/admin/orders/_order_details.html.erb +32 -0
- data/app/views/spree/admin/orders/_shipment.html.erb +10 -13
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +3 -3
- data/app/views/spree/admin/orders/cart.html.erb +4 -14
- data/app/views/spree/admin/orders/confirm.html.erb +3 -3
- data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +2 -2
- data/app/views/spree/admin/orders/confirm/_payments.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +24 -20
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +13 -11
- data/app/views/spree/admin/orders/customer_details/show.html.erb +2 -2
- data/app/views/spree/admin/orders/edit.html.erb +2 -1
- data/app/views/spree/admin/orders/index.html.erb +22 -20
- data/app/views/spree/admin/payment_methods/_form.html.erb +6 -6
- data/app/views/spree/admin/payment_methods/edit.html.erb +3 -3
- data/app/views/spree/admin/payment_methods/index.html.erb +4 -4
- data/app/views/spree/admin/payment_methods/new.html.erb +3 -3
- data/app/views/spree/admin/payments/_form.html.erb +10 -8
- data/app/views/spree/admin/payments/_list.html.erb +2 -2
- data/app/views/spree/admin/payments/credit.html.erb +1 -1
- data/app/views/spree/admin/payments/index.html.erb +3 -3
- data/app/views/spree/admin/payments/new.html.erb +4 -4
- data/app/views/spree/admin/payments/show.html.erb +3 -3
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +6 -9
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +1 -1
- data/app/views/spree/admin/prices/_form.html.erb +4 -15
- data/app/views/spree/admin/prices/_master_variant_table.html.erb +3 -3
- data/app/views/spree/admin/prices/_table.html.erb +2 -2
- data/app/views/spree/admin/prices/edit.html.erb +1 -1
- data/app/views/spree/admin/prices/index.html.erb +6 -6
- data/app/views/spree/admin/prices/new.html.erb +2 -2
- data/app/views/spree/admin/prices/new.js.erb +1 -1
- data/app/views/spree/admin/product_properties/index.html.erb +5 -5
- data/app/views/spree/admin/products/_form.html.erb +21 -27
- data/app/views/spree/admin/products/edit.html.erb +6 -6
- data/app/views/spree/admin/products/index.html.erb +15 -15
- data/app/views/spree/admin/products/new.html.erb +14 -14
- data/app/views/spree/admin/products/new.js.erb +1 -1
- data/app/views/spree/admin/promotion_actions/create.js.erb +3 -2
- data/app/views/spree/admin/promotion_categories/_form.html.erb +4 -4
- data/app/views/spree/admin/promotion_categories/edit.html.erb +3 -3
- data/app/views/spree/admin/promotion_categories/index.html.erb +2 -2
- data/app/views/spree/admin/promotion_categories/new.html.erb +3 -3
- data/app/views/spree/admin/promotion_code_batches/download.csv.ruby +6 -0
- data/app/views/spree/admin/promotion_code_batches/index.html.erb +65 -0
- data/app/views/spree/admin/promotion_code_batches/new.html.erb +23 -0
- data/app/views/spree/admin/promotion_codes/index.csv.ruby +1 -1
- data/app/views/spree/admin/promotion_codes/index.html.erb +28 -0
- data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +4 -4
- data/app/views/spree/admin/promotions/_activations_edit.html.erb +22 -0
- data/app/views/spree/admin/promotions/_activations_new.html.erb +66 -0
- data/app/views/spree/admin/promotions/_form.html.erb +51 -64
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +4 -4
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +4 -4
- data/app/views/spree/admin/promotions/_rules.html.erb +6 -8
- data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +2 -2
- data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +21 -22
- data/app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb +4 -0
- data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +8 -6
- data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +8 -6
- data/app/views/spree/admin/promotions/edit.html.erb +15 -12
- data/app/views/spree/admin/promotions/index.html.erb +9 -9
- data/app/views/spree/admin/promotions/new.html.erb +5 -6
- data/app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb +3 -3
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +7 -10
- data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_nth_order.html.erb +4 -4
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +3 -3
- data/app/views/spree/admin/promotions/rules/_product.html.erb +4 -4
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +4 -4
- data/app/views/spree/admin/promotions/rules/_user.html.erb +1 -1
- data/app/views/spree/admin/properties/_form.html.erb +4 -4
- data/app/views/spree/admin/properties/edit.html.erb +3 -3
- data/app/views/spree/admin/properties/index.html.erb +7 -7
- data/app/views/spree/admin/properties/new.html.erb +3 -3
- data/app/views/spree/admin/properties/new.js.erb +1 -1
- data/app/views/spree/admin/refund_reasons/edit.html.erb +3 -3
- data/app/views/spree/admin/refund_reasons/index.html.erb +1 -1
- data/app/views/spree/admin/refund_reasons/new.html.erb +3 -3
- data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +3 -3
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +4 -4
- data/app/views/spree/admin/reimbursements/edit.html.erb +6 -6
- data/app/views/spree/admin/reimbursements/index.html.erb +2 -2
- data/app/views/spree/admin/reimbursements/show.html.erb +6 -6
- data/app/views/spree/admin/reports/sales_total.html.erb +1 -1
- data/app/views/spree/admin/return_authorizations/_form.html.erb +3 -7
- data/app/views/spree/admin/return_authorizations/edit.html.erb +3 -3
- data/app/views/spree/admin/return_authorizations/index.html.erb +3 -3
- data/app/views/spree/admin/return_authorizations/new.html.erb +3 -3
- data/app/views/spree/admin/shared/_address_form.html.erb +12 -20
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +10 -13
- data/app/views/spree/admin/shared/_configuration_menu.html.erb +2 -2
- data/app/views/spree/admin/shared/_head.html.erb +1 -1
- data/app/views/spree/admin/shared/_image.html.erb +7 -0
- data/app/views/spree/admin/shared/_js_locale_data.html.erb +47 -0
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +1 -1
- data/app/views/spree/admin/shared/_number_with_currency.html.erb +16 -0
- data/app/views/spree/admin/shared/_order_submenu.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_summary.html.erb +16 -17
- data/app/views/spree/admin/shared/_product_tabs.html.erb +6 -6
- data/app/views/spree/admin/shared/_report_criteria.html.erb +7 -7
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +9 -9
- data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +2 -2
- data/app/views/spree/admin/shared/_sidebar.html.erb +1 -1
- data/app/views/spree/admin/shared/_variant_search.html.erb +4 -4
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +3 -3
- data/app/views/spree/admin/shared/named_types/_form.html.erb +8 -10
- data/app/views/spree/admin/shared/named_types/_index.html.erb +1 -1
- data/app/views/spree/admin/shared/named_types/_new.html.erb +3 -3
- data/app/views/spree/admin/shipping_categories/edit.html.erb +3 -3
- data/app/views/spree/admin/shipping_categories/index.html.erb +3 -3
- data/app/views/spree/admin/shipping_categories/new.html.erb +3 -3
- data/app/views/spree/admin/shipping_methods/_form.html.erb +15 -15
- data/app/views/spree/admin/shipping_methods/edit.html.erb +3 -3
- data/app/views/spree/admin/shipping_methods/index.html.erb +4 -4
- data/app/views/spree/admin/shipping_methods/new.html.erb +3 -3
- data/app/views/spree/admin/states/_form.html.erb +4 -4
- data/app/views/spree/admin/states/_new.html.erb +2 -2
- data/app/views/spree/admin/states/_state_list.html.erb +2 -2
- data/app/views/spree/admin/states/edit.html.erb +3 -3
- data/app/views/spree/admin/states/index.html.erb +6 -6
- data/app/views/spree/admin/states/new.html.erb +3 -3
- data/app/views/spree/admin/stock_items/_stock_management.html.erb +3 -3
- data/app/views/spree/admin/stock_items/index.html.erb +4 -4
- data/app/views/spree/admin/stock_locations/_form.html.erb +10 -10
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +5 -5
- data/app/views/spree/admin/stock_locations/edit.html.erb +3 -3
- data/app/views/spree/admin/stock_locations/index.html.erb +4 -4
- data/app/views/spree/admin/stock_locations/new.html.erb +3 -3
- data/app/views/spree/admin/stock_movements/index.html.erb +2 -8
- data/app/views/spree/admin/stock_transfers/_stock_movements.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 +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +9 -9
- data/app/views/spree/admin/stock_transfers/receive.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/show.html.erb +5 -5
- data/app/views/spree/admin/store_credits/_form.html.erb +7 -6
- 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/index.html.erb +14 -11
- data/app/views/spree/admin/store_credits/new.html.erb +2 -2
- data/app/views/spree/admin/stores/_form.html.erb +51 -0
- data/app/views/spree/admin/stores/edit.html.erb +19 -0
- data/app/views/spree/admin/stores/index.html.erb +41 -0
- data/app/views/spree/admin/stores/new.html.erb +15 -0
- data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +10 -8
- data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb +23 -4
- data/app/views/spree/admin/tax_categories/_form.html.erb +8 -8
- data/app/views/spree/admin/tax_categories/edit.html.erb +3 -3
- data/app/views/spree/admin/tax_categories/index.html.erb +4 -4
- data/app/views/spree/admin/tax_categories/new.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/_form.html.erb +7 -7
- data/app/views/spree/admin/tax_rates/edit.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/index.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/new.html.erb +3 -3
- data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/_list.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/_taxon.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.erb +1 -1
- data/app/views/spree/admin/taxonomies/index.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/new.html.erb +1 -1
- data/app/views/spree/admin/taxons/_form.html.erb +10 -10
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
- data/app/views/spree/admin/taxons/edit.html.erb +2 -2
- data/app/views/spree/admin/taxons/index.html.erb +2 -2
- data/app/views/spree/admin/users/_addresses_form.html.erb +4 -4
- data/app/views/spree/admin/users/_form.html.erb +8 -7
- data/app/views/spree/admin/users/addresses.html.erb +5 -5
- data/app/views/spree/admin/users/edit.html.erb +15 -15
- data/app/views/spree/admin/users/index.html.erb +5 -5
- data/app/views/spree/admin/users/items.html.erb +7 -7
- data/app/views/spree/admin/users/new.html.erb +3 -3
- data/app/views/spree/admin/users/orders.html.erb +7 -7
- data/app/views/spree/admin/variants/_form.html.erb +14 -14
- data/app/views/spree/admin/variants/_table.html.erb +2 -2
- data/app/views/spree/admin/variants/_table_filter.html.erb +3 -3
- data/app/views/spree/admin/variants/edit.html.erb +4 -4
- data/app/views/spree/admin/variants/index.html.erb +2 -2
- data/app/views/spree/admin/variants/new.html.erb +4 -4
- data/app/views/spree/admin/variants/new.js.erb +1 -1
- data/app/views/spree/admin/zones/_country_members.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +9 -9
- data/app/views/spree/admin/zones/_state_members.html.erb +1 -1
- data/app/views/spree/admin/zones/edit.html.erb +3 -3
- data/app/views/spree/admin/zones/index.html.erb +6 -6
- data/app/views/spree/admin/zones/new.html.erb +3 -3
- data/app/views/spree/layouts/admin.html.erb +3 -3
- data/app/views/spree/layouts/admin_style_guide.html.erb +1 -1
- data/config/initializers/assets.rb +1 -7
- data/config/routes.rb +6 -2
- data/lib/spree/backend.rb +0 -1
- data/lib/spree/backend/engine.rb +0 -5
- data/solidus_backend.gemspec +0 -1
- data/spec/controllers/spree/admin/payments_controller_spec.rb +21 -7
- data/spec/controllers/spree/admin/promotions_controller_spec.rb +30 -36
- data/spec/controllers/spree/admin/store_credits_controller_spec.rb +1 -0
- data/spec/controllers/spree/admin/users_controller_spec.rb +9 -1
- data/spec/features/admin/configuration/payment_methods_spec.rb +1 -1
- data/spec/features/admin/configuration/shipping_methods_spec.rb +21 -13
- data/spec/features/admin/configuration/stock_locations_spec.rb +3 -2
- data/spec/features/admin/configuration/{general_settings_spec.rb → store_spec.rb} +8 -9
- data/spec/features/admin/javascript_format_money_spec.rb +20 -0
- data/spec/features/admin/orders/customer_details_spec.rb +16 -12
- data/spec/features/admin/orders/line_items_spec.rb +2 -2
- data/spec/features/admin/orders/listing_spec.rb +25 -10
- data/spec/features/admin/orders/new_order_spec.rb +18 -31
- data/spec/features/admin/orders/order_details_spec.rb +22 -27
- data/spec/features/admin/orders/payments_spec.rb +5 -12
- data/spec/features/admin/orders/shipments_spec.rb +36 -2
- data/spec/features/admin/products/edit/images_spec.rb +1 -1
- data/spec/features/admin/products/edit/products_spec.rb +3 -3
- data/spec/features/admin/products/pricing_spec.rb +1 -1
- data/spec/features/admin/promotion_adjustments_spec.rb +42 -20
- data/spec/features/admin/stock_transfer_spec.rb +4 -4
- data/spec/features/admin/users_spec.rb +14 -0
- data/spec/javascripts/fixtures/_boot.html.erb +8 -0
- data/spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb +3 -0
- data/spec/javascripts/fixtures/number_with_currency/without_select.html.erb +3 -0
- data/spec/javascripts/format_money_spec.js +48 -0
- data/spec/javascripts/spec_helper.js +11 -0
- data/spec/javascripts/support/show_errors.js +8 -0
- data/spec/javascripts/support/with_translations.js +11 -0
- data/spec/javascripts/translation_spec.js +50 -0
- data/spec/javascripts/views/number_with_currency_spec.js +72 -0
- data/spec/spec_helper.rb +1 -0
- data/spec/support/feature/order_feature_helper.rb +8 -0
- data/spec/teaspoon_env.rb +17 -0
- data/vendor/assets/images/solidus_admin/select2-spinner.gif +0 -0
- data/vendor/assets/images/solidus_admin/select2.png +0 -0
- data/vendor/assets/images/solidus_admin/select2x2.png +0 -0
- data/vendor/assets/javascripts/solidus_admin/accounting.js +4 -0
- data/vendor/assets/javascripts/solidus_admin/backbone-nested-models.js +193 -0
- data/vendor/assets/javascripts/solidus_admin/bootstrap.js +1775 -1800
- data/vendor/assets/javascripts/solidus_admin/select2.js +3729 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/index.js +1 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ar.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_az.js +20 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_bg.js +20 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ca.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_cs.js +51 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_da.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_de.js +18 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_el.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_et.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_eu.js +45 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_fa.js +21 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_fi.js +30 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_fr.js +18 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_gl.js +45 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_he.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_hr.js +24 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_hu.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_id.js +21 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_is.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_it.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ja.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ka.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ko.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_lt.js +26 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_lv.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_mk.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ms.js +21 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_nb.js +22 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_nl.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pl.js +54 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pt-BR.js +18 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_pt-PT.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ro.js +17 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_rs.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ru.js +23 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_sk.js +50 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_sv.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_th.js +19 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_tr.js +20 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_ug-CN.js +16 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_uk.js +25 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_vi.js +20 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_zh-CN.js +16 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_zh-TW.js +16 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +5 -15
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_badge.scss +77 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +25 -10
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +38 -60
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +27 -30
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +66 -82
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +99 -173
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +6 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_code.scss +13 -7
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +151 -114
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom.scss +4 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +28 -60
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +154 -218
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +22 -46
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +7 -17
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +43 -54
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +80 -79
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_media.scss +6 -84
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +9 -7
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +38 -42
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +41 -84
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +171 -133
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_normalize.scss +230 -197
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +16 -22
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +87 -56
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +96 -65
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +17 -141
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +76 -34
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_responsive-embed.scss +18 -5
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +26 -66
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +23 -18
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_transitions.scss +34 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +16 -30
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities.scss +13 -95
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +542 -247
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +20 -39
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +2 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +6 -8
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_background-variant.scss +1 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/{_label.scss → _badge.scss} +2 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +25 -16
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +39 -53
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_cards.scss +11 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_clearfix.scss +1 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_float.scss +9 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +11 -21
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +5 -11
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +39 -18
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +52 -27
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +10 -9
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_image.scss +6 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +3 -5
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pagination.scss +2 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +3 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +2 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-emphasis.scss +1 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-hide.scss +1 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_transforms.scss +14 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_visibility.scss +5 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_align.scss +6 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/{_utilities-background.scss → utilities/_background.scss} +3 -8
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_borders.scss +37 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_clearfix.scss +3 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_display.scss +18 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_flex.scss +48 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_float.scss +9 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_position.scss +23 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_screenreaders.scss +11 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_sizing.scss +10 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_spacing.scss +43 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_text.scss +61 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/{_utilities-responsive.scss → utilities/_visibility.scss} +7 -1
- data/vendor/assets/stylesheets/solidus_admin/select2.scss +692 -0
- metadata +149 -48
- data/app/assets/javascripts/spree/backend/handlebars_extensions.coffee +0 -19
- data/app/assets/javascripts/spree/backend/line_items.js.coffee +0 -55
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +0 -62
- data/app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee +0 -4
- data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +0 -21
- data/app/assets/javascripts/spree/backend/variant_management.js.coffee +0 -10
- data/app/assets/javascripts/spree/backend/zone.js.coffee +0 -43
- data/app/views/spree/admin/general_settings/edit.html.erb +0 -80
- data/app/views/spree/admin/shared/_translations.html.erb +0 -29
- data/app/views/spree/admin/stock_movements/_form.html.erb +0 -12
- data/app/views/spree/admin/stock_movements/new.html.erb +0 -15
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_animation.scss +0 -27
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_labels.scss +0 -77
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pager.scss +0 -57
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-spacing.scss +0 -39
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-flex.scss +0 -8
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_center-block.scss +0 -7
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_progress.scss +0 -18
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pulls.scss +0 -6
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-filter.scss +0 -8
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_tab-focus.scss +0 -9
@@ -16,13 +16,13 @@ describe 'Stock Transfers', type: :feature, js: true do
|
|
16
16
|
create(:stock_location, name: 'SF')
|
17
17
|
|
18
18
|
visit spree.new_admin_stock_transfer_path
|
19
|
-
select "SF", from: 'stock_transfer[source_location_id]'
|
19
|
+
select "SF", from: 'stock_transfer[source_location_id]', visible: false
|
20
20
|
fill_in 'stock_transfer_description', with: description
|
21
21
|
click_button 'Continue'
|
22
22
|
|
23
23
|
expect(page).to have_field('stock_transfer_description', with: description)
|
24
24
|
|
25
|
-
select "NY", from: 'stock_transfer[destination_location_id]'
|
25
|
+
select "NY", from: 'stock_transfer[destination_location_id]', visible: false
|
26
26
|
within "form.edit_stock_transfer" do
|
27
27
|
page.find('button').trigger('click')
|
28
28
|
end
|
@@ -85,7 +85,7 @@ describe 'Stock Transfers', type: :feature, js: true do
|
|
85
85
|
describe 'with enough stock' do
|
86
86
|
it 'ships stock transfer' do
|
87
87
|
visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
|
88
|
-
click_on '
|
88
|
+
click_on 'Ship'
|
89
89
|
|
90
90
|
expect(page).to have_current_path(spree.admin_stock_transfers_path)
|
91
91
|
expect(stock_transfer.reload.shipped_at).to_not be_nil
|
@@ -102,7 +102,7 @@ describe 'Stock Transfers', type: :feature, js: true do
|
|
102
102
|
it 'does not ship stock transfer' do
|
103
103
|
visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
|
104
104
|
|
105
|
-
click_on '
|
105
|
+
click_on 'Ship'
|
106
106
|
|
107
107
|
expect(page).to have_current_path(spree.tracking_info_admin_stock_transfer_path(stock_transfer))
|
108
108
|
expect(stock_transfer.reload.shipped_at).to be_nil
|
@@ -128,6 +128,20 @@ describe 'Users', type: :feature do
|
|
128
128
|
expect(find_field('user_spree_role_admin')).to be_checked
|
129
129
|
end
|
130
130
|
|
131
|
+
it 'can delete user roles' do
|
132
|
+
user_a.spree_roles << Spree::Role.create(name: "dummy")
|
133
|
+
click_link 'Account'
|
134
|
+
|
135
|
+
user_a.spree_roles.each do |role|
|
136
|
+
uncheck "user_spree_role_#{role.name}"
|
137
|
+
end
|
138
|
+
|
139
|
+
click_button 'Update'
|
140
|
+
expect(page).to have_text 'Account updated'
|
141
|
+
expect(find_field('user_spree_role_dummy')).not_to be_checked
|
142
|
+
expect(user_a.reload.spree_roles).to be_empty
|
143
|
+
end
|
144
|
+
|
131
145
|
it 'can edit user shipping address' do
|
132
146
|
click_link "Addresses"
|
133
147
|
|
@@ -0,0 +1,8 @@
|
|
1
|
+
<%= javascript_include_tag *@suite.spec_assets, debug: @suite.config.expand_assets, allow_non_precompiled: true %>
|
2
|
+
<%= render "spree/admin/shared/js_locale_data" %>
|
3
|
+
<%= javascript_tag do -%>
|
4
|
+
Spree.env = "<%= Rails.env %>";
|
5
|
+
<% end %>
|
6
|
+
<script type="text/javascript">
|
7
|
+
Teaspoon.onWindowLoad(Teaspoon.execute);
|
8
|
+
</script>
|
@@ -0,0 +1,48 @@
|
|
1
|
+
describe('Spree.formatMoney', function() {
|
2
|
+
it('can format USD', function() {
|
3
|
+
expect(Spree.formatMoney(10, 'USD')).to.equal('$10.00');
|
4
|
+
expect(Spree.formatMoney('10', 'USD')).to.equal('$10.00');
|
5
|
+
expect(Spree.formatMoney(12.34, 'USD')).to.equal('$12.34');
|
6
|
+
expect(Spree.formatMoney('12.34', 'USD')).to.equal('$12.34');
|
7
|
+
expect(Spree.formatMoney(1000, 'USD')).to.equal('$1,000.00');
|
8
|
+
});
|
9
|
+
|
10
|
+
it('can format CAD', function() {
|
11
|
+
expect(Spree.formatMoney(1000, 'CAD')).to.equal('$1,000.00');
|
12
|
+
});
|
13
|
+
|
14
|
+
it('can format GBP', function() {
|
15
|
+
expect(Spree.formatMoney(1000, 'GBP')).to.equal('£1,000.00');
|
16
|
+
});
|
17
|
+
|
18
|
+
it('can format EUR', function() {
|
19
|
+
expect(Spree.formatMoney(1000, 'EUR')).to.equal('€1,000.00');
|
20
|
+
});
|
21
|
+
|
22
|
+
it('can format YEN', function() {
|
23
|
+
expect(Spree.formatMoney(1000, 'JPY')).to.equal('¥1,000');
|
24
|
+
});
|
25
|
+
|
26
|
+
describe('with comma as decimal', function() {
|
27
|
+
support.withTranslations({
|
28
|
+
currency_delimiter: ".",
|
29
|
+
currency_separator: ","
|
30
|
+
});
|
31
|
+
|
32
|
+
it('can format USD', function() {
|
33
|
+
expect(Spree.formatMoney(10, 'USD')).to.equal('$10,00');
|
34
|
+
expect(Spree.formatMoney('10', 'USD')).to.equal('$10,00');
|
35
|
+
expect(Spree.formatMoney(12.34, 'USD')).to.equal('$12,34');
|
36
|
+
expect(Spree.formatMoney('12.34', 'USD')).to.equal('$12,34');
|
37
|
+
expect(Spree.formatMoney(1000, 'GBP')).to.equal('£1.000,00');
|
38
|
+
});
|
39
|
+
|
40
|
+
it('can format EUR', function() {
|
41
|
+
expect(Spree.formatMoney(1000, 'EUR')).to.equal('€1.000,00');
|
42
|
+
});
|
43
|
+
|
44
|
+
it('can format YEN', function() {
|
45
|
+
expect(Spree.formatMoney(1000, 'JPY')).to.equal('¥1.000');
|
46
|
+
});
|
47
|
+
});
|
48
|
+
});
|
@@ -0,0 +1,11 @@
|
|
1
|
+
//= require ./support/show_errors
|
2
|
+
//= require support/sinon
|
3
|
+
//= require support/chai
|
4
|
+
//= require support/chai-jq-0.0.7
|
5
|
+
|
6
|
+
//= require_self
|
7
|
+
//= require spree/backend
|
8
|
+
//= require_tree ./support
|
9
|
+
|
10
|
+
window.support = {};
|
11
|
+
window.expect = chai.expect;
|
@@ -0,0 +1,50 @@
|
|
1
|
+
describe('Spree.t', function() {
|
2
|
+
support.withTranslations({
|
3
|
+
simple: "simple",
|
4
|
+
nested: {
|
5
|
+
key: "nested key"
|
6
|
+
},
|
7
|
+
deeply: {
|
8
|
+
nested: {
|
9
|
+
key: "deeply nested key"
|
10
|
+
}
|
11
|
+
}
|
12
|
+
})
|
13
|
+
|
14
|
+
it('can get a simple key', function() {
|
15
|
+
expect(Spree.t('simple')).to.equal('simple');
|
16
|
+
});
|
17
|
+
|
18
|
+
it('can get a nested key', function() {
|
19
|
+
expect(Spree.t('nested.key')).to.equal('nested key');
|
20
|
+
});
|
21
|
+
|
22
|
+
it('can get a nested key using scope', function() {
|
23
|
+
expect(Spree.t('key', {scope: 'nested'})).to.equal('nested key');
|
24
|
+
});
|
25
|
+
|
26
|
+
it('can get a deeply nested key', function() {
|
27
|
+
expect(Spree.t('deeply.nested.key')).to.equal('deeply nested key');
|
28
|
+
});
|
29
|
+
|
30
|
+
it('can get a deeply nested key using scope', function() {
|
31
|
+
expect(Spree.t('nested.key', {scope: 'deeply'})).to.equal('deeply nested key');
|
32
|
+
expect(Spree.t('key', {scope: 'deeply.nested'})).to.equal('deeply nested key');
|
33
|
+
});
|
34
|
+
});
|
35
|
+
|
36
|
+
describe('Spree.human_attribute_name', function() {
|
37
|
+
support.withTranslations({
|
38
|
+
activerecord: {
|
39
|
+
attributes: {
|
40
|
+
"spree/model": {
|
41
|
+
"name": "Name"
|
42
|
+
}
|
43
|
+
}
|
44
|
+
}
|
45
|
+
});
|
46
|
+
|
47
|
+
it('can get attribute names', function() {
|
48
|
+
expect(Spree.human_attribute_name('spree/model', "name")).to.equal('Name');
|
49
|
+
});
|
50
|
+
});
|
@@ -0,0 +1,72 @@
|
|
1
|
+
fixture.preload("number_with_currency/with_currency_select", "number_with_currency/without_select");
|
2
|
+
|
3
|
+
describe("Spree.Views.NumberWithCurrency", function() {
|
4
|
+
var view, $el;
|
5
|
+
var $symbol, $input, $select, $addon;
|
6
|
+
|
7
|
+
var loadFixture = function(path) {
|
8
|
+
var fixtures = fixture.load(path, true);
|
9
|
+
$el = $(fixtures[0]);
|
10
|
+
}
|
11
|
+
|
12
|
+
var loadView = function() {
|
13
|
+
view = new Spree.Views.NumberWithCurrency({el: $el});
|
14
|
+
view.render();
|
15
|
+
$symbol = $el.find('.number-with-currency-symbol');
|
16
|
+
$input = $el.find('input');
|
17
|
+
$select = $el.find('select');
|
18
|
+
$addon = $el.find('.number-with-currency-addon');
|
19
|
+
}
|
20
|
+
|
21
|
+
describe("with currency selector", function() {
|
22
|
+
beforeEach(function() {
|
23
|
+
loadFixture("number_with_currency/with_currency_select");
|
24
|
+
loadView();
|
25
|
+
});
|
26
|
+
|
27
|
+
it("has no currency selected", function() {
|
28
|
+
expect($select).to.have.$val('');
|
29
|
+
expect($symbol).to.have.$text('');
|
30
|
+
});
|
31
|
+
|
32
|
+
it("can select USD", function() {
|
33
|
+
$select.val('USD').trigger('change');
|
34
|
+
|
35
|
+
expect($select).to.have.$val('USD');
|
36
|
+
expect($symbol).to.have.$text('$');
|
37
|
+
});
|
38
|
+
|
39
|
+
it("can select GBP", function() {
|
40
|
+
$select.val('GBP').trigger('change');
|
41
|
+
|
42
|
+
expect($select).to.have.$val('GBP');
|
43
|
+
expect($symbol).to.have.$text('£');
|
44
|
+
});
|
45
|
+
|
46
|
+
it("can select JPY", function() {
|
47
|
+
$select.val('JPY').trigger('change');
|
48
|
+
|
49
|
+
expect($select).to.have.$val('JPY');
|
50
|
+
expect($symbol).to.have.$text('¥');
|
51
|
+
});
|
52
|
+
});
|
53
|
+
|
54
|
+
describe("without currency selector", function() {
|
55
|
+
beforeEach(function() {
|
56
|
+
loadFixture("number_with_currency/without_select");
|
57
|
+
loadView();
|
58
|
+
});
|
59
|
+
|
60
|
+
it("uses USD format", function() {
|
61
|
+
$el.find('[data-currency]').data('currency', 'USD');
|
62
|
+
view.render();
|
63
|
+
expect($symbol).to.have.$text('$');
|
64
|
+
});
|
65
|
+
|
66
|
+
it("uses JPY format", function() {
|
67
|
+
$el.find('[data-currency]').data('currency', 'JPY');
|
68
|
+
view.render();
|
69
|
+
expect($symbol).to.have.$text('¥');
|
70
|
+
});
|
71
|
+
});
|
72
|
+
});
|
data/spec/spec_helper.rb
CHANGED
@@ -1,4 +1,12 @@
|
|
1
1
|
module OrderFeatureHelper
|
2
|
+
def add_line_item(product_name, quantity: 1)
|
3
|
+
find(".js-add-line-item:not([disabled]), .line-item [name=quantity]").click
|
4
|
+
|
5
|
+
targetted_select2_search product_name, from: ".select-variant"
|
6
|
+
fill_in "quantity", with: quantity
|
7
|
+
click_icon 'ok'
|
8
|
+
end
|
9
|
+
|
2
10
|
def complete_split_to(destination, quantity: nil)
|
3
11
|
if destination.is_a?(Spree::Shipment)
|
4
12
|
destination = destination.number
|
@@ -0,0 +1,17 @@
|
|
1
|
+
ENV['RAILS_ENV'] = 'test'
|
2
|
+
require File.expand_path("../dummy/config/environment", __FILE__)
|
3
|
+
|
4
|
+
Teaspoon.configure do |config|
|
5
|
+
config.mount_at = "/teaspoon"
|
6
|
+
config.root = Spree::Backend::Engine.root
|
7
|
+
config.asset_paths = ["spec/javascripts", "spec/javascripts/stylesheets"]
|
8
|
+
config.fixture_paths = ["spec/javascripts/fixtures"]
|
9
|
+
|
10
|
+
config.suite do |suite|
|
11
|
+
suite.use_framework :mocha, "2.3.3"
|
12
|
+
suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
|
13
|
+
suite.helper = "spec_helper"
|
14
|
+
suite.boot_partial = "/boot"
|
15
|
+
suite.expand_assets = true
|
16
|
+
end
|
17
|
+
end
|
Binary file
|
Binary file
|
Binary file
|
@@ -0,0 +1,4 @@
|
|
1
|
+
/*!
|
2
|
+
* accounting.js v0.4.2, copyright 2014 Open Exchange Rates, MIT license, http://openexchangerates.github.io/accounting.js
|
3
|
+
*/
|
4
|
+
(function(p,z){function q(a){return!!(""===a||a&&a.charCodeAt&&a.substr)}function m(a){return u?u(a):"[object Array]"===v.call(a)}function r(a){return"[object Object]"===v.call(a)}function s(a,b){var d,a=a||{},b=b||{};for(d in b)b.hasOwnProperty(d)&&null==a[d]&&(a[d]=b[d]);return a}function j(a,b,d){var c=[],e,h;if(!a)return c;if(w&&a.map===w)return a.map(b,d);for(e=0,h=a.length;e<h;e++)c[e]=b.call(d,a[e],e,a);return c}function n(a,b){a=Math.round(Math.abs(a));return isNaN(a)?b:a}function x(a){var b=c.settings.currency.format;"function"===typeof a&&(a=a());return q(a)&&a.match("%v")?{pos:a,neg:a.replace("-","").replace("%v","-%v"),zero:a}:!a||!a.pos||!a.pos.match("%v")?!q(b)?b:c.settings.currency.format={pos:b,neg:b.replace("%v","-%v"),zero:b}:a}var c={version:"0.4.1",settings:{currency:{symbol:"$",format:"%s%v",decimal:".",thousand:",",precision:2,grouping:3},number:{precision:0,grouping:3,thousand:",",decimal:"."}}},w=Array.prototype.map,u=Array.isArray,v=Object.prototype.toString,o=c.unformat=c.parse=function(a,b){if(m(a))return j(a,function(a){return o(a,b)});a=a||0;if("number"===typeof a)return a;var b=b||".",c=RegExp("[^0-9-"+b+"]",["g"]),c=parseFloat((""+a).replace(/\((.*)\)/,"-$1").replace(c,"").replace(b,"."));return!isNaN(c)?c:0},y=c.toFixed=function(a,b){var b=n(b,c.settings.number.precision),d=Math.pow(10,b);return(Math.round(c.unformat(a)*d)/d).toFixed(b)},t=c.formatNumber=c.format=function(a,b,d,i){if(m(a))return j(a,function(a){return t(a,b,d,i)});var a=o(a),e=s(r(b)?b:{precision:b,thousand:d,decimal:i},c.settings.number),h=n(e.precision),f=0>a?"-":"",g=parseInt(y(Math.abs(a||0),h),10)+"",l=3<g.length?g.length%3:0;return f+(l?g.substr(0,l)+e.thousand:"")+g.substr(l).replace(/(\d{3})(?=\d)/g,"$1"+e.thousand)+(h?e.decimal+y(Math.abs(a),h).split(".")[1]:"")},A=c.formatMoney=function(a,b,d,i,e,h){if(m(a))return j(a,function(a){return A(a,b,d,i,e,h)});var a=o(a),f=s(r(b)?b:{symbol:b,precision:d,thousand:i,decimal:e,format:h},c.settings.currency),g=x(f.format);return(0<a?g.pos:0>a?g.neg:g.zero).replace("%s",f.symbol).replace("%v",t(Math.abs(a),n(f.precision),f.thousand,f.decimal))};c.formatColumn=function(a,b,d,i,e,h){if(!a)return[];var f=s(r(b)?b:{symbol:b,precision:d,thousand:i,decimal:e,format:h},c.settings.currency),g=x(f.format),l=g.pos.indexOf("%s")<g.pos.indexOf("%v")?!0:!1,k=0,a=j(a,function(a){if(m(a))return c.formatColumn(a,f);a=o(a);a=(0<a?g.pos:0>a?g.neg:g.zero).replace("%s",f.symbol).replace("%v",t(Math.abs(a),n(f.precision),f.thousand,f.decimal));if(a.length>k)k=a.length;return a});return j(a,function(a){return q(a)&&a.length<k?l?a.replace(f.symbol,f.symbol+Array(k-a.length+1).join(" ")):Array(k-a.length+1).join(" ")+a:a})};if("undefined"!==typeof exports){if("undefined"!==typeof module&&module.exports)exports=module.exports=c;exports.accounting=c}else"function"===typeof define&&define.amd?define([],function(){return c}):(c.noConflict=function(a){return function(){p.accounting=a;c.noConflict=z;return c}}(p.accounting),p.accounting=c)})(this);
|
@@ -0,0 +1,193 @@
|
|
1
|
+
/**
|
2
|
+
* Backbone Nested Models
|
3
|
+
* Author: Bret Little
|
4
|
+
* Version: 2.0.4
|
5
|
+
*
|
6
|
+
* Nested model support in Backbone.js
|
7
|
+
*
|
8
|
+
**/
|
9
|
+
|
10
|
+
// support amd and common js
|
11
|
+
(function (root, factory) {
|
12
|
+
if (typeof exports === 'object') {
|
13
|
+
// CommonJS
|
14
|
+
module.exports = factory(require('backbone'), require('underscore'));
|
15
|
+
} else if (typeof define === 'function' && define.amd) {
|
16
|
+
// AMD
|
17
|
+
define(['backbone', 'underscore'], function (b, u) {
|
18
|
+
return (root.returnExportsGlobal = factory(b, u));
|
19
|
+
});
|
20
|
+
} else {
|
21
|
+
// Global Variables
|
22
|
+
root.returnExportsGlobal = factory(root.Backbone, root._);
|
23
|
+
}
|
24
|
+
}(this, function (Backbone, _) {
|
25
|
+
|
26
|
+
var Model = Backbone.Model,
|
27
|
+
Collection = Backbone.Collection;
|
28
|
+
|
29
|
+
Backbone.Model.prototype.setRelation = function(attr, val, options) {
|
30
|
+
var relation = this.attributes[attr],
|
31
|
+
id = this.idAttribute || "id",
|
32
|
+
modelToSet, modelsToAdd = [], modelsToRemove = [];
|
33
|
+
|
34
|
+
if(options.unset && relation) delete relation.parent;
|
35
|
+
|
36
|
+
if(this.relations && _.has(this.relations, attr)) {
|
37
|
+
|
38
|
+
// If the relation already exists, we don't want to replace it, rather
|
39
|
+
// update the data within it whether it is a collection or model
|
40
|
+
if(relation && relation instanceof Collection) {
|
41
|
+
|
42
|
+
// `val` can come in as a Collection, Array, or single Model.
|
43
|
+
// Ensure that it is an Array for use with `collection.set()`.
|
44
|
+
if(val instanceof Collection || val instanceof Array) {
|
45
|
+
val = val.models || val;
|
46
|
+
} else {
|
47
|
+
val = [val];
|
48
|
+
}
|
49
|
+
|
50
|
+
relation.set(val, options);
|
51
|
+
|
52
|
+
return relation;
|
53
|
+
}
|
54
|
+
|
55
|
+
if(relation && relation instanceof Model) {
|
56
|
+
|
57
|
+
// `val` can come in as a Model or attributes hash.
|
58
|
+
// Ensure that it is an attributes hash for use with `model.set()`.
|
59
|
+
if (val instanceof Model) {
|
60
|
+
val = val.toJSON()
|
61
|
+
}
|
62
|
+
|
63
|
+
relation.set(val, options);
|
64
|
+
|
65
|
+
return relation;
|
66
|
+
}
|
67
|
+
|
68
|
+
options._parent = this;
|
69
|
+
|
70
|
+
if (val instanceof Collection || val instanceof Model) {
|
71
|
+
val = val.toJSON();
|
72
|
+
}
|
73
|
+
val = new this.relations[attr](val, options);
|
74
|
+
val.parent = this;
|
75
|
+
}
|
76
|
+
|
77
|
+
return val;
|
78
|
+
};
|
79
|
+
|
80
|
+
Backbone.Model.prototype.set = function(key, val, options) {
|
81
|
+
var attr, attrs, unset, changes, silent, changing, prev, current;
|
82
|
+
if (key == null) return this;
|
83
|
+
|
84
|
+
// Handle both `"key", value` and `{key: value}` -style arguments.
|
85
|
+
if (typeof key === 'object') {
|
86
|
+
attrs = key;
|
87
|
+
options = val;
|
88
|
+
} else {
|
89
|
+
(attrs = {})[key] = val;
|
90
|
+
}
|
91
|
+
|
92
|
+
options || (options = {});
|
93
|
+
|
94
|
+
// Run validation.
|
95
|
+
if (!this._validate(attrs, options)) return false;
|
96
|
+
|
97
|
+
// Extract attributes and options.
|
98
|
+
unset = options.unset;
|
99
|
+
silent = options.silent;
|
100
|
+
changes = [];
|
101
|
+
changing = this._changing;
|
102
|
+
this._changing = true;
|
103
|
+
|
104
|
+
if (!changing) {
|
105
|
+
this._previousAttributes = _.clone(this.attributes);
|
106
|
+
this.changed = {};
|
107
|
+
}
|
108
|
+
current = this.attributes, prev = this._previousAttributes;
|
109
|
+
|
110
|
+
// Check for changes of `id`.
|
111
|
+
if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
|
112
|
+
|
113
|
+
// For each `set` attribute, update or delete the current value.
|
114
|
+
for (attr in attrs) {
|
115
|
+
val = attrs[attr];
|
116
|
+
|
117
|
+
// Inject in the relational lookup
|
118
|
+
val = this.setRelation(attr, val, options);
|
119
|
+
|
120
|
+
if (!_.isEqual(current[attr], val)) changes.push(attr);
|
121
|
+
if (!_.isEqual(prev[attr], val)) {
|
122
|
+
this.changed[attr] = val;
|
123
|
+
} else {
|
124
|
+
delete this.changed[attr];
|
125
|
+
}
|
126
|
+
unset ? delete current[attr] : current[attr] = val;
|
127
|
+
}
|
128
|
+
|
129
|
+
// Trigger all relevant attribute changes.
|
130
|
+
if (!silent) {
|
131
|
+
if (changes.length) this._pending = true;
|
132
|
+
for (var i = 0, l = changes.length; i < l; i++) {
|
133
|
+
this.trigger('change:' + changes[i], this, current[changes[i]], options);
|
134
|
+
}
|
135
|
+
}
|
136
|
+
|
137
|
+
if (changing) return this;
|
138
|
+
if (!silent) {
|
139
|
+
while (this._pending) {
|
140
|
+
this._pending = false;
|
141
|
+
this.trigger('change', this, options);
|
142
|
+
}
|
143
|
+
}
|
144
|
+
this._pending = false;
|
145
|
+
this._changing = false;
|
146
|
+
return this;
|
147
|
+
};
|
148
|
+
|
149
|
+
Backbone.Model.prototype.toJSON = function(options) {
|
150
|
+
var attrs = _.clone(this.attributes);
|
151
|
+
|
152
|
+
_.each(this.relations, function(rel, key) {
|
153
|
+
if (_.has(attrs, key)) {
|
154
|
+
attrs[key] = attrs[key].toJSON();
|
155
|
+
} else {
|
156
|
+
attrs[key] = (new rel()).toJSON();
|
157
|
+
}
|
158
|
+
});
|
159
|
+
|
160
|
+
return attrs;
|
161
|
+
};
|
162
|
+
|
163
|
+
Backbone.Model.prototype.clone = function(options) {
|
164
|
+
return new this.constructor(this.toJSON());
|
165
|
+
};
|
166
|
+
|
167
|
+
Backbone.Collection.prototype.resetRelations = function(options) {
|
168
|
+
_.each(this.models, function(model) {
|
169
|
+
_.each(model.relations, function(rel, key) {
|
170
|
+
if(model.get(key) instanceof Backbone.Collection) {
|
171
|
+
model.get(key).trigger('reset', model, options);
|
172
|
+
}
|
173
|
+
});
|
174
|
+
})
|
175
|
+
};
|
176
|
+
|
177
|
+
Backbone.Collection.prototype.reset = function(models, options) {
|
178
|
+
options || (options = {});
|
179
|
+
for (var i = 0, l = this.models.length; i < l; i++) {
|
180
|
+
this._removeReference(this.models[i]);
|
181
|
+
}
|
182
|
+
options.previousModels = this.models;
|
183
|
+
this._reset();
|
184
|
+
this.add(models, _.extend({silent: true}, options));
|
185
|
+
if (!options.silent) {
|
186
|
+
this.trigger('reset', this, options);
|
187
|
+
this.resetRelations(options);
|
188
|
+
}
|
189
|
+
return this;
|
190
|
+
};
|
191
|
+
|
192
|
+
return Backbone;
|
193
|
+
}));
|