Copy translations from Transifex

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,11 +13,21 @@ Provide context for others to understand it. -->
 
 
 #### Release notes
-<!-- Write a one liner description of the change to be included in the release notes.
-Every PR is worth mentioning, because you did it for a reason. -->
+<!-- Write a line or two to be included in the release notes.
+Everything is worth mentioning, because you did it for a reason. -->
 
-<!-- Please select one for your PR and delete the other. -->
-Changelog Category: User facing changes | Technical changes
+
+
+<!-- Please assign one category to your PR and delete the others. 
+The categories are based on https://keepachangelog.com/en/1.0.0/. -->
+
+Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
+
+
+
+#### Discourse thread
+<!-- Is there a discussion about this in Discourse?
+Add the link or remove this section. -->
 
 
 

.hound.yml

@@ -1,4 +0,0 @@
-rubocop:
-  config_file: .rubocop_styleguide.yml
-scss:
-  config_file: .scss-lint.yml

.rubocop_manual_todo.yml

@@ -42,6 +42,7 @@ Layout/LineLength:
   - app/helpers/angular_form_helper.rb
   - app/helpers/checkout_helper.rb
   - app/helpers/enterprises_helper.rb
+  - app/helpers/injection_helper.rb
   - app/helpers/markdown_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/orders_helper.rb
@@ -61,10 +62,11 @@ Layout/LineLength:
   - app/models/product_import/unit_converter.rb
   - app/models/proxy_order.rb
   - app/models/schedule.rb
-  - app/models/spree/app_configuration.rb
+  - app/models/spree/app_configuration_decorator.rb
   - app/models/spree/gateway/stripe_connect.rb
   - app/models/spree/image.rb
-  - app/models/spree/order.rb
+  - app/models/spree/line_item_decorator.rb
+  - app/models/spree/order_decorator.rb
   - app/models/spree/payment_method.rb
   - app/models/spree/product_decorator.rb
   - app/models/spree/user.rb
@@ -73,7 +75,6 @@ Layout/LineLength:
   - app/models/variant_override_set.rb
   - app/serializers/api/admin/subscription_line_item_serializer.rb
   - app/services/cart_service.rb
-  - app/services/checkout/post_checkout_actions.rb
   - app/services/default_stock_location.rb
   - app/services/embedded_page_service.rb
   - app/services/order_cycle_form.rb
@@ -87,7 +88,6 @@ Layout/LineLength:
   - Gemfile
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/available_payment_method_filter.rb
-  - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/customers_report.rb
   - lib/open_food_network/enterprise_fee_applicator.rb
   - lib/open_food_network/enterprise_fee_calculator.rb
@@ -101,6 +101,7 @@ Layout/LineLength:
   - lib/open_food_network/scope_variants_for_search.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/localized_number.rb
+  - lib/spree/product_filters.rb
   - lib/tasks/data.rake
   - lib/tasks/enterprises.rake
   - spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -166,6 +167,7 @@ Layout/LineLength:
   - spec/features/admin/enterprises/index_spec.rb
   - spec/features/admin/enterprises_spec.rb
   - spec/features/admin/enterprise_user_spec.rb
+  - spec/features/admin/image_settings_spec.rb
   - spec/features/admin/multilingual_spec.rb
   - spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
   - spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -262,17 +264,12 @@ Layout/LineLength:
   - spec/models/spree/adjustment_spec.rb
   - spec/models/spree/classification_spec.rb
   - spec/models/spree/gateway/stripe_connect_spec.rb
-  - spec/models/spree/inventory_unit_spec.rb
   - spec/models/spree/line_item_spec.rb
-  - spec/models/spree/order/checkout_spec.rb
-  - spec/models/spree/order_inventory_spec.rb
   - spec/models/spree/order_spec.rb
-  - spec/models/spree/order/state_machine_spec.rb
   - spec/models/spree/payment_method_spec.rb
   - spec/models/spree/payment_spec.rb
   - spec/models/spree/product_set_spec.rb
   - spec/models/spree/product_spec.rb
-  - spec/models/spree/return_authorization_spec.rb
   - spec/models/spree/shipping_method_spec.rb
   - spec/models/spree/stock_item_spec.rb
   - spec/models/spree/taxon_spec.rb
@@ -302,7 +299,6 @@ Layout/LineLength:
   - spec/serializers/api/order_serializer_spec.rb
   - spec/services/cart_service_spec.rb
   - spec/services/checkout/form_data_adapter_spec.rb
-  - spec/services/checkout/post_checkout_actions_spec.rb
   - spec/services/embedded_page_service_spec.rb
   - spec/services/exchange_products_renderer_spec.rb
   - spec/services/order_cycle_distributed_products_spec.rb
@@ -349,6 +345,7 @@ Metrics/AbcSize:
   - app/controllers/cart_controller.rb
   - app/controllers/discourse_sso_controller.rb
   - app/controllers/enterprises_controller.rb
+  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/overview_controller.rb
@@ -389,22 +386,17 @@ Metrics/AbcSize:
   - app/models/proxy_order.rb
   - app/models/spree/ability.rb
   - app/models/spree/address.rb
-  - app/models/spree/line_item.rb
+  - app/models/spree/line_item_decorator.rb
   - app/models/spree/order/checkout.rb
-  - app/models/spree/order_contents.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/order.rb
+  - app/models/spree/order_decorator.rb
   - app/models/spree/payment/processing.rb
   - app/models/spree/payment.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/return_authorization.rb
   - app/models/spree/shipment.rb
   - app/models/spree/taxon.rb
   - app/models/spree/tax_rate.rb
   - app/models/spree/zone.rb
+  - app/serializers/api/admin/enterprise_serializer.rb
   - app/serializers/api/product_serializer.rb
   - app/serializers/api/variant_serializer.rb
   - app/services/cart_service.rb
@@ -462,7 +454,6 @@ Metrics/AbcSize:
   - spec/services/order_checkout_restart_spec.rb
   - spec/support/i18n_translations_checker.rb
   - spec/support/performance_helper.rb
-  - spec/support/request/web_helper.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -527,11 +518,7 @@ Metrics/CyclomaticComplexity:
   - app/models/spree/order/checkout.rb
   - app/models/spree/payment_method.rb
   - app/models/spree/payment.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/return_authorization.rb
   - app/models/spree/zone.rb
   - app/models/variant_override_set.rb
   - app/services/cart_service.rb
@@ -565,10 +552,7 @@ Metrics/PerceivedComplexity:
   - app/models/spree/order/checkout.rb
   - app/models/spree/payment_method.rb
   - app/models/spree/payment.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/return_authorization.rb
   - app/models/spree/zone.rb
   - app/models/variant_override_set.rb
   - app/services/cart_service.rb
@@ -594,7 +578,7 @@ Metrics/PerceivedComplexity:
   - app/models/spree/ability.rb
   - app/models/spree/address.rb
   - app/models/spree/order/checkout.rb
-  - app/models/spree/order.rb
+  - app/models/spree/order_decorator.rb
   - app/models/spree/product_decorator.rb
   - app/models/spree/zone.rb
   - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
@@ -612,6 +596,61 @@ Metrics/PerceivedComplexity:
 Metrics/MethodLength:
   Max: 10
   Exclude:
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/spree/admin/taxons_controller.rb
+  - app/controllers/spree/orders_controller.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/base_helper.rb
+  - app/helpers/spree/admin/navigation_helper.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/payment.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/zone.rb
+  - app/models/variant_override_set.rb
+  - app/services/cart_service.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/stock/estimator.rb
+  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/localized_number.rb
+  - spec/models/product_importer_spec.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/api/variants_controller.rb
+  - app/controllers/spree/admin/taxons_controller.rb
+  - app/controllers/spree/orders_controller.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/navigation_helper.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/order_decorator.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/zone.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/stock/estimator.rb
+  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/localized_number.rb
+  - spec/models/product_importer_spec.rb
   - app/controllers/admin/contents_controller.rb
   - app/controllers/admin/customers_controller.rb
   - app/controllers/admin/enterprise_fees_controller.rb
@@ -626,6 +665,7 @@ Metrics/MethodLength:
   - app/controllers/api/variants_controller.rb
   - app/controllers/cart_controller.rb
   - app/controllers/shop_controller.rb
+  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
@@ -661,17 +701,10 @@ Metrics/MethodLength:
   - app/models/spree/address.rb
   - app/models/spree/credit_card.rb
   - app/models/spree/order/checkout.rb
-  - app/models/spree/order_contents.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/order.rb
+  - app/models/spree/order_decorator.rb
   - app/models/spree/payment_method.rb
   - app/models/spree/payment/processing.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/preferences/store.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/return_authorization.rb
   - app/models/spree/shipment.rb
   - app/models/spree/taxon.rb
   - app/models/spree/tax_rate.rb
@@ -752,8 +785,6 @@ Metrics/ClassLength:
   - app/models/spree/ability.rb
   - app/models/spree/address.rb
   - app/models/spree/credit_card.rb
-  - app/models/spree/line_item.rb
-  - app/models/spree/order.rb
   - app/models/spree/payment.rb
   - app/models/spree/shipment.rb
   - app/models/spree/user.rb
@@ -783,18 +814,40 @@ Metrics/ModuleLength:
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/spree/order/checkout.rb
   - app/models/spree/payment/processing.rb
+  - engines/order_management/spec/services/order_management/order/updater_spec.rb
+  - engines/order_management/spec/services/order_management/stock/package_spec.rb
+  - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
+  - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
+  - engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
+  - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
   - lib/open_food_network/column_preference_defaults.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
+  - spec/controllers/api/order_cycles_controller_spec.rb
   - spec/controllers/api/orders_controller_spec.rb
+  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
+  - spec/lib/open_food_network/address_finder_spec.rb
+  - spec/lib/open_food_network/customers_report_spec.rb
+  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
   - spec/lib/open_food_network/order_cycle_permissions_spec.rb
+  - spec/lib/open_food_network/order_grouper_spec.rb
+  - spec/lib/open_food_network/packing_report_spec.rb
+  - spec/lib/open_food_network/permissions_spec.rb
+  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
+  - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
+  - spec/lib/open_food_network/tag_rule_applicator_spec.rb
+  - spec/lib/open_food_network/user_balance_calculator_spec.rb
+  - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
   - spec/models/spree/adjustment_spec.rb
   - spec/models/spree/credit_card_spec.rb
   - spec/models/spree/line_item_spec.rb
   - spec/models/spree/product_spec.rb
+  - spec/models/spree/shipping_method_spec.rb
   - spec/models/spree/variant_spec.rb
+  - spec/services/permissions/order_spec.rb
+  - spec/services/variant_units/option_value_namer_spec.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -803,9 +856,3 @@ Metrics/ParameterLists:
   - app/models/product_import/entry_processor.rb
   - lib/open_food_network/xero_invoices_report.rb
   - spec/features/admin/reports_spec.rb
-
-Lint/UselessAssignment:
-  Exclude:
-  - 'spec/**/*'
-  - 'app/models/spree/taxon.rb'
-  - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_specs.yml

@@ -1,7 +0,0 @@
-inherit_from:
-  - .rubocop.yml
-
-# This rubocop config file is only used for specs
-# Here we allow specs to be 300 lines long
-Metrics/ModuleLength:
-  Max: 300

.rubocop_todo.yml

@@ -1,11 +1,144 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-10-30 17:18:53 +0000 using RuboCop version 0.81.0.
+# on 2020-10-14 09:49:36 +0100 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/models/spree/address_spec.rb'
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'spec/features/admin/variants_spec.rb'
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/models/spree/zone_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/FirstArrayElementIndentation:
+  Exclude:
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/FirstHashElementIndentation:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/swagger_helper.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/lib/open_food_network/packing_report_spec.rb'
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: normal, indented_internal_methods
+Layout/IndentationConsistency:
+  Exclude:
+    - 'spec/models/spree/order/checkout_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineHashBraceLayout:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+    - 'spec/services/checkout/form_data_adapter_spec.rb'
+    - 'spec/services/user_locale_setter_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/factories.rb'
+    - 'spec/factories/address_factory.rb'
+    - 'spec/support/request/stripe_helper.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'spec/features/consumer/shopping/shopping_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+
 # Offense count: 2
 Lint/DuplicateMethods:
   Exclude:
@@ -19,6 +152,20 @@ Lint/IneffectiveAccessModifier:
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+
 # Offense count: 3
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
@@ -27,20 +174,19 @@ Lint/UselessAccessModifier:
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
 
-# Offense count: 2
+# Offense count: 1
 Lint/UselessAssignment:
   Exclude:
     - 'spec/**/*'
-    - 'app/models/spree/taxon.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
+    - 'app/models/spree/taxon.rb'
 
-# Offense count: 10
+# Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/spree/admin/taxonomies_controller.rb'
     - 'app/models/spree/adjustment.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/services/checkout/post_checkout_actions.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/web_helper.rb'
@@ -60,7 +206,7 @@ Naming/MemoizedInstanceVariableName:
     - 'app/mailers/producer_mailer.rb'
     - 'lib/open_food_network/address_finder.rb'
 
-# Offense count: 24
+# Offense count: 20
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -74,11 +220,10 @@ Naming/PredicateName:
     - 'app/models/order_cycle.rb'
     - 'app/models/spree/adjustment.rb'
     - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/order.rb'
+    - 'app/models/spree/line_item_decorator.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
-    - 'app/models/spree/preferences/preferable.rb'
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/user.rb'
     - 'lib/open_food_network/customers_report.rb'
@@ -117,14 +262,21 @@ Rails/Date:
     - 'app/models/order_cycle.rb'
     - 'app/models/spree/credit_card.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforceForPrefixed.
 Rails/Delegate:
   Exclude:
-    - 'app/models/spree/line_item.rb'
     - 'engines/order_management/app/services/order_management/reports/bulk_coop/renderers/html_renderer.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: find_by_sql
+Rails/DynamicFindBy:
+  Exclude:
+    - 'spec/factories/state_factory.rb'
+
 # Offense count: 16
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
@@ -155,12 +307,13 @@ Rails/FindBy:
     - 'app/models/product_import/spreadsheet_data.rb'
     - 'app/models/spree/user.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/FindEach:
   Exclude:
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/shipment.rb'
 
 # Offense count: 9
@@ -171,13 +324,13 @@ Rails/HasAndBelongsToMany:
     - 'app/models/concerns/payment_method_distributors.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
-    - 'app/models/spree/line_item.rb'
+    - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/role.rb'
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/zone.rb'
 
-# Offense count: 38
+# Offense count: 35
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -188,10 +341,9 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/address.rb'
     - 'app/models/spree/adjustment.rb'
     - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/order.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/property.rb'
-    - 'app/models/spree/return_authorization.rb'
     - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_category.rb'
     - 'app/models/spree/shipping_method.rb'
@@ -240,7 +392,7 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/users_controller.rb'
     - 'app/controllers/user_passwords_controller.rb'
 
-# Offense count: 14
+# Offense count: 13
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/spree/admin/reports_controller.rb'
@@ -263,16 +415,15 @@ Rails/RakeEnvironment:
     - 'lib/capistrano/tasks/**/*.rake'
     - 'lib/tasks/specs.rake'
 
-# Offense count: 11
+# Offense count: 9
 Rails/ReflectionClassName:
   Exclude:
     - 'app/models/customer.rb'
     - 'app/models/distributor_shipping_method.rb'
     - 'app/models/enterprise_role.rb'
-    - 'app/models/spree/order.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 247
+# Offense count: 243
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -291,8 +442,7 @@ Rails/SkipsModelValidations:
     - 'app/models/spree/address.rb'
     - 'app/models/spree/adjustment.rb'
     - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/inventory_unit.rb'
-    - 'app/models/spree/order.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method.rb'
@@ -330,6 +480,7 @@ Rails/SkipsModelValidations:
     - 'spec/features/admin/order_cycles/complex_editing_spec.rb'
     - 'spec/features/admin/order_cycles/simple_spec.rb'
     - 'spec/features/admin/order_spec.rb'
+    - 'spec/features/admin/payments_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
     - 'spec/features/consumer/caching/shops_caching_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
@@ -350,7 +501,6 @@ Rails/SkipsModelValidations:
     - 'spec/models/spree/adjustment_spec.rb'
     - 'spec/models/spree/asset_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
-    - 'spec/models/spree/order_inventory_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/tax_category_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
@@ -383,7 +533,7 @@ Rails/UniqueValidationWithoutIndex:
 # Environments: development, test, production
 Rails/UnknownEnv:
   Exclude:
-    - 'app/models/spree/app_configuration.rb'
+    - 'app/models/spree/app_configuration_decorator.rb'
     - 'lib/spree/core/controller_helpers/ssl.rb'
 
 # Offense count: 2
@@ -392,7 +542,7 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 29
+# Offense count: 64
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -407,6 +557,40 @@ Style/ClassAndModuleChildren:
     - 'app/models/tag_rule/filter_payment_methods.rb'
     - 'app/models/tag_rule/filter_shipping_methods.rb'
     - 'app/serializers/api/address_serializer.rb'
+    - 'app/serializers/api/admin/basic_enterprise_fee_serializer.rb'
+    - 'app/serializers/api/admin/basic_enterprise_serializer.rb'
+    - 'app/serializers/api/admin/basic_order_cycle_serializer.rb'
+    - 'app/serializers/api/admin/calculator/flat_percent_item_total_serializer.rb'
+    - 'app/serializers/api/admin/calculator_serializer.rb'
+    - 'app/serializers/api/admin/column_preference_serializer.rb'
+    - 'app/serializers/api/admin/customer_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_fee_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_relationship_permission_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_relationship_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_role_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_serializer.rb'
+    - 'app/serializers/api/admin/exchange_serializer.rb'
+    - 'app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb'
+    - 'app/serializers/api/admin/for_order_cycle/supplied_product_serializer.rb'
+    - 'app/serializers/api/admin/id_name_serializer.rb'
+    - 'app/serializers/api/admin/id_serializer.rb'
+    - 'app/serializers/api/admin/index_enterprise_serializer.rb'
+    - 'app/serializers/api/admin/inventory_item_serializer.rb'
+    - 'app/serializers/api/admin/line_item_serializer.rb'
+    - 'app/serializers/api/admin/order_cycle_serializer.rb'
+    - 'app/serializers/api/admin/order_serializer.rb'
+    - 'app/serializers/api/admin/payment_method/base_serializer.rb'
+    - 'app/serializers/api/admin/payment_method/stripe_serializer.rb'
+    - 'app/serializers/api/admin/product_serializer.rb'
+    - 'app/serializers/api/admin/shipping_method_serializer.rb'
+    - 'app/serializers/api/admin/tag_rule_serializer.rb'
+    - 'app/serializers/api/admin/tax_category_serializer.rb'
+    - 'app/serializers/api/admin/taxon_serializer.rb'
+    - 'app/serializers/api/admin/units_product_serializer.rb'
+    - 'app/serializers/api/admin/units_variant_serializer.rb'
+    - 'app/serializers/api/admin/user_serializer.rb'
+    - 'app/serializers/api/admin/variant_override_serializer.rb'
+    - 'app/serializers/api/admin/variant_serializer.rb'
     - 'app/serializers/api/country_serializer.rb'
     - 'app/serializers/api/currency_config_serializer.rb'
     - 'app/serializers/api/current_order_serializer.rb'
@@ -440,7 +624,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 765
+# Offense count: 818
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -507,6 +691,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/base_controller.rb'
     - 'app/controllers/spree/admin/countries_controller.rb'
     - 'app/controllers/spree/admin/general_settings_controller.rb'
+    - 'app/controllers/spree/admin/image_settings_controller.rb'
     - 'app/controllers/spree/admin/images_controller.rb'
     - 'app/controllers/spree/admin/invoices_controller.rb'
     - 'app/controllers/spree/admin/mail_methods_controller.rb'
@@ -541,6 +726,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/user_passwords_controller.rb'
     - 'app/controllers/user_registrations_controller.rb'
     - 'app/helpers/admin/enterprises_helper.rb'
+    - 'app/helpers/admin/image_settings_helper.rb'
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/helpers/admin/orders_helper.rb'
     - 'app/helpers/admin/subscriptions_helper.rb'
@@ -632,10 +818,13 @@ Style/FrozenStringLiteralComment:
     - 'app/models/product_import/unit_converter.rb'
     - 'app/models/proxy_order.rb'
     - 'app/models/schedule.rb'
+    - 'app/models/spree/app_configuration_decorator.rb'
     - 'app/models/spree/gateway/migs.rb'
     - 'app/models/spree/gateway/pin.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
+    - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/option_type_decorator.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
@@ -658,6 +847,48 @@ Style/FrozenStringLiteralComment:
     - 'app/models/variant_override_set.rb'
     - 'app/serializers/api/address_serializer.rb'
     - 'app/serializers/api/adjustment_serializer.rb'
+    - 'app/serializers/api/admin/basic_enterprise_fee_serializer.rb'
+    - 'app/serializers/api/admin/basic_enterprise_serializer.rb'
+    - 'app/serializers/api/admin/basic_order_cycle_serializer.rb'
+    - 'app/serializers/api/admin/calculator/flat_percent_item_total_serializer.rb'
+    - 'app/serializers/api/admin/calculator_serializer.rb'
+    - 'app/serializers/api/admin/column_preference_serializer.rb'
+    - 'app/serializers/api/admin/customer_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_fee_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_relationship_permission_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_relationship_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_role_serializer.rb'
+    - 'app/serializers/api/admin/enterprise_serializer.rb'
+    - 'app/serializers/api/admin/exchange_serializer.rb'
+    - 'app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb'
+    - 'app/serializers/api/admin/for_order_cycle/supplied_product_serializer.rb'
+    - 'app/serializers/api/admin/id_email_serializer.rb'
+    - 'app/serializers/api/admin/id_name_serializer.rb'
+    - 'app/serializers/api/admin/id_serializer.rb'
+    - 'app/serializers/api/admin/index_enterprise_serializer.rb'
+    - 'app/serializers/api/admin/index_order_cycle_serializer.rb'
+    - 'app/serializers/api/admin/inventory_item_serializer.rb'
+    - 'app/serializers/api/admin/line_item_serializer.rb'
+    - 'app/serializers/api/admin/order_cycle_serializer.rb'
+    - 'app/serializers/api/admin/order_serializer.rb'
+    - 'app/serializers/api/admin/payment_method/base_serializer.rb'
+    - 'app/serializers/api/admin/payment_method/stripe_serializer.rb'
+    - 'app/serializers/api/admin/payment_method_serializer.rb'
+    - 'app/serializers/api/admin/product_serializer.rb'
+    - 'app/serializers/api/admin/proxy_order_serializer.rb'
+    - 'app/serializers/api/admin/schedule_serializer.rb'
+    - 'app/serializers/api/admin/shipping_method_serializer.rb'
+    - 'app/serializers/api/admin/subscription_customer_serializer.rb'
+    - 'app/serializers/api/admin/subscription_line_item_serializer.rb'
+    - 'app/serializers/api/admin/subscription_serializer.rb'
+    - 'app/serializers/api/admin/tag_rule_serializer.rb'
+    - 'app/serializers/api/admin/tax_category_serializer.rb'
+    - 'app/serializers/api/admin/taxon_serializer.rb'
+    - 'app/serializers/api/admin/units_product_serializer.rb'
+    - 'app/serializers/api/admin/units_variant_serializer.rb'
+    - 'app/serializers/api/admin/user_serializer.rb'
+    - 'app/serializers/api/admin/variant_override_serializer.rb'
+    - 'app/serializers/api/admin/variant_serializer.rb'
     - 'app/serializers/api/cached_enterprise_serializer.rb'
     - 'app/serializers/api/country_serializer.rb'
     - 'app/serializers/api/credit_card_serializer.rb'
@@ -824,6 +1055,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/spree/authentication_helpers.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
+    - 'lib/spree/product_filters.rb'
     - 'lib/stripe/account_connector.rb'
     - 'lib/stripe/profile_storer.rb'
     - 'lib/stripe/webhook_handler.rb'
@@ -891,7 +1123,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/shops_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
-    - 'spec/controllers/spree/admin/general_settings_controller_spec.rb'
+    - 'spec/controllers/spree/admin/image_settings_controller_spec.rb'
     - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
     - 'spec/controllers/spree/admin/mail_methods_controller_spec.rb'
     - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
@@ -936,6 +1168,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/admin/configuration/content_spec.rb'
     - 'spec/features/admin/configuration/general_settings_spec.rb'
+    - 'spec/features/admin/configuration/image_settings_spec.rb'
     - 'spec/features/admin/configuration/mail_methods_spec.rb'
     - 'spec/features/admin/configuration/states_spec.rb'
     - 'spec/features/admin/configuration/tax_categories_spec.rb'
@@ -951,6 +1184,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/features/admin/enterprises/index_spec.rb'
     - 'spec/features/admin/enterprises_spec.rb'
     - 'spec/features/admin/external_services_spec.rb'
+    - 'spec/features/admin/image_settings_spec.rb'
     - 'spec/features/admin/multilingual_spec.rb'
     - 'spec/features/admin/overview_spec.rb'
     - 'spec/features/admin/payment_method_spec.rb'
@@ -1045,6 +1279,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb'
     - 'spec/lib/open_food_network/xero_invoices_report_spec.rb'
     - 'spec/lib/spree/localized_number_spec.rb'
+    - 'spec/lib/spree/product_filters_spec.rb'
     - 'spec/lib/stripe/account_connector_spec.rb'
     - 'spec/lib/stripe/webhook_handler_spec.rb'
     - 'spec/lib/tasks/enterprises_rake_spec.rb'
@@ -1088,6 +1323,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/classification_spec.rb'
     - 'spec/models/spree/credit_card_spec.rb'
     - 'spec/models/spree/gateway/stripe_connect_spec.rb'
+    - 'spec/models/spree/image_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/order/checkout_spec.rb'
     - 'spec/models/spree/order_spec.rb'
@@ -1194,6 +1430,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/support/products_helper.rb'
     - 'spec/support/request/admin_helper.rb'
     - 'spec/support/request/authentication_helper.rb'
+    - 'spec/support/request/checkout_helper.rb'
     - 'spec/support/request/cookie_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/menu_helper.rb'
@@ -1212,7 +1449,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
     - 'spec/views/spree/admin/shared/_order_links.html.haml_spec.rb'
 
-# Offense count: 44
+# Offense count: 48
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -1228,7 +1465,7 @@ Style/GuardClause:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
-    - 'app/models/spree/preferences/preferable_class_methods.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
     - 'app/services/order_syncer.rb'
@@ -1237,15 +1474,25 @@ Style/GuardClause:
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'spec/support/delayed_job_helper.rb'
+    - 'spec/support/request/checkout_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 3
+# Offense count: 66
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+    - 'spec/models/spree/credit_card_spec.rb'
+    - 'spec/models/spree/payment_spec.rb'
+
+# Offense count: 2
 Style/MissingRespondToMissing:
   Exclude:
     - 'app/helpers/application_helper.rb'
     - 'app/models/spree/gateway.rb'
-    - 'app/models/spree/preferences/configuration.rb'
 
 # Offense count: 2
 Style/MixinUsage:
@@ -1253,7 +1500,7 @@ Style/MixinUsage:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 43
+# Offense count: 36
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1267,11 +1514,8 @@ Style/NumericPredicate:
     - 'app/models/product_import/product_importer.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/order_contents.rb'
-    - 'app/models/spree/order_inventory.rb'
-    - 'app/models/spree/preferences/preferable.rb'
+    - 'app/models/spree/line_item_decorator.rb'
+    - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/variant_override.rb'
     - 'app/services/cart_service.rb'
@@ -1284,7 +1528,37 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
-# Offense count: 241
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  Exclude:
+    - 'spec/controllers/checkout_controller_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RandomWithOffset:
+  Exclude:
+    - 'spec/factories.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/spree/core/controller_helpers/auth.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/spree/core/delegate_belongs_to.rb'
+
+# Offense count: 231
 Style/Send:
   Exclude:
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -1309,10 +1583,8 @@ Style/Send:
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/spree/gateway/stripe_connect_spec.rb'
-    - 'spec/models/spree/order_inventory_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/payment_spec.rb'
-    - 'spec/models/spree/return_authorization_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/models/tag_rule/discount_order_spec.rb'
     - 'spec/models/tag_rule/filter_order_cycles_spec.rb'
@@ -1330,11 +1602,3 @@ Style/Send:
 Style/StructInheritance:
   Exclude:
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
-Style/SymbolProc:
-  Exclude:
-    - 'app/models/spree/preferences/preferable.rb'

.scss-lint.yml

@@ -1,19 +1,3 @@
 scss_files: 'app/assets/stylesheets/**/*.css.scss'
 
 exclude: 'app/assets/stylesheets/shared/**'
-
-linters:
-  ImportantRule:
-    enabled: false
-    VendorPrefix:
-      enabled: false
-    LeadingZero:
-      enabled: false
-    PropertySortOrder:
-      enabled: false
-    StringQuotes:
-      enabled: false
-    DeclarationOrder:
-      enabled: false
-    NestingDepth:
-      enabled: false

DOCKER.md

@@ -0,0 +1,65 @@
+### Docker
+
+It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
+The objective is to spare configuration time, in order to help people testing the app and contribute to it.
+It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
+
+### Install Docker
+
+Please check the documentation here, https://docs.docker.com/install/ to install Docker.
+
+For Docker Compose, information are here: https://docs.docker.com/compose/install/.
+
+Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
+
+
+### Use Docker with Open Food Network
+
+Open a terminal with a shell.
+
+Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
+
+```sh
+$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
+```
+
+Otherwise, if you just want to get things running, clone from the OFN main repo:
+
+```sh
+$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
+```
+
+Go at the root of the app:
+
+```sh
+$ cd openfoodnetwork
+```
+
+Download the Docker images and build the containers:
+
+```sh
+$ docker-compose build
+```
+
+Setup the database and seed it with sample data:
+```sh
+$ docker-compose run web bundle exec rake db:reset
+$ docker-compose run web bundle exec rake db:test:prepare
+$ docker-compose run web bundle exec rake ofn:sample_data
+```
+
+Finally, run the app with all the required containers:
+
+```sh
+$ docker-compose up
+```
+
+The default admin user is 'ofn@example.com' with 'ofn123' password.
+Check the app in the browser at `http://localhost:3000`.
+
+You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
+
+You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).
+
+### Troubleshooting
+If you are using Windows and having issues related to the ruby-build not finding a definition for the ruby version, you may need to follow these commands [here](https://stackoverflow.com/questions/2517190/how-do-i-force-git-to-use-lf-instead-of-crlf-under-windows/33424884#33424884) to fix your local git config related to line breaks.

Dockerfile

@@ -1,10 +1,4 @@
-FROM ubuntu:20.04
-
-ENV TZ Europe/London
-
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
+FROM ubuntu:18.04
 
 # Install all the requirements
 RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip
@@ -33,11 +27,8 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
-# Install node & yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-    apt-get install -y nodejs yarn
+# Install node
+RUN apt-get install -y nodejs
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -52,9 +43,5 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
 
 # Copy code and install app dependencies
 COPY . /usr/src/app/
-
-# Install front-end dependencies
-RUN yarn install
-
 # Run bundler install in parallel with the amount of available CPUs
 RUN bundle install --jobs="$(nproc)"

Gemfile

@@ -3,7 +3,7 @@ ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.8.0'
+gem 'i18n-js', '~> 3.7.1'
 gem 'rails', '~> 4.0.13'
 gem 'rails-i18n', '~> 4.0'
 gem 'rails_safe_tasks', '~> 1.0'
@@ -18,11 +18,18 @@ gem 'web', path: './engines/web'
 gem 'activerecord-postgresql-adapter'
 gem 'pg', '~> 0.21.0'
 
-gem 'acts_as_list', '= 0.3.0'
-gem 'awesome_nested_set', '~> 3.2.1'
+# OFN-maintained and patched version of Spree v2.0.4. See
+# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Tech-Doc:-OFN's-Spree-fork%F0%9F%8D%B4
+# for details.
+gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-1-0-stable'
+
+### Dependencies brought from spree core
+gem 'acts_as_list', '= 0.2.0'
+gem 'awesome_nested_set', '~> 3.0.0.rc.1'
 gem 'cancan', '~> 1.6.10'
 gem 'ffaker', '~> 1.16'
-gem 'highline', '2.0.3' # Necessary for the install generator
+gem 'highline', '= 1.6.18' # Necessary for the install generator
+gem 'httparty', '~> 0.18' # Used to check alerts in spree_core, this is not used in OFN.
 gem 'json', '>= 1.7.7'
 gem 'money', '5.1.1'
 gem 'paranoia', '~> 2.0'
@@ -30,7 +37,7 @@ gem 'ransack', '~> 1.8.10'
 gem 'state_machine', '1.2.0'
 gem 'stringex', '~> 1.5.1'
 
-gem 'spree_i18n', github: 'openfoodfoundation/spree_i18n', branch: '1-3-stable'
+gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 
 # Our branch contains the following changes:
 # - Pass customer email and phone number to PayPal (merged to upstream master)
@@ -54,11 +61,13 @@ gem 'daemons'
 gem 'delayed_job_active_record'
 gem 'delayed_job_web'
 
-gem 'kaminari', '~> 0.17.0'
+# Spree's default pagination gem (locked to the current version used by Spree)
+# We use it's methods in OFN code as well, so this is a direct dependency
+gem 'kaminari', '~> 0.14.1'
 
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
-gem 'aws-sdk', '1.67.0'
+gem 'aws-sdk', '1.11.1' # temporarily locked down due to https://github.com/aws/aws-sdk-ruby/issues/273
 gem 'bugsnag'
 gem 'db2fog'
 gem 'haml'

Gemfile.lock

@@ -6,11 +6,12 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 1a477e9f7763297944cc99b6f4dd3d962aa963e9
+  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)
       paypal-sdk-merchant (= 1.106.1)
+      spree_core (~> 2.1.0)
 
 GIT
   remote: https://github.com/openfoodfoundation/ofn-qz.git
@@ -20,13 +21,39 @@ GIT
     ofn-qz (0.1.0)
 
 GIT
-  remote: https://github.com/openfoodfoundation/spree_i18n.git
-  revision: 12f18312232f0ce70270d47859d2951d12f7791c
+  remote: https://github.com/openfoodfoundation/spree.git
+  revision: cbb24a6ed701166ffaf2ab60a402154100d74766
+  branch: 2-1-0-stable
+  specs:
+    spree_core (2.1.0)
+      activemerchant (= 1.78.0)
+      acts_as_list (= 0.2.0)
+      awesome_nested_set (~> 3.0.0.rc.1)
+      aws-sdk (= 1.11.1)
+      cancan (~> 1.6.10)
+      ffaker (~> 1.16)
+      highline (= 1.6.18)
+      httparty (~> 0.11)
+      json (>= 1.7.7)
+      kaminari (~> 0.14.1)
+      money (= 5.1.1)
+      paperclip (~> 3.4.1)
+      paranoia (~> 2.0)
+      rails (~> 4.0)
+      ransack (~> 1.0)
+      state_machine (= 1.2.0)
+      stringex (~> 1.5.1)
+      truncate_html (= 0.9.2)
+
+GIT
+  remote: https://github.com/spree/spree_i18n.git
+  revision: 752eb67204e9c5a4e22b62591a8fd55fe2285e43
   branch: 1-3-stable
   specs:
     spree_i18n (1.0.0)
       i18n (~> 0.5)
       rails-i18n
+      spree_core (>= 1.1)
 
 PATH
   remote: engines/catalog
@@ -82,7 +109,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.7)
+    activerecord-import (1.0.6)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -100,7 +127,7 @@ GEM
       tzinfo (~> 0.3.37)
     acts-as-taggable-on (4.0.0)
       activerecord (>= 4.0)
-    acts_as_list (0.3.0)
+    acts_as_list (0.2.0)
       activerecord (>= 3.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
@@ -114,16 +141,15 @@ GEM
     arel (4.0.2)
     ast (2.4.0)
     atomic (1.1.101)
-    awesome_nested_set (3.2.1)
-      activerecord (>= 4.0.0, < 7.0)
+    awesome_nested_set (3.0.3)
+      activerecord (>= 4.0.0, < 5)
     awesome_print (1.8.0)
-    aws-sdk (1.67.0)
-      aws-sdk-v1 (= 1.67.0)
-    aws-sdk-v1 (1.67.0)
+    aws-sdk (1.11.1)
       json (~> 1.4)
-      nokogiri (~> 1)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bugsnag (6.18.0)
+    bugsnag (6.17.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)
@@ -178,7 +204,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.42.0)
+    ddtrace (0.41.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -389,10 +415,13 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
-    highline (2.0.3)
+    highline (1.6.18)
     hike (1.2.3)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.8.0)
+    i18n-js (3.7.1)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -411,7 +440,7 @@ GEM
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     jwt (2.2.2)
-    kaminari (0.17.0)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.11.3)
@@ -649,13 +678,14 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
+    uuidtools (2.1.5)
     warden (1.2.7)
       rack (>= 1.0)
     webdrivers (4.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.9.5)
+    webmock (3.9.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -680,15 +710,15 @@ DEPENDENCIES
   activerecord-postgresql-adapter
   activerecord-session_store
   acts-as-taggable-on (~> 4.0)
-  acts_as_list (= 0.3.0)
+  acts_as_list (= 0.2.0)
   andand
   angular-rails-templates (~> 0.3.0)
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.5.5)
   atomic
-  awesome_nested_set (~> 3.2.1)
+  awesome_nested_set (~> 3.0.0.rc.1)
   awesome_print
-  aws-sdk (= 1.67.0)
+  aws-sdk (= 1.11.1)
   bugsnag
   byebug (~> 11.0.0)
   cancan (~> 1.6.10)
@@ -721,9 +751,10 @@ DEPENDENCIES
   geocoder
   gmaps4rails
   haml
-  highline (= 2.0.3)
+  highline (= 1.6.18)
+  httparty (~> 0.18)
   i18n (~> 0.6.11)
-  i18n-js (~> 3.8.0)
+  i18n-js (~> 3.7.1)
   immigrant
   jquery-migrate-rails
   jquery-rails (= 3.1.5)
@@ -731,7 +762,7 @@ DEPENDENCIES
   json (>= 1.7.7)
   json_spec (~> 1.1.4)
   jwt (~> 2.2)
-  kaminari (~> 0.17.0)
+  kaminari (~> 0.14.1)
   knapsack
   letter_opener (>= 1.4.1)
   mini_racer (= 0.2.15)
@@ -768,6 +799,7 @@ DEPENDENCIES
   selenium-webdriver
   shoulda-matchers
   simplecov
+  spree_core!
   spree_i18n!
   spree_paypal_express!
   spring

README.md

@@ -16,7 +16,7 @@ We're part of global movement - get involved!
 
 ## Contributing
 
-If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through the [OFN Handbook][ofn-handbook].
+If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through our [Contributor Guide][contributor-guide].
 
 Our [GETTING_STARTED](GETTING_STARTED.md) and [CONTRIBUTING](CONTRIBUTING.md) guides are the best place to start for developers looking to set up a development environment and make contributions to the codebase.
 
@@ -41,7 +41,7 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
-[ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
+[contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
 [welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27

app/assets/images/flag.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="15 13 34 38.4" enable-background="new 15 13 34 38.4" xml:space="preserve">
+<g>
+	<polygon fill="#FFFFFF" points="15.5,13.5 48.5,13.5 48.5,50.7 31.6,45.5 15.5,50.7 	"/>
+	<path fill="#999999" d="M48,14v36l-16.4-5L16,50V14H48 M49,13h-1H16h-1v1v36v1.4l1.3-0.4l15.3-5l16.1,5l1.3,0.4V50V14V13L49,13z"/>
+</g>
+</svg>

app/assets/javascripts/admin/all.js

@@ -27,14 +27,14 @@
 //= require lodash.underscore.js
 
 // spree
-//= require admin/spree/spree
+//= require spree
 //= require admin/spree/spree-select2
 //= require modernizr
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express
-//= require admin/spree/handlebar_extensions
+//= require admin/handlebar_extensions
 
 // OFN specific
 //= require_tree ../templates/admin

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -104,7 +104,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.$watch 'sortOptions', (sort) ->
     return unless sort && sort.predicate != ""
 
-    $scope.q.sorting = sort.getSortingExpr()
+    $scope.sorting = sort.getSortingExpr()
     $scope.fetchProducts()
   , true
 

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -47,8 +47,3 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
         tag.text.toLowerCase().indexOf(query.toLowerCase()) != -1
       defer.resolve filtered
     defer.promise
-
-  $scope.displayBalanceStatus = (customer) ->
-    return unless customer.balance_status
-
-    t('admin.customers.index.' + customer.balance_status)

app/assets/javascripts/admin/enterprises/directives/terms_and_conditions_warning.js.coffee

@@ -1,30 +0,0 @@
-angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($compile, $templateCache, DialogDefaults, $timeout) ->
-  restrict: 'A'
-  scope: true
-
-  link: (scope, element, attr) ->
-    # This file input click handler will hold the browser file input dialog and show a warning modal
-    scope.hold_file_input_and_show_warning_modal = (event) ->
-      event.preventDefault()
-      scope.template = $compile($templateCache.get('admin/modals/terms_and_conditions_warning.html'))(scope)
-      if scope.template.dialog
-        scope.template.dialog(DialogDefaults)
-        scope.template.dialog('open')
-      scope.$apply()
-
-    element.bind 'click', scope.hold_file_input_and_show_warning_modal
-
-    # When the user presses continue in the warning modal, we open the browser file input dialog
-    scope.continue = ->
-      scope.template.dialog('close')
-
-      # unbind warning modal handler and click file input again to open the browser file input dialog
-      element.unbind('click').trigger('click')
-      # afterwards, bind warning modal handler again so that the warning is shown the next time
-      $timeout ->
-        element.bind 'click', scope.hold_file_input_and_show_warning_modal
-      return
-
-    scope.close = ->
-      scope.template.dialog('close')
-      return

app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.products").factory "VariantUnitManager", (availableUnits) ->
+angular.module("admin.products").factory "VariantUnitManager", ->
   class VariantUnitManager
     @units:
       'weight':
@@ -29,13 +29,12 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
           system: 'metric'
 
     @variantUnitOptions: ->
-      available = availableUnits.split(",")
       options = for unit_type, _ of @units
-        for scale in @unitScales(unit_type, available)
+        for scale in @unitScales(unit_type)
           name = @getUnitName(scale, unit_type)
           ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
       options.push [[I18n.t('items'), 'items']]
-      options = [].concat options...
+      [].concat options...
 
     @getScale: (value, unitType) ->
       scaledValue = null
@@ -54,13 +53,8 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
       else
         ''
 
-    @unitScales: (unitType, availableUnits = null) ->
-      scales = Object.keys(@units[unitType])
-      if availableUnits
-        scales = scales.filter (scale) ->
-          availableUnits.includes(VariantUnitManager.getUnitName(scale, unitType))
-
-      (parseFloat(scale) for scale in scales).sort (a, b) ->
+    @unitScales: (unitType) ->
+      (parseFloat(scale) for scale in Object.keys(@units[unitType])).sort (a, b) ->
          a - b
 
     @compatibleUnitScales: (scale, unitType) ->

app/assets/javascripts/admin/spree/base.js.erb

@@ -1,4 +1,5 @@
 //= require_self
+//= require admin/handlebar_extensions
 //= require admin/spree/orders/variant_autocomplete
 
 /**
@@ -115,8 +116,7 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined' &&
-    typeof Spree.translations !== 'undefined') {
+  if (typeof Spree !== 'undefined') {
     handle_date_picker_fields = function(){
       $('.datepicker').datepicker({
         dateFormat: Spree.translations.date_picker,

app/assets/javascripts/admin/spree/handlebar_extensions.js

@@ -1,9 +0,0 @@
-//= require handlebars
-
-Handlebars.registerHelper("t", function(key) {
-  if (Spree.translations[key]) {
-    return Spree.translations[key]
-  } else {
-    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
-  }
-});

app/assets/javascripts/admin/spree/image_settings.js.erb

@@ -0,0 +1,59 @@
+$(document).ready(function() {
+
+  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0) {
+    $('#s3_settings, #s3_headers').show();
+  }
+
+  // Toggle display of S3 settings based on value of use_s3 checkbox
+  $('input#preferences_use_s3[type="checkbox"]').click(function() {
+    $('#s3_settings, #s3_headers').toggle();
+  });
+
+  $(document).on('click', '.destroy_style', function(e) {
+    e.preventDefault();
+    $(this).parent().remove();
+  });
+
+  $(document).on('click', '.destroy_new_attachment_styles', function(e) {
+    e.preventDefault();
+    $(this).closest('.new_attachment_styles').remove();
+  });
+
+  $(document).on('click', '.destroy_new_s3_headers', function(e) {
+    e.preventDefault();
+    $(this).closest('.new_s3_headers').remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $(document).on('click', '.add_new_style', function(e) {
+    e.preventDefault();
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+  });
+
+  // Handle adding new headers
+  var headers_hash_index = 1;
+  $(document).on('click', '.add_header', function(e) {
+    e.preventDefault();
+    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<div class="' + hash_name + ' row"><div class="field">';
+    html += '<div class="five columns">';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += Spree.translations.name + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
+    html += '</div><div class="five columns">'
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += Spree.translations.value + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
+    html += '</div><div class="two columns">'
+    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
+    html += '</div></div></div>';
+
+    index += 1;
+    return html;
+  };
+});

app/assets/javascripts/admin/spree/spree.js.coffee

@@ -1,13 +0,0 @@
-#= require jsuri
-
-class window.Spree
-  # Helper function to take a URL and add query parameters to it
-  @url: (uri, query) ->
-    if uri.path == undefined
-      uri = new Uri(uri)
-    if query
-      $.each query, (key, value) ->
-        uri.addQueryParam(key, value)
-    if Spree.api_key
-      uri.addQueryParam('token', Spree.api_key)
-    return uri

app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee

@@ -1,6 +1,6 @@
 Darkswarm.controller "ProductNodeCtrl", ($scope, $modal, FilterSelectorsService) ->
   $scope.enterprise = $scope.product.supplier # For the modal, so it's consistent
-  $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
 
   $scope.triggerProductModal = ->
+    $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
     $modal.open(templateUrl: "product_modal.html", scope: $scope)

app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee

@@ -1,39 +0,0 @@
-Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
-  $scope.$watchGroup [
-    'variant.line_item.quantity',
-    'variant.line_item.max_quantity'
-  ], (new_value, old_value) ->
-    return if old_value[0] == null && new_value[0] == null
-    Cart.adjust($scope.variant.line_item)
-
-  $scope.add = (quantity) ->
-    item = $scope.variant.line_item
-    item.quantity += quantity
-    if $scope.variant.product.group_buy
-      if item.quantity < 1 || item.max_quantity < item.quantity
-        item.max_quantity = item.quantity
-
-  $scope.addMax = (quantity) ->
-    item = $scope.variant.line_item
-    item.max_quantity += quantity
-    if item.max_quantity < item.quantity
-      item.quantity = item.max_quantity
-
-  $scope.canAdd = (quantity) ->
-    wantedQuantity = $scope.variant.line_item.quantity + quantity
-    $scope.quantityValid(wantedQuantity)
-
-  $scope.canAddMax = (quantity) ->
-    variant = $scope.variant
-    wantedQuantity = variant.line_item.max_quantity + quantity
-    $scope.quantityValid(wantedQuantity) && variant.line_item.quantity > 0
-
-  $scope.quantityValid = (quantity) ->
-    variant = $scope.variant
-    minimum = 0
-    maximum = variant.on_demand && Infinity || variant.on_hand
-    quantity >= minimum && quantity <= maximum
-
-  $scope.addBulk = (quantity) ->
-    $scope.add(quantity)
-    $modal.open(templateUrl: "bulk_buy_modal.html", scope: $scope, windowClass: "product-bulk-modal")

app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee

@@ -2,7 +2,7 @@ Darkswarm.directive "priceBreakdown", ($tooltip)->
   # We use the $tooltip service from Angular foundation to give us boilerplate
   # Subsequently we patch the scope, template and restrictions
   tooltip = $tooltip 'priceBreakdown', 'priceBreakdown', 'click'
-  tooltip.scope =
+  tooltip.scope = 
     variant: "="
   tooltip.templateUrl = "price_breakdown_button.html"
   tooltip.replace = true
@@ -15,3 +15,6 @@ Darkswarm.directive 'priceBreakdownPopup', ->
   replace: true
   templateUrl: 'price_breakdown.html'
   scope: false
+
+  link: (scope, elem, attrs) ->
+    scope.expanded = false unless scope.expanded?

app/assets/javascripts/darkswarm/directives/price_percentage.js.coffee

@@ -0,0 +1,10 @@
+Darkswarm.directive "pricePercentage", ->
+  restrict: 'E'
+  replace: true
+  templateUrl: 'price_percentage.html'
+  scope:
+    percentage: '='
+
+  link: (scope, elem, attrs) ->
+    elem.find(".meter").css
+      width: "#{scope.percentage}%"

app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee

@@ -4,4 +4,10 @@ Darkswarm.directive "shopVariant", ->
   templateUrl: 'shop_variant.html'
   scope:
     variant: '='
-  controller: 'ShopVariantCtrl'
+  controller: ($scope, Cart) ->
+    $scope.$watchGroup [
+      'variant.line_item.quantity',
+      'variant.line_item.max_quantity'
+    ], (new_value, old_value) ->
+      return if old_value[0] == null && new_value[0] == null
+      Cart.adjust($scope.variant.line_item)

app/assets/javascripts/darkswarm/services/checkout.js.coffee

@@ -95,10 +95,6 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
               last_name: @order.bill_address.lastname
               save_requested_by_customer: @secrets.save_requested_by_customer
           }
-
-      if @terms_and_conditions_accepted()
-        munged_order["terms_and_conditions_accepted"] = true
-
       munged_order
 
     shippingMethod: ->
@@ -118,7 +114,3 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
 
     cartTotal: ->
       @order.display_total + @shippingPrice() + @paymentPrice()
-
-    terms_and_conditions_accepted: ->
-      terms_and_conditions_checkbox = angular.element("#accept_terms")[0]
-      terms_and_conditions_checkbox? && terms_and_conditions_checkbox.checked

app/assets/javascripts/darkswarm/services/variants.js.coffee

@@ -10,6 +10,7 @@ Darkswarm.factory 'Variants', ->
 
     extend: (variant)->
       variant.extended_name = @extendedVariantName(variant)
+      variant.base_price_percentage = Math.round(variant.price / variant.price_with_fees * 100)
       variant.line_item ||= @lineItemFor(variant) # line_item may have been initialised in Cart#constructor
       variant.line_item.total_price = variant.price_with_fees * variant.line_item.quantity
       variant

app/assets/javascripts/templates/admin/modals/terms_and_conditions_info.html.haml

@@ -1,13 +0,0 @@
-%div
-  .margin-bottom-30.text-center
-    .text-big
-      {{ 'js.admin.modals.terms_and_conditions_info.title' | t }}
-  .margin-bottom-30
-    %p
-      {{ 'js.admin.modals.terms_and_conditions_info.message_1' | t }}
-  .margin-bottom-30
-    %p
-      {{ 'js.admin.modals.terms_and_conditions_info.message_2' | t }}
-
-  .text-center
-    %input.button.red.icon-plus{ type: 'button', value: t('js.admin.modals.got_it'), ng: { click: 'close()' } }

app/assets/javascripts/templates/admin/modals/terms_and_conditions_warning.html.haml

@@ -1,14 +0,0 @@
-%div
-  .margin-bottom-30.text-center
-    .text-big
-      {{ 'js.admin.modals.terms_and_conditions_warning.title' | t }}
-  .margin-bottom-30
-    %p
-      {{ 'js.admin.modals.terms_and_conditions_warning.message_1' | t }}
-  .margin-bottom-30
-    %p
-      {{ 'js.admin.modals.terms_and_conditions_warning.message_2' | t }}
-
-  .text-center
-    %input.button.red{ type: 'button', value: t('js.admin.modals.close'), ng: { click: 'close()' } }
-    %input.button.red{ type: 'button', value: t('js.admin.modals.continue'), ng: { click: 'continue()' } }

app/assets/javascripts/templates/bulk_buy_modal.html.haml

@@ -1,37 +0,0 @@
-.row
-  .columns.small-12
-    %h3{"ng-bind" => "::variant.extended_name"}
-
-.row.variant-bulk-buy-price-summary
-  .columns.small-6
-    .variant-unit {{ ::variant.unit_to_display }}
-  .columns.small-6
-    {{ variant.line_item.total_price | localizeCurrency }}
-
-.row
-  .columns.small-6
-    .variant-bulk-buy-quantity-label
-      {{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
-    %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
-        -# U+FF0D Fullwidth Hyphen-Minus
-        －
-      %span.bulk-buy.variant-quantity>
-        {{ variant.line_item.quantity }}
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-        -# U+FF0B Fullwidth Plus Sign
-        ＋
-  .columns.small-6
-    .variant-bulk-buy-quantity-label
-      {{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
-    %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
-        -# U+FF0D Fullwidth Hyphen-Minus
-        －
-      %span.bulk-buy.variant-quantity>
-        {{ variant.line_item.max_quantity }}
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
-        -# U+FF0B Fullwidth Plus Sign
-        ＋
-
-%ng-include{src: "'partials/close.html'"}

app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml

@@ -1,16 +1,14 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
-    {{ "js.shopfront.variant.add_to_cart" | t }}
-  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(-1)"}}>
-    -# U+FF0D Fullwidth Hyphen-Minus
-    －
-  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
-    -# U+FF0B Fullwidth Plus Sign
-    ＋
-  %br
-  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
-    {{ "js.shopfront.variant.quantity_in_cart" | t:{quantity: variant.line_item.quantity || 0} }}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.quantity"}}
+  %input{type: :number,
+  integer: true,
+  value: nil,
+  min: 0,
+  placeholder: "0",
+  "ofn-disable-scroll" => true,
+  "ng-debounce" => "500",
+  onwheel: "this.blur()",
+  "ng-model" => "variant.line_item.quantity",
+  "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
+  "ng-disabled" => "!variant.on_demand && variant.on_hand == 0",
+  name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}

app/assets/javascripts/templates/partials/shop_variant_with_group_buy.html.haml

@@ -1,17 +1,28 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::variant.product.group_buy"}
 
-  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "addBulk(1)", disabled: "!canAdd(1)"}}
-    {{ "js.shopfront.variant.add_to_cart" | t }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}>
-    {{ variant.line_item.quantity }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}
-    {{ variant.line_item.max_quantity || "-" }}
-  %br
-  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
-    {{ "js.shopfront.variant.in_cart" | t }}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.quantity"}}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.max_quantity"}}
+  %span.bulk-input-container
+    %span.bulk-input
+      %input.bulk.first{type: :number,
+      value: nil,
+      integer: true,
+      min: 0,
+      "ng-model" => "variant.line_item.quantity",
+      placeholder: "{{::'shop_variant_quantity_min' | t}}",
+      "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
+      "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
+      name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
+    %span.bulk-input
+      %input.bulk.second{type: :number,
+      "ng-disabled" => "!variant.line_item.quantity",
+      integer: true,
+      min: 0,
+      "ng-model" => "variant.line_item.max_quantity",
+      placeholder: "{{::'shop_variant_quantity_max' | t}}",
+      "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
+      min: "{{variant.line_item.quantity}}",
+      name: "variant_attributes[{{::variant.id}}][max_quantity]",
+      id: "variants_{{::variant.id}}_max"}

app/assets/javascripts/templates/price_breakdown.html.haml

@@ -1,28 +1,37 @@
-.joyride-tip-guide.price_breakdown{ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
-  %span.joyride-nub.top
-  .background{ng: {click: "tt_isOpen = false"}}
+.joyride-tip-guide.price_breakdown{"ng-class" => "{ in: tt_isOpen, fade: tt_animation }"}
+  %span.joyride-nub.right
   .joyride-content-wrapper
-    %h6 {{ "js.shopfront.price_breakdown" | t }}
-    %ul
-      %li
-        .right {{ ::variant.price | localizeCurrency }}
-        %span{"ng-bind" => "::'item_cost' | t"}
-      %li{"ng-if" => "::variant.fees.admin"}
-        .right {{ ::variant.fees.admin | localizeCurrency }}
-        %span{"ng-bind" => "::'admin_fee' | t"}
-      %li{"ng-if" => "::variant.fees.sales"}
-        .right {{ ::variant.fees.sales | localizeCurrency }}
-        %span{"ng-bind" => "::'sales_fee' | t"}
-      %li{"ng-if" => "::variant.fees.packing"}
-        .right {{ ::variant.fees.packing | localizeCurrency }}
-        %span{"ng-bind" => "::'packing_fee' | t"}
-      %li{"ng-if" => "::variant.fees.transport"}
-        .right {{ ::variant.fees.transport | localizeCurrency }}
-        %span{"ng-bind" => "::'transport_fee' | t"}
-      %li{"ng-if" => "::variant.fees.fundraising"}
-        .right {{ ::variant.fees.fundraising | localizeCurrency }}
-        %span{"ng-bind" => "::'fundraising_fee' | t"}
-      %li
-        %strong
-          .right = {{ ::variant.price_with_fees | localizeCurrency }}
-           
+    .collapsed{"ng-show" => "!expanded"}
+      %price-percentage{percentage: 'variant.base_price_percentage'}
+      %a{"ng-click" => "expanded = !expanded"}
+        %span{"ng-bind" => "::'price_breakdown' | t"}
+        %i.ofn-i_005-caret-down
+
+    .expanded{"ng-show" => "expanded"}
+      %ul
+        %li.cost
+          .right {{ ::variant.price | localizeCurrency }}
+          %span{"ng-bind" => "::'item_cost' | t"}
+        %li.admin-fee{"ng-if" => "::variant.fees.admin"}
+          .right {{ ::variant.fees.admin | localizeCurrency }}
+          %span{"ng-bind" => "::'admin_fee' | t"}
+        %li.sales-fee{"ng-if" => "::variant.fees.sales"}
+          .right {{ ::variant.fees.sales | localizeCurrency }}
+          %span{"ng-bind" => "::'sales_fee' | t"}
+        %li.packing-fee{"ng-if" => "::variant.fees.packing"}
+          .right {{ ::variant.fees.packing | localizeCurrency }}
+          %span{"ng-bind" => "::'packing_fee' | t"}
+        %li.transport-fee{"ng-if" => "::variant.fees.transport"}
+          .right {{ ::variant.fees.transport | localizeCurrency }}
+          %span{"ng-bind" => "::'transport_fee' | t"}
+        %li.fundraising-fee{"ng-if" => "::variant.fees.fundraising"}
+          .right {{ ::variant.fees.fundraising | localizeCurrency }}
+          %span{"ng-bind" => "::'fundraising_fee' | t"}
+        %li.total
+          %strong
+            .right = {{ ::variant.price_with_fees | localizeCurrency }}
+             
+
+      %a{"ng-click" => "expanded = !expanded"}
+        %span{"ng-bind" => "::'price_graph' | t"}
+        %i.ofn-i_006-caret-up

app/assets/javascripts/templates/price_percentage.html.haml

@@ -0,0 +1,4 @@
+.progress
+  .right {{::'fees' | t}}
+  .meter
+    {{::'item_cost' | t}}

app/assets/javascripts/templates/shop_variant.html.haml

@@ -1,16 +1,31 @@
 .variants.row
-  .small-4.medium-4.large-6.columns.variant-name
-    .inline{"ng-if" => "::variant.display_name"} {{ ::variant.display_name }}
-    .variant-unit {{ ::variant.unit_to_display }}
-  .small-3.medium-3.large-2.columns.variant-price
-    %price-breakdown{"price-breakdown" => "_", variant: "variant",
-      "price-breakdown-append-to-body" => "true",
-      "price-breakdown-placement" => "bottom",
-      "price-breakdown-animation" => true}
-    {{ variant.price_with_fees | localizeCurrency }}
-  .medium-2.large-1.columns.total-price
-    %span{"ng-class" => "{filled: variant.line_item.total_price}"}
-      {{ variant.line_item.total_price | localizeCurrency }}
+  .small-12.medium-4.large-4.columns.variant-name
+    .table-cell
+      .inline {{ ::variant.name_to_display }}
+      .bulk-buy.inline{"ng-if" => "::variant.product.group_buy"}
+        %i.ofn-i_056-bulk><
+        %em><
+          \ {{::'bulk' | t}}
 
   %ng-include{src: "'partials/shop_variant_no_group_buy.html'"}
   %ng-include{src: "'partials/shop_variant_with_group_buy.html'"}
+
+  .small-3.medium-1.large-1.columns.variant-unit
+    .table-cell
+      %em {{ ::variant.unit_to_display }}
+
+  .small-4.medium-2.large-2.columns.variant-price
+    .table-cell.price
+      %i.ofn-i_009-close
+      {{ variant.price_with_fees | localizeCurrency }}
+
+      -# Now in a template in app/assets/javascripts/templates !
+      %price-breakdown{"price-breakdown" => "_", variant: "variant",
+        "price-breakdown-append-to-body" => "true",
+        "price-breakdown-placement" => "left",
+        "price-breakdown-animation" => true}
+
+  .small-12.medium-2.large-2.columns.total-price.text-right
+    .table-cell
+      %strong{"ng-class" => "{filled: variant.line_item.total_price}"}
+        {{ variant.line_item.total_price | localizeCurrency }}

app/assets/stylesheets/admin/all.scss

@@ -35,6 +35,7 @@
 @import 'plugins/font-awesome';
 @import 'plugins/select2';
 
+@import 'sections/image_settings';
 @import 'sections/orders';
 @import 'sections/products';
 

app/assets/stylesheets/admin/hacks/ie.scss

@@ -29,6 +29,11 @@ html.ie {
       z-index: 0;
     }
   }
+
+  // Fix margin-top for destroy paperclip styles background
+  .destroy_new_attachment_styles {
+    margin-top: 17px !important;
+  }
 }
 
 // IE8 Hacks

app/assets/stylesheets/admin/products.scss

@@ -121,10 +121,3 @@ form#image_upload {
   }
 }
 
-form.edit_image {
-  .field {
-    img {
-      max-width: 150px;
-    }
-  }
-}

app/assets/stylesheets/admin/sections/image_settings.scss

@@ -0,0 +1,3 @@
+.destroy_style, .destroy_header {
+  float: right;
+}

app/assets/stylesheets/admin/shared/layout.scss

@@ -71,6 +71,12 @@
   display: none;
 }
 
+// For block grids
+.frameless {
+  margin-left: -10px;
+  margin-right: -10px;
+}
+
 // Header
 //---------------------------------------------------
 #header {

app/assets/stylesheets/admin/shared/typography.scss

@@ -154,7 +154,3 @@ input.text-big {
 .pad-top {
   padding-top: 1em;
 }
-
-.white-space-nowrap {
-  white-space: nowrap;
-}

app/assets/stylesheets/darkswarm/_shop-inputs.scss

@@ -6,110 +6,93 @@
 .darkswarm {
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
-}
 
-.reveal-modal.product-bulk-modal {
-  width: 26em;
-}
+  // ordering
+  product {
+    input {
+      @include border-radius(0);
 
-// Components to add variants to cart and change quantities
-//
-// They are not nested so that they can be used in modals.
-button.add-variant, button.variant-quantity {
-  height: 2.5rem;
-  border-radius: 0;
-  background-color: $orange-500;
-  color: white;
-  // Override foundation button styles:
-  font-size: 1rem;
-  margin: 0;
-  padding: 0;
-  transition: none;
+      @include csstrans;
 
-  &:hover {
-    background-color: $orange-600;
-  }
-  &[disabled] {
-    &:hover, &:focus {
-      background-color: $orange-500;
+      margin: 0;
+      width: 10rem;
+      display: inline;
+
+      @include box-shadow(none);
+
+      border-color: #b3b3b3;
+      text-align: right;
+
+      @include breakpoint(desktop) {
+        width: 8rem;
+      }
+
+      @include breakpoint(tablet) {
+        width: 7rem;
+      }
+
+      @include breakpoint(phablet) {
+        float: left !important;
+        font-size: 0.75rem;
+        padding-left: 0.25rem;
+        padding-right: 0.25rem;
+      }
+
+      @include breakpoint(mobile) {
+        width: 5.8rem;
+      }
+
+      &:hover {
+        @include box-shadow(none);
+
+        border-color: #888;
+        background-color: #fafafa;
+      }
+
+      &:active, &:focus, &.active {
+        @include box-shadow(none);
+
+        background-color: #f9f4b9;
+        border-color: #666;
+      }
     }
-  }
-  &:nth-of-type(1) {
-    border-bottom-left-radius: 0.25em;
-    border-top-left-radius: 0.25em;
-  }
-  &:nth-last-of-type(1) {
-    border-top-right-radius: 0.25em;
-    border-bottom-right-radius: 0.25em;
-  }
-}
 
-button.add-variant {
-  min-width: 6rem;
-  padding: 0 1em;
+    // BULK
 
-  &[disabled] {
-    &:hover, &:focus {
-      background-color: $orange-500;
+    input.bulk {
+      width: 5rem;
+
+      @include breakpoint(desktop) {
+        width: 4rem;
+      }
+
+      @include breakpoint(tablet) {
+        width: 3.5rem;
+      }
+
+      @include breakpoint(mobile) {
+        width: 2.8rem;
+      }
+    }
+
+    input.bulk.first {
+      border-right: 0;
+    }
+
+    input.bulk.second {
+      border-left: 0;
+    }
+
+    .bulk-input-container {
+      float: right;
+
+      @include breakpoint(phablet) {
+        float: left !important;
+      }
+
+      .bulk-input {
+        float: left;
+      }
     }
   }
 }
-
-button.variant-quantity {
-  width: 3rem;
-
-  &:nth-of-type(1):not(.bulk-buy):not(.bulk-buy-add) {
-    border-right: .1em solid $orange-400;
-  }
-}
-
-.variant-quantity-display {
-  display: inline-block;
-  font-size: 0.875em;
-  margin-top: 0.25em;
-  text-align: center;
-  width: 6rem;
-  visibility: hidden;
-
-  &.visible {
-    visibility: visible;
-  }
-}
-
-button.bulk-buy.variant-quantity {
-  background-color: transparent;
-  border: .1em solid $grey-200;
-  color: inherit;
-}
-
-button.bulk-buy-add.variant-quantity {
-  width: 2.5rem;
-
-  &[disabled] {
-    background-color: $grey-400;
-
-    &:hover, &:focus {
-      background-color: $grey-400;
-    }
-  }
-}
-
-span.bulk-buy.variant-quantity {
-  border: .1em solid $grey-200;
-  height: 2.5rem;
-  display: inline-block;
-  min-width: 3em;
-  padding: .5em;
-  text-align: center;
-  vertical-align: top;
-}
-
-.variant-bulk-buy-price-summary {
-  color: $disabled-med;
-  margin-bottom: 1em;
-}
-
-.variant-bulk-buy-quantity-label {
-  font-size: 0.875rem;
-  margin-bottom: .5em;
-}

app/assets/stylesheets/darkswarm/_shop-navigation.scss

@@ -178,7 +178,7 @@ shop ordercycle {
 }
 
 shop navigation ordercycle {
-  margin-top: 3.4em;
+  margin-top: 3em;
   padding: 1em;
   height: 7.6em;
   position: absolute;

app/assets/stylesheets/darkswarm/_shop-popovers.scss

@@ -4,69 +4,86 @@
 // Pop over
 // Foundation overrides
 .joyride-tip-guide.price_breakdown {
-  width: 16rem;
-  max-width: 65%;
   // JS needs to be tweaked to adjust for left alignment - this is dynamic can't rewrite in CSS
-  margin-left: -7.4rem;
-  margin-top: 0.1rem;
+  background-color: #999;
+  color: #1f1f1f;
+  margin-left: -8px;
 
-  @include box-shadow(0 2px 8px 0 rgba(0, 0, 0, 0.35));
+  @include box-shadow(0 1px 2px 0 rgba(0, 0, 0, 0.7));
 
   .joyride-content-wrapper {
-    padding: .625rem;
+    padding: 1.125rem 1.25rem 1.5rem;
+    padding: 1rem;
+    margin: 1%;
     width: 98%;
-    background-color: $grey-800;
+    background-color: white;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    color: #1f1f1f;
+  }
+
+  .joyride-nub.right {
+    top: 38px;
+    border-color: #999 !important;
+    border-top-color: transparent !important;
+    border-right-color: transparent !important;
+    border-bottom-color: transparent !important;
+  }
+
+  .progress {
+    background-color: #13bf85;
+    padding: 0;
+    border: none;
     color: white;
-  }
-
-  h6 {
-    font-size: 0.937rem;
+    font-size: 0.75rem;
+    font-style: oblique;
     line-height: 1;
-    border-bottom: .1em solid $grey-700;
-    padding: 0 0 .625em 0;
-    margin-bottom: 2px;
+    height: auto;
+
+    .right {
+      padding: 0.5rem 0.25rem 0 0;
+    }
+
+    .meter {
+      background-color: #0b8c61;
+      padding: 0.5rem 0.25rem;
+      border-right: 1px solid #539f92;
+    }
   }
 
-  .joyride-nub.top {
-    left: 7.4rem;
-    z-index: -1;
-  }
+  .expanded {
+    ul, li {
+      list-style: none;
+      margin: 0;
+      font-size: 0.875rem;
+    }
 
-  .background {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-    cursor: pointer;
-  }
+    li {
+      background-color: #13bf85;
+      padding: 0 0.25rem;
+      margin-bottom: 2px;
+      color: white;
+    }
 
-  ul, li {
-    list-style: none;
-    margin: 0;
-    font-size: 0.875rem;
-  }
+    li.cost {
+      background-color: #0b8c61;
+    }
 
-  li {
-    line-height: 1;
-    border-bottom: .1em solid $grey-700;
-    padding: 0.625rem 0;
-    margin-bottom: 2px;
-  }
-
-  li:last-child {
-    border-bottom: 0;
-    padding-bottom: 0;
+    li:last-child {
+      margin-bottom: 0.75rem;
+    }
   }
 }
 
 button.graph-button {
   // z-index: 9999999
+  border: 1px solid transparent;
   padding: 0;
   margin: 0;
-  display: inline-block;
+  display: inline;
   background-color: rgba(255, 255, 255, 0.5);
+  padding: 4px;
 
   @include box-shadow(none);
 
@@ -80,6 +97,7 @@ button.graph-button {
   }
 
   &:focus {
+    border: 1px solid #e0e0e0;
     background-color: rgba(255, 255, 255, 1);
 
     &:before {
@@ -89,15 +107,22 @@ button.graph-button {
 
   &:hover, &:active {
     background-color: rgba(255, 255, 255, 1);
+    border: 1px solid transparent;
 
     &:before {
-      color: $teal-500;
+      color: $clr-brick-bright;
     }
   }
+
+  @include breakpoint(tablet) {
+    // Hide for small
+    display: none;
+  }
 }
 
 button.graph-button.open {
-  background-color: $teal-500;
+  border: 1px solid transparent;
+  background-color: $clr-brick-bright;
 
   &:before {
     content: "";

app/assets/stylesheets/darkswarm/_shop-product-rows.scss

@@ -10,57 +10,91 @@
         .columns {
           padding-top: 0em;
           padding-bottom: 0em;
+          display: table;
           line-height: 1.1;
+
+          // outline: 1px solid red
+
+          @include breakpoint(tablet) {
+            font-size: 0.875rem;
+          }
+
+          @include breakpoint(phablet) {
+            font-size: 0.75rem;
+          }
         }
-      }
 
-      .shop-variants {
-        // product-thumb width + 1rem
-        padding-left: calc(22.222% + 1rem);
-
-        @include breakpoint(phablet) {
-          padding-left: 0;
-          clear: left;
+        .table-cell {
+          display: table-cell;
+          vertical-align: middle;
+          height: 37px;
         }
       }
 
       // ROW VARIANTS
       .row.variants {
-        margin: 0 0 1em 0;
+        margin-left: 0;
+        margin-right: 0;
+        background-color: #ECECEC;
+
+        &:hover, &:focus, &:active {
+          background-color: $clr-brick-light;
+        }
+
+        &:nth-of-type(even) {
+          background-color: #f9f9f9;
+
+          &:hover, &:focus, &:active {
+            background-color: $clr-brick-ultra-light;
+          }
+        }
 
         &.out-of-stock {
           opacity: 0.2;
         }
 
-        .variant-name,
-        .total-price {
-          padding-top: .74em;
-        }
-        .variant-price {
-          padding-top: .65em;
-        }
-
         // Variant name
         .variant-name {
-          padding-left: 0;
-          padding-right: 0;
+          padding-left: 7.9375rem;
 
-          @include breakpoint(phablet) {
-            padding-left: 0.5rem;
+          @include breakpoint(tablet) {
+            padding-left: 4.9375rem;
           }
+        }
 
-          & > *:nth-child(n + 2) {
-            color: $grey-550;
-            font-size: 0.875rem;
-            font-style: italic;
-            line-height: normal;
+        .variant-name {
+          @include breakpoint(phablet) {
+            background: #333;
+            color: white;
+            padding-left: 0.9375rem;
+            font-weight: bold;
+
+            .table-cell {
+              height: 27px;
+            }
+          }
+        }
+
+        // Variant unit
+        .variant-unit {
+          padding-left: 0rem;
+          padding-right: 0rem;
+          color: #888;
+          font-size: 0.875rem;
+          overflow: hidden;
+
+          @include breakpoint(tablet) {
+            font-size: 0.75rem;
           }
         }
 
         // Variant price
         .variant-price {
+          padding-left: 0.25rem;
+          padding-right: 0.25rem;
+
           @include breakpoint(phablet) {
-            padding-left: 1rem;
+            text-align: right;
           }
         }
 
@@ -74,16 +108,24 @@
           }
 
           @include breakpoint(phablet) {
-            display: none;
+            background: #777;
+            color: $disabled-med;
+
+            .filled {
+              color: white;
+            }
+
+            .table-cell {
+              height: 27px;
+            }
           }
         }
       }
 
       // ROW SUMMARY
-      .summary {
+      .row.summary {
         margin-left: 0;
         margin-right: 0;
-        margin-bottom: 1.25em;
         background: #fff;
 
         .columns {
@@ -98,77 +140,39 @@
         }
 
         .summary-header {
-          // product-thumb width + 1rem
-          padding-left: calc(22.222% + 1rem);
-          padding-right: 1rem;
+          padding-left: 7.9375rem;
 
-          @include breakpoint(phablet) {
-            padding-left: calc(33.333% + 1rem);
+          @include breakpoint(tablet) {
+            padding-left: 4.9375rem;
           }
 
-          .product-producer {
-            color: $grey-550;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            font-style: italic;
+          @include breakpoint(phablet) {
+            padding-left: 0.9375rem;
+          }
 
-            a {
-              color: $teal-500;
-
-              &:hover, &:focus, &:active {
-                color: $teal-600;
-                text-decoration: underline;
-              }
-            }
+          small {
+            font-size: 80%;
           }
 
           h3 {
-            font-size: 1.3rem;
-            margin-top: 0.75rem;
-            margin-bottom: 0.6rem;
+            font-size: 1.5rem;
+            margin: 0;
           }
 
           h3 a {
-            color: $orange-500;
+            color: #222;
+
+            i {
+              @include csstrans;
+
+              font-size: 0.6em;
+            }
 
             &:hover, &:focus, &:active {
-              color: $orange-600;
-              text-decoration: underline;
-            }
-          }
+              color: $clr-brick;
 
-          .product-description {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-bottom: 0.75rem;
-          }
-
-          .product-properties {
-            margin: .5em 0;
-
-            li {
-              margin: 0 0.25rem 0.25rem 0;
-
-              a {
-                padding: 0.1em 0.625em;
-
-                cursor: auto;
-
-                &.has-tip {
-                  cursor: pointer;
-                  font-weight: normal;
-                }
-                &:hover, &:focus {
-                  border-color: #ccc;
-                }
-              }
-
-              // Foundation doesn't show the nub on mobile.
-              // Repeating the style to show it here.
-              .nub {
-                border-color: transparent transparent #333333 transparent;
+              i {
+                font-size: 0.8em;
               }
             }
           }

app/assets/stylesheets/darkswarm/_shop-product-thumb.scss

@@ -1,32 +1,80 @@
+@import "mixins";
+@import "branding";
+@import "animations";
+
 .darkswarm {
   products {
     product {
       .product-thumb {
-        // Desktop: the product summary is nine columns wide. Use two
-        // for the image. 100% / 9 * 2 = 22.222% <= 192px
-        width: calc(22.222%);
+        @include csstrans;
+
+        position: absolute;
+        top: 2px;
+        left: 0px;
+        width: 7rem;
+        height: 7rem;
         float: left;
+        display: block;
+        z-index: 1;
+        background-color: white;
+        overflow: hidden;
 
-        // Mobile: the summary has full twelve columns and the image
-        // should take four of them. 100% / 12 * 4 = 33.333% <= 227px
-        @include breakpoint(phablet) {
-          width: calc(33.333%);
-        }
+        i {
+          @include csstrans;
 
-        // Make this an anchor for the bulk label.
-        position: relative;
-
-        .product-thumb__bulk-label {
-          background-color: $grey-700;
-          color: white;
+          transition-delay: 150ms;
           position: absolute;
-          right: 0;
-          top: .8em;
-          padding: .25em .5em;
+          left: 45%;
+          top: 45%;
+          z-index: 99999;
+          color: white;
+          font-size: 1rem;
+          opacity: 0;
         }
 
-        &:hover {
-          filter: brightness(96%);
+        img {
+          @include csstrans;
+
+          opacity: 1;
+
+          @include transform-scale(scale(1));
+        }
+
+        &:hover, &:focus, &:active {
+          background-color: $clr-brick;
+
+          i {
+            left: 32%;
+            top: 30%;
+            font-size: 3rem;
+            opacity: 1;
+          }
+
+          img {
+            opacity: 0.5;
+
+            @include transform-scale(scale(1.1));
+          }
+        }
+
+        @include breakpoint(tablet) {
+          top: 2px;
+          width: 4rem;
+          height: 4rem;
+
+          &:hover, &:focus, &:active {
+            i {
+              left: 30%;
+              top: 30%;
+              font-size: 2rem;
+            }
+          }
+        }
+
+        @include breakpoint(phablet) {
+          display: none;
+          width: 0rem;
+          height: 0rem;
         }
       }
     }

app/assets/stylesheets/darkswarm/_shop-taxon-flag.scss

@@ -0,0 +1,47 @@
+@import "mixins";
+
+.darkswarm {
+  products {
+    product {
+      .taxon-flag {
+        background: transparent image-url("flag.svg") top center no-repeat;
+        background-size: 34px 39px;
+        min-height: 40px;
+        width: 34px;
+        margin-top: -1.1rem;
+        padding-top: 0.25rem;
+        z-index: 999999;
+
+        @include breakpoint(mobile) {
+          background-size: 28px 32px;
+          min-height: 32px;
+          width: 28px;
+        }
+
+        render-svg {
+          svg {
+            width: 24px;
+            height: 24px;
+
+            path {
+              fill: #999;
+            }
+          }
+        }
+
+        @include breakpoint(tablet) {
+          margin-top: -0.85rem;
+        }
+
+        @include breakpoint(mobile) {
+          render-svg {
+            svg {
+              width: 18px;
+              height: 18px;
+            }
+          }
+        }
+      }
+    }
+  }
+}

app/assets/stylesheets/darkswarm/branding.scss

@@ -11,6 +11,7 @@ $ofn-grey: #808184;
 $clr-brick: #c1122b;
 $clr-brick-light: #f5e6e7;
 $clr-brick-light-trans: rgba(245, 230, 231, 0.9);
+$clr-brick-ultra-light: #faf5f6;
 $clr-brick-bright: #eb4c46;
 $clr-brick-med-bright: #e5a2a0;
 $clr-brick-light-bright: #f5c4c9;
@@ -47,7 +48,6 @@ $grey-200: #ddd;
 $grey-300: #ccc;
 $grey-400: #bbb;
 $grey-500: #999;
-$grey-550: #888;
 $grey-600: #777;
 $grey-650: #666;
 $grey-700: #555;
@@ -56,7 +56,6 @@ $grey-800: #333;
 $teal-300: #80d3df;
 $teal-400: #4cb5c5;
 $teal-500: #0096ad;
-$teal-600: #007a9a;
 
 $orange-400: #ff9466;
 $orange-450: #f4704c;

app/assets/stylesheets/darkswarm/embedded_shopfront.scss

@@ -5,7 +5,7 @@ $large-menu-height: 4.6875rem;
 $medium-menu-height: 3rem;
 $gutter-width: 0.9375rem;
 
-.top-bar .powered-by {
+nav.top-bar ul.left li.powered-by {
   display: none;
 }
 
@@ -59,6 +59,13 @@ body.embedded {
         line-height: $large-menu-height;
         height: $large-menu-height;
         vertical-align: top;
+
+        &.cart {
+          div.joyride-tip-guide { // Cart Dropdown
+            top: 75px;
+            overflow: visible;
+          }
+        }
       }
     }
 

app/assets/stylesheets/darkswarm/menu.scss

@@ -44,13 +44,6 @@ nav.top-bar {
 
 .top-bar-section {
   border-bottom: 1px solid $light-grey-transparency;
-  display: flex;
-  justify-content: space-between;
-
-  .nav-main-menu,
-  .nav-icons-menu {
-    flex-shrink: 0;
-  }
 
   a.icon {
     &:hover {
@@ -106,14 +99,21 @@ nav.top-bar {
     }
   }
 
+  ul.center {
+    display: inline-block;
+
+    // By default, we center between the left and right uls, but we want to be centered
+    // relative to the whole page. The difference in width between the other uls is 74px,
+    // so we offset by that amount here.
+    margin-left: -74px;
+  }
+
   ul.dropdown {
     border: 1px solid $smoke;
     border-top: none;
-    left: auto;
-    right: 0;
   }
 
-  .nav-icons-menu {
+  ul.right {
     > li {
       border-left: 1px solid #ddd;
       padding: 0 14px;
@@ -244,7 +244,9 @@ nav.top-bar {
 
 .top-bar .ofn-logo img {
   height: auto;
+  width: auto;
   max-height: 44px;
+  max-width: 250px;
 }
 
 .left-off-canvas-menu {
@@ -287,6 +289,10 @@ nav.top-bar {
     .has-dropdown > a {
       padding: 0 ($topbar-height / 8) !important;
     }
+
+    ul.center {
+      margin-left: -24px;
+    }
   }
 }
 

app/assets/stylesheets/darkswarm/mixins.scss

@@ -142,6 +142,57 @@
 
 // Background options \\
 
+@mixin darkbg {
+  background-color: $clr-brick;
+
+  &, & * {
+    color: white;
+  }
+
+  a {
+    color: $clr-brick-ultra-light;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-brick-light;
+    }
+  }
+}
+
+@mixin lightbg {
+  background-color: $clr-brick-light;
+
+  &, & * {
+    color: black;
+  }
+
+  a {
+    color: $clr-brick;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-brick-bright;
+    }
+  }
+}
+
+@mixin turqbg {
+  background-color: $clr-turquoise-light;
+
+  &, & * {
+    color: $clr-turquoise;
+  }
+
+  a {
+    color: $clr-turquoise;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-turquoise-bright;
+    }
+  }
+}
+
 @mixin fullbg {
   background-position: center center;
   background-repeat: no-repeat;
@@ -151,6 +202,12 @@
   background-size: cover;
 }
 
+@mixin fullwidthbg {
+  background-position: center top;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
+
 @mixin gradient($gradient-clr1, $gradient-clr2) {
   background: $gradient-clr1;
 

app/assets/stylesheets/darkswarm/shop.scss

@@ -8,30 +8,10 @@
 @import "shop-inputs";
 @import "shop-navigation";
 @import "shop-product-rows";
+@import "shop-taxon-flag";
 @import "shop-popovers";
 
 .darkswarm {
-  .product-listing {
-    @include breakpoint(desktop) {
-      padding-right: 0;
-      padding-left: 0;
-    }
-
-    .row.full {
-      width: 100%;
-      margin: 0;
-
-      .columns.full {
-        padding-right: 0;
-        padding-left: 0;
-      }
-    }
-  }
-
-  .filter-header {
-    margin-top: 1.1em;
-  }
-
   products {
     display: block;
 
@@ -71,18 +51,32 @@
     product {
       @include csstrans;
 
-      // Avoid margin collapsing which breaks the flush alignment of the first
-      // image.
-      overflow: auto;
-
-      &:nth-child(n + 2) {
-        border-top: 1px solid $grey-100;
-      }
+      border-bottom: 1px solid #e5e5e5;
+      border-top: 1px solid #e5e5e5;
       padding-bottom: 1px;
+      margin-bottom: 20px !important;
       position: relative;
       display: block;
       color: $med-drk-grey;
 
+      &:hover, &:focus, &:active {
+        border-bottom: 1px solid $clr-brick-med-bright;
+        border-top: 1px solid $clr-brick-med-bright;
+      }
+
+      // BULK
+      .bulk-buy {
+        font-size: 0.875rem;
+
+        @include breakpoint(tablet) {
+          font-size: 0.75rem;
+        }
+      }
+
+      .bulk-buy, .bulk-buy i {
+        color: #888;
+      }
+
       .inline {
         display: inline;
       }
@@ -91,6 +85,27 @@
         width: 100px;
         margin-bottom: 20px;
       }
+
+      // ICONS
+      i {
+        font-size: 0.75em;
+        padding-right: 0.9375rem;
+
+        @include breakpoint(phablet) {
+          padding-right: 0.25rem;
+        }
+      }
+
+      i.ofn-i_056-bulk {
+        font-size: 1rem;
+        padding-right: 0rem;
+      }
+
+      i.ofn-i_036-producers {
+        padding-left: 0.2rem;
+        padding-right: 0rem;
+        font-size: 0.8rem;
+      }
     }
   }
 

app/assets/stylesheets/darkswarm/shop_search.scss

@@ -6,6 +6,7 @@
   background-color: $grey-100;
   height: 5em;
   padding: 1em 0;
+  margin-bottom: 1em;
   position: relative;
   z-index: 5;
 
@@ -49,7 +50,7 @@
 
   button {
     background-color: $grey-600;
-    margin: 0 0 0 1em;
+    margin-left: 1em;
     height: 3em;
     width: 7em;
     padding: 0;

app/assets/stylesheets/darkswarm/ui.scss

@@ -159,6 +159,11 @@ a.button.large {
   display: flex;
 }
 
+.no-gutter {
+  padding-right: 0;
+  padding-left: 0;
+}
+
 .disable-scroll {
   overflow: hidden;
 }

app/controllers/admin/enterprise_fees_controller.rb

@@ -27,7 +27,7 @@ module Admin
     end
 
     def bulk_update
-      @enterprise_fee_set = EnterpriseFeeSet.new(enterprise_fee_bulk_params)
+      @enterprise_fee_set = EnterpriseFeeSet.new(params[:enterprise_fee_set])
 
       if @enterprise_fee_set.save
         redirect_to redirect_path, notice: I18n.t(:enterprise_fees_update_notice)
@@ -78,15 +78,5 @@ module Admin
 
       main_app.admin_enterprise_fees_path
     end
-
-    def enterprise_fee_bulk_params
-      params.require(:enterprise_fee_set).permit(
-        collection_attributes: [
-          :id, :enterprise_id, :fee_type, :name, :tax_category_id,
-          :inherits_tax_category, :calculator_type,
-          { calculator_attributes: PermittedAttributes::Calculator.attributes }
-        ]
-      )
-    end
   end
 end

app/controllers/admin/enterprises_controller.rb

@@ -73,7 +73,7 @@ module Admin
 
       if @enterprise.update(attributes)
         flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name)
-        redirect_to spree.admin_dashboard_path
+        redirect_to admin_dashboard_path
       else
         flash[:error] = I18n.t(:enterprise_register_error, enterprise: @enterprise.name)
         render :welcome, layout: "spree/layouts/bare_admin"
@@ -181,10 +181,10 @@ module Admin
       enterprise_payment_methods = @enterprise.payment_methods.to_a
       enterprise_shipping_methods = @enterprise.shipping_methods.to_a
       # rubocop:disable Style/TernaryParentheses
-      @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).to_a.sort_by! do |pm|
+      @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).sort_by! do |pm|
         [(enterprise_payment_methods.include? pm) ? 0 : 1, pm.name]
       end
-      @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).to_a.sort_by! do |sm|
+      @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).sort_by! do |sm|
         [(enterprise_shipping_methods.include? sm) ? 0 : 1, sm.name]
       end
       # rubocop:enable Style/TernaryParentheses

app/controllers/admin/order_cycles_controller.rb

@@ -223,7 +223,7 @@ module Admin
     end
 
     def order_cycle_set
-      @order_cycle_set ||= OrderCycleSet.new(@order_cycles, order_cycle_bulk_params)
+      @order_cycle_set ||= OrderCycleSet.new(@order_cycles, params[:order_cycle_set])
     end
 
     def require_order_cycle_set_params
@@ -240,11 +240,5 @@ module Admin
     def order_cycle_params
       PermittedAttributes::OrderCycle.new(params).call
     end
-
-    def order_cycle_bulk_params
-      params.require(:order_cycle_set).permit(
-        collection_attributes: [:id] + PermittedAttributes::OrderCycle.basic_attributes
-      )
-    end
   end
 end

app/controllers/api/base_controller.rb

@@ -4,7 +4,6 @@ require "spree/core/controller_helpers/ssl"
 
 module Api
   class BaseController < ActionController::Metal
-    include ActionController::StrongParameters
     include Spree::Api::ControllerSetup
     include Spree::Core::ControllerHelpers::SSL
     include ::ActionController::Head

app/controllers/api/customers_controller.rb

@@ -11,15 +11,11 @@ module Api
       @customer = Customer.find(params[:id])
       authorize! :update, @customer
 
-      if @customer.update(customer_params)
+      if @customer.update(params[:customer])
         render json: @customer, serializer: CustomerSerializer, status: :ok
       else
         invalid_resource!(@customer)
       end
     end
-
-    def customer_params
-      params.require(:customer).permit(:code, :email, :enterprise_id, :allow_charges)
-    end
   end
 end

app/controllers/api/enterprises_controller.rb

@@ -12,7 +12,7 @@ module Api
       # params[:user_ids] breaks the enterprise creation
       # We remove them from params and save them after creating the enterprise
       user_ids = params[:enterprise].delete(:user_ids)
-      @enterprise = Enterprise.new(enterprise_params)
+      @enterprise = Enterprise.new(params[:enterprise])
       if @enterprise.save
         @enterprise.user_ids = user_ids
         render text: @enterprise.id, status: :created
@@ -25,7 +25,7 @@ module Api
       @enterprise = Enterprise.find_by(permalink: params[:id]) || Enterprise.find(params[:id])
       authorize! :update, @enterprise
 
-      if @enterprise.update(enterprise_params)
+      if @enterprise.update(params[:enterprise])
         render text: @enterprise.id, status: :ok
       else
         invalid_resource!(@enterprise)
@@ -69,9 +69,5 @@ module Api
     def override_visible
       params[:enterprise][:visible] = false
     end
-
-    def enterprise_params
-      PermittedAttributes::Enterprise.new(params).call
-    end
   end
 end

app/controllers/api/products_controller.rb

@@ -1,5 +1,4 @@
 require 'open_food_network/permissions'
-require 'spree/core/product_duplicator'
 
 module Api
   class ProductsController < Api::BaseController
@@ -17,7 +16,7 @@ module Api
     def create
       authorize! :create, Spree::Product
       params[:product][:available_on] ||= Time.zone.now
-      @product = Spree::Product.new(product_params)
+      @product = Spree::Product.new(params[:product])
       begin
         if @product.save
           render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
@@ -33,7 +32,7 @@ module Api
     def update
       authorize! :update, Spree::Product
       @product = find_product(params[:id])
-      if @product.update(product_params)
+      if @product.update(params[:product])
         render json: @product, serializer: Api::Admin::ProductSerializer, status: :ok
       else
         invalid_resource!(@product)
@@ -156,9 +155,5 @@ module Api
         per_page: (params[:per_page] || DEFAULT_PER_PAGE).to_i
       }
     end
-
-    def product_params
-      params.require(:product).permit PermittedAttributes::Product.attributes
-    end
   end
 end

app/controllers/api/shipments_controller.rb

@@ -30,7 +30,7 @@ module Api
         @shipment.adjustment.open
       end
 
-      @shipment.update(shipment_params[:shipment])
+      @shipment.update(params[:shipment])
 
       if unlock == 'yes'
         @shipment.adjustment.close
@@ -88,7 +88,7 @@ module Api
 
     def find_and_update_shipment
       @shipment = @order.shipments.find_by!(number: params[:id])
-      @shipment.update(shipment_params[:shipment]) if shipment_params[:shipment].present?
+      @shipment.update(params[:shipment])
       @shipment.reload
     end
 
@@ -101,12 +101,5 @@ module Api
     def get_or_create_shipment(stock_location_id)
       @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
     end
-
-    def shipment_params
-      params.permit(
-        [:id, :order_id, :variant_id, :quantity,
-         { shipment: [:tracking, :selected_shipping_rate_id] }]
-      )
-    end
   end
 end

app/controllers/api/taxons_controller.rb

@@ -22,7 +22,7 @@ module Api
 
     def create
       authorize! :create, Spree::Taxon
-      @taxon = Spree::Taxon.new(taxon_params)
+      @taxon = Spree::Taxon.new(params[:taxon])
       @taxon.taxonomy_id = params[:taxonomy_id]
       taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
 
@@ -42,7 +42,7 @@ module Api
 
     def update
       authorize! :update, Spree::Taxon
-      if taxon.update(taxon_params)
+      if taxon.update(params[:taxon])
         render json: taxon, serializer: Api::TaxonSerializer, status: :ok
       else
         invalid_resource!(taxon)
@@ -66,11 +66,5 @@ module Api
     def taxon
       @taxon ||= taxonomy.taxons.find(params[:id])
     end
-
-    def taxon_params
-      return if params[:taxon].blank?
-
-      params.require(:taxon).permit([:name, :parent_id])
-    end
   end
 end

app/controllers/api/variants_controller.rb

@@ -17,7 +17,7 @@ module Api
 
     def create
       authorize! :create, Spree::Variant
-      @variant = scope.new(variant_params)
+      @variant = scope.new(params[:variant])
       if @variant.save
         render json: @variant, serializer: Api::VariantSerializer, status: :created
       else
@@ -28,7 +28,7 @@ module Api
     def update
       authorize! :update, Spree::Variant
       @variant = scope.find(params[:id])
-      if @variant.update(variant_params)
+      if @variant.update(params[:variant])
         render json: @variant, serializer: Api::VariantSerializer, status: :ok
       else
         invalid_resource!(@product)
@@ -69,9 +69,5 @@ module Api
       end
       variants
     end
-
-    def variant_params
-      params.require(:variant).permit(PermittedAttributes::Variant.attributes)
-    end
   end
 end

app/controllers/checkout_controller.rb

@@ -47,6 +47,8 @@ class CheckoutController < Spree::StoreController
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
     return action_failed unless @order.update(params_adapter.params[:order])
 
+    fire_event('spree.checkout.update')
+
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
     rescue_from_spree_gateway_error(e)
@@ -148,7 +150,7 @@ class CheckoutController < Spree::StoreController
   def handle_redirect_from_stripe
     if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
-      redirect_to(spree.order_path(@order)) && return
+      redirect_to(order_path(@order)) && return
     else
       checkout_failed
     end
@@ -208,10 +210,10 @@ class CheckoutController < Spree::StoreController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: spree.order_path(@order))
+        respond_with(@order, location: order_path(@order))
       end
       format.json do
-        render json: { path: spree.order_path(@order) }, status: :ok
+        render json: { path: order_path(@order) }, status: :ok
       end
     end
   end

app/controllers/spree/admin/general_settings_controller.rb

@@ -10,7 +10,6 @@ module Spree
       end
 
       def update
-        merge_available_units_params unless params[:available_units].nil?
         params.each do |name, value|
           next unless Spree::Config.has_preference? name
 
@@ -18,14 +17,7 @@ module Spree
         end
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
 
-        redirect_to spree.edit_admin_general_settings_path
-      end
-
-      private
-
-      def merge_available_units_params
-        params[:available_units] =
-          params[:available_units].select { |_unit, checked| checked == "1" }.keys.join(",")
+        redirect_to edit_admin_general_settings_path
       end
     end
   end

app/controllers/spree/admin/image_settings_controller.rb

@@ -0,0 +1,79 @@
+module Spree
+  module Admin
+    class ImageSettingsController < Spree::Admin::BaseController
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      end
+
+      def update
+        update_styles(params)
+        update_headers(params) if Spree::Config[:use_s3]
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:success] = Spree.t(:image_settings_updated)
+            redirect_to spree.edit_admin_image_settings_path
+          }
+        end
+      end
+
+      private
+
+      def update_styles(params)
+        if params[:new_attachment_styles].present?
+          params[:new_attachment_styles].each do |_index, style|
+            params[:attachment_styles][style[:name]] = style[:value] if style[:value].present?
+          end
+        end
+
+        styles = params[:attachment_styles]
+
+        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_headers(params)
+        if params[:new_s3_headers].present?
+          params[:new_s3_headers].each do |_index, header|
+            params[:s3_headers][header[:name]] = header[:value] if header[:value].present?
+          end
+        end
+
+        headers = params[:s3_headers]
+
+        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
+      end
+
+      def update_paperclip_settings
+        if Spree::Config[:use_s3]
+          s3_creds = { access_key_id: Spree::Config[:s3_access_key],
+                       secret_access_key: Spree::Config[:s3_secret],
+                       bucket: Spree::Config[:s3_bucket] }
+          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+          Spree::Image.attachment_definitions[:attachment][:s3_headers] =
+            ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+        else
+          Spree::Image.attachment_definitions[:attachment].delete :storage
+        end
+
+        Spree::Image.attachment_definitions[:attachment][:styles] =
+          ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+        Spree::Image.attachment_definitions[:attachment][:default_url] =
+          Spree::Config[:attachment_default_url]
+        Spree::Image.attachment_definitions[:attachment][:default_style] =
+          Spree::Config[:attachment_default_style]
+
+        # Spree stores attachent definitions in JSON. This converts the style name and format to
+        # strings. However, when paperclip encounters these, it doesn't recognise the format.
+        # Here we solve that problem by converting format and style name to symbols.
+        Spree::Image.reformat_styles
+      end
+    end
+  end
+end

app/controllers/spree/admin/images_controller.rb

@@ -25,7 +25,7 @@ module Spree
         @object.attributes = permitted_resource_params
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
-          redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
+          redirect_to admin_product_images_url(params[:product_id], @url_filters)
         else
           respond_with(@object)
         end
@@ -41,7 +41,7 @@ module Spree
 
         if @object.update(permitted_resource_params)
           flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
+          redirect_to admin_product_images_url(params[:product_id], @url_filters)
         else
           respond_with(@object)
         end
@@ -55,13 +55,13 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_removed)
         end
 
-        redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
+        redirect_to admin_product_images_url(params[:product_id], @url_filters)
       end
 
       private
 
       def location_after_save
-        spree.admin_product_images_url(@product)
+        admin_product_images_url(@product)
       end
 
       def load_data

app/controllers/spree/admin/mail_methods_controller.rb

@@ -23,7 +23,7 @@ module Spree
       rescue StandardError => e
         flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e }
       ensure
-        redirect_to spree.edit_admin_mail_methods_url
+        redirect_to edit_admin_mail_methods_url
       end
 
       private

app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -27,7 +27,7 @@ module Spree
 
             @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
-            redirect_to spree.admin_order_customer_path(@order)
+            redirect_to admin_order_customer_path(@order)
           else
             render action: :edit
           end

app/controllers/spree/admin/orders_controller.rb

@@ -3,6 +3,7 @@ require 'open_food_network/spree_api_key_loader'
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
+      require 'spree/core/gateway_error'
       include OpenFoodNetwork::SpreeApiKeyLoader
       helper CheckoutHelper
 
@@ -28,7 +29,7 @@ module Spree
         @order = Order.create
         @order.created_by = spree_current_user
         @order.save
-        redirect_to spree.edit_admin_order_url(@order)
+        redirect_to edit_admin_order_url(@order)
       end
 
       def edit
@@ -47,16 +48,16 @@ module Spree
           if @order.line_items.empty?
             @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
           end
-          return redirect_to(spree.edit_admin_order_path(@order),
+          return redirect_to(edit_admin_order_path(@order),
                              flash: { error: @order.errors.full_messages.join(', ') })
         end
 
         @order.update!
         if @order.complete?
-          redirect_to spree.edit_admin_order_path(@order)
+          redirect_to edit_admin_order_path(@order)
         else
           # Jump to next step if order is not complete
-          redirect_to spree.admin_order_customer_path(@order)
+          redirect_to admin_order_customer_path(@order)
         end
       end
 
@@ -90,9 +91,7 @@ module Spree
         Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
         flash[:success] = t('admin.orders.invoice_email_sent')
 
-        respond_with(@order) { |format|
-          format.html { redirect_to spree.edit_admin_order_path(@order) }
-        }
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
       end
 
       def print
@@ -132,9 +131,7 @@ module Spree
 
         flash[:error] = t(:must_have_valid_business_number,
                           enterprise_name: @order.distributor.name)
-        respond_with(@order) { |format|
-          format.html { redirect_to spree.edit_admin_order_path(@order) }
-        }
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
       end
 
       def load_distribution_choices

app/controllers/spree/admin/payment_methods_controller.rb

@@ -15,14 +15,14 @@ module Spree
         @payment_method = params[:payment_method].
           delete(:type).
           constantize.
-          new(PermittedAttributes::PaymentMethod.new(params[:payment_method]).call)
+          new(payment_method_params)
         @object = @payment_method
 
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
           respond_with(@payment_method)
@@ -43,7 +43,7 @@ module Spree
         if @payment_method.update(params_for_update)
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
           respond_with(@payment_method)
@@ -92,6 +92,17 @@ module Spree
 
       private
 
+      def payment_method_params
+        params.require(:payment_method).permit(
+          :name, :description, :type, :active,
+          :environment, :display_on, :tag_list,
+          :preferred_enterprise_id, :preferred_server, :preferred_login, :preferred_password,
+          :calculator_type, :preferred_api_key,
+          :preferred_signature, :preferred_solution, :preferred_landing_page, :preferred_logourl,
+          :preferred_test_mode, distributor_ids: []
+        )
+      end
+
       def force_environment
         params[:payment_method][:environment] = Rails.env unless spree_current_user.admin?
       end
@@ -111,12 +122,12 @@ module Spree
         return if valid_payment_methods.include?(params[:payment_method][:type])
 
         flash[:error] = Spree.t(:invalid_payment_provider)
-        redirect_to spree.new_admin_payment_method_path
+        redirect_to new_admin_payment_method_path
       end
 
       def load_hubs
         # rubocop:disable Style/TernaryParentheses
-        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.to_a.sort_by! do |d|
+        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.sort_by! do |d|
           [(@payment_method.has_distributor? d) ? 0 : 1, d.name]
         end
         # rubocop:enable Style/TernaryParentheses
@@ -153,7 +164,7 @@ module Spree
       # Also, remove password if present and blank
       def params_for_update
         gateway_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        params_for_update = params[:payment_method].merge(gateway_params)
+        params_for_update = payment_method_params.merge(gateway_params)
 
         params_for_update.each do |key, _value|
           if key.include?("password") && params_for_update[key].blank?
@@ -161,7 +172,7 @@ module Spree
           end
         end
 
-        PermittedAttributes::PaymentMethod.new(params_for_update).call
+        params_for_update
       end
     end
   end

app/controllers/spree/admin/payments_controller.rb

@@ -12,7 +12,7 @@ module Spree
 
       def index
         @payments = @order.payments
-        redirect_to spree.new_admin_order_payment_url(@order) if @payments.empty?
+        redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
 
       def new
@@ -25,7 +25,7 @@ module Spree
 
         begin
           unless @payment.save
-            redirect_to spree.admin_order_payments_path(@order)
+            redirect_to admin_order_payments_path(@order)
             return
           end
 
@@ -35,16 +35,16 @@ module Spree
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
 
-            redirect_to spree.admin_order_payments_path(@order)
+            redirect_to admin_order_payments_path(@order)
           else
             OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
-            redirect_to spree.edit_admin_order_url(@order)
+            redirect_to edit_admin_order_url(@order)
           end
         rescue Spree::Core::GatewayError => e
           flash[:error] = e.message.to_s
-          redirect_to spree.new_admin_order_payment_path(@order)
+          redirect_to new_admin_order_payment_path(@order)
         end
       end
 
@@ -118,7 +118,7 @@ module Spree
         return if @order.payment? || @order.complete?
 
         flash[:notice] = Spree.t(:fill_in_customer_info)
-        redirect_to spree.edit_admin_order_customer_url(@order)
+        redirect_to edit_admin_order_customer_url(@order)
       end
 
       def load_order

app/controllers/spree/admin/product_properties_controller.rb

@@ -16,7 +16,7 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_removed)
         end
         # if destroy fails it won't show any errors to the user
-        redirect_to spree.admin_product_product_properties_url(params[:product_id], @url_filters)
+        redirect_to admin_product_product_properties_url(params[:product_id], @url_filters)
       end
 
       private

app/controllers/spree/admin/products_controller.rb

@@ -29,9 +29,9 @@ module Spree
           if @object.save
             flash[:success] = flash_message_for(@object, :successfully_created)
             if params[:button] == "add_another"
-              redirect_to spree.new_admin_product_path
+              redirect_to new_admin_product_path
             else
-              redirect_to spree.admin_products_path
+              redirect_to admin_products_path
             end
           else
             render :new
@@ -70,7 +70,7 @@ module Spree
 
             flash[:success] = flash_message_for(@object, :successfully_updated)
           end
-          redirect_to spree.edit_admin_product_url(@object, @url_filters)
+          redirect_to edit_admin_product_url(@object, @url_filters)
         end
       end
 
@@ -97,7 +97,7 @@ module Spree
                             Spree.t('notice_messages.product_not_cloned')
                           end
 
-        redirect_to spree.edit_admin_product_url(@new)
+        redirect_to edit_admin_product_url(@new)
       end
 
       def group_buy_options

app/controllers/spree/admin/reports_controller.rb

@@ -294,7 +294,7 @@ module Spree
         if report_in_order_management_engine?(report)
           main_app.public_send("new_order_management_reports_#{report}_url".to_sym)
         else
-          spree.public_send("#{report}_admin_reports_url".to_sym)
+          public_send("#{report}_admin_reports_url".to_sym)
         end
       rescue NoMethodError
         url_for([:new, :admin, :reports, report.to_s.singularize])

app/controllers/spree/admin/shipping_methods_controller.rb

@@ -50,7 +50,7 @@ module Spree
 
       def load_hubs
         # rubocop:disable Style/TernaryParentheses
-        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.to_a.sort_by! do |d|
+        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.sort_by! do |d|
           [(@shipping_method.has_distributor? d) ? 0 : 1, d.name]
         end
         # rubocop:enable Style/TernaryParentheses
@@ -74,7 +74,7 @@ module Spree
       end
 
       def location_after_save
-        spree.edit_admin_shipping_method_path(@shipping_method)
+        edit_admin_shipping_method_path(@shipping_method)
       end
 
       def load_data
@@ -86,7 +86,12 @@ module Spree
         params.require(:shipping_method).permit(
           :name, :description, :display_on, :require_ship_address, :tag_list, :calculator_type,
           distributor_ids: [],
-          calculator_attributes: PermittedAttributes::Calculator.attributes
+          calculator_attributes: [
+            :id, :preferred_currency, :preferred_amount, :preferred_unit_from_list,
+            :preferred_per_unit, :preferred_flat_percent, :preferred_first_item,
+            :preferred_additional_item, :preferred_max_items, :preferred_minimal_amount,
+            :preferred_normal_amount, :preferred_discount_amount
+          ]
         )
       end
     end

app/controllers/spree/admin/states_controller.rb

@@ -14,7 +14,7 @@ module Spree
       protected
 
       def location_after_save
-        spree.admin_country_states_url(@country)
+        admin_country_states_url(@country)
       end
 
       def collection

app/controllers/spree/admin/tax_settings_controller.rb

@@ -6,7 +6,7 @@ module Spree
 
         respond_to do |format|
           format.html {
-            redirect_to spree.edit_admin_tax_settings_path
+            redirect_to edit_admin_tax_settings_path
           }
         end
       end

app/controllers/spree/admin/taxonomies_controller.rb

@@ -11,9 +11,9 @@ module Spree
 
       def location_after_save
         if @taxonomy.created_at == @taxonomy.updated_at
-          spree.edit_admin_taxonomy_url(@taxonomy)
+          edit_admin_taxonomy_url(@taxonomy)
         else
-          spree.admin_taxonomies_url
+          admin_taxonomies_url
         end
       end
 

app/controllers/spree/admin/taxons_controller.rb

@@ -15,9 +15,9 @@ module Spree
           respond_with(@taxon) do |format|
             format.html do
               if redirect_to @taxonomy
-                spree.edit_admin_taxonomy_url(@taxonomy)
+                edit_admin_taxonomy_url(@taxonomy)
               else
-                spree.admin_taxonomies_url
+                admin_taxonomies_url
               end
             end
           end
@@ -95,7 +95,7 @@ module Spree
         end
 
         respond_with(@taxon) do |format|
-          format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
+          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
           format.json { render json: @taxon.to_json }
         end
       end

app/controllers/spree/admin/users_controller.rb

@@ -60,14 +60,14 @@ module Spree
         if @user.generate_spree_api_key!
           flash[:success] = t('spree.api.key_generated')
         end
-        redirect_to spree.edit_admin_user_path(@user)
+        redirect_to edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
           flash[:success] = t('spree.api.key_cleared')
         end
-        redirect_to spree.edit_admin_user_path(@user)
+        redirect_to edit_admin_user_path(@user)
       end
 
       protected

app/controllers/spree/admin/variants_controller.rb

@@ -21,9 +21,9 @@ module Spree
 
         if @object.update(permitted_resource_params)
           flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
+          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
         else
-          redirect_to spree.edit_admin_product_variant_url(params[:product_id], @object, @url_filters)
+          redirect_to edit_admin_product_variant_url(params[:product_id], @object, @url_filters)
         end
       end
 
@@ -40,9 +40,9 @@ module Spree
         @object.attributes = permitted_resource_params
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
-          redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
+          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
         else
-          redirect_to spree.new_admin_product_variant_url(params[:product_id], @url_filters)
+          redirect_to new_admin_product_variant_url(params[:product_id], @url_filters)
         end
 
         return unless @object.present? && @object.valid?
@@ -61,21 +61,17 @@ module Spree
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
 
         @variant = Spree::Variant.find(params[:id])
-        flash[:success] = delete_variant
+        flash[:success] = if VariantDeleter.new.delete(@variant)
+                            Spree.t('notice_messages.variant_deleted')
+                          else
+                            Spree.t('notice_messages.variant_not_deleted')
+                          end
 
-        redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
+        redirect_to admin_product_variants_url(params[:product_id], @url_filters)
       end
 
       protected
 
-      def delete_variant
-        if VariantDeleter.new.delete(@variant)
-          Spree.t('notice_messages.variant_deleted')
-        else
-          Spree.t('notice_messages.variant_not_deleted')
-        end
-      end
-
       def create_before
         option_values = params[:new_variant]
         option_values.andand.each_value { |id| @object.option_values << OptionValue.find(id) }

app/controllers/spree/base_controller.rb

@@ -3,8 +3,8 @@
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/respond_with'
-require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/ssl'
 
 module Spree
   class BaseController < ApplicationController

app/controllers/spree/credit_cards_controller.rb

@@ -48,10 +48,10 @@ module Spree
       else
         flash[:error] = I18n.t(:card_could_not_be_removed)
       end
-      redirect_to spree.account_path(anchor: 'cards')
+      redirect_to account_path(anchor: 'cards')
     rescue Stripe::CardError
       flash[:error] = I18n.t(:card_could_not_be_removed)
-      redirect_to spree.account_path(anchor: 'cards')
+      redirect_to account_path(anchor: 'cards')
     end
 
     private

app/controllers/spree/orders_controller.rb

@@ -78,7 +78,11 @@ module Spree
         discard_empty_line_items
         with_open_adjustments { update_totals_and_taxes }
 
-        @order.update_distribution_charge!
+        if @order == current_order
+          fire_event('spree.order.contents_changed')
+        else
+          @order.update_distribution_charge!
+        end
 
         respond_with(@order) do |format|
           format.html do
@@ -86,7 +90,7 @@ module Spree
               @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
-              redirect_to spree.order_path(@order)
+              redirect_to order_path(@order)
             else
               redirect_to main_app.cart_path
             end
@@ -153,7 +157,7 @@ module Spree
       else
         flash[:error] = I18n.t(:orders_could_not_cancel)
       end
-      redirect_to request.referer || spree.order_path(@order)
+      redirect_to request.referer || order_path(@order)
     end
 
     private
@@ -217,7 +221,7 @@ module Spree
 
       if items.empty?
         flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-        redirect_to spree.order_path(order_to_update)
+        redirect_to order_path(order_to_update)
       end
     end
 

app/controllers/spree/paypal_controller_decorator.rb

@@ -6,51 +6,6 @@ Spree::PaypalController.class_eval do
   after_action :reset_order_when_complete, only: :confirm
   before_action :permit_parameters!
 
-  def express
-    order = current_order || raise(ActiveRecord::RecordNotFound)
-    items = order.line_items.map(&method(:line_item))
-
-    tax_adjustments = order.adjustments.tax
-    # TODO: Remove in Spree 2.2
-    tax_adjustments = tax_adjustments.additional if tax_adjustments.respond_to?(:additional)
-    shipping_adjustments = order.adjustments.shipping
-
-    order.adjustments.eligible.each do |adjustment|
-      next if (tax_adjustments + shipping_adjustments).include?(adjustment)
-
-      items << {
-        Name: adjustment.label,
-        Quantity: 1,
-        Amount: {
-          currencyID: order.currency,
-          value: adjustment.amount
-        }
-      }
-    end
-
-    # Because PayPal doesn't accept $0 items at all.
-    # See #10
-    # https://cms.paypal.com/uk/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECCustomizing
-    # "It can be a positive or negative value but not zero."
-    items.reject! do |item|
-      item[:Amount][:value].zero?
-    end
-    pp_request = provider.build_set_express_checkout(express_checkout_request_details(order, items))
-
-    begin
-      pp_response = provider.set_express_checkout(pp_request)
-      if pp_response.success?
-        redirect_to provider.express_checkout_url(pp_response, useraction: 'commit')
-      else
-        flash[:error] = Spree.t('flash.generic_error', scope: 'paypal', reasons: pp_response.errors.map(&:long_message).join(" "))
-        redirect_to spree.checkout_state_path(:payment)
-      end
-    rescue SocketError
-      flash[:error] = Spree.t('flash.connection_failed', scope: 'paypal')
-      redirect_to spree.checkout_state_path(:payment)
-    end
-  end
-
   def cancel
     flash[:notice] = Spree.t('flash.cancel', scope: 'paypal')
     redirect_to main_app.checkout_path
@@ -94,24 +49,4 @@ Spree::PaypalController.class_eval do
     orphaned_payments = current_order.payments.where(payment_method_id: payment_method.id, source_id: nil)
     orphaned_payments.each(&:destroy)
   end
-
-  def completion_route(order)
-    spree.order_path(order, token: order.token)
-  end
-
-  def express_checkout_request_details(order, items)
-    {
-      SetExpressCheckoutRequestDetails: {
-        InvoiceID: order.number,
-        BuyerEmail: order.email,
-        ReturnURL: spree.confirm_paypal_url(payment_method_id: params[:payment_method_id], utm_nooverride: 1),
-        CancelURL: spree.cancel_paypal_url,
-        SolutionType: payment_method.preferred_solution.presence || "Mark",
-        LandingPage: payment_method.preferred_landing_page.presence || "Billing",
-        cppheaderimage: payment_method.preferred_logourl.presence || "",
-        NoShipping: 1,
-        PaymentDetails: [payment_details(items)]
-      }
-    }
-  end
 end

app/controllers/spree/user_passwords_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserPasswordsController < Devise::PasswordsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common

app/controllers/spree/user_registrations_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common

app/controllers/spree/user_sessions_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserSessionsController < Devise::SessionsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common

app/helpers/admin/image_settings_helper.rb

@@ -0,0 +1,21 @@
+module Admin
+  module ImageSettingsHelper
+    def admin_image_settings_format_options
+      [['Unchanged', ''], ['PNG', 'png'], ['JPEG', 'jpg']]
+    end
+
+    def admin_image_settings_geometry_from_style(style)
+      geometry, _format = admin_image_settings_split_style style
+      geometry
+    end
+
+    def admin_image_settings_format_from_style(style)
+      _geometry, format = admin_image_settings_split_style style
+      format
+    end
+
+    def admin_image_settings_split_style(style)
+      [style, nil].flatten[0..1]
+    end
+  end
+end

app/helpers/admin/injection_helper.rb

@@ -184,12 +184,6 @@ module Admin
                        json: "'#{@spree_api_key}'" }
     end
 
-    def admin_inject_available_units
-      admin_inject_json "admin.products",
-                        "availableUnits",
-                        Spree::Config.available_units
-    end
-
     def admin_inject_json(ng_module, name, data)
       json = data.to_json
       render partial: "admin/json/injection_ams",

app/helpers/checkout_helper.rb

@@ -7,8 +7,6 @@ module CheckoutHelper
     adjustments = order.adjustments.eligible
     exclude = opts[:exclude] || {}
 
-    adjustments = adjustments.to_a
-
     # Remove empty tax adjustments and (optionally) shipping fees
     adjustments.reject! { |a| a.originator_type == 'Spree::TaxRate' && a.amount == 0 }
     adjustments.reject! { |a| a.originator_type == 'Spree::ShippingMethod' } if exclude.include? :shipping

app/helpers/injection_helper.rb

@@ -4,7 +4,7 @@ module InjectionHelper
   include SerializerHelper
 
   def inject_enterprises(enterprises = nil)
-    inject_json_array(
+    inject_json_ams(
       "enterprises",
       enterprises || default_enterprise_query,
       Api::EnterpriseSerializer,
@@ -15,7 +15,7 @@ module InjectionHelper
   def inject_groups
     select_only = required_attributes EnterpriseGroup, Api::GroupListSerializer
 
-    inject_json_array(
+    inject_json_ams(
       "groups",
       EnterpriseGroup.on_front_page.by_position.select(select_only).
         includes(enterprises: [:shipping_methods, { address: [:state, :country] }],
@@ -26,7 +26,7 @@ module InjectionHelper
   end
 
   def inject_enterprise_shopfront(enterprise)
-    inject_json(
+    inject_json_ams(
       "shopfront",
       enterprise,
       Api::EnterpriseShopfrontSerializer
@@ -36,7 +36,7 @@ module InjectionHelper
   def inject_enterprise_shopfront_list
     select_only = required_attributes Enterprise, Api::EnterpriseShopfrontListSerializer
 
-    inject_json_array(
+    inject_json_ams(
       "enterprises",
       Enterprise.activated.visible.select(select_only).includes(address: [:state, :country]).all,
       Api::EnterpriseShopfrontListSerializer
@@ -50,13 +50,13 @@ module InjectionHelper
       includes(:properties, address: [:state, :country], supplied_products: :properties).
       all
 
-    inject_json_array "enterprises",
-                      enterprises_and_relatives,
-                      Api::EnterpriseSerializer, enterprise_injection_data
+    inject_json_ams "enterprises",
+                    enterprises_and_relatives,
+                    Api::EnterpriseSerializer, enterprise_injection_data
   end
 
   def inject_group_enterprises
-    inject_json_array(
+    inject_json_ams(
       "enterprises",
       @group.enterprises.activated.all,
       Api::EnterpriseSerializer,
@@ -65,18 +65,11 @@ module InjectionHelper
   end
 
   def inject_current_hub
-    inject_json "currentHub",
-                current_distributor,
-                Api::EnterpriseSerializer,
-                enterprise_injection_data
+    inject_json_ams "currentHub", current_distributor, Api::EnterpriseSerializer, enterprise_injection_data
   end
 
   def inject_current_order
-    inject_json "currentOrder",
-                current_order,
-                Api::CurrentOrderSerializer,
-                current_distributor: current_distributor,
-                current_order_cycle: current_order_cycle
+    inject_json_ams "currentOrder", current_order, Api::CurrentOrderSerializer, current_distributor: current_distributor, current_order_cycle: current_order_cycle
   end
 
   def inject_current_order_cycle
@@ -86,78 +79,73 @@ module InjectionHelper
   end
 
   def inject_available_shipping_methods
-    inject_json_array "shippingMethods", available_shipping_methods,
-                      Api::ShippingMethodSerializer, current_order: current_order
+    inject_json_ams "shippingMethods", available_shipping_methods,
+                    Api::ShippingMethodSerializer, current_order: current_order
   end
 
   def inject_available_payment_methods
-    inject_json_array "paymentMethods", available_payment_methods,
-                      Api::PaymentMethodSerializer, current_order: current_order
+    inject_json_ams "paymentMethods", available_payment_methods,
+                    Api::PaymentMethodSerializer, current_order: current_order
   end
 
   def inject_taxons
-    inject_json_array "taxons", Spree::Taxon.all.to_a, Api::TaxonSerializer
+    inject_json_ams "taxons", Spree::Taxon.all.to_a, Api::TaxonSerializer
   end
 
   def inject_properties
-    inject_json_array "properties", Spree::Property.all.to_a, Api::PropertySerializer
+    inject_json_ams "properties", Spree::Property.all.to_a, Api::PropertySerializer
   end
 
   def inject_currency_config
-    inject_json "currencyConfig", {}, Api::CurrencyConfigSerializer
+    inject_json_ams "currencyConfig", {}, Api::CurrencyConfigSerializer
   end
 
   def inject_open_street_map_config
-    inject_json "openStreetMapConfig", {}, Api::OpenStreetMapConfigSerializer
+    inject_json_ams "openStreetMapConfig", {}, Api::OpenStreetMapConfigSerializer
   end
 
   def inject_spree_api_key
-    render partial: "json/injection_ams",
-           locals: { name: 'spreeApiKey', json: "'#{@spree_api_key}'" }
+    render partial: "json/injection_ams", locals: { name: 'spreeApiKey', json: "'#{@spree_api_key}'" }
   end
 
   def inject_available_countries
-    inject_json_array "availableCountries", available_countries, Api::CountrySerializer
+    inject_json_ams "availableCountries", available_countries, Api::CountrySerializer
   end
 
   def inject_enterprise_attributes
-    render partial: "json/injection_ams",
-           locals: { name: 'enterpriseAttributes', json: @enterprise_attributes.to_json.to_s }
+    render partial: "json/injection_ams", locals: { name: 'enterpriseAttributes', json: @enterprise_attributes.to_json.to_s }
   end
 
   def inject_orders
-    inject_json_array "orders", @orders.all, Api::OrderSerializer
+    inject_json_ams "orders", @orders.all, Api::OrderSerializer
   end
 
   def inject_shops
     customers = spree_current_user.customers
-    shops = Enterprise.where(id: @orders.pluck(:distributor_id).uniq |
-                                 customers.pluck(:enterprise_id))
-    inject_json_array "shops", shops.all, Api::ShopForOrdersSerializer
+    shops = Enterprise.where(id: @orders.pluck(:distributor_id).uniq | customers.pluck(:enterprise_id))
+    inject_json_ams "shops", shops.all, Api::ShopForOrdersSerializer
   end
 
   def inject_saved_credit_cards
     data = spree_current_user ? spree_current_user.credit_cards.with_payment_profile.all : []
 
-    inject_json_array "savedCreditCards", data, Api::CreditCardSerializer
+    inject_json_ams "savedCreditCards", data, Api::CreditCardSerializer
   end
 
   def inject_current_user
-    inject_json "user", spree_current_user, Api::UserSerializer
+    inject_json_ams "user", spree_current_user, Api::UserSerializer
   end
 
   def inject_rails_flash
-    inject_json "railsFlash", OpenStruct.new(flash.to_hash), Api::RailsFlashSerializer
+    inject_json_ams "railsFlash", OpenStruct.new(flash.to_hash), Api::RailsFlashSerializer
   end
 
-  def inject_json_array(name, data, serializer, opts = {})
-    opts = { each_serializer: serializer }.merge(opts)
-    serializer = ActiveModel::ArraySerializer
+  def inject_json_ams(name, data, serializer, opts = {})
+    if data.is_a?(Array)
+      opts = { each_serializer: serializer }.merge(opts)
+      serializer = ActiveModel::ArraySerializer
+    end
 
-    inject_json(name, data, serializer, opts)
-  end
-
-  def inject_json(name, data, serializer, opts = {})
     serializer_instance = serializer.new(data, opts)
     json = serializer_instance.to_json
     render partial: "json/injection_ams", locals: { name: name, json: json }

app/helpers/spree/admin/general_settings_helper.rb

@@ -8,10 +8,6 @@ module Spree
         end
         options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency])
       end
-
-      def all_units
-        ["g", "oz", "lb", "kg", "T", "mL", "L", "kL"]
-      end
     end
   end
 end

app/helpers/spree/admin/navigation_helper.rb

@@ -86,9 +86,9 @@ module Spree
 
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
-        name = options[:name] || I18n.t(:delete)
+        name = options[:name] || Spree.t(:delete)
         options[:class] = "delete-resource"
-        options[:data] = { confirm: I18n.t(:are_you_sure), action: 'remove' }
+        options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
         link_to_with_icon 'icon-trash', name, url, options
       end
 

app/helpers/spree/admin/orders_helper.rb

@@ -113,12 +113,11 @@ module Spree
       end
 
       def event_link(event)
-        event_label = I18n.t(event, scope: "actions")
-        confirm_message = I18n.t("admin.orders.edit.order_sure_want_to", event: event_label)
-        button_link_to(event_label,
+        button_link_to(Spree.t(event),
                        fire_admin_order_url(@order, e: event),
-                       method: :put, icon: "icon-#{event}",
-                       data: { confirm: confirm_message })
+                       method: :put,
+                       icon: "icon-#{event}",
+                       data: { confirm: Spree.t(:order_sure_want_to, event: Spree.t(event)) })
       end
     end
   end