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/workflows/stage.yml

@@ -0,0 +1,49 @@
+name: "Deploy to Staging"
+
+on:
+  pull_request:
+    types: [labeled]
+  workflow_dispatch:
+    inputs:
+      server:
+        description: "Staging Server"
+        type: choice
+        required: true
+        options:
+          - staging.openfoodnetwork.org.uk
+          - 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: Configure deployment key
+        run: |
+          install -m 600 -D /dev/null ~/.ssh/id_rsa
+          echo "${{ secrets.DEPLOYMENT_KEY }}" > ~/.ssh/id_rsa
+          echo "${{ secrets.DEPLOYMENT_HOSTS }}" > ~/.ssh/known_hosts
+
+      - name: Deploy to Staging
+        env:
+          LABEL: ${{ github.event.label.name }}
+        run: |
+          ssh ofn-deploy@${{ github.event.label.description }} -o LogLevel=ERROR "pull-request-${{ github.event.pull_request.number }} ."
+
+  deploy_branch:
+    if: ${{ inputs.server }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure deployment key
+        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
+        run: |
+          ssh ofn-deploy@${{ inputs.server }} -o LogLevel=ERROR "$GITHUB_REF_NAME $GITHUB_SHA"

.prettierignore

@@ -1,4 +1,4 @@
-# Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
+# Ignore a lot of things, but we should enable where it can be helpful.
 
 *.md
 *.yml
@@ -6,13 +6,21 @@
 *.json
 *.html
 
+# JS
+# Enabled: app/webpacker/controllers/*.js and app/webpacker/packs/*.js
 babel.config.js
 postcss.config.js
 
+# SCSS
+# Enabled: most of admin
+/app/webpacker/css/admin/globals/
+/app/webpacker/css/admin/shared/
+/app/webpacker/css/admin_v3/globals/variables.scss
 /app/webpacker/css/darkswarm/
 /app/webpacker/css/mail/
 /app/webpacker/css/shared/
 
+# More
 /app/assets/
 /config/
 /coverage/

.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.50.2.
+# 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
@@ -16,7 +16,7 @@ Gemspec/RequiredRubyVersion:
     - 'engines/order_management/order_management.gemspec'
     - 'engines/web/web.gemspec'
 
-# Offense count: 28
+# Offense count: 31
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
@@ -62,11 +62,10 @@ Layout/BlockEndNewline:
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/system/admin/orders_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Layout/ClosingParenthesisIndentation:
   Exclude:
-    - 'lib/reporting/queries/joins.rb'
     - 'spec/system/admin/orders_spec.rb'
 
 # Offense count: 1
@@ -100,7 +99,7 @@ Layout/FirstHashElementIndentation:
   Exclude:
     - 'spec/services/products_renderer_spec.rb'
 
-# Offense count: 11
+# Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -109,7 +108,6 @@ Layout/FirstHashElementIndentation:
 Layout/HashAlignment:
   Exclude:
     - 'app/controllers/spree/users_controller.rb'
-    - 'app/models/spree/image.rb'
     - 'spec/migrations/migrate_customer_names_spec.rb'
     - 'spec/models/enterprise_spec.rb'
     - 'spec/system/admin/customers_spec.rb'
@@ -199,35 +197,28 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/system/consumer/cookies_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
 
-# Offense count: 615
+# 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_fees_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/schedules_controller.rb'
     - 'app/controllers/admin/subscriptions_controller.rb'
-    - 'app/controllers/api/v0/order_cycles_controller.rb'
     - 'app/controllers/payment_gateways/paypal_controller.rb'
-    - 'app/helpers/angular_form_builder.rb'
     - 'app/helpers/angular_form_helper.rb'
     - 'app/helpers/enterprises_helper.rb'
-    - 'app/helpers/order_cycles_helper.rb'
-    - 'app/helpers/spree/orders_helper.rb'
     - 'app/jobs/subscription_confirm_job.rb'
     - 'app/mailers/subscription_mailer.rb'
-    - 'app/models/column_preference.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/entry_processor.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/product_import/unit_converter.rb'
     - 'app/models/proxy_order.rb'
@@ -236,17 +227,13 @@ Layout/LineLength:
     - 'app/models/spree/gateway/stripe_sca.rb'
     - 'app/models/spree/line_item.rb'
     - 'app/models/spree/order.rb'
-    - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/preferences/store.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
-    - 'app/serializers/api/admin/subscription_line_item_serializer.rb'
     - 'app/services/cart_service.rb'
-    - 'app/services/checkout/post_checkout_actions.rb'
     - 'app/services/embedded_page_service.rb'
     - 'app/services/order_cycle_form.rb'
     - 'app/services/order_syncer.rb'
-    - 'app/services/products_renderer.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'
@@ -260,7 +247,6 @@ Layout/LineLength:
     - '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/reporting/reports/xero_invoices/base.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/tasks/data.rake'
     - 'lib/tasks/enterprises.rake'
@@ -362,11 +348,12 @@ Layout/LineLength:
     - 'spec/support/cancan_helper.rb'
     - 'spec/support/features/datepicker_helper.rb'
     - 'spec/support/matchers/select2_matchers.rb'
-    - 'spec/support/matchers/table_matchers.rb'
     - 'spec/support/request/web_helper.rb'
     - 'spec/system/admin/adjustments_spec.rb'
     - 'spec/system/admin/bulk_order_management_spec.rb'
     - 'spec/system/admin/bulk_product_update_spec.rb'
+    - 'spec/system/admin/order_spec.rb'
+    - 'spec/system/admin/product_import_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -374,13 +361,12 @@ Layout/MultilineBlockLayout:
   Exclude:
     - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
 
-# Offense count: 7
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Exclude:
-    - 'lib/reporting/queries/joins.rb'
     - 'spec/system/admin/orders_spec.rb'
     - 'spec/system/admin/products_spec.rb'
 
@@ -412,7 +398,7 @@ Layout/TrailingEmptyLines:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 70
+# Offense count: 76
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -420,7 +406,6 @@ Layout/TrailingWhitespace:
     - 'app/controllers/spree/users_controller.rb'
     - 'app/controllers/user_confirmations_controller.rb'
     - 'app/models/enterprise.rb'
-    - 'app/models/spree/image.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/user_confirmations_controller_spec.rb'
     - 'spec/factories/order_factory.rb'
@@ -438,7 +423,6 @@ Layout/TrailingWhitespace:
     - 'spec/system/admin/order_spec.rb'
     - 'spec/system/admin/product_import_spec.rb'
     - 'spec/system/admin/shipping_methods_spec.rb'
-    - 'spec/system/consumer/split_checkout_spec.rb'
 
 # Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
@@ -468,7 +452,7 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/validators/date_time_string_validator_spec.rb'
     - 'spec/validators/integer_array_validator_spec.rb'
 
-# Offense count: 8
+# Offense count: 6
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
@@ -550,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?
 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).
@@ -581,6 +569,7 @@ Lint/UselessMethodDefinition:
     - 'app/models/spree/gateway.rb'
 
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
@@ -639,11 +628,16 @@ Metrics/BlockLength:
     - 'spec/factories/user_factory.rb'
     - 'spec/factories/variant_factory.rb'
     - 'spec/requests/api/orders_spec.rb'
+    - 'spec/requests/checkout/failed_checkout_spec.rb'
+    - 'spec/requests/checkout/stripe_sca_spec.rb'
     - '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'
+    - 'spec/system/consumer/split_checkout_tax_not_incl_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: CountBlocks, Max.
@@ -651,7 +645,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 46
+# Offense count: 47
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -659,7 +653,6 @@ 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'
@@ -688,6 +681,7 @@ Metrics/ClassLength:
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/product.rb'
     - 'app/models/spree/shipment.rb'
+    - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
@@ -704,7 +698,7 @@ Metrics/ClassLength:
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/reporting/reports/xero_invoices/base.rb'
 
-# Offense count: 35
+# Offense count: 36
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -759,7 +753,7 @@ Metrics/MethodLength:
     - 'lib/reporting/reports/xero_invoices/base.rb'
     - 'lib/tasks/sample_data/product_factory.rb'
 
-# Offense count: 50
+# Offense count: 49
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ModuleLength:
   Exclude:
@@ -808,16 +802,16 @@ Metrics/ModuleLength:
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
-    - 'spec/models/spree/variant_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/variant_units/option_value_namer_spec.rb'
     - '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'
@@ -852,6 +846,7 @@ Naming/HeredocDelimiterNaming:
     - 'app/models/content_configuration.rb'
 
 # Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -899,7 +894,7 @@ Rails/ActionOrder:
     - 'app/controllers/spree/admin/variants_controller.rb'
     - 'app/controllers/user_confirmations_controller.rb'
 
-# Offense count: 15
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -909,7 +904,6 @@ Rails/ActiveRecordCallbacksOrder:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship.rb'
-    - 'app/models/spree/line_item.rb'
     - 'app/models/spree/order.rb'
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/product.rb'
@@ -930,12 +924,6 @@ Rails/ApplicationController:
   Exclude:
     - 'engines/dfc_provider/app/controllers/dfc_provider/base_controller.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/ApplicationJob:
-  Exclude:
-    - 'app/jobs/report_job.rb'
-
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
@@ -996,7 +984,7 @@ Rails/FilePath:
     - 'spec/models/content_configuration_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
-# Offense count: 11
+# Offense count: 8
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -1004,12 +992,9 @@ Rails/HasAndBelongsToMany:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/option_value.rb'
     - 'app/models/spree/role.rb'
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/user.rb'
-    - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
 
 # Offense count: 47
@@ -1076,18 +1061,16 @@ Rails/I18nLocaleTexts:
   Exclude:
     - 'app/controllers/admin/stripe_accounts_controller.rb'
 
-# Offense count: 27
+# Offense count: 26
 # Configuration parameters: IgnoreScopes, Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
   Exclude:
     - 'app/models/enterprise.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/spree/adjustment.rb'
     - 'app/models/spree/country.rb'
     - 'app/models/spree/inventory_unit.rb'
     - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/option_type.rb'
     - 'app/models/spree/order.rb'
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/price.rb'
@@ -1122,7 +1105,7 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
 
-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/NegateInclude:
   Exclude:
@@ -1131,11 +1114,10 @@ Rails/NegateInclude:
     - 'app/models/product_import/spreadsheet_entry.rb'
     - 'app/models/spree/order/checkout.rb'
     - 'app/services/order_cart_reset.rb'
-    - 'engines/order_management/app/services/order_management/stock/estimator.rb'
     - 'lib/spree/localized_number.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
-# Offense count: 18
+# Offense count: 17
 Rails/OutputSafety:
   Exclude:
     - 'app/helpers/angular_form_helper.rb'
@@ -1180,7 +1162,7 @@ Rails/PluckInWhere:
   Exclude:
     - 'app/models/spree/variant.rb'
 
-# Offense count: 28
+# Offense count: 30
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RedundantPresenceValidationOnBelongsTo:
   Exclude:
@@ -1487,7 +1469,7 @@ Style/GlobalStdStream:
     - 'lib/tasks/subscriptions/debug.rake'
     - 'lib/tasks/subscriptions/test.rake'
 
-# Offense count: 39
+# Offense count: 38
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
@@ -1506,7 +1488,6 @@ Style/GuardClause:
     - 'app/models/spree/order.rb'
     - 'app/models/spree/preferences/preferable_class_methods.rb'
     - 'app/services/order_syncer.rb'
-    - 'app/services/variant_units/variant_and_line_item_naming.rb'
     - 'engines/order_management/app/services/order_management/order/updater.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
@@ -1690,7 +1671,7 @@ Style/RedundantStringEscape:
     - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
     - 'spec/system/admin/enterprise_fees_spec.rb'
 
-# Offense count: 206
+# Offense count: 208
 Style/Send:
   Exclude:
     - 'app/controllers/split_checkout_controller.rb'
@@ -1740,7 +1721,7 @@ Style/SlicingWithRange:
     - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 29
+# Offense count: 28
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
@@ -1761,7 +1742,6 @@ Style/StringConcatenation:
     - 'lib/spree/core/environment_extension.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/variant_spec.rb'
     - 'spec/services/embedded_page_service_spec.rb'
     - 'spec/support/api_helper.rb'
     - 'spec/support/features/datepicker_helper.rb'

Gemfile

@@ -119,8 +119,6 @@ gem 'test-unit', '~> 3.5'
 
 gem 'coffee-rails', '~> 5.0.0'
 
-gem 'mini_racer'
-
 gem 'angular_rails_csrf'
 
 gem 'jquery-rails', '4.4.0'

Gemfile.lock

@@ -44,73 +44,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    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.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (1.0.3)
+    active_storage_validations (1.0.4)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -157,17 +157,17 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.760.0)
-    aws-sdk-core (3.171.1)
+    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.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.66.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.124.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.2)
@@ -191,7 +191,7 @@ GEM
       railties (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.39.1)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -219,7 +219,7 @@ GEM
       matrix
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -237,12 +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.11.1)
-      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
+    ddtrace (1.12.1)
+      debase-ruby_core_source (= 3.2.1)
       libdatadog (~> 2.0.0.1.0)
-      libddwaf (~> 1.8.2.0.0)
+      libddwaf (~> 1.9.0.0.0)
       msgpack
-    debase-ruby_core_source (3.2.0)
+    debase-ruby_core_source (3.2.1)
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
@@ -276,7 +276,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.4)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -340,7 +340,7 @@ GEM
     hiredis (0.6.3)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -382,22 +382,21 @@ GEM
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.0)
-    knapsack_pro (3.11.0)
+    jwt (2.7.1)
+    knapsack_pro (5.1.0)
       rake
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     libdatadog (2.0.0.1.0)
-    libddwaf (1.8.2.0.0)
+    libddwaf (1.9.0.0.1)
       ffi (~> 1.0)
-    libv8-node (16.10.0.0)
     link_header (0.0.8)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.2)
+    loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -417,14 +416,12 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.2)
-    mini_racer (0.6.3)
-      libv8-node (~> 16.10.0.0)
     minitest (5.18.0)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.7.0)
+    msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     net-imap (0.3.4)
@@ -437,8 +434,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.4)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -474,10 +471,11 @@ GEM
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.23.0)
-    paranoia (2.6.1)
+    paranoia (2.6.2)
       activerecord (>= 5.1, < 7.1)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
       xml-simple
@@ -496,13 +494,13 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    puma (6.2.2)
+    puma (6.3.0)
       nio4r (~> 2.0)
     query_count (1.1.1)
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.6.2)
+    racc (1.7.0)
     rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -520,20 +518,20 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
+      railties (= 7.0.5)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -546,15 +544,16 @@ GEM
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -574,7 +573,7 @@ GEM
     redis (4.8.1)
     redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     reline (0.3.3)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -607,7 +606,7 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.2)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -628,17 +627,17 @@ GEM
     rswag-ui (2.9.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
-    rubocop (1.51.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
@@ -668,12 +667,12 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.1.0)
+    sidekiq (7.1.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.14.0)
-    sidekiq-scheduler (5.0.2)
+    sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
@@ -720,7 +719,7 @@ GEM
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
     temple (0.8.2)
-    test-unit (3.5.8)
+    test-unit (3.6.0)
       power_assert
     thor (1.2.2)
     thread-local (1.1.0)
@@ -742,7 +741,7 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.1.0)
-    view_component (3.0.0)
+    view_component (3.2.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -860,7 +859,6 @@ DEPENDENCIES
   mime-types
   mimemagic (> 0.3.5)
   mini_portile2 (~> 2.8)
-  mini_racer
   monetize (~> 1.11)
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection

app/assets/javascripts/admin/all.js

@@ -7,7 +7,6 @@
 
 // jquery and angular
 //= require jquery2
-//= require jquery_ujs
 //= require jquery.ui.all
 //= require jquery.powertip
 //= require jquery.cookie

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -9,6 +9,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.sharedResource = false
   $scope.columns = Columns.columns
   $scope.sorting = SortOptions
+  $scope.sorting.toggle("order_date")
   $scope.pagination = LineItems.pagination
   $scope.per_page_options = [
     {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
@@ -61,6 +62,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.dereferenceLoadedData()
 
   $scope.loadOrders = ->
+    return $scope.orders = [] unless $scope.line_items.length
+
     RequestMonitor.load $scope.orders = Orders.index(
       "q[id_in][]": $scope.line_items.map((line_item) -> line_item.order.id)
     )
@@ -79,6 +82,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
       "q[order_completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined,
       "q[order_completed_at_lt]": if formattedEndDate then formattedEndDate else undefined,
+      "q[s]": "order_completed_at desc",
       "page": $scope.page,
       "per_page": $scope.per_page
     )

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

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

app/assets/javascripts/admin/orders/controllers/bulk_invoice_controller.js.coffee

@@ -1,32 +0,0 @@
-angular.module("admin.orders").controller "bulkInvoiceCtrl", ($scope, $http, $timeout) ->
-  $scope.createBulkInvoice = ->
-    $scope.invoice_id = null
-    $scope.poll = 1
-    $scope.loading = true
-    $scope.message = null
-    $scope.error = null
-    $scope.poll_wait = 5 # 5 Seconds between each check
-    $scope.poll_retries = 80 # Maximum checks before stopping
-
-    $http.post('/admin/orders/invoices', {order_ids: $scope.selected_orders}).then (response) ->
-      $scope.invoice_id = response.data
-      $scope.pollBulkInvoice()
-
-  $scope.pollBulkInvoice = ->
-    $timeout($scope.nextPoll, $scope.poll_wait * 1000)
-
-  $scope.nextPoll = ->
-    $http.get('/admin/orders/invoices/'+$scope.invoice_id+'/poll').then (response) ->
-      $scope.loading = false
-      $scope.message = t('js.admin.orders.index.bulk_invoice_created')
-
-    .catch (response) ->
-      $scope.poll++
-
-      if $scope.poll > $scope.poll_retries
-        $scope.loading = false
-        $scope.error = t('js.admin.orders.index.bulk_invoice_failed')
-        return
-
-      $scope.pollBulkInvoice()
-

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -1,117 +0,0 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter, $location, KeyValueMapStore) ->
-  $scope.RequestMonitor = RequestMonitor
-  $scope.pagination = Orders.pagination
-  $scope.orders = Orders.all
-  $scope.sortOptions = SortOptions
-  $scope.per_page_options = [
-    {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
-    {id: 50, name: t('js.admin.orders.index.per_page', results: 50)},
-    {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
-  ]
-  $scope.selected_orders = []
-  $scope.checkboxes = {}
-  $scope.selected = false
-  $scope.select_all = false
-  $scope.poll = 0
-  $scope.rowStatus = {}
-
-  KeyValueMapStore.localStorageKey = 'ordersFilters'
-  KeyValueMapStore.storableKeys = ["q", "sorting", "page", "per_page"]
-
-  $scope.initialise = ->
-    unless KeyValueMapStore.restoreValues($scope)
-      $scope.setDefaults()
-
-    $scope.fetchResults()
-
-  $scope.setDefaults = ->
-    $scope.per_page = 15
-    $scope.q = {
-      completed_at_not_null: true
-    }
-    e = new CustomEvent("flatpickr_clear");
-    window.dispatchEvent(e)
-
-  $scope.clearFilters = () ->
-    KeyValueMapStore.clearKeyValueMap()
-    $scope.setDefaults()
-    $scope.fetchResults()
-
-  $scope.fetchResults = (page=1) ->
-    startDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_gteq, ' 00:00:00')
-    endDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_lteq, ' 23:59:59')
-
-    $scope.resetSelected()
-    params = {
-      'q[completed_at_gteq]': startDateWithTime,
-      'q[completed_at_lteq]': endDateWithTime,
-      'q[state_eq]': $scope.q?.state_eq,
-      'q[number_cont]': $scope.q?.number_cont,
-      'q[email_cont]': $scope.q?.email_cont,
-      'q[bill_address_firstname_start]': $scope.q?.bill_address_firstname_start,
-      'q[bill_address_lastname_start]': $scope.q?.bill_address_lastname_start,
-      # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
-      'q[completed_at_not_null]': $scope.q?.completed_at_not_null || null,
-      'q[distributor_id_in][]': $scope.q?.distributor_id_in,
-      'q[order_cycle_id_in][]': $scope.q?.order_cycle_id_in,
-      'q[s]': $scope.sorting || 'completed_at desc',
-      shipping_method_id: $scope.q?.shipping_method_id,
-      per_page: $scope.per_page,
-      page: page
-    }
-    KeyValueMapStore.setStoredValues($scope)
-    RequestMonitor.load(Orders.index(params).$promise)
-
-  $scope.appendStringIfNotEmpty = (baseString, stringToAppend) ->
-    return baseString unless baseString
-    return baseString if baseString.endsWith(stringToAppend)
-
-    baseString + stringToAppend
-
-  $scope.resetSelected = ->
-    $scope.selected_orders.length = 0
-    $scope.selected = false
-    $scope.select_all = false
-    $scope.checkboxes = {}
-
-  $scope.toggleSelection = (id) ->
-    index = $scope.selected_orders.indexOf(id)
-
-    if index == -1
-      $scope.selected_orders.push(id)
-    else
-      $scope.selected_orders.splice(index, 1)
-
-  $scope.toggleAll = ->
-    $scope.selected_orders.length = 0
-    $scope.orders.forEach (order) ->
-      $scope.checkboxes[order.id] = $scope.select_all
-      $scope.selected_orders.push order.id if $scope.select_all
-
-  $scope.$watch 'sortOptions', (sort) ->
-    return unless sort && sort.predicate != ""
-
-    $scope.sorting = sort.getSortingExpr()
-    $scope.fetchResults()
-  , true
-
-  $scope.capturePayment = (order) ->
-    $scope.rowAction('capture', order)
-
-  $scope.shipOrder = (order) ->
-    $scope.rowAction('ship', order)
-
-  $scope.rowAction = (action, order) ->
-    $scope.rowStatus[order.id] = "loading"
-
-    Orders[action](order).$promise.then (data) ->
-      $scope.rowStatus[order.id] = "success"
-      $timeout(->
-        $scope.rowStatus[order.id] = null
-      , 1500)
-    , (error) ->
-      $scope.rowStatus[order.id] = "error"
-
-  $scope.changePage = (newPage) ->
-    $scope.page = newPage
-    $scope.fetchResults(newPage)

app/assets/javascripts/admin/orders/directives/invoices_modal.js.coffee

@@ -1,5 +0,0 @@
-angular.module("admin.orders").directive "invoicesModal", ($modal) ->
-  restrict: 'C'
-  link: (scope, elem, attrs, ctrl) ->
-    elem.on "click", (ev) =>
-      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/bulk_invoice.html', controller: ctrl, scope: scope, windowClass: 'simple-modal')

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

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

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

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

app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee

@@ -10,6 +10,12 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
         element.select2
           placeholder: t('admin.orders.select_variant')
           minimumInputLength: 3
+          formatInputTooShort: ->
+            t('admin.select2.minimal_search_length', count: 3)
+          formatSearching: ->
+            t('admin.select2.searching')
+          formatNoMatches: ->
+            t('admin.select2.no_matches')
           ajax:
             url: Spree.routes.variants_search
             datatype: "json"

app/assets/javascripts/admin/utils/services/status_message.js.coffee

@@ -5,8 +5,8 @@ angular.module("admin.utils").factory "StatusMessage", ->
       alert:    {style: {color: 'grey'}}
       notice:   {style: {color: 'grey'}}
       success:  {style: {color: '#9fc820'}}
-      failure:  {style: {color: '#da5354'}}
-      error:   {style: {color: '#da5354'}}
+      failure:  {style: {color: '#C85136'}}
+      error:   {style: {color: '#C85136'}}
 
     statusMessage:
       text: ""

app/assets/javascripts/admin_minimal.js

@@ -0,0 +1,34 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+
+//= require jquery2
+//= require admin/spree/spree-select2
+//= require admin/spree/handlebar_extensions
+
+//= require i18n/translations
+//= require darkswarm/i18n.translate.js
+//= require moment/min/moment.min.js
+//= require moment/locale/ar.js
+//= require moment/locale/ca.js
+//= require moment/locale/de.js
+//= require moment/locale/en-gb.js
+//= require moment/locale/es.js
+//= require moment/locale/fil.js
+//= require moment/locale/fr.js
+//= require moment/locale/it.js
+//= require moment/locale/nb.js
+//= require moment/locale/nl-be.js
+//= require moment/locale/pt-br.js
+//= require moment/locale/pt.js
+//= require moment/locale/ru.js
+//= require moment/locale/sv.js
+//= require moment/locale/tr.js
+//= require moment/locale/pl.js
+
+//= require js-big-decimal/dist/web/js-big-decimal.min.js
+
+window.angular = { module: function(noop){ return { value: function(){} } } }

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

@@ -67,11 +67,3 @@ document.addEventListener "turbo:before-render", ->
     rootscope = null
     window.injector = null
   true
-
-document.addEventListener "ajax:beforeSend", (event) =>
-  window.Turbo.navigator.adapter.progressBar.setValue(0)
-  window.Turbo.navigator.adapter.progressBar.show()
-
-document.addEventListener "ajax:complete", (event) =>
-  window.Turbo.navigator.adapter.progressBar.setValue(100)
-  window.Turbo.navigator.adapter.progressBar.hide()

app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee

@@ -1,22 +0,0 @@
-angular.module('Darkswarm').controller "AccordionCtrl", ($scope, localStorageService, $timeout, $document, CurrentHub) ->
-  $scope.accordionSections = ["details", "billing", "shipping", "payment"]
-  $scope.accordion = { details: true, billing: true, shipping: true, payment: true }
-
-  $scope.show = (section) ->
-    $scope.accordion[section] = true
-
-  $scope.scrollTo = (section) ->
-    # Scrolling is confused by our position:fixed top bar - add an offset to scroll
-    # to the correct location, plus 5px buffer
-    offset_height = $("nav.top-bar").height() + 5
-    $document.scrollTo($("##{section}"), offset_height, 400)
-
-  $scope.$on 'purchaseFormInvalid', (event, form) ->
-    # Scroll to first invalid section
-    for section in $scope.accordionSections
-      if not form[section].$valid
-        $scope.show section
-        $timeout ->
-          $scope.scrollTo(section)
-        , 50
-        break

app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee

@@ -1,12 +0,0 @@
-angular.module('Darkswarm').controller "BillingCtrl", ($scope, $timeout, $controller) ->
-  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
-
-  $scope.name = "billing"
-  $scope.nextPanel = "shipping"
-
-  $scope.summary = ->
-    [$scope.order.bill_address.address1,
-    $scope.order.bill_address.city,
-    $scope.order.bill_address.zipcode]
-
-  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee

@@ -1,43 +0,0 @@
-angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, $http) ->
-  $scope.Checkout = Checkout
-  $scope.submitted = false
-
-  # Bind to local storage
-  $scope.fieldsToBind = ["bill_address", "email", "payment_method_id", "shipping_method_id", "ship_address"]
-  prefix = "order_#{Checkout.order.id}#{CurrentUser.id or ""}#{CurrentHub.hub.id}"
-
-  for field in $scope.fieldsToBind
-    localStorageService.bind $scope, "Checkout.order.#{field}", Checkout.order[field], "#{prefix}_#{field}"
-
-  localStorageService.bind $scope, "Checkout.ship_address_same_as_billing", true, "#{prefix}_sameasbilling"
-  localStorageService.bind $scope, "Checkout.default_bill_address", false, "#{prefix}_defaultasbilladdress"
-  localStorageService.bind $scope, "Checkout.default_ship_address", false, "#{prefix}_defaultasshipaddress"
-
-  $scope.order = Checkout.order # Ordering is important
-  $scope.secrets = Checkout.secrets
-
-  $scope.enabled = !!CurrentUser.id?
-
-  $scope.purchase = (event, form) ->
-    event.preventDefault()
-    $scope.formdata = form
-    $scope.submitted = true
-
-    if CurrentUser.id
-      $scope.validateForm(form)
-    else
-      $scope.ensureUserIsGuest()
-
-  $scope.validateForm = ->
-    if $scope.formdata.$valid
-      $scope.Checkout.purchase()
-    else
-      $scope.$broadcast 'purchaseFormInvalid', $scope.formdata
-
-  $scope.ensureUserIsGuest = (callback = null) ->
-    $http.post("/user/registered_email", {email: $scope.order.email})
-      .then (response)->
-        window.CableReady.perform(response.data)
-      .catch ->
-        $scope.validateForm() if $scope.submitted
-        callback() if callback

app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee

@@ -1,8 +0,0 @@
-angular.module('Darkswarm').controller "CountryCtrl", ($scope, availableCountries) ->
-
-  $scope.countries = availableCountries
-
-  $scope.countriesById = $scope.countries.reduce (obj, country) ->
-    obj[country.id] = country
-    obj
-  , {}

app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee

@@ -1,24 +0,0 @@
-angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, SpreeUser, $controller) ->
-  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
-
-  $scope.name = "details"
-  $scope.nextPanel = "billing"
-
-  $scope.login_or_next = (event) ->
-    event.preventDefault()
-    unless CurrentUser.id
-      $scope.ensureUserIsGuest($scope.next)
-      return
-
-    $scope.next()
-
-  $scope.summary = ->
-    [$scope.fullName(),
-    $scope.order.email,
-    $scope.order.bill_address.phone]
-
-  $scope.fullName = ->
-    [$scope.order.bill_address.firstname ? null,
-    $scope.order.bill_address.lastname ? null].join(" ").trim()
-
-  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee

@@ -1,19 +0,0 @@
-angular.module('Darkswarm').controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates, $controller) ->
-  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
-
-  $scope.savedCreditCards = savedCreditCards
-  $scope.name = "payment"
-  $scope.months = Dates.months
-  $scope.years = Dates.years
-
-  $scope.secrets.card_month = "1"
-  $scope.secrets.card_year = moment().year()
-
-  for card in savedCreditCards when card.is_default
-    $scope.secrets.selected_card = card.id
-    break
-
-  $scope.summary = ->
-    [$scope.Checkout.paymentMethod()?.name]
-
-  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee

@@ -1,11 +0,0 @@
-angular.module('Darkswarm').controller "ShippingCtrl", ($scope, $timeout, ShippingMethods, $controller) ->
-  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
-
-  $scope.ShippingMethods = ShippingMethods
-  $scope.name = "shipping"
-  $scope.nextPanel = "payment"
-
-  $scope.summary = ->
-    [$scope.Checkout.shippingMethod()?.name]
-  
-  $timeout $scope.onTimeout 

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

@@ -25,6 +25,8 @@ angular.module('Darkswarm').controller "OrderCycleChangeCtrl", ($scope, $rootSco
     Cart.reloadFinalisedLineItems()
     ChangeableOrdersAlert.reload()
     $rootScope.$broadcast 'orderCycleSelected'
+    event = new CustomEvent('orderCycleSelected')
+    window.dispatchEvent(event)
 
   $scope.closesInLessThan3Months = () ->
     moment().diff(moment(OrderCycle.orders_close_at(),  "YYYY-MM-DD HH:mm:SS Z"), 'days') > -75

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

@@ -1,22 +0,0 @@
-angular.module('Darkswarm').controller "PageSelectionCtrl", ($scope, $rootScope, $location) ->
-  $scope.selectedPage = ->
-    # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`.
-    # We remove the slash at the beginning.
-    page = $location.path()[1..]
-
-    return $scope.whitelist[0] unless page
-
-    # If the path points to an unrelated path like `/login`, stay where we were.
-    return $scope.lastPage unless page in $scope.whitelist
-
-    $scope.lastPage = page
-    page
-
-  $scope.whitelistPages = (pages) ->
-    $scope.whitelist = pages
-    $scope.lastPage = pages[0]
-
-  # when an order cycle is changed, ensure the shop tab is active to save a click
-  $rootScope.$on "orderCycleSelected", ->
-    if $scope.selectedPage() != "shop"
-      $location.path("shop")

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

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

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

@@ -4,7 +4,16 @@
     {{ 'admin.actions' | t }}
     %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
   %div.menu{ 'ng-show' => "expanded" }
-    %a.menu_item{ 'ng-repeat' => "link in links", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method || 'get' }}", confirm: "{{link.confirm}}" } }
-      %span
-        %i{ ng: { class: "link.icon" } }
-      %span {{ link.name }}
+    %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/assets/javascripts/templates/admin/save_bar.html.haml

@@ -3,7 +3,7 @@
     .seven.columns.alpha
       %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
         {{ StatusMessage.statusMessage.text || " " }}
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #da5354' }
+      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #C85136' }
         {{ StatusMessage.invalidMessage || " " }}
     .nine.columns.omega.text-right{ ng: { transclude: true } }
 

app/assets/javascripts/templates/product_modal.html.haml

@@ -15,6 +15,6 @@
 
   .columns.small-12.medium-6.large-6.product-img
     %img{"ng-src" => "{{::product.largeImage}}", "ng-if" => "::product.largeImage"}
-    %img.placeholder{ src: "/noimage/large.png", "ng-if" => "::!product.largeImage"}
+    %img.placeholder{ src: Spree::Image.default_image_url(:large), "ng-if" => "::!product.largeImage"}
 
 %ng-include{src: "'partials/close.html'"}

app/channels/session_channel.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SessionChannel < ApplicationCable::Channel
+  def self.for_request(request)
+    "SessionChannel:#{request.session.id}"
+  end
+
+  def subscribed
+    return reject if current_user.nil?
+
+    stream_from "SessionChannel:#{session_id}"
+  end
+end

app/components/confirm_modal_component.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 class ConfirmModalComponent < ModalComponent
-  def initialize(id:, confirm_actions: nil, controllers: nil, message: nil, confirm_reflexes: nil)
+  def initialize(id:, confirm_actions: nil, reflex: nil, controller: nil, message: nil, confirm_reflexes: nil)
     super(id: id, close_button: true)
     @confirm_actions = confirm_actions
+    @reflex = reflex
     @confirm_reflexes = confirm_reflexes
-    @controllers = controllers
+    @controller = controller
     @message = message
   end
 

app/components/confirm_modal_component/confirm_modal_component.html.haml

@@ -1,4 +1,4 @@
-%div{ id: @id, "data-controller": "modal #{@controllers}", "data-action": "keyup@document->modal#closeIfEscapeKey" }
+%div{ id: @id, "data-controller": "modal #{@controller}", "data-action": "keyup@document->modal#closeIfEscapeKey", "data-#{@controller}-reflex-value": @reflex }
   .reveal-modal-bg.fade{ "data-modal-target": "background", "data-action": "click->modal#close" }
   .reveal-modal.fade.tiny.help-modal{ "data-modal-target": "modal" }
     = content

app/components/product_component.rb

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

app/components/product_component/product_component.html.haml

@@ -1,6 +1,6 @@
 %tr
   - @columns.each do |column|
     %td.products_column{class: column[:id]}
-      - if column[:id] == "name" && @image
+      - if column[:id] == "name" && @image&.attachment.present?
         = image_tag @image.url(:mini)
       = column[:value]

app/components/products_table_component.rb

@@ -168,13 +168,12 @@ class ProductsTableComponent < ViewComponentReflex::Component
 
   def product_query_includes
     [
-      master: [:images],
+      :image,
       variants: [
         :default_price,
         :stock_locations,
         :stock_items,
-        :variant_overrides,
-        { option_values: :option_type }
+        :variant_overrides
       ]
     ]
   end

app/controllers/admin/bulk_line_items_controller.rb

@@ -11,9 +11,8 @@ module Admin
 
       @line_items = order_permissions.
         editable_line_items.where(order_id: orders).
-        includes(variant: { option_values: :option_type }).
-        ransack(params[:q]).result.
-        reorder('spree_line_items.order_id ASC, spree_line_items.id ASC')
+        includes(:variant).
+        ransack(params[:q]).result
 
       @pagy, @line_items = pagy(@line_items) if pagination_required?
 

app/controllers/admin/enterprise_fees_controller.rb

@@ -25,7 +25,6 @@ module Admin
         format.json {
           render_as_json @collection, controller: self, include_calculators: @include_calculators
         }
-        # format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } }
       end
     end
 
@@ -63,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 order_cycle.nil? && 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/enterprises_controller.rb

@@ -29,7 +29,6 @@ module Admin
 
     after_action  :geocode_address_if_use_geocoder, only: [:create, :update]
 
-    helper 'spree/products'
     include OrderCyclesHelper
 
     def index
@@ -47,6 +46,7 @@ module Admin
     def edit
       @object = Enterprise.where(permalink: params[:id]).
         includes(users: [:ship_address, :bill_address]).first
+      @object.build_custom_tab if @object.custom_tab.nil?
       if params[:stimulus]
         @enterprise.is_primary_producer = params[:is_primary_producer]
         @enterprise.sells = params[:enterprise_sells]
@@ -64,6 +64,8 @@ module Admin
       update_tag_rules(tag_rules_attributes) if tag_rules_attributes.present?
       update_enterprise_notifications
 
+      delete_custom_tab if params[:custom_tab] == 'false'
+
       if @object.update(enterprise_params)
         flash[:success] = flash_message_for(@object, :successfully_updated)
         respond_with(@object) do |format|
@@ -136,6 +138,11 @@ module Admin
 
     protected
 
+    def delete_custom_tab
+      @object.custom_tab.destroy if @object.custom_tab.present?
+      enterprise_params.delete(:custom_tab_attributes)
+    end
+
     def build_resource
       enterprise = super
       enterprise.address ||= Spree::Address.new
@@ -171,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 @order_cycle.nil? && 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
@@ -179,7 +188,7 @@ module Admin
         if enterprises.present?
           enterprises.includes(
             supplied_products:
-              [:supplier, { master: [:images], variants: { option_values: :option_type } }]
+              [:supplier, :variants, :image]
           )
         end
       when :index
@@ -188,7 +197,8 @@ module Admin
             editable_enterprises.
             order('is_primary_producer ASC, name')
         elsif json_request?
-          OpenFoodNetwork::Permissions.new(spree_current_user).editable_enterprises.ransack(params[:q]).result
+          OpenFoodNetwork::Permissions.new(spree_current_user)
+            .editable_enterprises.ransack(params[:q]).result
         else
           Enterprise.where("1=0")
         end
@@ -196,7 +206,6 @@ module Admin
         OpenFoodNetwork::Permissions.new(spree_current_user).visible_enterprises
           .includes(:shipping_methods, :payment_methods).ransack(params[:q]).result
       else
-        # TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now
         OpenFoodNetwork::Permissions.new(spree_current_user).
           editable_enterprises.
           order('is_primary_producer ASC, name')
@@ -317,7 +326,9 @@ module Admin
                                                      :producer_properties_attributes).nil?
         names = Spree::Property.pluck(:name)
         enterprise_params[:producer_properties_attributes].each do |key, property|
-          enterprise_params[:producer_properties_attributes].delete key unless names.include? property[:property_name]
+          unless names.include? property[:property_name]
+            enterprise_params[:producer_properties_attributes].delete key
+          end
         end
       end
     end

app/controllers/admin/schedules_controller.rb

@@ -40,8 +40,11 @@ module Admin
     def index
       respond_to do |format|
         format.json do
-          render_as_json @collection, ams_prefix: params[:ams_prefix],
-                                      editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+          render_as_json(
+            @collection,
+            ams_prefix: params[:ams_prefix],
+            editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+          )
         end
       end
     end
@@ -119,7 +122,8 @@ module Admin
         .pluck(:id)
       result = @existing_order_cycle_ids
       result |= (requested & permitted) # add any requested & permitted ids
-      result -= ((result & permitted) - requested) # remove any existing and permitted ids that were not specifically requested
+      # remove any existing and permitted ids that were not specifically requested
+      result -= ((result & permitted) - requested)
       result
     end
 

app/controllers/admin/vouchers_controller.rb

@@ -26,11 +26,14 @@ module Admin
     private
 
     def load_enterprise
-      @enterprise = Enterprise.find_by permalink: params[:enterprise_id]
+      @enterprise = OpenFoodNetwork::Permissions
+        .new(spree_current_user)
+        .editable_enterprises
+        .find_by(permalink: params[:enterprise_id])
     end
 
     def permitted_resource_params
-      params.require(:voucher).permit(:code)
+      params.require(:voucher).permit(:code, :amount)
     end
   end
 end

app/controllers/api/v0/order_cycles_controller.rb

@@ -80,8 +80,12 @@ module Api
       end
 
       def permitted_ransack_params
-        [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
-         :with_properties, :primary_taxon_id_in_any]
+        [
+          "#{[:name, :meta_keywords, :variants_display_as,
+              :variants_display_name, :supplier_name]
+          .join('_or_')}_cont",
+          :with_properties, :primary_taxon_id_in_any
+        ]
       end
 
       def distributor

app/controllers/api/v0/orders_controller.rb

@@ -47,17 +47,15 @@ module Api
       def capture
         authorize! :admin, order
 
-        pending_payment = order.pending_payments.first
+        payment_capture = OrderCaptureService.new(order)
 
-        return payment_capture_failed unless order.payment_required? && pending_payment
-
-        if pending_payment.capture!
+        if payment_capture.call
           render json: order.reload, serializer: Api::Admin::OrderSerializer, status: :ok
+        elsif payment_capture.gateway_error.present?
+          error_during_processing(payment_capture.gateway_error)
         else
           payment_capture_failed
         end
-      rescue Spree::Core::GatewayError => e
-        error_during_processing(e)
       end
 
       private

app/controllers/api/v0/product_images_controller.rb

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

app/controllers/api/v0/products_controller.rb

@@ -116,9 +116,8 @@ module Api
 
       def product_query_includes
         [
-          master: { images: { attachment_attachment: :blob } },
-          variants: [:default_price, :stock_locations, :stock_items, :variant_overrides,
-                     { option_values: :option_type }]
+          image: { attachment_attachment: :blob },
+          variants: [:default_price, :stock_locations, :stock_items, :variant_overrides]
         ]
       end
 

app/controllers/api/v0/shipments_controller.rb

@@ -21,7 +21,9 @@ module Api
         @shipment.refresh_rates
         @shipment.save!
 
-        render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+        OrderWorkflow.new(@order).advance_to_payment if @order.line_items.any?
+
+        render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
       end
 
       def update
@@ -32,7 +34,7 @@ module Api
         @shipment.fee_adjustment.fire_events(:open)
 
         if @shipment.update(shipment_params)
-          @order.updater.update_totals_and_states
+          @order.update_totals_and_states
         end
 
         @shipment.fee_adjustment.close

app/controllers/api/v0/variants_controller.rb

@@ -9,12 +9,12 @@ module Api
       before_action :product
 
       def index
-        @variants = scope.includes(option_values: :option_type).ransack(params[:q]).result
+        @variants = scope.ransack(params[:q]).result
         render json: @variants, each_serializer: Api::VariantSerializer
       end
 
       def show
-        @variant = scope.includes(option_values: :option_type).find(params[:id])
+        @variant = scope.find(params[:id])
         render json: @variant, serializer: Api::VariantSerializer
       end
 
@@ -56,9 +56,9 @@ module Api
       def scope
         if @product
           variants = if current_api_user.has_spree_role?("admin") || params[:show_deleted]
-                       @product.variants_including_master.with_deleted
+                       @product.variants.with_deleted
                      else
-                       @product.variants_including_master
+                       @product.variants
                      end
         else
           variants = Spree::Variant.where(nil)

app/controllers/application_controller.rb

@@ -9,6 +9,7 @@ require 'spree/core/controller_helpers/common'
 require 'open_food_network/referer_parser'
 
 class ApplicationController < ActionController::Base
+  include CablecarResponses
   include Pagy::Backend
   include RequestTimeouts
 

app/controllers/checkout_controller.rb

@@ -1,187 +0,0 @@
-# frozen_string_literal: true
-
-require 'open_food_network/address_finder'
-
-class CheckoutController < ::BaseController
-  include OrderStockCheck
-  include OrderCompletion
-  include WhiteLabel
-
-  layout 'darkswarm'
-
-  helper 'terms_and_conditions'
-  helper 'checkout'
-
-  # We need pessimistic locking to avoid race conditions.
-  # Otherwise we fail on duplicate indexes or end up with negative stock.
-  prepend_around_action CurrentOrderLocker, only: [:edit, :update]
-
-  prepend_before_action :check_hub_ready_for_checkout
-  prepend_before_action :check_order_cycle_expiry
-  prepend_before_action :require_order_cycle
-  prepend_before_action :require_distributor_chosen
-
-  before_action :load_order
-
-  before_action :handle_insufficient_stock
-
-  before_action :associate_user
-  before_action :check_authorization
-
-  before_action :hide_ofn_navigation, only: :edit
-
-  helper 'spree/orders'
-
-  def edit; end
-
-  def update
-    params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
-    return action_failed unless @order.update(params_adapter.params[:order] || {})
-
-    checkout_workflow(params_adapter.shipping_method_id)
-  rescue Spree::Core::GatewayError => e
-    gateway_error(e)
-    action_failed(e)
-  rescue StandardError => e
-    flash[:error] = I18n.t("checkout.failed")
-    action_failed(e)
-  ensure
-    @order.update_order!
-  end
-
-  private
-
-  def check_authorization
-    authorize!(:edit, current_order, session[:access_token])
-  end
-
-  def load_order
-    load_checkout_order
-
-    return handle_invalid_stock unless valid_order_line_items?
-
-    before_address
-    setup_for_current_state
-  end
-
-  def handle_invalid_stock
-    reset_order_to_cart
-
-    respond_to do |format|
-      format.html do
-        redirect_to main_app.cart_path
-      end
-
-      format.json do
-        render json: { path: main_app.cart_path }, status: :bad_request
-      end
-    end
-  end
-
-  def setup_for_current_state
-    method_name = :"before_#{@order.state}"
-    __send__(method_name) if respond_to?(method_name, true)
-  end
-
-  def before_address
-    associate_user
-
-    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
-
-    @order.bill_address = finder.bill_address
-    @order.ship_address = finder.ship_address
-  end
-
-  def before_payment
-    current_order.payments.destroy_all if request.put?
-  end
-
-  def checkout_workflow(shipping_method_id)
-    while @order.state != "complete"
-      if @order.state == "payment"
-        update_payment_total
-        return if redirect_to_payment_gateway
-
-        return action_failed if @order.errors.any?
-        return action_failed unless @order.process_payments!
-      end
-
-      next if OrderWorkflow.new(@order).next({ "shipping_method_id" => shipping_method_id })
-
-      return action_failed
-    end
-
-    update_response
-  end
-
-  def update_payment_total
-    @order.updater.update_totals
-    @order.updater.update_pending_payment
-  end
-
-  def redirect_to_payment_gateway
-    return unless selected_payment_method.external_gateway?
-    return unless (redirect_url = selected_payment_method.external_payment_url(order: @order))
-
-    render json: { path: redirect_url }, status: :ok
-    true
-  end
-
-  def selected_payment_method
-    @selected_payment_method ||= Spree::PaymentMethod.find(
-      params.dig(:order, :payments_attributes, 0, :payment_method_id)
-    )
-  end
-
-  def update_response
-    if order_complete?
-      processing_succeeded
-      update_succeeded_response
-    else
-      action_failed(RuntimeError.new("Order not complete after the checkout workflow"))
-    end
-  end
-
-  def order_complete?
-    @order.state == "complete" || @order.completed?
-  end
-
-  def update_succeeded_response
-    respond_to do |format|
-      format.html do
-        respond_with(@order, location: order_completion_route)
-      end
-      format.json do
-        render json: { path: order_completion_route }, status: :ok
-      end
-    end
-  end
-
-  def action_failed(error = RuntimeError.new(order_processing_error))
-    processing_failed(error)
-    action_failed_response
-  end
-
-  def action_failed_response
-    respond_to do |format|
-      format.html do
-        render :edit
-      end
-      format.json do
-        discard_flash_errors
-        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
-      end
-    end
-  end
-
-  def permitted_params
-    PermittedAttributes::Checkout.new(params).call
-  end
-
-  def discard_flash_errors
-    # Marks flash errors for deletion after the current action has completed.
-    # This ensures flash errors generated during XHR requests are not persisted in the
-    # session for longer than expected.
-    flash.discard(:error)
-  end
-end

app/controllers/concerns/order_stock_check.rb

@@ -13,8 +13,6 @@ module OrderStockCheck
   def handle_insufficient_stock
     return if sufficient_stock?
 
-    reset_order_to_cart
-
     flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
     redirect_to main_app.cart_path
   end
@@ -43,10 +41,4 @@ module OrderStockCheck
   def sufficient_stock?
     @sufficient_stock ||= @order.insufficient_stock_lines.blank?
   end
-
-  def reset_order_to_cart
-    return if OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, spree_current_user
-
-    OrderCheckoutRestart.new(@order).call
-  end
 end

app/controllers/enterprises_controller.rb

@@ -4,7 +4,6 @@ require 'open_food_network/enterprise_injection_data'
 
 class EnterprisesController < BaseController
   layout "darkswarm"
-  helper Spree::ProductsHelper
   include OrderCyclesHelper
   include SerializerHelper
   include WhiteLabel

app/controllers/payment_gateways/paypal_controller.rb

@@ -29,11 +29,11 @@ module PaymentGateways
           flash[:error] =
             Spree.t('flash.generic_error', scope: 'paypal',
                                            reasons: pp_response.errors.map(&:long_message).join(" "))
-          redirect_to main_app.checkout_state_path(:payment)
+          redirect_to main_app.checkout_step_path(:payment)
         end
       rescue SocketError
         flash[:error] = Spree.t('flash.connection_failed', scope: 'paypal')
-        redirect_to main_app.checkout_state_path(:payment)
+        redirect_to main_app.checkout_step_path(:payment)
       end
     end
 

app/controllers/split_checkout_controller.rb

@@ -172,7 +172,7 @@ class SplitCheckoutController < ::BaseController
 
     @order.select_shipping_method(params[:shipping_method_id])
     @order.update(order_params)
-    @order.updater.update_totals_and_states
+    @order.update_totals_and_states
 
     validate_current_step!
 

app/controllers/spree/admin/adjustments_controller.rb

@@ -14,7 +14,7 @@ module Spree
 
       def update_order
         @order.reload
-        @order.updater.update_totals_and_states
+        @order.update_totals_and_states
       end
 
       def collection

app/controllers/spree/admin/images_controller.rb

@@ -25,6 +25,7 @@ module Spree
         set_viewable
 
         @object.attributes = permitted_resource_params
+
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
           redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
@@ -62,20 +63,28 @@ module Spree
 
       private
 
+      def collection
+        parent.image
+      end
+
+      def find_resource
+        parent.image
+      end
+
+      def build_resource
+        Spree::Image.new(viewable: parent)
+      end
+
       def location_after_save
         spree.admin_product_images_url(@product)
       end
 
       def load_data
         @product = Product.find_by(permalink: params[:product_id])
-        @variants = @product.variants.collect do |variant|
-          [variant.options_text, variant.id]
-        end
-        @variants.insert(0, [Spree.t(:all), @product.master.id])
       end
 
       def set_viewable
-        @image.viewable_type = 'Spree::Variant'
+        @image.viewable_type = 'Spree::Product'
         @image.viewable_id = params[:image][:viewable_id]
       end
 

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

@@ -58,7 +58,7 @@ module Spree
           @order.create_tax_charge!
           Spree::TaxRate.adjust(@order, @order.adjustments.admin)
 
-          @order.updater.update_totals_and_states
+          @order.update_totals_and_states
         end
 
         def order_params

app/controllers/spree/admin/orders_controller.rb

@@ -8,56 +8,50 @@ module Spree
       include OpenFoodNetwork::SpreeApiKeyLoader
       helper CheckoutHelper
 
-      before_action :load_order, only: [:edit, :update, :fire, :resend,
-                                        :invoice, :print, :distribution]
-      before_action :load_distribution_choices, only: [:new, :edit, :update, :distribution]
-
+      before_action :load_order, only: [:edit, :update, :fire, :resend, :invoice, :print]
+      before_action :load_distribution_choices, only: [:new, :create, :edit, :update]
       before_action :require_distributor_abn, only: :invoice
+      before_action :restore_saved_query!, only: :index
 
       respond_to :html, :json
 
-      def new
-        @order = Order.create
-        @order.created_by = spree_current_user
-        @order.generate_order_number
-        @order.save
-        redirect_to spree.distribution_admin_order_path(@order)
+      def index
+        orders = SearchOrders.new(search_params, spree_current_user).orders
+        @pagy, @orders = pagy(orders, items: params[:per_page] || 15)
+
+        update_search_results if searching?
       end
 
-      def distribution
-        return if order_params.blank?
-
-        on_update
-
-        @order.assign_attributes(order_params)
-        return unless @order.save(context: :set_distribution_step)
-
-        redirect_to spree.admin_order_customer_path(@order)
+      def new
+        @order = Spree::Order.new
       end
 
       def edit
         @order.shipments.map(&:refresh_rates)
+      end
 
-        OrderWorkflow.new(@order).advance_to_payment
-        @order.errors.clear
+      def create
+        @order = Spree::Order.new(order_params.merge(created_by: spree_current_user))
+
+        if @order.save(context: :require_distribution)
+          redirect_to spree.admin_order_customer_path(@order)
+        else
+          render :new
+        end
       end
 
       def update
         on_update
 
-        if params[:set_distribution_step] && @order.update(order_params)
-          return redirect_to spree.admin_order_customer_path(@order)
-        end
-
-        unless order_params.present? && @order.update(order_params) && @order.line_items.present?
-          if @order.line_items.empty? && !params[:suppress_error_msg]
-            @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
-          end
+        order_updated = order_params.present? && @order.update(order_params)
 
+        unless order_updated && line_items_present?
           flash[:error] = @order.errors.full_messages.join(', ') if @order.errors.present?
           return redirect_to spree.edit_admin_order_path(@order)
         end
 
+        OrderWorkflow.new(@order).advance_to_payment
+
         if @order.complete?
           redirect_to spree.edit_admin_order_path(@order)
         else
@@ -110,6 +104,43 @@ module Spree
 
       private
 
+      def line_items_present?
+        return true if @order.line_items.any?
+
+        @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
+        false
+      end
+
+      def update_search_results
+        session[:admin_orders_search] = search_params
+
+        render cable_ready: cable_car.inner_html(
+          "#orders-index",
+          partial("spree/admin/orders/table", locals: { pagy: @pagy, orders: @orders })
+        )
+      end
+
+      def searching?
+        params[:q].present? && request.format.symbol == :cable_ready
+      end
+
+      def search_params
+        default_filters.deep_merge(
+          params.permit(:page, :per_page, :shipping_method_id, q: {})
+        ).to_h.with_indifferent_access
+      end
+
+      def default_filters
+        { q: { completed_at_not_null: 1, s: "completed_at desc" } }
+      end
+
+      def restore_saved_query!
+        return unless request.format.html?
+
+        @_params = ActionController::Parameters.new(session[:admin_orders_search] || {})
+        @stored_query = search_params.to_query
+      end
+
       def on_update
         @order.recreate_all_fees!
 

app/controllers/spree/admin/payments_controller.rb

@@ -129,7 +129,8 @@ module Spree
                             @payment_methods.first
                           end
 
-        @previous_cards = @order.credit_cards.with_payment_profile
+        credit_card_ids = @order.payments.from_credit_card.pluck(:source_id).uniq
+        @previous_cards = CreditCard.where(id: credit_card_ids).with_payment_profile
       end
 
       # At this point admin should have passed through Customer Details step

app/controllers/spree/admin/products_controller.rb

@@ -7,7 +7,6 @@ require 'open_food_network/permissions'
 module Spree
   module Admin
     class ProductsController < ::Admin::ResourceController
-      helper 'spree/products'
       include OpenFoodNetwork::SpreeApiKeyLoader
       include OrderCyclesHelper
       include EnterprisesHelper
@@ -23,10 +22,6 @@ module Spree
 
       def create
         delete_stock_params_and_set_after do
-          if params[:product][:prototype_id].present?
-            @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-          end
-
           @object.attributes = permitted_resource_params
           if @object.save
             flash[:success] = flash_message_for(@object, :successfully_created)
@@ -117,7 +112,6 @@ module Spree
 
       def load_data
         @taxons = Taxon.order(:name)
-        @option_types = OptionType.order(:name)
         @tax_categories = TaxCategory.order(:name)
         @shipping_categories = ShippingCategory.order(:name)
       end
@@ -127,8 +121,7 @@ module Spree
       end
 
       def product_includes
-        [{ variants: [:images, { option_values: :option_type }] },
-         { master: [:images, :default_price] }]
+        [:image, { variants: [:images] }]
       end
 
       def collection_actions
@@ -188,7 +181,6 @@ module Spree
           joins(:product).
           where('spree_products.supplier_id IN (?)', editable_enterprises.collect(&:id)).
           where('spree_variants.import_date IS NOT NULL').
-          where(spree_variants: { is_master: false }).
           where(spree_variants: { deleted_at: nil }).
           order('spree_variants.import_date DESC')
       end
@@ -214,7 +206,7 @@ module Spree
       end
 
       def set_stock_levels(product, on_hand, on_demand)
-        variant = product_variant(product)
+        variant = product.variants.first
 
         begin
           variant.on_demand = on_demand if on_demand.present?
@@ -234,14 +226,6 @@ module Spree
         end
       end
 
-      def product_variant(product)
-        if product.variants.any?
-          product.variants.first
-        else
-          product.master
-        end
-      end
-
       def set_product_master_variant_price_to_zero
         @product.price = 0 if @product.price.nil?
       end

app/controllers/spree/admin/variants_controller.rb

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

app/controllers/spree/orders_controller.rb

@@ -10,7 +10,7 @@ module Spree
     layout 'darkswarm'
 
     rescue_from ActiveRecord::RecordNotFound, with: :render_404
-    helper 'spree/products', 'spree/orders'
+    helper 'spree/orders'
 
     respond_to :html, :json
 
@@ -78,7 +78,7 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next_transition.run_callbacks if @order.cart?
-              redirect_to main_app.checkout_state_path(@order.checkout_steps.first)
+              redirect_to main_app.checkout_step_path(@order.checkout_steps.first)
             elsif @order.complete?
               redirect_to main_app.order_path(@order)
             else

app/helpers/angular_form_builder.rb

@@ -34,7 +34,13 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     options.reverse_merge!('id' => angular_id(method), 'ng-model' => angular_model(method).to_s)
 
     @template.select_tag angular_name(method),
-                         @template.ng_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
+                         @template.ng_options_from_collection_for_select(
+                           collection,
+                           value_method,
+                           text_method,
+                           angular_field
+                         ),
+                         options
   end
 
   private

app/helpers/injection_helper.rb

@@ -89,16 +89,6 @@ module InjectionHelper
     render partial: "json/injection_ams", locals: { name: "orderCycleData", json: json }
   end
 
-  def inject_available_shipping_methods
-    inject_json_array "shippingMethods", available_shipping_methods,
-                      Api::ShippingMethodSerializer, current_order: current_order
-  end
-
-  def inject_available_payment_methods
-    inject_json_array "paymentMethods", available_payment_methods,
-                      Api::PaymentMethodSerializer, current_order: current_order
-  end
-
   def inject_taxons
     inject_json_array "taxons", Spree::Taxon.all.to_a, Api::TaxonSerializer
   end

app/helpers/order_cycles_helper.rb

@@ -53,7 +53,8 @@ module OrderCyclesHelper
   end
 
   def simple_index
-    @simple_index ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
+    @simple_index ||=
+      !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
   end
 
   def pickup_time(order_cycle = current_order_cycle)
@@ -73,7 +74,8 @@ module OrderCyclesHelper
   def validated_enterprise_options(enterprises, options = {})
     enterprises.map do |e|
       disabled_message = nil
-      if options[:shipping_and_payment_methods] && (e.shipping_methods.empty? || e.payment_methods.available.empty?)
+      if options[:shipping_and_payment_methods] &&
+         (e.shipping_methods.empty? || e.payment_methods.available.empty?)
         if e.shipping_methods.empty? && e.payment_methods.available.empty?
           disabled_message = I18n.t(:no_shipping_or_payment)
         elsif e.shipping_methods.empty?

app/helpers/shop_helper.rb

@@ -19,15 +19,27 @@ module ShopHelper
 
   def shop_tabs
     [
-      { name: 'home', title: t(:shopping_tabs_home), show: show_home_tab? },
-      { name: 'shop', title: t(:shopping_tabs_shop), show: !require_customer? },
+      { name: 'home', title: t(:shopping_tabs_home), show: show_home_tab?,
+        default: show_home_tab? },
+      { name: 'shop', title: t(:shopping_tabs_shop), show: !require_customer?,
+        default: !show_home_tab? },
       { name: 'about', title: t(:shopping_tabs_about), show: true },
       { name: 'producers', title: t(:shopping_tabs_producers), show: true },
       { name: 'contact', title: t(:shopping_tabs_contact), show: true },
-      { name: 'groups', title: t(:shopping_tabs_groups), show: current_distributor.groups.any? },
+      { name: 'groups', title: t(:shopping_tabs_groups), show: show_groups_tabs? },
+      custom_tab,
     ].select{ |tab| tab[:show] }
   end
 
+  def custom_tab
+    {
+      name: "custom_#{current_distributor.custom_tab&.title&.parameterize}",
+      title: current_distributor.custom_tab&.title,
+      show: current_distributor.custom_tab.present?,
+      custom: true,
+    }
+  end
+
   def shop_tab_names
     shop_tabs.map { |tab| tab[:name] }
   end
@@ -52,4 +64,10 @@ module ShopHelper
 
     true
   end
+
+  private
+
+  def show_groups_tabs?
+    !current_distributor.hide_groups_tab? && current_distributor.groups.any?
+  end
 end

app/helpers/spree/admin/images_helper.rb

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

app/helpers/spree/admin/navigation_helper.rb

@@ -26,11 +26,11 @@ module Spree
         destination_url = options[:url] || spree.public_send("#{options[:route]}_path")
         titleized_label = Spree.t(options[:label],
                                   default: options[:label],
-                                  scope: [:admin, :tab]).titleize
+                                  scope: [:admin, :tab]).capitalize
 
         css_classes = []
 
-        if options[:icon]
+        if options[:icon] && !feature?(:admin_style_v3, spree_current_user)
           link = link_to_with_icon(options[:icon], titleized_label, destination_url)
           css_classes << 'tab-with-icon'
         else

app/helpers/spree/admin/orders_helper.rb

@@ -62,7 +62,6 @@ module Spree
         { name: t(:resend_confirmation),
           url: spree.resend_admin_order_path(@order),
           icon: 'icon-email',
-          method: 'post',
           confirm: t(:confirm_resend_order_confirmation) }
       end
 

app/helpers/spree/orders_helper.rb

@@ -18,7 +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/products_helper.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module ProductsHelper
-    def product_has_variant_unit_option_type?(product)
-      product.option_types.any? { |option_type| variant_unit_option_type? option_type }
-    end
-
-    def variant_unit_option_type?(option_type)
-      Spree::Product.all_variant_unit_option_types.include? option_type
-    end
-  end
-end

app/helpers/terms_and_conditions_helper.rb

@@ -6,16 +6,6 @@ module TermsAndConditionsHelper
                                                                    rel: "noopener")
   end
 
-  def render_terms_and_conditions
-    if platform_terms_required? && distributor_terms_required?
-      render("checkout/all_terms_and_conditions")
-    elsif platform_terms_required?
-      render "checkout/platform_terms_of_service"
-    elsif distributor_terms_required?
-      render "checkout/terms_and_conditions"
-    end
-  end
-
   def any_terms_required?(distributor)
     TermsOfService.required?(distributor)
   end

app/jobs/bulk_invoice_job.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 class BulkInvoiceJob < ApplicationJob
-  def perform(order_ids, filepath)
+  include CableReady::Broadcaster
+  delegate :render, to: ActionController::Base
+
+  def perform(order_ids, filepath, options = {})
     pdf = CombinePDF.new
 
     sorted_orders(order_ids).each do |order|
@@ -10,7 +13,11 @@ class BulkInvoiceJob < ApplicationJob
       pdf << CombinePDF.parse(invoice)
     end
 
+    ensure_directory_exists filepath
+
     pdf.save filepath
+
+    broadcast(filepath, options[:channel]) if options[:channel]
   end
 
   private
@@ -18,10 +25,26 @@ class BulkInvoiceJob < ApplicationJob
   # Ensures the records are returned in the same order the ids were originally given in
   def sorted_orders(order_ids)
     orders_by_id = Spree::Order.where(id: order_ids).to_a.index_by(&:id)
-    order_ids.map { |id| orders_by_id[id] }
+    order_ids.map { |id| orders_by_id[id.to_i] }
   end
 
   def renderer
     @renderer ||= InvoiceRenderer.new
   end
+
+  def broadcast(filepath, channel)
+    file_id = filepath.split("/").last.split(".").first
+
+    cable_ready[channel].
+      inner_html(
+        selector: "#bulk_invoices_modal .modal-content",
+        html: render(partial: "spree/admin/orders/bulk/invoice_link",
+                     locals: { invoice_url: "/admin/orders/invoices/#{file_id}" })
+      ).
+      broadcast
+  end
+
+  def ensure_directory_exists(filepath)
+    FileUtils.mkdir_p(File.dirname(filepath))
+  end
 end

app/mailers/producer_mailer.rb

@@ -60,7 +60,7 @@ class ProducerMailer < ApplicationMailer
 
   def line_items_from(order_cycle, producer)
     @line_items ||= Spree::LineItem.
-      includes(:option_values, variant: [:product, { option_values: :option_type }]).
+      includes(variant: [:product]).
       from_order_cycle(order_cycle).
       sorted_by_name_and_unit_value.
       merge(Spree::Product.with_deleted.in_supplier(producer)).

app/mailers/spree/order_mailer.rb

@@ -28,6 +28,7 @@ module Spree
 
     def confirm_email_for_customer(order_or_order_id, resend = false)
       @order = find_order(order_or_order_id)
+      @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
       I18n.with_locale valid_locale(@order.user) do
         subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
         mail(to: @order.email,

app/mailers/subscription_mailer.rb

@@ -11,6 +11,7 @@ class SubscriptionMailer < ApplicationMailer
   def confirmation_email(order)
     @type = 'confirmation'
     @order = order
+    @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
     send_mail(order)
   end
 

app/models/adjustment_metadata.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AdjustmentMetadata < ApplicationRecord
+  self.belongs_to_required_by_default = true
+
   belongs_to :adjustment, class_name: 'Spree::Adjustment'
   belongs_to :enterprise
 end

app/models/application_record.rb

@@ -10,4 +10,12 @@ class ApplicationRecord < ActiveRecord::Base
   include ArelHelpers::JoinAssociation
 
   self.abstract_class = true
+
+  def self.image_service
+    ENV["S3_BUCKET"].present? ? :amazon_public : :local
+  end
+
+  def url_for(*args)
+    Rails.application.routes.url_helpers.url_for(*args)
+  end
 end

app/models/column_preference.rb

@@ -5,6 +5,8 @@ require 'open_food_network/column_preference_defaults'
 class ColumnPreference < ApplicationRecord
   extend OpenFoodNetwork::ColumnPreferenceDefaults
 
+  self.belongs_to_required_by_default = true
+
   # Non-persisted attributes that only have one
   # setting (ie. the default) for a given column
   attr_accessor :name
@@ -48,6 +50,8 @@ class ColumnPreference < ApplicationRecord
   def self.filter(default_preferences, user, action_name)
     return unless action_name == 'order_cycles_index'
 
-    default_preferences.delete(:schedules) unless user.admin? || user.enterprises.where(enable_subscriptions: true).any?
+    return if user.admin? || user.enterprises.where(enable_subscriptions: true).any?
+
+    default_preferences.delete(:schedules)
   end
 end

app/models/concerns/order_validations.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module OrderValidations
+  extend ActiveSupport::Concern
+
+  private
+
+  def disallow_guest_order
+    return unless using_guest_checkout? && registered_email?
+
+    errors.add(:email, I18n.t('devise.failure.already_registered'))
+  end
+
+  # Check that line_items in the current order are available from a newly selected distribution
+  def products_available_from_new_distribution
+    return if OrderCycleDistributedVariants.new(order_cycle, distributor)
+      .distributes_order_variants?(self)
+
+    errors.add(:base, I18n.t(:spree_order_availability_error))
+  end
+
+  # Determine if email is required (we don't want validation errors before we hit the checkout)
+  def require_email
+    true unless (new_record? || cart?) && !checkout_processing
+  end
+
+  def ensure_line_items_present
+    return if line_items.present?
+
+    errors.add(:base, Spree.t(:there_are_no_items_for_this_order))
+    false
+  end
+
+  def ensure_available_shipping_rates
+    return unless shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
+
+    errors.add(:base, Spree.t(:items_cannot_be_shipped))
+    false
+  end
+end

app/models/coordinator_fee.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CoordinatorFee < ApplicationRecord
+  self.belongs_to_required_by_default = true
+
   belongs_to :order_cycle
   belongs_to :enterprise_fee
 end

app/models/custom_tab.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: false
+
+class CustomTab < ApplicationRecord
+  belongs_to :enterprise, optional: false
+
+  validates :title, presence: true, length: { maximum: 20 }
+end

app/models/customer.rb

@@ -10,20 +10,22 @@
 class Customer < ApplicationRecord
   include SetUnusedAddressFields
 
+  self.belongs_to_required_by_default = true
+
   acts_as_taggable
 
   searchable_attributes :first_name, :last_name, :email, :code
 
-  belongs_to :enterprise, optional: false
-  belongs_to :user, class_name: "Spree::User"
+  belongs_to :enterprise
+  belongs_to :user, class_name: "Spree::User", optional: true
   has_many :orders, class_name: "Spree::Order"
   before_destroy :update_orders_and_delete_canceled_subscriptions
 
-  belongs_to :bill_address, class_name: "Spree::Address"
+  belongs_to :bill_address, class_name: "Spree::Address", optional: true
   alias_attribute :billing_address, :bill_address
   accepts_nested_attributes_for :bill_address
 
-  belongs_to :ship_address, class_name: "Spree::Address"
+  belongs_to :ship_address, class_name: "Spree::Address", optional: true
   alias_attribute :shipping_address, :ship_address
   accepts_nested_attributes_for :ship_address
 

app/models/distributor_payment_method.rb

@@ -2,6 +2,8 @@
 
 class DistributorPaymentMethod < ApplicationRecord
   self.table_name = "distributors_payment_methods"
+  self.belongs_to_required_by_default = true
+
   belongs_to :payment_method, class_name: "Spree::PaymentMethod", touch: true
   belongs_to :distributor, class_name: "Enterprise", touch: true
 end

app/models/distributor_shipping_method.rb

@@ -2,6 +2,8 @@
 
 class DistributorShippingMethod < ApplicationRecord
   self.table_name = "distributors_shipping_methods"
+  self.belongs_to_required_by_default = true
+
   belongs_to :shipping_method, class_name: "Spree::ShippingMethod", touch: true
   belongs_to :distributor, class_name: "Enterprise", touch: true
 end

app/models/enterprise.rb

@@ -5,20 +5,9 @@ class Enterprise < ApplicationRecord
   ENTERPRISE_SEARCH_RADIUS = 100
   # The next Rails version will have named variants but we need to store them
   # ourselves for now.
-  LOGO_SIZES = {
-    thumb: { gravity: "Center", resize: "100x100^", crop: '100x100+0+0' },
-    small: { gravity: "Center", resize: "180x180^", crop: '180x180+0+0' },
-    medium: { gravity: "Center", resize: "300x300^", crop: '300x300+0+0' },
-  }.freeze
-  PROMO_IMAGE_SIZES = {
-    thumb: { resize_to_limit: [100, 100] },
-    medium: { resize_to_fill: [720, 156] },
-    large: { resize_to_fill: [1200, 260] },
-  }.freeze
-  WHITE_LABEL_LOGO_SIZES = {
-    default: { gravity: "Center", resize_to_fill: [217, 44] },
-    mobile: { gravity: "Center", resize_to_fill: [75, 26] },
-  }.freeze
+  LOGO_SIZES = [:thumb, :small, :medium].freeze
+  PROMO_IMAGE_SIZES = [:thumb, :medium, :large].freeze
+  WHITE_LABEL_LOGO_SIZES = [:default, :mobile].freeze
   VALID_INSTAGRAM_REGEX = %r{\A[a-zA-Z0-9._]{1,30}([^/-]*)\z}
 
   searchable_attributes :sells, :is_primary_producer, :name
@@ -61,8 +50,10 @@ class Enterprise < ApplicationRecord
   has_many :users, through: :enterprise_roles
   belongs_to :owner, class_name: 'Spree::User',
                      inverse_of: :owned_enterprises
-  has_many :distributor_payment_methods, foreign_key: :distributor_id
-  has_many :distributor_shipping_methods, foreign_key: :distributor_id
+  has_many :distributor_payment_methods,
+    inverse_of: :distributor, foreign_key: :distributor_id
+  has_many :distributor_shipping_methods,
+    inverse_of: :distributor, foreign_key: :distributor_id
   has_many :payment_methods, through: :distributor_payment_methods
   has_many :shipping_methods, through: :distributor_shipping_methods
   has_many :customers
@@ -70,6 +61,7 @@ class Enterprise < ApplicationRecord
   has_many :tag_rules
   has_one :stripe_account, dependent: :destroy
   has_many :vouchers
+  has_one :custom_tab, dependent: :destroy
 
   delegate :latitude, :longitude, :city, :state_name, to: :address
 
@@ -84,11 +76,23 @@ class Enterprise < ApplicationRecord
                                             reject_if: lambda { |tag_rule|
                                               tag_rule[:preferred_customer_tags].blank?
                                             }
+  accepts_nested_attributes_for :custom_tab
 
-  has_one_attached :logo
-  has_one_attached :promo_image
   has_one_attached :terms_and_conditions
-  has_one_attached :white_label_logo
+  has_one_attached :logo, service: image_service do |attachment|
+    attachment.variant :thumb, resize_to_fill: [100, 100], crop: [0, 0, 100, 100]
+    attachment.variant :small, resize_to_fill: [180, 180], crop: [0, 0, 180, 180]
+    attachment.variant :medium, resize_to_fill: [300, 300], crop: [0, 0, 300, 300]
+  end
+  has_one_attached :promo_image, service: image_service do |attachment|
+    attachment.variant :thumb, resize_to_limit: [100, 100]
+    attachment.variant :medium, resize_to_fill: [720, 156]
+    attachment.variant :large, resize_to_fill: [1200, 260]
+  end
+  has_one_attached :white_label_logo, service: image_service do |attachment|
+    attachment.variant :default, resize_to_fill: [217, 44]
+    attachment.variant :mobile,  resize_to_fill: [75, 26]
+  end
 
   validates :logo,
             processable_image: true,
@@ -115,6 +119,7 @@ class Enterprise < ApplicationRecord
       with: VALID_INSTAGRAM_REGEX,
       message: Spree.t('errors.messages.invalid_instagram_url')
     }, allow_blank: true
+  validate :validate_white_label_logo_link
 
   before_validation :initialize_permalink, if: lambda { permalink.nil? }
   before_validation :set_unused_address_fields
@@ -155,7 +160,7 @@ class Enterprise < ApplicationRecord
   scope :is_distributor, -> { where('sells != ?', 'none') }
   scope :is_hub, -> { where(sells: 'any') }
   scope :supplying_variant_in, lambda { |variants|
-    joins(supplied_products: :variants_including_master).
+    joins(supplied_products: :variants).
       where('spree_variants.id IN (?)', variants).
       select('DISTINCT enterprises.*')
   }
@@ -292,27 +297,15 @@ class Enterprise < ApplicationRecord
   end
 
   def logo_url(name)
-    return unless logo.variable?
-
-    Rails.application.routes.url_helpers.url_for(
-      logo.variant(LOGO_SIZES[name])
-    )
+    image_url_for(logo, name)
   end
 
   def promo_image_url(name)
-    return unless promo_image.variable?
-
-    Rails.application.routes.url_helpers.url_for(
-      promo_image.variant(PROMO_IMAGE_SIZES[name])
-    )
+    image_url_for(promo_image, name)
   end
 
   def white_label_logo_url(name = :default)
-    return unless white_label_logo.variable?
-
-    Rails.application.routes.url_helpers.url_for(
-      white_label_logo.variant(WHITE_LABEL_LOGO_SIZES[name])
-    )
+    image_url_for(white_label_logo, name)
   end
 
   def website
@@ -396,7 +389,7 @@ class Enterprise < ApplicationRecord
   def current_distributed_taxons
     Spree::Taxon
       .select("DISTINCT spree_taxons.*")
-      .joins(products: :variants_including_master)
+      .joins(products: :variants)
       .joins("INNER JOIN (#{current_exchange_variants.to_sql}) \
         AS exchange_variants ON spree_variants.id = exchange_variants.variant_id")
   end
@@ -452,6 +445,29 @@ class Enterprise < ApplicationRecord
 
   private
 
+  def validate_white_label_logo_link
+    return if white_label_logo.blank?
+
+    return if white_label_logo_link.blank?
+
+    white_label_logo_link.strip!
+    uri = URI(white_label_logo_link)
+    self.white_label_logo_link = "http://#{white_label_logo_link}" if uri.scheme.nil?
+  rescue URI::InvalidURIError
+    errors.add(:white_label_logo_link, I18n.t(:invalid_url))
+  end
+
+  def image_url_for(image, name)
+    return unless image.variable?
+    return image.variant(name).processed.url if image.attachment.service.name == :amazon_public
+
+    url_for(image.variant(name))
+  rescue ActiveStorage::Error => e
+    Rails.logger.error(e.message)
+
+    nil
+  end
+
   def current_exchange_variants
     ExchangeVariant.joins(exchange: :order_cycle)
       .merge(Exchange.outgoing)

app/models/enterprise_group.rb

@@ -25,8 +25,8 @@ class EnterpriseGroup < ApplicationRecord
 
   delegate :phone, :address1, :address2, :city, :zipcode, :state, :country, to: :address
 
-  has_one_attached :logo
-  has_one_attached :promo_image
+  has_one_attached :logo, service: image_service
+  has_one_attached :promo_image, service: image_service
 
   validates :logo,
             processable_image: true,

app/models/exchange.rb

@@ -16,7 +16,7 @@ class Exchange < ApplicationRecord
   belongs_to :sender, class_name: 'Enterprise'
   belongs_to :receiver, class_name: 'Enterprise'
 
-  has_many :exchange_variants, dependent: :destroy
+  has_many :exchange_variants, dependent: :delete_all
   has_many :variants, through: :exchange_variants
 
   has_many :exchange_fees, dependent: :destroy
@@ -25,6 +25,8 @@ class Exchange < ApplicationRecord
   validates :order_cycle, :sender, :receiver, presence: true
   validates :sender_id, uniqueness: { scope: [:order_cycle_id, :receiver_id, :incoming] }
 
+  before_destroy :delete_related_exchange_variants, prepend: true
+
   after_save :touch_receiver
 
   accepts_nested_attributes_for :variants
@@ -53,7 +55,7 @@ class Exchange < ApplicationRecord
   }
   scope :with_product, lambda { |product|
     joins(:exchange_variants).
-      where('exchange_variants.variant_id IN (?)', product.variants_including_master.select(&:id))
+      where('exchange_variants.variant_id IN (?)', product.variants.select(&:id))
   }
   scope :by_enterprise_name, -> {
     joins('INNER JOIN enterprises AS sender   ON (sender.id   = exchanges.sender_id)').
@@ -118,4 +120,13 @@ class Exchange < ApplicationRecord
       variant_ids.map{ |variant_id| { variant_id: variant_id, exchange_id: exchange_id } }
     )
   end
+
+  def delete_related_exchange_variants
+    return unless incoming?
+
+    ExchangeVariant.where(variant_id: variant_ids).
+      joins(:exchange).
+      where(exchanges: { order_cycle: order_cycle, incoming: false }).
+      delete_all
+  end
 end

app/models/exchange_variant.rb

@@ -3,9 +3,15 @@
 class ExchangeVariant < ApplicationRecord
   belongs_to :exchange
   belongs_to :variant, class_name: 'Spree::Variant'
-  after_destroy :destroy_related_outgoing_variants
 
-  def destroy_related_outgoing_variants
-    VariantDeleter.new.destroy_related_outgoing_variants(variant_id, exchange.order_cycle)
+  after_destroy :delete_related_outgoing_variants
+
+  def delete_related_outgoing_variants
+    return unless exchange.incoming?
+
+    ExchangeVariant.where(variant_id: variant_id).
+      joins(:exchange).
+      where(exchanges: { order_cycle: exchange.order_cycle, incoming: false }).
+      delete_all
   end
 end

app/models/product_import/entry_processor.rb

@@ -55,7 +55,6 @@ module ProductImport
             VariantOverride.for_hubs([enterprise_id]).count
           else
             Spree::Variant.
-              not_master.
               joins(:product).
               where('spree_products.supplier_id IN (?)', enterprise_id).
               count
@@ -90,7 +89,8 @@ module ProductImport
     end
 
     def total_saved_count
-      @products_created + @variants_created + @variants_updated + @inventory_created + @inventory_updated
+      [@products_created, @variants_created, @variants_updated,
+       @inventory_created, @inventory_updated].sum
     end
 
     def permission_by_id?(enterprise_id)

app/models/product_import/entry_validator.rb

@@ -167,7 +167,7 @@ module ProductImport
     def unit_fields_validation(entry)
       unit_types = ['g', 'oz', 'lb', 'kg', 't', 'ml', 'l', 'kl', '']
 
-      unless entry.units&.present?
+      if entry.units.blank?
         mark_as_invalid(entry, attribute: 'units',
                                error: I18n.t('admin.product_import.model.blank'))
       end
@@ -180,7 +180,7 @@ module ProductImport
       return if import_into_inventory?
 
       # unit_type must be valid type
-      if entry.unit_type&.present?
+      if entry.unit_type.present?
         unit_type = entry.unit_type.to_s.strip.downcase
         unless unit_types.include?(unit_type)
           mark_as_invalid(entry, attribute: 'unit_type',
@@ -190,7 +190,7 @@ module ProductImport
       end
 
       # variant_unit_name must be present if unit_type not present
-      return if entry.variant_unit_name&.present?
+      return if entry.variant_unit_name.present?
 
       mark_as_invalid(entry, attribute: 'variant_unit_name',
                              error: I18n.t('admin.product_import.model.conditional_blank'))

app/models/product_import/product_importer.rb

@@ -233,6 +233,8 @@ module ProductImport
     def rows
       return [] unless @sheet&.last_row
 
+      @sheet.parse(clean: true)
+
       (2..@sheet.last_row).map do |i|
         @sheet.row(i)
       end

app/models/spree/ability.rb

@@ -22,8 +22,6 @@ module Spree
         can :manage, :all
       else
         can [:index, :read], Country
-        can [:index, :read], OptionType
-        can [:index, :read], OptionValue
         can :create, Order
         can :read, Order do |order, token|
           order.user == user || order.token && token == order.token

app/models/spree/image.rb

@@ -2,14 +2,12 @@
 
 module Spree
   class Image < Asset
-    SIZES = {
-      mini: { resize_to_fill: [48, 48] },
-      small: { resize_to_fill: [227, 227] },
-      product: { resize_to_limit: [240, 240] },
-      large: { resize_to_limit: [600, 600] },
-    }.freeze
-
-    has_one_attached :attachment
+    has_one_attached :attachment, service: image_service do |attachment|
+      attachment.variant :mini, resize_to_fill: [48, 48]
+      attachment.variant :small, resize_to_fill: [227, 227]
+      attachment.variant :product, resize_to_limit: [240, 240]
+      attachment.variant :large, resize_to_limit: [600, 600]
+    end
 
     validates :attachment,
               attached: true,
@@ -17,20 +15,33 @@ module Spree
               content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
     validate :no_attachment_errors
 
+    def self.default_image_url(size)
+      return "/noimage/product.png" unless size&.to_sym.in?([:mini, :small, :product, :large])
+
+      "/noimage/#{size}.png"
+    end
+
     def variant(name)
       if attachment.variable?
-        attachment.variant(SIZES[name])
+        attachment.variant(name)
       else
         attachment
       end
     end
 
     def url(size)
-      return unless attachment.attached?
+      return self.class.default_image_url(size) unless attachment.attached?
+      return variant(size).processed.url if attachment.service.name == :amazon_public
 
-      Rails.application.routes.url_helpers.url_for(variant(size))
+      url_for(variant(size))
+    rescue ActiveStorage::Error => e
+      Rails.logger.error(e.message)
+
+      self.class.default_image_url(size)
     end
 
+    private
+
     # if there are errors from the plugin, then add a more meaningful message
     def no_attachment_errors
       return if errors[:attachment].empty?

app/models/spree/line_item.rb

@@ -9,7 +9,7 @@ module Spree
     include LineItemStockChanges
 
     searchable_attributes :price, :quantity, :order_id, :variant_id, :tax_category_id
-    searchable_associations :order, :order_cycle, :variant, :product, :supplier, :tax_category, :option_values
+    searchable_associations :order, :order_cycle, :variant, :product, :supplier, :tax_category
     searchable_scopes :with_tax, :without_tax
 
     belongs_to :order, class_name: "Spree::Order", inverse_of: :line_items
@@ -22,9 +22,6 @@ module Spree
 
     has_many :adjustments, as: :adjustable, dependent: :destroy
 
-    has_and_belongs_to_many :option_values, join_table: 'spree_option_values_line_items',
-                                            class_name: 'Spree::OptionValue'
-
     before_validation :adjust_quantity
     before_validation :copy_price
     before_validation :copy_tax_category
@@ -42,12 +39,16 @@ module Spree
     before_save :update_inventory
     before_save :calculate_final_weight_volume, if: :quantity_changed?,
                                                 unless: :final_weight_volume_changed?
-    after_save :update_order
-    after_save :update_units
-    before_destroy :update_inventory_before_destroy
-    after_destroy :update_order
+    before_save :assign_units, if: ->(line_item) {
+      line_item.new_record? || line_item.final_weight_volume_changed?
+    }
 
-    delegate :product, :unit_description, :display_name, to: :variant
+    before_destroy :update_inventory_before_destroy
+
+    after_destroy :update_order
+    after_save :update_order
+
+    delegate :product, :variant_unit, :unit_description, :display_name, :display_as, to: :variant
 
     attr_accessor :skip_stock_check, :target_shipment # Allows manual skipping of Stock::AvailabilityValidator
 

app/models/spree/option_type.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class OptionType < ApplicationRecord
-    has_many :option_values, -> { order(:position) }, dependent: :destroy
-    has_many :product_option_types, dependent: :destroy
-    has_many :products, through: :product_option_types
-
-    validates :name, :presentation, presence: true
-    default_scope -> { order("#{table_name}.position") }
-
-    accepts_nested_attributes_for :option_values,
-                                  reject_if: lambda { |ov|
-                                    ov[:name].blank? || ov[:presentation].blank?
-                                  },
-                                  allow_destroy: true
-  end
-end

app/models/spree/option_value.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class OptionValue < ApplicationRecord
-    belongs_to :option_type
-    acts_as_list scope: :option_type
-    has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants',
-                                       class_name: "Spree::Variant"
-
-    validates :name, :presentation, presence: true
-  end
-end

app/models/spree/option_values_line_item.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class OptionValuesLineItem < ApplicationRecord
-    belongs_to :line_item, class_name: 'Spree::LineItem'
-    belongs_to :option_value, class_name: 'Spree::OptionValue'
-  end
-end

app/models/spree/order.rb

@@ -8,6 +8,7 @@ require 'open_food_network/tag_rule_applicator'
 module Spree
   class Order < ApplicationRecord
     include OrderShipment
+    include OrderValidations
     include Checkout
     include Balance
     include SetUnusedAddressFields
@@ -24,9 +25,7 @@ module Spree
         order.update_totals
         order.payment_required?
       }
-      go_to_state :confirmation, if: ->(order) {
-        OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, order.created_by
-      }
+      go_to_state :confirmation
       go_to_state :complete
     end
 
@@ -83,13 +82,13 @@ module Spree
     accepts_nested_attributes_for :shipments
 
     delegate :admin_and_handling_total, :payment_fee, :ship_total, to: :adjustments_fetcher
-    delegate :update_totals, to: :updater
+    delegate :update_totals, :update_totals_and_states, to: :updater
     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, on: :create
+    before_validation :generate_order_number, if: :new_record?
     before_validation :clone_billing_address, if: :use_billing?
     before_validation :ensure_customer
 
@@ -104,8 +103,9 @@ module Spree
     validates :email, presence: true,
                       format: /\A([\w.%+\-']+)@([\w\-]+\.)+(\w{2,})\z/i,
                       if: :require_email
-    validates :order_cycle, presence: true, on: :set_distribution_step
-    validates :distributor, presence: true, on: :set_distribution_step
+
+    validates :order_cycle, presence: true, on: :require_distribution
+    validates :distributor, presence: true, on: :require_distribution
 
     make_permalink field: :number
 
@@ -290,8 +290,9 @@ module Spree
                                                    created_by_id: created_by_id)
     end
 
-    # FIXME refactor this method and implement validation using validates_* utilities
     def generate_order_number
+      return if number.present?
+
       record = true
       while record
         random = "R#{Array.new(9){ rand(9) }.join}"
@@ -301,10 +302,6 @@ module Spree
       number
     end
 
-    def shipped_shipments
-      shipments.shipped
-    end
-
     def contains?(variant)
       find_line_item_by_variant(variant).present?
     end
@@ -320,8 +317,7 @@ module Spree
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
-      return if state.in?(["cart", "address", "delivery"]) &&
-        OpenFoodNetwork::FeatureToggle.enabled?(:split_checkout)
+      return if state.in?(["cart", "address", "delivery"])
 
       clear_legacy_taxes!
 
@@ -341,11 +337,6 @@ module Spree
       complete? || resumed? || awaiting_return? || returned?
     end
 
-    def credit_cards
-      credit_card_ids = payments.from_credit_card.pluck(:source_id).uniq
-      CreditCard.where(id: credit_card_ids)
-    end
-
     # Finalizes an in progress order after checkout is complete.
     # Called after transition to complete state when payments will have been processed
     def finalize!
@@ -374,13 +365,6 @@ module Spree
       )
     end
 
-    def deliver_order_confirmation_email
-      return if subscription.present?
-
-      Spree::OrderMailer.confirm_email_for_customer(id).deliver_later(wait: 10.seconds)
-      Spree::OrderMailer.confirm_email_for_shop(id).deliver_later(wait: 10.seconds)
-    end
-
     # Helper methods for checkout steps
     def paid?
       payment_state == 'paid' || payment_state == 'credit_owed'
@@ -442,19 +426,6 @@ module Spree
       restart_checkout_flow if state.in?(["payment", "confirmation"])
     end
 
-    def state_changed(name)
-      state = "#{name}_state"
-      return unless persisted?
-
-      old_state = __send__("#{state}_was")
-      state_changes.create(
-        previous_state: old_state,
-        next_state: __send__(state),
-        name: name,
-        user_id: user_id
-      )
-    end
-
     def shipped?
       %w(partial shipped).include?(shipment_state)
     end
@@ -508,24 +479,6 @@ module Spree
       end
     end
 
-    def refresh_shipment_rates
-      shipments.map(&:refresh_rates)
-    end
-
-    # Check that line_items in the current order are available from a newly selected distribution
-    def products_available_from_new_distribution
-      return if OrderCycleDistributedVariants.new(order_cycle, distributor)
-        .distributes_order_variants?(self)
-
-      errors.add(:base, I18n.t(:spree_order_availability_error))
-    end
-
-    def disallow_guest_order
-      return unless using_guest_checkout? && registered_email?
-
-      errors.add(:email, I18n.t('devise.failure.already_registered'))
-    end
-
     # After changing line items of a completed order
     def update_shipping_fees!
       shipments.each do |shipment|
@@ -587,10 +540,6 @@ module Spree
       save!
     end
 
-    def distribution_set?
-      distributor && order_cycle
-    end
-
     def shipping_tax
       shipment_adjustments.reload.tax.sum(:amount)
     end
@@ -627,6 +576,13 @@ module Spree
 
     private
 
+    def deliver_order_confirmation_email
+      return if subscription.present?
+
+      Spree::OrderMailer.confirm_email_for_customer(id).deliver_later(wait: 10.seconds)
+      Spree::OrderMailer.confirm_email_for_shop(id).deliver_later(wait: 10.seconds)
+    end
+
     def fee_handler
       @fee_handler ||= OrderFeesHandler.new(self)
     end
@@ -656,38 +612,6 @@ module Spree
       self.email = user.email if user
     end
 
-    # Determine if email is required (we don't want validation errors before we hit the checkout)
-    def require_email
-      return true unless (new_record? || cart?) && !checkout_processing
-    end
-
-    def ensure_line_items_present
-      return if line_items.present?
-
-      errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) && (return false)
-    end
-
-    def ensure_available_shipping_rates
-      return unless shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
-
-      errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
-    end
-
-    def after_cancel
-      shipments.each(&:cancel!)
-      payments.checkout.each(&:void!)
-
-      OrderMailer.cancel_email(id).deliver_later if send_cancellation_email
-      update(payment_state: updater.update_payment_state)
-    end
-
-    def after_resume
-      shipments.each(&:resume!)
-      payments.void.each(&:resume!)
-
-      update(payment_state: updater.update_payment_state)
-    end
-
     def use_billing?
       @use_billing == true || @use_billing == 'true' || @use_billing == '1'
     end
@@ -725,7 +649,7 @@ module Spree
       return if adjustment.finalized?
 
       adjustment.update_adjustment!(force: true)
-      updater.update_totals_and_states
+      update_totals_and_states
     end
   end
 end

app/models/spree/order/checkout.rb

@@ -75,9 +75,9 @@ module Spree
 
               before_transition to: :delivery, do: :create_proposed_shipments
               before_transition to: :delivery, do: :ensure_available_shipping_rates
-              before_transition to: :payment, do: :create_tax_charge!
               before_transition to: :confirmation, do: :validate_payment_method!
 
+              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
@@ -96,14 +96,6 @@ module Spree
             end
           end
 
-          def self.find_transition(options = {})
-            return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
-
-            next_event_transitions.detect do |transition|
-              transition[options[:from].to_sym] == options[:to].to_sym
-            end
-          end
-
           def self.next_event_transitions
             @next_event_transitions ||= []
           end
@@ -136,8 +128,36 @@ module Spree
             )
           end
 
+          def state_changed(name)
+            state = "#{name}_state"
+            return unless persisted?
+
+            old_state = __send__("#{state}_was")
+            state_changes.create(
+              previous_state: old_state,
+              next_state: __send__(state),
+              name: name,
+              user_id: user_id
+            )
+          end
+
           private
 
+          def after_cancel
+            shipments.each(&:cancel!)
+            payments.checkout.each(&:void!)
+
+            OrderMailer.cancel_email(id).deliver_later if send_cancellation_email
+            update(payment_state: updater.update_payment_state)
+          end
+
+          def after_resume
+            shipments.each(&:resume!)
+            payments.void.each(&:resume!)
+
+            update(payment_state: updater.update_payment_state)
+          end
+
           def validate_payment_method!
             return unless checkout_processing
             return if payments.any?

app/models/spree/payment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "spree/localized_number"
+
 module Spree
   class Payment < ApplicationRecord
     include Spree::Payment::Processing