Update all locales with the latest Transifex translations

Fix container issues introduced by #11123

.github/ISSUE_TEMPLATE/release.md

@@ -40,7 +40,7 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 
 [Ready To Go]: #zenhub
 [Transifex pull request]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+head%3Atransifex
-[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%23%23%23+Experimental+features+for+testing+:sunglasses:%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A
 [releases]: https://github.com/openfoodfoundation/openfoodnetwork/releases
 [#instance-managers]: https://app.slack.com/client/T02G54U79/CG7NJ966B
 [#testing]: https://openfoodnetwork.slack.com/app_redirect?channel=C02TZ6X00

.github/workflows/stage.yml

@@ -1,7 +1,7 @@
 name: "Deploy to Staging"
 
 on:
-  pull_request:
+  pull_request_target:
     types: [labeled]
   workflow_dispatch:
     inputs:
@@ -14,23 +14,27 @@ on:
           - staging.openfoodnetwork.org.au
           - staging.coopcircuits.fr
 
-permissions:
-  contents: read
-
 jobs:
   deploy_pr:
     if: contains(fromJSON('["pr-staged-uk", "pr-staged-au", "pr-staged-fr"]'), github.event.label.name)
     runs-on: ubuntu-latest
     steps:
+      - name: "Check user has write access"
+        uses: "lannonbr/repo-permission-check-action@2.0.2"
+        with:
+          permission: "write"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
       - name: Configure deployment key
+        if: success()
         run: |
           install -m 600 -D /dev/null ~/.ssh/id_rsa
           echo "${{ secrets.DEPLOYMENT_KEY }}" > ~/.ssh/id_rsa
           echo "${{ secrets.DEPLOYMENT_HOSTS }}" > ~/.ssh/known_hosts
 
       - name: Deploy to Staging
-        env:
-          LABEL: ${{ github.event.label.name }}
+        if: success()
         run: |
           ssh ofn-deploy@${{ github.event.label.description }} -o LogLevel=ERROR "pull-request-${{ github.event.pull_request.number }} ."
 
@@ -38,12 +42,21 @@ jobs:
     if: ${{ inputs.server }}
     runs-on: ubuntu-latest
     steps:
+      - name: "Check user has write access"
+        uses: "lannonbr/repo-permission-check-action@2.0.2"
+        with:
+          permission: "write"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Configure deployment key
+        if: success()
         run: |
           install -m 600 -D /dev/null ~/.ssh/id_rsa
           echo "${{ secrets.DEPLOYMENT_KEY }}" > ~/.ssh/id_rsa
           echo "${{ secrets.DEPLOYMENT_HOSTS }}" > ~/.ssh/known_hosts
 
       - name: Deploy to Staging
+        if: success()
         run: |
           ssh ofn-deploy@${{ inputs.server }} -o LogLevel=ERROR "$GITHUB_REF_NAME $GITHUB_SHA"

.rubocop_styleguide.yml

@@ -44,6 +44,9 @@ Metrics/BlockLength:
     "xdescribe",
   ]
 
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
 Rails/ApplicationRecord:
   Exclude:
     # Migrations should not contain application code:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp`
-# using RuboCop version 1.52.0.
+# using RuboCop version 1.52.1.
 # 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
@@ -33,7 +33,6 @@ Layout/ArgumentAlignment:
     - 'spec/system/admin/order_cycles/list_spec.rb'
     - 'spec/system/admin/order_cycles/simple_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
     - 'spec/system/consumer/shopping/products_spec.rb'
 
 # Offense count: 4
@@ -74,13 +73,12 @@ Layout/EmptyLines:
   Exclude:
     - 'app/models/spree/payment.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'spec/requests/checkout/concurrency_spec.rb'
     - 'spec/system/admin/order_cycles/list_spec.rb'
 
 # Offense count: 2
@@ -140,16 +138,12 @@ Layout/LeadingCommentSpace:
   Exclude:
     - 'spec/system/admin/enterprises_spec.rb'
 
-# Offense count: 114
+# Offense count: 105
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/LineContinuationSpacing:
   Exclude:
-    - 'app/helpers/checkout_helper.rb'
-    - 'engines/order_management/spec/services/order_management/order/updater_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
-    - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
     - 'spec/system/admin/bulk_order_management_spec.rb'
     - 'spec/system/admin/configuration/content_spec.rb'
     - 'spec/system/admin/customers_spec.rb'
@@ -171,22 +165,18 @@ Layout/LineContinuationSpacing:
     - 'spec/system/consumer/caching/shops_caching_spec.rb'
     - 'spec/system/consumer/cookies_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
     - 'spec/system/consumer/shopping/checkout_spec.rb'
     - 'spec/system/consumer/shopping/products_spec.rb'
     - 'spec/system/consumer/shopping/shopping_spec.rb'
     - 'spec/system/consumer/shopping/unit_price_spec.rb'
     - 'spec/system/consumer/split_checkout_spec.rb'
 
-# Offense count: 18
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
 Layout/LineEndStringConcatenationIndentation:
   Exclude:
-    - 'app/mailers/spree/user_mailer.rb'
-    - 'engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
     - 'spec/system/admin/configuration/content_spec.rb'
     - 'spec/system/admin/customers_spec.rb'
     - 'spec/system/admin/overview_spec.rb'
@@ -197,128 +187,27 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/system/consumer/cookies_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
 
-# Offense count: 606
+# Offense count: 213
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
     - 'app/components/confirm_modal_component.rb'
-    - 'app/controllers/admin/bulk_line_items_controller.rb'
-    - 'app/controllers/admin/enterprise_relationships_controller.rb'
-    - 'app/controllers/admin/enterprises_controller.rb'
     - 'app/controllers/admin/product_import_controller.rb'
-    - 'app/controllers/admin/subscriptions_controller.rb'
-    - 'app/controllers/payment_gateways/paypal_controller.rb'
-    - 'app/helpers/angular_form_helper.rb'
-    - 'app/helpers/enterprises_helper.rb'
-    - 'app/jobs/subscription_confirm_job.rb'
-    - 'app/mailers/subscription_mailer.rb'
-    - 'app/models/concerns/order_shipment.rb'
-    - 'app/models/concerns/product_stock.rb'
-    - 'app/models/concerns/variant_stock.rb'
     - 'app/models/customer.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/product_import/spreadsheet_entry.rb'
-    - 'app/models/product_import/unit_converter.rb'
-    - 'app/models/proxy_order.rb'
-    - 'app/models/schedule.rb'
-    - 'app/models/spree/app_configuration.rb'
-    - 'app/models/spree/gateway/stripe_sca.rb'
     - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/preferences/store.rb'
-    - 'app/models/subscription.rb'
-    - 'app/models/variant_override.rb'
-    - 'app/services/cart_service.rb'
-    - 'app/services/embedded_page_service.rb'
-    - 'app/services/order_cycle_form.rb'
-    - 'app/services/order_syncer.rb'
-    - 'app/services/variant_units/variant_and_line_item_naming.rb'
-    - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
-    - 'engines/order_management/spec/services/order_management/order/updater_spec.rb'
-    - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
-    - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/enterprise_fee_applicator.rb'
-    - 'lib/open_food_network/enterprise_fee_calculator.rb'
-    - 'lib/open_food_network/enterprise_issue_validator.rb'
-    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/open_food_network/order_cycle_permissions.rb'
-    - 'lib/open_food_network/scope_variants_for_search.rb'
-    - 'lib/reporting/line_items.rb'
-    - 'lib/reporting/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total.rb'
-    - 'lib/spree/localized_number.rb'
-    - 'lib/tasks/data.rake'
-    - 'lib/tasks/enterprises.rake'
-    - 'lib/tasks/import_product_images.rake'
-    - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
-    - 'spec/controllers/admin/column_preferences_controller_spec.rb'
-    - 'spec/controllers/admin/enterprises_controller_spec.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
-    - 'spec/controllers/admin/schedules_controller_spec.rb'
-    - 'spec/controllers/admin/stripe_accounts_controller_spec.rb'
-    - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb'
-    - 'spec/controllers/admin/subscription_line_items_controller_spec.rb'
-    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
-    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
-    - 'spec/controllers/api/v0/base_controller_spec.rb'
-    - 'spec/controllers/api/v0/exchange_products_controller_spec.rb'
     - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
-    - 'spec/controllers/api/v0/orders_controller_spec.rb'
-    - 'spec/controllers/api/v0/products_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/checkout_controller_spec.rb'
-    - 'spec/controllers/enterprises_controller_spec.rb'
-    - 'spec/controllers/line_items_controller_spec.rb'
-    - 'spec/controllers/shops_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders/invoices_spec.rb'
     - 'spec/controllers/spree/admin/orders_controller_spec.rb'
-    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
-    - '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/stripe/webhooks_controller_spec.rb'
-    - 'spec/factories/stock_location_factory.rb'
-    - 'spec/helpers/injection_helper_spec.rb'
-    - 'spec/helpers/order_cycles_helper_spec.rb'
-    - 'spec/helpers/spree/admin/base_helper_spec.rb'
-    - 'spec/jobs/subscription_confirm_job_spec.rb'
-    - 'spec/jobs/subscription_placement_job_spec.rb'
-    - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_permissions_spec.rb'
-    - 'spec/lib/open_food_network/permissions_spec.rb'
-    - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
-    - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
     - 'spec/lib/reports/customers_report_spec.rb'
-    - 'spec/lib/reports/order_cycle_management_report_spec.rb'
-    - 'spec/lib/reports/products_and_inventory_report_spec.rb'
-    - 'spec/lib/reports/users_and_enterprises_report_spec.rb'
-    - 'spec/mailers/order_mailer_spec.rb'
-    - 'spec/mailers/producer_mailer_spec.rb'
-    - 'spec/mailers/subscription_mailer_spec.rb'
-    - 'spec/models/concerns/calculated_adjustments_spec.rb'
-    - 'spec/models/concerns/order_shipment_spec.rb'
-    - 'spec/models/concerns/product_stock_spec.rb'
-    - 'spec/models/enterprise_relationship_spec.rb'
     - 'spec/models/enterprise_spec.rb'
-    - 'spec/models/exchange_spec.rb'
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/product_importer_spec.rb'
     - 'spec/models/spree/ability_spec.rb'
-    - 'spec/models/spree/address_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
-    - 'spec/models/spree/classification_spec.rb'
-    - 'spec/models/spree/inventory_unit_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
-    - 'spec/models/spree/order/checkout_spec.rb'
-    - 'spec/models/spree/order_inventory_spec.rb'
-    - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/spree/payment_method_spec.rb'
-    - 'spec/models/spree/payment_spec.rb'
     - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/models/spree/user_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
@@ -333,7 +222,6 @@ Layout/LineLength:
     - 'spec/serializers/api/admin/order_cycle_serializer_spec.rb'
     - 'spec/services/address_geocoder_spec.rb'
     - 'spec/services/cart_service_spec.rb'
-    - 'spec/services/checkout/form_data_adapter_spec.rb'
     - 'spec/services/checkout/post_checkout_actions_spec.rb'
     - 'spec/services/content_sanitizer_spec.rb'
     - 'spec/services/embedded_page_service_spec.rb'
@@ -382,14 +270,6 @@ Layout/MultilineMethodCallIndentation:
     - 'spec/system/admin/payment_method_spec.rb'
     - 'spec/system/admin/variant_overrides_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'app/models/spree/order.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -473,7 +353,7 @@ Lint/DuplicateRequire:
   Exclude:
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
 
-# Offense count: 20
+# Offense count: 19
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
@@ -488,7 +368,6 @@ Lint/EmptyBlock:
     - 'spec/jobs/order_cycle_opened_job_spec.rb'
     - 'spec/jobs/subscription_placement_job_spec.rb'
     - 'spec/models/product_import/entry_validator_spec.rb'
-    - 'spec/requests/checkout/concurrency_spec.rb'
 
 # Offense count: 6
 # Configuration parameters: AllowComments.
@@ -534,17 +413,13 @@ Lint/RedundantDirGlobSort:
     - 'spec/base_spec_helper.rb'
     - 'spec/system_helper.rb'
 
-# Offense count: 6
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
-# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?, presence, present?
 Lint/RedundantSafeNavigation:
   Exclude:
-    - 'app/models/report_blob.rb'
     - 'app/models/spree/payment.rb'
-    - 'app/serializers/api/admin/subscription_line_item_serializer.rb'
-    - 'lib/open_food_network/address_finder.rb'
-    - 'lib/tasks/missing_payments.rake'
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
@@ -576,13 +451,12 @@ Lint/Void:
     - 'spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb'
     - 'spec/system/admin/order_cycles/simple_spec.rb'
 
-# Offense count: 27
+# Offense count: 26
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'app/controllers/admin/enterprises_controller.rb'
     - 'app/controllers/payment_gateways/paypal_controller.rb'
-    - 'app/controllers/spree/admin/orders_controller.rb'
     - 'app/controllers/spree/admin/payments_controller.rb'
     - 'app/controllers/spree/admin/taxons_controller.rb'
     - 'app/controllers/spree/admin/variants_controller.rb'
@@ -603,7 +477,7 @@ Metrics/AbcSize:
     - 'lib/tasks/enterprises.rake'
     - 'spec/services/order_checkout_restart_spec.rb'
 
-# Offense count: 41
+# Offense count: 48
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -645,7 +519,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 47
+# Offense count: 49
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -653,12 +527,12 @@ Metrics/ClassLength:
     - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprises_controller.rb'
     - 'app/controllers/admin/order_cycles_controller.rb'
+    - 'app/controllers/admin/product_import_controller.rb'
     - 'app/controllers/admin/resource_controller.rb'
     - 'app/controllers/admin/schedules_controller.rb'
     - 'app/controllers/admin/subscriptions_controller.rb'
     - 'app/controllers/api/v0/products_controller.rb'
     - 'app/controllers/application_controller.rb'
-    - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/payment_gateways/paypal_controller.rb'
     - 'app/controllers/split_checkout_controller.rb'
     - 'app/controllers/spree/admin/orders_controller.rb'
@@ -695,15 +569,15 @@ Metrics/ClassLength:
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/order_cycle_permissions.rb'
     - 'lib/open_food_network/permissions.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb'
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/reporting/reports/xero_invoices/base.rb'
 
-# Offense count: 36
+# Offense count: 34
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'app/controllers/admin/enterprises_controller.rb'
-    - 'app/controllers/spree/admin/orders_controller.rb'
     - 'app/controllers/spree/admin/taxons_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/helpers/checkout_helper.rb'
@@ -719,7 +593,6 @@ Metrics/CyclomaticComplexity:
     - 'app/models/spree/preference.rb'
     - 'app/models/spree/preferences/preferable.rb'
     - 'app/models/spree/preferences/preferable_class_methods.rb'
-    - 'app/models/spree/product.rb'
     - 'app/models/spree/return_authorization.rb'
     - 'app/models/spree/tax_rate.rb'
     - 'app/models/spree/variant.rb'
@@ -732,7 +605,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/spree/localized_number.rb'
     - 'spec/models/product_importer_spec.rb'
 
-# Offense count: 24
+# Offense count: 25
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Exclude:
@@ -751,6 +624,7 @@ Metrics/MethodLength:
     - 'lib/open_food_network/order_cycle_permissions.rb'
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/reporting/reports/xero_invoices/base.rb'
+    - 'lib/spree/localized_number.rb'
     - 'lib/tasks/sample_data/product_factory.rb'
 
 # Offense count: 49
@@ -807,11 +681,10 @@ Metrics/ModuleLength:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/stripe_stubs.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Exclude:
-    - 'app/components/confirm_modal_component.rb'
     - 'app/helpers/angular_form_builder.rb'
     - 'app/models/product_import/entry_processor.rb'
     - 'lib/reporting/reports/xero_invoices/base.rb'
@@ -838,6 +711,31 @@ Naming/AccessorMethodName:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/web_helper.rb'
 
+# Offense count: 42
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/link_helper.rb'
+    - 'app/helpers/spree/admin/base_helper.rb'
+    - 'app/reflexes/application_reflex.rb'
+    - 'app/services/cache_service.rb'
+    - 'app/services/current_order_locker.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
+    - 'lib/spree/core/controller_helpers/respond_with.rb'
+    - 'lib/spree/core/delegate_belongs_to.rb'
+    - 'lib/spree/core/environment_extension.rb'
+    - 'spec/models/enterprise_caching_spec.rb'
+    - 'spec/support/embedded_pages_helper.rb'
+    - 'spec/support/preferences_helper.rb'
+    - 'spec/support/request/shop_workflow.rb'
+    - 'spec/support/request/ui_component_helper.rb'
+    - 'spec/support/request/web_helper.rb'
+    - 'spec/swagger_helper.rb'
+    - 'spec/system/support/capybara_setup.rb'
+
 # Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
@@ -894,7 +792,7 @@ Rails/ActionOrder:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/user_confirmations_controller.rb'
 
-# Offense count: 13
+# Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -974,6 +872,7 @@ Rails/ExpandedDateRange:
     - 'app/models/spree/product.rb'
 
 # Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -1012,7 +911,6 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/order.rb'
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/payment_method.rb'
-    - 'app/models/spree/product.rb'
     - 'app/models/spree/property.rb'
     - 'app/models/spree/return_authorization.rb'
     - 'app/models/spree/shipment.rb'
@@ -1061,7 +959,13 @@ Rails/I18nLocaleTexts:
   Exclude:
     - 'app/controllers/admin/stripe_accounts_controller.rb'
 
-# Offense count: 26
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/IgnoredColumnsAssignment:
+  Exclude:
+    - 'app/models/spree/variant.rb'
+
+# Offense count: 22
 # Configuration parameters: IgnoreScopes, Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
@@ -1105,14 +1009,13 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
 
-# Offense count: 8
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/NegateInclude:
   Exclude:
     - 'app/controllers/admin/resource_controller.rb'
     - 'app/models/calculator/weight.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
-    - 'app/models/spree/order/checkout.rb'
     - 'app/services/order_cart_reset.rb'
     - 'lib/spree/localized_number.rb'
     - 'spec/support/matchers/table_matchers.rb'
@@ -1264,7 +1167,7 @@ Rails/StripHeredoc:
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/tasks/data/truncate_data.rake'
 
-# Offense count: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -1272,7 +1175,6 @@ Rails/TimeZone:
   Exclude:
     - 'app/models/spree/gateway/pay_pal_express.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
-    - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/services/customer_order_cancellation_spec.rb'
 
 # Offense count: 1
@@ -1374,6 +1276,19 @@ Security/Open:
   Exclude:
     - 'app/services/image_importer.rb'
 
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ArrayIntersect:
+  Exclude:
+    - 'app/models/spree/ability.rb'
+    - 'app/models/tag_rule/filter_order_cycles.rb'
+    - 'app/models/tag_rule/filter_payment_methods.rb'
+    - 'app/models/tag_rule/filter_products.rb'
+    - 'app/models/tag_rule/filter_shipping_methods.rb'
+    - 'app/services/order_syncer.rb'
+    - 'lib/open_food_network/tag_rule_applicator.rb'
+    - 'spec/support/matchers/select2_matchers.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/BlockComments:
@@ -1496,6 +1411,14 @@ Style/GuardClause:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/system/support/precompile_assets.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: braces, no_braces
+Style/HashAsLastArrayItem:
+  Exclude:
+    - 'app/components/products_table_component.rb'
+
 # Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowSplatArgument.
@@ -1518,13 +1441,414 @@ Style/HashLikeCase:
   Exclude:
     - 'app/models/enterprise.rb'
 
+# Offense count: 1778
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent
+Style/HashSyntax:
+  Exclude:
+    - 'app/components/confirm_modal_component.rb'
+    - 'app/components/help_modal_component.rb'
+    - 'app/components/products_table_component.rb'
+    - 'app/components/selector_with_filter_component.rb'
+    - 'app/controllers/admin/customers_controller.rb'
+    - 'app/controllers/admin/enterprise_fees_controller.rb'
+    - 'app/controllers/admin/enterprise_groups_controller.rb'
+    - 'app/controllers/admin/enterprises_controller.rb'
+    - 'app/controllers/admin/order_cycles_controller.rb'
+    - 'app/controllers/admin/reports_controller.rb'
+    - 'app/controllers/admin/resource_controller.rb'
+    - 'app/controllers/admin/stripe_connect_settings_controller.rb'
+    - 'app/controllers/api/v0/enterprise_attachment_controller.rb'
+    - 'app/controllers/api/v0/shipments_controller.rb'
+    - 'app/controllers/concerns/extra_fields.rb'
+    - 'app/controllers/concerns/manager_invitations.rb'
+    - 'app/controllers/concerns/reports_actions.rb'
+    - 'app/controllers/line_items_controller.rb'
+    - 'app/controllers/payment_gateways/paypal_controller.rb'
+    - 'app/controllers/spree/admin/mail_methods_controller.rb'
+    - 'app/controllers/spree/admin/orders/customer_details_controller.rb'
+    - 'app/helpers/admin/injection_helper.rb'
+    - 'app/helpers/checkout_helper.rb'
+    - 'app/helpers/injection_helper.rb'
+    - 'app/helpers/serializer_helper.rb'
+    - 'app/helpers/spree/admin/base_helper.rb'
+    - 'app/helpers/tax_helper.rb'
+    - 'app/jobs/report_job.rb'
+    - 'app/jobs/webhook_delivery_job.rb'
+    - 'app/json_schemas/json_api_schema/structure.rb'
+    - 'app/mailers/enterprise_mailer.rb'
+    - 'app/mailers/payment_mailer.rb'
+    - 'app/mailers/producer_mailer.rb'
+    - 'app/mailers/spree/order_mailer.rb'
+    - 'app/mailers/spree/shipment_mailer.rb'
+    - 'app/mailers/spree/test_mailer.rb'
+    - 'app/mailers/spree/user_mailer.rb'
+    - 'app/mailers/subscription_mailer.rb'
+    - 'app/models/column_preference.rb'
+    - 'app/models/concerns/calculated_adjustments.rb'
+    - 'app/models/concerns/order_shipment.rb'
+    - 'app/models/concerns/variant_stock.rb'
+    - 'app/models/customer.rb'
+    - 'app/models/enterprise.rb'
+    - 'app/models/enterprise_relationship.rb'
+    - 'app/models/exchange.rb'
+    - 'app/models/exchange_variant.rb'
+    - 'app/models/invoice/data_presenter.rb'
+    - 'app/models/invoice/data_presenter/adjustment.rb'
+    - 'app/models/invoice/data_presenter/line_item.rb'
+    - 'app/models/invoice/data_presenter/payment.rb'
+    - 'app/models/producer_property.rb'
+    - 'app/models/product_import/entry_validator.rb'
+    - 'app/models/product_import/product_importer.rb'
+    - 'app/models/report_blob.rb'
+    - 'app/models/spree/address.rb'
+    - 'app/models/spree/adjustment.rb'
+    - 'app/models/spree/credit_card.rb'
+    - 'app/models/spree/gateway/pay_pal_express.rb'
+    - 'app/models/spree/gateway/stripe_sca.rb'
+    - 'app/models/spree/inventory_unit.rb'
+    - 'app/models/spree/item_adjustments.rb'
+    - 'app/models/spree/line_item.rb'
+    - 'app/models/spree/order.rb'
+    - 'app/models/spree/order/checkout.rb'
+    - 'app/models/spree/order_contents.rb'
+    - 'app/models/spree/payment.rb'
+    - 'app/models/spree/payment/processing.rb'
+    - 'app/models/spree/preferences/store.rb'
+    - 'app/models/spree/price.rb'
+    - 'app/models/spree/product.rb'
+    - 'app/models/spree/product_property.rb'
+    - 'app/models/spree/return_authorization.rb'
+    - 'app/models/spree/shipment.rb'
+    - 'app/models/spree/shipping_rate.rb'
+    - 'app/models/spree/stock_location.rb'
+    - 'app/models/spree/tax_rate.rb'
+    - 'app/models/spree/taxonomy.rb'
+    - 'app/models/spree/user.rb'
+    - 'app/models/spree/variant.rb'
+    - 'app/models/stripe_account.rb'
+    - 'app/models/voucher.rb'
+    - 'app/reflexes/admin/orders_reflex.rb'
+    - 'app/reflexes/invite_manager_reflex.rb'
+    - 'app/reflexes/white_label_reflex.rb'
+    - 'app/serializers/api/admin/enterprise_serializer.rb'
+    - 'app/services/address_geocoder.rb'
+    - 'app/services/customer_syncer.rb'
+    - 'app/services/exchange_variant_bulk_updater.rb'
+    - 'app/services/image_importer.rb'
+    - 'app/services/order_cycle_warning.rb'
+    - 'app/services/order_invoice_comparator.rb'
+    - 'app/services/order_syncer.rb'
+    - 'app/services/products_renderer.rb'
+    - 'app/services/recurring_payments.rb'
+    - 'app/services/shop/order_cycles_list.rb'
+    - 'app/services/voucher_adjustments_service.rb'
+    - 'engines/dfc_provider/app/services/dfc_builder.rb'
+    - 'engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb'
+    - 'engines/dfc_provider/spec/support/authorization_helper.rb'
+    - 'engines/order_management/app/services/order_management/stock/estimator.rb'
+    - 'engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb'
+    - 'engines/order_management/app/services/order_management/subscriptions/validator.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/stock/packer_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb'
+    - 'engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb'
+    - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
+    - 'engines/web/lib/web/cookies_consent.rb'
+    - 'lib/open_food_network/address_finder.rb'
+    - 'lib/open_food_network/enterprise_fee_applicator.rb'
+    - 'lib/open_food_network/enterprise_fee_calculator.rb'
+    - 'lib/open_food_network/i18n_inflections.rb'
+    - 'lib/open_food_network/order_cycle_form_applicator.rb'
+    - 'lib/open_food_network/scope_variant_to_hub.rb'
+    - 'lib/reporting/report_headers_builder.rb'
+    - 'lib/reporting/report_renderer.rb'
+    - 'lib/reporting/report_rows_builder.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/fee_summary.rb'
+    - 'lib/reporting/reports/list.rb'
+    - 'lib/reporting/reports/order_cycle_management/base.rb'
+    - 'lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb'
+    - 'lib/reporting/reports/packing/customer.rb'
+    - 'lib/reporting/reports/packing/product.rb'
+    - 'lib/reporting/reports/packing/supplier.rb'
+    - 'lib/reporting/reports/sales_tax/sales_tax_totals_by_order.rb'
+    - 'lib/reporting/reports/sales_tax/sales_tax_totals_by_producer.rb'
+    - 'lib/spree/core/controller_helpers/respond_with.rb'
+    - 'lib/stripe/account_connector.rb'
+    - 'lib/stripe/credit_card_clone_destroyer.rb'
+    - 'lib/stripe/credit_card_clone_finder.rb'
+    - 'lib/stripe/payment_intent_validator.rb'
+    - 'lib/tasks/sample_data/addressing.rb'
+    - 'lib/tasks/sample_data/enterprise_factory.rb'
+    - 'lib/tasks/sample_data/order_cycle_factory.rb'
+    - 'lib/tasks/sample_data/payment_method_factory.rb'
+    - 'lib/tasks/sample_data/user_factory.rb'
+    - 'lib/tasks/subscriptions/debug.rake'
+    - 'lib/tasks/subscriptions/test.rake'
+    - 'spec/components/product_component_spec.rb'
+    - 'spec/constraints/feature_toggle_constraint_spec.rb'
+    - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
+    - 'spec/controllers/admin/customers_controller_spec.rb'
+    - 'spec/controllers/admin/enterprises_controller_spec.rb'
+    - 'spec/controllers/admin/inventory_items_controller_spec.rb'
+    - 'spec/controllers/admin/invoice_settings_controller_spec.rb'
+    - 'spec/controllers/admin/matomo_settings_controller_spec.rb'
+    - 'spec/controllers/admin/order_cycles_controller_spec.rb'
+    - 'spec/controllers/admin/proxy_orders_controller_spec.rb'
+    - 'spec/controllers/admin/reports_controller_spec.rb'
+    - 'spec/controllers/admin/schedules_controller_spec.rb'
+    - 'spec/controllers/admin/stripe_accounts_controller_spec.rb'
+    - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb'
+    - 'spec/controllers/admin/subscription_line_items_controller_spec.rb'
+    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
+    - 'spec/controllers/admin/tag_rules_controller_spec.rb'
+    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
+    - 'spec/controllers/api/v0/customers_controller_spec.rb'
+    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
+    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
+    - 'spec/controllers/api/v0/orders_controller_spec.rb'
+    - 'spec/controllers/api/v0/products_controller_spec.rb'
+    - 'spec/controllers/api/v0/reports/packing_report_spec.rb'
+    - 'spec/controllers/api/v0/shipments_controller_spec.rb'
+    - 'spec/controllers/api/v0/taxonomies_controller_spec.rb'
+    - 'spec/controllers/api/v0/taxons_controller_spec.rb'
+    - 'spec/controllers/api/v0/variants_controller_spec.rb'
+    - 'spec/controllers/base_controller_spec.rb'
+    - 'spec/controllers/cart_controller_spec.rb'
+    - 'spec/controllers/enterprises_controller_spec.rb'
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/payment_gateways/stripe_controller_spec.rb'
+    - 'spec/controllers/split_checkout_controller_spec.rb'
+    - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
+    - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb'
+    - 'spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
+    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/search_controller_spec.rb'
+    - 'spec/controllers/spree/admin/taxons_controller_spec.rb'
+    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
+    - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/controllers/stripe/webhooks_controller_spec.rb'
+    - 'spec/factories/line_item_factory.rb'
+    - 'spec/factories/order_cycle_factory.rb'
+    - 'spec/factories/order_factory.rb'
+    - 'spec/factories/shipment_factory.rb'
+    - 'spec/factories/subscription_factory.rb'
+    - 'spec/helpers/admin/orders_helper_spec.rb'
+    - 'spec/helpers/checkout_helper_spec.rb'
+    - 'spec/helpers/spree/base_helper_spec.rb'
+    - 'spec/jobs/report_job_spec.rb'
+    - 'spec/jobs/subscription_confirm_job_spec.rb'
+    - 'spec/jobs/subscription_placement_job_spec.rb'
+    - 'spec/jobs/webhook_delivery_job_spec.rb'
+    - 'spec/lib/open_food_network/address_finder_spec.rb'
+    - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb'
+    - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
+    - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
+    - 'spec/lib/open_food_network/order_cycle_permissions_spec.rb'
+    - 'spec/lib/open_food_network/property_merge_spec.rb'
+    - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
+    - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
+    - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
+    - 'spec/lib/reports/bulk_coop_report_spec.rb'
+    - 'spec/lib/reports/customers_report_spec.rb'
+    - 'spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb'
+    - 'spec/lib/reports/enterprise_fee_summary/permissions_spec.rb'
+    - 'spec/lib/reports/lettuce_share_report_spec.rb'
+    - 'spec/lib/reports/line_items_spec.rb'
+    - 'spec/lib/reports/order_cycle_management_report_spec.rb'
+    - 'spec/lib/reports/orders_and_distributors_report_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb'
+    - 'spec/lib/reports/packing/packing_report_spec.rb'
+    - 'spec/lib/reports/products_and_inventory_report_spec.rb'
+    - 'spec/lib/spree/core/product_duplicator_spec.rb'
+    - 'spec/lib/stripe/account_connector_spec.rb'
+    - 'spec/lib/tasks/data/remove_transient_data_spec.rb'
+    - 'spec/lib/tasks/data/truncate_data_spec.rb'
+    - 'spec/mailers/order_mailer_spec.rb'
+    - 'spec/mailers/producer_mailer_spec.rb'
+    - 'spec/mailers/report_mailer_spec.rb'
+    - 'spec/mailers/shipment_mailer_spec.rb'
+    - 'spec/mailers/subscription_mailer_spec.rb'
+    - 'spec/migrations/migrate_admin_tax_amounts_spec.rb'
+    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
+    - 'spec/models/calculator/flexi_rate_spec.rb'
+    - 'spec/models/calculator/price_sack_spec.rb'
+    - 'spec/models/calculator/weight_spec.rb'
+    - 'spec/models/column_preference_spec.rb'
+    - 'spec/models/concerns/calculated_adjustments_spec.rb'
+    - 'spec/models/concerns/order_shipment_spec.rb'
+    - 'spec/models/concerns/product_stock_spec.rb'
+    - 'spec/models/customer_spec.rb'
+    - 'spec/models/enterprise_caching_spec.rb'
+    - 'spec/models/enterprise_fee_spec.rb'
+    - 'spec/models/enterprise_relationship_spec.rb'
+    - 'spec/models/enterprise_spec.rb'
+    - 'spec/models/exchange_spec.rb'
+    - 'spec/models/invoice_spec.rb'
+    - 'spec/models/order_cycle_spec.rb'
+    - 'spec/models/product_import/entry_validator_spec.rb'
+    - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
+    - 'spec/models/product_importer_spec.rb'
+    - 'spec/models/proxy_order_spec.rb'
+    - 'spec/models/spree/ability_spec.rb'
+    - 'spec/models/spree/address_spec.rb'
+    - 'spec/models/spree/adjustment_spec.rb'
+    - 'spec/models/spree/calculator_spec.rb'
+    - 'spec/models/spree/classification_spec.rb'
+    - 'spec/models/spree/credit_card_spec.rb'
+    - 'spec/models/spree/gateway/stripe_sca_spec.rb'
+    - 'spec/models/spree/inventory_unit_spec.rb'
+    - 'spec/models/spree/line_item_spec.rb'
+    - 'spec/models/spree/order/checkout_spec.rb'
+    - 'spec/models/spree/order/state_machine_spec.rb'
+    - 'spec/models/spree/order/tax_spec.rb'
+    - 'spec/models/spree/order_spec.rb'
+    - 'spec/models/spree/payment_method_spec.rb'
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/models/spree/preference_spec.rb'
+    - 'spec/models/spree/product_spec.rb'
+    - 'spec/models/spree/return_authorization_spec.rb'
+    - 'spec/models/spree/shipment_spec.rb'
+    - 'spec/models/spree/shipping_method_spec.rb'
+    - 'spec/models/spree/shipping_rate_spec.rb'
+    - 'spec/models/spree/stock/availability_validator_spec.rb'
+    - 'spec/models/spree/stock_movement_spec.rb'
+    - 'spec/models/spree/tax_rate_spec.rb'
+    - 'spec/models/spree/user_spec.rb'
+    - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/spree/zone_spec.rb'
+    - 'spec/models/stripe_account_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
+    - 'spec/models/voucher_spec.rb'
+    - 'spec/queries/complete_orders_with_balance_spec.rb'
+    - 'spec/queries/customers_with_balance_spec.rb'
+    - 'spec/queries/outstanding_balance_spec.rb'
+    - 'spec/queries/payments_requiring_action_spec.rb'
+    - 'spec/requests/admin/vouchers_controller_spec.rb'
+    - 'spec/requests/api/v1/customers_spec.rb'
+    - 'spec/requests/checkout/failed_checkout_spec.rb'
+    - 'spec/requests/checkout/paypal_spec.rb'
+    - 'spec/requests/checkout/routes_spec.rb'
+    - 'spec/requests/checkout/stripe_sca_spec.rb'
+    - 'spec/requests/voucher_adjustments_spec.rb'
+    - 'spec/serializers/api/admin/customer_serializer_spec.rb'
+    - 'spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb'
+    - 'spec/serializers/api/admin/index_enterprise_serializer_spec.rb'
+    - 'spec/serializers/api/admin/order_serializer_spec.rb'
+    - 'spec/serializers/api/admin/variant_override_serializer_spec.rb'
+    - 'spec/serializers/api/enterprise_serializer_spec.rb'
+    - 'spec/serializers/api/order_serializer_spec.rb'
+    - 'spec/serializers/api/product_serializer_spec.rb'
+    - 'spec/services/cap_quantity_spec.rb'
+    - 'spec/services/cart_service_spec.rb'
+    - 'spec/services/checkout/payment_method_fetcher_spec.rb'
+    - 'spec/services/default_stock_location_spec.rb'
+    - 'spec/services/invoice_data_generator_spec.rb'
+    - 'spec/services/order_available_payment_methods_spec.rb'
+    - 'spec/services/order_available_shipping_methods_spec.rb'
+    - 'spec/services/order_cart_reset_spec.rb'
+    - 'spec/services/order_checkout_restart_spec.rb'
+    - 'spec/services/order_cycle_distributed_products_spec.rb'
+    - 'spec/services/order_cycle_form_spec.rb'
+    - 'spec/services/order_cycle_webhook_service_spec.rb'
+    - 'spec/services/order_data_masker_spec.rb'
+    - 'spec/services/order_factory_spec.rb'
+    - 'spec/services/order_fees_handler_spec.rb'
+    - 'spec/services/order_invoice_comparator_spec.rb'
+    - 'spec/services/order_payment_finder_spec.rb'
+    - 'spec/services/order_syncer_spec.rb'
+    - 'spec/services/order_tax_adjustments_fetcher_spec.rb'
+    - 'spec/services/order_workflow_spec.rb'
+    - 'spec/services/paypal_items_builder_spec.rb'
+    - 'spec/services/permissions/order_spec.rb'
+    - 'spec/services/place_proxy_order_spec.rb'
+    - 'spec/services/process_payment_intent_spec.rb'
+    - 'spec/services/product_tag_rules_filterer_spec.rb'
+    - 'spec/services/products_renderer_spec.rb'
+    - 'spec/services/search_orders_spec.rb'
+    - 'spec/services/sets/product_set_spec.rb'
+    - 'spec/services/tax_rate_finder_spec.rb'
+    - 'spec/services/user_default_address_setter_spec.rb'
+    - 'spec/services/variants_stock_levels_spec.rb'
+    - 'spec/services/voucher_adjustments_service_spec.rb'
+    - 'spec/support/controller_helper.rb'
+    - 'spec/support/controller_requests_helper.rb'
+    - 'spec/support/request/stripe_stubs.rb'
+    - 'spec/support/request/ui_component_helper.rb'
+    - 'spec/support/request/web_helper.rb'
+    - 'spec/system/admin/adjustments_spec.rb'
+    - 'spec/system/admin/bulk_product_update_spec.rb'
+    - 'spec/system/admin/configuration/states_spec.rb'
+    - 'spec/system/admin/configuration/tax_rates_spec.rb'
+    - 'spec/system/admin/customers_spec.rb'
+    - 'spec/system/admin/enterprises_spec.rb'
+    - 'spec/system/admin/invoice_print_spec.rb'
+    - 'spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb'
+    - 'spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb'
+    - 'spec/system/admin/order_cycles/simple_spec.rb'
+    - 'spec/system/admin/order_spec.rb'
+    - 'spec/system/admin/orders_spec.rb'
+    - 'spec/system/admin/payments_stripe_spec.rb'
+    - 'spec/system/admin/reports/enterprise_fee_summaries_spec.rb'
+    - 'spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb'
+    - 'spec/system/admin/reports/orders_and_fulfillment_spec.rb'
+    - 'spec/system/admin/reports/packing_report_spec.rb'
+    - 'spec/system/admin/reports/payments_report_spec.rb'
+    - 'spec/system/admin/reports/revenues_by_hub_spec.rb'
+    - 'spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb'
+    - 'spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb'
+    - 'spec/system/admin/reports_spec.rb'
+    - 'spec/system/admin/subscriptions_spec.rb'
+    - 'spec/system/admin/tag_rules_spec.rb'
+    - 'spec/system/admin/variant_overrides_spec.rb'
+    - 'spec/system/admin/variants_spec.rb'
+    - 'spec/system/admin/vouchers_spec.rb'
+    - 'spec/system/consumer/account/cards_spec.rb'
+    - 'spec/system/consumer/account/developer_settings_spec.rb'
+    - 'spec/system/consumer/account/payments_spec.rb'
+    - 'spec/system/consumer/account_spec.rb'
+    - 'spec/system/consumer/authentication_spec.rb'
+    - 'spec/system/consumer/multilingual_spec.rb'
+    - 'spec/system/consumer/shopping/cart_spec.rb'
+    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
+    - 'spec/system/consumer/shopping/checkout_paypal_spec.rb'
+    - 'spec/system/consumer/shopping/checkout_spec.rb'
+    - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
+    - 'spec/system/consumer/shopping/orders_spec.rb'
+    - 'spec/system/consumer/shopping/products_spec.rb'
+    - 'spec/system/consumer/shopping/shopping_spec.rb'
+    - 'spec/system/consumer/shopping/unit_price_spec.rb'
+    - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
+    - 'spec/system/consumer/split_checkout_spec.rb'
+    - 'spec/system/consumer/split_checkout_tax_incl_spec.rb'
+    - 'spec/system/consumer/split_checkout_tax_not_incl_spec.rb'
+    - 'spec/system/consumer/user_password_spec.rb'
+    - 'spec/system/consumer/white_label_spec.rb'
+    - 'spec/system/support/cuprite_setup.rb'
+    - 'spec/views/spree/orders/edit.html.haml_spec.rb'
+    - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
     - 'lib/reporting/report_query_template.rb'
     - 'lib/reporting/report_row_builder.rb'
-    - 'lib/reporting/reports/enterprise_fee_summary/base.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/fee_summary.rb'
     - 'lib/tasks/sample_data/user_factory.rb'
 
 # Offense count: 3
@@ -1628,11 +1952,10 @@ Style/RedundantArgument:
     - 'engines/dfc_provider/app/services/authorization_control.rb'
     - 'spec/support/query_counter.rb'
 
-# Offense count: 15
+# Offense count: 14
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantConstantBase:
   Exclude:
-    - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/split_checkout_controller.rb'
     - 'app/controllers/webhook_endpoints_controller.rb'
     - 'config.ru'
@@ -1671,12 +1994,11 @@ Style/RedundantStringEscape:
     - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
     - 'spec/system/admin/enterprise_fees_spec.rb'
 
-# Offense count: 208
+# Offense count: 205
 Style/Send:
   Exclude:
     - 'app/controllers/split_checkout_controller.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
-    - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/payment_gateways/paypal_controller_spec.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
@@ -1706,12 +2028,6 @@ Style/Send:
     - 'spec/services/variant_units/option_value_namer_spec.rb'
     - 'spec/support/localized_number_helper.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SingleArgumentDig:
-  Exclude:
-    - 'app/services/checkout/form_data_adapter.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/SlicingWithRange:

.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.4

Gemfile

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "3.0.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
+ruby File.read('.ruby-version').chomp
+
 gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
 gem 'rails'
@@ -115,8 +116,6 @@ gem 'spreadsheet_architect' # write spreadsheets
 
 gem 'whenever', require: false
 
-gem 'test-unit', '~> 3.5'
-
 gem 'coffee-rails', '~> 5.0.0'
 
 gem 'angular_rails_csrf'
@@ -140,7 +139,6 @@ gem "faraday"
 gem "private_address_check"
 
 group :production, :staging do
-  gem 'ddtrace'
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
 

Gemfile.lock

@@ -44,49 +44,49 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    actioncable (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionmailbox (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.5)
-      actionpack (= 7.0.5)
-      actionview (= 7.0.5)
-      activejob (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionmailer (7.0.6)
+      actionpack (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.5)
-      actionview (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actiontext (7.0.5)
-      actionpack (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    actiontext (7.0.6)
+      actionpack (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.5)
-      activesupport (= 7.0.5)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -98,19 +98,19 @@ GEM
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.0.5)
-      activesupport (= 7.0.5)
+    activejob (7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.3.6)
     activemerchant (1.123.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (7.0.5)
-      activesupport (= 7.0.5)
-    activerecord (7.0.5)
-      activemodel (= 7.0.5)
-      activesupport (= 7.0.5)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
@@ -121,14 +121,14 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activesupport (= 7.0.5)
+    activestorage (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activesupport (= 7.0.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.5)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -157,16 +157,16 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.779.0)
-    aws-sdk-core (3.174.0)
+    aws-partitions (1.780.0)
+    aws-sdk-core (3.175.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.66.0)
+    aws-sdk-kms (1.67.0)
       aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.124.0)
+    aws-sdk-s3 (1.126.0)
       aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -237,12 +237,6 @@ GEM
     datafoodconsortium-connector (1.0.0.pre.alpha.6)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.4)
     date (3.3.3)
-    ddtrace (1.12.1)
-      debase-ruby_core_source (= 3.2.1)
-      libdatadog (~> 2.0.0.1.0)
-      libddwaf (~> 1.9.0.0.0)
-      msgpack
-    debase-ruby_core_source (3.2.1)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -276,7 +270,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.6)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -323,7 +317,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.8.1)
+    geocoder (1.8.2)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gmaps4rails (2.1.2)
@@ -383,15 +377,13 @@ GEM
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwt (2.7.1)
-    knapsack_pro (5.1.0)
+    knapsack_pro (5.1.2)
       rake
+    language_server-protocol (3.17.0.3)
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
-    libdatadog (2.0.0.1.0)
-    libddwaf (1.9.0.0.1)
-      ffi (~> 1.0)
     link_header (0.0.8)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -416,7 +408,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
@@ -424,7 +416,7 @@ GEM
     msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -434,7 +426,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.2)
+    nokogiri (1.15.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -488,7 +480,6 @@ GEM
       ruby-rc4
       ttfunk
     pg (1.2.3)
-    power_assert (2.0.3)
     private_address_check (0.5.0)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -500,7 +491,7 @@ GEM
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.7.0)
+    racc (1.7.1)
     rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -518,26 +509,27 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.5)
-      actioncable (= 7.0.5)
-      actionmailbox (= 7.0.5)
-      actionmailer (= 7.0.5)
-      actionpack (= 7.0.5)
-      actiontext (= 7.0.5)
-      actionview (= 7.0.5)
-      activejob (= 7.0.5)
-      activemodel (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    rails (7.0.6)
+      actioncable (= 7.0.6)
+      actionmailbox (= 7.0.6)
+      actionmailer (= 7.0.6)
+      actionpack (= 7.0.6)
+      actiontext (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activemodel (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       bundler (>= 1.15.0)
-      railties (= 7.0.5)
+      railties (= 7.0.6)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-erd (1.7.2)
       activerecord (>= 4.2)
@@ -551,9 +543,9 @@ GEM
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -627,8 +619,9 @@ GEM
     rswag-ui (2.9.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
-    rubocop (1.52.1)
+    rubocop (1.54.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
@@ -639,7 +632,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.19.1)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -653,7 +646,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.1)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.4.25)
@@ -695,13 +688,13 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    state_machines (0.5.0)
-    state_machines-activemodel (0.8.0)
-      activemodel (>= 5.1)
-      state_machines (>= 0.5.0)
-    state_machines-activerecord (0.8.0)
-      activerecord (>= 5.1)
-      state_machines-activemodel (>= 0.8.0)
+    state_machines (0.6.0)
+    state_machines-activemodel (0.9.0)
+      activemodel (>= 6.0)
+      state_machines (>= 0.6.0)
+    state_machines-activerecord (0.9.0)
+      activerecord (>= 6.0)
+      state_machines-activemodel (>= 0.9.0)
     stimulus_reflex (3.5.0.rc2)
       actioncable (>= 5.2, < 8)
       actionpack (>= 5.2, < 8)
@@ -719,13 +712,11 @@ GEM
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
     temple (0.8.2)
-    test-unit (3.6.0)
-      power_assert
     thor (1.2.2)
     thread-local (1.1.0)
     tilt (2.1.0)
     timecop (0.9.6)
-    timeout (0.3.2)
+    timeout (0.4.0)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -740,8 +731,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.1.0)
-    view_component (3.2.0)
+    vcr (6.2.0)
+    view_component (3.3.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -818,7 +809,6 @@ DEPENDENCIES
   database_cleaner
   datafoodconsortium-connector
   db2fog!
-  ddtrace
   debug (>= 1.0.0)
   debugger-linecache
   devise
@@ -910,7 +900,6 @@ DEPENDENCIES
   stimulus_reflex (= 3.5.0.rc2)
   stringex (~> 2.8.5)
   stripe
-  test-unit (~> 3.5)
   timecop
   valid_email2
   vcr
@@ -925,7 +914,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 3.0.3p157
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.4.3

app/assets/javascripts/admin/all.js

@@ -68,25 +68,6 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment/min/moment.min.js
-//= require moment/locale/ar.js
-//= require moment/locale/ca.js
-//= require moment/locale/de.js
-//= require moment/locale/en-gb.js
-//= require moment/locale/es.js
-//= require moment/locale/fil.js
-//= require moment/locale/fr.js
-//= require moment/locale/it.js
-//= require moment/locale/nb.js
-//= require moment/locale/nl-be.js
-//= require moment/locale/pt-br.js
-//= require moment/locale/pt.js
-//= require moment/locale/ru.js
-//= require moment/locale/sv.js
-//= require moment/locale/tr.js
-//= require moment/locale/pl.js
-
-//= require js-big-decimal/dist/web/js-big-decimal.min.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -113,7 +113,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
 
   editProductUrl = (product, variant) ->
-    "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
+    "/admin/products/" + product.id + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
@@ -162,7 +162,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         if confirm(t("are_you_sure"))
           $http(
             method: "DELETE"
-            url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
+            url: "/api/v0/products/" + product.id + "/variants/" + variant.id
           ).then (response) ->
             $scope.removeVariant(product, variant)
     else
@@ -352,9 +352,6 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
-        if product.hasOwnProperty("available_on")
-          filteredProduct.available_on = product.available_on
-          hasUpdatableProperty = true
         if filteredMaster?
           filteredProduct.master_attributes = filteredMaster
           hasUpdatableProperty = true

app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee

@@ -1,5 +0,0 @@
- angular.module("admin.dropdown").directive "linksDropdown", ($window)->
-  restrict: "C"
-  scope:
-    links: "="
-  templateUrl: "admin/links_dropdown.html"

app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee

@@ -33,6 +33,4 @@ angular.module('admin.orderCycles').factory('Enterprise', ($resource) ->
     variantsOf: (product) ->
       if product.variants.length > 0
         variant.id for variant in product.variants
-      else
-        [product.master_id]
   })

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

@@ -1,15 +0,0 @@
-$ ->
-  ($ '#new_image_link').click (event) ->
-    event.preventDefault()
-
-    ($ '.no-objects-found').hide()
-
-    ($ this).hide()
-    $.ajax
-      type: 'GET'
-      url: @href
-      data: (
-        authenticity_token: AUTH_TOKEN
-      )
-      success: (r) ->
-        ($ '#images').html r

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

@@ -1,7 +0,0 @@
-($ '#cancel_link').click (event) ->
-  event.preventDefault()
-
-  ($ '.no-objects-found').show()
-
-  ($ '#new_image_link').show()
-  ($ '#images').html('')

app/assets/javascripts/admin_minimal.js

@@ -11,24 +11,5 @@
 
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment/min/moment.min.js
-//= require moment/locale/ar.js
-//= require moment/locale/ca.js
-//= require moment/locale/de.js
-//= require moment/locale/en-gb.js
-//= require moment/locale/es.js
-//= require moment/locale/fil.js
-//= require moment/locale/fr.js
-//= require moment/locale/it.js
-//= require moment/locale/nb.js
-//= require moment/locale/nl-be.js
-//= require moment/locale/pt-br.js
-//= require moment/locale/pt.js
-//= require moment/locale/ru.js
-//= require moment/locale/sv.js
-//= require moment/locale/tr.js
-//= require moment/locale/pl.js
 
-//= require js-big-decimal/dist/web/js-big-decimal.min.js
-
-window.angular = { module: function(noop){ return { value: function(){} } } }
+window.angular = { module: function(noop){ return { value: function(){} } } }

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

@@ -29,24 +29,6 @@
 #
 #= require angular-flash.min.js
 #
-#= require moment/min/moment.min.js
-#= require moment/locale/ar.js
-#= require moment/locale/ca.js
-#= require moment/locale/de.js
-#= require moment/locale/en-gb.js
-#= require moment/locale/es.js
-#= require moment/locale/fil.js
-#= require moment/locale/fr.js
-#= require moment/locale/it.js
-#= require moment/locale/nb.js
-#= require moment/locale/nl-be.js
-#= require moment/locale/pt-br.js
-#= require moment/locale/pt.js
-#= require moment/locale/ru.js
-#= require moment/locale/sv.js
-#= require moment/locale/tr.js
-#= require moment/locale/pl.js
-#
 #= require modernizr
 #
 #= require foundation-sites/js/foundation.js

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

@@ -33,9 +33,9 @@ angular.module('Darkswarm').factory 'Products', (OrderCycleResource, OrderCycle,
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
-        product.primaryImage = product.images[0]?.small_url if product.images
+        product.primaryImage = product.image?.small_url if product.image
         product.primaryImageOrMissing = product.primaryImage || "/noimage/small.png"
-        product.largeImage = product.images[0]?.large_url if product.images
+        product.largeImage = product.image?.large_url if product.image
 
     dereference: ->
       for product in @fetched_products

app/assets/javascripts/templates/admin/links_dropdown.html.haml

@@ -1,19 +0,0 @@
-.ofn-drop-down
-  %span
-    %i.icon-check
-    {{ 'admin.actions' | t }}
-    %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
-  %div.menu{ 'ng-show' => "expanded" }
-    %div{ 'ng-repeat' => "link in links" }
-      %a.menu_item{ 'ng-if': "link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method }}", "ujs-navigate": "false", confirm: "{{link.confirm}}" } }
-        %span
-          %i{ ng: { class: "link.icon" } }
-        %span {{ link.name }}
-      %a.menu_item{ 'ng-if': "link.confirm && !link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}", "data-confirm": "{{link.confirm}}" }
-        %span
-          %i{ ng: { class: "link.icon" } }
-        %span {{ link.name }}
-      %a.menu_item{ 'ng-if': "!link.confirm && !link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}" }
-        %span
-          %i{ ng: { class: "link.icon" } }
-        %span {{ link.name }}

app/channels/scoped_channel.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ScopedChannel < ApplicationCable::Channel
+  class << self
+    def for_id(id)
+      "ScopedChannel:#{id}"
+    end
+  end
+
+  def subscribed
+    stream_from "ScopedChannel:#{params[:id]}"
+  end
+end

app/components/product_component.rb

@@ -6,7 +6,7 @@ class ProductComponent < ViewComponentReflex::Component
   def initialize(product:, columns:)
     super
     @product = product
-    @image = @product.images[0] if product.images.any?
+    @image = @product.image if product.image.present?
     @columns = columns.map do |c|
       {
         id: c[:value],
@@ -28,7 +28,7 @@ class ProductComponent < ViewComponentReflex::Component
     when 'price'
       @product.price
     when 'unit'
-      "#{@product.unit_value} #{@product.variant_unit}"
+      "#{@product.variants.first.unit_value} #{@product.variant_unit}"
     when 'producer'
       @product.supplier.name
     when 'category'
@@ -43,8 +43,6 @@ class ProductComponent < ViewComponentReflex::Component
       @product.tax_category.name
     when 'inherits_properties'
       @product.inherits_properties
-    when 'available_on'
-      format_date(@product.available_on)
     when 'import_date'
       format_date(@product.import_date)
     end

app/components/products_table_component.rb

@@ -17,7 +17,6 @@ class ProductsTableComponent < ViewComponentReflex::Component
       label: I18n.t("admin.products_page.columns_selector.inherits_properties"),
       value: "inherits_properties"
     },
-    { label: I18n.t("admin.products_page.columns_selector.available_on"), value: "available_on" },
     { label: I18n.t("admin.products_page.columns_selector.import_date"), value: "import_date" }
   ].sort do |a, b|
     a[:label] <=> b[:label]
@@ -168,7 +167,7 @@ class ProductsTableComponent < ViewComponentReflex::Component
 
   def product_query_includes
     [
-      master: [:images],
+      :image,
       variants: [
         :default_price,
         :stock_locations,

app/controllers/admin/bulk_line_items_controller.rb

@@ -12,7 +12,7 @@ module Admin
       @line_items = order_permissions.
         editable_line_items.where(order_id: orders).
         includes(:variant).
-        ransack(params[:q]).result
+        ransack(params[:q]).result.order(:id)
 
       @pagy, @line_items = pagy(@line_items) if pagination_required?
 
@@ -34,7 +34,8 @@ module Admin
       # and https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
       order.with_lock do
         if order.contents.update_item(@line_item, line_item_params)
-          render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
+          # No Content, does not trigger ng resource auto-update
+          render body: nil, status: :no_content
         else
           render json: { errors: @line_item.errors }, status: :precondition_failed
         end

app/controllers/admin/customers_controller.rb

@@ -36,8 +36,10 @@ module Admin
     end
 
     def create
-      @customer = Customer.new(customer_params)
+      @customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
+
       if user_can_create_customer?
+        @customer.created_manually = true
         if @customer.save
           tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
           render_as_json @customer, tag_rule_mapping: tag_rule_mapping
@@ -83,7 +85,7 @@ module Admin
     def customers
       return @customers if @customers.present?
 
-      @customers = Customer.managed_by(spree_current_user)
+      @customers = Customer.visible.managed_by(spree_current_user)
       return @customers if params[:enterprise_id].blank?
 
       @customers = @customers.where(enterprise_id: params[:enterprise_id])

app/controllers/admin/enterprise_fees_controller.rb

@@ -62,9 +62,7 @@ module Admin
       when :for_order_cycle
         order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id]
         coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id]
-        if order_cycle.nil? && coordinator.present?
-          order_cycle = OrderCycle.new(coordinator: coordinator)
-        end
+        order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user,
                                                                  order_cycle).visible_enterprises
         EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')

app/controllers/admin/enterprise_relationships_controller.rb

@@ -16,7 +16,8 @@ module Admin
       @enterprise_relationship = EnterpriseRelationship.new enterprise_relationship_params
 
       if @enterprise_relationship.save
-        render plain: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
+        render plain: Api::Admin::EnterpriseRelationshipSerializer
+          .new(@enterprise_relationship).to_json
       else
         render status: :bad_request,
                json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }

app/controllers/admin/enterprises_controller.rb

@@ -121,8 +121,12 @@ module Admin
     def for_order_cycle
       respond_to do |format|
         format.json do
-          render json: @collection,
-                 each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer, order_cycle: @order_cycle, spree_current_user: spree_current_user
+          render(
+            json: @collection,
+            each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer,
+            order_cycle: @order_cycle,
+            spree_current_user: spree_current_user
+          )
         end
       end
     end
@@ -178,9 +182,7 @@ module Admin
       when :for_order_cycle
         @order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id]
         coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id]
-        if @order_cycle.nil? && coordinator.present?
-          @order_cycle = OrderCycle.new(coordinator: coordinator)
-        end
+        @order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
 
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle)
           .visible_enterprises
@@ -188,7 +190,7 @@ module Admin
         if enterprises.present?
           enterprises.includes(
             supplied_products:
-              [:supplier, :variants, { master: [:images] }]
+              [:supplier, :variants, :image]
           )
         end
       when :index

app/controllers/admin/product_import_controller.rb

@@ -37,8 +37,14 @@ module Admin
     end
 
     def reset_absent_products
-      @importer = ProductImport::ProductImporter.new(File.new(file_path),
-                                                     spree_current_user, import_into: params[:import_into], enterprises_to_reset: params[:enterprises_to_reset], updated_ids: params[:updated_ids], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(
+        File.new(file_path),
+        spree_current_user,
+        import_into: params[:import_into],
+        enterprises_to_reset: params[:enterprises_to_reset],
+        updated_ids: params[:updated_ids],
+        settings: params[:settings]
+      )
 
       if params.key?(:enterprises_to_reset) && params.key?(:updated_ids)
         @importer.reset_absent(params[:updated_ids])
@@ -56,8 +62,13 @@ module Admin
     end
 
     def process_data(method)
-      @importer = ProductImport::ProductImporter.new(File.new(file_path),
-                                                     spree_current_user, start: params[:start], end: params[:end], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(
+        File.new(file_path),
+        spree_current_user,
+        start: params[:start],
+        end: params[:end],
+        settings: params[:settings]
+      )
 
       begin
         @importer.public_send("#{method}_entries")

app/controllers/admin/products_v3_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Admin
+  class ProductsV3Controller < Spree::Admin::BaseController
+    def index; end
+  end
+end

app/controllers/admin/reports_controller.rb

@@ -22,24 +22,29 @@ module Admin
     def show
       @report = report_class.new(spree_current_user, params, render: render_data?)
 
+      @background_reports = OpenFoodNetwork::FeatureToggle
+        .enabled?(:background_reports, spree_current_user)
+
+      if @background_reports && request.post?
+        return background(report_format)
+      end
+
       if params[:report_format].present?
         export_report
       else
         show_report
       end
-    rescue Timeout::Error
-      render_timeout_error
     end
 
     private
 
     def export_report
-      send_data render_report_as(report_format), filename: report_filename
+      send_data @report.render_as(report_format), filename: report_filename
     end
 
     def show_report
       assign_view_data
-      @table = render_report_as(:html) if render_data?
+      @table = @report.render_as(:html) if render_data?
       render "show"
     end
 
@@ -56,45 +61,24 @@ module Admin
       request.post?
     end
 
-    def render_report_as(format)
-      if OpenFoodNetwork::FeatureToggle.enabled?(:background_reports, spree_current_user)
-        @blob = ReportBlob.create_for_upload_later!(report_filename)
-        ReportJob.perform_later(
-          report_class, spree_current_user, params, format, @blob
-        )
-        Timeout.timeout(max_wait_time) do
-          sleep 1 until @blob.content_stored?
-        end
+    def background(format)
+      cable_ready[ScopedChannel.for_id(params[:uuid])]
+        .inner_html(
+          selector: "#report-table",
+          html: render_to_string(partial: "admin/reports/loading")
+        ).scroll_into_view(
+          selector: "#report-table",
+          block: "start"
+        ).broadcast
 
-        # This result has been rendered by Rails in safe mode already.
-        @blob.result.html_safe # rubocop:disable Rails/OutputSafety
-      else
-        @report.render_as(format)
-      end
-    end
+      blob = ReportBlob.create_for_upload_later!(report_filename)
 
-    def render_timeout_error
-      assign_view_data
-      if @blob
-        @error = ".report_taking_longer_html"
-        @error_url = @blob.expiring_service_url
-      else
-        @error = ".report_taking_longer"
-        @error_url = ""
-      end
-      render "show"
-    end
+      ReportJob.perform_later(
+        report_class: report_class, user: spree_current_user, params: params,
+        format: format, blob: blob, channel: ScopedChannel.for_id(params[:uuid]),
+      )
 
-    def max_wait_time
-      # This value is used by rack-timeout and nginx, usually 30 seconds in
-      # staging and production:
-      server_timeout = ENV.fetch("RACK_TIMEOUT_SERVICE_TIMEOUT", "15").to_f
-
-      # Zero disables the timeout:
-      return 0 if server_timeout.zero?
-
-      # We want to time out earlier than nginx:
-      server_timeout - 2.seconds
+      head :no_content
     end
   end
 end

app/controllers/admin/subscriptions_controller.rb

@@ -18,7 +18,8 @@ module Admin
           if view_context.subscriptions_setup_complete?(@shops)
             @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user)
               .includes([:distributors, :cached_incoming_exchanges])
-            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).includes(:taggings)
+            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user)
+              .includes(:taggings)
             @payment_method_tags = payment_method_tags_by_id
             @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user)
           else
@@ -100,7 +101,8 @@ module Admin
     end
 
     def load_shops
-      @shops = Enterprise.managed_by(spree_current_user).is_distributor.where(enable_subscriptions: true)
+      @shops = Enterprise.managed_by(spree_current_user)
+        .is_distributor.where(enable_subscriptions: true)
     end
 
     def load_form_data
@@ -139,7 +141,9 @@ module Admin
       @open_orders_to_keep = @subscription.proxy_orders.placed_and_open.pluck(:id)
       return if @open_orders_to_keep.empty? || params[:open_orders] == 'keep'
 
-      render json: { errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') } },
+      render json: {
+               errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') }
+             },
              status: :conflict
     end
 
@@ -147,7 +151,9 @@ module Admin
       return if params[:canceled_orders] == 'notified'
       return if @subscription.proxy_orders.active.canceled.empty?
 
-      render json: { errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') } },
+      render json: {
+               errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') }
+             },
              status: :conflict
     end
 

app/controllers/api/v0/customers_controller.rb

@@ -6,7 +6,7 @@ module Api
       skip_authorization_check only: :index
 
       def index
-        @customers = current_api_user.customers
+        @customers = current_api_user.customers.visible
         render json: @customers, each_serializer: CustomerSerializer
       end
 

app/controllers/api/v0/product_images_controller.rb

@@ -9,9 +9,9 @@ module Api
         product = Spree::Product.find(params[:product_id])
         authorize! :update, product
 
-        image = product.images.first || Spree::Image.new(
-          viewable_id: product.master.id,
-          viewable_type: 'Spree::Variant'
+        image = product.image || Spree::Image.new(
+          viewable_id: product.id,
+          viewable_type: 'Spree::Product'
         )
 
         success_status = image.persisted? ? :ok : :created

app/controllers/api/v0/products_controller.rb

@@ -10,8 +10,6 @@ module Api
       respond_to :json
       DEFAULT_PER_PAGE = 15
 
-      before_action :set_default_available_on, only: :create
-
       skip_authorization_check only: [:show, :bulk_products, :overridable]
 
       def show
@@ -23,15 +21,10 @@ module Api
         authorize! :create, Spree::Product
         @product = Spree::Product.new(product_params)
 
-        begin
-          if @product.save
-            render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
-          else
-            invalid_resource!(@product)
-          end
-        rescue ActiveRecord::RecordNotUnique
-          @product.permalink = nil
-          retry
+        if @product.save
+          render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
+        else
+          invalid_resource!(@product)
         end
       end
 
@@ -96,8 +89,6 @@ module Api
       private
 
       def find_product(id)
-        product_scope.find_by!(permalink: id.to_s)
-      rescue ActiveRecord::RecordNotFound
         product_scope.find(id)
       end
 
@@ -116,7 +107,7 @@ module Api
 
       def product_query_includes
         [
-          master: { images: { attachment_attachment: :blob } },
+          image: { attachment_attachment: :blob },
           variants: [:default_price, :stock_locations, :stock_items, :variant_overrides]
         ]
       end
@@ -152,10 +143,6 @@ module Api
         @product_params ||=
           params.permit(product: PermittedAttributes::Product.attributes)[:product].to_h
       end
-
-      def set_default_available_on
-        product_params[:available_on] ||= Time.zone.now
-      end
     end
   end
 end

app/controllers/api/v0/variants_controller.rb

@@ -50,15 +50,15 @@ module Api
       private
 
       def product
-        @product ||= Spree::Product.find_by(permalink: params[:product_id]) if params[:product_id]
+        @product ||= Spree::Product.find(params[:product_id]) if params[:product_id]
       end
 
       def scope
         if @product
           variants = if current_api_user.has_spree_role?("admin") || params[:show_deleted]
-                       @product.variants_including_master.with_deleted
+                       @product.variants.with_deleted
                      else
-                       @product.variants_including_master
+                       @product.variants
                      end
         else
           variants = Spree::Variant.where(nil)

app/controllers/api/v1/customers_controller.rb

@@ -29,7 +29,8 @@ module Api
 
       def create
         authorize! :update, Enterprise.find(customer_params[:enterprise_id])
-        customer = Customer.new(customer_params)
+        customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
+        customer.assign_attributes(customer_params)
 
         if customer.save
           render json: Api::V1::CustomerSerializer.new(customer), status: :created
@@ -80,7 +81,7 @@ module Api
       end
 
       def visible_customers
-        Customer.managed_by(current_api_user)
+        Customer.visible.managed_by(current_api_user)
       end
 
       def customer_params
@@ -96,6 +97,7 @@ module Api
           ]
         ).to_h
 
+        attributes.merge!(created_manually: true)
         attributes.merge!(tag_list: params[:tags]) if params.key?(:tags)
 
         transform_address!(attributes, :billing_address, :bill_address)

app/controllers/concerns/order_completion.rb

@@ -41,8 +41,8 @@ module OrderCompletion
     main_app.order_path(@order, order_token: @order.token)
   end
 
-  def order_failed_route
-    main_app.checkout_path
+  def order_failed_route(step: 'details')
+    main_app.checkout_step_path(step:)
   end
 
   def order_invalid_for_checkout?
@@ -60,8 +60,8 @@ module OrderCompletion
 
   def process_payment_completion!
     unless @order.process_payments!
-      processing_failed
-      return redirect_to order_failed_route
+      payment_failed
+      return redirect_to order_failed_route(step: 'payment')
     end
 
     if OrderWorkflow.new(@order).next && @order.complete?
@@ -82,12 +82,20 @@ module OrderCompletion
     order_completion_reset(@order)
   end
 
-  def processing_failed(error = RuntimeError.new(order_processing_error))
+  def payment_failed
+    notify_failure
+  end
+
+  def processing_failed
+    notify_failure
+    Checkout::PostCheckoutActions.new(@order).failure
+  end
+
+  def notify_failure(error = RuntimeError.new(order_processing_error))
     Bugsnag.notify(error) do |payload|
       payload.add_metadata :order, @order
     end
     flash[:error] = order_processing_error if flash.blank?
-    Checkout::PostCheckoutActions.new(@order).failure
   end
 
   def order_processing_error

app/controllers/payment_gateways/paypal_controller.rb

@@ -27,8 +27,11 @@ module PaymentGateways
           redirect_to provider.express_checkout_url(pp_response, useraction: 'commit')
         else
           flash[:error] =
-            Spree.t('flash.generic_error', scope: 'paypal',
-                                           reasons: pp_response.errors.map(&:long_message).join(" "))
+            Spree.t(
+              'flash.generic_error',
+              scope: 'paypal',
+              reasons: pp_response.errors.map(&:long_message).join(" "),
+            )
           redirect_to main_app.checkout_step_path(:payment)
         end
       rescue SocketError

app/controllers/split_checkout_controller.rb

@@ -24,7 +24,6 @@ class SplitCheckoutController < ::BaseController
   def edit
     redirect_to_step_based_on_order unless params[:step]
     check_step if params[:step]
-    recalculate_tax if params[:step] == "summary"
 
     flash_error_when_no_shipping_method_available if available_shipping_methods.none?
   end
@@ -204,6 +203,7 @@ class SplitCheckoutController < ::BaseController
 
   def process_voucher
     if add_voucher
+      VoucherAdjustmentsService.calculate(@order)
       render_voucher_section_or_redirect
     elsif @order.errors.present?
       render_error
@@ -226,7 +226,7 @@ class SplitCheckoutController < ::BaseController
 
     adjustment = voucher.create_adjustment(voucher.code, @order)
 
-    if !adjustment.valid?
+    unless adjustment.valid?
       @order.errors.add(:voucher, I18n.t('split_checkout.errors.add_voucher_error'))
       adjustment.errors.each { |error| @order.errors.import(error) }
       return false
@@ -308,18 +308,4 @@ class SplitCheckoutController < ::BaseController
       redirect_to checkout_step_path(:payment) if params[:step] == "summary"
     end
   end
-
-  def recalculate_tax
-    @order.create_tax_charge!
-    @order.update_order!
-
-    apply_voucher if @order.voucher_adjustments.present?
-  end
-
-  def apply_voucher
-    VoucherAdjustmentsService.calculate(@order)
-
-    # update order to take into account the voucher we applied
-    @order.update_order!
-  end
 end

app/controllers/spree/admin/base_controller.rb

@@ -33,7 +33,7 @@ module Spree
 
       def model_class
         const_name = controller_name.classify
-        return "Spree::#{const_name}".constantize if Spree.const_defined?(const_name)
+        return "Spree::#{const_name}".constantize if Object.const_defined?("Spree::#{const_name}")
 
         nil
       end

app/controllers/spree/admin/images_controller.rb

@@ -6,7 +6,7 @@ module Spree
       # This will make resource controller redirect correctly after deleting product images.
       # This can be removed after upgrading to Spree 2.1.
       # See here https://github.com/spree/spree/commit/334a011d2b8e16355e4ae77ae07cd93f7cbc8fd1
-      belongs_to 'spree/product', find_by: :permalink
+      belongs_to 'spree/product'
 
       before_action :load_data
 
@@ -25,6 +25,7 @@ module Spree
         set_viewable
 
         @object.attributes = permitted_resource_params
+
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
           redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
@@ -62,20 +63,28 @@ module Spree
 
       private
 
+      def collection
+        parent.image
+      end
+
+      def find_resource
+        parent.image
+      end
+
+      def build_resource
+        Spree::Image.new(viewable: parent)
+      end
+
       def location_after_save
         spree.admin_product_images_url(@product)
       end
 
       def load_data
-        @product = Product.find_by(permalink: params[:product_id])
-        @variants = @product.variants.collect do |variant|
-          [variant.options_text, variant.id]
-        end
-        @variants.insert(0, [Spree.t(:all), @product.master.id])
+        @product = Product.find(params[:product_id])
       end
 
       def set_viewable
-        @image.viewable_type = 'Spree::Variant'
+        @image.viewable_type = 'Spree::Product'
         @image.viewable_id = params[:image][:viewable_id]
       end
 

app/controllers/spree/admin/invoices_controller.rb

@@ -6,6 +6,10 @@ module Spree
       respond_to :json
       authorize_resource class: false
 
+      def index
+        @order = Spree::Order.find_by(number: params[:order_id])
+      end
+
       def create
         invoice_service = BulkInvoiceService.new
         invoice_service.start_pdf_job(params[:order_ids])
@@ -13,6 +17,24 @@ module Spree
         render json: invoice_service.id, status: :ok
       end
 
+      def generate
+        @order = Order.find_by(number: params[:order_id])
+        @comparator = OrderInvoiceComparator.new(@order)
+        if @comparator.can_generate_new_invoice?
+          @order.invoices.create!(
+            date: Time.zone.today,
+            number: @order.invoices.count + 1,
+            data: invoice_data
+          )
+        elsif @comparator.can_update_latest_invoice?
+          @order.invoices.last.update!(
+            date: Time.zone.today,
+            data: invoice_data
+          )
+        end
+        redirect_back(fallback_location: spree.admin_dashboard_path)
+      end
+
       def show
         invoice_id = params[:id]
         invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
@@ -29,6 +51,12 @@ module Spree
           render json: { created: false }, status: :unprocessable_entity
         end
       end
+
+      protected
+
+      def invoice_data
+        @invoice_data ||= InvoiceDataGenerator.new(@order).generate
+      end
     end
   end
 end

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

@@ -24,7 +24,6 @@ module Spree
             end
 
             refresh_shipment_rates
-            recalculate_taxes
             OrderWorkflow.new(@order).advance_to_payment
 
             flash[:success] = Spree.t('customer_details_updated')
@@ -52,15 +51,6 @@ module Spree
           @order.shipments.map(&:refresh_rates)
         end
 
-        def recalculate_taxes
-          # If the order's address has been changed, the tax zone could be different,
-          # which means a different set of tax rates might be applicable.
-          @order.create_tax_charge!
-          Spree::TaxRate.adjust(@order, @order.adjustments.admin)
-
-          @order.update_totals_and_states
-        end
-
         def order_params
           params.require(:order).permit(
             :email,

app/controllers/spree/admin/orders_controller.rb

@@ -99,6 +99,10 @@ module Spree
       end
 
       def print
+        if OpenFoodNetwork::FeatureToggle.enabled?(:invoices)
+          @order = @order.invoices.find(params[:invoice_id]).presenter
+        end
+
         render_with_wicked_pdf InvoiceRenderer.new.args(@order)
       end
 

app/controllers/spree/admin/product_properties_controller.rb

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ::Admin::ResourceController
-      belongs_to 'spree/product', find_by: :permalink
+      belongs_to 'spree/product'
       before_action :find_properties
       before_action :setup_property, only: [:index]
 

app/controllers/spree/admin/products_controller.rb

@@ -103,7 +103,7 @@ module Spree
       protected
 
       def find_resource
-        Product.find_by!(permalink: params[:id])
+        Product.find(params[:id])
       end
 
       def location_after_save
@@ -121,8 +121,7 @@ module Spree
       end
 
       def product_includes
-        [{ variants: [:images] },
-         { master: [:images, :default_price] }]
+        [:image, { variants: [:images] }]
       end
 
       def collection_actions
@@ -182,7 +181,6 @@ module Spree
           joins(:product).
           where('spree_products.supplier_id IN (?)', editable_enterprises.collect(&:id)).
           where('spree_variants.import_date IS NOT NULL').
-          where(spree_variants: { is_master: false }).
           where(spree_variants: { deleted_at: nil }).
           order('spree_variants.import_date DESC')
       end
@@ -208,7 +206,7 @@ module Spree
       end
 
       def set_stock_levels(product, on_hand, on_demand)
-        variant = product_variant(product)
+        variant = product.variants.first
 
         begin
           variant.on_demand = on_demand if on_demand.present?
@@ -228,14 +226,6 @@ module Spree
         end
       end
 
-      def product_variant(product)
-        if product.variants.any?
-          product.variants.first
-        else
-          product.master
-        end
-      end
-
       def set_product_master_variant_price_to_zero
         @product.price = 0 if @product.price.nil?
       end

app/controllers/spree/admin/variants_controller.rb

@@ -5,9 +5,7 @@ require 'open_food_network/scope_variants_for_search'
 module Spree
   module Admin
     class VariantsController < ::Admin::ResourceController
-      belongs_to 'spree/product', find_by: :permalink
-
-      before_action :assign_default_attributes, only: :new
+      belongs_to 'spree/product'
 
       def index
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
@@ -45,6 +43,7 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_created)
           redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
         else
+          flash[:error] = @object.errors.full_messages.to_sentence if @object.errors.any?
           redirect_to spree.new_admin_product_variant_url(params[:product_id], @url_filters)
         end
 
@@ -83,13 +82,6 @@ module Spree
         @object.save
       end
 
-      def assign_default_attributes
-        @object.attributes = @object.product.master.
-          attributes.except('id', 'created_at', 'deleted_at', 'sku', 'is_master')
-        # Shallow Clone of the default price to populate the price field.
-        @object.default_price = @object.product.master.default_price.clone
-      end
-
       def collection
         @deleted = params.key?(:deleted) && params[:deleted] == "on" ? "checked" : ""
 

app/helpers/angular_form_helper.rb

@@ -7,7 +7,8 @@ module AngularFormHelper
     container.map do |element|
       html_attributes = option_html_attributes(element)
       text, value = option_text_and_value(element).map(&:to_s)
-      %(<option value="#{ERB::Util.html_escape(value)}"#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
+      %(<option value="#{ERB::Util.html_escape(value)}"\
+        #{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
     end.join("\n").html_safe
   end
 

app/helpers/checkout_helper.rb

@@ -139,7 +139,7 @@ module CheckoutHelper
   def stripe_card_options(cards)
     cards.map do |cc|
       [
-        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:"\
+        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:" \
         "#{cc.month.to_s.rjust(2, '0')}/#{cc.year}", cc.id
       ]
     end

app/helpers/enterprises_helper.rb

@@ -77,7 +77,8 @@ module EnterprisesHelper
   end
 
   def subscriptions_enabled?
-    spree_current_user.admin? || spree_current_user.enterprises.where(enable_subscriptions: true).any?
+    spree_current_user.admin? ||
+      spree_current_user.enterprises.where(enable_subscriptions: true).any?
   end
 
   def enterprise_url_selector(enterprise)

app/helpers/order_cycles_helper.rb

@@ -36,6 +36,13 @@ module OrderCyclesHelper
                                  shipping_and_payment_methods: true
   end
 
+  def distributors_with_editable_shipping_and_payment_methods(order_cycle)
+    return order_cycle.distributors if Enterprise
+      .managed_by(spree_current_user).exists?(order_cycle.coordinator.id)
+
+    order_cycle.distributors.managed_by(spree_current_user)
+  end
+
   def order_cycle_status_class(order_cycle)
     if order_cycle.undated?
       'undated'

app/helpers/order_helper.rb

@@ -8,4 +8,14 @@ module OrderHelper
   def outstanding_balance_label(order)
     order.outstanding_balance.label
   end
+
+  def show_generate_invoice_button?(order)
+    comparator = order_comparator(order)
+    comparator.can_generate_new_invoice? ||
+      comparator.can_update_latest_invoice?
+  end
+
+  def order_comparator(order)
+    OrderInvoiceComparator.new(order)
+  end
 end

app/helpers/reports_helper.rb

@@ -32,7 +32,28 @@ module ReportsHelper
     end
   end
 
+  def fee_name_options(orders)
+    EnterpriseFee.where(id: enterprise_fee_ids(orders))
+      .pluck(:name, :id)
+  end
+
+  def fee_owner_options(orders)
+    Enterprise.where(id: enterprise_fee_owner_ids(orders))
+      .pluck(:name, :id)
+  end
+
   def currency_symbol
     Spree::Money.currency_symbol
   end
+
+  def enterprise_fee_owner_ids(orders)
+    EnterpriseFee.where(id: enterprise_fee_ids(orders))
+      .pluck(:enterprise_id)
+  end
+
+  def enterprise_fee_ids(orders)
+    Spree::Adjustment.enterprise_fee
+      .where(order_id: orders.map(&:id))
+      .pluck(:originator_id)
+  end
 end

app/helpers/spree/admin/images_helper.rb

@@ -5,11 +5,7 @@ module Spree
     module ImagesHelper
       def options_text_for(image)
         if image.viewable.is_a?(Spree::Variant)
-          if image.viewable.is_master?
-            I18n.t(:all)
-          else
-            image.viewable.options_text
-          end
+          image.viewable.options_text
         else
           I18n.t(:all)
         end

app/helpers/spree/admin/orders_helper.rb

@@ -31,6 +31,7 @@ module Spree
       end
 
       def invoice_links
+        return [] if OpenFoodNetwork::FeatureToggle.enabled?(:invoices)
         return [] unless Spree::Config[:enable_invoices?]
 
         [send_invoice_link, print_invoice_link]

app/helpers/spree/orders_helper.rb

@@ -18,9 +18,8 @@ module Spree
     def changeable_orders
       # Only returns open order for the current user + shop + oc combo
       return @changeable_orders unless @changeable_orders.nil?
-      unless spree_current_user && current_distributor && current_order_cycle
-        return @changeable_orders = []
-      end
+      return @changeable_orders = [] unless spree_current_user &&
+                                            current_distributor && current_order_cycle
       return @changeable_orders = [] unless current_distributor.allow_order_changes?
 
       @changeable_orders = Spree::Order.complete.where(

app/jobs/application_job.rb

@@ -7,4 +7,11 @@ class ApplicationJob < ActiveJob::Base
 
   # Most jobs are safe to ignore if the underlying records are no longer available
   # discard_on ActiveJob::DeserializationError
+
+  private
+
+  def enable_active_storage_urls
+    ActiveStorage::Current.url_options ||=
+      Rails.application.config.action_controller.default_url_options
+  end
 end

app/jobs/report_job.rb

@@ -2,9 +2,14 @@
 
 # Renders a report and stores it in a given blob.
 class ReportJob < ApplicationJob
+  include CableReady::Broadcaster
+  delegate :render, to: ActionController::Base
+
+  before_perform :enable_active_storage_urls
+
   NOTIFICATION_TIME = 5.seconds
 
-  def perform(report_class, user, params, format, blob)
+  def perform(report_class:, user:, params:, format:, blob:, channel: nil)
     start_time = Time.zone.now
 
     report = report_class.new(user, params, render: true)
@@ -14,6 +19,8 @@ class ReportJob < ApplicationJob
     execution_time = Time.zone.now - start_time
 
     email_result(user, blob) if execution_time > NOTIFICATION_TIME
+
+    broadcast_result(channel, format, blob) if channel
   end
 
   def email_result(user, blob)
@@ -22,4 +29,17 @@ class ReportJob < ApplicationJob
       blob: blob,
     ).report_ready.deliver_later
   end
+
+  def broadcast_result(channel, format, blob)
+    cable_ready[channel].inner_html(
+      selector: "#report-table",
+      html: actioncable_content(format, blob)
+    ).broadcast
+  end
+
+  def actioncable_content(format, blob)
+    return blob.result if format.to_sym == :html
+
+    render(partial: "admin/reports/download", locals: { file_url: blob.expiring_service_url })
+  end
 end

app/jobs/subscription_confirm_job.rb

@@ -41,7 +41,9 @@ class SubscriptionConfirmJob < ApplicationJob
 
   def recently_closed_order_cycles
     OrderCycle.closed.where(
-      'order_cycles.orders_close_at BETWEEN (?) AND (?) OR order_cycles.updated_at BETWEEN (?) AND (?)', 1.hour.ago, Time.zone.now, 1.hour.ago, Time.zone.now
+      'order_cycles.orders_close_at BETWEEN (?) AND (?) ' \
+      'OR order_cycles.updated_at BETWEEN (?) AND (?)',
+      1.hour.ago, Time.zone.now, 1.hour.ago, Time.zone.now
     )
   end
 

app/mailers/spree/user_mailer.rb

@@ -13,7 +13,7 @@ module Spree
       @edit_password_reset_url = spree.
         edit_spree_user_password_url(reset_password_token: token)
       subject = "#{Spree::Config[:site_name]} " \
-        "#{I18n.t('spree.user_mailer.reset_password_instructions.subject')}"
+                "#{I18n.t('spree.user_mailer.reset_password_instructions.subject')}"
 
       I18n.with_locale valid_locale(user) do
         mail(to: user.email, subject: subject)

app/mailers/subscription_mailer.rb

@@ -38,14 +38,16 @@ class SubscriptionMailer < ApplicationMailer
     @shop = Enterprise.find(summary.shop_id)
     @summary = summary
     mail(to: @shop.contact.email,
-         subject: "#{Spree::Config[:site_name]} #{t('subscription_mailer.placement_summary_email.subject')}")
+         subject: "#{Spree::Config[:site_name]} " \
+                  "#{t('subscription_mailer.placement_summary_email.subject')}")
   end
 
   def confirmation_summary_email(summary)
     @shop = Enterprise.find(summary.shop_id)
     @summary = summary
     mail(to: @shop.contact.email,
-         subject: "#{Spree::Config[:site_name]} #{t('subscription_mailer.confirmation_summary_email.subject')}")
+         subject: "#{Spree::Config[:site_name]} " \
+                  "#{t('subscription_mailer.confirmation_summary_email.subject')}")
   end
 
   private

app/models/application_record.rb

@@ -15,6 +15,16 @@ class ApplicationRecord < ActiveRecord::Base
     ENV["S3_BUCKET"].present? ? :amazon_public : :local
   end
 
+  # We might have a development environment without S3 but with a database
+  # dump pointing to S3 images. Accessing the service fails then.
+  def image_variant_url_for(variant)
+    if ENV["S3_BUCKET"].present? && variant.service.public?
+      variant.processed.url
+    else
+      url_for(variant)
+    end
+  end
+
   def url_for(*args)
     Rails.application.routes.url_helpers.url_for(*args)
   end

app/models/concerns/order_shipment.rb

@@ -4,7 +4,7 @@ require 'active_support/concern'
 
 # This module is an adapter for OFN to work with Spree 2 code.
 #
-# Although Spree 2 supports multiple shipments per order, in OFN we have only one shipment per order.
+# Although Spree 2 supports multiple shipments per order, in OFN we have only 1 shipment per order.
 # A shipment is associated to a shipping_method through a selected shipping_rate.
 # See https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-Upgrade:-Migration-to-multiple-shipments
 # for details.
@@ -30,7 +30,8 @@ module OrderShipment
     shipments.first.shipping_method
   end
 
-  # Finds the shipment's shipping_rate for the given shipping_method_id and selects that shipping_rate.
+  # Finds the shipment's shipping_rate for the given shipping_method_id
+  # and selects that shipping_rate.
   # If the selection is successful, it persists it in the database by saving the shipment.
   # If it fails, it does not clear the current shipping_method selection.
   #

app/models/concerns/product_stock.rb

@@ -6,7 +6,8 @@ module ProductStock
   extend ActiveSupport::Concern
 
   def on_demand
-    raise 'Cannot determine product on_demand value of product with multiple variants' if variants.size > 1
+    raise 'Cannot determine product on_demand value of product with multiple variants' if
+      variants.size > 1
 
     variants.first.on_demand
   end

app/models/concerns/variant_stock.rb

@@ -42,7 +42,8 @@ module VariantStock
   # Checks whether this variant is produced on demand.
   def on_demand
     # A variant that has not been saved yet or has been soft-deleted doesn't have a stock item
-    #   This provides a default value for variant.on_demand using Spree::StockLocation.backorderable_default
+    #   This provides a default value for variant.on_demand
+    #     using Spree::StockLocation.backorderable_default
     return Spree::StockLocation.first.backorderable_default if new_record? || deleted?
 
     # This can be removed unless we have seen this error in Bugsnag recently
@@ -76,8 +77,10 @@ module VariantStock
     end
   end
 
-  # Moving Spree::Stock::Quantifier.can_supply? to the variant enables us to override this behaviour for variant overrides
-  # We can have this responsibility here in the variant because there is only one stock item per variant
+  # Moving Spree::Stock::Quantifier.can_supply? to the variant enables us
+  #   to override this behaviour for variant overrides
+  # We can have this responsibility here in the variant because there is
+  #   only one stock item per variant
   #
   # Here we depend only on variant.total_on_hand and variant.on_demand.
   #   This way, variant_overrides only need to override variant.total_on_hand and variant.on_demand.
@@ -85,8 +88,10 @@ module VariantStock
     on_demand || total_on_hand >= quantity
   end
 
-  # Moving Spree::StockLocation.fill_status to the variant enables us to override this behaviour for variant overrides
-  # We can have this responsibility here in the variant because there is only one stock item per variant
+  # Moving Spree::StockLocation.fill_status to the variant enables us
+  #   to override this behaviour for variant overrides
+  # We can have this responsibility here in the variant because there is
+  #   only one stock item per variant
   #
   # Here we depend only on variant.total_on_hand and variant.on_demand.
   #   This way, variant_overrides only need to override variant.total_on_hand and variant.on_demand.
@@ -102,7 +107,8 @@ module VariantStock
     [on_hand, backordered]
   end
 
-  # We can have this responsibility here in the variant because there is only one stock item per variant
+  # We can have this responsibility here in the variant because there is
+  #   only one stock item per variant
   #
   # This enables us to override this behaviour for variant overrides
   def move(quantity, originator = nil)
@@ -138,7 +144,8 @@ module VariantStock
 
   # Overwrites stock_item.count_on_hand
   #
-  # Calling stock_item.adjust_count_on_hand will bypass filling backorders and creating stock movements
+  # Calling stock_item.adjust_count_on_hand will bypass filling backorders
+  #   and creating stock movements
   # If that was required we could call self.move
   def overwrite_stock_levels(new_level)
     stock_item.adjust_count_on_hand(new_level.to_i - stock_item.count_on_hand)

app/models/customer.rb

@@ -34,10 +34,15 @@ class Customer < ApplicationRecord
 
   validates :code, uniqueness: { scope: :enterprise_id, allow_nil: true }
   validates :email, presence: true, 'valid_email_2/email': true,
-                    uniqueness: { scope: :enterprise_id, message: I18n.t('validation_msg_is_associated_with_an_exising_customer') }
+                    uniqueness: {
+                      scope: :enterprise_id,
+                      message: I18n.t('validation_msg_is_associated_with_an_exising_customer')
+                    }
 
   scope :of, ->(enterprise) { where(enterprise_id: enterprise) }
   scope :managed_by, ->(user) { user&.persisted? ? where(user: user).or(of(Enterprise.managed_by(user))) : none }
+  scope :created_manually, -> { where(created_manually: true) }
+  scope :visible, -> { where(id: Spree::Order.complete.select(:customer_id)).or(created_manually) }
 
   before_create :associate_user
 

app/models/enterprise.rb

@@ -160,7 +160,7 @@ class Enterprise < ApplicationRecord
   scope :is_distributor, -> { where('sells != ?', 'none') }
   scope :is_hub, -> { where(sells: 'any') }
   scope :supplying_variant_in, lambda { |variants|
-    joins(supplied_products: :variants_including_master).
+    joins(supplied_products: :variants).
       where('spree_variants.id IN (?)', variants).
       select('DISTINCT enterprises.*')
   }
@@ -389,7 +389,7 @@ class Enterprise < ApplicationRecord
   def current_distributed_taxons
     Spree::Taxon
       .select("DISTINCT spree_taxons.*")
-      .joins(products: :variants_including_master)
+      .joins(products: :variants)
       .joins("INNER JOIN (#{current_exchange_variants.to_sql}) \
         AS exchange_variants ON spree_variants.id = exchange_variants.variant_id")
   end
@@ -459,10 +459,10 @@ class Enterprise < ApplicationRecord
 
   def image_url_for(image, name)
     return unless image.variable?
-    return image.variant(name).processed.url if image.attachment.service.name == :amazon_public
 
-    url_for(image.variant(name))
+    image_variant_url_for(image.variant(name))
   rescue ActiveStorage::Error => e
+    Bugsnag.notify "Enterprise ##{id} #{image.try(:name)} error: #{e.message}"
     Rails.logger.error(e.message)
 
     nil
@@ -505,7 +505,10 @@ class Enterprise < ApplicationRecord
   end
 
   def set_unused_address_fields
-    address.firstname = address.lastname = address.phone = address.company = 'unused' if address.present?
+    if address.present?
+      address.firstname = address.lastname = address.phone =
+                            address.company = 'unused'
+    end
     business_address.first_name = business_address.last_name = 'unused' if business_address.present?
   end
 

app/models/exchange.rb

@@ -55,7 +55,7 @@ class Exchange < ApplicationRecord
   }
   scope :with_product, lambda { |product|
     joins(:exchange_variants).
-      where('exchange_variants.variant_id IN (?)', product.variants_including_master.select(&:id))
+      where('exchange_variants.variant_id IN (?)', product.variants.select(&:id))
   }
   scope :by_enterprise_name, -> {
     joins('INNER JOIN enterprises AS sender   ON (sender.id   = exchanges.sender_id)').

app/models/invoice.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Invoice < ApplicationRecord
+  belongs_to :order, class_name: 'Spree::Order'
+  serialize :data, Hash
+  before_validation :serialize_order
+
+  def presenter
+    @presenter ||= Invoice::DataPresenter.new(self)
+  end
+
+  def serialize_order
+    return data unless data.empty?
+
+    self.data = Invoice::OrderSerializer.new(order).serializable_hash
+  end
+end

app/models/invoice/data_presenter.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+class Invoice
+  class DataPresenter
+    attr_reader :invoice
+
+    delegate :data, :date, to: :invoice
+
+    FINALIZED_NON_SUCCESSFUL_STATES = %w(canceled returned).freeze
+
+    extend Invoice::DataPresenterAttributes
+
+    attributes :additional_tax_total, :currency, :included_tax_total, :payment_total,
+               :shipping_method_id, :state, :total, :number, :note, :special_instructions,
+               :completed_at
+
+    attributes_with_presenter :bill_address, :customer, :distributor, :ship_address,
+                              :shipping_method, :order_cycle
+
+    array_attribute :sorted_line_items, class_name: 'LineItem'
+    array_attribute :all_eligible_adjustments, class_name: 'Adjustment'
+    array_attribute :payments, class_name: 'Payment'
+
+    # if any of the following attributes is updated, a new invoice should be generated
+    invoice_generation_attributes :additional_tax_total, :all_eligible_adjustments, :bill_address,
+                                  :included_tax_total, :payments, :payment_total, :ship_address,
+                                  :shipping_method_id, :sorted_line_items, :total
+
+    # if any of the following attributes is updated, the latest invoice should be updated
+    invoice_update_attributes :note, :special_instructions, :state,
+                              :all_eligible_adjustments, :payments
+
+    def initialize(invoice)
+      @invoice = invoice
+    end
+
+    def has_taxes_included
+      included_tax_total > 0
+    end
+
+    def total_tax
+      additional_tax_total + included_tax_total
+    end
+
+    def order_completed_at
+      return nil if data[:completed_at].blank?
+
+      Time.zone.parse(data[:completed_at])
+    end
+
+    def checkout_adjustments(exclude: [], reject_zero_amount: true)
+      adjustments = all_eligible_adjustments
+
+      adjustments.reject! { |a| a.originator_type == 'Spree::TaxRate' }
+
+      if exclude.include? :line_item
+        adjustments.reject! { |a|
+          a.adjustable_type == 'Spree::LineItem'
+        }
+      end
+
+      if reject_zero_amount
+        adjustments.reject! { |a| a.amount == 0 }
+      end
+
+      adjustments
+    end
+
+    def display_checkout_taxes_hash
+      totals = OrderTaxAdjustmentsFetcher.new(nil).totals(all_tax_adjustments)
+
+      totals.map do |tax_rate, tax_amount|
+        {
+          amount: Spree::Money.new(tax_amount, currency: order.currency),
+          percentage: number_to_percentage(tax_rate.amount * 100, precision: 1),
+          rate_amount: tax_rate.amount,
+        }
+      end.sort_by { |tax| tax[:rate_amount] }
+    end
+
+    def all_tax_adjustments
+      all_eligible_adjustments.select { |a| a.originator_type == 'Spree::TaxRate' }
+    end
+
+    def invoice_date
+      date
+    end
+
+    def paid?
+      data[:payment_state] == 'paid' || data[:payment_state] == 'credit_owed'
+    end
+
+    def outstanding_balance?
+      !new_outstanding_balance.zero?
+    end
+
+    def new_outstanding_balance
+      if state.in?(FINALIZED_NON_SUCCESSFUL_STATES)
+        -payment_total
+      else
+        total - payment_total
+      end
+    end
+
+    def outstanding_balance_label
+      new_outstanding_balance.negative? ? I18n.t(:credit_owed) : I18n.t(:balance_due)
+    end
+
+    def last_payment
+      payments.max_by(&:created_at)
+    end
+
+    def last_payment_method
+      last_payment&.payment_method
+    end
+
+    def display_outstanding_balance
+      Spree::Money.new(new_outstanding_balance, currency: currency)
+    end
+
+    def display_checkout_tax_total
+      Spree::Money.new(total_tax, currency: currency)
+    end
+
+    def display_checkout_total_less_tax
+      Spree::Money.new(total - total_tax, currency: currency)
+    end
+
+    def display_total
+      Spree::Money.new(total, currency: currency)
+    end
+  end
+end

app/models/invoice/data_presenter/address.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Address < Invoice::DataPresenter::Base
+      attributes :firstname, :lastname, :address1, :address2, :city, :zipcode, :company, :phone
+      attributes_with_presenter :state
+      invoice_generation_attributes :firstname, :lastname, :address1, :address2, :city, :zipcode,
+                                    :company, :phone
+
+      def full_name
+        "#{firstname} #{lastname}".strip
+      end
+
+      def address_part1
+        render_address([address1, address2])
+      end
+
+      def address_part2
+        render_address([city, zipcode, state&.name])
+      end
+
+      def full_address
+        render_address([address1, address2, city, zipcode, state&.name])
+      end
+
+      private
+
+      def render_address(address_parts)
+        address_parts.compact_blank.join(', ')
+      end
+    end
+  end
+end

app/models/invoice/data_presenter/adjustment.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Adjustment < Invoice::DataPresenter::Base
+      attributes :additional_tax_total, :adjustable_type, :amount, :currency, :included_tax_total,
+                 :label, :originator_type
+      invoice_generation_attributes :additional_tax_total, :adjustable_type, :amount,
+                                    :included_tax_total
+      invoice_update_attributes :label
+
+      def display_amount
+        Spree::Money.new(amount, currency: currency)
+      end
+
+      def display_taxes(display_zero: false)
+        if included_tax_total.positive?
+          amount = Spree::Money.new(included_tax_total, currency: currency)
+          I18n.t(:tax_amount_included, amount: amount)
+        elsif additional_tax_total.positive?
+          Spree::Money.new(additional_tax_total, currency: currency)
+        elsif display_zero
+          Spree::Money.new(0.00, currency: currency)
+        end
+      end
+    end
+  end
+end

app/models/invoice/data_presenter/base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Base
+      attr_reader :data
+
+      def initialize(data)
+        @data = data
+      end
+      extend Invoice::DataPresenterAttributes
+    end
+  end
+end

app/models/invoice/data_presenter/bill_address.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class BillAddress < Invoice::DataPresenter::Address
+    end
+  end
+end

app/models/invoice/data_presenter/business_address.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class BusinessAddress < Invoice::DataPresenter::Address
+    end
+  end
+end

app/models/invoice/data_presenter/contact.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Contact < Invoice::DataPresenter::Base
+      attributes :name, :email
+    end
+  end
+end

app/models/invoice/data_presenter/customer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Customer < Invoice::DataPresenter::Base
+      attributes :code, :email
+    end
+  end
+end

app/models/invoice/data_presenter/distributor.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Distributor < Invoice::DataPresenter::Base
+      attributes :name, :abn, :acn, :logo_url, :display_invoice_logo, :invoice_text, :email_address
+      attributes_with_presenter :contact, :address, :business_address
+
+      def display_invoice_logo?
+        display_invoice_logo == true
+      end
+    end
+  end
+end

app/models/invoice/data_presenter/line_item.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class LineItem < Invoice::DataPresenter::Base
+      attributes :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity,
+                 :variant_id
+      attributes_with_presenter :variant
+      invoice_generation_attributes :added_tax, :included_tax, :price_with_adjustments,
+                                    :quantity, :variant_id
+
+      delegate :name_to_display, :options_text, to: :variant
+
+      def display_amount_with_adjustments
+        Spree::Money.new((price_with_adjustments * quantity), currency: currency)
+      end
+
+      def single_display_amount_with_adjustments
+        Spree::Money.new(price_with_adjustments, currency: currency)
+      end
+
+      def display_line_items_taxes(display_zero: true)
+        if included_tax.positive?
+          Spree::Money.new( included_tax, currency: currency)
+        elsif added_tax.positive?
+          Spree::Money.new( added_tax, currency: currency)
+        elsif display_zero
+          Spree::Money.new(0.00, currency: currency)
+        end
+      end
+    end
+  end
+end

app/models/invoice/data_presenter/order_cycle.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class OrderCycle < Invoice::DataPresenter::Base
+      attributes :name
+    end
+  end
+end

app/models/invoice/data_presenter/payment.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Payment < Invoice::DataPresenter::Base
+      attributes :amount, :currency, :state, :payment_method_id
+      attributes_with_presenter :payment_method
+      invoice_generation_attributes :amount, :payment_method_id
+      invoice_update_attributes :state
+
+      def created_at
+        datetime = data&.[](:created_at)
+        datetime.present? ? Time.zone.parse(datetime) : nil
+      end
+
+      def display_amount
+        Spree::Money.new(amount, currency: currency)
+      end
+
+      def payment_method_name
+        payment_method&.name
+      end
+    end
+  end
+end

app/models/invoice/data_presenter/payment_method.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class PaymentMethod < Invoice::DataPresenter::Base
+      attributes :id, :name, :description
+      invoice_generation_attributes :id
+    end
+  end
+end

app/models/invoice/data_presenter/product.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Product < Invoice::DataPresenter::Base
+      attributes :name
+      attributes_with_presenter :supplier
+    end
+  end
+end

app/models/invoice/data_presenter/ship_address.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class ShipAddress < Invoice::DataPresenter::Address
+    end
+  end
+end

app/models/invoice/data_presenter/shipping_method.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class ShippingMethod < Invoice::DataPresenter::Base
+      attributes :id, :name, :require_ship_address
+      invoice_generation_attributes :id
+    end
+  end
+end

app/models/invoice/data_presenter/state.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class State < Invoice::DataPresenter::Base
+      attributes :name
+    end
+  end
+end

app/models/invoice/data_presenter/supplier.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Supplier < Invoice::DataPresenter::Base
+      attributes :name
+    end
+  end
+end

app/models/invoice/data_presenter/variant.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: false
+
+class Invoice
+  class DataPresenter
+    class Variant < Invoice::DataPresenter::Base
+      attributes :id, :display_name, :options_text
+      attributes_with_presenter :product
+
+      def name_to_display
+        return product.name if display_name.blank?
+
+        display_name
+      end
+    end
+  end
+end

app/models/invoice/data_presenter_attributes.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Invoice
+  module DataPresenterAttributes
+    extend ActiveSupport::Concern
+
+    def attributes(*attributes, prefix: nil)
+      attributes.each do |attribute|
+        define_method([prefix, attribute].compact_blank.join("_")) do
+          data&.[](attribute)
+        end
+      end
+    end
+
+    def attributes_with_presenter(*attributes)
+      attributes.each do |attribute|
+        define_method(attribute) do
+          instance_variable = instance_variable_get("@#{attribute}")
+          return instance_variable if instance_variable
+
+          instance_variable_set("@#{attribute}",
+                                Invoice::DataPresenter.const_get(
+                                  attribute.to_s.classify
+                                ).new(data&.[](attribute)))
+        end
+      end
+    end
+
+    def array_attribute(attribute_name, class_name: nil)
+      define_method(attribute_name) do
+        instance_variable = instance_variable_get("@#{attribute_name}")
+        return instance_variable if instance_variable
+
+        instance_variable_set("@#{attribute_name}",
+                              data&.[](attribute_name)&.map { |item|
+                                Invoice::DataPresenter.const_get(class_name).new(item)
+                              })
+      end
+    end
+
+    # if one of the list attributes is updated, the invoice needs to be regenerated
+    def invoice_generation_attributes(*attributes)
+      define_method(:invoice_generation_values) do
+        attributes.map do |attribute|
+          public_send(attribute)
+        end
+      end
+    end
+
+    # if one of the list attributes is updated, the invoice needs to be updated
+    def invoice_update_attributes(*attributes)
+      define_method(:invoice_update_values) do
+        attributes.map do |attribute|
+          public_send(attribute)
+        end
+      end
+    end
+  end
+end

app/models/product_import/entry_processor.rb

@@ -55,7 +55,6 @@ module ProductImport
             VariantOverride.for_hubs([enterprise_id]).count
           else
             Spree::Variant.
-              not_master.
               joins(:product).
               where('spree_products.supplier_id IN (?)', enterprise_id).
               count

app/models/product_import/spreadsheet_entry.rb

@@ -11,7 +11,12 @@ module ProductImport
     include ActiveModel::Validations
 
     attr_accessor :line_number, :valid, :validates_as, :product_object, :product_validations,
-                  :on_hand_nil, :has_overrides, :units, :unscaled_units, :unit_type, :tax_category, :shipping_category, :id, :product_id, :producer, :producer_id, :distributor, :distributor_id, :name, :display_name, :sku, :unit_value, :unit_description, :variant_unit, :variant_unit_scale, :variant_unit_name, :display_as, :category, :primary_taxon_id, :price, :on_hand, :on_demand, :tax_category_id, :shipping_category_id, :description, :import_date, :enterprise, :enterprise_id
+                  :on_hand_nil, :has_overrides, :units, :unscaled_units, :unit_type, :tax_category,
+                  :shipping_category, :id, :product_id, :producer, :producer_id, :distributor,
+                  :distributor_id, :name, :display_name, :sku, :unit_value, :unit_description,
+                  :variant_unit, :variant_unit_scale, :variant_unit_name, :display_as, :category,
+                  :primary_taxon_id, :price, :on_hand, :on_demand, :tax_category_id,
+                  :shipping_category_id, :description, :import_date, :enterprise, :enterprise_id
 
     NON_DISPLAY_ATTRIBUTES = ['id', 'product_id', 'unscaled_units', 'variant_id', 'enterprise',
                               'enterprise_id', 'producer_id', 'distributor_id', 'primary_taxon',
@@ -68,7 +73,11 @@ module ProductImport
 
     def invalid_attributes
       invalid_attrs = {}
-      errors = @product_validations ? @product_validations.messages.merge(self.errors.messages) : self.errors.messages
+      errors = if @product_validations
+                 @product_validations.messages.merge(self.errors.messages)
+               else
+                 self.errors.messages
+               end
       errors.each do |attr, message|
         invalid_attrs[attr.to_s] = "#{attr.to_s.capitalize} #{message.first}"
       end

app/models/product_import/unit_converter.rb

@@ -73,11 +73,13 @@ module ProductImport
     end
 
     def units_and_unit_type_present?
-      @attrs.key?('units') && @attrs.key?('unit_type') && @attrs['units'].present? && @attrs['unit_type'].present?
+      @attrs.key?('units') && @attrs.key?('unit_type') && @attrs['units'].present? &&
+        @attrs['unit_type'].present?
     end
 
     def units_and_variant_unit_name_present?
-      @attrs.key?('units') && @attrs.key?('variant_unit_name') && @attrs['units'].present? && @attrs['variant_unit_name'].present?
+      @attrs.key?('units') && @attrs.key?('variant_unit_name') && @attrs['units'].present? &&
+        @attrs['variant_unit_name'].present?
     end
 
     def valid_unit_type?(unit_type)

app/models/proxy_order.rb

@@ -17,7 +17,8 @@ class ProxyOrder < ApplicationRecord
   scope :canceled, -> { where('proxy_orders.canceled_at IS NOT NULL') }
   scope :not_canceled, -> { where('proxy_orders.canceled_at IS NULL') }
   scope :placed_and_open, -> {
-                            joins(:order).not_closed.where(spree_orders: { state: ['complete', 'resumed'] })
+                            joins(:order).not_closed
+                              .where(spree_orders: { state: ['complete', 'resumed'] })
                           }
 
   def state

app/models/schedule.rb

@@ -8,7 +8,8 @@ class Schedule < ApplicationRecord
   has_many :coordinators, -> { distinct }, through: :order_cycles
 
   scope :with_coordinator, lambda { |enterprise|
-                             joins(:order_cycles).where('coordinator_id = ?', enterprise.id).select('DISTINCT schedules.*')
+                             joins(:order_cycles).where('coordinator_id = ?', enterprise.id)
+                               .select('DISTINCT schedules.*')
                            }
 
   def current_or_next_order_cycle

app/models/spree/adjustment.rb

@@ -67,6 +67,8 @@ module Spree
     scope :charge, -> { where('amount >= 0') }
     scope :credit, -> { where('amount < 0') }
     scope :return_authorization, -> { where(originator_type: "Spree::ReturnAuthorization") }
+    scope :voucher, -> { where(originator_type: "Voucher") }
+    scope :non_voucher, -> { where.not(originator_type: "Voucher") }
     scope :inclusive, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
     scope :legacy_tax, -> { additional.tax.where(adjustable_type: "Spree::Order") }

app/models/spree/app_configuration.rb

@@ -75,7 +75,8 @@ module Spree
     preference :attachment_url, :string,
                default: '/spree/products/:id/:style/:basename.:extension'
     preference :attachment_styles, :string,
-               default: "{\"mini\":\"48x48>\",\"small\":\"100x100>\",\"product\":\"240x240>\",\"large\":\"600x600>\"}"
+               default: "{\"mini\":\"48x48>\",\"small\":\"100x100>\"," \
+                        "\"product\":\"240x240>\",\"large\":\"600x600>\"}"
     preference :attachment_default_style, :string, default: 'product'
     preference :s3_access_key, :string
     preference :s3_bucket, :string

app/models/spree/gateway/stripe_sca.rb

@@ -91,7 +91,7 @@ module Spree
                                                                  stripe_account: stripe_account_id)
         gateway_options[:stripe_account] = stripe_account_id
 
-        # If a payment has been confirmed it cannot be voided by Stripe, and must be refunded instead
+        # If a payment has been confirmed it can't be voided by Stripe, and must be refunded instead
         if voidable?(payment_intent_response)
           provider.void(response_code, gateway_options)
         else

app/models/spree/image.rb

@@ -31,10 +31,10 @@ module Spree
 
     def url(size)
       return self.class.default_image_url(size) unless attachment.attached?
-      return variant(size).processed.url if attachment.service.name == :amazon_public
 
-      url_for(variant(size))
+      image_variant_url_for(variant(size))
     rescue ActiveStorage::Error => e
+      Bugsnag.notify "Product ##{viewable_id} Image ##{id} error: #{e.message}"
       Rails.logger.error(e.message)
 
       self.class.default_image_url(size)

app/models/spree/order.rb

@@ -68,6 +68,7 @@ module Spree
              },
              class_name: 'Spree::Adjustment',
              dependent: :destroy
+    has_many :invoices
 
     belongs_to :order_cycle
     belongs_to :distributor, class_name: 'Enterprise'
@@ -86,15 +87,6 @@ module Spree
     delegate :create_line_item_fees!, :create_order_fees!, :update_order_fees!,
              :update_line_item_fees!, :recreate_all_fees!, to: :fee_handler
 
-    # Needs to happen before save_permalink is called
-    before_validation :set_currency
-    before_validation :generate_order_number, if: :new_record?
-    before_validation :clone_billing_address, if: :use_billing?
-    before_validation :ensure_customer
-
-    before_create :link_by_email
-    after_create :create_tax_charge!
-
     validates :customer, presence: true, if: :require_customer?
     validate :products_available_from_new_distribution, if: lambda {
       distributor_id_changed? || order_cycle_id_changed?
@@ -107,16 +99,25 @@ module Spree
     validates :order_cycle, presence: true, on: :require_distribution
     validates :distributor, presence: true, on: :require_distribution
 
-    make_permalink field: :number
+    before_validation :set_currency
+    before_validation :generate_order_number, if: :new_record?
+    before_validation :clone_billing_address, if: :use_billing?
+    before_validation :ensure_customer
 
+    before_create :link_by_email
     before_save :update_shipping_fees!, if: :complete?
     before_save :update_payment_fees!, if: :complete?
 
+    after_create :create_tax_charge!
+    after_save :reapply_tax_on_changed_address
+
     after_save_commit DefaultAddressUpdater
 
+    make_permalink field: :number
+
     attribute :send_cancellation_email, type: :boolean, default: true
     attribute :restock_items, type: :boolean, default: true
-    # -- Scopes
+
     scope :not_empty, -> {
       left_outer_joins(:line_items).where.not(spree_line_items: { id: nil })
     }
@@ -145,9 +146,7 @@ module Spree
     }
 
     scope :with_line_items_variants_and_products_outer, lambda {
-      joins('LEFT OUTER JOIN spree_line_items ON (spree_line_items.order_id = spree_orders.id)').
-        joins('LEFT OUTER JOIN spree_variants ON (spree_variants.id = spree_line_items.variant_id)').
-        joins('LEFT OUTER JOIN spree_products ON (spree_products.id = spree_variants.product_id)')
+      left_outer_joins(line_items: { variant: :product })
     }
 
     # All the states an order can be in after completing the checkout
@@ -171,6 +170,11 @@ module Spree
       line_items.inject(0.0) { |sum, li| sum + li.amount }
     end
 
+    # Order total without any applied discounts from vouchers
+    def pre_discount_total
+      item_total + all_adjustments.additional.eligible.non_voucher.sum(:amount)
+    end
+
     def currency
       self[:currency] || Spree::Config[:currency]
     end
@@ -317,12 +321,13 @@ module Spree
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
-      return if state.in?(["cart", "address", "delivery"])
+      return if before_payment_state?
 
       clear_legacy_taxes!
 
       Spree::TaxRate.adjust(self, line_items)
       Spree::TaxRate.adjust(self, shipments) if shipments.any?
+      Spree::TaxRate.adjust(self, adjustments.admin) if adjustments.admin.any?
       fee_handler.tax_enterprise_fees!
     end
 
@@ -574,8 +579,20 @@ module Spree
       end
     end
 
+    def before_payment_state?
+      state.in?(["cart", "address", "delivery"])
+    end
+
     private
 
+    def reapply_tax_on_changed_address
+      return if before_payment_state?
+      return unless tax_address&.saved_changes?
+
+      create_tax_charge!
+      update_totals_and_states
+    end
+
     def deliver_order_confirmation_email
       return if subscription.present?
 

app/models/spree/order/checkout.rb

@@ -77,7 +77,10 @@ module Spree
               before_transition to: :delivery, do: :ensure_available_shipping_rates
               before_transition to: :confirmation, do: :validate_payment_method!
 
-              after_transition to: :payment, do: :create_tax_charge!
+              after_transition to: :payment do |order|
+                order.create_tax_charge!
+                order.update_totals_and_states
+              end
               after_transition to: :complete, do: :finalize!
               after_transition to: :resumed,  do: :after_resume
               after_transition to: :canceled, do: :after_cancel
@@ -144,7 +147,7 @@ module Spree
           private
 
           def after_cancel
-            shipments.each(&:cancel!)
+            shipments.reject(&:canceled?).each(&:cancel!)
             payments.checkout.each(&:void!)
 
             OrderMailer.cancel_email(id).deliver_later if send_cancellation_email

app/models/spree/preferences/store.rb

@@ -36,15 +36,17 @@ module Spree
           return val
         end
 
-        # If it's not in the cache, maybe it's in the database, but
-        # has been cleared from the cache
+        # If it's not in the cache, maybe it's in the database, but has been cleared from the cache
         # does it exist in the database?
-        if should_persist? && (Spree::Preference.table_exists? && preference = Spree::Preference.find_by(key: key))
-          # it does exist, so let's put it back into the cache
-          @cache.write(preference.key, preference.value)
+        if should_persist? && Spree::Preference.table_exists?
+          preference = Spree::Preference.find_by(key: key)
+          if preference
+            # it does exist, so let's put it back into the cache
+            @cache.write(preference.key, preference.value)
 
-          # and return the value
-          return preference.value
+            # and return the value
+            return preference.value
+          end
         end
 
         unless fallback.nil?

app/models/spree/product.rb

@@ -23,47 +23,69 @@ require 'concerns/product_stock'
 #
 module Spree
   class Product < ApplicationRecord
-    include PermalinkGenerator
     include ProductStock
 
     acts_as_paranoid
 
-    searchable_attributes :supplier_id, :primary_taxon_id, :meta_keywords
-    searchable_associations :supplier, :properties, :primary_taxon, :variants, :master
+    searchable_attributes :supplier_id, :primary_taxon_id, :meta_keywords, :sku
+    searchable_associations :supplier, :properties, :primary_taxon, :variants
     searchable_scopes :active, :with_properties
 
-    has_many :product_properties, dependent: :destroy
-    has_many :properties, through: :product_properties
-
-    has_many :classifications, dependent: :delete_all
-    has_many :taxons, through: :classifications
-
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
     belongs_to :supplier, class_name: 'Enterprise', touch: true
     belongs_to :primary_taxon, class_name: 'Spree::Taxon', touch: true
 
-    has_one :master,
-            -> { where is_master: true },
-            class_name: 'Spree::Variant',
-            dependent: :destroy
+    has_one :image, class_name: "Spree::Image", as: :viewable, dependent: :destroy
 
-    has_many :variants, -> {
-      where(is_master: false).order("spree_variants.position ASC")
-    }, class_name: 'Spree::Variant'
-
-    has_many :variants_including_master,
-             -> { order("spree_variants.position ASC") },
-             class_name: 'Spree::Variant',
-             dependent: :destroy
+    has_many :product_properties, dependent: :destroy
+    has_many :properties, through: :product_properties
+    has_many :classifications, dependent: :delete_all
+    has_many :taxons, through: :classifications
+    has_many :variants, -> { order("spree_variants.position ASC") }, class_name: 'Spree::Variant',
+                                                                     dependent: :destroy
 
     has_many :prices, -> {
       order('spree_variants.position, spree_variants.id, currency')
     }, through: :variants
 
     has_many :stock_items, through: :variants
-
     has_many :supplier_properties, through: :supplier, source: :properties
+    has_many :variant_images, -> { order(:position) }, source: :images,
+                                                       through: :variants
+
+    validates :name, presence: true
+    validates :shipping_category, presence: true
+
+    validates :supplier, presence: true
+    validates :primary_taxon, presence: true
+    validates :tax_category, presence: true,
+                             if: proc { Spree::Config[:products_require_tax_category] }
+
+    validates :variant_unit, presence: true
+    validates :unit_value, presence:
+      { if: ->(p) { %w(weight volume).include?(p.variant_unit) && new_record? } }
+    validates :variant_unit_scale,
+              presence: { if: ->(p) { %w(weight volume).include? p.variant_unit } }
+    validates :variant_unit_name,
+              presence: { if: ->(p) { p.variant_unit == 'items' } }
+    validate :validate_image
+
+    accepts_nested_attributes_for :variants, allow_destroy: true
+    accepts_nested_attributes_for :image
+    accepts_nested_attributes_for :product_properties,
+                                  allow_destroy: true,
+                                  reject_if: lambda { |pp| pp[:property_name].blank? }
+
+    # Transient attributes used temporarily when creating a new product,
+    # these values are persisted on the product's variant
+    attr_accessor :price, :display_as, :unit_value, :unit_description
+
+    before_save :add_primary_taxon_to_taxons
+
+    after_save :remove_previous_primary_taxon_from_taxons
+    after_create :ensure_standard_variant
+    after_save :update_units
 
     scope :with_properties, ->(*property_ids) {
       left_outer_joins(:product_properties).
@@ -75,58 +97,6 @@ module Spree
         )
     }
 
-    delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight,
-                        :height, :width, :depth, :is_master, :cost_currency,
-                        :price_in, :amount_in, :unit_value, :unit_description
-    delegate :images_attributes=, :display_as=, to: :master
-
-    after_create :set_master_variant_defaults
-    after_save :save_master
-
-    delegate :images, to: :master, prefix: true
-    alias_method :images, :master_images
-
-    has_many :variant_images, -> { order(:position) }, source: :images,
-                                                       through: :variants_including_master
-
-    accepts_nested_attributes_for :variants, allow_destroy: true
-
-    validates :name, presence: true
-    validates :permalink, presence: true
-    validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
-    validates :shipping_category, presence: true
-
-    validates :supplier, presence: true
-    validates :primary_taxon, presence: true
-    validates :tax_category, presence: true,
-                             if: proc { Spree::Config[:products_require_tax_category] }
-
-    validates :variant_unit, presence: true
-    validates :unit_value, presence: { if: ->(p) { %w(weight volume).include? p.variant_unit } }
-    validates :variant_unit_scale,
-              presence: { if: ->(p) { %w(weight volume).include? p.variant_unit } }
-    validates :variant_unit_name,
-              presence: { if: ->(p) { p.variant_unit == 'items' } }
-    validate :validate_image_for_master
-
-    accepts_nested_attributes_for :product_properties,
-                                  allow_destroy: true,
-                                  reject_if: lambda { |pp| pp[:property_name].blank? }
-
-    make_permalink order: :name
-
-    after_initialize :ensure_master
-    after_initialize :set_available_on_to_now, if: :new_record?
-
-    before_validation :sanitize_permalink
-    before_save :add_primary_taxon_to_taxons
-    after_save :remove_previous_primary_taxon_from_taxons
-    after_save :ensure_standard_variant
-    after_save :update_units
-
-    before_destroy :punch_permalink
-
-    # -- Joins
     scope :with_order_cycles_outer, -> {
       joins("
         LEFT OUTER JOIN spree_variants AS o_spree_variants
@@ -150,7 +120,7 @@ module Spree
     }
 
     scope :with_order_cycles_inner, -> {
-      joins(variants_including_master: { exchanges: :order_cycle })
+      joins(variants: { exchanges: :order_cycle })
     }
 
     scope :visible_for, lambda { |enterprise|
@@ -229,18 +199,12 @@ module Spree
       return where('spree_products.supplier_id IN (?)', [enterprise.id] | permitted_producer_ids)
     }
 
-    scope :active, lambda {
-      where("spree_products.deleted_at IS NULL AND spree_products.available_on <= ?", Time.zone.now)
-    }
+    scope :active, lambda { where("spree_products.deleted_at IS NULL") }
 
     def self.group_by_products_id
       group(column_names.map { |col_name| "#{table_name}.#{col_name}" })
     end
 
-    def to_param
-      permalink.present? ? permalink : (permalink_was || UrlGenerator.to_url(name))
-    end
-
     def tax_category
       if self[:tax_category_id].nil?
         TaxCategory.find_by(is_default: true)
@@ -283,13 +247,6 @@ module Spree
       stock_items.sum(&:count_on_hand)
     end
 
-    # Master variant may be deleted (i.e. when the product is deleted)
-    # which would make AR's default finder return nil.
-    # This is a stopgap for that little problem.
-    def master
-      super || variants_including_master.with_deleted.find_by(is_master: true)
-    end
-
     def properties_including_inherited
       # Product properties override producer properties
       ps = product_properties.all
@@ -325,7 +282,7 @@ module Spree
         touch_distributors
 
         ExchangeVariant.
-          where('exchange_variants.variant_id IN (?)', variants_including_master.with_deleted.
+          where('exchange_variants.variant_id IN (?)', variants.with_deleted.
           select(:id)).destroy_all
 
         super
@@ -334,52 +291,10 @@ module Spree
 
     private
 
-    # ensures the master variant is flagged as such
-    def set_master_variant_defaults
-      master.is_master = true
-    end
-
-    # Here we rescue errors when saving master variants (without the need for a
-    #   validates_associated on master) and we get more specific data about the errors
-    def save_master
-      if master && (
-          master.changed? || master.new_record? || (
-            master.default_price && (
-              master.default_price.changed? || master.default_price.new_record?
-            )
-          )
-        )
-        master.save!
-      end
-
-      # If the master cannot be saved, the Product object will get its errors
-      # and will be destroyed
-    rescue ActiveRecord::RecordInvalid
-      master.errors.each do |error|
-        errors.add error.attribute, error.message
-      end
-      raise
-    end
-
-    def ensure_master
-      return unless new_record?
-
-      self.master ||= Variant.new
-    end
-
-    def punch_permalink
-      # Punch permalink with date prefix
-      update_attribute :permalink, "#{Time.now.to_i}_#{permalink}"
-    end
-
-    def set_available_on_to_now
-      self.available_on ||= Time.zone.now
-    end
-
     def update_units
       return unless saved_change_to_variant_unit? || saved_change_to_variant_unit_name?
 
-      variants_including_master.each(&:update_units)
+      variants.each(&:update_units)
     end
 
     def touch_distributors
@@ -397,24 +312,19 @@ module Spree
     end
 
     def ensure_standard_variant
-      return unless master.valid? && variants.empty?
+      return unless variants.empty?
 
-      variant = master.dup
+      variant = Spree::Variant.new
       variant.product = self
-      variant.is_master = false
+      variant.price = price
+      variant.display_as = display_as
+      variant.unit_value = unit_value
+      variant.unit_description = unit_description
       variants << variant
     end
 
-    # Spree creates a permalink already but our implementation fixes an edge case.
-    def sanitize_permalink
-      return unless permalink.blank? || saved_change_to_permalink? || permalink_changed?
-
-      requested = permalink.presence || permalink_was.presence || name.presence || 'product'
-      self.permalink = create_unique_permalink(requested.parameterize)
-    end
-
-    def validate_image_for_master
-      return if master.images.all?(&:valid?)
+    def validate_image
+      return if image.blank? || image.valid?
 
       errors.add(:base, I18n.t('spree.admin.products.image_not_processable'))
     end