Merge pull request #6002 from openfoodfoundation/dependabot/bundler/unicorn-5.7.0

Bump unicorn from 5.6.0 to 5.7.0

.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

@@ -38,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

@@ -330,6 +330,13 @@ Layout/LineLength:
   - 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
@@ -459,6 +466,13 @@ Metrics/AbcSize:
   - 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
@@ -501,6 +515,9 @@ Metrics/BlockLength:
   - 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
@@ -535,6 +552,9 @@ Metrics/CyclomaticComplexity:
   - 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
@@ -563,6 +583,8 @@ Metrics/PerceivedComplexity:
   - 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
@@ -675,6 +697,15 @@ Metrics/MethodLength:
   - 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
@@ -719,6 +750,8 @@ Metrics/ClassLength:
   - 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
@@ -764,6 +797,8 @@ Metrics/ModuleLength:
   - 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

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-08-13 16:05:53 +1000 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
@@ -28,13 +28,14 @@ Layout/EmptyLines:
   Exclude:
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 3
+# 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.
@@ -61,7 +62,7 @@ Layout/FirstHashElementIndentation:
     - 'spec/models/spree/payment_spec.rb'
     - 'spec/swagger_helper.rb'
 
-# Offense count: 5
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -69,6 +70,7 @@ Layout/FirstHashElementIndentation:
 # 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
@@ -79,13 +81,6 @@ Layout/IndentationConsistency:
   Exclude:
     - 'spec/models/spree/order/checkout_spec.rb'
 
-# Offense count: 26
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 409
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -123,13 +118,22 @@ Layout/SpaceInsideHashLiteralBraces:
     - '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/controllers/base_controller2_spec.rb'
     - '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
@@ -145,6 +149,13 @@ Lint/IneffectiveAccessModifier:
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/factories/stock_location_factory.rb'
+
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
@@ -160,48 +171,6 @@ Lint/UselessAccessModifier:
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/spree/core/controller_helpers/common.rb'
-
-# Offense count: 19
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 126
-
-# Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 102
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 231
-
-# Offense count: 3
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 23
-
-# Offense count: 19
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 140
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 208
-
-# Offense count: 2
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 24
-
 # Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
@@ -227,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_
@@ -241,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'
@@ -252,6 +222,13 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
+# 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:
@@ -261,12 +238,13 @@ Rails/ActiveRecordAliases:
     - 'spec/features/consumer/shopping/orders_spec.rb'
     - 'spec/requests/api/orders_spec.rb'
 
-# Offense count: 1
+# 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.
@@ -281,7 +259,7 @@ Rails/Delegate:
 # 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.
@@ -323,7 +301,7 @@ Rails/FindEach:
     - '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:
@@ -332,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: 26
+# Offense count: 27
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -342,8 +321,9 @@ 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'
@@ -392,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'
@@ -403,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'
 
@@ -422,7 +403,7 @@ Rails/ReflectionClassName:
     - 'app/models/enterprise_role.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 233
+# 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:
@@ -439,17 +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.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'
@@ -494,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'
@@ -510,7 +494,7 @@ Rails/SkipsModelValidations:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
@@ -518,6 +502,7 @@ Rails/UniqueValidationWithoutIndex:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
     - 'app/models/spree/stock_item.rb'
+    - 'app/models/spree/zone.rb'
 
 # Offense count: 2
 # Configuration parameters: Environments.
@@ -527,23 +512,29 @@ Rails/UnknownEnv:
     - '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:
   Exclude:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 71
+# 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'
@@ -601,11 +592,13 @@ Style/ClassAndModuleChildren:
     - 'app/serializers/api/variant_serializer.rb'
     - 'lib/open_food_network/locking.rb'
     - 'spec/controllers/spree/admin/base_controller_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.
@@ -615,7 +608,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 847
+# Offense count: 829
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -710,10 +703,6 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/credit_cards_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'
@@ -781,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'
@@ -796,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'
@@ -824,16 +810,12 @@ Style/FrozenStringLiteralComment:
     - '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_method_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
@@ -842,7 +824,6 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
     - 'app/models/spree/shipping_method_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'
@@ -1125,7 +1106,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/api/taxonomies_controller_spec.rb'
     - 'spec/controllers/api/taxons_controller_spec.rb'
     - 'spec/controllers/api/variants_controller_spec.rb'
-    - 'spec/controllers/base_controller2_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
     - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
@@ -1169,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'
@@ -1323,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'
@@ -1461,6 +1442,7 @@ Style/FrozenStringLiteralComment:
     - '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: 48
 # Configuration parameters: MinBodyLength.
@@ -1491,18 +1473,21 @@ Style/GuardClause:
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 54
+# 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: 1
+# Offense count: 2
 Style/MissingRespondToMissing:
   Exclude:
     - 'app/helpers/application_helper.rb'
+    - 'app/models/spree/gateway.rb'
 
 # Offense count: 2
 Style/MixinUsage:
@@ -1510,7 +1495,7 @@ Style/MixinUsage:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 39
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1521,7 +1506,6 @@ 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'
@@ -1548,6 +1532,18 @@ 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.
@@ -1556,6 +1552,14 @@ 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:

Gemfile.lock

@@ -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)
@@ -148,7 +148,7 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bugsnag (6.16.0)
+    bugsnag (6.17.0)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)
@@ -204,7 +204,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.39.0)
+    ddtrace (0.40.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -439,7 +439,7 @@ 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)
@@ -509,7 +509,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -671,7 +671,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.6.0)
+    unicorn (5.7.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -687,7 +687,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)

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/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/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()

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/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
@@ -39,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/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/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/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/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/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/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/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/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

@@ -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

@@ -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/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/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

@@ -1,6 +1,10 @@
 # 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

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/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/mailers/spree/order_mailer.rb

@@ -5,6 +5,7 @@ module Spree
     helper HtmlHelper
     helper ::CheckoutHelper
     helper SpreeCurrencyHelper
+    helper Spree::Admin::PaymentsHelper
     helper OrderHelper
     include I18nHelper
 

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/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

app/models/product_import/unit_converter.rb

@@ -32,6 +32,8 @@ module ProductImport
       {
         'g' => { scale: 1, unit: 'weight' },
         'kg' => { scale: 1000, unit: 'weight' },
+        'oz' => { scale: 28.35, unit: 'weight' },
+        'lb' => { scale: 453.6, unit: 'weight' },
         't' => { scale: 1_000_000, unit: 'weight' },
         'ml' => { scale: 0.001, unit: 'volume' },
         'l' => { scale: 1, unit: 'volume' },

app/models/spree/ability_decorator.rb

@@ -97,7 +97,9 @@ class AbilityDecorator
     end
 
     can [:admin, :index, :create], Enterprise
-    can [:read, :edit, :update, :remove_logo, :remove_promo_image, :bulk_update, :resend_confirmation], Enterprise do |enterprise|
+    can [:read, :edit, :update,
+         :remove_logo, :remove_promo_image, :remove_terms_and_conditions,
+         :bulk_update, :resend_confirmation], Enterprise do |enterprise|
       OpenFoodNetwork::Permissions.new(user).editable_enterprises.include? enterprise
     end
     can [:welcome, :register], Enterprise do |enterprise|

app/models/spree/address.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Spree
+  class Address < ActiveRecord::Base
+    include AddressDisplay
+
+    belongs_to :country, class_name: "Spree::Country"
+    belongs_to :state, class_name: "Spree::State"
+
+    has_one :enterprise, dependent: :restrict_with_exception
+    has_many :shipments
+
+    validates :firstname, :lastname, :address1, :city, :country, presence: true
+    validates :zipcode, presence: true, if: :require_zipcode?
+    validates :phone, presence: true, if: :require_phone?
+
+    validate :state_validate
+
+    after_save :touch_enterprise
+
+    alias_attribute :first_name, :firstname
+    alias_attribute :last_name, :lastname
+    delegate :name, to: :state, prefix: true, allow_nil: true
+
+    geocoded_by :geocode_address
+
+    def self.default
+      country = begin
+                  Spree::Country.find(Spree::Config[:default_country_id])
+                rescue StandardError
+                  Spree::Country.first
+                end
+      new(country: country)
+    end
+
+    def full_name
+      "#{firstname} #{lastname}".strip
+    end
+
+    def state_text
+      state.try(:abbr) || state.try(:name) || state_name
+    end
+
+    def same_as?(other)
+      return false if other.nil?
+
+      attributes.except('id', 'updated_at', 'created_at') ==
+        other.attributes.except('id', 'updated_at', 'created_at')
+    end
+
+    alias same_as same_as?
+
+    def to_s
+      "#{full_name}: #{address1}"
+    end
+
+    def clone
+      self.class.new(attributes.except('id', 'updated_at', 'created_at'))
+    end
+
+    def ==(other)
+      self_attrs = attributes
+      other_attrs = other.respond_to?(:attributes) ? other.attributes : {}
+
+      [self_attrs, other_attrs].each { |attrs|
+        attrs.except!('id', 'created_at', 'updated_at', 'order_id')
+      }
+
+      self_attrs == other_attrs
+    end
+
+    def empty?
+      attributes.except('id', 'created_at', 'updated_at', 'order_id', 'country_id').all? { |_, v|
+        v.nil?
+      }
+    end
+
+    # Generates an ActiveMerchant compatible address hash
+    def active_merchant_hash
+      {
+        name: full_name,
+        address1: address1,
+        address2: address2,
+        city: city,
+        state: state_text,
+        zip: zipcode,
+        country: country.try(:iso),
+        phone: phone
+      }
+    end
+
+    def geocode_address
+      render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
+    end
+
+    def full_address
+      render_address([address1, address2, city, zipcode, state.andand.name])
+    end
+
+    def address_part1
+      render_address([address1, address2])
+    end
+
+    def address_part2
+      render_address([city, zipcode, state.andand.name])
+    end
+
+    private
+
+    def require_phone?
+      true
+    end
+
+    def require_zipcode?
+      true
+    end
+
+    def state_validate
+      # Skip state validation without country (also required)
+      # or when disabled by preference
+      return if country.blank? || !Spree::Config[:address_requires_state]
+      return unless country.states_required
+
+      # Ensure associated state belongs to country
+      if state.present?
+        if state.country == country
+          self.state_name = nil # not required as we have a valid state and country combo
+        elsif state_name.present?
+          self.state = nil
+        else
+          errors.add(:state, :invalid)
+        end
+      end
+
+      # Ensure state_name belongs to country without states,
+      #   or that it matches a predefined state name/abbr
+      if state_name.present?
+        if country.states.present?
+          states = country.states.find_all_by_name_or_abbr(state_name)
+
+          if states.size == 1
+            self.state = states.first
+            self.state_name = nil
+          else
+            errors.add(:state, :invalid)
+          end
+        end
+      end
+
+      # ensure at least one state field is populated
+      errors.add :state, :blank if state.blank? && state_name.blank?
+    end
+
+    def touch_enterprise
+      enterprise.andand.touch
+    end
+
+    def render_address(parts)
+      parts.select(&:present?).join(', ')
+    end
+  end
+end

app/models/spree/address_decorator.rb

@@ -1,38 +0,0 @@
-Spree::Address.class_eval do
-  include AddressDisplay
-
-  has_one :enterprise, dependent: :restrict_with_exception
-  belongs_to :country, class_name: "Spree::Country"
-
-  after_save :touch_enterprise
-
-  geocoded_by :geocode_address
-
-  delegate :name, to: :state, prefix: true, allow_nil: true
-
-  def geocode_address
-    render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
-  end
-
-  def full_address
-    render_address([address1, address2, city, zipcode, state.andand.name])
-  end
-
-  def address_part1
-    render_address([address1, address2])
-  end
-
-  def address_part2
-    render_address([city, zipcode, state.andand.name])
-  end
-
-  private
-
-  def touch_enterprise
-    enterprise.andand.touch
-  end
-
-  def render_address(parts)
-    parts.select(&:present?).join(', ')
-  end
-end

app/models/spree/adjustment.rb

@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require 'spree/localized_number'
+require 'concerns/adjustment_scopes'
+
+# Adjustments represent a change to the +item_total+ of an Order. Each adjustment
+# has an +amount+ that can be either positive or negative.
+#
+# Adjustments can be open/closed/finalized
+#
+# Once an adjustment is finalized, it cannot be changed, but an adjustment can
+# toggle between open/closed as needed
+#
+# Boolean attributes:
+#
+# +mandatory+
+#
+# If this flag is set to true then it means the the charge is required and will not
+# be removed from the order, even if the amount is zero. In other words a record
+# will be created even if the amount is zero. This is useful for representing things
+# such as shipping and tax charges where you may want to make it explicitly clear
+# that no charge was made for such things.
+#
+# +eligible?+
+#
+# This boolean attributes stores whether this adjustment is currently eligible
+# for its order. Only eligible adjustments count towards the order's adjustment
+# total. This allows an adjustment to be preserved if it becomes ineligible so
+# it might be reinstated.
+module Spree
+  class Adjustment < ActiveRecord::Base
+    extend Spree::LocalizedNumber
+
+    # Deletion of metadata is handled in the database.
+    # So we don't need the option `dependent: :destroy` as long as
+    # AdjustmentMetadata has no destroy logic itself.
+    has_one :metadata, class_name: 'AdjustmentMetadata'
+
+    belongs_to :adjustable, polymorphic: true
+    belongs_to :source, polymorphic: true
+    belongs_to :originator, polymorphic: true
+    belongs_to :tax_rate, -> { where spree_adjustments: { originator_type: 'Spree::TaxRate' } },
+               foreign_key: 'originator_id'
+
+    validates :label, presence: true
+    validates :amount, numericality: true
+
+    after_save :update_adjustable
+    after_destroy :update_adjustable
+
+    state_machine :state, initial: :open do
+      event :close do
+        transition from: :open, to: :closed
+      end
+
+      event :open do
+        transition from: :closed, to: :open
+      end
+
+      event :finalize do
+        transition from: [:open, :closed], to: :finalized
+      end
+    end
+
+    scope :tax, -> { where(originator_type: 'Spree::TaxRate', adjustable_type: 'Spree::Order') }
+    scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
+    scope :optional, -> { where(mandatory: false) }
+    scope :charge, -> { where('amount >= 0') }
+    scope :credit, -> { where('amount < 0') }
+    scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
+
+    scope :enterprise_fee, -> { where(originator_type: 'EnterpriseFee') }
+    scope :admin,          -> { where(source_type: nil, originator_type: nil) }
+    scope :included_tax,   -> {
+      where(originator_type: 'Spree::TaxRate', adjustable_type: 'Spree::LineItem')
+    }
+
+    scope :with_tax,       -> { where('spree_adjustments.included_tax <> 0') }
+    scope :without_tax,    -> { where('spree_adjustments.included_tax = 0') }
+    scope :payment_fee,    -> { where(AdjustmentScopes::PAYMENT_FEE_SCOPE) }
+    scope :shipping,       -> { where(AdjustmentScopes::SHIPPING_SCOPE) }
+    scope :eligible,       -> { where(AdjustmentScopes::ELIGIBLE_SCOPE) }
+
+    localize_number :amount
+
+    # Update the boolean _eligible_ attribute which determines which adjustments
+    # count towards the order's adjustment_total.
+    def set_eligibility
+      result = mandatory || (amount != 0 && eligible_for_originator?)
+      update_column(:eligible, result)
+    end
+
+    # Allow originator of the adjustment to perform an additional eligibility of the adjustment
+    # Should return _true_ if originator is absent or doesn't implement _eligible?_
+    def eligible_for_originator?
+      return true if originator.nil?
+
+      !originator.respond_to?(:eligible?) || originator.eligible?(source)
+    end
+
+    # Update both the eligibility and amount of the adjustment. Adjustments
+    # delegate updating of amount to their Originator when present, but only if
+    # +locked+ is false. Adjustments that are +locked+ will never change their amount.
+    #
+    # Adjustments delegate updating of amount to their Originator when present,
+    # but only if when they're in "open" state, closed or finalized adjustments
+    # are not recalculated.
+    #
+    # It receives +calculable+ as the updated source here so calculations can be
+    # performed on the current values of that source. If we used +source+ it
+    # could load the old record from db for the association. e.g. when updating
+    # more than on line items at once via accepted_nested_attributes the order
+    # object on the association would be in a old state and therefore the
+    # adjustment calculations would not performed on proper values
+    def update!(calculable = nil)
+      return if immutable?
+
+      # Fix for Spree issue #3381
+      # If we attempt to call 'source' before the reload, then source is currently
+      # the order object. After calling a reload, the source is the Shipment.
+      reload
+      originator.update_adjustment(self, calculable || source) if originator.present?
+      set_eligibility
+    end
+
+    def currency
+      adjustable ? adjustable.currency : Spree::Config[:currency]
+    end
+
+    def display_amount
+      Spree::Money.new(amount, currency: currency)
+    end
+
+    def immutable?
+      state != "open"
+    end
+
+    def set_included_tax!(rate)
+      tax = amount - (amount / (1 + rate))
+      set_absolute_included_tax! tax
+    end
+
+    def set_absolute_included_tax!(tax)
+      # This rubocop issue can now fixed by renaming Adjustment#update! to something else,
+      #   then AR's update! can be used instead of update_attributes!
+      # rubocop:disable Rails/ActiveRecordAliases
+      update_attributes! included_tax: tax.round(2)
+      # rubocop:enable Rails/ActiveRecordAliases
+    end
+
+    def display_included_tax
+      Spree::Money.new(included_tax, currency: currency)
+    end
+
+    def has_tax?
+      included_tax.positive?
+    end
+
+    def self.without_callbacks
+      skip_callback :save, :after, :update_adjustable
+      skip_callback :destroy, :after, :update_adjustable
+
+      result = yield
+    ensure
+      set_callback :save, :after, :update_adjustable
+      set_callback :destroy, :after, :update_adjustable
+
+      result
+    end
+
+    private
+
+    def update_adjustable
+      adjustable.update! if adjustable.is_a? Order
+    end
+  end
+end

app/models/spree/adjustment_decorator.rb

@@ -1,62 +0,0 @@
-require 'spree/localized_number'
-require 'concerns/adjustment_scopes'
-
-module Spree
-  Adjustment.class_eval do
-    extend Spree::LocalizedNumber
-
-    # Deletion of metadata is handled in the database.
-    # So we don't need the option `dependent: :destroy` as long as
-    # AdjustmentMetadata has no destroy logic itself.
-    has_one :metadata, class_name: 'AdjustmentMetadata'
-    belongs_to :tax_rate, -> { where spree_adjustments: { originator_type: 'Spree::TaxRate' } },
-               foreign_key: 'originator_id'
-
-    scope :enterprise_fee, -> { where(originator_type: 'EnterpriseFee') }
-    scope :admin,          -> { where(source_type: nil, originator_type: nil) }
-    scope :included_tax,   -> {
-      where(originator_type: 'Spree::TaxRate', adjustable_type: 'Spree::LineItem')
-    }
-
-    scope :with_tax,       -> { where('spree_adjustments.included_tax <> 0') }
-    scope :without_tax,    -> { where('spree_adjustments.included_tax = 0') }
-    scope :payment_fee,    -> { where(AdjustmentScopes::PAYMENT_FEE_SCOPE) }
-    scope :shipping,       -> { where(AdjustmentScopes::SHIPPING_SCOPE) }
-    scope :eligible,       -> { where(AdjustmentScopes::ELIGIBLE_SCOPE) }
-
-    localize_number :amount
-
-    def set_included_tax!(rate)
-      tax = amount - (amount / (1 + rate))
-      set_absolute_included_tax! tax
-    end
-
-    def set_absolute_included_tax!(tax)
-      # This rubocop issue can only be fixed when Adjustment#update! is brought from Spree to OFN
-      #   and renamed to something else, then AR's update! can be used instead of update_attributes!
-      # rubocop:disable Rails/ActiveRecordAliases
-      update_attributes! included_tax: tax.round(2)
-      # rubocop:enable Rails/ActiveRecordAliases
-    end
-
-    def display_included_tax
-      Spree::Money.new(included_tax, currency: currency)
-    end
-
-    def has_tax?
-      included_tax > 0
-    end
-
-    def self.without_callbacks
-      skip_callback :save, :after, :update_adjustable
-      skip_callback :destroy, :after, :update_adjustable
-
-      result = yield
-    ensure
-      set_callback :save, :after, :update_adjustable
-      set_callback :destroy, :after, :update_adjustable
-
-      result
-    end
-  end
-end

app/models/spree/asset.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class Asset < ActiveRecord::Base
+    belongs_to :viewable, polymorphic: true, touch: true
+    acts_as_list scope: :viewable
+  end
+end

app/models/spree/calculator.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Spree
+  class Calculator < ActiveRecord::Base
+    belongs_to :calculable, polymorphic: true
+
+    # This method must be overriden in concrete calculator.
+    #
+    # It should return amount computed based on #calculable and/or optional parameter
+    def compute(_something = nil)
+      raise NotImplementedError, 'please use concrete calculator'
+    end
+
+    # overwrite to provide description for your calculators
+    def self.description
+      'Base Calculator'
+    end
+
+    ###################################################################
+
+    def self.register(*klasses); end
+
+    # Returns all calculators applicable for kind of work
+    def self.calculators
+      Rails.application.config.spree.calculators
+    end
+
+    def to_s
+      self.class.name.titleize.gsub("Calculator\/", "")
+    end
+
+    def description
+      self.class.description
+    end
+
+    def available?(_object)
+      true
+    end
+
+    private
+
+    # Given an object which might be an Order or a LineItem (amongst
+    # others), return a collection of line items.
+    def line_items_for(object)
+      if object.is_a?(Spree::LineItem)
+        [object]
+      elsif object.respond_to? :line_items
+        object.line_items
+      elsif object.respond_to?(:order) && object.order.present?
+        object.order.line_items
+      else
+        [object]
+      end
+    end
+  end
+end

app/models/spree/calculator_decorator.rb

@@ -1,19 +0,0 @@
-module Spree
-  Calculator.class_eval do
-    private
-
-    # Given an object which might be an Order or a LineItem (amongst
-    # others), return a collection of line items.
-    def line_items_for(object)
-      if object.is_a?(Spree::LineItem)
-        [object]
-      elsif object.respond_to? :line_items
-        object.line_items
-      elsif object.respond_to?(:order) && object.order.present?
-        object.order.line_items
-      else
-        [object]
-      end
-    end
-  end
-end

app/models/spree/classification.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spree
+  class Classification < ActiveRecord::Base
+    self.table_name = 'spree_products_taxons'
+    belongs_to :product, class_name: "Spree::Product", touch: true
+    belongs_to :taxon, class_name: "Spree::Taxon", touch: true
+
+    before_destroy :dont_destroy_if_primary_taxon
+
+    private
+
+    def dont_destroy_if_primary_taxon
+      return unless product.primary_taxon == taxon
+
+      errors.add :base, I18n.t(:spree_classification_primary_taxon_error, taxon: taxon.name,
+                                                                          product: product.name)
+      false
+    end
+  end
+end

app/models/spree/classification_decorator.rb

@@ -1,15 +0,0 @@
-Spree::Classification.class_eval do
-  belongs_to :product, class_name: "Spree::Product", touch: true
-  belongs_to :taxon, class_name: "Spree::Taxon", touch: true
-
-  before_destroy :dont_destroy_if_primary_taxon
-
-  private
-
-  def dont_destroy_if_primary_taxon
-    if product.primary_taxon == taxon
-      errors.add :base, I18n.t(:spree_classification_primary_taxon_error, taxon: taxon.name, product: product.name)
-      false
-    end
-  end
-end

app/models/spree/country.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Spree
+  class Country < ActiveRecord::Base
+    has_many :states, -> { order('name ASC') }
+
+    validates :name, :iso_name, presence: true
+
+    def <=>(other)
+      name <=> other.name
+    end
+
+    def to_s
+      name
+    end
+  end
+end

app/models/spree/credit_card.rb

@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+module Spree
+  class CreditCard < ActiveRecord::Base
+    belongs_to :payment_method
+    belongs_to :user
+
+    has_many :payments, as: :source
+
+    before_save :set_last_digits
+
+    attr_accessor :verification_value
+    attr_reader :number
+    attr_writer :save_requested_by_customer # For holding customer preference in memory
+
+    validates :month, :year, numericality: { only_integer: true }
+    validates :number, presence: true, unless: :has_payment_profile?, on: :create
+    validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
+    validate :expiry_not_in_the_past
+
+    after_create :ensure_single_default_card
+    after_save :ensure_single_default_card, if: :default_card_needs_updating?
+
+    scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
+
+    # needed for some of the ActiveMerchant gateways (eg. SagePay)
+    alias_attribute :brand, :cc_type
+
+    def expiry=(expiry)
+      self[:month], self[:year] = expiry.split(" / ")
+      self[:year] = "20" + self[:year]
+    end
+
+    def number=(num)
+      @number = begin
+                  num.gsub(/[^0-9]/, '')
+                rescue StandardError
+                  nil
+                end
+    end
+
+    # cc_type is set by jquery.payment, which helpfully provides different
+    # types from Active Merchant. Converting them is necessary.
+    def cc_type=(type)
+      real_type = case type
+                  when 'mastercard', 'maestro'
+                    'master'
+                  when 'amex'
+                    'american_express'
+                  when 'dinersclub'
+                    'diners_club'
+                  else
+                    type
+                  end
+      self[:cc_type] = real_type
+    end
+
+    def set_last_digits
+      number.to_s.gsub!(/\s/, '')
+      verification_value.to_s.gsub!(/\s/, '')
+      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
+    end
+
+    def name?
+      first_name? && last_name?
+    end
+
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def verification_value?
+      verification_value.present?
+    end
+
+    # Show the card number, with all but last 4 numbers replace with "X". (XXXX-XXXX-XXXX-4338)
+    def display_number
+      "XXXX-XXXX-XXXX-#{last_digits}"
+    end
+
+    def actions
+      %w{capture void credit}
+    end
+
+    # Indicates whether its possible to capture the payment
+    def can_capture?(payment)
+      payment.pending? || payment.checkout?
+    end
+
+    # Indicates whether its possible to void the payment.
+    def can_void?(payment)
+      !payment.void?
+    end
+
+    # Indicates whether its possible to credit the payment. Note that most gateways require that the
+    #   payment be settled first which generally happens within 12-24 hours of the transaction.
+    def can_credit?(payment)
+      return false unless payment.completed?
+      return false unless payment.order.payment_state == 'credit_owed'
+
+      payment.credit_allowed.positive?
+    end
+
+    # Allows us to use a gateway_payment_profile_id to store Stripe Tokens
+    def has_payment_profile?
+      gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
+    end
+
+    def to_active_merchant
+      ActiveMerchant::Billing::CreditCard.new(
+        number: number,
+        month: month,
+        year: year,
+        verification_value: verification_value,
+        first_name: first_name,
+        last_name: last_name
+      )
+    end
+
+    def save_requested_by_customer?
+      !!@save_requested_by_customer
+    end
+
+    private
+
+    def expiry_not_in_the_past
+      return unless year.present? && month.present?
+
+      time = "#{year}-#{month}-1".to_time
+      return unless time < Time.zone.now.to_time.beginning_of_month
+
+      errors.add(:base, :card_expired)
+    end
+
+    def reusable?
+      gateway_customer_profile_id.present?
+    end
+
+    def default_missing?
+      !user.credit_cards.exists?(is_default: true)
+    end
+
+    def default_card_needs_updating?
+      is_default_changed? || gateway_customer_profile_id_changed?
+    end
+
+    def ensure_single_default_card
+      return unless user
+      return unless is_default? || (reusable? && default_missing?)
+
+      user.credit_cards.update_all(['is_default=(id=?)', id])
+      self.is_default = true
+    end
+  end
+end

app/models/spree/credit_card_decorator.rb

@@ -1,47 +0,0 @@
-Spree::CreditCard.class_eval do
-  # For holding customer preference in memory
-  attr_writer :save_requested_by_customer
-
-  # Should be able to remove once we reach Spree v2.2.0
-  # https://github.com/spree/spree/commit/411010f3975c919ab298cb63962ee492455b415c
-  belongs_to :payment_method
-
-  belongs_to :user
-
-  after_create :ensure_single_default_card
-  after_save :ensure_single_default_card, if: :default_card_needs_updating?
-
-  # Allows us to use a gateway_payment_profile_id to store Stripe Tokens
-  # Should be able to remove once we reach Spree v2.2.0
-  # Commit: https://github.com/spree/spree/commit/5a4d690ebc64b264bf12904a70187e7a8735ef3f
-  # See also: https://github.com/spree/spree_gateway/issues/111
-  def has_payment_profile? # rubocop:disable Naming/PredicateName
-    gateway_customer_profile_id.present? || gateway_payment_profile_id.present?
-  end
-
-  def save_requested_by_customer?
-    !!@save_requested_by_customer
-  end
-
-  private
-
-  def reusable?
-    gateway_customer_profile_id.present?
-  end
-
-  def default_missing?
-    !user.credit_cards.exists?(is_default: true)
-  end
-
-  def default_card_needs_updating?
-    is_default_changed? || gateway_customer_profile_id_changed?
-  end
-
-  def ensure_single_default_card
-    return unless user
-    return unless is_default? || (reusable? && default_missing?)
-
-    user.credit_cards.update_all(['is_default=(id=?)', id])
-    self.is_default = true
-  end
-end

app/models/spree/gateway.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Spree
+  class Gateway < PaymentMethod
+    include PaymentMethodDistributors
+
+    delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
+
+    validates :name, :type, presence: true
+
+    # Default to live
+    preference :server, :string, default: 'live'
+    preference :test_mode, :boolean, default: false
+
+    def payment_source_class
+      CreditCard
+    end
+
+    # instantiates the selected gateway and configures with the options stored in the database
+    def self.current
+      super
+    end
+
+    def provider
+      gateway_options = options
+      gateway_options.delete :login if gateway_options.key?(:login) && gateway_options[:login].nil?
+      if gateway_options[:server]
+        ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
+      end
+      @provider ||= provider_class.new(gateway_options)
+    end
+
+    def options
+      preferences.each_with_object({}){ |(key, value), memo| memo[key.to_sym] = value; }
+    end
+
+    def method_missing(method, *args)
+      if @provider.nil? || !@provider.respond_to?(method)
+        super
+      else
+        provider.__send__(method, *args)
+      end
+    end
+
+    def payment_profiles_supported?
+      false
+    end
+
+    def method_type
+      'gateway'
+    end
+
+    def supports?(source)
+      return true unless provider_class.respond_to? :supports?
+      return false unless source.brand
+
+      provider_class.supports?(source.brand)
+    end
+  end
+end

app/models/spree/gateway/bogus.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Spree
+  class Gateway
+    class Bogus < Spree::Gateway
+      TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222'].freeze
+      TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100'].freeze
+      TEST_AMEX = ['378282246310005', '371449635398431',
+                   '378734493671000', '340000000000009'].freeze
+      TEST_DISC = ['6011000000000004', '6011111111111117', '6011000990139424'].freeze
+
+      VALID_CCS = ['1', TEST_VISA, TEST_MC, TEST_AMEX, TEST_DISC].flatten
+
+      attr_accessor :test
+
+      def provider_class
+        self.class
+      end
+
+      def preferences
+        {}
+      end
+
+      def create_profile(payment)
+        # simulate the storage of credit card profile using remote service
+        success = VALID_CCS.include? payment.source.number
+        payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
+      end
+
+      def authorize(_money, credit_card, _options = {})
+        profile_id = credit_card.gateway_customer_profile_id
+        if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                { message: 'Bogus Gateway: Forced failure' },
+                                                test: true)
+        end
+      end
+
+      def purchase(_money, credit_card, _options = {})
+        profile_id = credit_card.gateway_customer_profile_id
+        if VALID_CCS.include?(credit_card.number) || profile_id&.starts_with?('BGS-')
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                message: 'Bogus Gateway: Forced failure',
+                                                test: true)
+        end
+      end
+
+      def credit(_money, _credit_card, _response_code, _options = {})
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                              test: true, authorization: '12345')
+      end
+
+      def capture(authorization, _credit_card, _gateway_options)
+        if authorization.response_code == '12345'
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '67890')
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                error: 'Bogus Gateway: Forced failure', test: true)
+        end
+      end
+
+      def void(_response_code, _credit_card, _options = {})
+        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                              test: true, authorization: '12345')
+      end
+
+      def test?
+        # Test mode is not really relevant with bogus gateway (no such thing as live server)
+        true
+      end
+
+      def payment_profiles_supported?
+        true
+      end
+
+      def actions
+        %w(capture void credit)
+      end
+
+      private
+
+      def generate_profile_id(success)
+        record = true
+        prefix = success ? 'BGS' : 'FAIL'
+        while record
+          random = "#{prefix}-#{Array.new(6){ rand(6) }.join}"
+          record = CreditCard.find_by(gateway_customer_profile_id: random)
+        end
+        random
+      end
+    end
+  end
+end

app/models/spree/gateway/bogus_simple.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Bogus Gateway that doesn't support payment profiles
+module Spree
+  class Gateway
+    class BogusSimple < Spree::Gateway::Bogus
+      def payment_profiles_supported?
+        false
+      end
+
+      def authorize(_money, credit_card, _options = {})
+        if VALID_CCS.include? credit_card.number
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                { message: 'Bogus Gateway: Forced failure' },
+                                                test: true)
+        end
+      end
+
+      def purchase(_money, credit_card, _options = {})
+        if VALID_CCS.include? credit_card.number
+          ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {},
+                                                test: true, authorization: '12345',
+                                                avs_result: { code: 'A' })
+        else
+          ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure',
+                                                message: 'Bogus Gateway: Forced failure',
+                                                test: true)
+        end
+      end
+    end
+  end
+end

app/models/spree/gateway_decorator.rb

@@ -1,9 +0,0 @@
-require 'spree/concerns/payment_method_distributors'
-
-Spree::Gateway.class_eval do
-  include Spree::PaymentMethodDistributors
-
-  # Default to live
-  preference :server, :string, default: 'live'
-  preference :test_mode, :boolean, default: false
-end

app/models/spree/image.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Spree
+  class Image < Asset
+    validates_attachment_presence :attachment
+    validate :no_attachment_errors
+
+    has_attached_file :attachment,
+                      styles: { mini: '48x48>', small: '100x100>',
+                                product: '240x240>', large: '600x600>' },
+                      default_style: :product,
+                      url: '/spree/products/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
+                      convert_options: { all: '-strip -auto-orient -colorspace RGB' }
+
+    # save the w,h of the original image (from which others can be calculated)
+    # we need to look at the write-queue for images which have not been saved yet
+    after_post_process :find_dimensions
+
+    include Spree::Core::S3Support
+    supports_s3 :attachment
+
+    Spree::Image.attachment_definitions[:attachment][:styles] =
+      ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+    Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Image.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
+    Spree::Image.attachment_definitions[:attachment][:default_url] =
+      Spree::Config[:attachment_default_url]
+    Spree::Image.attachment_definitions[:attachment][:default_style] =
+      Spree::Config[:attachment_default_style]
+
+    # used by admin products autocomplete
+    def mini_url
+      attachment.url(:mini, false)
+    end
+
+    def find_dimensions
+      temporary = attachment.queued_for_write[:original]
+      filename = temporary.path unless temporary.nil?
+      filename = attachment.path if filename.blank?
+      geometry = Paperclip::Geometry.from_file(filename)
+      self.attachment_width  = geometry.width
+      self.attachment_height = geometry.height
+    end
+
+    # if there are errors from the plugin, then add a more meaningful message
+    def no_attachment_errors
+      return if attachment.errors.empty?
+
+      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
+      false
+    end
+
+    # Spree stores attachent definitions in JSON. This converts the style name and format to
+    # strings. However, when paperclip encounters these, it doesn't recognise the format.
+    # Here we solve that problem by converting format and style name to symbols.
+    # See also: ImageSettingsController decorator.
+    #
+    # eg. {'mini' => ['48x48>', 'png']} is converted to {mini: ['48x48>', :png]}
+    def self.format_styles(styles)
+      styles_a = styles.map do |name, style|
+        style[1] = style[1].to_sym if style.is_a? Array
+        [name.to_sym, style]
+      end
+
+      Hash[styles_a]
+    end
+
+    def self.reformat_styles
+      Spree::Image.attachment_definitions[:attachment][:styles] =
+        format_styles(Spree::Image.attachment_definitions[:attachment][:styles])
+    end
+
+    reformat_styles
+  end
+end

app/models/spree/image_decorator.rb

@@ -1,23 +0,0 @@
-Spree::Image.class_eval do
-  # Spree stores attachent definitions in JSON. This converts the style name and format to
-  # strings. However, when paperclip encounters these, it doesn't recognise the format.
-  # Here we solve that problem by converting format and style name to symbols.
-  # See also: ImageSettingsController decorator.
-  #
-  # eg. {'mini' => ['48x48>', 'png']} is converted to {mini: ['48x48>', :png]}
-  def self.format_styles(styles)
-    styles_a = styles.map do |name, style|
-      style[1] = style[1].to_sym if style.is_a? Array
-      [name.to_sym, style]
-    end
-
-    Hash[styles_a]
-  end
-
-  def self.reformat_styles
-    Spree::Image.attachment_definitions[:attachment][:styles] =
-      format_styles(Spree::Image.attachment_definitions[:attachment][:styles])
-  end
-
-  reformat_styles
-end

app/models/spree/line_item_decorator.rb

@@ -1,8 +1,8 @@
 require 'open_food_network/scope_variant_to_hub'
-require 'open_food_network/variant_and_line_item_naming'
+require 'variant_units/variant_and_line_item_naming'
 
 Spree::LineItem.class_eval do
-  include OpenFoodNetwork::VariantAndLineItemNaming
+  include VariantUnits::VariantAndLineItemNaming
   include LineItemBasedAdjustmentHandling
   has_and_belongs_to_many :option_values, join_table: 'spree_option_values_line_items', class_name: 'Spree::OptionValue'
 

app/models/spree/log_entry.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  class LogEntry < ActiveRecord::Base
+    belongs_to :source, polymorphic: true
+
+    # Fix for Spree #1767
+    # If a payment fails, we want to make sure we keep the record of it failing
+    after_rollback :save_anyway
+
+    def save_anyway
+      log = Spree::LogEntry.new
+      log.source  = source
+      log.details = details
+      log.save!
+    end
+  end
+end

app/models/spree/order_decorator.rb

@@ -194,8 +194,6 @@ Spree::Order.class_eval do
   end
 
   # After changing line items of a completed order
-  # TODO: perhaps this should be triggered from a controller
-  # rather than an after_save callback?
   def update_shipping_fees!
     shipments.each do |shipment|
       next if shipment.shipped?
@@ -222,8 +220,6 @@ Spree::Order.class_eval do
   end
 
   # After changing line items of a completed order
-  # TODO: perhaps this should be triggered from a controller
-  # rather than an after_save callback?
   def update_payment_fees!
     payments.each do |payment|
       next if payment.completed?

app/models/spree/payment/processing.rb

@@ -179,11 +179,11 @@ module Spree
                     # For more information, please see Spree::Payment#set_unique_identifier
                     order_id: gateway_order_id }
 
-        options.merge!({ shipping: order.ship_total * 100,
-                         tax: order.tax_total * 100,
-                         subtotal: order.item_total * 100,
-                         discount: order.promo_total * 100,
-                         currency: currency })
+        options.merge!(shipping: order.ship_total * 100,
+                       tax: order.tax_total * 100,
+                       subtotal: order.item_total * 100,
+                       discount: 0,
+                       currency: currency)
 
         options.merge!({ billing_address: order.bill_address.try(:active_merchant_hash),
                          shipping_address: order.ship_address.try(:active_merchant_hash) })

app/models/spree/payment_method.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+module Spree
+  class PaymentMethod < ActiveRecord::Base
+    include Spree::Core::CalculatedAdjustments
+    include PaymentMethodDistributors
+
+    acts_as_taggable
+    acts_as_paranoid
+
+    DISPLAY = [:both, :front_end, :back_end].freeze
+    default_scope -> { where(deleted_at: nil) }
+
+    has_many :credit_cards, class_name: "Spree::CreditCard"
+
+    validates :name, presence: true
+    validate :distributor_validation
+
+    after_initialize :init
+
+    scope :production, -> { where(environment: 'production') }
+
+    scope :managed_by, lambda { |user|
+      if user.has_spree_role?('admin')
+        where(nil)
+      else
+        joins(:distributors).
+          where('distributors_payment_methods.distributor_id IN (?)',
+                user.enterprises.select(&:id)).
+          select('DISTINCT spree_payment_methods.*')
+      end
+    }
+
+    scope :for_distributors, ->(distributors) {
+      non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
+      where(id: non_unique_matches.map(&:id))
+    }
+
+    scope :for_distributor, lambda { |distributor|
+      joins(:distributors).
+        where('enterprises.id = ?', distributor)
+    }
+
+    scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }
+
+    scope :by_name, -> { order('spree_payment_methods.name ASC') }
+
+    scope :available, lambda { |display_on = 'both'|
+      where(active: true).
+        where('spree_payment_methods.display_on=? OR spree_payment_methods.display_on=? OR spree_payment_methods.display_on IS NULL', display_on, '').
+        where('spree_payment_methods.environment=? OR spree_payment_methods.environment=? OR spree_payment_methods.environment IS NULL', Rails.env, '')
+    }
+
+    def self.providers
+      Rails.application.config.spree.payment_methods
+    end
+
+    def provider_class
+      raise 'You must implement provider_class method for this gateway.'
+    end
+
+    # The class that will process payments for this payment type, used for @payment.source
+    # e.g. CreditCard in the case of a the Gateway payment type
+    # nil means the payment method doesn't require a source e.g. check
+    def payment_source_class
+      raise 'You must implement payment_source_class method for this gateway.'
+    end
+
+    def self.active?
+      where(type: to_s, environment: Rails.env, active: true).count.positive?
+    end
+
+    def method_type
+      type.demodulize.downcase
+    end
+
+    def self.find_with_destroyed(*args)
+      unscoped { find(*args) }
+    end
+
+    def payment_profiles_supported?
+      false
+    end
+
+    def source_required?
+      true
+    end
+
+    def auto_capture?
+      Spree::Config[:auto_capture]
+    end
+
+    def supports?(_source)
+      true
+    end
+
+    def init
+      unless reflections.key?(:calculator)
+        self.class.include Spree::Core::CalculatedAdjustments
+      end
+
+      self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
+    end
+
+    def has_distributor?(distributor)
+      distributors.include?(distributor)
+    end
+
+    def self.clean_name
+      case name
+      when "Spree::PaymentMethod::Check"
+        "Cash/EFT/etc. (payments for which automatic validation is not required)"
+      when "Spree::Gateway::Migs"
+        "MasterCard Internet Gateway Service (MIGS)"
+      when "Spree::Gateway::Pin"
+        "Pin Payments"
+      when "Spree::Gateway::StripeConnect"
+        "Stripe"
+      when "Spree::Gateway::StripeSCA"
+        "Stripe SCA"
+      when "Spree::Gateway::PayPalExpress"
+        "PayPal Express"
+      else
+        i = name.rindex('::') + 2
+        name[i..-1]
+      end
+    end
+
+    private
+
+    def distributor_validation
+      validates_with DistributorsValidator
+    end
+  end
+end

app/models/spree/payment_method/check.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Spree
+  class PaymentMethod
+    class Check < Spree::PaymentMethod
+      def actions
+        %w{capture void}
+      end
+
+      # Indicates whether its possible to capture the payment
+      def can_capture?(payment)
+        ['checkout', 'pending'].include?(payment.state)
+      end
+
+      # Indicates whether its possible to void the payment.
+      def can_void?(payment)
+        payment.state != 'void'
+      end
+
+      def capture(*_args)
+        ActiveMerchant::Billing::Response.new(true, "", {}, {})
+      end
+
+      def void(*_args)
+        ActiveMerchant::Billing::Response.new(true, "", {}, {})
+      end
+
+      def source_required?
+        false
+      end
+    end
+  end
+end

app/models/spree/payment_method_decorator.rb

@@ -1,84 +0,0 @@
-require 'spree/concerns/payment_method_distributors'
-
-Spree::PaymentMethod.class_eval do
-  include Spree::Core::CalculatedAdjustments
-  include Spree::PaymentMethodDistributors
-
-  acts_as_taggable
-
-  has_many :credit_cards, class_name: "Spree::CreditCard" # from Spree v.2.3.0 d470b31798f37
-
-  after_initialize :init
-
-  validate :distributor_validation
-
-  # -- Scopes
-  scope :managed_by, lambda { |user|
-    if user.has_spree_role?('admin')
-      where(nil)
-    else
-      joins(:distributors).
-        where('distributors_payment_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
-        select('DISTINCT spree_payment_methods.*')
-    end
-  }
-
-  scope :for_distributors, ->(distributors) {
-    non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
-    where(id: non_unique_matches.map(&:id))
-  }
-
-  scope :for_distributor, lambda { |distributor|
-    joins(:distributors).
-      where('enterprises.id = ?', distributor)
-  }
-
-  scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }
-
-  scope :by_name, -> { order('spree_payment_methods.name ASC') }
-
-  # Rewrite Spree's ruby-land class method as a scope
-  scope :available, lambda { |display_on = 'both'|
-    where(active: true).
-      where('spree_payment_methods.display_on=? OR spree_payment_methods.display_on=? OR spree_payment_methods.display_on IS NULL', display_on, '').
-      where('spree_payment_methods.environment=? OR spree_payment_methods.environment=? OR spree_payment_methods.environment IS NULL', Rails.env, '')
-  }
-
-  def init
-    unless reflections.key?(:calculator)
-      self.class.include Spree::Core::CalculatedAdjustments
-    end
-
-    self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
-  end
-
-  def has_distributor?(distributor)
-    distributors.include?(distributor)
-  end
-
-  def self.clean_name
-    case name
-    when "Spree::PaymentMethod::Check"
-      "Cash/EFT/etc. (payments for which automatic validation is not required)"
-    when "Spree::Gateway::Migs"
-      "MasterCard Internet Gateway Service (MIGS)"
-    when "Spree::Gateway::Pin"
-      "Pin Payments"
-    when "Spree::Gateway::StripeConnect"
-      "Stripe"
-    when "Spree::Gateway::StripeSCA"
-      "Stripe SCA"
-    when "Spree::Gateway::PayPalExpress"
-      "PayPal Express"
-    else
-      i = name.rindex('::') + 2
-      name[i..-1]
-    end
-  end
-
-  private
-
-  def distributor_validation
-    validates_with DistributorsValidator
-  end
-end

app/models/spree/preferences/file_configuration.rb

@@ -1,45 +1,47 @@
-module Spree::Preferences
-  class FileConfiguration < Configuration
-    def self.preference(name, type, *args)
-      if type == :file
-        super "#{name}_file_name",    :string,  *args
-        super "#{name}_content_type", :string,  *args
-        super "#{name}_file_size",    :integer, *args
-        super "#{name}_updated_at",   :string,  *args
+module Spree
+  module Preferences
+    class FileConfiguration < Configuration
+      def self.preference(name, type, *args)
+        if type == :file
+          super "#{name}_file_name",    :string,  *args
+          super "#{name}_content_type", :string,  *args
+          super "#{name}_file_size",    :integer, *args
+          super "#{name}_updated_at",   :string,  *args
 
-      else
-        super name, type, *args
+        else
+          super name, type, *args
+        end
       end
-    end
 
-    def get_preference(key)
-      if !has_preference?(key) && has_attachment?(key)
-        public_send key
-      else
-        super key
+      def get_preference(key)
+        if !has_preference?(key) && has_attachment?(key)
+          public_send key
+        else
+          super key
+        end
       end
-    end
-    alias :[] :get_preference
+      alias :[] :get_preference
 
-    def preference_type(name)
-      if has_attachment? name
-        :file
-      else
-        super name
+      def preference_type(name)
+        if has_attachment? name
+          :file
+        else
+          super name
+        end
       end
-    end
 
-    # Spree's Configuration responds to preference methods via method_missing, but doesn't
-    # override respond_to?, which consequently reports those methods as unavailable. Paperclip
-    # errors if respond_to? isn't correct, so we override it here.
-    def respond_to?(method, include_all = false)
-      name = method.to_s.delete('=')
-      super(self.class.preference_getter_method(name), include_all) || super(method, include_all)
-    end
+      # Spree's Configuration responds to preference methods via method_missing, but doesn't
+      # override respond_to?, which consequently reports those methods as unavailable. Paperclip
+      # errors if respond_to? isn't correct, so we override it here.
+      def respond_to?(method, include_all = false)
+        name = method.to_s.delete('=')
+        super(self.class.preference_getter_method(name), include_all) || super(method, include_all)
+      end
 
-    def has_attachment?(name)
-      self.class.respond_to?(:attachment_definitions) &&
-        self.class.attachment_definitions.key?(name.to_sym)
+      def has_attachment?(name)
+        self.class.respond_to?(:attachment_definitions) &&
+          self.class.attachment_definitions.key?(name.to_sym)
+      end
     end
   end
 end

app/models/spree/role.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class Role < ActiveRecord::Base
+    has_and_belongs_to_many :users, join_table: 'spree_roles_users',
+                                    class_name: Spree.user_class.to_s
+  end
+end

app/models/spree/shipment.rb

@@ -90,7 +90,7 @@ module Spree
     end
 
     def selected_shipping_rate
-      shipping_rates.where(selected: true).first
+      shipping_rates.find_by(selected: true)
     end
 
     def selected_shipping_rate_id
@@ -294,7 +294,7 @@ module Spree
       record = true
       while record
         random = "H#{Array.new(11) { rand(9) }.join}"
-        record = self.class.where(number: random).first
+        record = self.class.find_by(number: random)
       end
       self.number = random
     end

app/models/spree/shipping_category.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingCategory < ActiveRecord::Base
+    validates :name, presence: true
+    has_many :products
+    has_many :shipping_method_categories
+    has_many :shipping_methods, through: :shipping_method_categories
+  end
+end

app/models/spree/shipping_method.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingMethod < ActiveRecord::Base
+    include Spree::Core::CalculatedAdjustments
+    DISPLAY = [:both, :front_end, :back_end].freeze
+
+    acts_as_taggable
+
+    default_scope -> { where(deleted_at: nil) }
+
+    has_many :shipments
+    has_many :shipping_method_categories
+    has_many :shipping_categories, through: :shipping_method_categories
+    has_many :shipping_rates
+    has_many :distributor_shipping_methods
+    has_many :distributors, through: :distributor_shipping_methods,
+                            class_name: 'Enterprise',
+                            foreign_key: 'distributor_id'
+
+    has_and_belongs_to_many :zones, join_table: 'spree_shipping_methods_zones',
+                                    class_name: 'Spree::Zone',
+                                    foreign_key: 'shipping_method_id'
+
+    validates :name, presence: true
+    validate :distributor_validation
+    validate :at_least_one_shipping_category
+
+    after_save :touch_distributors
+
+    scope :managed_by, lambda { |user|
+      if user.has_spree_role?('admin')
+        where(nil)
+      else
+        joins(:distributors).
+          where('distributors_shipping_methods.distributor_id IN (?)',
+                user.enterprises.select(&:id)).
+          select('DISTINCT spree_shipping_methods.*')
+      end
+    }
+
+    scope :for_distributors, ->(distributors) {
+      non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
+      where(id: non_unique_matches.map(&:id))
+    }
+    scope :for_distributor, lambda { |distributor|
+      joins(:distributors).
+        where('enterprises.id = ?', distributor)
+    }
+
+    scope :by_name, -> { order('spree_shipping_methods.name ASC') }
+    scope :display_on_checkout, -> {
+      where("spree_shipping_methods.display_on is null OR spree_shipping_methods.display_on = ''")
+    }
+
+    def adjustment_label
+      I18n.t('shipping')
+    end
+
+    # Here we allow checkout with shipping methods without zones (see issue #3928 for details)
+    #   and also checkout with addresses outside of the zones of the selected shipping method
+    # This method could be used, like in Spree, to validate shipping method zones on checkout.
+    def include?(address)
+      address.present?
+    end
+
+    def build_tracking_url(tracking)
+      tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
+    end
+
+    def self.calculators
+      spree_calculators.__send__ model_name_without_spree_namespace
+    end
+
+    # Some shipping methods are only meant to be set via backend
+    def frontend?
+      display_on != "back_end"
+    end
+
+    def has_distributor?(distributor)
+      distributors.include?(distributor)
+    end
+
+    # Checks whether the shipping method is of delivery type, meaning that it
+    # requires the user to specify a ship address at checkout.
+    #
+    # @return [Boolean]
+    def delivery?
+      require_ship_address
+    end
+
+    # Return the services (pickup, delivery) that different distributors provide, in the format:
+    # {distributor_id => {pickup: true, delivery: false}, ...}
+    def self.services
+      Hash[
+        Spree::ShippingMethod.
+          joins(:distributor_shipping_methods).
+          group('distributor_id').
+          select("distributor_id").
+          select("BOOL_OR(spree_shipping_methods.require_ship_address = 'f') AS pickup").
+          select("BOOL_OR(spree_shipping_methods.require_ship_address = 't') AS delivery").
+          map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup, delivery: sm.delivery }] }
+      ]
+    end
+
+    def self.on_backend_query
+      "#{table_name}.display_on != 'front_end' OR #{table_name}.display_on IS NULL"
+    end
+
+    def self.on_frontend_query
+      "#{table_name}.display_on != 'back_end' OR #{table_name}.display_on IS NULL"
+    end
+
+    private
+
+    def at_least_one_shipping_category
+      return unless shipping_categories.empty?
+
+      errors[:base] << "You need to select at least one shipping category"
+    end
+
+    def touch_distributors
+      distributors.each do |distributor|
+        distributor.touch if distributor.persisted?
+      end
+    end
+
+    def distributor_validation
+      validates_with DistributorsValidator
+    end
+  end
+end

app/models/spree/shipping_method_category.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingMethodCategory < ActiveRecord::Base
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
+  end
+end

app/models/spree/shipping_method_decorator.rb

@@ -1,90 +0,0 @@
-Spree::ShippingMethod.class_eval do
-  acts_as_taggable
-
-  has_many :distributor_shipping_methods
-  has_many :distributors, through: :distributor_shipping_methods, class_name: 'Enterprise', foreign_key: 'distributor_id'
-
-  after_save :touch_distributors
-
-  validate :distributor_validation
-
-  scope :managed_by, lambda { |user|
-    if user.has_spree_role?('admin')
-      where(nil)
-    else
-      joins(:distributors).
-        where('distributors_shipping_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
-        select('DISTINCT spree_shipping_methods.*')
-    end
-  }
-
-  scope :for_distributors, ->(distributors) {
-    non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
-    where(id: non_unique_matches.map(&:id))
-  }
-  scope :for_distributor, lambda { |distributor|
-    joins(:distributors).
-      where('enterprises.id = ?', distributor)
-  }
-
-  scope :by_name, -> { order('spree_shipping_methods.name ASC') }
-  scope :display_on_checkout, -> { where("spree_shipping_methods.display_on is null OR spree_shipping_methods.display_on = ''") }
-
-  # Return the services (pickup, delivery) that different distributors provide, in the format:
-  # {distributor_id => {pickup: true, delivery: false}, ...}
-  def self.services
-    Hash[
-      Spree::ShippingMethod.
-        joins(:distributor_shipping_methods).
-        group('distributor_id').
-        select("distributor_id").
-        select("BOOL_OR(spree_shipping_methods.require_ship_address = 'f') AS pickup").
-        select("BOOL_OR(spree_shipping_methods.require_ship_address = 't') AS delivery").
-        map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup, delivery: sm.delivery }] }
-    ]
-  end
-
-  # This method is overriden so that we can remove the restriction added in Spree
-  #   Spree restricts shipping method calculators to the ones that inherit from Spree::Shipping::ShippingCalculator
-  #   Spree::Shipping::ShippingCalculator makes sure that calculators are able to handle packages and not orders as input
-  #   This is not necessary in OFN because calculators in OFN are already customized to work with different types of input
-  def self.calculators
-    spree_calculators.send model_name_without_spree_namespace
-  end
-
-  # This is bypassing the validation of shipping method zones on checkout
-  # It allows checkout using shipping methods without zones (see issue #3928 for details)
-  #   and it allows checkout with addresses outside of the zones of the selected shipping method
-  def include?(address)
-    address.present?
-  end
-
-  def has_distributor?(distributor)
-    distributors.include?(distributor)
-  end
-
-  def adjustment_label
-    I18n.t('shipping')
-  end
-
-  # Checks whether the shipping method is of delivery type, meaning that it
-  # requires the user to specify a ship address at checkout. Note this is
-  # a setting we added onto the +spree_shipping_methods+ table.
-  #
-  # @return [Boolean]
-  def delivery?
-    require_ship_address
-  end
-
-  private
-
-  def touch_distributors
-    distributors.each do |distributor|
-      distributor.touch if distributor.persisted?
-    end
-  end
-
-  def distributor_validation
-    validates_with DistributorsValidator
-  end
-end

app/models/spree/shipping_rate.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingRate < ActiveRecord::Base
+    belongs_to :shipment, class_name: 'Spree::Shipment'
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
+
+    scope :frontend,
+          -> {
+            includes(:shipping_method).
+              where(ShippingMethod.on_frontend_query).
+              references(:shipping_method).
+              order("cost ASC")
+          }
+    scope :backend,
+          -> {
+            includes(:shipping_method).
+              where(ShippingMethod.on_backend_query).
+              references(:shipping_method).
+              order("cost ASC")
+          }
+
+    delegate :order, :currency, to: :shipment
+    delegate :name, to: :shipping_method
+
+    def display_price
+      price = if Spree::Config[:shipment_inc_vat]
+                (1 + Spree::TaxRate.default) * cost
+              else
+                cost
+              end
+
+      Spree::Money.new(price, { currency: currency })
+    end
+
+    alias_method :display_cost, :display_price
+  end
+end

app/models/spree/state.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spree
+  class State < ActiveRecord::Base
+    belongs_to :country, class_name: 'Spree::Country'
+
+    validates :country, :name, presence: true
+
+    def self.find_all_by_name_or_abbr(name_or_abbr)
+      where('name = ? OR abbr = ?', name_or_abbr, name_or_abbr)
+    end
+
+    def <=>(other)
+      name <=> other.name
+    end
+
+    def to_s
+      name
+    end
+  end
+end

app/models/spree/stock_location.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Spree
+  class StockLocation < ActiveRecord::Base
+    has_many :stock_items, dependent: :delete_all
+    has_many :stock_movements, through: :stock_items
+
+    belongs_to :state, class_name: 'Spree::State'
+    belongs_to :country, class_name: 'Spree::Country'
+
+    validates :name, presence: true
+
+    scope :active, -> { where(active: true) }
+
+    after_create :create_stock_items
+
+    # Wrapper for creating a new stock item respecting the backorderable config
+    def propagate_variant(variant)
+      stock_items.create!(variant: variant, backorderable: backorderable_default)
+    end
+
+    def stock_item(variant)
+      stock_items.where(variant_id: variant).order(:id).first
+    end
+
+    def stock_item_or_create(variant)
+      stock_item(variant) || stock_items.create(variant: variant)
+    end
+
+    def count_on_hand(variant)
+      stock_item(variant).try(:count_on_hand)
+    end
+
+    def backorderable?(variant)
+      stock_item(variant).try(:backorderable?)
+    end
+
+    def restock(variant, quantity, originator = nil)
+      move(variant, quantity, originator)
+    end
+
+    def unstock(variant, quantity, originator = nil)
+      move(variant, -quantity, originator)
+    end
+
+    def move(variant, quantity, originator = nil)
+      variant.move(quantity, originator)
+    end
+
+    def fill_status(variant, quantity)
+      variant.fill_status(quantity)
+    end
+
+    private
+
+    def create_stock_items
+      Variant.find_each { |variant| propagate_variant(variant) }
+    end
+  end
+end

app/models/spree/stock_location_decorator.rb

@@ -1,9 +0,0 @@
-Spree::StockLocation.class_eval do
-  def move(variant, quantity, originator = nil)
-    variant.move(quantity, originator)
-  end
-
-  def fill_status(variant, quantity)
-    variant.fill_status(quantity)
-  end
-end

app/models/spree/stock_movement.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spree
+  class StockMovement < ActiveRecord::Base
+    belongs_to :stock_item, class_name: 'Spree::StockItem'
+    belongs_to :originator, polymorphic: true
+
+    after_create :update_stock_item_quantity
+
+    validates :stock_item, presence: true
+    validates :quantity, presence: true
+
+    scope :recent, -> { order('created_at DESC') }
+
+    def readonly?
+      !new_record?
+    end
+
+    private
+
+    def update_stock_item_quantity
+      stock_item.adjust_count_on_hand quantity
+    end
+  end
+end

app/models/spree/tax_category.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spree
+  class TaxCategory < ActiveRecord::Base
+    acts_as_paranoid
+    validates :name, presence: true, uniqueness: { scope: :deleted_at }
+
+    has_many :tax_rates, dependent: :destroy
+
+    before_save :set_default_category
+
+    def set_default_category
+      # set existing default tax category to false if this one has been marked as default
+
+      return unless is_default && tax_category = self.class.find_by(is_default: true)
+
+      tax_category.update_column(:is_default, false) unless tax_category == self
+    end
+  end
+end

app/models/spree/tax_rate.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: false
+
+module Spree
+  class DefaultTaxZoneValidator < ActiveModel::Validator
+    def validate(record)
+      return unless record.included_in_price
+
+      return if Zone.default_tax
+
+      record.errors.add(:included_in_price, Spree.t(:included_price_validation))
+    end
+  end
+end
+
+module Spree
+  class TaxRate < ActiveRecord::Base
+    acts_as_paranoid
+    include Spree::Core::CalculatedAdjustments
+    belongs_to :zone, class_name: "Spree::Zone"
+    belongs_to :tax_category, class_name: "Spree::TaxCategory"
+
+    validates :amount, presence: true, numericality: true
+    validates :tax_category_id, presence: true
+    validates_with DefaultTaxZoneValidator
+
+    scope :by_zone, ->(zone) { where(zone_id: zone) }
+
+    # Gets the array of TaxRates appropriate for the specified order
+    def self.match(order)
+      return [] if order.distributor && !order.distributor.charges_sales_tax
+      return [] unless order.tax_zone
+
+      all.select do |rate|
+        rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || rate.zone.default_tax
+      end
+    end
+
+    def self.adjust(order)
+      order.adjustments.tax.destroy_all
+      order.line_item_adjustments.where(originator_type: 'Spree::TaxRate').destroy_all
+
+      match(order).each do |rate|
+        rate.adjust(order)
+      end
+    end
+
+    # For VAT, the default rate is the rate that is configured for the default category
+    # It is needed for every price calculation (as all customer facing prices include VAT)
+    # Here we return the actual amount, which may be 0 in case of wrong setup, but is never nil
+    def self.default
+      category = TaxCategory.includes(:tax_rates).find_by(is_default: true)
+      return 0 unless category
+
+      address ||= Address.new(country_id: Spree::Config[:default_country_id])
+      rate = category.tax_rates.detect { |tax_rate| tax_rate.zone.include? address }.try(:amount)
+
+      rate || 0
+    end
+
+    # Creates necessary tax adjustments for the order.
+    def adjust(order)
+      label = create_label
+      if included_in_price
+        if Zone.default_tax.contains? order.tax_zone
+          order.line_items.each { |line_item| create_adjustment(label, line_item, line_item) }
+        else
+          amount = -1 * calculator.compute(order)
+          label = Spree.t(:refund) + label
+
+          order.adjustments.create(
+            amount: amount,
+            source: order,
+            originator: self,
+            state: "closed",
+            label: label
+          )
+        end
+      else
+        create_adjustment(label, order, order)
+      end
+
+      order.adjustments(:reload)
+      order.line_items(:reload)
+      # TaxRate adjustments (order.adjustments.tax)
+      #   and price adjustments (tax included on line items) consist of 100% tax
+      (order.adjustments.tax + order.price_adjustments).each do |adjustment|
+        adjustment.set_absolute_included_tax! adjustment.amount
+      end
+    end
+
+    # Manually apply a TaxRate to a particular amount. TaxRates normally compute against
+    # LineItems or Orders, so we mock out a line item here to fit the interface
+    # that our calculator (usually DefaultTax) expects.
+    def compute_tax(amount)
+      line_item = LineItem.new quantity: 1
+      line_item.tax_category = tax_category
+      line_item.define_singleton_method(:price) { amount }
+
+      # Tax on adjustments (represented by the included_tax field) is always inclusive of
+      # tax. However, there's nothing to stop an admin from setting one up with a tax rate
+      # that's marked as not inclusive of tax, and that would result in the DefaultTax
+      # calculator generating a slightly incorrect value. Therefore, we treat the tax
+      # rate as inclusive of tax for the calculations below, regardless of its original
+      # setting.
+      with_tax_included_in_price do
+        calculator.compute line_item
+      end
+    end
+
+    private
+
+    def create_label
+      label = ""
+      label << (name.presence || tax_category.name) + " "
+      label << (show_rate_in_label? ? "#{amount * 100}%" : "")
+    end
+
+    def with_tax_included_in_price
+      old_included_in_price = included_in_price
+
+      self.included_in_price = true
+      calculator.calculable.included_in_price = true
+
+      result = yield
+    ensure
+      self.included_in_price = old_included_in_price
+      calculator.calculable.included_in_price = old_included_in_price
+
+      result
+    end
+  end
+end

app/models/spree/tax_rate_decorator.rb

@@ -1,61 +0,0 @@
-module Spree
-  TaxRate.class_eval do
-    class << self
-      def match(order)
-        return [] if order.distributor && !order.distributor.charges_sales_tax
-        return [] unless order.tax_zone
-
-        all.select do |rate|
-          rate.zone == order.tax_zone || rate.zone.contains?(order.tax_zone) || rate.zone.default_tax
-        end
-      end
-    end
-
-    def adjust_with_included_tax(order)
-      adjust_without_included_tax(order)
-
-      order.adjustments(:reload)
-      order.line_items(:reload)
-      # TaxRate adjustments (order.adjustments.tax) and price adjustments (tax included on line items) consist of 100% tax
-      (order.adjustments.tax + order.price_adjustments).each do |adjustment|
-        adjustment.set_absolute_included_tax! adjustment.amount
-      end
-    end
-    alias_method_chain :adjust, :included_tax
-
-    # Manually apply a TaxRate to a particular amount. TaxRates normally compute against
-    # LineItems or Orders, so we mock out a line item here to fit the interface
-    # that our calculator (usually DefaultTax) expects.
-    def compute_tax(amount)
-      line_item = LineItem.new quantity: 1
-      line_item.tax_category = tax_category
-      line_item.define_singleton_method(:price) { amount }
-
-      # Tax on adjustments (represented by the included_tax field) is always inclusive of
-      # tax. However, there's nothing to stop an admin from setting one up with a tax rate
-      # that's marked as not inclusive of tax, and that would result in the DefaultTax
-      # calculator generating a slightly incorrect value. Therefore, we treat the tax
-      # rate as inclusive of tax for the calculations below, regardless of its original
-      # setting.
-      with_tax_included_in_price do
-        calculator.compute line_item
-      end
-    end
-
-    private
-
-    def with_tax_included_in_price
-      old_included_in_price = included_in_price
-
-      self.included_in_price = true
-      calculator.calculable.included_in_price = true
-
-      result = yield
-    ensure
-      self.included_in_price = old_included_in_price
-      calculator.calculable.included_in_price = old_included_in_price
-
-      result
-    end
-  end
-end

app/models/spree/taxon.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module Spree
+  class Taxon < ActiveRecord::Base
+    acts_as_nested_set dependent: :destroy
+
+    belongs_to :taxonomy, class_name: 'Spree::Taxonomy', touch: true
+    has_many :classifications, dependent: :destroy
+    has_many :products, through: :classifications
+
+    before_create :set_permalink
+
+    validates :name, presence: true
+
+    has_attached_file :icon,
+                      styles: { mini: '32x32>', normal: '128x128>' },
+                      default_style: :mini,
+                      url: '/spree/taxons/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
+                      default_url: '/assets/default_taxon.png'
+
+    include Spree::Core::S3Support
+    supports_s3 :icon
+
+    # Indicate which filters should be used for this taxon
+    def applicable_filters
+      []
+    end
+
+    # Return meta_title if set otherwise generates from root name and/or taxon name
+    def seo_title
+      if meta_title
+        meta_title
+      else
+        root? ? name : "#{root.name} - #{name}"
+      end
+    end
+
+    # Creates permalink based on Stringex's .to_url method
+    def set_permalink
+      if parent.present?
+        self.permalink = [parent.permalink, permalink_end].join('/')
+      elsif permalink.blank?
+        self.permalink = name.to_url
+      end
+    end
+
+    # For #2759
+    def to_param
+      permalink
+    end
+
+    def active_products
+      scope = products.active
+      scope
+    end
+
+    def pretty_name
+      ancestor_chain = ancestors.inject("") do |name, ancestor|
+        name += "#{ancestor.name} -> "
+      end
+      ancestor_chain + name.to_s
+    end
+
+    # Find all the taxons of supplied products for each enterprise, indexed by enterprise.
+    # Format: {enterprise_id => [taxon_id, ...]}
+    def self.supplied_taxons
+      taxons = {}
+
+      Spree::Taxon.
+        joins(products: :supplier).
+        select('spree_taxons.*, enterprises.id AS enterprise_id').
+        each do |t|
+          taxons[t.enterprise_id.to_i] ||= Set.new
+          taxons[t.enterprise_id.to_i] << t.id
+        end
+
+      taxons
+    end
+
+    # Find all the taxons of distributed products for each enterprise, indexed by enterprise.
+    # May return :all taxons (distributed in open and closed order cycles),
+    # or :current taxons (distributed in an open order cycle).
+    #
+    # Format: {enterprise_id => [taxon_id, ...]}
+    def self.distributed_taxons(which_taxons = :all)
+      ents_and_vars = ExchangeVariant.joins(exchange: :order_cycle).merge(Exchange.outgoing)
+        .select("DISTINCT variant_id, receiver_id AS enterprise_id")
+
+      ents_and_vars = ents_and_vars.merge(OrderCycle.active) if which_taxons == :current
+
+      taxons = Spree::Taxon
+        .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id")
+        .joins(products: :variants_including_master)
+        .joins("
+          INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars
+          ON spree_variants.id = ents_and_vars.variant_id")
+
+      taxons.each_with_object({}) do |t, ts|
+        ts[t.enterprise_id.to_i] ||= Set.new
+        ts[t.enterprise_id.to_i] << t.id
+      end
+    end
+
+    private
+
+    def permalink_end
+      return name.to_url if permalink.blank?
+
+      permalink.split('/').last
+    end
+  end
+end

app/models/spree/taxon_decorator.rb

@@ -1,47 +0,0 @@
-Spree::Taxon.class_eval do
-  has_many :classifications, dependent: :destroy
-
-  # Indicate which filters should be used for this taxon
-  def applicable_filters
-    fs = []
-    # fs << Spree::ProductFilters.distributor_filter if Spree::ProductFilters.respond_to? :distributor_filter
-    fs
-  end
-
-  # Find all the taxons of supplied products for each enterprise, indexed by enterprise.
-  # Format: {enterprise_id => [taxon_id, ...]}
-  def self.supplied_taxons
-    taxons = {}
-
-    Spree::Taxon.
-      joins(products: :supplier).
-      select('spree_taxons.*, enterprises.id AS enterprise_id').
-      each do |t|
-        taxons[t.enterprise_id.to_i] ||= Set.new
-        taxons[t.enterprise_id.to_i] << t.id
-      end
-
-    taxons
-  end
-
-  # Find all the taxons of distributed products for each enterprise, indexed by enterprise.
-  # May return :all taxons (distributed in open and closed order cycles),
-  # or :current taxons (distributed in an open order cycle).
-  #
-  # Format: {enterprise_id => [taxon_id, ...]}
-  def self.distributed_taxons(which_taxons = :all)
-    ents_and_vars = ExchangeVariant.joins(exchange: :order_cycle).merge(Exchange.outgoing)
-      .select("DISTINCT variant_id, receiver_id AS enterprise_id")
-
-    ents_and_vars = ents_and_vars.merge(OrderCycle.active) if which_taxons == :current
-
-    taxons = Spree::Taxon
-      .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id").joins(products: :variants_including_master)
-      .joins("INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars ON spree_variants.id = ents_and_vars.variant_id")
-
-    taxons.each_with_object({}) do |t, ts|
-      ts[t.enterprise_id.to_i] ||= Set.new
-      ts[t.enterprise_id.to_i] << t.id
-    end
-  end
-end