Merge pull request #5793 from luisramos0/payment_fees

Make charges update method update the first pending payment

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,6 +23,10 @@ The categories are based on https://keepachangelog.com/en/1.0.0/. -->
 
 Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
 
+#### How is this related to the Spree upgrade?
+<!-- Any known conflicts with the Spree Upgrade?
+Explain them or remove this section. -->
+
 
 
 #### Discourse thread

.rubocop_manual_todo.yml

@@ -108,6 +108,7 @@ Layout/LineLength:
   - lib/open_food_network/scope_variants_for_search.rb
   - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - lib/spree/product_filters.rb
   - lib/tasks/data.rake
@@ -321,15 +322,6 @@ Layout/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - spec/controllers/base_controller2_spec.rb
-  - spec/features/consumer/caching/darkswarm_caching_spec.rb
-  - spec/models/calculator/flexi_rate_spec.rb
-  - spec/models/calculator/price_sack_spec.rb
-  - spec/models/spree/stock_item_spec.rb
-  - spec/requests/api/orders_spec.rb
-  - spec/swagger_helper.rb
-  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -408,7 +400,6 @@ Metrics/AbcSize:
   - app/services/create_order_cycle.rb
   - app/services/order_cycle_form.rb
   - app/services/order_syncer.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
   - engines/order_management/app/services/order_management/stock/packer.rb
@@ -436,9 +427,7 @@ Metrics/AbcSize:
   - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/api/controller_setup.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - lib/stripe/account_connector.rb
   - lib/tasks/enterprises.rake
@@ -454,11 +443,6 @@ Metrics/AbcSize:
   - spec/models/product_importer_spec.rb
   - spec/services/order_checkout_restart_spec.rb
   - spec/support/performance_helper.rb
-  - app/controllers/application_controller.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
-  - app/models/spree/payment.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -477,8 +461,6 @@ Metrics/BlockLength:
   ]
   Exclude:
   - app/models/spree/shipment.rb
-  - lib/spree/core/controller_helpers/common.rb
-  - lib/spree/core/controller_helpers/ssl.rb
   - lib/tasks/data.rake
   - spec/controllers/spree/admin/invoices_controller_spec.rb
   - spec/factories/enterprise_factory.rb
@@ -497,10 +479,6 @@ Metrics/BlockLength:
   - spec/support/delayed_job_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
-  - spec/requests/api/orders_spec.rb
-  - spec/swagger_helper.rb
 
 Metrics/CyclomaticComplexity:
   Max: 6
@@ -527,14 +505,10 @@ Metrics/CyclomaticComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/core/controller_helpers/order_decorator.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/PerceivedComplexity:
   Max: 7
@@ -556,13 +530,10 @@ Metrics/PerceivedComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/core/controller_helpers/order_decorator.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
-  - app/models/spree/order/checkout.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/MethodLength:
   Max: 10
@@ -625,7 +596,6 @@ Metrics/MethodLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/services/order_cycle_form.rb
   - app/services/permitted_attributes/checkout.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
@@ -656,10 +626,7 @@ Metrics/MethodLength:
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/api/controller_setup.rb
-  - lib/spree/core/controller_helpers/auth.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
   - lib/stripe/profile_storer.rb
   - lib/tasks/data/truncate_data.rb
@@ -669,12 +636,7 @@ Metrics/MethodLength:
   - spec/features/consumer/shopping/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
-  - spec/support/request/authentication_helper.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
+  - spec/support/request/authentication_workflow.rb
 
 Metrics/ClassLength:
   Max: 100
@@ -704,7 +666,6 @@ Metrics/ClassLength:
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/serializers/api/enterprise_shopfront_serializer.rb
   - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/open_food_network/bulk_coop_report.rb
@@ -717,8 +678,6 @@ Metrics/ClassLength:
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
-  - app/models/spree/payment.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
 
 Metrics/ModuleLength:
   Max: 100
@@ -727,7 +686,6 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
-  - engines/order_management/spec/services/order_management/order/updater_spec.rb
   - engines/order_management/spec/services/order_management/stock/package_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
@@ -762,8 +720,6 @@ Metrics/ModuleLength:
   - spec/models/spree/variant_spec.rb
   - spec/services/permissions/order_spec.rb
   - spec/support/request/web_helper.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -772,8 +728,3 @@ Metrics/ParameterLists:
   - app/models/product_import/entry_processor.rb
   - lib/open_food_network/xero_invoices_report.rb
   - spec/features/admin/reports_spec.rb
-
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_todo.yml

@@ -1,214 +1,79 @@
 # 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-06-22 13:28:10 +0100 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/models/spree/order/checkout_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'spec/models/spree/order/checkout_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/EmptyLines:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-    - 'spec/requests/api/orders_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/FirstArrayElementIndentation:
-  Exclude:
-    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-    - 'spec/swagger_helper.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, indented_internal_methods
-Layout/IndentationConsistency:
-  Exclude:
-    - 'spec/models/spree/order/checkout_spec.rb'
-
-# Offense count: 26
+# Offense count: 139
 # 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.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineHashBraceLayout:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
-# SupportedStylesForExponentOperator: space, no_space
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-    - 'spec/requests/api/orders_spec.rb'
-    - 'spec/services/checkout/form_data_adapter_spec.rb'
-    - 'spec/services/user_locale_setter_spec.rb'
-
-# Offense count: 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/requests/api/orders_spec.rb'
+  Max: 268
 
 # Offense count: 2
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 8
+# Offense count: 9
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/spree/user.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
+    - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
-
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
+    - 'lib/open_food_network/reports/bulk_coop_report.rb'
+    - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/spree/core/controller_helpers/common.rb'
-
-# Offense count: 19
+# Offense count: 6
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 126
+  Max: 37
 
-# Offense count: 7
+# Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 102
+  Max: 27
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 231
+  Max: 101
 
-# Offense count: 3
+# Offense count: 1
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 23
+  Max: 7
 
-# Offense count: 19
+# Offense count: 6
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 140
+  Max: 20
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 208
+  Max: 121
 
-# Offense count: 2
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
-  Max: 24
-
-# Offense count: 9
+# Offense count: 8
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/spree/admin/taxonomies_controller.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'lib/spree/core/controller_helpers/common.rb'
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/web_helper.rb'
 
@@ -252,15 +117,6 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-Rails/ActiveRecordAliases:
-  Exclude:
-    - 'spec/controllers/line_items_controller_spec.rb'
-    - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/features/consumer/shopping/orders_spec.rb'
-    - 'spec/requests/api/orders_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -268,13 +124,6 @@ Rails/Date:
   Exclude:
     - 'app/models/order_cycle.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforceForPrefixed.
-Rails/Delegate:
-  Exclude:
-    - 'engines/order_management/app/services/order_management/reports/bulk_coop/renderers/html_renderer.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Whitelist.
@@ -301,7 +150,7 @@ Rails/FilePath:
     - 'spec/serializers/api/admin/enterprise_serializer_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
-# Offense count: 9
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -311,17 +160,15 @@ Rails/FindBy:
     - 'app/models/product_import/entry_processor.rb'
     - 'app/models/product_import/entry_validator.rb'
     - 'app/models/product_import/spreadsheet_data.rb'
-    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/user.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/FindEach:
   Exclude:
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/shipment.rb'
 
 # Offense count: 5
 # Configuration parameters: Include.
@@ -333,7 +180,7 @@ Rails/HasAndBelongsToMany:
     - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/line_item_decorator.rb'
 
-# Offense count: 26
+# Offense count: 25
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -345,7 +192,6 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method_decorator.rb'
     - 'app/models/spree/property.rb'
-    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
@@ -422,7 +268,7 @@ Rails/ReflectionClassName:
     - 'app/models/enterprise_role.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 233
+# Offense count: 227
 # 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:
@@ -441,8 +287,7 @@ Rails/SkipsModelValidations:
     - 'app/models/spree/address_decorator.rb'
     - 'app/models/spree/credit_card_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
-    - 'app/models/spree/payment.rb'
-    - 'app/models/spree/shipment.rb'
+    - 'app/models/spree/payment_decorator.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
@@ -510,22 +355,27 @@ Rails/SkipsModelValidations:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
-    - 'app/models/spree/stock_item.rb'
 
 # Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - 'app/models/spree/stock_item.rb'
+
+# Offense count: 1
 # Configuration parameters: Environments.
 # Environments: development, test, production
 Rails/UnknownEnv:
   Exclude:
     - 'app/models/spree/app_configuration_decorator.rb'
-    - 'lib/spree/core/controller_helpers/ssl.rb'
 
 # Offense count: 2
 Style/CaseEquality:
@@ -533,7 +383,7 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 71
+# Offense count: 75
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -597,10 +447,20 @@ Style/ClassAndModuleChildren:
     - 'app/serializers/api/property_serializer.rb'
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
+    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'lib/open_food_network/locking.rb'
+    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
+    - 'lib/open_food_network/reports/bulk_coop_report.rb'
+    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
+    - 'lib/open_food_network/reports/report.rb'
+    - 'lib/open_food_network/reports/row.rb'
+    - 'lib/open_food_network/reports/rule.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
+    - 'spec/lib/open_food_network/reports/report_spec.rb'
+    - 'spec/lib/open_food_network/reports/row_spec.rb'
+    - 'spec/lib/open_food_network/reports/rule_spec.rb'
 
 # Offense count: 2
 Style/ClassVars:
@@ -615,7 +475,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 847
+# Offense count: 874
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -709,6 +569,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/credit_cards_controller.rb'
+    - 'app/controllers/spree/home_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/controllers/spree/store_controller.rb'
     - 'app/controllers/spree/user_passwords_controller.rb'
@@ -763,6 +624,8 @@ Style/FrozenStringLiteralComment:
     - 'app/jobs/subscription_placement_job.rb'
     - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
+    - 'app/mailers/spree/base_mailer_decorator.rb'
+    - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer.rb'
     - 'app/mailers/subscription_mailer.rb'
     - 'app/models/adjustment_metadata.rb'
@@ -821,6 +684,12 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/address_decorator.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/app_configuration_decorator.rb'
+    - 'app/models/spree/calculator/default_tax_decorator.rb'
+    - 'app/models/spree/calculator/flat_percent_item_total_decorator.rb'
+    - 'app/models/spree/calculator/flat_rate_decorator.rb'
+    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
+    - 'app/models/spree/calculator/per_item_decorator.rb'
+    - 'app/models/spree/calculator/price_sack_decorator.rb'
     - 'app/models/spree/calculator_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/concerns/payment_method_distributors.rb'
@@ -833,6 +702,7 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/option_type_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
+    - 'app/models/spree/payment_decorator.rb'
     - 'app/models/spree/payment_method_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
     - 'app/models/spree/price_decorator.rb'
@@ -841,12 +711,15 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/product_property_decorator.rb'
     - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
+    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/shipping_method_decorator.rb'
+    - 'app/models/spree/stock/availability_validator_decorator.rb'
     - 'app/models/spree/stock_location_decorator.rb'
     - 'app/models/spree/tax_rate_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
+    - 'app/models/stock/package.rb'
     - 'app/models/stripe_account.rb'
     - 'app/models/subscription.rb'
     - 'app/models/subscription_line_item.rb'
@@ -930,6 +803,7 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'app/serializers/api/shop_for_orders_serializer.rb'
     - 'app/serializers/api/state_serializer.rb'
+    - 'app/serializers/api/taxon_image_serializer.rb'
     - 'app/serializers/api/taxon_jstree_attribute_serializer.rb'
     - 'app/serializers/api/taxon_jstree_serializer.rb'
     - 'app/serializers/api/taxon_serializer.rb'
@@ -937,6 +811,7 @@ Style/FrozenStringLiteralComment:
     - 'app/serializers/api/user_serializer.rb'
     - 'app/serializers/api/variant_serializer.rb'
     - 'app/services/action_callbacks.rb'
+    - 'app/services/advance_order_service.rb'
     - 'app/services/bulk_invoice_service.rb'
     - 'app/services/cart_service.rb'
     - 'app/services/create_order_cycle.rb'
@@ -956,7 +831,6 @@ Style/FrozenStringLiteralComment:
     - 'app/services/order_factory.rb'
     - 'app/services/order_syncer.rb'
     - 'app/services/order_update_issues.rb'
-    - 'app/services/order_workflow.rb'
     - 'app/services/permissions/order.rb'
     - 'app/services/product_tag_rules_filterer.rb'
     - 'app/services/products_renderer.rb'
@@ -1019,6 +893,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/address_finder.rb'
     - 'lib/open_food_network/available_payment_method_filter.rb'
+    - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/column_preference_defaults.rb'
     - 'lib/open_food_network/customers_report.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
@@ -1031,6 +906,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/i18n_config.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
     - 'lib/open_food_network/locking.rb'
+    - 'lib/open_food_network/model_class_from_controller_name.rb'
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/order_cycle_management_report.rb'
@@ -1052,8 +928,14 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/referer_parser.rb'
+    - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
+    - 'lib/open_food_network/reports/bulk_coop_report.rb'
+    - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/open_food_network/reports/line_items.rb'
     - 'lib/open_food_network/reports/list.rb'
+    - 'lib/open_food_network/reports/report.rb'
+    - 'lib/open_food_network/reports/row.rb'
+    - 'lib/open_food_network/reports/rule.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/scope_product_to_hub.rb'
     - 'lib/open_food_network/scope_variant_to_hub.rb'
@@ -1067,6 +949,9 @@ Style/FrozenStringLiteralComment:
     - 'lib/spree/api/controller_setup.rb'
     - 'lib/spree/api/testing_support/setup.rb'
     - 'lib/spree/authentication_helpers.rb'
+    - 'lib/spree/core/controller_helpers/auth_decorator.rb'
+    - 'lib/spree/core/controller_helpers/order_decorator.rb'
+    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
     - 'lib/spree/product_filters.rb'
@@ -1095,6 +980,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/tasks/sample_data/user_factory.rb'
     - 'lib/tasks/specs.rake'
     - 'lib/tasks/users.rake'
+    - 'spec/config/application_spec.rb'
     - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
     - 'spec/controllers/admin/column_preferences_controller_spec.rb'
     - 'spec/controllers/admin/customers_controller_spec.rb'
@@ -1125,9 +1011,9 @@ 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_concurrency_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/groups_controller_spec.rb'
@@ -1144,6 +1030,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/overview_controller_spec.rb'
     - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/admin/products_controller_spec.rb'
     - 'spec/controllers/spree/admin/reports_controller_spec.rb'
     - 'spec/controllers/spree/admin/search_controller_spec.rb'
@@ -1152,6 +1039,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/spree/admin/variants_controller_spec.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/controllers/spree/store_controller_spec.rb'
     - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/controllers/spree/users_controller_spec.rb'
     - 'spec/controllers/stripe/callbacks_controller_spec.rb'
@@ -1259,6 +1147,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/jobs/subscription_placement_job_spec.rb'
     - 'spec/jobs/welcome_enterprise_job_spec.rb'
     - 'spec/lib/open_food_network/address_finder_spec.rb'
+    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
     - 'spec/lib/open_food_network/customers_report_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
@@ -1284,6 +1173,9 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/property_merge_spec.rb'
     - 'spec/lib/open_food_network/referer_parser_spec.rb'
+    - 'spec/lib/open_food_network/reports/report_spec.rb'
+    - 'spec/lib/open_food_network/reports/row_spec.rb'
+    - 'spec/lib/open_food_network/reports/rule_spec.rb'
     - 'spec/lib/open_food_network/sales_tax_report_spec.rb'
     - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
@@ -1298,16 +1190,12 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/tasks/enterprises_rake_spec.rb'
     - 'spec/lib/tasks/users_rake_spec.rb'
     - 'spec/mailers/enterprise_mailer_spec.rb'
+    - 'spec/mailers/order_mailer_spec.rb'
     - 'spec/mailers/producer_mailer_spec.rb'
     - 'spec/mailers/subscription_mailer_spec.rb'
     - 'spec/mailers/user_mailer_spec.rb'
     - 'spec/models/adjustment_metadata_spec.rb'
-    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
     - 'spec/models/calculator/flat_percent_per_item_spec.rb'
-    - 'spec/models/calculator/flat_rate_spec.rb'
-    - 'spec/models/calculator/flexi_rate_spec.rb'
-    - 'spec/models/calculator/per_item_spec.rb'
-    - 'spec/models/calculator/price_sack_spec.rb'
     - 'spec/models/calculator/weight_spec.rb'
     - 'spec/models/column_preference_spec.rb'
     - 'spec/models/concerns/order_shipment_spec.rb'
@@ -1333,6 +1221,11 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/addresses_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
+    - 'spec/models/spree/calculator/flat_percent_item_total_spec.rb'
+    - 'spec/models/spree/calculator/flat_rate_spec.rb'
+    - 'spec/models/spree/calculator/flexi_rate_spec.rb'
+    - 'spec/models/spree/calculator/per_item_spec.rb'
+    - 'spec/models/spree/calculator/price_sack_spec.rb'
     - 'spec/models/spree/calculator_spec.rb'
     - 'spec/models/spree/classification_spec.rb'
     - 'spec/models/spree/credit_card_spec.rb'
@@ -1347,12 +1240,14 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/price_spec.rb'
     - 'spec/models/spree/product_set_spec.rb'
     - 'spec/models/spree/product_spec.rb'
+    - 'spec/models/spree/shipment_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/stock/availability_validator_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/models/spree/user_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/stock/package_spec.rb'
     - 'spec/models/stripe_account_spec.rb'
     - 'spec/models/subscription_line_item_spec.rb'
     - 'spec/models/subscription_spec.rb'
@@ -1394,6 +1289,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/serializers/api/product_serializer_spec.rb'
     - 'spec/serializers/api/shipping_method_serializer_spec.rb'
     - 'spec/serializers/api/variant_serializer_spec.rb'
+    - 'spec/services/advance_order_service_spec.rb'
     - 'spec/services/bulk_invoice_service_spec.rb'
     - 'spec/services/cart_service_spec.rb'
     - 'spec/services/default_shipping_category_spec.rb'
@@ -1409,7 +1305,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/services/order_cycle_warning_spec.rb'
     - 'spec/services/order_factory_spec.rb'
     - 'spec/services/order_syncer_spec.rb'
-    - 'spec/services/order_workflow_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/product_tag_rules_filterer_spec.rb'
     - 'spec/services/products_renderer_spec.rb'
@@ -1443,7 +1338,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/support/performance_helper.rb'
     - 'spec/support/products_helper.rb'
     - 'spec/support/request/admin_helper.rb'
-    - 'spec/support/request/authentication_helper.rb'
+    - 'spec/support/request/authentication_workflow.rb'
     - 'spec/support/request/checkout_workflow.rb'
     - 'spec/support/request/cookie_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
@@ -1460,9 +1355,8 @@ Style/FrozenStringLiteralComment:
     - 'spec/validators/integer_array_validator_spec.rb'
     - 'spec/views/spree/admin/orders/edit.html.haml_spec.rb'
     - 'spec/views/spree/admin/orders/index.html.haml_spec.rb'
-    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
 
-# Offense count: 48
+# Offense count: 51
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -1482,35 +1376,32 @@ Style/GuardClause:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
+    - 'app/services/advance_order_service.rb'
     - 'app/services/order_syncer.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
+    - 'lib/spree/core/controller_helpers/order_decorator.rb'
+    - 'lib/spree/core/controller_helpers/respond_with_decorator.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 54
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
-  Exclude:
-    - 'spec/models/spree/payment_spec.rb'
-
 # Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
-# Offense count: 2
+# Offense count: 4
 Style/MixinUsage:
   Exclude:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
+    - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
+    - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 39
+# Offense count: 41
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1525,9 +1416,11 @@ Style/NumericPredicate:
     - 'app/models/product_import/product_importer.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/spree/adjustment_decorator.rb'
+    - 'app/models/spree/calculator/flexi_rate_decorator.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
+    - 'app/models/spree/shipment_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/variant_override.rb'
     - 'app/services/cart_service.rb'
@@ -1540,22 +1433,6 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Exclude:
-    - 'spec/controllers/checkout_controller_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/spree/core/controller_helpers/auth.rb'
-
 # Offense count: 231
 Style/Send:
   Exclude:

DOCKER.md

@@ -17,13 +17,7 @@ Better to have at least 2GB free on your computer in order to download images an
 
 Open a terminal with a shell.
 
-Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
-
-```sh
-$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
-```
-
-Otherwise, if you just want to get things running, clone from the OFN main repo:
+Clone the repository:
 
 ```sh
 $ git clone git@github.com:openfoodfoundation/openfoodnetwork.git

GETTING_STARTED.md

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

Gemfile

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

Gemfile.lock

@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
+  revision: e28e4a8c5cedba504eea9cdad4be440d277d7e68
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)
@@ -108,7 +108,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.6)
+    activerecord-import (1.0.5)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -148,7 +148,9 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt (3.1.13)
-    bugsnag (6.16.0)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
+    bugsnag (6.13.1)
       concurrent-ruby (~> 1.0)
     builder (3.1.4)
     byebug (11.0.1)
@@ -192,7 +194,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     css_parser (1.7.1)
@@ -204,7 +206,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.39.0)
+    ddtrace (0.37.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -217,18 +219,15 @@ GEM
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (3.5.10)
-      bcrypt (~> 3.0)
+    devise (3.0.4)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-token_authenticatable (0.4.10)
-      devise (>= 3.5.2, < 4.0.0)
     diff-lcs (1.3)
+    diffy (3.3.0)
     docile (1.3.2)
     dry-inflector (0.1.2)
     erubis (2.7.0)
@@ -439,7 +438,7 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.2.2)
+    jwt (2.2.1)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -467,7 +466,7 @@ GEM
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
-    multi_json (1.15.0)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
@@ -479,11 +478,11 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.8)
+    oj (3.10.7)
     optimist (3.0.0)
     orm_adapter (0.5.0)
-    paper_trail (7.1.3)
-      activerecord (>= 4.0, < 5.2)
+    paper_trail (5.2.3)
+      activerecord (>= 3.0, < 6.0)
       request_store (~> 1.1)
     paperclip (3.4.2)
       activemodel (>= 3.0.0)
@@ -509,7 +508,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.5)
+    public_suffix (4.0.3)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -554,10 +553,8 @@ GEM
       nokogiri (~> 1.5)
       optimist (~> 3.0)
     redcarpet (3.5.0)
-    request_store (1.5.0)
+    request_store (1.4.1)
       rack (>= 1.4)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
     rexml (3.2.4)
     roadie (3.4.0)
       css_parser (~> 1.4)
@@ -591,19 +588,19 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.9.2)
-    rswag (2.3.1)
-      rswag-api (= 2.3.1)
-      rswag-specs (= 2.3.1)
-      rswag-ui (= 2.3.1)
-    rswag-api (2.3.1)
-      railties (>= 3.1, < 7.0)
-    rswag-specs (2.3.1)
-      activesupport (>= 3.1, < 7.0)
+    rswag (2.2.0)
+      rswag-api (= 2.2.0)
+      rswag-specs (= 2.2.0)
+      rswag-ui (= 2.2.0)
+    rswag-api (2.2.0)
+      railties (>= 3.1, < 6.1)
+    rswag-specs (2.2.0)
+      activesupport (>= 3.1, < 6.1)
       json-schema (~> 2.2)
-      railties (>= 3.1, < 7.0)
-    rswag-ui (2.3.1)
-      actionpack (>= 3.1, < 7.0)
-      railties (>= 3.1, < 7.0)
+      railties (>= 3.1, < 6.1)
+    rswag-ui (2.2.0)
+      actionpack (>= 3.1, < 6.1)
+      railties (>= 3.1, < 6.1)
     rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -671,7 +668,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.6.0)
+    unicorn (5.5.5)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -738,10 +735,10 @@ DEPENDENCIES
   debugger-linecache
   delayed_job_active_record
   delayed_job_web
-  devise (~> 3.5.10)
+  devise (~> 3.0.1)
   devise-encryptable
-  devise-token_authenticatable (~> 0.4.10)
   dfc_provider!
+  diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails (= 4.10.0)
   ffaker (~> 1.16)
@@ -775,7 +772,7 @@ DEPENDENCIES
   ofn-qz!
   oj
   order_management!
-  paper_trail (~> 7.1.3)
+  paper_trail (~> 5.2.3)
   paperclip (~> 3.4.1)
   paranoia (~> 2.0)
   pg (~> 0.21.0)

app/assets/javascripts/admin/all.js

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

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

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

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

@@ -1,9 +0,0 @@
-Darkswarm.directive "disableEnterWithBlur", ()->
-  # Stops enter from doing normal enter things, and blurs the input
-  restrict: 'A'
-  link: (scope, element, attrs)->
-    element.bind "keydown keypress", (e)->
-      code = e.keyCode || e.which
-      if code == 13
-        element.blur()
-        e.preventDefault()

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

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

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

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

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

@@ -24,8 +24,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
           try
             @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
           finally
-            Bugsnag.notify(error)
-            throw error
+            throw error # generate a BugsnagJS alert
 
     handle_checkout_error_response: (response) =>
       throw response unless response.data?

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

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

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

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

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

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

app/assets/stylesheets/admin/reports.scss

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

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

@@ -20,11 +20,9 @@
 
     &:first-child {
       padding-left: 0;
-      width: 70%;
     }
     &:last-child {
       padding-right: 0;
-      width: 30%;
     }
   }
 }

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

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

app/assets/stylesheets/mail/email.scss

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

app/assets/stylesheets/mail/payments_list.scss

@@ -1,45 +0,0 @@
-@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,7 +1,6 @@
 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,8 +3,6 @@ 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]
@@ -142,7 +140,7 @@ module Admin
     end
 
     def permitted_resource_params
-      params.require(:schedule).permit(:id, :name, order_cycle_ids: [])
+      params.require(:schedule).permit(:id, :name)
     end
   end
 end

app/controllers/api/base_controller.rb

@@ -1,6 +1,5 @@
 # Base controller for OFN's API
 require_dependency 'spree/api/controller_setup'
-require "spree/core/controller_helpers/ssl"
 
 module Api
   class BaseController < ActionController::Metal
@@ -54,7 +53,7 @@ module Api
 
     # Use logged in user (spree_current_user) for API authentication (current_api_user)
     def authenticate_user
-      return if @current_api_user = spree_current_user
+      return if @current_api_user = try_spree_current_user
 
       if api_key.blank?
         # An anonymous user

app/controllers/application_controller.rb

@@ -62,15 +62,11 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    shopfront_redirect || main_app.root_path
+    session[:shopfront_redirect] || main_app.root_path
   end
 
   private
 
-  def shopfront_redirect
-    session[:shopfront_redirect]
-  end
-
   def restrict_iframes
     response.headers['X-Frame-Options'] = 'DENY'
     response.headers['Content-Security-Policy'] = "frame-ancestors 'none'"

app/controllers/base_controller.rb

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

app/controllers/cart_controller.rb

@@ -1,4 +1,4 @@
-require 'spree/core/controller_helpers/order'
+require 'spree/core/controller_helpers/order_decorator'
 
 class CartController < BaseController
   before_action :check_authorization

app/controllers/checkout_controller.rb

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

app/controllers/concerns/paper_trail_logging.rb

@@ -1,17 +0,0 @@
-# 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/enterprises_controller.rb

@@ -68,7 +68,7 @@ class EnterprisesController < BaseController
     # reset_distributor must be called before any call to current_customer or current_distributor
     order_cart_reset = OrderCartReset.new(order, params[:id])
     order_cart_reset.reset_distributor
-    order_cart_reset.reset_other!(spree_current_user, current_customer)
+    order_cart_reset.reset_other!(try_spree_current_user, current_customer)
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t(:enterprise_shop_show_error)
     redirect_to shops_path

app/controllers/home_controller.rb

@@ -16,10 +16,6 @@ class HomeController < BaseController
 
   def sell; end
 
-  def unauthorized
-    render 'shared/unauthorized', status: :unauthorized
-  end
-
   private
 
   # Cache the value of the query count

app/controllers/spree/admin/base_controller.rb

@@ -24,7 +24,7 @@ module Spree
       # This is in Spree::Core::ControllerHelpers::Auth
       # But you can't easily reopen modules in Ruby
       def unauthorized
-        if spree_current_user
+        if try_spree_current_user
           flash[:error] = t(:authorization_failure)
           redirect_to '/unauthorized'
         else

app/controllers/spree/admin/mail_methods_controller.rb

@@ -15,7 +15,7 @@ module Spree
       end
 
       def testmail
-        if TestMailer.test_email(spree_current_user).deliver
+        if TestMailer.test_email(try_spree_current_user).deliver
           flash[:success] = Spree.t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = Spree.t('admin.mail_methods.testmail.delivery_error')

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

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

app/controllers/spree/admin/orders_controller.rb

@@ -27,7 +27,7 @@ module Spree
 
       def new
         @order = Order.create
-        @order.created_by = spree_current_user
+        @order.created_by = try_spree_current_user
         @order.save
         redirect_to edit_admin_order_url(@order)
       end
@@ -35,7 +35,7 @@ module Spree
       def edit
         @order.shipments.map(&:refresh_rates)
 
-        OrderWorkflow.new(@order).complete
+        AdvanceOrderService.new(@order).call
 
         # The payment step shows an error of 'No pending payments'
         # Clearing the errors from the order object will stop this error

app/controllers/spree/admin/payments_controller.rb

@@ -37,7 +37,7 @@ module Spree
 
             redirect_to admin_order_payments_path(@order)
           else
-            OrderWorkflow.new(@order).complete!
+            AdvanceOrderService.new(@order).call!
 
             flash[:success] = Spree.t(:new_order_completed)
             redirect_to edit_admin_order_url(@order)
@@ -61,7 +61,7 @@ module Spree
         else
           flash[:error] = t(:cannot_perform_operation)
         end
-      rescue StandardError => e
+      rescue Spree::Core::GatewayError => e
         flash[:error] = e.message
       ensure
         redirect_to request.referer

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/base_controller.rb

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

app/controllers/spree/home_controller.rb

@@ -0,0 +1,7 @@
+module Spree
+  class HomeController < Spree::StoreController
+    respond_to :html
+
+    def index; end
+  end
+end

app/controllers/spree/orders_controller.rb

@@ -1,5 +1,5 @@
-require 'spree/core/controller_helpers/order'
-require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/order_decorator'
+require 'spree/core/controller_helpers/auth_decorator'
 
 module Spree
   class OrdersController < Spree::StoreController
@@ -194,7 +194,7 @@ module Spree
       return if session[:access_token] || params[:token] || spree_current_user
 
       flash[:error] = I18n.t("spree.orders.edit.login_to_view_order")
-      redirect_to main_app.root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
+      require_login_then_redirect_to request.env['PATH_INFO']
     end
 
     def order_to_update

app/controllers/spree/store_controller.rb

@@ -6,5 +6,9 @@ module Spree
 
     include I18nHelper
     before_action :set_locale
+
+    def unauthorized
+      render 'shared/unauthorized', status: :unauthorized
+    end
   end
 end

app/controllers/spree/user_passwords_controller.rb

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

app/controllers/spree/user_registrations_controller.rb

@@ -1,10 +1,3 @@
-# frozen_string_literal: true
-
-require "spree/core/controller_helpers/auth"
-require "spree/core/controller_helpers/common"
-require "spree/core/controller_helpers/order"
-require "spree/core/controller_helpers/ssl"
-
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
     helper 'spree/base', 'spree/store'
@@ -30,6 +23,7 @@ module Spree
       if resource.save
         set_flash_message(:notice, :signed_up)
         sign_in(:spree_user, @user)
+        session[:spree_user_signup] = true
         associate_user
         respond_with resource, location: after_sign_up_path_for(resource)
       else

app/controllers/spree/user_sessions_controller.rb

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

app/controllers/spree/users_controller.rb

@@ -59,7 +59,7 @@ module Spree
       if @user
         authorize! params[:action].to_sym, @user
       else
-        redirect_to main_app.login_path
+        redirect_to spree.login_path
       end
     end
 

app/controllers/user_confirmations_controller.rb

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

app/controllers/user_passwords_controller.rb

@@ -10,7 +10,7 @@ class UserPasswordsController < Spree::UserPasswordsController
 
     if resource.errors.empty?
       set_flash_message(:success, :send_instructions) if is_navigational_format?
-      respond_with resource, location: main_app.login_path
+      respond_with resource, location: spree.login_path
     else
       respond_to do |format|
         format.html do

app/controllers/user_registrations_controller.rb

@@ -16,6 +16,7 @@ class UserRegistrationsController < Spree::UserRegistrationsController
       return render_error(@user.errors)
     end
 
+    session[:spree_user_signup] = true
     session[:confirmation_return_url] = params[:return_url]
     associate_user
 

app/helpers/order_helper.rb

@@ -4,8 +4,4 @@ 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/jobs/subscription_confirm_job.rb

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

app/jobs/subscription_placement_job.rb

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

app/mailers/spree/base_mailer.rb

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

app/mailers/spree/base_mailer_decorator.rb

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

app/mailers/spree/order_mailer.rb

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

app/mailers/spree/order_mailer_decorator.rb

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

app/mailers/spree/shipment_mailer.rb

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

app/mailers/spree/test_mailer.rb

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

app/mailers/spree/user_mailer.rb

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

app/mailers/subscription_mailer.rb

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

app/models/content_configuration.rb

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

app/models/enterprise.rb

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

app/models/order_updater.rb

@@ -0,0 +1,92 @@
+require 'delegate'
+
+class OrderUpdater < SimpleDelegator
+  # TODO: This logic adapted from Spree 2.4, remove when we get there
+  # Handles state updating in a much more logical way than < 2.4
+  # Specifically, doesn't depend on payments.last to determine payment state
+  # Also swapped: == 0 for .zero?, .size == 0 for empty? and .size > 0 for !empty?
+  # See:
+  # https://github.com/spree/spree/commit/38b8456183d11fc1e00e395e7c9154c76ef65b85
+  # https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
+  def update_payment_state
+    last_payment_state = order.payment_state
+
+    order.payment_state = infer_payment_state
+    track_payment_state_change(last_payment_state)
+
+    order.payment_state
+  end
+
+  def before_save_hook
+    shipping_address_from_distributor
+  end
+
+  # Sets the distributor's address as shipping address of the order for those
+  # shipments using a shipping method that doesn't require address, such us
+  # a pickup.
+  def shipping_address_from_distributor
+    return if order.shipping_method.blank? || order.shipping_method.require_ship_address
+
+    order.ship_address = order.address_from_distributor
+  end
+
+  private
+
+  def infer_payment_state
+    if failed_payments?
+      'failed'
+    elsif canceled_and_not_paid_for?
+      'void'
+    else
+      infer_payment_state_from_balance
+    end
+  end
+
+  def infer_payment_state_from_balance
+    # This part added so that we don't need to override
+    # order.outstanding_balance
+    balance = order.outstanding_balance
+    balance = -1 * order.payment_total if canceled_and_paid_for?
+
+    infer_state(balance)
+  end
+
+  def infer_state(balance)
+    if balance > 0
+      'balance_due'
+    elsif balance < 0
+      'credit_owed'
+    elsif balance.zero?
+      'paid'
+    end
+  end
+
+  # Tracks the state transition through a state_change for this order. It
+  # does so until the last state is reached. That is, when the infered next
+  # state is the same as the order has now.
+  #
+  # @param last_payment_state [String]
+  def track_payment_state_change(last_payment_state)
+    return if last_payment_state == order.payment_state
+
+    order.state_changed('payment')
+  end
+
+  # Taken from order.outstanding_balance in Spree 2.4
+  # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a
+  def canceled_and_paid_for?
+    order.canceled? && paid?
+  end
+
+  def canceled_and_not_paid_for?
+    order.state == 'canceled' && order.payment_total.zero?
+  end
+
+  def paid?
+    payments.present? && !payments.completed.empty?
+  end
+
+  def failed_payments?
+    payments.present? && payments.valid.empty?
+  end
+end

app/models/preference_sections/map_section.rb

@@ -10,9 +10,7 @@ module PreferenceSections
       [
         :open_street_map_enabled,
         :open_street_map_provider_name,
-        :open_street_map_provider_options,
-        :open_street_map_default_latitude,
-        :open_street_map_default_longitude
+        :open_street_map_provider_options
       ]
     end
   end

app/models/spree/credit_card.rb

@@ -1,155 +0,0 @@
-# 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

@@ -0,0 +1,47 @@
+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

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'spree/concerns/payment_method_distributors'
-
-module Spree
-  class Gateway < PaymentMethod
-    include Spree::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

@@ -1,102 +0,0 @@
-# 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

@@ -1,36 +0,0 @@
-# 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

@@ -0,0 +1,9 @@
+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/order/checkout.rb

@@ -1,191 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class Order < ActiveRecord::Base
-    module Checkout
-      def self.included(klass)
-        klass.class_eval do
-          class_attribute :next_event_transitions
-          class_attribute :previous_states
-          class_attribute :checkout_flow
-          class_attribute :checkout_steps
-          class_attribute :removed_transitions
-
-          def self.checkout_flow(&block)
-            if block_given?
-              @checkout_flow = block
-              define_state_machine!
-            else
-              @checkout_flow
-            end
-          end
-
-          def self.define_state_machine!
-            self.checkout_steps = {}
-            self.next_event_transitions = []
-            self.previous_states = [:cart]
-            self.removed_transitions = []
-
-            # Build the checkout flow using the checkout_flow defined either
-            # within the Order class, or a decorator for that class.
-            #
-            # This method may be called multiple times depending on if the
-            # checkout_flow is re-defined in a decorator or not.
-            instance_eval(&checkout_flow)
-
-            klass = self
-
-            # To avoid a ton of warnings when the state machine is re-defined
-            StateMachine::Machine.ignore_method_conflicts = true
-            # To avoid multiple occurrences of the same transition being defined
-            # On first definition, state_machines will not be defined
-            state_machines.clear if respond_to?(:state_machines)
-            state_machine :state, initial: :cart do
-              klass.next_event_transitions.each { |t| transition(t.merge(on: :next)) }
-
-              # Persist the state on the order
-              after_transition do |order|
-                order.state = order.state
-                order.save
-              end
-
-              event :cancel do
-                transition to: :canceled, if: :allow_cancel?
-              end
-
-              event :return do
-                transition to: :returned, from: :awaiting_return, unless: :awaiting_returns?
-              end
-
-              event :resume do
-                transition to: :resumed, from: :canceled, if: :allow_resume?
-              end
-
-              event :authorize_return do
-                transition to: :awaiting_return
-              end
-
-              if states[:payment]
-                before_transition to: :complete do |order|
-                  order.process_payments! if order.payment_required?
-                end
-              end
-
-              before_transition from: :cart, do: :ensure_line_items_present
-
-              before_transition to: :delivery, do: :create_proposed_shipments
-              before_transition to: :delivery, do: :ensure_available_shipping_rates
-
-              after_transition to: :complete, do: :finalize!
-              after_transition to: :delivery, do: :create_tax_charge!
-              after_transition to: :resumed,  do: :after_resume
-              after_transition to: :canceled, do: :after_cancel
-            end
-          end
-
-          def self.go_to_state(name, options = {})
-            checkout_steps[name] = options
-            previous_states.each do |state|
-              add_transition({ from: state, to: name }.merge(options))
-            end
-            if options[:if]
-              previous_states << name
-            else
-              self.previous_states = [name]
-            end
-          end
-
-          def self.insert_checkout_step(name, options = {})
-            before = options.delete(:before)
-            after = options.delete(:after) unless before
-            after = checkout_steps.keys.last unless before || after
-
-            cloned_steps = checkout_steps.clone
-            cloned_removed_transitions = removed_transitions.clone
-            checkout_flow do
-              cloned_steps.each_pair do |key, value|
-                go_to_state(name, options) if key == before
-                go_to_state(key, value)
-                go_to_state(name, options) if key == after
-              end
-              cloned_removed_transitions.each do |transition|
-                remove_transition(transition)
-              end
-            end
-          end
-
-          def self.remove_checkout_step(name)
-            cloned_steps = checkout_steps.clone
-            cloned_removed_transitions = removed_transitions.clone
-            checkout_flow do
-              cloned_steps.each_pair do |key, value|
-                go_to_state(key, value) unless key == name
-              end
-              cloned_removed_transitions.each do |transition|
-                remove_transition(transition)
-              end
-            end
-          end
-
-          def self.remove_transition(options = {})
-            removed_transitions << options
-            next_event_transitions.delete(find_transition(options))
-          end
-
-          def self.find_transition(options = {})
-            return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
-
-            next_event_transitions.detect do |transition|
-              transition[options[:from].to_sym] == options[:to].to_sym
-            end
-          end
-
-          def self.next_event_transitions
-            @next_event_transitions ||= []
-          end
-
-          def self.checkout_steps
-            @checkout_steps ||= {}
-          end
-
-          def self.add_transition(options)
-            next_event_transitions << { options.delete(:from) => options.delete(:to) }.
-              merge(options)
-          end
-
-          def checkout_steps
-            steps = self.class.checkout_steps.
-              each_with_object([]) { |(step, options), checkout_steps|
-              next if options.include?(:if) && !options[:if].call(self)
-
-              checkout_steps << step
-            }.map(&:to_s)
-            # Ensure there is always a complete step
-            steps << "complete" unless steps.include?("complete")
-            steps
-          end
-
-          def checkout_step?(step)
-            step.present? ? checkout_steps.include?(step) : false
-          end
-
-          def checkout_step_index(step)
-            checkout_steps.index(step)
-          end
-
-          def self.removed_transitions
-            @removed_transitions ||= []
-          end
-
-          def can_go_to_state?(state)
-            return false unless self.state.present? &&
-                                checkout_step?(state) &&
-                                checkout_step?(self.state)
-
-            checkout_step_index(state) > checkout_step_index(self.state)
-          end
-        end
-      end
-    end
-  end
-end

app/models/spree/order_decorator.rb

@@ -89,10 +89,6 @@ Spree::Order.class_eval do
     where("state != ?", state)
   }
 
-  def updater
-    @updater ||= OrderManagement::Order::Updater.new(self)
-  end
-
   def create_proposed_shipments
     adjustments.shipping.delete_all
     shipments.destroy_all
@@ -378,13 +374,6 @@ Spree::Order.class_eval do
     address
   end
 
-  # Update attributes of a record in the database without callbacks, validations etc.
-  #   This was originally an extension to ActiveRecord in Spree but only used for Spree::Order
-  def update_attributes_without_callbacks(attributes)
-    assign_attributes(attributes)
-    Spree::Order.where(id: id).update_all(attributes)
-  end
-
   private
 
   def adjustments_fetcher

app/models/spree/order_updater_decorator.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Spree::OrderUpdater.class_eval do
+  # Override spree method to make it update all adjustments as in Spree v2.0.4
+  def update_shipping_adjustments
+    order.adjustments.reload.each(&:update!)
+  end
+end

app/models/spree/payment.rb

@@ -1,216 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class Payment < ActiveRecord::Base
-    include Spree::Payment::Processing
-    extend Spree::LocalizedNumber
-
-    localize_number :amount
-
-    IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
-
-    delegate :line_items, to: :order
-    delegate :currency, to: :order
-
-    belongs_to :order, class_name: 'Spree::Order'
-    belongs_to :source, polymorphic: true
-    belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
-
-    has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0").completed },
-             class_name: "Spree::Payment", foreign_key: :source_id
-    has_many :log_entries, as: :source, dependent: :destroy
-
-    has_one :adjustment, as: :source, dependent: :destroy
-
-    validate :validate_source
-    before_save :set_unique_identifier
-
-    after_save :create_payment_profile, if: :profiles_supported?
-
-    # update the order totals, etc.
-    after_save :ensure_correct_adjustment, :update_order
-    # invalidate previously entered payments
-    after_create :invalidate_old_payments
-
-    # Skips the validation of the source (for example, credit card) of the payment.
-    #
-    # This is used in refunds as the validation of the card can fail but the refund can go through,
-    #    we trust the payment gateway in these cases. For example, Stripe is accepting refunds with
-    #    source cards that were valid when the payment was placed but are now expired, and we
-    #    consider them invalid.
-    attr_accessor :skip_source_validation
-    attr_accessor :source_attributes
-
-    after_initialize :build_source
-
-    scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
-    scope :with_state, ->(s) { where(state: s.to_s) }
-    scope :completed, -> { with_state('completed') }
-    scope :pending, -> { with_state('pending') }
-    scope :failed, -> { with_state('failed') }
-    scope :valid, -> { where('state NOT IN (?)', %w(failed invalid)) }
-
-    # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-    state_machine initial: :checkout do
-      # With card payments, happens before purchase or authorization happens
-      event :started_processing do
-        transition from: [:checkout, :pending, :completed, :processing], to: :processing
-      end
-      # When processing during checkout fails
-      event :failure do
-        transition from: [:pending, :processing], to: :failed
-      end
-      # With card payments this represents authorizing the payment
-      event :pend do
-        transition from: [:checkout, :processing], to: :pending
-      end
-      # With card payments this represents completing a purchase or capture transaction
-      event :complete do
-        transition from: [:processing, :pending, :checkout], to: :completed
-      end
-      event :void do
-        transition from: [:pending, :completed, :checkout], to: :void
-      end
-      # when the card brand isnt supported
-      event :invalidate do
-        transition from: [:checkout], to: :invalid
-      end
-    end
-
-    def money
-      Spree::Money.new(amount, currency: currency)
-    end
-    alias display_amount money
-
-    def offsets_total
-      offsets.pluck(:amount).sum
-    end
-
-    def credit_allowed
-      amount - offsets_total
-    end
-
-    def can_credit?
-      credit_allowed.positive?
-    end
-
-    def build_source
-      return if source_attributes.nil?
-      return unless payment_method.andand.payment_source_class
-
-      self.source = payment_method.payment_source_class.new(source_attributes)
-      source.payment_method_id = payment_method.id
-      source.user_id = order.user_id if order
-    end
-
-    # Pin payments lacks void and credit methods, but it does have refund
-    # Here we swap credit out for refund and remove void as a possible action
-    def actions
-      return [] unless payment_source&.respond_to?(:actions)
-
-      actions = payment_source.actions.select do |action|
-        !payment_source.respond_to?("can_#{action}?") ||
-          payment_source.__send__("can_#{action}?", self)
-      end
-
-      if payment_method.is_a? Gateway::Pin
-        actions << 'refund' if actions.include? 'credit'
-        actions.reject! { |a| ['credit', 'void'].include? a }
-      end
-
-      actions
-    end
-
-    def payment_source
-      res = source.is_a?(Payment) ? source.source : source
-      res || payment_method
-    end
-
-    def ensure_correct_adjustment
-      revoke_adjustment_eligibility if ['failed', 'invalid'].include?(state)
-      return if adjustment.try(:finalized?)
-
-      if adjustment
-        adjustment.originator = payment_method
-        adjustment.label = adjustment_label
-        adjustment.save
-      else
-        payment_method.create_adjustment(adjustment_label, order, self, true)
-        association(:adjustment).reload
-      end
-    end
-
-    def adjustment_label
-      I18n.t('payment_method_fee')
-    end
-
-    private
-
-    # Don't charge fees for invalid or failed payments.
-    # This is called twice for failed payments, because the persistence of the 'failed'
-    # state is acheived through some trickery using an after_rollback callback on the
-    # payment model. See Spree::Payment#persist_invalid
-    def revoke_adjustment_eligibility
-      return unless adjustment.try(:reload)
-      return if adjustment.finalized?
-
-      adjustment.update_attribute(:eligible, false)
-      adjustment.finalize!
-    end
-
-    def validate_source
-      if source && !skip_source_validation && !source.valid?
-        source.errors.each do |field, error|
-          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-          errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
-        end
-      end
-      errors.blank?
-    end
-
-    def profiles_supported?
-      payment_method.respond_to?(:payment_profiles_supported?) &&
-        payment_method.payment_profiles_supported?
-    end
-
-    def create_payment_profile
-      return unless source.is_a?(CreditCard)
-      return unless source.try(:save_requested_by_customer?)
-      return unless source.number || source.gateway_payment_profile_id
-      return unless source.gateway_customer_profile_id.nil?
-
-      payment_method.create_profile(self)
-    rescue ActiveMerchant::ConnectionError => e
-      gateway_error e
-    end
-
-    # Makes newly entered payments invalidate previously entered payments so the most recent payment
-    # is used by the gateway.
-    def invalidate_old_payments
-      order.payments.with_state('checkout').where.not(id: id).each do |payment|
-        # Using update_column skips validations and so it skips validate_source. As we are just
-        # invalidating past payments here, we don't want to validate all of them at this stage.
-        payment.update_column(:state, 'invalid')
-        payment.ensure_correct_adjustment
-      end
-    end
-
-    def update_order
-      order.payments.reload
-      order.update!
-    end
-
-    # Necessary because some payment gateways will refuse payments with
-    # duplicate IDs. We *were* using the Order number, but that's set once and
-    # is unchanging. What we need is a unique identifier on a per-payment basis,
-    # and this is it. Related to #1998.
-    # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
-    def set_unique_identifier
-      self.identifier = generate_identifier while self.class.exists?(identifier: identifier)
-    end
-
-    def generate_identifier
-      Array.new(8){ IDENTIFIER_CHARS.sample }.join
-    end
-  end
-end

app/models/spree/payment/processing.rb

@@ -1,277 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class Payment < ActiveRecord::Base
-    module Processing
-      def process!
-        return unless payment_method&.source_required?
-
-        raise Core::GatewayError, Spree.t(:payment_processing_failed) unless source
-
-        return if processing?
-
-        unless payment_method.supports?(source)
-          invalidate!
-          raise Core::GatewayError, Spree.t(:payment_method_not_supported)
-        end
-
-        if payment_method.auto_capture?
-          purchase!
-        else
-          authorize!
-        end
-      end
-
-      def authorize!
-        started_processing!
-        gateway_action(source, :authorize, :pend)
-      end
-
-      def purchase!
-        started_processing!
-        gateway_action(source, :purchase, :complete)
-      end
-
-      def capture!
-        return true if completed?
-
-        started_processing!
-        protect_from_connection_error do
-          check_environment
-
-          response = if payment_method.payment_profiles_supported?
-                       # Gateways supporting payment profiles will need access to credit
-                       # card object because this stores the payment profile information
-                       # so supply the authorization itself as well as the credit card,
-                       # rather than just the authorization code
-                       payment_method.capture(self, source, gateway_options)
-                     else
-                       # Standard ActiveMerchant capture usage
-                       payment_method.capture(money.money.cents,
-                                              response_code,
-                                              gateway_options)
-                     end
-
-          handle_response(response, :complete, :failure)
-        end
-      end
-
-      def void_transaction!
-        return true if void?
-
-        protect_from_connection_error do
-          check_environment
-
-          response = if payment_method.payment_profiles_supported?
-                       # Gateways supporting payment profiles will need access to credit
-                       # card object because this stores the payment profile information
-                       # so supply the authorization itself as well as the credit card,
-                       # rather than just the authorization code
-                       payment_method.void(response_code, source, gateway_options)
-                     else
-                       # Standard ActiveMerchant void usage
-                       payment_method.void(response_code, gateway_options)
-                     end
-
-          record_response(response)
-
-          if response.success?
-            self.response_code = response.authorization
-            void
-          else
-            gateway_error(response)
-          end
-        end
-      end
-
-      def credit!(credit_amount = nil)
-        protect_from_connection_error do
-          check_environment
-
-          credit_amount = calculate_refund_amount(credit_amount)
-
-          response = if payment_method.payment_profiles_supported?
-                       payment_method.credit(
-                         (credit_amount * 100).round,
-                         source,
-                         response_code,
-                         gateway_options
-                       )
-                     else
-                       payment_method.credit(
-                         (credit_amount * 100).round,
-                         response_code,
-                         gateway_options
-                       )
-                     end
-
-          record_response(response)
-
-          if response.success?
-            self.class.create!(
-              order: order,
-              source: self,
-              payment_method: payment_method,
-              amount: credit_amount.abs * -1,
-              response_code: response.authorization,
-              state: 'completed',
-              skip_source_validation: true
-            )
-          else
-            gateway_error(response)
-          end
-        end
-      end
-
-      def refund!(refund_amount = nil)
-        protect_from_connection_error do
-          check_environment
-
-          refund_amount = calculate_refund_amount(refund_amount)
-
-          response = if payment_method.payment_profiles_supported?
-                       payment_method.refund(
-                         (refund_amount * 100).round,
-                         source,
-                         response_code,
-                         gateway_options
-                       )
-                     else
-                       payment_method.refund(
-                         (refund_amount * 100).round,
-                         response_code,
-                         gateway_options
-                       )
-                     end
-
-          record_response(response)
-
-          if response.success?
-            self.class.create!(
-              order: order,
-              source: self,
-              payment_method: payment_method,
-              amount: refund_amount.abs * -1,
-              response_code: response.authorization,
-              state: 'completed',
-              skip_source_validation: true
-            )
-          else
-            gateway_error(response)
-          end
-        end
-      end
-
-      def partial_credit(amount)
-        return if amount > credit_allowed
-
-        started_processing!
-        credit!(amount)
-      end
-
-      def gateway_options
-        options = { email: order.email,
-                    customer: order.email,
-                    ip: order.last_ip_address,
-                    # Need to pass in a unique identifier here to make some
-                    # payment gateways happy.
-                    #
-                    # 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!({ billing_address: order.bill_address.try(:active_merchant_hash),
-                         shipping_address: order.ship_address.try(:active_merchant_hash) })
-
-        options
-      end
-
-      private
-
-      def calculate_refund_amount(refund_amount = nil)
-        refund_amount ||= if credit_allowed >= order.outstanding_balance.abs
-                            order.outstanding_balance.abs
-                          else
-                            credit_allowed.abs
-                          end
-        refund_amount.to_f
-      end
-
-      def gateway_action(source, action, success_state)
-        protect_from_connection_error do
-          check_environment
-
-          response = payment_method.public_send(
-            action,
-            (amount * 100).round,
-            source,
-            gateway_options
-          )
-          handle_response(response, success_state, :failure)
-        end
-      end
-
-      def handle_response(response, success_state, failure_state)
-        record_response(response)
-
-        if response.success?
-          unless response.authorization.nil?
-            self.response_code = response.authorization
-            self.avs_response = response.avs_result['code']
-
-            if response.cvv_result
-              self.cvv_response_code = response.cvv_result['code']
-              self.cvv_response_message = response.cvv_result['message']
-            end
-          end
-          __send__("#{success_state}!")
-        else
-          __send__(failure_state)
-          gateway_error(response)
-        end
-      end
-
-      def record_response(response)
-        log_entries.create(details: response.to_yaml)
-      end
-
-      def protect_from_connection_error
-        yield
-      rescue ActiveMerchant::ConnectionError => e
-        gateway_error(e)
-      end
-
-      def gateway_error(error)
-        text = if error.is_a? ActiveMerchant::Billing::Response
-                 error.params['message'] || error.params['response_reason_text'] || error.message
-               elsif error.is_a? ActiveMerchant::ConnectionError
-                 Spree.t(:unable_to_connect_to_gateway)
-               else
-                 error.to_s
-               end
-        logger.error(Spree.t(:gateway_error))
-        logger.error("  #{error.to_yaml}")
-        raise Core::GatewayError, text
-      end
-
-      # Saftey check to make sure we're not accidentally performing operations on a live gateway.
-      # Ex. When testing in staging environment with a copy of production data.
-      def check_environment
-        return if payment_method.environment == Rails.env
-
-        message = Spree.t(:gateway_config_unavailable) + " - #{Rails.env}"
-        raise Core::GatewayError, message
-      end
-
-      # The unique identifier to be passed in to the payment gateway
-      def gateway_order_id
-        "#{order.number}-#{identifier}"
-      end
-    end
-  end
-end

app/models/spree/payment_decorator.rb

@@ -0,0 +1,117 @@
+require 'spree/localized_number'
+
+module Spree
+  Payment.class_eval do
+    extend Spree::LocalizedNumber
+
+    delegate :line_items, to: :order
+
+    has_one :adjustment, as: :source, dependent: :destroy
+
+    after_save :ensure_correct_adjustment, :update_order
+
+    localize_number :amount
+
+    # We bypass this after_rollback callback that is setup in Spree::Payment
+    # The issues the callback fixes are not experienced in OFN:
+    #   if a payment fails on checkout the state "failed" is persisted correctly
+    def persist_invalid; end
+
+    def ensure_correct_adjustment
+      revoke_adjustment_eligibility if ['failed', 'invalid'].include?(state)
+      return if adjustment.try(:finalized?)
+
+      if adjustment
+        adjustment.originator = payment_method
+        adjustment.label = adjustment_label
+        adjustment.save
+      else
+        payment_method.create_adjustment(adjustment_label, order, self, true)
+        association(:adjustment).reload
+      end
+    end
+
+    def adjustment_label
+      I18n.t('payment_method_fee')
+    end
+
+    # Pin payments lacks void and credit methods, but it does have refund
+    # Here we swap credit out for refund and remove void as a possible action
+    def actions_with_pin_payment_adaptations
+      actions = actions_without_pin_payment_adaptations
+      if payment_method.is_a? Gateway::Pin
+        actions << 'refund' if actions.include? 'credit'
+        actions.reject! { |a| ['credit', 'void'].include? a }
+      end
+      actions
+    end
+    alias_method_chain :actions, :pin_payment_adaptations
+
+    def refund!(refund_amount = nil)
+      protect_from_connection_error do
+        check_environment
+
+        refund_amount = calculate_refund_amount(refund_amount)
+
+        if payment_method.payment_profiles_supported?
+          response = payment_method.refund((refund_amount * 100).round, source, response_code, gateway_options)
+        else
+          response = payment_method.refund((refund_amount * 100).round, response_code, gateway_options)
+        end
+
+        record_response(response)
+
+        if response.success?
+          self.class.create(order: order,
+                            source: self,
+                            payment_method: payment_method,
+                            amount: refund_amount.abs * -1,
+                            response_code: response.authorization,
+                            state: 'completed')
+        else
+          gateway_error(response)
+        end
+      end
+    end
+
+    # Import from future Spree v.2.3.0 d470b31798f37
+    def build_source
+      return if source_attributes.nil?
+      return unless payment_method.andand.payment_source_class
+
+      self.source = payment_method.payment_source_class.new(source_attributes)
+      source.payment_method_id = payment_method.id
+      source.user_id = order.user_id if order
+    end
+
+    private
+
+    def calculate_refund_amount(refund_amount = nil)
+      refund_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+      refund_amount.to_f
+    end
+
+    def create_payment_profile
+      return unless source.is_a?(CreditCard)
+      return unless source.try(:save_requested_by_customer?)
+      return unless source.number || source.gateway_payment_profile_id
+      return unless source.gateway_customer_profile_id.nil?
+
+      payment_method.create_profile(self)
+    rescue ActiveMerchant::ConnectionError => e
+      gateway_error e
+    end
+
+    # Don't charge fees for invalid or failed payments.
+    # This is called twice for failed payments, because the persistence of the 'failed'
+    # state is acheived through some trickery using an after_rollback callback on the
+    # payment model. See Spree::Payment#persist_invalid
+    def revoke_adjustment_eligibility
+      return unless adjustment.try(:reload)
+      return if adjustment.finalized?
+
+      adjustment.update_attribute(:eligible, false)
+      adjustment.finalize!
+    end
+  end
+end

app/models/spree/payment_method.rb

@@ -1,137 +0,0 @@
-# frozen_string_literal: true
-
-require 'spree/concerns/payment_method_distributors'
-
-module Spree
-  class PaymentMethod < ActiveRecord::Base
-    include Spree::Core::CalculatedAdjustments
-    include Spree::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

@@ -1,33 +0,0 @@
-# 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

@@ -0,0 +1,84 @@
+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/product_decorator.rb

@@ -63,7 +63,8 @@ Spree::Product.class_eval do
   scope :visible_for, lambda { |enterprise|
     joins('LEFT OUTER JOIN spree_variants AS o_spree_variants ON (o_spree_variants.product_id = spree_products.id)').
       joins('LEFT OUTER JOIN inventory_items AS o_inventory_items ON (o_spree_variants.id = o_inventory_items.variant_id)').
-      where('o_inventory_items.enterprise_id = (?) AND visible = (?)', enterprise, true)
+      where('o_inventory_items.enterprise_id = (?) AND visible = (?)', enterprise, true).
+      select('DISTINCT spree_products.*')
   }
 
   # -- Scopes

app/models/spree/taxon_decorator.rb

@@ -1,6 +1,9 @@
 Spree::Taxon.class_eval do
   has_many :classifications, dependent: :destroy
 
+  attachment_definitions[:icon][:path] = 'public/images/spree/taxons/:id/:style/:basename.:extension'
+  attachment_definitions[:icon][:url] = '/images/spree/taxons/:id/:style/:basename.:extension'
+
   # Indicate which filters should be used for this taxon
   def applicable_filters
     fs = []

app/models/spree/user.rb

@@ -34,6 +34,10 @@ module Spree
 
     # We use the same options as Spree and add :confirmable
     devise :confirmable, reconfirmable: true
+    # TODO: Later versions of devise have a dedicated after_confirmation callback, so use that
+    after_update :welcome_after_confirm, if: lambda {
+      confirmation_token_changed? && confirmation_token.nil?
+    }
 
     class DestroyWithOrdersError < StandardError; end
 
@@ -45,14 +49,14 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def send_reset_password_instructions
+      generate_reset_password_token!
+      UserMailer.reset_password_instructions(id).deliver
+    end
     # handle_asynchronously will define send_reset_password_instructions_with_delay.
     # If handle_asynchronously is called twice, we get an infinite job loop.
     handle_asynchronously :send_reset_password_instructions unless method_defined? :send_reset_password_instructions_with_delay
 
-    def regenerate_reset_password_token
-      set_reset_password_token
-    end
-
     def known_users
       if admin?
         Spree::User.where(nil)
@@ -78,9 +82,9 @@ module Spree
       customers.find_by(enterprise_id: enterprise)
     end
 
-    # This is a Devise Confirmable callback that runs on email confirmation
-    # It sends a welcome email after the user email is confirmed
-    def after_confirmation
+    def welcome_after_confirm
+      # Send welcome email if we are confirming an user's email
+      # Note: this callback only runs on email confirmation
       return unless confirmed? && unconfirmed_email.nil? && !unconfirmed_email_changed?
 
       send_signup_confirmation

app/serializers/api/admin/enterprise_serializer.rb

@@ -4,8 +4,8 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
              :preferred_shopfront_message, :preferred_shopfront_closed_message,
              :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order,
              :preferred_product_selection_from_inventory_only,
-             :preferred_show_customer_names_to_suppliers, :owner, :contact, :users, :tag_groups,
-             :default_tag_group, :require_login, :allow_guest_orders, :allow_order_changes,
+             :owner, :contact, :users, :tag_groups, :default_tag_group,
+             :require_login, :allow_guest_orders, :allow_order_changes,
              :logo, :promo_image
 
   has_one :owner, serializer: Api::Admin::UserSerializer

app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb

@@ -30,10 +30,9 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
   def products_scope
     products_relation = object.supplied_products
     if order_cycle.prefers_product_selection_from_coordinator_inventory_only?
-      products_relation = products_relation.
-        visible_for(order_cycle.coordinator)
+      products_relation = products_relation.visible_for(order_cycle.coordinator)
     end
-    products_relation
+    products_relation.order(:name)
   end
 
   def products

app/serializers/api/open_street_map_config_serializer.rb

@@ -4,9 +4,7 @@ module Api
   class OpenStreetMapConfigSerializer < ActiveModel::Serializer
     attributes :open_street_map_enabled,
                :open_street_map_provider_name,
-               :open_street_map_provider_options,
-               :open_street_map_default_latitude,
-               :open_street_map_default_longitude
+               :open_street_map_provider_options
 
     def open_street_map_enabled
       ContentConfig.open_street_map_enabled
@@ -17,15 +15,7 @@ module Api
     end
 
     def open_street_map_provider_options
-      ContentConfig.open_street_map_provider_options
-    end
-
-    def open_street_map_default_latitude
-      ContentConfig.open_street_map_default_latitude
-    end
-
-    def open_street_map_default_longitude
-      ContentConfig.open_street_map_default_longitude
+      ContentConfig.open_street_map_provider_options.to_json
     end
   end
 end

app/serializers/api/taxon_image_serializer.rb

@@ -0,0 +1,11 @@
+class Api::TaxonImageSerializer < ActiveModel::Serializer
+  attributes :id, :alt, :small_url, :large_url
+
+  def small_url
+    object.attachment.url(:small, false)
+  end
+
+  def large_url
+    object.attachment.url(:large, false)
+  end
+end

app/serializers/api/taxon_serializer.rb

@@ -2,5 +2,9 @@ class Api::TaxonSerializer < ActiveModel::Serializer
   cached
   delegate :cache_key, to: :object
 
-  attributes :id, :name, :permalink, :pretty_name, :position, :parent_id, :taxonomy_id
+  attributes :id, :name, :permalink, :icon, :pretty_name, :position, :parent_id, :taxonomy_id
+
+  def icon
+    object.icon(:original)
+  end
 end

app/services/advance_order_service.rb

@@ -0,0 +1,43 @@
+class AdvanceOrderService
+  attr_reader :order
+
+  def initialize(order)
+    @order = order
+  end
+
+  def call
+    advance_order(advance_order_options)
+  end
+
+  def call!
+    advance_order!(advance_order_options)
+  end
+
+  private
+
+  def advance_order_options
+    shipping_method_id = order.shipping_method.id if order.shipping_method.present?
+    { shipping_method_id: shipping_method_id }
+  end
+
+  def advance_order(options)
+    until order.state == "complete"
+      break unless order.next
+
+      after_transition_hook(options)
+    end
+  end
+
+  def advance_order!(options)
+    until order.completed?
+      order.next!
+      after_transition_hook(options)
+    end
+  end
+
+  def after_transition_hook(options)
+    if order.state == "delivery"
+      order.select_shipping_method(options[:shipping_method_id]) if options[:shipping_method_id]
+    end
+  end
+end

app/services/order_adjustments_fetcher.rb

@@ -57,12 +57,11 @@ class OrderAdjustmentsFetcher
     if adjustments_eager_loaded?
       adjustment_scope = public_send("#{scope}_scope")
 
-      # Adjustments are already loaded here, this block is using `Array#select`
       adjustments.select do |adjustment|
-        match_by_scope(adjustment, adjustment_scope) && match_by_scope(adjustment, eligible_scope)
+        match_by_scope(adjustment, adjustment_scope)
       end
     else
-      adjustments.where(nil).eligible.public_send scope
+      adjustments.where(nil).public_send scope
     end
   end
 

app/services/order_data_masker.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class OrderDataMasker
-  def initialize(order)
-    @order = order
-  end
-
-  def call
-    mask_customer_names unless customer_names_allowed?
-    mask_contact_data
-  end
-
-  private
-
-  attr_accessor :order
-
-  def customer_names_allowed?
-    order.distributor.preferences[:show_customer_names_to_suppliers]
-  end
-
-  def mask_customer_names
-    order.bill_address&.assign_attributes(firstname: I18n.t('admin.reports.hidden'),
-                                          lastname: "")
-    order.ship_address&.assign_attributes(firstname: I18n.t('admin.reports.hidden'),
-                                          lastname: "")
-  end
-
-  def mask_contact_data
-    order.bill_address&.assign_attributes(phone: "", address1: "", address2: "",
-                                          city: "", zipcode: "", state: nil)
-    order.ship_address&.assign_attributes(phone: "", address1: "", address2: "",
-                                          city: "", zipcode: "", state: nil)
-    order.assign_attributes(email: I18n.t('admin.reports.hidden'))
-  end
-end

app/services/order_workflow.rb

@@ -1,79 +0,0 @@
-class OrderWorkflow
-  attr_reader :order
-
-  def initialize(order)
-    @order = order
-  end
-
-  def complete
-    advance_order(advance_order_options)
-  end
-
-  def complete!
-    advance_order!(advance_order_options)
-  end
-
-  def next(options = {})
-    result = advance_order_one_step
-
-    after_transition_hook(options)
-
-    result
-  end
-
-  private
-
-  def advance_order_options
-    shipping_method_id = order.shipping_method.id if order.shipping_method.present?
-    { shipping_method_id: shipping_method_id }
-  end
-
-  def advance_order(options)
-    until order.state == "complete"
-      break unless order.next
-
-      after_transition_hook(options)
-    end
-  end
-
-  def advance_order!(options)
-    until order.completed?
-      order.next!
-      after_transition_hook(options)
-    end
-  end
-
-  def advance_order_one_step
-    tries ||= 3
-    order.next
-  rescue ActiveRecord::StaleObjectError
-    retry unless (tries -= 1).zero?
-    false
-  end
-
-  def after_transition_hook(options)
-    if order.state == "delivery"
-      order.select_shipping_method(options[:shipping_method_id]) if options[:shipping_method_id]
-    end
-
-    persist_all_payments if order.state == "payment"
-  end
-
-  # When a payment fails, the order state machine stays in 'payment' and rollbacks all transactions
-  #   This rollback also reverts the payment state from 'failed', 'void' or 'invalid' to 'pending'
-  #   Despite the rollback, the in-memory payment still has the correct state, so we persist it
-  def persist_all_payments
-    order.payments.each do |payment|
-      in_memory_payment_state = payment.state
-      if different_from_db_payment_state?(in_memory_payment_state, payment.id)
-        payment.reload.update(state: in_memory_payment_state)
-      end
-    end
-  end
-
-  # Verifies if the in-memory payment state is different from the one stored in the database
-  #   This is be done without reloading the payment so that in-memory data is not changed
-  def different_from_db_payment_state?(in_memory_payment_state, payment_id)
-    in_memory_payment_state != Spree::Payment.find(payment_id).state
-  end
-end

app/services/permitted_attributes/enterprise.rb

@@ -30,7 +30,7 @@ module PermittedAttributes
         :abn, :acn, :charges_sales_tax, :display_invoice_logo, :invoice_text,
         :preferred_product_selection_from_inventory_only, :preferred_shopfront_message,
         :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order,
-        :preferred_shopfront_order_cycle_order, :preferred_show_customer_names_to_suppliers
+        :preferred_shopfront_order_cycle_order
       ]
     end
   end

app/services/permitted_attributes/order_cycle.rb

@@ -11,7 +11,6 @@ module PermittedAttributes
 
       @params.require(:order_cycle).permit(
         :name, :orders_open_at, :orders_close_at, :coordinator_id,
-        :preferred_product_selection_from_coordinator_inventory_only,
         incoming_exchanges: permitted_exchange_attributes,
         outgoing_exchanges: permitted_exchange_attributes,
         schedule_ids: [], coordinator_fee_ids: []

app/views/admin/enterprises/form/_shop_preferences.html.haml

@@ -89,16 +89,3 @@
     .five.columns.omega
       = f.radio_button :enable_subscriptions, false
       = f.label :enable_subscriptions, t('.enable_subscriptions_false'), value: :false
-
-.row
-  .alpha.eleven.columns
-    .three.columns.alpha
-      %label= t '.customer_names_in_reports'
-      %div{'ofn-with-tip' => t('.customer_names_tip')}
-        %a= t 'admin.whats_this'
-    .three.columns
-      = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, true
-      = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_true'), value: :true
-    .five.columns.omega
-      = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, false
-      = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_false'), value: :false

app/views/admin/subscriptions/_form.html.haml

@@ -4,7 +4,7 @@
       %a.button{ href: main_app.admin_subscriptions_path, ng: { show: "['details','review'].indexOf(view) >= 0" } }= t(:cancel)
       %input{ type: "button", value: t(:back), ng: { click: 'back()', show: '!!backCallbacks[view]'} }
       %input.red{ type: "button", value: t(:next), ng: { click: 'next()', show: '!!nextCallbacks[view]' } }
-      %input.red{ type: "submit", value: t('.create'), ng: { show: "view == 'review'" } }
+      %input.red{ type: "submit", value: t('admin.subscriptions.create'), ng: { show: "view == 'review'" } }
     %div{ ng: { show: 'subscription.id' } }
       %a.button{ href: main_app.admin_subscriptions_path }= t(:close)
       %input.red{ type: "button", value: t(:review), ng: { click: "setView('review')", show: "view != 'review'" } }

app/views/admin/subscriptions/edit.html.haml

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  =t('.title')
+  =t('admin.subscriptions.edit')
 
 -# - content_for :page_actions do
 -#   %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'

app/views/admin/subscriptions/index.html.haml

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  = t('.title')
+  = t('admin.subscriptions.subscriptions')
 
 - content_for :main_ng_app_name do
   = "admin.subscriptions"
@@ -7,7 +7,7 @@
 - content_for :page_actions do
   %li
     %a.button.icon-plus#new-subscription{ href: "javascript:void(0)", "new-subscription-dialog" => true }
-      = t('.new')
+      = t('admin.subscriptions.new')
 
 = render :partial => 'spree/admin/shared/order_sub_menu'
 

app/views/admin/subscriptions/new.html.haml

@@ -1,7 +1,7 @@
 -# = render :partial => 'spree/shared/error_messages', :locals => { :target => @enterprise }
 
 - content_for :page_title do
-  =t('.title')
+  =t('admin.subscriptions.new')
 
 -# - content_for :page_actions do
 -#   %li= button_link_to "Back to subscriptions list", main_app.admin_subscriptions_path, icon: 'icon-arrow-left'

app/views/admin/subscriptions/setup_explanation.html.haml

@@ -1,4 +1,4 @@
-%h1.text-center.margin-bottom-30= t('.title')
+%h1.text-center.margin-bottom-30= t('admin.subscription.subscriptions')
 
 .row
   .four.columns.alpha  

app/views/layouts/_bugsnag_js.html.haml

@@ -1,8 +1,10 @@
 - bugsnag_js_key = ENV['BUGSNAG_JS_KEY'] || ENV['BUGSNAG_API_KEY']
 - if bugsnag_js_key.present?
-  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v7/bugsnag.min.js"}
+  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v6/bugsnag.min.js"}
   :javascript
-    Bugsnag.start({
+    window.bugsnagClient = bugsnag({
       apiKey: "#{bugsnag_js_key}",
-      releaseStage: "#{Rails.env}"
-    })
+      beforeSend: function (report) {
+        report.app.releaseStage = "#{Rails.env}"
+      }
+    });

app/views/layouts/darkswarm.html.haml

@@ -9,7 +9,7 @@
       %meta{name: "robots", content: "noindex"}
     %title= content_for?(:title) ? "#{yield(:title)} - #{t(:title)}".html_safe : "#{t(:welcome_to)} #{t(:title)}"
     - if Rails.env.production?
-      = favicon_link_tag "/favicon.ico"
+      = favicon_link_tag
     - else
       = favicon_link_tag "/favicon-staging.ico"
     %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
@@ -38,12 +38,9 @@
     %loading
 
     = render "layouts/bugsnag_js"
-
-    - if Spree::Config.stripe_connect_enabled
-      %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
+    %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
     - if !ContentConfig.open_street_map_enabled
       %script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
-
     = javascript_include_tag "darkswarm/all"
     = javascript_include_tag "web/all"
     = render "layouts/i18n_script"