Enable master variants with associated order cycles

There's only 5 in UK prod. keeping them is easier than figuring out if it's safe to delete.

(cherry picked from commit 4bf65e330b)

.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%23%23%23+Experimental+features+for+testing+:sunglasses:%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%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_target:
+  pull_request:
     types: [labeled]
   workflow_dispatch:
     inputs:
@@ -14,27 +14,23 @@ 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
-        if: success()
+        env:
+          LABEL: ${{ github.event.label.name }}
         run: |
           ssh ofn-deploy@${{ github.event.label.description }} -o LogLevel=ERROR "pull-request-${{ github.event.pull_request.number }} ."
 
@@ -42,21 +38,12 @@ 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

@@ -25,7 +25,6 @@ Metrics/BlockLength:
   AllowedMethods: [
     "class_eval",
     "collection",
-    "configure",
     "context",
     "delete",
     "describe",
@@ -45,9 +44,6 @@ Metrics/BlockLength:
     "xdescribe",
   ]
 
-Metrics/ParameterLists:
-  CountKeywordArgs: false
-
 Rails/ApplicationRecord:
   Exclude:
     # Migrations should not contain application code:
@@ -93,8 +89,6 @@ Naming/VariableNumber:
   AllowedIdentifiers:
     - street_address_1
     - street_address_2
-  AllowedPatterns:
-    - _v[\d]+
 
 Bundler/DuplicatedGem:
   Enabled: false

.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.1.
+# using RuboCop version 1.52.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -33,6 +33,7 @@ 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
@@ -73,12 +74,13 @@ Layout/EmptyLines:
   Exclude:
     - 'app/models/spree/payment.rb'
 
-# Offense count: 1
+# Offense count: 2
 # 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
@@ -138,12 +140,16 @@ Layout/LeadingCommentSpace:
   Exclude:
     - 'spec/system/admin/enterprises_spec.rb'
 
-# Offense count: 105
+# Offense count: 114
 # 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'
@@ -165,18 +171,22 @@ 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: 13
+# Offense count: 18
 # 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'
@@ -187,27 +197,128 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/system/consumer/cookies_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
 
-# Offense count: 213
+# Offense count: 606
 # 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'
@@ -222,6 +333,7 @@ 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'
@@ -270,6 +382,14 @@ 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.
@@ -353,7 +473,7 @@ Lint/DuplicateRequire:
   Exclude:
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
@@ -368,6 +488,7 @@ 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.
@@ -413,13 +534,17 @@ Lint/RedundantDirGlobSort:
     - 'spec/base_spec_helper.rb'
     - 'spec/system_helper.rb'
 
-# Offense count: 1
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
-# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?, presence, present?
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
 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).
@@ -451,12 +576,13 @@ Lint/Void:
     - 'spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb'
     - 'spec/system/admin/order_cycles/simple_spec.rb'
 
-# Offense count: 26
+# Offense count: 27
 # 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'
@@ -477,7 +603,7 @@ Metrics/AbcSize:
     - 'lib/tasks/enterprises.rake'
     - 'spec/services/order_checkout_restart_spec.rb'
 
-# Offense count: 48
+# Offense count: 41
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -488,6 +614,7 @@ Metrics/BlockLength:
     - 'app/models/spree/shipment.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
     - 'lib/tasks/data.rake'
+    - 'spec/base_spec_helper.rb'
     - 'spec/factories.rb'
     - 'spec/factories/address_factory.rb'
     - 'spec/factories/enterprise_factory.rb'
@@ -506,6 +633,7 @@ Metrics/BlockLength:
     - 'spec/support/cancan_helper.rb'
     - 'spec/support/matchers/select2_matchers.rb'
     - 'spec/support/matchers/table_matchers.rb'
+    - 'spec/swagger_helper.rb'
     - 'spec/system/consumer/shopping/checkout_spec.rb'
     - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
     - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
@@ -517,7 +645,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 49
+# Offense count: 47
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -525,12 +653,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'
@@ -567,15 +695,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: 34
+# Offense count: 36
 # 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'
@@ -591,6 +719,7 @@ 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'
@@ -603,7 +732,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/spree/localized_number.rb'
     - 'spec/models/product_importer_spec.rb'
 
-# Offense count: 25
+# Offense count: 24
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Exclude:
@@ -622,7 +751,6 @@ 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
@@ -679,10 +807,11 @@ Metrics/ModuleLength:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/stripe_stubs.rb'
 
-# Offense count: 7
+# Offense count: 8
 # 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'
@@ -709,31 +838,6 @@ 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|$))
@@ -790,7 +894,7 @@ Rails/ActionOrder:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/user_confirmations_controller.rb'
 
-# Offense count: 12
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -870,7 +974,6 @@ Rails/ExpandedDateRange:
     - 'app/models/spree/product.rb'
 
 # Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -909,6 +1012,7 @@ 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'
@@ -957,13 +1061,7 @@ Rails/I18nLocaleTexts:
   Exclude:
     - 'app/controllers/admin/stripe_accounts_controller.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/IgnoredColumnsAssignment:
-  Exclude:
-    - 'app/models/spree/variant.rb'
-
-# Offense count: 22
+# Offense count: 26
 # Configuration parameters: IgnoreScopes, Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
@@ -1007,13 +1105,14 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
 
-# Offense count: 6
+# Offense count: 8
 # 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'
@@ -1165,7 +1264,7 @@ Rails/StripHeredoc:
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/tasks/data/truncate_data.rake'
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -1173,6 +1272,7 @@ 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
@@ -1274,19 +1374,6 @@ 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:
@@ -1409,14 +1496,6 @@ 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.
@@ -1439,414 +1518,13 @@ 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/fee_summary.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/base.rb'
     - 'lib/tasks/sample_data/user_factory.rb'
 
 # Offense count: 3
@@ -1950,10 +1628,11 @@ Style/RedundantArgument:
     - 'engines/dfc_provider/app/services/authorization_control.rb'
     - 'spec/support/query_counter.rb'
 
-# Offense count: 14
+# Offense count: 15
 # 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'
@@ -1992,11 +1671,12 @@ Style/RedundantStringEscape:
     - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
     - 'spec/system/admin/enterprise_fees_spec.rb'
 
-# Offense count: 205
+# Offense count: 208
 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'
@@ -2026,6 +1706,12 @@ 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.1.4
+3.0.3

Gemfile

@@ -1,10 +1,9 @@
 # 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'
@@ -116,6 +115,8 @@ gem 'spreadsheet_architect' # write spreadsheets
 
 gem 'whenever', require: false
 
+gem 'test-unit', '~> 3.5'
+
 gem 'coffee-rails', '~> 5.0.0'
 
 gem 'angular_rails_csrf'
@@ -139,6 +140,7 @@ 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.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.6)
-      actionpack (= 7.0.6)
-      actionview (= 7.0.6)
-      activejob (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.6)
-      actionview (= 7.0.6)
-      activesupport (= 7.0.6)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
       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.6)
-      actionpack (= 7.0.6)
-      activerecord (= 7.0.6)
-      activestorage (= 7.0.6)
-      activesupport (= 7.0.6)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.6)
-      activesupport (= 7.0.6)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       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.6)
-      activesupport (= 7.0.6)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       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.6)
-      activesupport (= 7.0.6)
-    activerecord (7.0.6)
-      activemodel (= 7.0.6)
-      activesupport (= 7.0.6)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
     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.6)
-      actionpack (= 7.0.6)
-      activejob (= 7.0.6)
-      activerecord (= 7.0.6)
-      activesupport (= 7.0.6)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.6)
+    activesupport (7.0.5)
       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.780.0)
-    aws-sdk-core (3.175.0)
+    aws-partitions (1.779.0)
+    aws-sdk-core (3.174.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.67.0)
+    aws-sdk-kms (1.66.0)
       aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.126.0)
+    aws-sdk-s3 (1.124.0)
       aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -237,6 +237,12 @@ 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)
@@ -270,7 +276,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.10)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -317,7 +323,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.8.2)
+    geocoder (1.8.1)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gmaps4rails (2.1.2)
@@ -377,13 +383,15 @@ GEM
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwt (2.7.1)
-    knapsack_pro (5.1.2)
+    knapsack_pro (5.1.0)
       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)
@@ -408,7 +416,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    minitest (5.18.1)
+    minitest (5.18.0)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
@@ -416,7 +424,7 @@ GEM
     msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.6)
+    net-imap (0.3.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -426,7 +434,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -480,6 +488,7 @@ 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)
@@ -491,7 +500,7 @@ GEM
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.7.1)
+    racc (1.7.0)
     rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -509,27 +518,26 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    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)
+    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)
       bundler (>= 1.15.0)
-      railties (= 7.0.6)
+      railties (= 7.0.5)
     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.1.1)
-      activesupport (>= 5.0.0)
-      minitest
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-erd (1.7.2)
       activerecord (>= 4.2)
@@ -543,9 +551,9 @@ GEM
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.6)
-      actionpack (= 7.0.6)
-      activesupport (= 7.0.6)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -619,9 +627,8 @@ GEM
     rswag-ui (2.9.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
-    rubocop (1.54.1)
+    rubocop (1.52.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
@@ -632,7 +639,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.20.2)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -646,7 +653,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.2)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.4.25)
@@ -688,13 +695,13 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.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)
+    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)
     stimulus_reflex (3.5.0.rc2)
       actioncable (>= 5.2, < 8)
       actionpack (>= 5.2, < 8)
@@ -712,11 +719,13 @@ 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.4.0)
+    timeout (0.3.2)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -731,8 +740,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.2.0)
-    view_component (3.4.0)
+    vcr (6.1.0)
+    view_component (3.2.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -809,6 +818,7 @@ DEPENDENCIES
   database_cleaner
   datafoodconsortium-connector
   db2fog!
+  ddtrace
   debug (>= 1.0.0)
   debugger-linecache
   devise
@@ -900,6 +910,7 @@ DEPENDENCIES
   stimulus_reflex (= 3.5.0.rc2)
   stringex (~> 2.8.5)
   stripe
+  test-unit (~> 3.5)
   timecop
   valid_email2
   vcr
@@ -914,7 +925,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.0.3p157
 
 BUNDLED WITH
    2.4.3

app/assets/javascripts/admin/all.js

@@ -68,6 +68,25 @@
 //= 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.id + ((if variant then "/variants/" + variant.id else "")) + "/edit"
+    "/admin/products/" + product.permalink_live + ((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.id + "/variants/" + variant.id
+            url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
           ).then (response) ->
             $scope.removeVariant(product, variant)
     else
@@ -352,6 +352,9 @@ 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

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

app/assets/javascripts/admin_minimal.js

@@ -11,5 +11,24 @@
 
 //= 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
 
-window.angular = { module: function(noop){ return { value: function(){} } } }
+//= require js-big-decimal/dist/web/js-big-decimal.min.js
+
+window.angular = { module: function(noop){ return { value: function(){} } } }

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

@@ -29,6 +29,24 @@
 #
 #= 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/templates/admin/links_dropdown.html.haml

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

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

@@ -43,6 +43,8 @@ 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,6 +17,7 @@ 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]

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.order(:id)
+        ransack(params[:q]).result
 
       @pagy, @line_items = pagy(@line_items) if pagination_required?
 
@@ -34,8 +34,7 @@ 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)
-          # No Content, does not trigger ng resource auto-update
-          render body: nil, status: :no_content
+          render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
         else
           render json: { errors: @line_item.errors }, status: :precondition_failed
         end

app/controllers/admin/customers_controller.rb

@@ -36,10 +36,8 @@ module Admin
     end
 
     def create
-      @customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
-
+      @customer = Customer.new(customer_params)
       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
@@ -85,7 +83,7 @@ module Admin
     def customers
       return @customers if @customers.present?
 
-      @customers = Customer.visible.managed_by(spree_current_user)
+      @customers = Customer.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,7 +62,9 @@ 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]
-        order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
+        if order_cycle.nil? && coordinator.present?
+          order_cycle = OrderCycle.new(coordinator: coordinator)
+        end
         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,8 +16,7 @@ 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,12 +121,8 @@ 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
@@ -182,7 +178,9 @@ 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]
-        @order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
+        if @order_cycle.nil? && coordinator.present?
+          @order_cycle = OrderCycle.new(coordinator: coordinator)
+        end
 
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle)
           .visible_enterprises

app/controllers/admin/product_import_controller.rb

@@ -37,14 +37,8 @@ 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])
@@ -62,13 +56,8 @@ 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

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

app/controllers/admin/reports_controller.rb

@@ -22,29 +22,24 @@ 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 @report.render_as(report_format), filename: report_filename
+      send_data render_report_as(report_format), filename: report_filename
     end
 
     def show_report
       assign_view_data
-      @table = @report.render_as(:html) if render_data?
+      @table = render_report_as(:html) if render_data?
       render "show"
     end
 
@@ -61,24 +56,45 @@ module Admin
       request.post?
     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
+    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
 
-      blob = ReportBlob.create_for_upload_later!(report_filename)
+        # 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
 
-      ReportJob.perform_later(
-        report_class: report_class, user: spree_current_user, params: params,
-        format: format, blob: blob, channel: ScopedChannel.for_id(params[:uuid]),
-      )
+    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
 
-      head :no_content
+    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
     end
   end
 end

app/controllers/admin/subscriptions_controller.rb

@@ -18,8 +18,7 @@ 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
@@ -101,8 +100,7 @@ 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
@@ -141,9 +139,7 @@ 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
 
@@ -151,9 +147,7 @@ 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/admin/vouchers_controller.rb

@@ -9,11 +9,14 @@ module Admin
     end
 
     def create
-      @voucher = Voucher.create(permitted_resource_params.merge(enterprise: @enterprise))
+      voucher_params = permitted_resource_params.merge(enterprise: @enterprise)
+      @voucher = Voucher.create(voucher_params)
 
       if @voucher.save
-        flash[:success] = flash_message_for(@voucher, :successfully_created)
-        redirect_to edit_admin_enterprise_path(@enterprise, anchor: :vouchers_panel)
+        redirect_to(
+          "#{edit_admin_enterprise_path(@enterprise)}#vouchers_panel",
+          flash: { success: flash_message_for(@voucher, :successfully_created) }
+        )
       else
         flash[:error] = @voucher.errors.full_messages.to_sentence
         render :new

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.visible
+        @customers = current_api_user.customers
         render json: @customers, each_serializer: CustomerSerializer
       end
 

app/controllers/api/v0/products_controller.rb

@@ -10,6 +10,8 @@ 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
@@ -21,10 +23,15 @@ module Api
         authorize! :create, Spree::Product
         @product = Spree::Product.new(product_params)
 
-        if @product.save
-          render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
-        else
-          invalid_resource!(@product)
+        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
         end
       end
 
@@ -89,6 +96,8 @@ module Api
       private
 
       def find_product(id)
+        product_scope.find_by!(permalink: id.to_s)
+      rescue ActiveRecord::RecordNotFound
         product_scope.find(id)
       end
 
@@ -143,6 +152,10 @@ 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,7 +50,7 @@ module Api
       private
 
       def product
-        @product ||= Spree::Product.find(params[:product_id]) if params[:product_id]
+        @product ||= Spree::Product.find_by(permalink: params[:product_id]) if params[:product_id]
       end
 
       def scope

app/controllers/api/v1/customers_controller.rb

@@ -29,8 +29,7 @@ module Api
 
       def create
         authorize! :update, Enterprise.find(customer_params[:enterprise_id])
-        customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
-        customer.assign_attributes(customer_params)
+        customer = Customer.new(customer_params)
 
         if customer.save
           render json: Api::V1::CustomerSerializer.new(customer), status: :created
@@ -81,7 +80,7 @@ module Api
       end
 
       def visible_customers
-        Customer.visible.managed_by(current_api_user)
+        Customer.managed_by(current_api_user)
       end
 
       def customer_params
@@ -97,7 +96,6 @@ 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/checkout_callbacks.rb

@@ -14,7 +14,7 @@ module CheckoutCallbacks
     prepend_before_action :require_order_cycle
     prepend_before_action :require_distributor_chosen
 
-    before_action :load_order, :associate_user, :load_saved_addresses
+    before_action :load_order, :associate_user, :load_saved_addresses, :load_saved_credit_cards
     before_action :load_shipping_methods, if: -> { params[:step] == "details" }
 
     before_action :ensure_order_not_completed
@@ -30,6 +30,8 @@ module CheckoutCallbacks
     @order.manual_shipping_selection = true
     @order.checkout_processing = true
 
+    @voucher_adjustment = @order.voucher_adjustments.first
+
     redirect_to(main_app.shop_path) && return if redirect_to_shop?
     redirect_to_cart_path && return unless valid_order_line_items?
   end
@@ -41,6 +43,11 @@ module CheckoutCallbacks
     @order.ship_address ||= finder.ship_address
   end
 
+  def load_saved_credit_cards
+    @saved_credit_cards = spree_current_user&.credit_cards&.with_payment_profile.to_a
+    @selected_card = nil
+  end
+
   def load_shipping_methods
     @shipping_methods = available_shipping_methods.sort { |a, b| a.name.casecmp(b.name) }
   end

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(step: 'details')
-    main_app.checkout_step_path(step:)
+  def order_failed_route
+    main_app.checkout_path
   end
 
   def order_invalid_for_checkout?
@@ -60,8 +60,8 @@ module OrderCompletion
 
   def process_payment_completion!
     unless @order.process_payments!
-      payment_failed
-      return redirect_to order_failed_route(step: 'payment')
+      processing_failed
+      return redirect_to order_failed_route
     end
 
     if OrderWorkflow.new(@order).next && @order.complete?
@@ -82,20 +82,12 @@ module OrderCompletion
     order_completion_reset(@order)
   end
 
-  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))
+  def processing_failed(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,11 +27,8 @@ 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,13 +24,14 @@ 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"
 
-    return if available_shipping_methods.any?
-
-    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
+    flash_error_when_no_shipping_method_available if available_shipping_methods.none?
   end
 
   def update
+    return process_voucher if params[:apply_voucher].present?
+
     if confirm_order || update_order
       return if performed?
 
@@ -60,6 +61,27 @@ class SplitCheckoutController < ::BaseController
       replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
   end
 
+  def render_voucher_section_or_redirect
+    respond_to do |format|
+      format.cable_ready { render_voucher_section }
+      format.html { redirect_to checkout_step_path(:payment) }
+    end
+  end
+
+  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
+  def render_voucher_section
+    render(
+      status: :ok,
+      cable_ready: cable_car.replace(
+        "#voucher-section",
+        partial(
+          "split_checkout/voucher_section",
+          locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
+        )
+      )
+    )
+  end
+
   def order_error_messages
     # Remove ship_address.* errors if no shipping method is not selected
     remove_ship_address_errors if no_ship_address_needed?
@@ -104,6 +126,10 @@ class SplitCheckoutController < ::BaseController
     end
   end
 
+  def flash_error_when_no_shipping_method_available
+    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
+  end
+
   def check_payments_adjustments
     @order.payments.each(&:ensure_correct_adjustment)
   end
@@ -176,6 +202,39 @@ class SplitCheckoutController < ::BaseController
     selected_shipping_method.first.require_ship_address == false
   end
 
+  def process_voucher
+    if add_voucher
+      render_voucher_section_or_redirect
+    elsif @order.errors.present?
+      render_error
+    end
+  end
+
+  def add_voucher
+    if params.dig(:order, :voucher_code).blank?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
+
+    # Fetch Voucher
+    voucher = Voucher.find_by(code: params[:order][:voucher_code], enterprise: @order.distributor)
+
+    if voucher.nil?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
+
+    adjustment = voucher.create_adjustment(voucher.code, @order)
+
+    if !adjustment.valid?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.add_voucher_error'))
+      adjustment.errors.each { |error| @order.errors.import(error) }
+      return false
+    end
+
+    true
+  end
+
   def summary_step?
     params[:step] == "summary"
   end
@@ -203,7 +262,6 @@ class SplitCheckoutController < ::BaseController
 
   def validate_payment!
     return true if params.dig(:order, :payments_attributes, 0, :payment_method_id).present?
-    return true if @order.zero_priced_order?
 
     @order.errors.add :payment_method, I18n.t('split_checkout.errors.select_a_payment_method')
   end
@@ -250,4 +308,18 @@ 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 Object.const_defined?("Spree::#{const_name}")
+        return "Spree::#{const_name}".constantize if Spree.const_defined?(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'
+      belongs_to 'spree/product', find_by: :permalink
 
       before_action :load_data
 
@@ -80,7 +80,7 @@ module Spree
       end
 
       def load_data
-        @product = Product.find(params[:product_id])
+        @product = Product.find_by(permalink: params[:product_id])
       end
 
       def set_viewable

app/controllers/spree/admin/invoices_controller.rb

@@ -6,10 +6,6 @@ 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])
@@ -17,24 +13,6 @@ 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)
@@ -51,12 +29,6 @@ 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,6 +24,7 @@ module Spree
             end
 
             refresh_shipment_rates
+            recalculate_taxes
             OrderWorkflow.new(@order).advance_to_payment
 
             flash[:success] = Spree.t('customer_details_updated')
@@ -51,6 +52,15 @@ 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,10 +99,6 @@ 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'
+      belongs_to 'spree/product', find_by: :permalink
       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(params[:id])
+        Product.find_by!(permalink: params[:id])
       end
 
       def location_after_save

app/controllers/spree/admin/variants_controller.rb

@@ -5,7 +5,7 @@ require 'open_food_network/scope_variants_for_search'
 module Spree
   module Admin
     class VariantsController < ::Admin::ResourceController
-      belongs_to 'spree/product'
+      belongs_to 'spree/product', find_by: :permalink
 
       def index
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)

app/controllers/voucher_adjustments_controller.rb

@@ -1,77 +1,32 @@
 # frozen_string_literal: true
 
 class VoucherAdjustmentsController < BaseController
-  before_action :set_order
-
-  def create
-    if add_voucher
-      VoucherAdjustmentsService.calculate(@order)
-      @order.update_totals_and_states
-
-      update_payment_section
-    elsif @order.errors.present?
-      render_error
-    end
-  end
+  include CablecarResponses
 
   def destroy
+    @order = current_order
+
     @order.voucher_adjustments.find_by(id: params[:id])&.destroy
 
-    update_payment_section
+    respond_to do |format|
+      format.cable_ready { render_voucher_section }
+      format.html { redirect_to checkout_step_path(:payment) }
+    end
   end
 
   private
 
-  def set_order
-    @order = current_order
-  end
-
-  def add_voucher
-    if voucher_params[:voucher_code].blank?
-      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.voucher_not_found'))
-      return false
-    end
-
-    voucher = Voucher.find_by(code: voucher_params[:voucher_code], enterprise: @order.distributor)
-
-    if voucher.nil?
-      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.voucher_not_found'))
-      return false
-    end
-
-    adjustment = voucher.create_adjustment(voucher.code, @order)
-
-    unless adjustment.valid?
-      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.add_voucher_error'))
-      adjustment.errors.each { |error| @order.errors.import(error) }
-      return false
-    end
-
-    true
-  end
-
-  def update_payment_section
-    render cable_ready: cable_car.replace(
-      selector: "#checkout-payment-methods",
-      html: render_to_string(partial: "split_checkout/payment", locals: { step: "payment" })
-    )
-  end
-
-  def render_error
-    flash.now[:error] = @order.errors.full_messages.to_sentence
-
-    render status: :unprocessable_entity, cable_ready: cable_car.
-      replace("#flashes", partial("shared/flashes", locals: { flashes: flash })).
-      replace(
+  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
+  def render_voucher_section
+    render(
+      status: :ok,
+      cable_ready: cable_car.replace(
         "#voucher-section",
         partial(
           "split_checkout/voucher_section",
           locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
         )
       )
-  end
-
-  def voucher_params
-    params.require(:order).permit(:voucher_code)
+    )
   end
 end

app/helpers/angular_form_helper.rb

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

@@ -120,8 +120,6 @@ module CheckoutHelper
   end
 
   def payment_or_shipping_price(method, order)
-    return unless method
-
     price = method.compute_amount(order)
     if price.zero?
       t('checkout_method_free')
@@ -141,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,8 +77,7 @@ 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,13 +36,6 @@ 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,14 +8,4 @@ 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,28 +32,7 @@ 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/orders_helper.rb

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

app/helpers/spree/payment_methods_helper.rb

@@ -5,13 +5,11 @@ module Spree
     def payment_method(payment)
       # hack to allow us to retrieve the name of a "deleted" payment method
       id = payment.payment_method_id
-      return if id.nil?
-
       Spree::PaymentMethod.find_with_destroyed(id)
     end
 
     def payment_method_name(payment)
-      payment_method(payment)&.name
+      payment_method(payment).name
     end
   end
 end

app/jobs/application_job.rb

@@ -7,11 +7,4 @@ 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,14 +2,9 @@
 
 # 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:, channel: nil)
+  def perform(report_class, user, params, format, blob)
     start_time = Time.zone.now
 
     report = report_class.new(user, params, render: true)
@@ -19,8 +14,6 @@ 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)
@@ -29,17 +22,4 @@ 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,9 +41,7 @@ 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,16 +38,14 @@ 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,16 +15,6 @@ 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 1 shipment per order.
+# Although Spree 2 supports multiple shipments per order, in OFN we have only one 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,8 +30,7 @@ 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,8 +6,7 @@ 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,8 +42,7 @@ 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
@@ -77,10 +76,8 @@ 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.
@@ -88,10 +85,8 @@ 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.
@@ -107,8 +102,7 @@ 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)
@@ -144,8 +138,7 @@ 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,15 +34,10 @@ 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

@@ -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
 
-    image_variant_url_for(image.variant(name))
+    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,10 +505,7 @@ class Enterprise < ApplicationRecord
   end
 
   def set_unused_address_fields
-    if address.present?
-      address.firstname = address.lastname = address.phone =
-                            address.company = 'unused'
-    end
+    address.firstname = address.lastname = address.phone = address.company = 'unused' if address.present?
     business_address.first_name = business_address.last_name = 'unused' if business_address.present?
   end
 

app/models/invoice.rb

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

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

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

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

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

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

app/models/invoice/data_presenter/business_address.rb

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

app/models/invoice/data_presenter/contact.rb

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

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

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

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

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

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

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

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

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

app/models/invoice/data_presenter/shipping_method.rb

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

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

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

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

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

@@ -11,12 +11,7 @@ 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',
@@ -73,11 +68,7 @@ module ProductImport
 
     def invalid_attributes
       invalid_attrs = {}
-      errors = if @product_validations
-                 @product_validations.messages.merge(self.errors.messages)
-               else
-                 self.errors.messages
-               end
+      errors = @product_validations ? @product_validations.messages.merge(self.errors.messages) : self.errors.messages
       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,13 +73,11 @@ 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,8 +17,7 @@ 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,8 +8,7 @@ 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,8 +67,6 @@ 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,8 +75,7 @@ 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 can't be voided by Stripe, and must be refunded instead
+        # If a payment has been confirmed it cannot 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
 
-      image_variant_url_for(variant(size))
+      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

@@ -23,7 +23,7 @@ module Spree
       go_to_state :delivery
       go_to_state :payment, if: ->(order) {
         order.update_totals
-        order.payment_required? || order.zero_priced_order?
+        order.payment_required?
       }
       go_to_state :confirmation
       go_to_state :complete
@@ -68,7 +68,6 @@ module Spree
              },
              class_name: 'Spree::Adjustment',
              dependent: :destroy
-    has_many :invoices
 
     belongs_to :order_cycle
     belongs_to :distributor, class_name: 'Enterprise'
@@ -87,6 +86,15 @@ 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?
@@ -99,25 +107,16 @@ module Spree
     validates :order_cycle, presence: true, on: :require_distribution
     validates :distributor, presence: true, on: :require_distribution
 
-    before_validation :set_currency
-    before_validation :generate_order_number, if: :new_record?
-    before_validation :clone_billing_address, if: :use_billing?
-    before_validation :ensure_customer
+    make_permalink field: :number
 
-    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 })
     }
@@ -146,7 +145,9 @@ module Spree
     }
 
     scope :with_line_items_variants_and_products_outer, lambda {
-      left_outer_joins(line_items: { variant: :product })
+      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)')
     }
 
     # All the states an order can be in after completing the checkout
@@ -170,11 +171,6 @@ 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
@@ -219,12 +215,6 @@ module Spree
       total.to_f > 0.0 && !skip_payment_for_subscription?
     end
 
-    # There are items present in the order, but either the items have zero price,
-    # or the order's total has been modified (maybe discounted) to zero.
-    def zero_priced_order?
-      line_items.count.positive? && total.zero?
-    end
-
     # Returns the relevant zone (if any) to be used for taxation purposes.
     # Uses default tax zone unless there is a specific match
     def tax_zone
@@ -327,13 +317,12 @@ 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 before_payment_state?
+      return if state.in?(["cart", "address", "delivery"])
 
       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
 
@@ -585,20 +574,8 @@ 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?
 
@@ -621,10 +598,6 @@ module Spree
       raise Core::GatewayError, Spree.t(:no_pending_payments) if pending_payments.empty?
 
       pending_payments.each do |payment|
-        if payment.amount.zero? && zero_priced_order?
-          payment.update_columns(state: "completed", captured_at: Time.zone.now)
-        end
-
         break if payment_total >= total
 
         yield payment

app/models/spree/order/checkout.rb

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

app/models/spree/preferences/store.rb

@@ -36,17 +36,15 @@ 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)
-          if preference
-            # 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))
+          # 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
-          end
+          # and return the value
+          return preference.value
         end
 
         unless fallback.nil?

app/models/spree/product.rb

@@ -23,6 +23,7 @@ require 'concerns/product_stock'
 #
 module Spree
   class Product < ApplicationRecord
+    include PermalinkGenerator
     include ProductStock
 
     acts_as_paranoid
@@ -55,6 +56,7 @@ module Spree
                                                        through: :variants
 
     validates :name, presence: true
+    validates :permalink, presence: true
     validates :shipping_category, presence: true
 
     validates :supplier, presence: true
@@ -81,7 +83,14 @@ module Spree
     # these values are persisted on the product's variant
     attr_accessor :price, :display_as, :unit_value, :unit_description
 
+    make_permalink order: :name
+
+    after_initialize :set_available_on_to_now, if: :new_record?
+
+    before_validation :sanitize_permalink
+
     before_save :add_primary_taxon_to_taxons
+    before_destroy :punch_permalink
 
     after_save :remove_previous_primary_taxon_from_taxons
     after_create :ensure_standard_variant
@@ -199,12 +208,18 @@ module Spree
       return where('spree_products.supplier_id IN (?)', [enterprise.id] | permitted_producer_ids)
     }
 
-    scope :active, lambda { where("spree_products.deleted_at IS NULL") }
+    scope :active, lambda {
+      where("spree_products.deleted_at IS NULL AND spree_products.available_on <= ?", Time.zone.now)
+    }
 
     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)
@@ -291,6 +306,15 @@ module Spree
 
     private
 
+    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?
 
@@ -323,6 +347,14 @@ module Spree
       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
       return if image.blank? || image.valid?
 

app/models/spree/variant.rb

@@ -23,7 +23,8 @@ module Spree
 
     belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product'
 
-    delegate_belongs_to :product, :name, :description, :tax_category_id, :shipping_category_id,
+    delegate_belongs_to :product, :name, :description, :permalink, :available_on,
+                        :tax_category_id, :shipping_category_id,
                         :meta_keywords, :tax_category, :shipping_category
 
     has_many :inventory_units, inverse_of: :variant

app/models/subscription.rb

@@ -29,14 +29,12 @@ class Subscription < ApplicationRecord
   accepts_nested_attributes_for :bill_address, :ship_address
 
   scope :not_ended, -> {
-                      where('subscriptions.ends_at > (?) OR subscriptions.ends_at IS NULL',
-                            Time.zone.now)
+                      where('subscriptions.ends_at > (?) OR subscriptions.ends_at IS NULL', Time.zone.now)
                     }
   scope :not_canceled, -> { where('subscriptions.canceled_at IS NULL') }
   scope :not_paused, -> { where('subscriptions.paused_at IS NULL') }
   scope :active, -> {
-                   not_canceled.not_ended.not_paused.where('subscriptions.begins_at <= (?)',
-                                                           Time.zone.now)
+                   not_canceled.not_ended.not_paused.where('subscriptions.begins_at <= (?)', Time.zone.now)
                  }
 
   def closed_proxy_orders

app/models/variant_override.rb

@@ -13,8 +13,7 @@ class VariantOverride < ApplicationRecord
 
   validates :hub, presence: true
   validates :variant, presence: true
-  # Default stock can be nil, indicating stock should not be reset or zero, meaning reset to zero.
-  # Need to ensure this can be set by the user.
+  # Default stock can be nil, indicating stock should not be reset or zero, meaning reset to zero. Need to ensure this can be set by the user.
   validates :default_stock, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
   validates :price, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
   validates :count_on_hand, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
@@ -49,8 +48,7 @@ class VariantOverride < ApplicationRecord
 
   def move_stock!(quantity)
     unless stock_overridden?
-      Bugsnag.notify RuntimeError.new "Attempting to move stock of a VariantOverride " \
-                                      "without a count_on_hand specified."
+      Bugsnag.notify RuntimeError.new "Attempting to move stock of a VariantOverride without a count_on_hand specified."
       return
     end
 
@@ -71,8 +69,7 @@ class VariantOverride < ApplicationRecord
         self.attributes = { on_demand: false, count_on_hand: default_stock }
         save
       else
-        Bugsnag.notify RuntimeError.new "Attempting to reset stock level for a variant " \
-                                        "with no default stock level."
+        Bugsnag.notify RuntimeError.new "Attempting to reset stock level for a variant with no default stock level."
       end
     end
     self

app/models/voucher.rb

@@ -41,6 +41,6 @@ class Voucher < ApplicationRecord
   # We limit adjustment to the maximum amount needed to cover the order, ie if the voucher
   # covers more than the order.total we only need to create an adjustment covering the order.total
   def compute_amount(order)
-    -amount.clamp(0, order.pre_discount_total)
+    -amount.clamp(0, order.total)
   end
 end