Update all locales with the latest Transifex translations

Transifex

.codeclimate.yml

@@ -20,6 +20,9 @@ plugins:
         enabled: false
       DeclarationOrder:
         enabled: false
+      NestingDepth:
+        enabled: false
+
   duplication:
     enabled: true
     exclude_patterns:

.github/ISSUE_TEMPLATE/release.md

@@ -9,10 +9,11 @@ assignees: ''
 
 Steps: 
 
-- [ ] Include translations
+- [ ] Include translations: `tx pull --force`
 - [ ] [Draft new release]
 - [ ] Notify #instance-managers of user-facing changes.
 - [ ] Test: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master <!-- replace the URL -->
+- [ ] Update translations if necessary
 - [ ] Publish and notify #global-community
 - [ ] Deploy and notify #instance-managers
 - [ ] Nudge next release manager

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,10 +23,6 @@ The categories are based on https://keepachangelog.com/en/1.0.0/. -->
 
 Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
 
-#### How is this related to the Spree upgrade?
-<!-- Any known conflicts with the Spree Upgrade?
-Explain them or remove this section. -->
-
 
 
 #### Discourse thread
@@ -42,6 +38,5 @@ Add the link or remove this section. -->
 
 
 #### Documentation updates
-<!-- Are their any wiki pages that need updating after merging this PR?
+<!-- Are there any wiki pages that need updating after merging this PR?
 List them here or remove this section. -->
-

.gitignore

@@ -1,5 +1,6 @@
 .bundle
 .rbenv-version
+.python-version
 .byebug_history
 .swp
 *.swo

.rubocop_manual_todo.yml

@@ -321,6 +321,22 @@ Layout/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - spec/controllers/base_controller2_spec.rb
+  - spec/features/consumer/caching/darkswarm_caching_spec.rb
+  - spec/models/calculator/flexi_rate_spec.rb
+  - spec/models/calculator/price_sack_spec.rb
+  - spec/models/spree/stock_item_spec.rb
+  - spec/requests/api/orders_spec.rb
+  - spec/swagger_helper.rb
+  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
+  - app/models/spree/image.rb
+  - app/models/spree/payment_method.rb
+  - spec/factories/line_item_factory.rb
+  - spec/factories/shipment_factory.rb
+  - spec/factories/stock_location_factory.rb
+  - spec/factories/user_factory.rb
+  - spec/lib/spree/core/calculated_adjustments_spec.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -399,6 +415,7 @@ Metrics/AbcSize:
   - app/services/create_order_cycle.rb
   - app/services/order_cycle_form.rb
   - app/services/order_syncer.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
   - engines/order_management/app/services/order_management/stock/packer.rb
@@ -444,6 +461,18 @@ Metrics/AbcSize:
   - spec/models/product_importer_spec.rb
   - spec/services/order_checkout_restart_spec.rb
   - spec/support/performance_helper.rb
+  - app/controllers/application_controller.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/money.rb
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -482,6 +511,13 @@ Metrics/BlockLength:
   - spec/support/delayed_job_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - spec/requests/api/orders_spec.rb
+  - spec/swagger_helper.rb
+  - spec/factories/address_factory.rb
+  - spec/factories/payment_method_factory.rb
+  - spec/factories/shipment_factory.rb
 
 Metrics/CyclomaticComplexity:
   Max: 6
@@ -513,6 +549,12 @@ Metrics/CyclomaticComplexity:
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
 
 Metrics/PerceivedComplexity:
   Max: 7
@@ -539,6 +581,10 @@ Metrics/PerceivedComplexity:
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
 
 Metrics/MethodLength:
   Max: 10
@@ -601,6 +647,7 @@ Metrics/MethodLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/services/order_cycle_form.rb
   - app/services/permitted_attributes/checkout.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
@@ -644,7 +691,21 @@ Metrics/MethodLength:
   - spec/features/consumer/shopping/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
-  - spec/support/request/authentication_workflow.rb
+  - spec/support/request/authentication_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/responder.rb
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/ClassLength:
   Max: 100
@@ -674,6 +735,7 @@ Metrics/ClassLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/serializers/api/enterprise_shopfront_serializer.rb
   - app/services/cart_service.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/open_food_network/bulk_coop_report.rb
@@ -686,6 +748,10 @@ Metrics/ClassLength:
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/zone.rb
 
 Metrics/ModuleLength:
   Max: 100
@@ -694,6 +760,7 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.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
@@ -728,6 +795,10 @@ Metrics/ModuleLength:
   - spec/models/spree/variant_spec.rb
   - spec/services/permissions/order_spec.rb
   - spec/support/request/web_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - spec/lib/open_food_network/packing_report_spec.rb
+  - spec/models/spree/credit_card_spec.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -736,3 +807,8 @@ 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/**/*'
+    - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_todo.yml

@@ -1,79 +1,183 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-06-22 13:28:10 +0100 using RuboCop version 0.81.0.
+# on 2020-09-10 16:12:05 +1000 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: 139
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 268
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - '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: 2
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - '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: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/factories.rb'
+    - 'spec/factories/address_factory.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:
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 9
+# Offense count: 8
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/spree/user.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 5
+# 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:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 6
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 37
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 27
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 101
-
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 6
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 20
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 121
-
-# Offense count: 8
+# Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/spree/admin/taxonomies_controller.rb'
     - 'app/models/spree/adjustment_decorator.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'
 
@@ -92,7 +196,7 @@ Naming/MemoizedInstanceVariableName:
     - 'app/mailers/producer_mailer.rb'
     - 'lib/open_food_network/address_finder.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -106,9 +210,10 @@ Naming/PredicateName:
     - 'app/models/order_cycle.rb'
     - 'app/models/spree/ability_decorator.rb'
     - 'app/models/spree/adjustment_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
+    - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'lib/open_food_network/customers_report.rb'
@@ -117,12 +222,36 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 1
+# Offense count: 2
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: snake_case, normalcase, non_integer
+Naming/VariableNumber:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Rails/ActiveRecordAliases:
+  Exclude:
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/features/consumer/shopping/orders_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+
+# Offense count: 3
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
     - 'app/models/order_cycle.rb'
+    - 'app/models/spree/credit_card.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforceForPrefixed.
+Rails/Delegate:
+  Exclude:
+    - 'engines/order_management/app/services/order_management/reports/bulk_coop/renderers/html_renderer.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -130,7 +259,7 @@ Rails/Date:
 # Whitelist: find_by_sql
 Rails/DynamicFindBy:
   Exclude:
-    - 'app/controllers/spree/admin/orders/customer_details_controller.rb'
+    - 'spec/factories/state_factory.rb'
 
 # Offense count: 16
 # Configuration parameters: EnforcedStyle.
@@ -150,7 +279,7 @@ Rails/FilePath:
     - 'spec/serializers/api/admin/enterprise_serializer_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
-# Offense count: 7
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -160,17 +289,19 @@ Rails/FindBy:
     - 'app/models/product_import/entry_processor.rb'
     - 'app/models/product_import/entry_validator.rb'
     - 'app/models/product_import/spreadsheet_data.rb'
+    - 'app/models/spree/shipment.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: 5
+# Offense count: 6
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -179,8 +310,9 @@ Rails/HasAndBelongsToMany:
     - 'app/models/enterprise_group.rb'
     - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/line_item_decorator.rb'
+    - 'app/models/spree/zone.rb'
 
-# Offense count: 25
+# Offense count: 27
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -189,9 +321,11 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/enterprise.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/spree/adjustment_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
+    - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/property.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
@@ -238,7 +372,7 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/users_controller.rb'
     - 'app/controllers/user_passwords_controller.rb'
 
-# Offense count: 12
+# Offense count: 13
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/spree/admin/reports_controller.rb'
@@ -249,6 +383,7 @@ Rails/OutputSafety:
     - 'app/helpers/spree/admin/zones_helper.rb'
     - 'app/helpers/spree/reports_helper.rb'
     - 'app/serializers/api/product_serializer.rb'
+    - 'lib/spree/money.rb'
     - 'lib/spree/money_decorator.rb'
     - 'spec/features/admin/order_print_ticket_spec.rb'
 
@@ -268,7 +403,7 @@ Rails/ReflectionClassName:
     - 'app/models/enterprise_role.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 227
+# Offense count: 241
 # 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:
@@ -285,16 +420,19 @@ Rails/SkipsModelValidations:
     - 'app/models/product_import/inventory_reset_strategy.rb'
     - 'app/models/proxy_order.rb'
     - 'app/models/spree/address_decorator.rb'
-    - 'app/models/spree/credit_card_decorator.rb'
+    - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_decorator.rb'
+    - 'app/models/spree/payment.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
+    - 'app/models/spree/zone.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
     - 'app/services/order_factory.rb'
     - 'engines/order_management/spec/performance/order_management/subscriptions/proxy_order_syncer_spec.rb'
     - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb'
     - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
+    - 'lib/spree/core/calculated_adjustments.rb'
     - 'lib/tasks/data/anonymize_data.rake'
     - 'lib/tasks/sample_data/product_factory.rb'
     - 'lib/tasks/users.rake'
@@ -339,6 +477,7 @@ Rails/SkipsModelValidations:
     - 'spec/models/enterprise_relationship_spec.rb'
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
+    - 'spec/models/spree/asset_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
@@ -355,27 +494,31 @@ Rails/SkipsModelValidations:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
 
-# Offense count: 2
+# Offense count: 4
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
+    - 'app/models/spree/stock_item.rb'
+    - 'app/models/spree/zone.rb'
 
 # Offense count: 2
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
-    - 'app/models/spree/stock_item.rb'
-
-# Offense count: 1
 # Configuration parameters: Environments.
 # Environments: development, test, production
 Rails/UnknownEnv:
   Exclude:
     - 'app/models/spree/app_configuration_decorator.rb'
+    - 'lib/spree/core/controller_helpers/ssl.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Exclude:
+    - 'spec/support/request/web_helper.rb'
 
 # Offense count: 2
 Style/CaseEquality:
@@ -383,17 +526,15 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 75
+# Offense count: 64
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'app/models/calculator/flat_percent_per_item.rb'
-    - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/gateway/migs.rb'
     - 'app/models/spree/gateway/pin.rb'
-    - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/product_set.rb'
     - 'app/models/tag_rule/discount_order.rb'
     - 'app/models/tag_rule/filter_order_cycles.rb'
@@ -447,25 +588,17 @@ Style/ClassAndModuleChildren:
     - 'app/serializers/api/property_serializer.rb'
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
-    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'lib/open_food_network/locking.rb'
-    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
-    - 'lib/open_food_network/reports/report.rb'
-    - 'lib/open_food_network/reports/row.rb'
-    - 'lib/open_food_network/reports/rule.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
-    - 'spec/lib/open_food_network/reports/row_spec.rb'
-    - 'spec/lib/open_food_network/reports/rule_spec.rb'
+    - 'spec/models/spree/payment_method_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 Style/ClassVars:
   Exclude:
     - 'lib/open_food_network/rack_request_blocker.rb'
+    - 'lib/spree/core/delegate_belongs_to.rb'
 
 # Offense count: 4
 # Configuration parameters: EnforcedStyle.
@@ -475,7 +608,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 874
+# Offense count: 829
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -569,12 +702,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/credit_cards_controller.rb'
-    - 'app/controllers/spree/home_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
-    - 'app/controllers/spree/store_controller.rb'
-    - 'app/controllers/spree/user_passwords_controller.rb'
-    - 'app/controllers/spree/user_registrations_controller.rb'
-    - 'app/controllers/spree/user_sessions_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
     - 'app/controllers/stripe/callbacks_controller.rb'
     - 'app/controllers/stripe/webhooks_controller.rb'
@@ -624,8 +752,6 @@ Style/FrozenStringLiteralComment:
     - 'app/jobs/subscription_placement_job.rb'
     - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/spree/base_mailer_decorator.rb'
-    - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer.rb'
     - 'app/mailers/subscription_mailer.rb'
     - 'app/models/adjustment_metadata.rb'
@@ -644,11 +770,9 @@ Style/FrozenStringLiteralComment:
     - 'app/models/coordinator_fee.rb'
     - 'app/models/customer.rb'
     - 'app/models/distributor_shipping_method.rb'
-    - 'app/models/enterprise.rb'
     - 'app/models/enterprise_fee.rb'
     - 'app/models/enterprise_fee_set.rb'
     - 'app/models/enterprise_group.rb'
-    - 'app/models/enterprise_relationship.rb'
     - 'app/models/enterprise_relationship_permission.rb'
     - 'app/models/enterprise_role.rb'
     - 'app/models/enterprise_set.rb'
@@ -659,7 +783,6 @@ Style/FrozenStringLiteralComment:
     - 'app/models/model_set.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/order_cycle_set.rb'
-    - 'app/models/order_updater.rb'
     - 'app/models/preference_sections/footer_and_external_links_section.rb'
     - 'app/models/preference_sections/group_signup_page_section.rb'
     - 'app/models/preference_sections/header_section.rb'
@@ -684,26 +807,15 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/address_decorator.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/app_configuration_decorator.rb'
-    - 'app/models/spree/calculator/default_tax_decorator.rb'
-    - 'app/models/spree/calculator/flat_percent_item_total_decorator.rb'
-    - 'app/models/spree/calculator/flat_rate_decorator.rb'
-    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
-    - 'app/models/spree/calculator/per_item_decorator.rb'
-    - 'app/models/spree/calculator/price_sack_decorator.rb'
     - 'app/models/spree/calculator_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/concerns/payment_method_distributors.rb'
-    - 'app/models/spree/credit_card_decorator.rb'
     - 'app/models/spree/gateway/migs.rb'
     - 'app/models/spree/gateway/pin.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
-    - 'app/models/spree/gateway_decorator.rb'
-    - 'app/models/spree/image_decorator.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/option_type_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment_decorator.rb'
-    - 'app/models/spree/payment_method_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
@@ -711,15 +823,11 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/product_property_decorator.rb'
     - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
-    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
-    - 'app/models/spree/stock/availability_validator_decorator.rb'
-    - 'app/models/spree/stock_location_decorator.rb'
     - 'app/models/spree/tax_rate_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
-    - 'app/models/stock/package.rb'
     - 'app/models/stripe_account.rb'
     - 'app/models/subscription.rb'
     - 'app/models/subscription_line_item.rb'
@@ -803,7 +911,6 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/shop_for_orders_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
-    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_jstree_attribute_serializer.rb'
     - 'app/serializers/api/taxon_jstree_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
@@ -811,7 +918,6 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/user_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'app/services/action_callbacks.rb'
-    - 'app/services/advance_order_service.rb'
     - 'app/services/bulk_invoice_service.rb'
     - 'app/services/cart_service.rb'
     - 'app/services/create_order_cycle.rb'
@@ -831,6 +937,7 @@ Style/FrozenStringLiteralComment:
     - 'app/services/order_factory.rb'
     - 'app/services/order_syncer.rb'
     - 'app/services/order_update_issues.rb'
+    - 'app/services/order_workflow.rb'
     - 'app/services/permissions/order.rb'
     - 'app/services/product_tag_rules_filterer.rb'
     - 'app/services/products_renderer.rb'
@@ -893,7 +1000,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/address_finder.rb'
     - 'lib/open_food_network/available_payment_method_filter.rb'
-    - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/column_preference_defaults.rb'
     - 'lib/open_food_network/customers_report.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
@@ -906,7 +1012,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/i18n_config.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
     - 'lib/open_food_network/locking.rb'
-    - 'lib/open_food_network/model_class_from_controller_name.rb'
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/order_cycle_management_report.rb'
@@ -928,14 +1033,8 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/referer_parser.rb'
-    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_report.rb'
-    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/open_food_network/reports/line_items.rb'
     - 'lib/open_food_network/reports/list.rb'
-    - 'lib/open_food_network/reports/report.rb'
-    - 'lib/open_food_network/reports/row.rb'
-    - 'lib/open_food_network/reports/rule.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/scope_product_to_hub.rb'
     - 'lib/open_food_network/scope_variant_to_hub.rb'
@@ -949,9 +1048,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/spree/api/controller_setup.rb'
     - 'lib/spree/api/testing_support/setup.rb'
     - 'lib/spree/authentication_helpers.rb'
-    - 'lib/spree/core/controller_helpers/auth_decorator.rb'
-    - 'lib/spree/core/controller_helpers/order_decorator.rb'
-    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
     - 'lib/spree/product_filters.rb'
@@ -980,7 +1076,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/tasks/sample_data/user_factory.rb'
     - 'lib/tasks/specs.rake'
     - 'lib/tasks/users.rake'
-    - 'spec/config/application_spec.rb'
     - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
     - 'spec/controllers/admin/column_preferences_controller_spec.rb'
     - 'spec/controllers/admin/customers_controller_spec.rb'
@@ -1013,7 +1108,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/api/variants_controller_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
     - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/checkout_controller_concurrency_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/groups_controller_spec.rb'
@@ -1030,7 +1124,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/overview_controller_spec.rb'
     - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
-    - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/admin/products_controller_spec.rb'
     - 'spec/controllers/spree/admin/reports_controller_spec.rb'
     - 'spec/controllers/spree/admin/search_controller_spec.rb'
@@ -1039,7 +1132,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/variants_controller_spec.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/controllers/spree/store_controller_spec.rb'
     - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/controllers/spree/users_controller_spec.rb'
     - 'spec/controllers/stripe/callbacks_controller_spec.rb'
@@ -1057,6 +1149,8 @@ Style/FrozenStringLiteralComment:
     - 'spec/factories/product_factory.rb'
     - 'spec/factories/shipment_factory.rb'
     - 'spec/factories/shipping_method_factory.rb'
+    - 'spec/factories/state_factory.rb'
+    - 'spec/factories/stock_movement_factory.rb'
     - 'spec/factories/subscription_factory.rb'
     - 'spec/factories/tag_rule_factory.rb'
     - 'spec/factories/user_factory.rb'
@@ -1147,7 +1241,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/jobs/subscription_placement_job_spec.rb'
     - 'spec/jobs/welcome_enterprise_job_spec.rb'
     - 'spec/lib/open_food_network/address_finder_spec.rb'
-    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
     - 'spec/lib/open_food_network/customers_report_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
@@ -1173,9 +1266,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/property_merge_spec.rb'
     - 'spec/lib/open_food_network/referer_parser_spec.rb'
-    - 'spec/lib/open_food_network/reports/report_spec.rb'
-    - 'spec/lib/open_food_network/reports/row_spec.rb'
-    - 'spec/lib/open_food_network/reports/rule_spec.rb'
     - 'spec/lib/open_food_network/sales_tax_report_spec.rb'
     - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
@@ -1190,12 +1280,16 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/tasks/enterprises_rake_spec.rb'
     - 'spec/lib/tasks/users_rake_spec.rb'
     - 'spec/mailers/enterprise_mailer_spec.rb'
-    - 'spec/mailers/order_mailer_spec.rb'
     - 'spec/mailers/producer_mailer_spec.rb'
     - 'spec/mailers/subscription_mailer_spec.rb'
     - 'spec/mailers/user_mailer_spec.rb'
     - 'spec/models/adjustment_metadata_spec.rb'
+    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
     - 'spec/models/calculator/flat_percent_per_item_spec.rb'
+    - 'spec/models/calculator/flat_rate_spec.rb'
+    - 'spec/models/calculator/flexi_rate_spec.rb'
+    - 'spec/models/calculator/per_item_spec.rb'
+    - 'spec/models/calculator/price_sack_spec.rb'
     - 'spec/models/calculator/weight_spec.rb'
     - 'spec/models/column_preference_spec.rb'
     - 'spec/models/concerns/order_shipment_spec.rb'
@@ -1211,7 +1305,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/model_set_spec.rb'
     - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/order_updater_spec.rb'
     - 'spec/models/product_import/entry_processor_spec.rb'
     - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
     - 'spec/models/product_import/reset_absent_spec.rb'
@@ -1221,11 +1314,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/addresses_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
-    - 'spec/models/spree/calculator/flat_percent_item_total_spec.rb'
-    - 'spec/models/spree/calculator/flat_rate_spec.rb'
-    - 'spec/models/spree/calculator/flexi_rate_spec.rb'
-    - 'spec/models/spree/calculator/per_item_spec.rb'
-    - 'spec/models/spree/calculator/price_sack_spec.rb'
     - 'spec/models/spree/calculator_spec.rb'
     - 'spec/models/spree/classification_spec.rb'
     - 'spec/models/spree/credit_card_spec.rb'
@@ -1240,14 +1328,12 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/price_spec.rb'
     - 'spec/models/spree/product_set_spec.rb'
     - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/shipment_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/stock/availability_validator_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/models/spree/user_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
-    - 'spec/models/stock/package_spec.rb'
     - 'spec/models/stripe_account_spec.rb'
     - 'spec/models/subscription_line_item_spec.rb'
     - 'spec/models/subscription_spec.rb'
@@ -1289,7 +1375,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/serializers/api/product_serializer_spec.rb'
     - 'spec/serializers/api/shipping_method_serializer_spec.rb'
     - 'spec/serializers/api/variant_serializer_spec.rb'
-    - 'spec/services/advance_order_service_spec.rb'
     - 'spec/services/bulk_invoice_service_spec.rb'
     - 'spec/services/cart_service_spec.rb'
     - 'spec/services/default_shipping_category_spec.rb'
@@ -1305,6 +1390,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/services/order_cycle_warning_spec.rb'
     - 'spec/services/order_factory_spec.rb'
     - 'spec/services/order_syncer_spec.rb'
+    - 'spec/services/order_workflow_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/product_tag_rules_filterer_spec.rb'
     - 'spec/services/products_renderer_spec.rb'
@@ -1338,7 +1424,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/support/performance_helper.rb'
     - 'spec/support/products_helper.rb'
     - 'spec/support/request/admin_helper.rb'
-    - 'spec/support/request/authentication_workflow.rb'
+    - 'spec/support/request/authentication_helper.rb'
     - 'spec/support/request/checkout_workflow.rb'
     - 'spec/support/request/cookie_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
@@ -1355,8 +1441,10 @@ Style/FrozenStringLiteralComment:
     - 'spec/validators/integer_array_validator_spec.rb'
     - 'spec/views/spree/admin/orders/edit.html.haml_spec.rb'
     - 'spec/views/spree/admin/orders/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/shared/_order_links.html.haml_spec.rb'
 
-# Offense count: 51
+# Offense count: 48
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -1376,32 +1464,38 @@ Style/GuardClause:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
-    - 'app/services/advance_order_service.rb'
     - 'app/services/order_syncer.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
-    - 'lib/spree/core/controller_helpers/order_decorator.rb'
-    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 1
+# 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'
 
-# Offense count: 4
+# Offense count: 2
 Style/MixinUsage:
   Exclude:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
-    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 41
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1412,15 +1506,12 @@ Style/NumericPredicate:
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/helpers/checkout_helper.rb'
     - 'app/helpers/shared_helper.rb'
-    - 'app/models/order_updater.rb'
     - 'app/models/product_import/product_importer.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/spree/adjustment_decorator.rb'
-    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/variant_override.rb'
     - 'app/services/cart_service.rb'
@@ -1433,6 +1524,42 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
+# 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.
+Style/RedundantPercentQ:
+  Exclude:
+    - 'spec/support/request/web_helper.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:

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct of the Open Food Network
+
+**Welcome!** We are currently working on a Code of Conduct. You are welcome to contribute. We started this work at the Global Gathering 2020 and you find [notes of the initial session](https://community.openfoodnetwork.org/t/global-gathering-2020-day-5-a-code-of-conduct-for-ofn/2071/1) in the community forum. You can edit this file on Github to suggest new content. Alternatively, you can post in our [community forum](https://community.openfoodnetwork.org) or reach us on [Slack](https://openfoodnetwork.org/slack-invite).

CONTRIBUTING.md

@@ -40,7 +40,7 @@ Push your changes to a branch on your fork:
 
 ## Submitting a Pull Request
 
-Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr].
+Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr]. 
 
 TL;DR:
 * Write tests

DOCKER.md

@@ -17,7 +17,13 @@ Better to have at least 2GB free on your computer in order to download images an
 
 Open a terminal with a shell.
 
-Clone the repository:
+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
@@ -54,3 +60,6 @@ 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

@@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBE
     echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
     rbenv install $(cat .ruby-version) && \
     rbenv global $(cat .ruby-version) && \
-    gem install bundler --version=1.17.2
+    gem install bundler --version=1.17.3
 
 # Install Postgres
 RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \

GETTING_STARTED.md

@@ -1,6 +1,6 @@
 ### Getting Started
 
-This is a general guide to setting up an Open Food Network development environment on your local machine.
+This is a general guide to setting up an Open Food Network **development environment on your local machine**. If you want to setup OFN on a server, please have a look at the [ofn-install deployment guide](https://github.com/openfoodfoundation/ofn-install/wiki).
 
 ### Requirements
 

Gemfile

@@ -39,18 +39,21 @@ gem 'stringex', '~> 1.5.1'
 
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 
-# Our branch contains two changes
+# Our branch contains the following changes:
 # - Pass customer email and phone number to PayPal (merged to upstream master)
 # - Change type of password from string to password to hide it in the form
+# - Skip CA cert file and use the ones provided by the OS
 gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable'
+
 gem 'stripe'
 
 # We need at least this version to have Digicert's root certificate
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78.0'
 
-gem 'devise', '~> 3.0.1'
+gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
 gem 'devise-encryptable'
+gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
 
@@ -83,12 +86,11 @@ gem 'acts-as-taggable-on', '~> 4.0'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'oj'
-gem 'paper_trail', '~> 5.2.3'
+gem 'paper_trail', '~> 7.1.3'
 gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
@@ -154,6 +156,7 @@ end
 
 group :test do
   gem 'simplecov', require: false
+  gem 'test-prof'
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'

Gemfile.lock

@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: e28e4a8c5cedba504eea9cdad4be440d277d7e68
+  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)
@@ -22,7 +22,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 0b0c422369c82b6dd7e7cb627a24e3a9fca19a6c
+  revision: cbb24a6ed701166ffaf2ab60a402154100d74766
   branch: 2-1-0-stable
   specs:
     spree_core (2.1.0)
@@ -64,6 +64,7 @@ PATH
   remote: engines/dfc_provider
   specs:
     dfc_provider (0.0.1)
+      active_model_serializers (~> 0.8.4)
       jwt (~> 2.2)
       rspec (~> 3.9)
 
@@ -108,7 +109,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.5)
+    activerecord-import (1.0.6)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -148,9 +149,7 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
-    bugsnag (6.14.0)
+    bugsnag (6.17.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)
@@ -194,19 +193,19 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     css_parser (1.7.1)
       addressable
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     database_cleaner (1.8.5)
     db2fog (0.9.0)
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.38.0)
+    ddtrace (0.41.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -219,15 +218,18 @@ GEM
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (3.0.4)
-      bcrypt-ruby (~> 3.0)
+    devise (3.5.10)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
+    devise-token_authenticatable (0.4.10)
+      devise (>= 3.5.2, < 4.0.0)
     diff-lcs (1.3)
-    diffy (3.3.0)
     docile (1.3.2)
     dry-inflector (0.1.2)
     erubis (2.7.0)
@@ -410,7 +412,7 @@ GEM
     get_process_mem (0.2.5)
       ffi (~> 1.0)
     gmaps4rails (2.1.2)
-    haml (5.1.2)
+    haml (5.2.0)
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
@@ -438,12 +440,12 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.2.1)
+    jwt (2.2.2)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.11.3)
-    knapsack (1.18.0)
+    knapsack (1.19.0)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -466,7 +468,7 @@ GEM
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
@@ -478,11 +480,11 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.7)
+    oj (3.10.8)
     optimist (3.0.0)
     orm_adapter (0.5.0)
-    paper_trail (5.2.3)
-      activerecord (>= 3.0, < 6.0)
+    paper_trail (7.1.3)
+      activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     paperclip (3.4.2)
       activemodel (>= 3.0.0)
@@ -508,7 +510,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.3)
+    public_suffix (4.0.6)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -553,8 +555,10 @@ GEM
       nokogiri (~> 1.5)
       optimist (~> 3.0)
     redcarpet (3.5.0)
-    request_store (1.4.1)
+    request_store (1.5.0)
       rack (>= 1.4)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
     rexml (3.2.4)
     roadie (3.4.0)
       css_parser (~> 1.4)
@@ -588,19 +592,19 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.9.2)
-    rswag (2.2.0)
-      rswag-api (= 2.2.0)
-      rswag-specs (= 2.2.0)
-      rswag-ui (= 2.2.0)
-    rswag-api (2.2.0)
-      railties (>= 3.1, < 6.1)
-    rswag-specs (2.2.0)
-      activesupport (>= 3.1, < 6.1)
+    rswag (2.3.1)
+      rswag-api (= 2.3.1)
+      rswag-specs (= 2.3.1)
+      rswag-ui (= 2.3.1)
+    rswag-api (2.3.1)
+      railties (>= 3.1, < 7.0)
+    rswag-specs (2.3.1)
+      activesupport (>= 3.1, < 7.0)
       json-schema (~> 2.2)
-      railties (>= 3.1, < 6.1)
-    rswag-ui (2.2.0)
-      actionpack (>= 3.1, < 6.1)
-      railties (>= 3.1, < 6.1)
+      railties (>= 3.1, < 7.0)
+    rswag-ui (2.3.1)
+      actionpack (>= 3.1, < 7.0)
+      railties (>= 3.1, < 7.0)
     rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -655,8 +659,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
     state_machine (1.2.0)
     stringex (1.5.1)
-    stripe (5.22.0)
+    stripe (5.25.0)
     temple (0.8.2)
+    test-prof (0.7.5)
     test-unit (3.3.6)
       power_assert
     thor (0.20.3)
@@ -668,7 +673,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.5.5)
+    unicorn (5.7.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -684,7 +689,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.3)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -735,10 +740,10 @@ DEPENDENCIES
   debugger-linecache
   delayed_job_active_record
   delayed_job_web
-  devise (~> 3.0.1)
+  devise (~> 3.5.10)
   devise-encryptable
+  devise-token_authenticatable (~> 0.4.10)
   dfc_provider!
-  diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails (= 4.10.0)
   ffaker (~> 1.16)
@@ -772,7 +777,7 @@ DEPENDENCIES
   ofn-qz!
   oj
   order_management!
-  paper_trail (~> 5.2.3)
+  paper_trail (~> 7.1.3)
   paperclip (~> 3.4.1)
   paranoia (~> 2.0)
   pg (~> 0.21.0)
@@ -807,6 +812,7 @@ DEPENDENCIES
   state_machine (= 1.2.0)
   stringex (~> 1.5.1)
   stripe
+  test-prof
   test-unit (~> 3.3)
   timecop
   truncate_html (= 0.9.2)

README.md

@@ -9,7 +9,7 @@ Supported by the Open Food Foundation and a network of global affiliates, we are
 
 We're part of global movement - get involved!
 
-* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel.
+* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel and join #dev for all tech-related topics.
 * Head to [https://openfoodnetwork.org](https://openfoodnetwork.org) for more information about the global OFN project.
 * Check out the [User Guide](https://guide.openfoodnetwork.org/) for a list of features and tutorials.
 * Join our [discussion forum](https://community.openfoodnetwork.org).
@@ -20,6 +20,11 @@ If you are interested in contributing to the OFN in any capacity, please introdu
 
 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.
 
+### Hacktoberfest :tada:
+
+Are you participating in [Hacktoberfest](https://hacktoberfest.digitalocean.com/)? Go check out our [Welcome New Developers project board][welcome-dev]! We have curated all issues we consider to be a good starting point for new members of the community and categorized them by skills and level of complexity. 
+Have a look and pick the one you would prefer working on!
+
 ## Provisioning
 
 If you're interested in provisioning a server, see [ofn-install][ofn-install] for the project's Ansible playbooks.
@@ -39,3 +44,4 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 [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/javascripts/admin/all.js

@@ -80,7 +80,11 @@
 //= require moment/nb.js
 //= require moment/pt-br.js
 //= require moment/pt.js
+//= require moment/ru.js
 //= require moment/sv.js
+//= require moment/ca.js
+//= require moment/ar.js
+//= require moment/tr.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, $location, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser, ProductFiltersUrl) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -13,37 +13,29 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
   ]
 
-  $scope.filterableColumns = [
-    { name: t("label_producers"),       db_column: "producer_name" },
-    { name: t("name"),           db_column: "name" }
-  ]
-
-  $scope.filterTypes = [
-    { name: t("equals"),         predicate: "eq" },
-    { name: t("contains"),       predicate: "cont" }
-  ]
-
-  $scope.optionTabs =
-    filters:        { title: t("filter_products"),   visible: false }
+  $scope.q = {
+    producerFilter: ""
+    categoryFilter: ""
+    importDateFilter: ""
+    query: ""
+    sorting: ""
+  }
 
   $scope.producers = producers
   $scope.taxons = Taxons.all
   $scope.tax_categories = tax_categories
-  $scope.producerFilter = ""
-  $scope.categoryFilter = ""
-  $scope.importDateFilter = ""
   $scope.page = 1
   $scope.per_page = 15
   $scope.products = BulkProducts.products
-  $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
   $scope.sortOptions = SortOptions
 
   $scope.initialise = ->
+    $scope.q = ProductFiltersUrl.loadFromUrl($location.search())
     $scope.fetchProducts()
 
-  $scope.$watchCollection '[query, producerFilter, categoryFilter, importDateFilter, per_page]', ->
+  $scope.$watchCollection '[q.query, q.producerFilter, q.categoryFilter, q.importDateFilter, per_page]', ->
     $scope.page = 1 # Reset page when changing filters for new search
 
   $scope.changePage = (newPage) ->
@@ -53,25 +45,27 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.fetchProducts = ->
     removeClearedValues()
     params = {
-      'q[name_cont]': $scope.query,
-      'q[supplier_id_eq]': $scope.producerFilter,
-      'q[primary_taxon_id_eq]': $scope.categoryFilter,
-      'q[s]': $scope.sorting,
-      import_date: $scope.importDateFilter,
+      'q[name_cont]': $scope.q.query,
+      'q[supplier_id_eq]': $scope.q.producerFilter,
+      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
+      'q[s]': $scope.q.sorting,
+      import_date: $scope.q.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
     }
     RequestMonitor.load(BulkProducts.fetch(params).$promise).then ->
+      # update url with the filters used
+      $location.search(ProductFiltersUrl.generate($scope.q))
       $scope.resetProducts()
 
   removeClearedValues = ->
-    delete $scope.producerFilter if $scope.producerFilter == "0"
-    delete $scope.categoryFilter if $scope.categoryFilter == "0"
-    delete $scope.importDateFilter if $scope.importDateFilter == "0"
+    delete $scope.q.producerFilter if $scope.q.producerFilter == "0"
+    delete $scope.q.categoryFilter if $scope.q.categoryFilter == "0"
+    delete $scope.q.importDateFilter if $scope.q.importDateFilter == "0"
 
   $timeout ->
     if $scope.showLatestImport
-      $scope.importDateFilter = $scope.importDates[1].id
+      $scope.q.importDateFilter = $scope.importDates[1].id
 
   $scope.resetProducts = ->
     DirtyProducts.clear()
@@ -101,10 +95,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.visibleTab = tab
 
   $scope.resetSelectFilters = ->
-    $scope.query = ""
-    $scope.producerFilter = "0"
-    $scope.categoryFilter = "0"
-    $scope.importDateFilter = "0"
+    $scope.q.query = ""
+    $scope.q.producerFilter = "0"
+    $scope.q.categoryFilter = "0"
+    $scope.q.importDateFilter = "0"
     $scope.fetchProducts()
 
   $scope.$watch 'sortOptions', (sort) ->
@@ -122,8 +116,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
-      window.open(editProductUrl(product, variant), "_blank")
-
+      $window.location.href = ProductFiltersUrl.buildUrl(editProductUrl(product, variant), $scope.q)
 
   $scope.toggleShowAllVariants = ->
     showVariants = !DisplayProperties.showVariants 0
@@ -220,10 +213,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       data:
         products: productsToSubmit
         filters:
-          'q[name_cont]': $scope.query
-          'q[supplier_id_eq]': $scope.producerFilter
-          'q[primary_taxon_id_eq]': $scope.categoryFilter
-          import_date: $scope.importDateFilter
+          'q[name_cont]': $scope.q.query
+          'q[supplier_id_eq]': $scope.q.producerFilter
+          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
+          import_date: $scope.q.importDateFilter
         page: $scope.page
         per_page: $scope.per_page
     ).success((data) ->

app/assets/javascripts/admin/directives/select2_min_search.js.coffee

@@ -5,5 +5,10 @@ angular.module("ofn.admin").directive "ofnSelect2MinSearch", ->
       minimumResultsForSearch: attrs.ofnSelect2MinSearch
 
     ngModel.$formatters.push (value) ->
-      if (value)
-        element.select2('val', value);
+      # select2 populates options with a value like "number:3" or "string:category" but
+      # select2('val', value) doesn't do the type conversion for us as one would expect
+      if isNaN(value)
+        element.select2('val', "string:#{value}")
+      else
+        element.select2('val', "number:#{value}")
+

app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

@@ -69,25 +69,24 @@ angular.module("admin.enterprises")
       $scope.newUser = $scope.invite_errors = $scope.invite_success = null
 
     $scope.removeLogo = ->
-      return unless confirm(t("admin.enterprises.remove_logo.immediate_removal_warning"))
-
-      Enterprises.removeLogo($scope.Enterprise).then (data) ->
-        $scope.Enterprise = angular.copy(data)
-        $scope.$emit("enterprise:updated", $scope.Enterprise)
-
-        StatusMessage.display("success", t("admin.enterprises.remove_logo.removed_successfully"))
-      , (response) ->
-        if response.data.error?
-          StatusMessage.display("failure", response.data.error)
+      $scope.performEnterpriseAction("removeLogo", "immediate_logo_removal_warning", "removed_logo_successfully")
 
     $scope.removePromoImage = ->
-      return unless confirm(t("admin.enterprises.remove_promo_image.immediate_removal_warning"))
+      $scope.performEnterpriseAction("removePromoImage", "immediate_promo_image_removal_warning", "removed_promo_image_successfully")
 
-      Enterprises.removePromoImage($scope.Enterprise).then (data) ->
+    $scope.removeTermsAndConditions = ->
+      $scope.performEnterpriseAction("removeTermsAndConditions", "immediate_terms_and_conditions_removal_warning", "removed_terms_and_conditions_successfully")
+
+    $scope.performEnterpriseAction = (enterpriseActionName, warning_message_key, success_message_key) ->
+      return unless confirm($scope.translation(warning_message_key))
+
+      Enterprises[enterpriseActionName]($scope.Enterprise).then (data) ->
         $scope.Enterprise = angular.copy(data)
         $scope.$emit("enterprise:updated", $scope.Enterprise)
-
-        StatusMessage.display("success", t("admin.enterprises.remove_promo_image.removed_successfully"))
+        StatusMessage.display("success", $scope.translation(success_message_key))
       , (response) ->
         if response.data.error?
           StatusMessage.display("failure", response.data.error)
+
+    $scope.translation = (key) ->
+      t('js.admin.enterprises.form.images.' + key)

app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee

@@ -9,22 +9,19 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.e
       $timeout ->
         # using $parse instead of scope[attrs.datetimepicker] for cases
         # where attrs.datetimepicker is 'foo.bar.lol'
-        $(element).datetimepicker
-          dateFormat: 'yy-mm-dd'
-          timeFormat: 'HH:mm'
-          showOn: 'button'
-          controlType: 'select'
-          oneLine: true
-          buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
-          buttonImageOnly: true
-          stepMinute: 15
-          onSelect: (dateText, inst) ->
-            scope.$apply(->
-              element.val(dateText)
-              parsed = $parse(attrs.datetimepicker)
-              parsed.assign(scope, dateText)
-            )
-
+        $(element).datetimepicker(
+          Object.assign(
+            window.JQUERY_UI_DATETIME_PICKER_DEFAULTS,
+            {
+              onSelect: (dateText, inst) ->
+                scope.$apply(->
+                  element.val(dateText)
+                  parsed = $parse(attrs.datetimepicker)
+                  parsed.assign(scope, dateText)
+                )
+            }
+          )
+        )
 
   .directive 'ofnOnChange', ->
     (scope, element, attrs) ->

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

@@ -53,17 +53,18 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       [value, unit_name]
 
     scale_for_unit_value: ->
-      # Find the largest available unit where unit_value comes to >= 1 when expressed in it.
-      # If there is none available where this is true, use the smallest available unit.
-      unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit] when @variant.unit_value / scale >= 1).reduce (unit, [scale, unit_name]) ->
-        if (unit && scale > unit[0]) || !unit?
-          [scale, unit_name]
-        else
-          unit
-      , null
-      if !unit?
-        unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit]).reduce (unit, [scale, unit_name]) ->
-          if scale < unit[0] then [scale, unit_name] else unit
-        , [Infinity,""]
+      # Find the largest available and compatible unit where unit_value comes
+      # to >= 1 when expressed in it.
+      # If there is none available where this is true, use the smallest
+      # available unit.
+      product = @variant.product
+      scales = VariantUnitManager.compatibleUnitScales(product.variant_unit_scale, product.variant_unit)
+      variantUnitValue = @variant.unit_value
 
-      unit
+      # sets largestScale = last element in filtered scales array
+      [_, ..., largestScale] = (scales.filter (s) -> variantUnitValue / s >= 1)
+
+      if (largestScale)
+        [largestScale, VariantUnitManager.getUnitName(largestScale, product.variant_unit)]
+      else
+        [scales[0], VariantUnitManager.getUnitName(scales[0], product.variant_unit)]

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

@@ -1,17 +1,35 @@
 angular.module("admin.products").factory "VariantUnitManager", ->
   class VariantUnitManager
-    @unitNames:
+    @units:
       'weight':
-        1.0: 'g'
-        1000.0: 'kg'
-        1000000.0: 'T'
+        1.0:
+          name: 'g'
+          system: 'metric'
+        1000.0:
+          name: 'kg'
+          system: 'metric'
+        1000000.0:
+          name: 'T'
+          system: 'metric'
+        453.6:
+          name: 'lb'
+          system: 'imperial'
+        28.35:
+          name: 'oz'
+          system: 'imperial'
       'volume':
-        0.001: 'mL'
-        1.0: 'L'
-        1000.0: 'kL'
+        0.001:
+          name: 'mL'
+          system: 'metric'
+        1.0:
+          name: 'L'
+          system: 'metric'
+        1000.0:
+          name: 'kL'
+          system: 'metric'
 
     @variantUnitOptions: ->
-      options = for unit_type, scale_with_name of @unitNames
+      options = for unit_type, _ of @units
         for scale in @unitScales(unit_type)
           name = @getUnitName(scale, unit_type)
           ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
@@ -30,7 +48,16 @@ angular.module("admin.products").factory "VariantUnitManager", ->
         unitScales[0]
 
     @getUnitName: (scale, unitType) ->
-      @unitNames[unitType][scale]
+      if @units[unitType][scale]
+        @units[unitType][scale]['name']
+      else
+        ''
 
     @unitScales: (unitType) ->
-      (parseFloat(scale) for scale in Object.keys(@unitNames[unitType])).sort()
+      (parseFloat(scale) for scale in Object.keys(@units[unitType])).sort (a, b) ->
+         a - b
+
+    @compatibleUnitScales: (scale, unitType) ->
+      scaleSystem = @units[unitType][scale]['system']
+      (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem).sort (a, b) ->
+         a - b

app/assets/javascripts/admin/resources/resources/enterprise_resource.js.coffee

@@ -14,4 +14,7 @@ angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
     'removePromoImage':
       url: '/api/enterprises/:id/promo_image.json'
       method: 'DELETE'
+    'removeTermsAndConditions':
+      url: '/api/enterprises/:id/terms_and_conditions.json'
+      method: 'DELETE'
   })

app/assets/javascripts/admin/resources/services/enterprises.js.coffee

@@ -52,3 +52,4 @@ angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource
 
     removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
     removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)
+    removeTermsAndConditions: performActionOnEnterpriseResource(EnterpriseResource.removeTermsAndConditions)

app/assets/javascripts/admin/services/product_filters.js.coffee

@@ -0,0 +1,23 @@
+angular.module("ofn.admin").factory "ProductFiltersUrl", ($httpParamSerializer) ->
+  new class ProductFiltersUrl
+    productFilters: ['producerFilter', 'categoryFilter', 'query', 'sorting', 'importDateFilter']
+
+    loadFromUrl: (filters) ->
+      loadedFilters = {}
+      for filter in @productFilters
+        loadedFilters[filter] = if filters[filter] then filters[filter] else ""
+
+      loadedFilters
+
+    generate: (ctrlFilters) ->
+      filters = {}
+      for filter in @productFilters
+        filters[filter] = ctrlFilters[filter] if ctrlFilters[filter]
+
+      filters
+
+    buildUrl: (baseUrl, ctrlFilters) ->
+      filterUrl = $httpParamSerializer(@generate(ctrlFilters))
+      filterUrl = "?#{filterUrl}" if filterUrl isnt ""
+
+      "#{baseUrl}#{filterUrl}"

app/assets/javascripts/admin/spree/orders/address_states.js

@@ -1,27 +1,17 @@
 var update_state = function(region) {
   var country        = $('span#' + region + 'country .select2').select2('val');
-
   var state_select   = $('span#' + region + 'state select.select2');
-  var state_input    = $('span#' + region + 'state input.state_name');
 
-  $.get(Spree.routes.states_search + "?country_id=" + country, function(data) {
-    var states = data["states"]
-    if (states.length > 0) {
-      state_select.html('');
-      var states_with_blank = [{name: '', id: ''}].concat(states);
-      $.each(states_with_blank, function(pos,state) {
-        var opt = $(document.createElement('option'))
-                  .attr('value', state.id)
-                  .html(state.name);
-        state_select.append(opt);
-      });
-      state_select.prop("disabled", false).show();
-      state_select.select2();
-      state_input.hide().prop("disabled", true);
-
-    } else {
-      state_input.prop("disabled", false).show();
-      state_select.select2('destroy').hide();
-    }
+  $.get(Spree.routes.states_search + "?country_id=" + country, function(states) {
+    state_select.html('');
+    var states_with_blank = [{name: '', id: ''}].concat(states);
+    $.each(states_with_blank, function(pos,state) {
+      var opt = $(document.createElement('option'))
+                .attr('value', state.id)
+                .html(state.name);
+      state_select.append(opt);
+    });
+    state_select.prop("disabled", false).show();
+    state_select.select2();
   })
 };

app/assets/javascripts/admin/spree/orders/use_billing.js

@@ -0,0 +1,17 @@
+$(document).ready(function() {
+  var order_use_billing_input = $('input#order_use_billing');
+
+  var order_use_billing = function () {
+    if (!order_use_billing_input.is(':checked')) {
+      $('#shipping').show();
+    } else {
+      $('#shipping').hide();
+    }
+  };
+
+  order_use_billing_input.click(function() {
+    order_use_billing();
+  });
+
+  order_use_billing();
+});

app/assets/javascripts/admin/util.js.erb

@@ -1,22 +1,30 @@
-$(document).ready(function() {
-  $('.datetimepicker').datetimepicker({
-    dateFormat: 'yy-mm-dd',
-    timeFormat: 'HH:mm',
+$(document).ready(function(){
+  window.JQUERY_UI_DATE_PICKER_DEFAULTS = {
+    dateFormat: Spree.translations.date_picker,
     dayNames: Spree.translations.abbr_day_names,
     dayNamesMin: Spree.translations.abbr_day_names,
     monthNames: Spree.translations.month_names,
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,
-    showOn: 'button',
-    controlType: 'select',
     oneLine: true,
+    showOn: 'button',
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
-    buttonImageOnly: true,
-    stepMinute: 15
-  });
-});
+    buttonImageOnly: true
+  }
 
-$(document).ready(function(){
+  window.JQUERY_UI_DATETIME_PICKER_DEFAULTS = Object.assign(
+    {},
+    window.JQUERY_UI_DATE_PICKER_DEFAULTS,
+    {
+      currentText: Spree.translations.datetime_ui_current_text,
+      closeText: Spree.translations.datetime_ui_close_text,
+      timeText: Spree.translations.datetime_ui_time_text,
+      timeFormat: 'HH:mm',
+      controlType: 'select',
+      stepMinute: 15
+    }
+  );
+  $('.datetimepicker').datetimepicker(window.JQUERY_UI_DATETIME_PICKER_DEFAULTS);
   $('a.close').click(function(event){
     event.preventDefault();
     $(this).parent().slideUp(250);

app/assets/javascripts/darkswarm/all.js.coffee

@@ -37,7 +37,11 @@
 #= require moment/nb.js
 #= require moment/pt-br.js
 #= require moment/pt.js
+#= require moment/ru.js
 #= require moment/sv.js
+#= require moment/ca.js
+#= require moment/ar.js
+#= require moment/tr.js
 #
 #= require modernizr
 #

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

@@ -2,15 +2,6 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, $rootScope, $timeout, OrderCycle
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
-  # Timeout forces this to be evaluated after everything is loaded
-  # This is a hack. We should probably write our own "popover" directive
-  # That takes an expression instead of a trigger, and binds to that
-  $timeout =>
-    $rootScope.$broadcast 'orderCycleSelected'
-    if !$scope.OrderCycle.selected()
-      $("#order_cycle_id").trigger("openTrigger")
-
-
 Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
   # Track previous order cycle id for use with revertOrderCycle()
   $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id

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

@@ -1,4 +1,4 @@
-Darkswarm.controller "PageSelectionCtrl", ($scope, $location) ->
+Darkswarm.controller "PageSelectionCtrl", ($scope, $rootScope, $location) ->
   $scope.selectedPage = ->
     # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`.
     # We remove the slash at the beginning.
@@ -15,3 +15,8 @@ Darkswarm.controller "PageSelectionCtrl", ($scope, $location) ->
   $scope.whitelistPages = (pages) ->
     $scope.whitelist = pages
     $scope.lastPage = pages[0]
+
+  # when an order cycle is changed, ensure the shop tab is active to save a click
+  $rootScope.$on "orderCycleSelected", ->
+    if $scope.selectedPage() != "shop"
+      $location.path("shop")

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

@@ -12,6 +12,11 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $scope.supplied_properties = null
   $scope.showFilterSidebar = false
 
+  # Update filters after initial load of shop tab
+  $timeout =>
+    $scope.update_filters()
+
+  # Update filters when order cycle changed
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
     $scope.clearAll()
@@ -63,7 +68,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
       id: $scope.order_cycle.order_cycle_id,
       page: page || $scope.page,
       per_page: $scope.per_page,
-      'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
       'q[properties_id_or_supplier_properties_id_in_any][]': $scope.activeProperties,
       'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }

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

@@ -16,8 +16,5 @@ window.Darkswarm = angular.module("Darkswarm", [
   $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
   $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"
 
-  # This allows us to trigger these two events on tooltips
-  $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' )
-
   # We manually handle our scrolling
   $anchorScrollProvider.disableAutoScrolling()

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

@@ -43,7 +43,7 @@ Darkswarm.directive 'mapSearch', ($timeout, Search) ->
     # When the map loads, and we have a search from ?query, perform that search
     scope.performUrlSearch = (map) ->
       google.maps.event.addListenerOnce map, "idle", =>
-        google.maps.event.trigger(scope.input, 'focus');
+        google.maps.event.trigger(scope.input, 'focus',{});
         google.maps.event.trigger(scope.input, 'keydown', {keyCode: 13});
 
     # Bias the SearchBox results towards places that are within the bounds of the

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

@@ -1,4 +1,4 @@
-Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
+Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
   restrict: 'E'
   replace: true
   scope: true
@@ -11,34 +11,6 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
     openStreetMapProviderName = openStreetMapConfig.open_street_map_provider_name
     openStreetMapProviderOptions = JSON.parse(openStreetMapConfig.open_street_map_provider_options)
 
-    average = (values) ->
-      total = values.reduce (sum, value) ->
-        sum = sum + value
-      , 0
-      total / values.length
-
-    averageAngle = (angleName) ->
-      positiveAngles = []
-      negativeAngles = []
-      for enterprise in Enterprises.enterprises
-        if enterprise.latitude? && enterprise.longitude?
-          if enterprise[angleName] > 0
-            positiveAngles.push(enterprise[angleName])
-          else
-            negativeAngles.push(enterprise[angleName])
-
-      averageNegativeAngle = average(negativeAngles)
-      averagePositiveAngle = average(positiveAngles)
-
-      if negativeAngles.length == 0
-        averagePositiveAngle
-      else if positiveAngles.length == 0
-        averageNegativeAngle
-      else if averagePositiveAngle > averageNegativeAngle
-        averagePositiveAngle - averageNegativeAngle
-      else
-        averageNegativeAngle - averagePositiveAngle
-
     buildMarker = (enterprise, latlng, title) ->
       icon = L.icon
         iconUrl: enterprise.icon
@@ -61,28 +33,31 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
 
     displayMap = ->
       setMapDimensions()
-      averageLatitude = averageAngle("latitude")
-      averageLongitude = averageAngle("longitude")
       zoomLevel = 6
       map = L.map('open-street-map')
       L.tileLayer.provider(openStreetMapProviderName, openStreetMapProviderOptions).addTo(map)
-      map.setView([averageLatitude, averageLongitude], zoomLevel)
+      map.setView([MapCentreCalculator.initialLatitude(), MapCentreCalculator.initialLongitude()], zoomLevel)
 
     displayEnterprises = ->
-      for enterprise in Enterprises.enterprises
-        if enterprise.latitude? && enterprise.longitude?
-          marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
-          enterpriseNames.push(enterpriseName(enterprise))
-          markers.push(marker)
+      for enterprise in Enterprises.geocodedEnterprises()
+        marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
+        enterpriseNames.push(enterpriseName(enterprise))
+        markers.push(marker)
+
+    disableSearchField = () =>
+      $('#open-street-map--search input').prop("disabled", true)
 
     displaySearchField = () ->
       new Autocomplete('#open-street-map--search',
         onSubmit: goToEnterprise
         search: searchEnterprises
       )
-      overwriteInlinePositionRelativeToPositionSearchField = ->
-        $('#open-street-map--search').css("position", "absolute")
-      overwriteInlinePositionRelativeToPositionSearchField()
+      overwriteInlinePositionRelativeToAbsoluteOnSearchField()
+      if Enterprises.geocodedEnterprises().length == 0
+        disableSearchField()
+
+    overwriteInlinePositionRelativeToAbsoluteOnSearchField = ->
+      $('#open-street-map--search').css("position", "absolute")
 
     searchEnterprises = (input) ->
       if input.length < 1

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, RailsFlashLoader) ->
+Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, Messages) ->
   # Handles syncing of current cart/order state to server
   new class Cart
     dirty: false
@@ -50,7 +50,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
         @popQueue() if @update_enqueued
 
       .error (response, status)=>
-        RailsFlashLoader.loadFlash({error: t('js.cart.add_to_cart_failed')})
+        Messages.flash({error: t('js.cart.add_to_cart_failed')})
         @update_running = false
 
     compareAndNotifyStockLevels: (stockLevels) =>

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, RailsFlashLoader, Loading)->
+Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, Messages)->
   new class Checkout
     errors: {}
     secrets: {}
@@ -13,7 +13,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
         @submit()
 
     submit: =>
-      Loading.message = t 'submitting_order'
+      Messages.loading(t 'submitting_order')
       $http.put('/checkout.json', {order: @preprocess()})
       .then (response) =>
         Navigation.go response.data.path
@@ -24,7 +24,8 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
           try
             @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
           finally
-            throw error # generate a BugsnagJS alert
+            Bugsnag.notify(error)
+            throw error
 
     handle_checkout_error_response: (response) =>
       throw response unless response.data?
@@ -38,8 +39,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
         @loadFlash(response.data.flash)
 
     loadFlash: (flash) =>
-      Loading.clear()
-      RailsFlashLoader.loadFlash(flash)
+      Messages.flash(flash)
 
     # Rails wants our Spree::Address data to be provided with _attributes
     preprocess: ->

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, RailsFlashLoader, Loading)->
+Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, Messages)->
   new class CreditCard
     visible: false
     errors: {}
@@ -12,16 +12,15 @@ Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeEleme
       params = @process_params()
       $http.put('/credit_cards/new_from_token', params )
         .success (data, status) =>
-          Loading.clear()
+          Messages.clear()
           @reset()
           CreditCards.add(data)
         .error (response, status) =>
           if response.path
             Navigation.go response.path
           else
-            Loading.clear()
             @errors = response.errors
-            RailsFlashLoader.loadFlash(response.flash)
+            Messages.flash(response.flash)
 
     setFullName: ->
       @secrets.name = "#{@secrets.first_name} #{@secrets.last_name}"

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, RailsFlashLoader)->
+Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages)->
   new class CreditCard
     saved: $filter('orderBy')(savedCreditCards,'-is_default')
 
@@ -10,6 +10,6 @@ Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, RailsFlashLo
       for othercard in @saved when othercard != card
         othercard.is_default = false
       $http.put("/credit_cards/#{card.id}", is_default: true).then (data) ->
-        RailsFlashLoader.loadFlash({success: t('js.default_card_updated')})
+        Messages.success(t('js.default_card_updated'))
       , (response) ->
-        RailsFlashLoader.loadFlash({error: response.data.flash.error})
+        Messages.flash(response.data.flash)

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

@@ -1,4 +1,4 @@
-angular.module("Darkswarm").factory 'Customer', ($resource, RailsFlashLoader) ->
+angular.module("Darkswarm").factory 'Customer', ($resource, Messages) ->
   Customer = $resource('/api/customers/:id/:action.json', {}, {
     'index':
       method: 'GET'
@@ -13,8 +13,8 @@ angular.module("Darkswarm").factory 'Customer', ($resource, RailsFlashLoader) ->
 
   Customer.prototype.update = ->
     @$update().then (response) =>
-      RailsFlashLoader.loadFlash({success: t('js.changes_saved')})
+      Messages.success(t('js.changes_saved'))
     , (response) =>
-      RailsFlashLoader.loadFlash({error: response.data.error})
+      Messages.error(response.data.error)
 
   Customer

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

@@ -84,3 +84,8 @@ Darkswarm.factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons
 
     resetDistance: ->
       enterprise.distance = null for enterprise in @enterprises
+
+    geocodedEnterprises: =>
+      @enterprises.filter (enterprise) ->
+        enterprise.latitude? && enterprise.longitude?
+

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

@@ -1,5 +1,5 @@
 Darkswarm.factory "Loading", ->
   new class Loading
-    message: null 
+    message: null
     clear: =>
       @message = null

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

@@ -2,9 +2,7 @@ Darkswarm.factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration)
   new class OfnMap
     constructor: ->
       @coordinates = {}
-      @enterprises = Enterprises.enterprises.filter (enterprise) ->
-        # Remove enterprises w/o lat or long
-        enterprise.latitude != null || enterprise.longitude != null
+      @enterprises = Enterprises.geocodedEnterprises()
       @enterprises = @enterprise_markers(@enterprises)
 
     enterprise_markers: (enterprises) ->

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

@@ -0,0 +1,30 @@
+Darkswarm.factory 'MapCentreCalculator', (Enterprises, openStreetMapConfig) ->
+  new class MapCentreCalculator
+
+    initialLatitude: =>
+      if Enterprises.geocodedEnterprises().length > 0
+        @_calculate("latitude", Enterprises.geocodedEnterprises())
+      else
+        openStreetMapConfig.open_street_map_default_latitude
+
+    initialLongitude: =>
+      if Enterprises.geocodedEnterprises().length > 0
+        @_calculate("longitude", Enterprises.geocodedEnterprises())
+      else
+        openStreetMapConfig.open_street_map_default_longitude
+
+    _calculate: (angleName, coordinates) =>
+      angles = []
+
+      for coordinate in coordinates
+        angles.push(coordinate[angleName])
+
+      minimumAngle = Math.min.apply(null, angles)
+      maximumAngle = Math.max.apply(null, angles)
+
+      distanceBetweenMinimumAndMaximum = if maximumAngle > minimumAngle
+        maximumAngle - minimumAngle
+      else
+        minimumAngle - maximumAngle
+
+      minimumAngle + (distanceBetweenMinimumAndMaximum / 2)

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

@@ -0,0 +1,17 @@
+Darkswarm.factory "Messages", (Loading, RailsFlashLoader)->
+  new class Messages
+    loading: (message) ->
+      Loading.message = message
+
+    success: (message) ->
+      @flash(success: message)
+
+    error: (message) ->
+      @flash(error: message)
+
+    flash: (flash) ->
+      @clear()
+      RailsFlashLoader.loadFlash(flash)
+
+    clear: ->
+      Loading.clear()

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
+Darkswarm.factory 'StripeElements', ($rootScope, Messages) ->
   new class StripeElements
     # These are both set from the StripeElements directive
     stripe: null
@@ -8,39 +8,49 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
     requestToken: (secrets, submit, loading_message = t("processing_payment")) ->
       return unless @stripe? && @card?
 
-      Loading.message = loading_message
+      Messages.loading loading_message
       cardData = @makeCardData(secrets)
 
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
-          Loading.clear()
-          RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
-          @triggerAngularDigest()
-          console.error(JSON.stringify(response.error))
+          @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.token.id
           secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
+      .catch (response) =>
+        # Stripe handles errors in the response above. This code may never be
+        # reached. But if we get here, we want to know.
+        @reportError(response, t("js.stripe_elements.unknown_error_from_stripe"))
+        throw response
 
     # Create Payment Method to be used with the Stripe Payment Intents API
     createPaymentMethod: (secrets, submit, loading_message = t("processing_payment")) ->
       return unless @stripe? && @card?
 
-      Loading.message = loading_message
+      Messages.loading loading_message
       cardData = @makeCardData(secrets)
 
       @stripe.createPaymentMethod({ type: 'card', card: @card }, @card, cardData).then (response) =>
         if(response.error)
-          Loading.clear()
-          RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
-          @triggerAngularDigest()
-          console.error(JSON.stringify(response.error))
+          @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.paymentMethod.id
           secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
+      .catch (response) =>
+        # Stripe handles errors in the response above. This code may never be
+        # reached. But if we get here, we want to know.
+        @reportError(response, t("js.stripe_elements.unknown_error_from_stripe"))
+        throw response
+
+    reportError: (error, messageForUser) ->
+      Messages.error(messageForUser)
+      @triggerAngularDigest()
+      console.error(error)
+      Bugsnag.notify(new Error(JSON.stringify(error)))
 
     triggerAngularDigest: ->
       # $evalAsync is improved way of triggering a digest without calling $apply

app/assets/stylesheets/admin/globals/variables.scss

@@ -1,3 +1,5 @@
+@import 'shared/variables/layout';
+
 // -------------------------------------------------------------
 //   Variables used in all other files
 //--------------------------------------------------------------

app/assets/stylesheets/admin/pages/enterprise_form.scss

@@ -1,7 +1,9 @@
-@import "variables";
+@import "../variables";
 
-span.unavailable, span.available {
+span.unavailable,
+span.available {
   font-weight: bold;
+
   i {
     font-size: 150%;
   }
@@ -13,4 +15,4 @@ span.available {
 
 span.unavailable {
   color: $warning-red;
-}
+}

app/assets/stylesheets/admin/reports.scss

@@ -3,6 +3,7 @@
 .report__table {
   margin-top: 2em;
 }
+
 .report__message {
   margin-top: 2em;
   border: 1px solid $pale-blue;
@@ -10,3 +11,7 @@
   padding: .5em;
   text-align: center;
 }
+
+.customer-names-tip {
+  margin-top: 1em;
+}

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

@@ -8,21 +8,61 @@
           box-sizing: border-box;
 }
 
-// Helpers
-.block-table {
-  display: table;
-  width: 100%;
+.admin {
+  &__section-header {
+    padding: 15px 0;
+    background-color: very-light($color-3, 4);
+    border-bottom: 1px solid $color-border;
 
-  .table-cell {
-    display: table-cell;
-    vertical-align: middle;
-    padding: 0 10px;
-
-    &:first-child {
-      padding-left: 0;
+    .ofn-drop-down {
+      border: 0;
+      background-color: $spree-blue;
+      color: $color-1;
+      float: none;
+      margin-left: 3px;
+      &:hover,
+      &.expanded {
+        border: 0;
+        color: $color-1;
+      }
     }
-    &:last-child {
-      padding-right: 0;
+
+    &__content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      @media all and (min-width: $tablet_breakpoint) {
+        flex-wrap: nowrap;
+      }
+    }
+
+    &__title {
+      width: 100%;
+      margin-bottom: 10px;
+      @media all and (min-width: $tablet_breakpoint) {
+        margin-bottom: 0;
+      }
+    }
+
+    &__actions {
+      display: flex;
+      flex: 1 0 auto;
+      align-items: center;
+      list-style: none;
+      @media all and (min-width: $tablet_breakpoint) {
+        justify-content: flex-end;
+      }
+      > li {
+        display: flex;
+        margin-right: 10px;
+        &:empty {
+          display: none;
+        }
+        &:last-child {
+          margin-right: 0;
+        }
+      }
     }
   }
 }
@@ -64,25 +104,6 @@
   margin-top: 15px;
 }
 
-#content-header {
-  padding: 15px 0;
-  background-color: very-light($color-3, 4);
-  border-bottom: 1px solid $color-border;
-
-  .page-title {
-    font-size: 20px;
-
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  .page-actions {
-    text-align: right;
-    form {
-      display: inline-block;
-    }
-  }
-}
-
 // Footer
 //---------------------------------------------------
 #footer {

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

@@ -132,3 +132,25 @@ dl {
   padding: 40px 0px;
   color: lighten($color-body-text, 15);
 }
+
+.text-normal {
+  font-size: 1rem;
+  font-weight: 300;
+}
+
+.text-big {
+  font-size: 1.2rem;
+  font-weight: 300;
+}
+
+.text-red {
+  color: $warning-red;
+}
+
+input.text-big {
+  font-size: 1.1rem;
+}
+
+.pad-top {
+  padding-top: 1em;
+}

app/assets/stylesheets/admin/typography.scss

@@ -1,20 +0,0 @@
-@import "variables";
-
-.text-normal {
-  font-size: 1.0rem;
-  font-weight: 300;
-}
-
-.text-big {
-  font-size: 1.2rem;
-  font-weight: 300;
-}
-
-.text-red {
-  color: $warning-red;
-}
-
-
-input.text-big {
-  font-size: 1.1rem;
-}

app/assets/stylesheets/darkswarm/expanding-sidebar.scss

@@ -16,12 +16,14 @@
     width: 100%;
     background-color: $shop-sidebar-overlay;
     opacity: 0;
-    transition: opacity $transition-sidebar;
+    visibility: hidden;
+    transition: all $transition-sidebar;
   }
 
   &.shown {
     .background {
       opacity: 1;
+      visibility: visible;
     }
 
     .sidebar,

app/assets/stylesheets/darkswarm/menu.scss

@@ -212,7 +212,7 @@ nav.top-bar {
 }
 
 .off-canvas-wrap {
-  overflow: inherit;
+  overflow: initial;
 }
 
 .off-canvas-list li.language-switcher ul li {

app/assets/stylesheets/darkswarm/mixins.scss

@@ -1,4 +1,5 @@
 // Note this mixin file is used in ADMIN and FRONTEND
+@import 'shared/variables/layout';
 
 @import "branding";
 
@@ -258,15 +259,15 @@
 
 @mixin breakpoint($point) {
   @if $point == desktop {
-    @media all and (max-width: 1024px) { @content; }
+    @media all and (max-width: $desktop_breakpoint) { @content; }
   }
   @else if $point == tablet {
-    @media all and (max-width: 768px) { @content; }
+    @media all and (max-width: $tablet_breakpoint) { @content; }
   }
   @else if $point == phablet {
-    @media all and (max-width: 640px)  { @content; }
+    @media all and (max-width: $phablet_breakpoint)  { @content; }
   }
   @else if $point == mobile {
-    @media all and (max-width: 480px)  { @content; }
+    @media all and (max-width: $mobile_breakpoint)  { @content; }
   }
 }

app/assets/stylesheets/darkswarm/shop_tabs.scss

@@ -34,7 +34,7 @@
     >a {
       outline: none;
       display: block;
-      color: $grey-500;
+      color: $black;
       font-family: "Oswald", sans-serif;
     }
 
@@ -42,9 +42,9 @@
       @include headingFont;
 
       background: transparent;
-      text-transform: uppercase;
+      text-transform: capitalize;
       line-height: 1;
-      font-size: 0.875em;
+      font-size: 1em;
       padding: 1em 2em;
       border: none;
 
@@ -58,6 +58,7 @@
 
       @include breakpoint(phablet) {
         padding: 0.35em 0 0.65em 0;
+        font-size: 0.875em;
       }
     }
 

app/assets/stylesheets/mail/email.scss

@@ -1,3 +1,5 @@
+@import '../admin/variables';
+
 /* -------------------------------------
  *		GLOBAL
  *------------------------------------- */

app/assets/stylesheets/mail/payments_list.scss

@@ -0,0 +1,45 @@
+@import "../admin/variables";
+
+// payment list, used in both invoice pdfs and order confirmation emails
+
+.payments-list {
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
+  font-size: 12px;
+  margin-bottom: 20px;
+
+  td {
+    padding: 5px;
+    border-bottom: 1px solid $medium-grey;
+
+    .payment-method-name {
+      display: block;
+      font-weight: bold;
+    }
+
+    .payment-method-description {
+      display: block;
+    }
+  }
+
+  thead th {
+    border-bottom: 1px solid $medium-grey;
+    padding: 10px 5px 5px;
+    text-transform: uppercase;
+    text-align: left;
+  }
+
+  .amount {
+    text-align: right;
+    padding-right: 15px;
+  }
+
+  .payment-state {
+    text-align: right;
+  }
+
+  .payment-state-value {
+    text-transform: uppercase;
+  }
+}

app/assets/stylesheets/shared/variables/_layout.scss

@@ -0,0 +1,6 @@
+// Breakpoints
+$desktop_breakpoint: 1024px;
+$tablet_breakpoint: 768px;
+$phablet_breakpoint: 640px;
+$mobile_breakpoint: 480px;
+

app/controllers/admin/order_cycles_controller.rb

@@ -1,6 +1,7 @@
 module Admin
   class OrderCyclesController < ResourceController
     include OrderCyclesHelper
+    include PaperTrailLogging
 
     prepend_before_action :set_order_cycle_id, only: [:incoming, :outgoing]
     before_action :load_data_for_index, only: :index

app/controllers/admin/schedules_controller.rb

@@ -3,6 +3,8 @@ require 'order_management/subscriptions/proxy_order_syncer'
 
 module Admin
   class SchedulesController < ResourceController
+    include PaperTrailLogging
+
     before_action :adapt_params, only: [:update]
     before_action :editable_order_cycle_ids_for_create, only: [:create]
     before_action :editable_order_cycle_ids_for_update, only: [:update]
@@ -140,7 +142,7 @@ module Admin
     end
 
     def permitted_resource_params
-      params.require(:schedule).permit(:id, :name)
+      params.require(:schedule).permit(:id, :name, order_cycle_ids: [])
     end
   end
 end

app/controllers/api/base_controller.rb

@@ -1,5 +1,6 @@
 # Base controller for OFN's API
 require_dependency 'spree/api/controller_setup'
+require "spree/core/controller_helpers/ssl"
 
 module Api
   class BaseController < ActionController::Metal
@@ -32,12 +33,6 @@ module Api
     use_renderers :json
     check_authorization
 
-    # Temporary measure to help debugging strong_parameters
-    rescue_from ActiveModel::ForbiddenAttributesError, with: :print_params
-    def print_params
-      raise ActiveModel::ForbiddenAttributesError, params.to_s
-    end
-
     def set_jsonp_format
       return unless params[:callback] && request.get?
 

app/controllers/api/order_cycles_controller.rb

@@ -75,7 +75,7 @@ module Api
     end
 
     def permitted_ransack_params
-      [:name_or_meta_keywords_or_supplier_name_cont,
+      [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
        :properties_id_or_supplier_properties_id_in_any,
        :primary_taxon_id_in_any]
     end

app/controllers/api/states_controller.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Api
+  class StatesController < Api::BaseController
+    respond_to :json
+
+    skip_authorization_check
+
+    def index
+      render json: states, each_serializer: Api::StateSerializer, status: :ok
+    end
+
+    def show
+      @state = scope.find(params[:id])
+      render json: @state, serializer: Api::StateSerializer, status: :ok
+    end
+
+    private
+
+    def scope
+      if params[:country_id]
+        @country = Spree::Country.find(params[:country_id])
+        @country.states
+      else
+        Spree::State.all
+      end
+    end
+
+    def states
+      states = scope.ransack(params[:q]).result.
+        includes(:country).order('name ASC')
+
+      if pagination?
+        states = states.page(params[:page]).per(params[:per_page])
+      end
+
+      states
+    end
+
+    def pagination?
+      params[:page] || params[:per_page]
+    end
+  end
+end

app/controllers/api/terms_and_conditions_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Api
+  class TermsAndConditionsController < Api::EnterpriseAttachmentController
+    private
+
+    def attachment_name
+      :terms_and_conditions
+    end
+
+    def enterprise_authorize_action
+      case action_name.to_sym
+      when :destroy
+        :remove_terms_and_conditions
+      end
+    end
+  end
+end

app/controllers/application_controller.rb

@@ -10,12 +10,6 @@ class ApplicationController < ActionController::Base
   include EnterprisesHelper
   include Spree::AuthenticationHelpers
 
-  # Temporary measure to help debugging strong_parameters
-  rescue_from ActiveModel::ForbiddenAttributesError, with: :print_params
-  def print_params
-    raise ActiveModel::ForbiddenAttributesError, params.to_s
-  end
-
   def redirect_to(options = {}, response_status = {})
     ::Rails.logger.error("Redirected by #{begin
                                             caller(1).first
@@ -62,11 +56,15 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    session[:shopfront_redirect] || main_app.root_path
+    shopfront_redirect || main_app.root_path
   end
 
   private
 
+  def shopfront_redirect
+    session[:shopfront_redirect]
+  end
+
   def restrict_iframes
     response.headers['X-Frame-Options'] = 'DENY'
     response.headers['Content-Security-Policy'] = "frame-ancestors 'none'"

app/controllers/base_controller.rb

@@ -1,8 +1,10 @@
+require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/respond_with'
 require 'open_food_network/tag_rule_applicator'
 
 class BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order

app/controllers/checkout_controller.rb

@@ -32,20 +32,20 @@ class CheckoutController < Spree::StoreController
 
   helper 'spree/orders'
 
-  rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
-
   def edit
     return handle_redirect_from_stripe if valid_payment_intent_provided?
 
     # This is only required because of spree_paypal_express. If we implement
     # a version of paypal that uses this controller, and more specifically
-    # the #update_failed method, then we can remove this call
+    # the #action_failed method, then we can remove this call
     OrderCheckoutRestart.new(@order).call
+  rescue Spree::Core::GatewayError => e
+    rescue_from_spree_gateway_error(e)
   end
 
   def update
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
-    return update_failed unless @order.update(params_adapter.params[:order])
+    return action_failed unless @order.update(params_adapter.params[:order])
 
     fire_event('spree.checkout.update')
 
@@ -54,7 +54,7 @@ class CheckoutController < Spree::StoreController
     rescue_from_spree_gateway_error(e)
   rescue StandardError => e
     flash[:error] = I18n.t("checkout.failed")
-    update_failed(e)
+    action_failed(e)
   end
 
   # Clears the cached order. Required for #current_order to return a new order
@@ -138,14 +138,6 @@ class CheckoutController < Spree::StoreController
     current_order.payments.destroy_all if request.put?
   end
 
-  def rescue_from_spree_gateway_error(error)
-    flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
-    respond_to do |format|
-      format.html { render :edit }
-      format.json { render json: { flash: flash.to_hash }, status: :bad_request }
-    end
-  end
-
   def valid_payment_intent_provided?
     return false unless params["payment_intent"]&.starts_with?("pi_")
 
@@ -156,11 +148,10 @@ class CheckoutController < Spree::StoreController
   end
 
   def handle_redirect_from_stripe
-    if advance_order_state(@order) && order_complete?
+    if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
       redirect_to(order_path(@order)) && return
     else
-      flash[:error] = order_error
       checkout_failed
     end
   end
@@ -171,11 +162,9 @@ class CheckoutController < Spree::StoreController
         return if redirect_to_payment_gateway
       end
 
-      @order.select_shipping_method(shipping_method_id) if @order.state == "delivery"
+      next if OrderWorkflow.new(@order).next({ shipping_method_id: shipping_method_id })
 
-      next if advance_order_state(@order)
-
-      return update_failed
+      return action_failed
     end
 
     update_response
@@ -190,15 +179,6 @@ class CheckoutController < Spree::StoreController
     true
   end
 
-  # Perform order.next, guarding against StaleObjectErrors
-  def advance_order_state(order)
-    tries ||= 3
-    order.next
-  rescue ActiveRecord::StaleObjectError
-    retry unless (tries -= 1).zero?
-    false
-  end
-
   def order_error
     if @order.errors.present?
       @order.errors.full_messages.to_sentence
@@ -212,7 +192,7 @@ class CheckoutController < Spree::StoreController
       checkout_succeeded
       update_succeeded_response
     else
-      update_failed(RuntimeError.new("Order not complete after the checkout workflow"))
+      action_failed(RuntimeError.new("Order not complete after the checkout workflow"))
     end
   end
 
@@ -238,30 +218,42 @@ class CheckoutController < Spree::StoreController
     end
   end
 
-  def update_failed(error = RuntimeError.new(order_error))
-    Bugsnag.notify(error)
-
-    flash[:error] = order_error if flash.blank?
-    checkout_failed
-    update_failed_response
+  def action_failed(error = RuntimeError.new(order_error))
+    checkout_failed(error)
+    action_failed_response
   end
 
-  def checkout_failed
+  def checkout_failed(error = RuntimeError.new(order_error))
+    Bugsnag.notify(error)
+    flash[:error] = order_error if flash.blank?
     Checkout::PostCheckoutActions.new(@order).failure
   end
 
-  def update_failed_response
+  def action_failed_response
     respond_to do |format|
       format.html do
         render :edit
       end
       format.json do
+        discard_flash_errors
         render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
       end
     end
   end
 
+  def rescue_from_spree_gateway_error(error)
+    flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
+    action_failed(error)
+  end
+
   def permitted_params
     PermittedAttributes::Checkout.new(params).call
   end
+
+  def discard_flash_errors
+    # Marks flash errors for deletion after the current action has completed.
+    # This ensures flash errors generated during XHR requests are not persisted in the
+    # session for longer than expected.
+    flash.discard(:error)
+  end
 end

app/controllers/concerns/paper_trail_logging.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# This concern adds additional Papertrail logging options so that the id of the
+# user that modified the record is also logged.
+# See: https://github.com/paper-trail-gem/paper_trail#setting-whodunnit-with-a-controller-callback
+
+module PaperTrailLogging
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_paper_trail_whodunnit
+  end
+
+  def user_for_paper_trail
+    spree_current_user
+  end
+end

app/controllers/spree/admin/images_controller.rb

@@ -8,9 +8,55 @@ module Spree
 
       before_action :load_data
 
-      create.before :set_viewable
-      update.before :set_viewable
-      destroy.before :destroy_before
+      def index
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def new
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
+        render layout: !request.xhr?
+      end
+
+      def create
+        @url_filters = ::ProductFilters.new.extract(params)
+        set_viewable
+
+        @object.attributes = permitted_resource_params
+        if @object.save
+          flash[:success] = flash_message_for(@object, :successfully_created)
+          redirect_to admin_product_images_url(params[:product_id], @url_filters)
+        else
+          respond_with(@object)
+        end
+      end
+
+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def update
+        @url_filters = ::ProductFilters.new.extract(params)
+        set_viewable
+
+        if @object.update(permitted_resource_params)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          redirect_to admin_product_images_url(params[:product_id], @url_filters)
+        else
+          respond_with(@object)
+        end
+      end
+
+      def destroy
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+        destroy_before
+
+        if @object.destroy
+          flash[:success] = flash_message_for(@object, :successfully_removed)
+        end
+
+        redirect_to admin_product_images_url(params[:product_id], @url_filters)
+      end
 
       private
 

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

@@ -23,7 +23,7 @@ module Spree
               @order.associate_user!(Spree.user_class.find_by(email: @order.email))
             end
 
-            AdvanceOrderService.new(@order).call
+            OrderWorkflow.new(@order).complete
 
             @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
@@ -51,7 +51,7 @@ module Spree
         end
 
         def load_order
-          @order = Order.find_by_number!(params[:order_id], include: :adjustments)
+          @order = Order.find_by!({ number: params[:order_id] }, include: :adjustments)
         end
 
         def check_authorization

app/controllers/spree/admin/orders_controller.rb

@@ -35,7 +35,7 @@ module Spree
       def edit
         @order.shipments.map(&:refresh_rates)
 
-        AdvanceOrderService.new(@order).call
+        OrderWorkflow.new(@order).complete
 
         # The payment step shows an error of 'No pending payments'
         # Clearing the errors from the order object will stop this error
@@ -80,7 +80,7 @@ module Spree
 
       def resend
         Spree::OrderMailer.confirm_email_for_customer(@order.id, true).deliver
-        flash[:success] = t(:order_email_resent)
+        flash[:success] = t('admin.orders.order_email_resent')
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end

app/controllers/spree/admin/payments_controller.rb

@@ -37,7 +37,7 @@ module Spree
 
             redirect_to admin_order_payments_path(@order)
           else
-            AdvanceOrderService.new(@order).call!
+            OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
             redirect_to edit_admin_order_url(@order)

app/controllers/spree/admin/product_properties_controller.rb

@@ -5,6 +5,20 @@ module Spree
       before_action :find_properties
       before_action :setup_property, only: [:index]
 
+      def index
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def destroy
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
+        if @object.destroy
+          flash[:success] = flash_message_for(@object, :successfully_removed)
+        end
+        # if destroy fails it won't show any errors to the user
+        redirect_to admin_product_product_properties_url(params[:product_id], @url_filters)
+      end
+
       private
 
       def find_properties

app/controllers/spree/admin/products_controller.rb

@@ -10,35 +10,32 @@ module Spree
       include OrderCyclesHelper
       include EnterprisesHelper
 
-      create.before :create_before
-      update.before :update_before
-
       before_action :load_data
       before_action :load_form_data, only: [:index, :new, :create, :edit, :update]
       before_action :load_spree_api_key, only: [:index, :variant_overrides]
       before_action :strip_new_properties, only: [:create, :update]
 
-      respond_override create: { html: {
-        success: lambda {
-          if params[:button] == "add_another"
-            redirect_to new_admin_product_path
-          else
-            redirect_to admin_products_path
-          end
-        },
-        failure: lambda {
-          render :new
-        }
-      } }
-
       def new
         @object.shipping_category = DefaultShippingCategory.find_or_create
-        super
       end
 
       def create
         delete_stock_params_and_set_after do
-          super
+          if params[:product][:prototype_id].present?
+            @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+          end
+
+          @object.attributes = permitted_resource_params
+          if @object.save
+            flash[:success] = flash_message_for(@object, :successfully_created)
+            if params[:button] == "add_another"
+              redirect_to new_admin_product_path
+            else
+              redirect_to admin_products_path
+            end
+          else
+            render :new
+          end
         end
       rescue Paperclip::Errors::NotIdentifiedByImageMagickError
         invoke_callbacks(:create, :fails)
@@ -56,14 +53,24 @@ module Spree
         @show_latest_import = params[:latest_import] || false
       end
 
-      def update
-        original_supplier_id = @product.supplier_id
+      def edit
+        @url_filters = ::ProductFilters.new.extract(params)
+      end
 
+      def update
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
+        original_supplier_id = @product.supplier_id
         delete_stock_params_and_set_after do
-          super
-          if original_supplier_id != @product.supplier_id
-            ExchangeVariantDeleter.new.delete(@product)
+          params[:product] ||= {} if params[:clear_product_properties]
+          if @object.update(permitted_resource_params)
+            if original_supplier_id != @product.supplier_id
+              ExchangeVariantDeleter.new.delete(@product)
+            end
+
+            flash[:success] = flash_message_for(@object, :successfully_updated)
           end
+          redirect_to edit_admin_product_url(@object, @url_filters)
         end
       end
 
@@ -93,6 +100,14 @@ module Spree
         redirect_to edit_admin_product_url(@new)
       end
 
+      def group_buy_options
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def seo
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
       protected
 
       def find_resource
@@ -135,19 +150,6 @@ module Spree
         @collection
       end
 
-      def create_before
-        return if params[:product][:prototype_id].blank?
-
-        @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-      end
-
-      def update_before
-        # We only reset the product properties if we're receiving a post from the form on that tab
-        return unless params[:clear_product_properties]
-
-        params[:product] ||= {}
-      end
-
       def product_includes
         [{ variants: [:images, { option_values: :option_type }] },
          { master: [:images, :default_price] }]

app/controllers/spree/admin/resource_controller.rb

@@ -178,7 +178,7 @@ module Spree
         return nil if parent_data.blank?
 
         @parent ||= parent_data[:model_class].
-          public_send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
+          public_send("find_by", parent_data[:find_by] => params["#{model_name}_id"])
         instance_variable_set("@#{model_name}", @parent)
       end
 

app/controllers/spree/admin/tax_rates_controller.rb

@@ -3,9 +3,6 @@ module Spree
     class TaxRatesController < ResourceController
       before_action :load_data
 
-      update.after :update_after
-      create.after :create_after
-
       private
 
       def load_data
@@ -14,14 +11,6 @@ module Spree
         @calculators = TaxRate.calculators.sort_by(&:name)
       end
 
-      def update_after
-        Rails.cache.delete('vat_rates')
-      end
-
-      def create_after
-        Rails.cache.delete('vat_rates')
-      end
-
       def permitted_resource_params
         params.require(:tax_rate).permit(
           :name, :amount, :included_in_price, :zone_id,

app/controllers/spree/admin/variants_controller.rb

@@ -4,14 +4,46 @@ module Spree
   module Admin
     class VariantsController < ResourceController
       helper 'spree/products'
+
       belongs_to 'spree/product', find_by: :permalink
       new_action.before :new_before
 
+      def index
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
+      def update
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
+        if @object.update(permitted_resource_params)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
+        else
+          redirect_to edit_admin_product_variant_url(params[:product_id], @object, @url_filters)
+        end
+      end
+
+      def new
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
       def create
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
         on_demand = params[:variant].delete(:on_demand)
         on_hand = params[:variant].delete(:on_hand)
 
-        super
+        @object.attributes = permitted_resource_params
+        if @object.save
+          flash[:success] = flash_message_for(@object, :successfully_created)
+          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
+        else
+          redirect_to new_admin_product_variant_url(params[:product_id], @url_filters)
+        end
 
         return unless @object.present? && @object.valid?
 
@@ -26,6 +58,8 @@ module Spree
       end
 
       def destroy
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+
         @variant = Spree::Variant.find(params[:id])
         flash[:success] = if VariantDeleter.new.delete(@variant)
                             Spree.t('notice_messages.variant_deleted')
@@ -33,9 +67,7 @@ module Spree
                             Spree.t('notice_messages.variant_not_deleted')
                           end
 
-        respond_with(@variant) do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-        end
+        redirect_to admin_product_variants_url(params[:product_id], @url_filters)
       end
 
       protected

app/controllers/spree/base_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'cancan'
+require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/respond_with'
+require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/ssl'
+
+module Spree
+  class BaseController < ApplicationController
+    include Spree::Core::ControllerHelpers::Auth
+    include Spree::Core::ControllerHelpers::RespondWith
+    include Spree::Core::ControllerHelpers::SSL
+    include Spree::Core::ControllerHelpers::Common
+
+    respond_to :html
+  end
+end
+
+require 'spree/i18n/initializer'

app/controllers/spree/store_controller.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'spree/core/controller_helpers/order'
+
 module Spree
   class StoreController < Spree::BaseController
     layout 'darkswarm'

app/controllers/spree/user_passwords_controller.rb

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserPasswordsController < Devise::PasswordsController
     helper 'spree/base', 'spree/store'

app/controllers/spree/user_registrations_controller.rb

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
     helper 'spree/base', 'spree/store'

app/controllers/spree/user_sessions_controller.rb

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserSessionsController < Devise::SessionsController
     helper 'spree/base', 'spree/store'
@@ -39,8 +46,18 @@ module Spree
       end
     end
 
+    def destroy
+      # Logout will clear session data including shopfront_redirect
+      #   Here we store it before actually logging out so that the redirect works correctly
+      @shopfront_redirect = session[:shopfront_redirect]
+
+      super
+    end
+
     private
 
+    attr_reader :shopfront_redirect
+
     def accurate_title
       Spree.t(:login)
     end

app/controllers/user_confirmations_controller.rb

@@ -44,9 +44,10 @@ class UserConfirmationsController < DeviseController
         'not_confirmed'
       end
 
-    if resource.reset_password_token.present?
+    if result == 'confirmed' && resource.reset_password_token.present?
+      raw_reset_password_token = resource.regenerate_reset_password_token
       return spree.edit_spree_user_password_path(
-        reset_password_token: resource.reset_password_token
+        reset_password_token: raw_reset_password_token
       )
     end
 

app/helpers/order_helper.rb

@@ -4,4 +4,8 @@ module OrderHelper
   def last_payment_method(order)
     OrderPaymentFinder.new(order).last_payment&.payment_method
   end
+
+  def outstanding_balance_label(order)
+    order.outstanding_balance.negative? ? t(:credit_owed) : t(:balance_due)
+  end
 end

app/helpers/spree/admin/images_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module ImagesHelper
+      def options_text_for(image)
+        if image.viewable.is_a?(Spree::Variant)
+          if image.viewable.is_master?
+            I18n.t(:all)
+          else
+            image.viewable.options_text
+          end
+        else
+          I18n.t(:all)
+        end
+      end
+    end
+  end
+end

app/helpers/spree/base_helper.rb

@@ -1,17 +1,12 @@
+# frozen_string_literal: true
+
 module Spree
   module BaseHelper
-    # human readable list of variant options
-    # Override: Do not show out of stock text
-    def variant_options(variant, _options = {})
-      variant.options_text
-    end
-
-    # Overriden to eager-load :states
     def available_countries
       checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
 
       countries = if checkout_zone && checkout_zone.kind == 'country'
-                    checkout_zone.country_list
+                    checkout_zone.countries
                   else
                     Country.includes(:states).all
                   end
@@ -21,5 +16,10 @@ module Spree
         country
       end.sort { |a, b| a.name <=> b.name }
     end
+
+    def pretty_time(time)
+      [I18n.l(time.to_date, format: :long),
+       time.strftime("%l:%M %p")].join(" ")
+    end
   end
 end

app/jobs/subscription_confirm_job.rb

@@ -45,27 +45,33 @@ class SubscriptionConfirmJob
   def confirm_order!(order)
     record_order(order)
 
-    if process_payment!(order)
-      send_confirmation_email(order)
-    else
+    process_payment!(order)
+    send_confirmation_email(order)
+  rescue StandardError => e
+    if order.errors.any?
       send_failed_payment_email(order)
+    else
+      Bugsnag.notify(e, order: order)
+      send_failed_payment_email(order, e.message)
     end
   end
 
+  # Process the order payment and raise if it's not successful
   def process_payment!(order)
-    return false if order.errors.present?
-    return true unless order.payment_required?
+    raise if order.errors.present?
+    return unless order.payment_required?
 
+    prepare_for_payment!(order)
+    order.process_payments!
+    raise if order.errors.any?
+  end
+
+  def prepare_for_payment!(order)
     setup_payment!(order)
-    return false if order.errors.any?
+    raise if order.errors.any?
 
     authorize_payment!(order)
-    return false if order.errors.any?
-
-    order.process_payments!
-    return false if order.errors.any?
-
-    true
+    raise if order.errors.any?
   end
 
   def setup_payment!(order)
@@ -87,9 +93,11 @@ class SubscriptionConfirmJob
     SubscriptionMailer.confirmation_email(order).deliver
   end
 
-  def send_failed_payment_email(order)
+  def send_failed_payment_email(order, error_message = nil)
     order.update!
-    record_and_log_error(:failed_payment, order)
+    record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver
+  rescue StandardError => e
+    Bugsnag.notify(e, order: order, error_message: error_message)
   end
 end

app/jobs/subscription_placement_job.rb

@@ -29,10 +29,16 @@ class SubscriptionPlacementJob
 
   def place_order_for(proxy_order)
     JobLogger.logger.info("Placing Order for Proxy Order #{proxy_order.id}")
-    proxy_order.initialise_order!
+    initialise_order(proxy_order)
     place_order(proxy_order.order)
   end
 
+  def initialise_order(proxy_order)
+    proxy_order.initialise_order!
+  rescue StandardError => e
+    Bugsnag.notify(e, subscription: proxy_order.subscription, proxy_order: proxy_order)
+  end
+
   def place_order(order)
     record_order(order)
     return record_issue(:complete, order) if order.completed?
@@ -42,8 +48,9 @@ class SubscriptionPlacementJob
 
     move_to_completion(order)
     send_placement_email(order, changes)
-  rescue StateMachine::InvalidTransition
-    record_and_log_error(:processing, order)
+  rescue StandardError => e
+    record_and_log_error(:processing, order, e.message)
+    Bugsnag.notify(e, order: order)
   end
 
   def cap_quantity_and_store_changes(order)
@@ -66,7 +73,7 @@ class SubscriptionPlacementJob
   end
 
   def move_to_completion(order)
-    AdvanceOrderService.new(order).call!
+    OrderWorkflow.new(order).complete!
   end
 
   def unavailable_stock_lines_for(order)

app/mailers/spree/base_mailer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Spree
+  class BaseMailer < ActionMailer::Base
+    # Inline stylesheets
+    include Roadie::Rails::Automatic
+
+    layout 'mailer'
+
+    def from_address
+      Spree::Config[:mails_from]
+    end
+
+    def money(amount)
+      Spree::Money.new(amount).to_s
+    end
+    helper_method :money
+
+    protected
+
+    def roadie_options
+      # This lets us specify assets using relative paths in email templates
+      super.merge(url_options: { host: URI(main_app.root_url).host })
+    end
+  end
+end

app/mailers/spree/base_mailer_decorator.rb

@@ -1,14 +0,0 @@
-Spree::BaseMailer.class_eval do
-  # Inline stylesheets
-  include Roadie::Rails::Automatic
-
-  # Define layout
-  layout 'mailer'
-
-  protected
-
-  def roadie_options
-    # This lets us specify assets using relative paths in email templates
-    super.merge(url_options: { host: URI(main_app.root_url).host })
-  end
-end

app/mailers/spree/order_mailer.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Spree
+  class OrderMailer < BaseMailer
+    helper HtmlHelper
+    helper ::CheckoutHelper
+    helper SpreeCurrencyHelper
+    helper Spree::Admin::PaymentsHelper
+    helper OrderHelper
+    include I18nHelper
+
+    def cancel_email(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        mail(to: @order.email,
+             from: from_address,
+             subject: mail_subject(t('spree.order_mailer.cancel_email.subject'), resend))
+      end
+    end
+
+    def confirm_email_for_customer(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
+        mail(to: @order.email,
+             from: from_address,
+             subject: subject,
+             reply_to: @order.distributor.contact.email)
+      end
+    end
+
+    def confirm_email_for_shop(order_or_order_id, resend = false)
+      @order = find_order(order_or_order_id)
+      I18n.with_locale valid_locale(@order.user) do
+        subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
+        mail(to: @order.distributor.contact.email,
+             from: from_address,
+             subject: subject)
+      end
+    end
+
+    def invoice_email(order_or_order_id, pdf)
+      @order = find_order(order_or_order_id)
+      attach_file("invoice-#{@order.number}.pdf", pdf)
+      I18n.with_locale valid_locale(@order.user) do
+        mail(to: @order.email,
+             from: from_address,
+             subject: mail_subject(t(:invoice), false),
+             reply_to: @order.distributor.contact.email)
+      end
+    end
+
+    private
+
+    # Finds an order instance from an order or from an order id
+    def find_order(order_or_order_id)
+      order_or_order_id.respond_to?(:id) ? order_or_order_id : Spree::Order.find(order_or_order_id)
+    end
+
+    def mail_subject(base_subject, resend)
+      resend_prefix = (resend ? "[#{t(:resend).upcase}] " : '')
+      "#{resend_prefix}#{Spree::Config[:site_name]} #{base_subject} ##{@order.number}"
+    end
+
+    def attach_file(filename, file)
+      attachments[filename] = file if file.present?
+    end
+  end
+end

app/mailers/spree/order_mailer_decorator.rb

@@ -1,64 +0,0 @@
-Spree::OrderMailer.class_eval do
-  helper HtmlHelper
-  helper CheckoutHelper
-  helper SpreeCurrencyHelper
-  helper OrderHelper
-  include I18nHelper
-
-  def cancel_email(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      mail(to: @order.email,
-           from: from_address,
-           subject: mail_subject(t('spree.order_mailer.cancel_email.subject'), resend))
-    end
-  end
-
-  def confirm_email_for_customer(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
-      mail(to: @order.email,
-           from: from_address,
-           subject: subject,
-           reply_to: @order.distributor.contact.email)
-    end
-  end
-
-  def confirm_email_for_shop(order_or_order_id, resend = false)
-    @order = find_order(order_or_order_id)
-    I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
-      mail(to: @order.distributor.contact.email,
-           from: from_address,
-           subject: subject)
-    end
-  end
-
-  def invoice_email(order_or_order_id, pdf)
-    @order = find_order(order_or_order_id)
-    attach_file("invoice-#{@order.number}.pdf", pdf)
-    I18n.with_locale valid_locale(@order.user) do
-      mail(to: @order.email,
-           from: from_address,
-           subject: mail_subject(t(:invoice), false),
-           reply_to: @order.distributor.contact.email)
-    end
-  end
-
-  private
-
-  # Finds an order instance from an order or from an order id
-  def find_order(order_or_order_id)
-    order_or_order_id.respond_to?(:id) ? order_or_order_id : Spree::Order.find(order_or_order_id)
-  end
-
-  def mail_subject(base_subject, resend)
-    resend_prefix = (resend ? "[#{t(:resend).upcase}] " : '')
-    "#{resend_prefix}#{Spree::Config[:site_name]} #{base_subject} ##{@order.number}"
-  end
-
-  def attach_file(filename, file)
-    attachments[filename] = file if file.present?
-  end
-end

app/mailers/spree/shipment_mailer.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShipmentMailer < BaseMailer
+    def shipped_email(shipment, resend = false)
+      @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      base_subject = t('spree.shipment_mailer.shipped_email.subject')
+      subject += "#{Spree::Config[:site_name]} #{base_subject} ##{@shipment.order.number}"
+      mail(to: @shipment.order.email, from: from_address, subject: subject)
+    end
+  end
+end

app/mailers/spree/test_mailer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  class TestMailer < BaseMailer
+    def test_email(user)
+      recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
+      subject = "#{Spree::Config[:site_name]} #{t('spree.test_mailer.test_email.subject')}"
+      mail(to: recipient.email, from: from_address, subject: subject)
+    end
+  end
+end

app/mailers/spree/user_mailer.rb

@@ -5,12 +5,11 @@ module Spree
     include I18nHelper
 
     # Overrides `Devise::Mailer.reset_password_instructions`
-    def reset_password_instructions(user)
-      recipient = user.respond_to?(:id) ? user : Spree.user_class.find(user)
+    def reset_password_instructions(user, token, _opts = {})
       @edit_password_reset_url = spree.
-        edit_spree_user_password_url(reset_password_token: recipient.reset_password_token)
+        edit_spree_user_password_url(reset_password_token: token)
 
-      mail(to: recipient.email, from: from_address,
+      mail(to: user.email, from: from_address,
            subject: Spree::Config[:site_name] + ' ' +
              I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]))
     end
@@ -25,8 +24,9 @@ module Spree
     end
 
     # Overrides `Devise::Mailer.confirmation_instructions`
-    def confirmation_instructions(user, _opts)
+    def confirmation_instructions(user, token, _opts = {})
       @user = user
+      @token = token
       @instance = Spree::Config[:site_name]
       @contact = ContentConfig.footer_email
 

app/mailers/subscription_mailer.rb

@@ -2,6 +2,7 @@ class SubscriptionMailer < Spree::BaseMailer
   helper CheckoutHelper
   helper ShopMailHelper
   helper OrderHelper
+  helper Spree::Admin::PaymentsHelper
   include I18nHelper
 
   def confirmation_email(order)

app/models/concerns/payment_method_distributors.rb

@@ -1,14 +1,19 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 # This concern is used to duplicate the associations distributors and distributor_ids
 #   across payment method and gateway
 #   this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
-module Spree::PaymentMethodDistributors
+module PaymentMethodDistributors
   extend ActiveSupport::Concern
 
   def self.included(base)
     base.class_eval do
-      has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods', class_name: 'Enterprise', foreign_key: 'payment_method_id', association_foreign_key: 'distributor_id'
+      has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods',
+                                             class_name: 'Enterprise',
+                                             foreign_key: 'payment_method_id',
+                                             association_foreign_key: 'distributor_id'
     end
   end
 end

app/models/content_configuration.rb

@@ -21,6 +21,8 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration
   preference :open_street_map_enabled, :boolean, default: false
   preference :open_street_map_provider_name, :string, default: "OpenStreetMap.Mapnik"
   preference :open_street_map_provider_options, :text, default: "{}"
+  preference :open_street_map_default_latitude, :string, default: "-37.4713077"
+  preference :open_street_map_default_longitude, :string, default: "144.7851531"
 
   # Producer sign-up page
   # All the following defaults using I18n don't work.

app/models/enterprise.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: false
+
+require 'spree/core/s3_support'
+
 class Enterprise < ActiveRecord::Base
   SELLS = %w(unspecified none own any).freeze
   ENTERPRISE_SEARCH_RADIUS = 100
@@ -6,11 +10,9 @@ class Enterprise < ActiveRecord::Base
   preference :shopfront_closed_message, :text, default: ""
   preference :shopfront_taxon_order, :string, default: ""
   preference :shopfront_order_cycle_order, :string, default: "orders_close_at"
+  preference :show_customer_names_to_suppliers, :boolean, default: false
 
-  # This is hopefully a temporary measure, pending the arrival of multiple named inventories
-  # for shops. We need this here to allow hubs to restrict visible variants to only those in
-  # their inventory if they so choose
-  # TODO: delegate this to a separate model instead of abusing Preferences.
+  # Allow hubs to restrict visible variants to only those in their inventory
   preference :product_selection_from_inventory_only, :boolean, default: false
 
   has_paper_trail only: [:owner_id, :sells], on: [:update]
@@ -73,10 +75,16 @@ class Enterprise < ActiveRecord::Base
                     },
                     url: '/images/enterprises/promo_images/:id/:style/:basename.:extension',
                     path: 'public/images/enterprises/promo_images/:id/:style/:basename.:extension'
-
   validates_attachment_content_type :logo, content_type: %r{\Aimage/.*\Z}
   validates_attachment_content_type :promo_image, content_type: %r{\Aimage/.*\Z}
 
+  has_attached_file :terms_and_conditions,
+                    url: '/files/enterprises/terms_and_conditions/:id/:basename.:extension',
+                    path: 'public/files/enterprises/terms_and_conditions/:id/:basename.:extension'
+  validates_attachment_content_type :terms_and_conditions,
+                                    content_type: "application/pdf",
+                                    message: I18n.t(:enterprise_terms_and_conditions_type_error)
+
   include Spree::Core::S3Support
   supports_s3 :logo
   supports_s3 :promo_image

app/models/enterprise_relationship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class EnterpriseRelationship < ActiveRecord::Base
   belongs_to :parent, class_name: 'Enterprise', touch: true
   belongs_to :child, class_name: 'Enterprise', touch: true