Merge branch 'active-storage' into HEAD

Creating a seperate release off the master branch.
2026-02-28 01:53:25 +00:00 · 2022-06-08 12:05:56 +10:00
489 changed files with 6773 additions and 35961 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1,2 +1 @@
 defaults
-IE 11
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,7 @@
 # ENV vars for the development environment
 # Override locally with `.env.development.local`
-#
-# You may also want to use this when testing other environments locally:
-#
-#     cp .env.development .env.local

-SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

 OFN_REDIS_URL="redis://localhost:6379/1"
 OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
--- a/.env.test
+++ b/.env.test
@@ -1,8 +1,6 @@
 # ENV vars for the test environment
 # Override locally with `.env.test.local`

-SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-STRIPE_SECRET_TEST_API_KEY="bogus_key"
-STRIPE_CUSTOMER="bogus_customer"
+SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

 SITE_URL="test.host"
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: openfoodfoundation
-patreon: # Replace with a single Patreon username
-open_collective: #
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@@ -10,6 +10,7 @@ assignees: ''
 ## Preparation on Thursday

 - [ ] Merge pull requests in the [Ready To Go] column
+- [ ] Merge [Transifex pull request]
 - [ ] Include translations: `tx pull --force`
 - [ ] [Draft new release]. Look at previous [releases] for inspiration.
 - [ ] Notify [#instance-managers] of user-facing changes.
@@ -17,12 +18,24 @@ assignees: ''
 ## Testing

 - [ ] [Find build] of the release commit and copy it below.
- [ ] Move this issue to Test Ready.
- [ ] Notify testers.
- [ ] Test build: <!-- paste build link here, e.g. https://semaphore...builds/1234 -->
+- [ ] Move this issue to Test Ready and notify testers.
+- [ ] Test: :warning: link to the build of the release commit https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master

 ## Finish on Tuesday

+- [ ] Update translations unless content has been removed from config/locales/en.yml between this release draft and current master.
+  <details><summary>Command line instructions</summary>
+  <pre>
+  git checkout master # same version as the release draft
+  git fetch upstream
+  git diff upstream/master -- config/locales/en.yml
+  tx pull --force # if no changes or only additions in the locale
+  git checkout --detach # if we need to commit new translations
+  git commit -a -m "Update translations"
+  git tag vx.y.z # put the release number in here
+  git push upstream vx.y.z
+  </pre>
+  </details>
 - [ ] Publish and notify [#global-community]:
  > The next release is ready: https://github.com/openfoodfoundation/openfoodnetwork/releases/latest
 - [ ] Deploy the new release to all managed instances.
--- a/.github/workflows/brakeman-analysis.yml
+++ b/.github/workflows/brakeman-analysis.yml
@@ -10,14 +10,8 @@ on:
  pull_request:
    branches: [ "master" ]

-permissions:
-  contents: read
-
 jobs:
  brakeman-scan:
-    permissions:
-      contents: read  # for actions/checkout to fetch code
-      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
    name: Brakeman Scan
    runs-on: ubuntu-latest
    steps:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,12 @@ env:
  DISABLE_KNAPSACK: true
  TIMEZONE: UTC
  COVERAGE: true
+  RSPEC_RETRY_RETRY_COUNT: 3
  RAILS_ENV: test

-permissions:
-  contents: read
-
 jobs:
  rspec:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
    services:
      postgres:
        image: postgres:10
@@ -35,13 +33,13 @@ jobs:
        specs:
          - "spec/controllers"
          - "spec/models"
+          - "spec/features/admin/[a-o0-9]*_spec.rb"
          - "spec/lib"
          - "spec/migrations"
          - "spec/serializers"
-          - "spec/system/admin/[a-o0-9]*"
-          - "spec/system/admin/[p-z]*"
-          - "spec/system/consumer/[a-o0-9]*"
-          - "spec/system/consumer/[p-z]*"
+          - "spec/system/admin/[a-o0-9]*_spec.rb"
+          - "spec/system/admin/[p-z]*_spec.rb"
+          - "spec/system/consumer"
          - "engines/*/spec"
      fail-fast: false
    steps:
@@ -77,7 +75,7 @@ jobs:
          if-no-files-found: ignore

  test-the-rest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
    services:
      postgres:
        image: postgres:10
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -1,7 +1,5 @@
 name: Linters
 on: [push, pull_request]
-permissions:
-  contents: read # to fetch code (actions/checkout)
 jobs:
  rubocop:
    name: runner / rubocop
@@ -18,16 +16,3 @@ jobs:
          reporter: github-pr-check
          level: error
          fail_on_error: true
-  prettier:
-    name: runner / prettier
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: prettier
-        uses: EPMatt/reviewdog-action-prettier@v1
-        with:
-          github_token: ${{ secrets.github_token }}
-          reporter: github-pr-check
-          level: error
-          fail_on_error: true
--- a/.github/workflows/mapi.yml
+++ b/.github/workflows/mapi.yml
@@ -1,12 +1,7 @@
 name: 'Mayhem for API'
-on: workflow_dispatch
-permissions:
-  contents: read # to fetch code (actions/checkout)
+on: [push]
 jobs:
  test:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-      security-events: write # to upload SARIF results (github/codeql-action/upload-sarif)
    if: ${{ github.repository_owner == 'openfoodfoundation' }}
    runs-on: ubuntu-latest
    strategy:
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,3 @@ coverage
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
-
-/config/credentials.yml.enc
-/config/master.key
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
- yarn pretty-quick --check --staged
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,21 +0,0 @@
-# Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
-*.css
-*.scss
-*.md
-*.yml
-*.yaml
-*.json
-*.html
-
-babel.config.js
-postcss.config.js
-
-.storybook/
-/app/assets/
-/config/
-/coverage/
-/engines/
-/public/
-/spec/
-/tmp/
-/vendor/
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1 +0,0 @@
-{}
--- a/.rubocop_styleguide.yml
+++ b/.rubocop_styleguide.yml
@@ -23,7 +23,7 @@ Metrics:
  Enabled: true

 Metrics/BlockLength:
-  AllowedMethods: [
+  IgnoredMethods: [
    "class_eval",
    "collection",
    "context",
@@ -41,14 +41,8 @@ Metrics/BlockLength:
    "resources",
    "scenario",
    "shared_examples",
-    "xdescribe",
  ]

-Rails/ApplicationRecord:
-  Exclude:
-    # Migrations should not contain application code:
-    - "db/migrate/*.rb"
-
 Rails/SkipsModelValidations:
  AllowedMethods:
    - "touch"
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400`
-# on 2022-08-29 05:26:26 UTC using RuboCop version 1.35.1.
+# on 2022-03-29 16:07:39 UTC using RuboCop version 1.22.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
@@ -25,13 +25,20 @@ Gemspec/RequiredRubyVersion:
    - 'engines/web/web.gemspec'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 Layout/ClosingParenthesisIndentation:
  Exclude:
    - 'lib/reporting/queries/joins.rb'

 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'spec/lib/reports/report_loader_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
@@ -40,15 +47,15 @@ Layout/EmptyLinesAroundBlockBody:
    - 'spec/system/admin/order_cycles/list_spec.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
  Exclude:
    - 'spec/system/admin/enterprises_spec.rb'

-# Offense count: 862
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# Offense count: 856
+# Cop supports --auto-correct.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
  Exclude:
@@ -61,6 +68,7 @@ Layout/LineLength:
    - 'app/controllers/admin/subscriptions_controller.rb'
    - 'app/controllers/api/v0/order_cycles_controller.rb'
    - 'app/controllers/payment_gateways/paypal_controller.rb'
+    - 'app/controllers/spree/admin/reports_controller.rb'
    - 'app/controllers/spree/users_controller.rb'
    - 'app/controllers/user_confirmations_controller.rb'
    - 'app/helpers/angular_form_builder.rb'
@@ -77,6 +85,7 @@ Layout/LineLength:
    - 'app/models/concerns/variant_stock.rb'
    - 'app/models/customer.rb'
    - 'app/models/enterprise.rb'
+    - 'app/models/enterprise_group.rb'
    - 'app/models/product_import/entry_processor.rb'
    - 'app/models/product_import/spreadsheet_entry.rb'
    - 'app/models/product_import/unit_converter.rb'
@@ -102,15 +111,23 @@ Layout/LineLength:
    - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
    - 'engines/order_management/spec/services/order_management/order/updater_spec.rb'
    - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
+    - 'engines/web/spec/features/consumer/cookies_spec.rb'
    - 'lib/discourse/single_sign_on.rb'
    - 'lib/open_food_network/enterprise_fee_applicator.rb'
    - 'lib/open_food_network/enterprise_fee_calculator.rb'
    - 'lib/open_food_network/enterprise_issue_validator.rb'
    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/open_food_network/order_cycle_permissions.rb'
    - 'lib/open_food_network/scope_variants_for_search.rb'
    - 'lib/reporting/line_items.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
    - 'lib/reporting/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total.rb'
+    - 'lib/reporting/reports/order_cycle_management/order_cycle_management_report.rb'
+    - 'lib/open_food_network/order_cycle_permissions.rb'
+    - 'lib/reporting/reports/orders_and_fulfillment/customer_totals_report.rb'
+    - 'lib/reporting/reports/orders_and_fulfillment/distributor_totals_by_supplier_report.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'
+    - 'lib/reporting/reports/products_and_inventory/lettuce_share_report.rb'
+    - 'lib/reporting/reports/sales_tax/sales_tax_report.rb'
    - 'lib/reporting/reports/xero_invoices/base.rb'
    - 'lib/spree/localized_number.rb'
    - 'lib/tasks/data.rake'
@@ -128,10 +145,12 @@ Layout/LineLength:
    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
    - 'spec/controllers/api/v0/base_controller_spec.rb'
+    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
    - 'spec/controllers/api/v0/exchange_products_controller_spec.rb'
    - 'spec/controllers/api/v0/logos_controller_spec.rb'
    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
    - 'spec/controllers/api/v0/orders_controller_spec.rb'
+    - 'spec/controllers/api/v0/product_images_controller_spec.rb'
    - 'spec/controllers/api/v0/products_controller_spec.rb'
    - 'spec/controllers/api/v0/promo_images_controller_spec.rb'
    - 'spec/controllers/api/v0/terms_and_conditions_controller_spec.rb'
@@ -145,6 +164,7 @@ Layout/LineLength:
    - 'spec/controllers/spree/admin/orders/invoices_spec.rb'
    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/reports_controller_spec.rb'
    - 'spec/controllers/spree/admin/variants_controller_spec.rb'
    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
    - 'spec/controllers/spree/orders_controller_spec.rb'
@@ -167,9 +187,13 @@ Layout/LineLength:
    - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
    - 'spec/lib/reports/customers_report_spec.rb'
    - 'spec/lib/reports/order_cycle_management_report_spec.rb'
+    - 'spec/lib/reports/order_grouper_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/orders_and_fulfillment_report_spec.rb'
    - 'spec/lib/reports/packing/packing_report_spec.rb'
    - 'spec/lib/reports/products_and_inventory_report_spec.rb'
    - 'spec/lib/reports/users_and_enterprises_report_spec.rb'
+    - 'spec/lib/reports/xero_invoices_report_spec.rb'
+    - 'spec/lib/stripe/authorize_response_patcher_spec.rb'
    - 'spec/mailers/order_mailer_spec.rb'
    - 'spec/mailers/producer_mailer_spec.rb'
    - 'spec/mailers/subscription_mailer_spec.rb'
@@ -177,6 +201,7 @@ Layout/LineLength:
    - 'spec/models/concerns/calculated_adjustments_spec.rb'
    - 'spec/models/concerns/order_shipment_spec.rb'
    - 'spec/models/concerns/product_stock_spec.rb'
+    - 'spec/models/enterprise_group_spec.rb'
    - 'spec/models/enterprise_relationship_spec.rb'
    - 'spec/models/enterprise_spec.rb'
    - 'spec/models/exchange_spec.rb'
@@ -202,6 +227,7 @@ Layout/LineLength:
    - 'spec/models/tag_rule/filter_payment_methods_spec.rb'
    - 'spec/models/tag_rule/filter_products_spec.rb'
    - 'spec/models/tag_rule/filter_shipping_methods_spec.rb'
+    - 'spec/models/terms_of_service_file_spec.rb'
    - 'spec/models/variant_override_spec.rb'
    - 'spec/requests/api/orders_spec.rb'
    - 'spec/requests/checkout/failed_checkout_spec.rb'
@@ -261,7 +287,6 @@ Layout/LineLength:
    - 'spec/system/admin/variant_overrides_spec.rb'
    - 'spec/system/consumer/authentication_spec.rb'
    - 'spec/system/consumer/caching/shops_caching_spec.rb'
-    - 'spec/system/consumer/cookies_spec.rb'
    - 'spec/system/consumer/shopping/cart_spec.rb'
    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
    - 'spec/system/consumer/shopping/checkout_spec.rb'
@@ -275,20 +300,35 @@ Layout/LineLength:
    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
+Layout/MultilineBlockLayout:
+  Exclude:
+    - 'spec/lib/reports/report_renderer_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
  Exclude:
    - 'lib/reporting/queries/joins.rb'

-# Offense count: 22
-# This cop supports safe autocorrection (--autocorrect).
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'lib/reporting/reports/customers/customers_report.rb'
+
+# Offense count: 20
+# Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
  Exclude:
    - 'app/controllers/spree/admin/shipping_methods_controller.rb'
    - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
+    - 'spec/system/admin/enterprises_spec.rb'
    - 'spec/system/admin/order_spec.rb'
    - 'spec/system/admin/shipping_methods_spec.rb'
    - 'spec/system/flatpickr_spec.rb'
@@ -317,7 +357,6 @@ Lint/DuplicateMethods:
    - 'lib/discourse/single_sign_on.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/DuplicateRequire:
  Exclude:
    - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
@@ -339,8 +378,9 @@ Lint/IneffectiveAccessModifier:
  Exclude:
    - 'app/models/spree/user.rb'

+
 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
 Lint/RedundantSafeNavigation:
@@ -348,7 +388,6 @@ Lint/RedundantSafeNavigation:
    - 'app/models/spree/payment.rb'

 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: present?, blank?, presence, try, try!, in?
 Lint/SafeNavigationChain:
@@ -357,21 +396,22 @@ Lint/SafeNavigationChain:
    - 'app/models/spree/stock/availability_validator.rb'

 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
  Exclude:
    - 'lib/reporting/queries/query_interface.rb'

 # Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
+# Configuration parameters: AllowComments.
 Lint/UselessMethodDefinition:
  Exclude:
    - 'app/controllers/spree/user_registrations_controller.rb'
    - 'app/models/spree/gateway.rb'

-# Offense count: 28
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes, Max.
+# Offense count: 38
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
  Exclude:
    - 'app/controllers/admin/enterprises_controller.rb'
@@ -393,14 +433,20 @@ Metrics/AbcSize:
    - 'app/models/spree/return_authorization.rb'
    - 'lib/discourse/single_sign_on.rb'
    - 'lib/open_food_network/order_cycle_form_applicator.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
+    - 'lib/reporting/reports/customers/customers_report.rb'
    - 'lib/open_food_network/order_cycle_permissions.rb'
+    - 'lib/reporting/reports/orders_and_distributors/orders_and_distributors_report.rb'
+    - 'lib/reporting/reports/packing/customer.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'
+    - 'lib/reporting/reports/sales_tax/sales_tax_report.rb'
    - 'lib/spree/core/controller_helpers/order.rb'
    - 'lib/tasks/enterprises.rake'
    - 'spec/services/order_checkout_restart_spec.rb'

-# Offense count: 42
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
-# AllowedMethods: refine
+# Offense count: 43
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
  Exclude:
    - 'app/models/spree/order/checkout.rb'
@@ -428,6 +474,7 @@ Metrics/BlockLength:
    - 'spec/support/matchers/select2_matchers.rb'
    - 'spec/support/matchers/table_matchers.rb'
    - 'spec/swagger_helper.rb'
+    - 'spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb'
    - 'spec/system/consumer/shopping/checkout_spec.rb'

 # Offense count: 1
@@ -436,7 +483,7 @@ Metrics/BlockNesting:
  Exclude:
    - 'app/models/spree/payment/processing.rb'

-# Offense count: 45
+# Offense count: 50
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
  Exclude:
@@ -455,6 +502,7 @@ Metrics/ClassLength:
    - 'app/controllers/spree/admin/payment_methods_controller.rb'
    - 'app/controllers/spree/admin/payments_controller.rb'
    - 'app/controllers/spree/admin/products_controller.rb'
+    - 'app/controllers/spree/admin/reports_controller.rb'
    - 'app/controllers/spree/admin/users_controller.rb'
    - 'app/controllers/spree/orders_controller.rb'
    - 'app/models/enterprise.rb'
@@ -481,13 +529,16 @@ Metrics/ClassLength:
    - 'engines/order_management/app/services/order_management/order/updater.rb'
    - 'lib/open_food_network/enterprise_fee_calculator.rb'
    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/open_food_network/order_cycle_permissions.rb'
    - 'lib/open_food_network/permissions.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
    - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
+    - 'lib/reporting/reports/order_cycle_management/order_cycle_management_report.rb'
+    - 'lib/open_food_network/order_cycle_permissions.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'
    - 'lib/reporting/reports/xero_invoices/base.rb'

-# Offense count: 35
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, Max.
+# Offense count: 39
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/CyclomaticComplexity:
  Exclude:
    - 'app/controllers/admin/enterprises_controller.rb'
@@ -514,14 +565,18 @@ Metrics/CyclomaticComplexity:
    - 'app/models/spree/zone.rb'
    - 'lib/discourse/single_sign_on.rb'
    - 'lib/open_food_network/enterprise_issue_validator.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
+    - 'lib/reporting/reports/customers/customers_report.rb'
+    - 'lib/reporting/reports/orders_and_fulfillment/customer_totals_report.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'
    - 'lib/reporting/reports/xero_invoices/base.rb'
    - 'lib/spree/core/controller_helpers/order.rb'
    - 'lib/spree/core/controller_helpers/respond_with.rb'
    - 'lib/spree/localized_number.rb'
    - 'spec/models/product_importer_spec.rb'

-# Offense count: 26
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Offense count: 32
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
  Exclude:
    - 'app/controllers/admin/enterprises_controller.rb'
@@ -538,12 +593,15 @@ Metrics/MethodLength:
    - 'app/models/spree/preferences/preferable_class_methods.rb'
    - 'lib/discourse/single_sign_on.rb'
    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/open_food_network/order_cycle_permissions.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
    - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
+    - 'lib/reporting/reports/order_cycle_management/order_cycle_management_report.rb'
+    - 'lib/open_food_network/order_cycle_permissions.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'
    - 'lib/reporting/reports/xero_invoices/base.rb'
    - 'lib/tasks/sample_data/product_factory.rb'

-# Offense count: 51
+# Offense count: 54
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ModuleLength:
  Exclude:
@@ -583,6 +641,9 @@ Metrics/ModuleLength:
    - 'spec/lib/reports/customers_report_spec.rb'
    - 'spec/lib/reports/enterprise_fee_summary/authorizer_spec.rb'
    - 'spec/lib/reports/order_cycle_management_report_spec.rb'
+    - 'spec/lib/reports/order_grouper_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/customer_totals_report_spec.rb'
+    - 'spec/lib/reports/orders_and_fulfillment/orders_and_fulfillment_report_spec.rb'
    - 'spec/lib/reports/products_and_inventory_report_spec.rb'
    - 'spec/lib/reports/users_and_enterprises_report_spec.rb'
    - 'spec/models/spree/adjustment_spec.rb'
@@ -609,8 +670,8 @@ Metrics/ParameterLists:
    - 'spec/support/controller_requests_helper.rb'
    - 'spec/system/admin/reports_spec.rb'

-# Offense count: 5
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, Max.
+# Offense count: 7
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/PerceivedComplexity:
  Exclude:
    - 'app/controllers/spree/admin/taxons_controller.rb'
@@ -618,8 +679,10 @@ Metrics/PerceivedComplexity:
    - 'app/models/enterprise_relationship.rb'
    - 'app/models/spree/ability.rb'
    - 'app/models/spree/order/checkout.rb'
+    - 'lib/reporting/reports/bulk_coop/bulk_coop_report.rb'
+    - 'lib/reporting/reports/payments/payments_report.rb'

-# Offense count: 8
+# Offense count: 9
 Naming/AccessorMethodName:
  Exclude:
    - 'app/controllers/spree/admin/taxonomies_controller.rb'
@@ -653,8 +716,8 @@ Naming/MethodParameterName:
  Exclude:
    - 'app/services/process_payment_intent.rb'

-# Offense count: 28
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
+# Offense count: 30
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
 Naming/VariableNumber:
@@ -662,6 +725,7 @@ Naming/VariableNumber:
    - 'app/controllers/spree/orders_controller.rb'
    - 'app/models/content_configuration.rb'
    - 'app/models/preference_sections/main_links_section.rb'
+    - 'lib/reporting/reports/orders_and_fulfillment/customer_totals_report.rb'
    - 'lib/spree/core/controller_helpers/common.rb'
    - 'spec/controllers/spree/admin/search_controller_spec.rb'
    - 'spec/factories/stock_location_factory.rb'
@@ -677,13 +741,13 @@ Rails/ActiveRecordOverride:
    - 'app/models/spree/product.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Rails/ApplicationController:
  Exclude:
    - 'engines/dfc_provider/app/controllers/dfc_provider/api/base_controller.rb'

 # Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Rails/ApplicationJob:
  Exclude:
    - 'app/jobs/bulk_invoice_job.rb'
@@ -694,13 +758,19 @@ Rails/ApplicationJob:
    - 'app/jobs/subscription_placement_job.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Rails/ApplicationMailer:
  Exclude:
    - 'app/mailers/spree/base_mailer.rb'

+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/ApplicationRecord:
+  Exclude:
+    - 'lib/tasks/data/remove_transient_data.rb'
+
 # Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
 Rails/Blank:
  Exclude:
@@ -726,7 +796,7 @@ Rails/FilePath:
    - 'spec/models/content_configuration_spec.rb'
    - 'spec/support/downloads_helper.rb'

-# Offense count: 12
+# Offense count: 11
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -734,7 +804,6 @@ Rails/HasAndBelongsToMany:
    - 'app/models/concerns/payment_method_distributors.rb'
    - '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'
@@ -743,7 +812,7 @@ Rails/HasAndBelongsToMany:
    - 'app/models/spree/variant.rb'
    - 'app/models/spree/zone.rb'

-# Offense count: 45
+# Offense count: 47
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -769,8 +838,9 @@ Rails/HasManyOrHasOneDependent:
    - 'app/models/spree/taxonomy.rb'
    - 'app/models/spree/user.rb'
    - 'app/models/spree/variant.rb'
+    - 'app/models/subscription.rb'

-# Offense count: 62
+# Offense count: 59
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -811,7 +881,7 @@ Rails/InverseOf:

 # Offense count: 38
 # Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+# Include: app/controllers/**/*.rb
 Rails/LexicallyScopedActionFilter:
  Exclude:
    - 'app/controllers/admin/enterprise_groups_controller.rb'
@@ -834,9 +904,10 @@ Rails/LexicallyScopedActionFilter:
    - 'app/controllers/spree/admin/zones_controller.rb'
    - 'app/controllers/spree/users_controller.rb'

-# Offense count: 18
+# Offense count: 19
 Rails/OutputSafety:
  Exclude:
+    - 'app/controllers/spree/admin/reports_controller.rb'
    - 'app/helpers/angular_form_helper.rb'
    - 'app/helpers/application_helper.rb'
    - 'app/helpers/reports_helper.rb'
@@ -851,7 +922,7 @@ Rails/OutputSafety:
    - 'spec/system/admin/order_print_ticket_spec.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Rails/RelativeDateConstant:
  Exclude:
    - 'lib/tasks/data/remove_transient_data.rb'
@@ -865,7 +936,7 @@ Rails/SkipsModelValidations:
    - 'spec/models/spree/line_item_spec.rb'

 # Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
@@ -900,20 +971,20 @@ Security/Open:
    - 'app/services/image_importer.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 Style/BlockComments:
  Exclude:
    - 'spec/system/admin/tag_rules_spec.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 # Configuration parameters: AllowOnConstant.
 Style/CaseEquality:
  Exclude:
    - 'spec/models/spree/payment_spec.rb'

 # Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Style/CaseLikeIf:
  Exclude:
    - 'app/controllers/admin/order_cycles_controller.rb'
@@ -921,7 +992,7 @@ Style/CaseLikeIf:
    - 'app/models/spree/payment/processing.rb'

 # Offense count: 25
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
@@ -956,14 +1027,13 @@ Style/ClassVars:
    - 'lib/spree/core/delegate_belongs_to.rb'

 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, IgnoredMethods.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
  EnforcedStyle: unannotated

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
@@ -971,7 +1041,7 @@ Style/FrozenStringLiteralComment:
    - '.simplecov'

 # Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Style/GlobalStdStream:
  Exclude:
    - 'lib/tasks/data.rake'
@@ -980,8 +1050,8 @@ Style/GlobalStdStream:
    - 'lib/tasks/subscriptions/debug.rake'
    - 'lib/tasks/subscriptions/test.rake'

-# Offense count: 40
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
+# Offense count: 39
+# Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Exclude:
    - 'app/controllers/admin/enterprises_controller.rb'
@@ -1015,8 +1085,8 @@ Style/HashLikeCase:
    - 'app/models/enterprise.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
 Style/MethodCallWithoutArgsParentheses:
  Exclude:
    - 'spec/system/flatpickr_spec.rb'
@@ -1028,8 +1098,22 @@ Style/MissingRespondToMissing:
    - 'app/models/spree/gateway.rb'
    - 'app/models/spree/preferences/configuration.rb'

+# Offense count: 1
+Style/MixinUsage:
+  Exclude:
+    - 'lib/reporting/reports/orders_and_fulfillment/orders_and_fulfillment_report.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/reporting/report_template.rb'
+    - 'lib/reporting/reports/packing/base.rb'
+
 # Offense count: 22
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 Style/NestedModifier:
  Exclude:
    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -1043,7 +1127,7 @@ Style/NestedModifier:
    - 'spec/system/admin/payments_stripe_spec.rb'
    - 'spec/system/admin/reports_spec.rb'

-# Offense count: 17
+# Offense count: 26
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
@@ -1055,6 +1139,7 @@ Style/OptionalBooleanParameter:
    - 'app/models/enterprise_relationship.rb'
    - 'app/models/product_import/entry_processor.rb'
    - 'app/models/spree/order_contents.rb'
+    - 'app/models/spree/preferences/file_configuration.rb'
    - 'app/models/spree/shipment.rb'
    - 'engines/order_management/app/services/order_management/stock/estimator.rb'
    - 'lib/spree/core/controller_helpers/order.rb'
@@ -1062,7 +1147,7 @@ Style/OptionalBooleanParameter:
    - 'spec/support/request/web_helper.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
@@ -1070,13 +1155,13 @@ Style/PreferredHashMethods:
    - 'app/controllers/api/v0/shipments_controller.rb'

 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
+# Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
  Exclude:
    - 'app/controllers/spree/admin/shipping_methods_controller.rb'

-# Offense count: 209
+# Offense count: 205
 Style/Send:
  Exclude:
    - 'app/controllers/split_checkout_controller.rb'
@@ -1110,16 +1195,17 @@ Style/Send:
    - 'spec/services/cart_service_spec.rb'
    - 'spec/services/products_renderer_spec.rb'
    - 'spec/services/variant_units/option_value_namer_spec.rb'
+    - 'spec/spec_helper.rb'
    - 'spec/support/localized_number_helper.rb'

 # Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Style/SingleArgumentDig:
  Exclude:
    - 'app/services/checkout/form_data_adapter.rb'

 # Offense count: 4
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Cop supports --auto-correct.
 Style/SlicingWithRange:
  Exclude:
    - 'app/helpers/spree/admin/navigation_helper.rb'
@@ -1127,8 +1213,8 @@ Style/SlicingWithRange:
    - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
    - 'lib/discourse/single_sign_on.rb'

-# Offense count: 29
-# This cop supports unsafe autocorrection (--autocorrect-all).
+# Offense count: 28
+# Cop supports --auto-correct.
 # Configuration parameters: Mode.
 Style/StringConcatenation:
  Exclude:
--- a/23
+++ b/23
@@ -29,7 +29,6 @@ gem 'rails_safe_tasks', '~> 1.0'
 gem "activerecord-import"
 gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6"
 gem "fog-aws", "~> 2.0" # db2fog does not support v3
-gem "mime-types" # required by fog

 gem "valid_email2"

@@ -70,6 +69,7 @@ gem 'rswag-api'
 gem 'rswag-ui'

 gem 'angularjs-rails', '1.8.0'
+gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
 gem 'haml'
 gem 'redcarpet'
@@ -97,15 +97,14 @@ gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'

-gem "cable_ready", "5.0.0.pre9"
-gem "stimulus_reflex", "3.5.0.pre9"
+gem "cable_ready", "5.0.0.pre3"

 gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'

 gem 'immigrant'
-gem 'roo'
+gem 'roo', github: "roo-rb/roo" # master is currently needed for Ruby 3.x (awaiting new release)
 gem 'spreadsheet_architect'

 gem 'whenever', require: false
@@ -116,6 +115,8 @@ gem 'coffee-rails', '~> 5.0.0'

 gem 'mini_racer', '0.4.0'

+gem 'uglifier', '>= 1.0.3'
+
 gem 'angular_rails_csrf'

 gem 'jquery-rails', '4.4.0'
@@ -130,7 +131,7 @@ gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'

-gem "view_component"
+gem "view_component", require: "view_component/engine"

 group :production, :staging do
  gem 'ddtrace'
@@ -139,6 +140,8 @@ group :production, :staging do
 end

 group :test, :development do
+  # Pretty printed test output
+  gem 'awesome_print'
  gem 'bullet'
  gem 'capybara'
  gem 'cuprite'
@@ -149,18 +152,20 @@ group :test, :development do
  gem 'knapsack'
  gem 'letter_opener', '>= 1.4.1'
  gem 'rspec-rails', ">= 3.5.2"
+  gem 'rspec-retry'
  gem 'rswag-specs'
+  gem 'selenium-webdriver'
  gem 'shoulda-matchers'
  gem 'timecop'
-  gem 'debug', '>= 1.0.0'
+  gem 'webdrivers'
 end

 group :test do
+  gem 'byebug'
  gem 'pdf-reader'
  gem 'rails-controller-testing'
  gem 'simplecov', require: false
  gem 'test-prof'
-  gem 'vcr'
  gem 'webmock'
  # See spec/spec_helper.rb for instructions
  # gem 'perftools.rb'
@@ -168,17 +173,17 @@ end

 group :development do
  gem 'debugger-linecache'
-  gem 'rails-erd'
  gem 'foreman'
  gem 'listen'
  gem 'pry', '~> 0.13.0'
+  gem 'pry-byebug', '~> 3.9.0'
  gem 'rubocop'
  gem 'rubocop-rails'
  gem 'spring'
  gem 'spring-commands-rspec'
  gem 'web-console'

-  gem "view_component_storybook"
+  gem "view_component_storybook", require: "view_component/storybook/engine"

  gem 'rack-mini-profiler', '< 3.0.0'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,6 +24,14 @@ GIT
      sass-rails
      thor (>= 0.14)

+GIT
+  remote: https://github.com/roo-rb/roo.git
+  revision: 709464c77623be2bc09b2103405d90ded7604a75
+  specs:
+    roo (2.8.3)
+      nokogiri (~> 1)
+      rubyzip (>= 1.3.0, < 3.0.0)
+
 PATH
  remote: engines/catalog
  specs:
@@ -51,67 +59,67 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.1.0)
-    actioncable (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    actioncable (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailbox (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      mail (>= 2.7.1)
-    actionmailer (6.1.7)
-      actionpack (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionmailer (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7)
-      actionview (= 6.1.7)
-      activesupport (= 6.1.7)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      rack (~> 2.0, >= 2.0.9)
      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 (6.1.7)
-      actionpack (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    actiontext (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      nokogiri (>= 1.8.5)
-    actionview (6.1.7)
-      activesupport (= 6.1.7)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
      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.0)
+    active_storage_validations (0.9.7)
      activejob (>= 5.2.0)
      activemodel (>= 5.2.0)
      activestorage (>= 5.2.0)
      activesupport (>= 5.2.0)
-    activejob (6.1.7)
-      activesupport (= 6.1.7)
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
      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 (6.1.7)
-      activesupport (= 6.1.7)
-    activerecord (6.1.7)
-      activemodel (= 6.1.7)
-      activesupport (= 6.1.7)
-    activerecord-import (1.4.1)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord-import (1.3.0)
      activerecord (>= 4.2)
    activerecord-postgresql-adapter (0.0.1)
      pg
@@ -121,14 +129,14 @@ GEM
      multi_json (~> 1.11, >= 1.11.2)
      rack (>= 2.0.8, < 3)
      railties (>= 5.2.4.1)
-    activestorage (6.1.7)
-      actionpack (= 6.1.7)
-      activejob (= 6.1.7)
-      activerecord (= 6.1.7)
-      activesupport (= 6.1.7)
-      marcel (~> 1.0)
+    activestorage (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+      marcel (~> 1.0.0)
      mini_mime (>= 1.1.0)
-    activesupport (6.1.7)
+    activesupport (6.1.4.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -138,63 +146,64 @@ GEM
      activerecord (>= 5.0, < 6.2)
    acts_as_list (1.0.4)
      activerecord (>= 4.2)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
    afm (0.2.2)
-    angular-rails-templates (1.2.0)
-      railties (>= 5.0, < 7.1)
+    angular-rails-templates (1.1.0)
+      railties (>= 4.2, < 7)
      sprockets (>= 3.0, < 5)
-      sprockets-rails
      tilt
-    angular_rails_csrf (5.0.0)
-      railties (>= 3, < 8)
+    angular_rails_csrf (4.5.0)
+      railties (>= 3, < 7)
    angularjs-file-upload-rails (2.4.1)
    angularjs-rails (1.8.0)
-    arel-helpers (2.14.0)
-      activerecord (>= 3.1.0, < 8)
+    arel-helpers (2.12.1)
+      activerecord (>= 3.1.0, < 7)
    ast (2.4.2)
-    awesome_nested_set (3.5.0)
-      activerecord (>= 4.0.0, < 7.1)
+    awesome_nested_set (3.4.0)
+      activerecord (>= 4.0.0, < 7.0)
+    awesome_print (1.9.2)
    aws-eventstream (1.2.0)
-    aws-partitions (1.601.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.570.0)
+    aws-sdk (1.67.0)
+      aws-sdk-v1 (= 1.67.0)
+    aws-sdk-core (3.130.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.55.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.113.0)
      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sdk-v1 (1.67.0)
+      json (~> 1.4)
+      nokogiri (~> 1)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
    axlsx_styler (1.1.0)
      activesupport (>= 3.1)
      caxlsx (>= 2.0.2)
-    bcrypt (3.1.18)
+    bcrypt (3.1.16)
    bigdecimal (3.0.2)
    bindex (0.8.1)
-    bootsnap (1.13.0)
+    bootsnap (1.10.1)
      msgpack (~> 1.2)
-    bugsnag (6.24.2)
+    bugsnag (6.24.1)
      concurrent-ruby (~> 1.0)
    builder (3.2.4)
-    bullet (7.0.3)
+    bullet (6.1.5)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
-    cable_ready (5.0.0.pre9)
-      actioncable (>= 5.2)
-      actionpack (>= 5.2)
-      actionview (>= 5.2)
-      activerecord (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
+    byebug (11.1.3)
+    cable_ready (5.0.0.pre3)
+      rails (>= 5.2)
      thread-local (>= 1.1.0)
    cancancan (1.15.0)
-    capybara (3.37.1)
+    capybara (3.36.0)
      addressable
      matrix
      mini_mime (>= 0.1.3)
@@ -208,7 +217,7 @@ GEM
      marcel (~> 1.0)
      nokogiri (~> 1.10, >= 1.10.4)
      rubyzip (>= 1.3.0, < 3)
-    choice (0.2.0)
+    childprocess (4.1.0)
    chronic (0.10.2)
    cliver (0.3.2)
    coderay (1.1.3)
@@ -219,15 +228,14 @@ GEM
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    combine_pdf (1.0.22)
-      matrix
+    combine_pdf (1.0.21)
      ruby-rc4 (>= 0.1.5)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
    crack (0.4.5)
      rexml
    crass (1.0.6)
-    css_parser (1.11.0)
+    css_parser (1.9.0)
      addressable
    cuprite (0.13)
      capybara (>= 2.1, < 4)
@@ -242,11 +250,8 @@ GEM
      debase-ruby_core_source (= 0.10.12)
      msgpack
    debase-ruby_core_source (0.10.12)
-    debug (1.6.2)
-      irb (>= 1.3.6)
-      reline (>= 0.3.1)
    debugger-linecache (1.2.0)
-    devise (4.8.1)
+    devise (4.8.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -254,20 +259,21 @@ GEM
      warden (~> 1.2.3)
    devise-encryptable (0.2.0)
      devise (>= 2.1.0)
-    devise-i18n (1.10.2)
+    devise-i18n (1.10.0)
      devise (>= 4.8.0)
    devise-token_authenticatable (1.1.0)
      devise (>= 4.0.0, < 5.0.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.4.4)
    digest (3.1.0)
    docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
+    dotenv (2.7.6)
+    dotenv-rails (2.7.6)
+      dotenv (= 2.7.6)
      railties (>= 3.2)
    dry-inflector (0.2.1)
-    erubi (1.11.0)
-    et-orbi (1.2.7)
+    e2mmap (0.1.0)
+    erubi (1.10.0)
+    et-orbi (1.2.4)
      tzinfo
    excon (0.81.0)
    execjs (2.7.0)
@@ -276,16 +282,21 @@ GEM
    factory_bot_rails (6.2.0)
      factory_bot (~> 6.2.0)
      railties (>= 5.0.0)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      multipart-post (>= 1.2, < 3)
      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
    ferrum (0.11)
      addressable (~> 2.5)
      cliver (~> 0.3)
      concurrent-ruby (~> 1.1)
      websocket-driver (>= 0.6, < 0.8)
-    ffaker (2.21.0)
+    ffaker (2.20.0)
    ffi (1.15.5)
    flipper (0.20.4)
    flipper-active_record (0.20.4)
@@ -313,17 +324,17 @@ GEM
      nokogiri (>= 1.5.11, < 2.0.0)
    foreman (0.87.2)
    formatador (0.2.5)
-    fugit (1.7.1)
-      et-orbi (~> 1, >= 1.2.7)
+    fugit (1.4.5)
+      et-orbi (~> 1.1, >= 1.1.8)
      raabro (~> 1.4)
    fuubar (2.5.1)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
-    geocoder (1.8.1)
+    geocoder (1.7.0)
    globalid (1.0.0)
      activesupport (>= 5.0)
    gmaps4rails (2.1.2)
-    good_migrations (0.2.1)
+    good_migrations (0.1.0)
      activerecord (>= 3.1)
      railties (>= 3.1)
    haml (5.2.2)
@@ -334,19 +345,16 @@ GEM
    highline (2.0.3)
    hiredis (0.6.3)
    htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
-    i18n-js (3.9.2)
+    i18n-js (3.9.0)
      i18n (>= 0.6.6)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    immigrant (0.3.6)
      activerecord (>= 3.0)
-    io-console (0.5.11)
    ipaddress (0.8.3)
-    irb (1.4.1)
-      reline (>= 0.3.0)
    jmespath (1.6.1)
    jquery-rails (4.4.0)
      rails-dom-testing (>= 1, < 3)
@@ -354,7 +362,7 @@ GEM
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (4.2.1)
      railties (>= 3.2.16)
-    json (2.6.2)
+    json (2.6.1)
    json-schema (2.8.1)
      addressable (>= 2.4)
    json_spec (1.1.5)
@@ -362,18 +370,18 @@ GEM
      rspec (>= 2.0, < 4.0)
    jsonapi-serializer (2.2.0)
      activesupport (>= 4.2)
-    jwt (2.5.0)
+    jwt (2.3.0)
    knapsack (4.0.0)
      rake
    launchy (2.5.0)
      addressable (~> 2.7)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
+    letter_opener (1.7.0)
+      launchy (~> 2.2)
    libv8-node (15.14.0.1)
    listen (3.7.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.0)
+    loofah (2.13.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@@ -381,9 +389,6 @@ GEM
    marcel (1.0.2)
    matrix (0.4.2)
    method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
    mimemagic (0.4.3)
      nokogiri (~> 1)
      rake
@@ -392,41 +397,41 @@ GEM
    mini_portile2 (2.8.0)
    mini_racer (0.4.0)
      libv8-node (~> 15.14.0.0)
-    minitest (5.16.3)
+    minitest (5.15.0)
    monetize (1.12.0)
      money (~> 6.12)
    money (6.16.0)
      i18n (>= 0.6.4, <= 2)
-    msgpack (1.5.4)
+    msgpack (1.4.2)
    multi_json (1.15.0)
    multi_xml (0.6.0)
+    multipart-post (2.1.1)
    nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.3)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    oauth2 (1.4.10)
-      faraday (>= 0.17.3, < 3.0)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
      jwt (>= 1.0, < 3.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
    orm_adapter (0.5.0)
-    pagy (5.10.1)
-      activesupport
+    pagy (5.1.2)
    paper_trail (12.1.0)
      activerecord (>= 5.2)
      request_store (~> 1.1)
-    parallel (1.22.1)
-    paranoia (2.6.0)
-      activerecord (>= 5.1, < 7.1)
-    parser (3.1.2.1)
+    parallel (1.21.0)
+    paranoia (2.4.3)
+      activerecord (>= 4.0, < 6.2)
+    parser (3.1.0.0)
      ast (~> 2.4.1)
    paypal-sdk-core (0.3.4)
      multi_json (~> 1.0)
      xml-simple
    paypal-sdk-merchant (1.117.2)
      paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.10.0)
+    pdf-reader (2.5.0)
      Ascii85 (~> 1.0)
      afm (~> 0.2.1)
      hashery (~> 2.0)
@@ -437,13 +442,16 @@ GEM
    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (5.0.0)
-    puma (5.6.5)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
+    puma (5.6.2)
      nio4r (~> 2.0)
    raabro (1.4.0)
    racc (1.6.0)
-    rack (2.2.4)
-    rack-mini-profiler (2.3.4)
+    rack (2.2.3)
+    rack-mini-profiler (2.3.3)
      rack (>= 1.2.0)
    rack-protection (2.1.0)
      rack
@@ -452,23 +460,23 @@ GEM
    rack-rewrite (1.5.1)
    rack-ssl (1.4.1)
      rack
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rack-timeout (0.6.3)
-    rails (6.1.7)
-      actioncable (= 6.1.7)
-      actionmailbox (= 6.1.7)
-      actionmailer (= 6.1.7)
-      actionpack (= 6.1.7)
-      actiontext (= 6.1.7)
-      actionview (= 6.1.7)
-      activejob (= 6.1.7)
-      activemodel (= 6.1.7)
-      activerecord (= 6.1.7)
-      activestorage (= 6.1.7)
-      activesupport (= 6.1.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rack-timeout (0.6.0)
+    rails (6.1.4.4)
+      actioncable (= 6.1.4.4)
+      actionmailbox (= 6.1.4.4)
+      actionmailer (= 6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actiontext (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      bundler (>= 1.15.0)
-      railties (= 6.1.7)
+      railties (= 6.1.4.4)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@@ -477,22 +485,17 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-erd (1.7.2)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
-      choice (~> 0.2.0)
-      ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.4.3)
+    rails-html-sanitizer (1.4.2)
      loofah (~> 2.3)
-    rails-i18n (7.0.5)
+    rails-i18n (7.0.1)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
    rails_safe_tasks (1.0.0)
-    railties (6.1.7)
-      actionpack (= 6.1.7)
-      activesupport (= 6.1.7)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
      method_source
-      rake (>= 12.2)
+      rake (>= 0.13)
      thor (~> 1.0)
    rainbow (3.1.1)
    rake (13.0.6)
@@ -504,42 +507,37 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redcarpet (3.5.1)
-    redis (4.8.0)
-    regexp_parser (2.5.0)
-    reline (0.3.1)
-      io-console (~> 0.5)
+    redis (4.5.1)
+    regexp_parser (2.2.0)
    request_store (1.5.0)
      rack (>= 1.4)
    responders (3.0.1)
      actionpack (>= 5.0)
      railties (>= 5.0)
    rexml (3.2.5)
-    roadie (5.0.1)
+    roadie (4.0.0)
      css_parser (~> 1.4)
      nokogiri (~> 1.8)
-    roadie-rails (3.0.0)
-      railties (>= 5.1, < 7.1)
-      roadie (~> 5.0)
+    roadie-rails (2.2.0)
+      railties (>= 5.1, < 6.2)
+      roadie (>= 3.1, < 5.0)
    rodf (1.1.1)
      builder (>= 3.0)
      dry-inflector (~> 0.1)
      rubyzip (>= 1.0)
-    roo (2.9.0)
-      nokogiri (~> 1)
-      rubyzip (>= 1.3.0, < 3.0.0)
    rspec (3.10.0)
      rspec-core (~> 3.10.0)
      rspec-expectations (~> 3.10.0)
      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
+    rspec-core (3.10.1)
      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec-expectations (3.10.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.10.0)
    rspec-mocks (3.10.2)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.10.0)
-    rspec-rails (5.1.2)
+    rspec-rails (5.0.2)
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      railties (>= 5.2)
@@ -547,41 +545,40 @@ GEM
      rspec-expectations (~> 3.10)
      rspec-mocks (~> 3.10)
      rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rswag-api (2.6.0)
-      railties (>= 3.1, < 7.1)
-    rswag-specs (2.6.0)
-      activesupport (>= 3.1, < 7.1)
+    rspec-retry (0.6.2)
+      rspec-core (> 3.3)
+    rspec-support (3.10.2)
+    rswag-api (2.4.0)
+      railties (>= 3.1, < 7.0)
+    rswag-specs (2.4.0)
+      activesupport (>= 3.1, < 7.0)
      json-schema (~> 2.2)
-      railties (>= 3.1, < 7.1)
-    rswag-ui (2.6.0)
-      actionpack (>= 3.1, < 7.1)
-      railties (>= 3.1, < 7.1)
-    rubocop (1.36.0)
-      json (~> 2.3)
+      railties (>= 3.1, < 7.0)
+    rswag-ui (2.4.0)
+      actionpack (>= 3.1, < 7.0)
+      railties (>= 3.1, < 7.0)
+    rubocop (1.22.2)
      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.16.1)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rails (2.13.2)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    ruby-graphviz (1.2.5)
-      rexml
+      rubocop (>= 1.7.0, < 2.0)
    ruby-progressbar (1.11.0)
    ruby-rc4 (0.1.5)
    ruby-vips (2.1.4)
      ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
+    ruby2_keywords (0.0.4)
    rubyzip (2.3.2)
-    rufus-scheduler (3.8.2)
+    rufus-scheduler (3.7.0)
      fugit (~> 1.1, >= 1.1.6)
    sass (3.4.25)
    sass-rails (5.0.8)
@@ -591,17 +588,23 @@ GEM
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
    sd_notify (0.1.1)
+    selenium-webdriver (4.0.3)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2)
    semantic_range (3.0.0)
-    shoulda-matchers (5.2.0)
+    shoulda-matchers (5.0.0)
      activesupport (>= 5.2.0)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
+    sidekiq (6.3.1)
+      connection_pool (>= 2.2.2)
      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
-    sidekiq-scheduler (4.0.3)
      redis (>= 4.2.0)
+    sidekiq-scheduler (3.1.0)
+      e2mmap
+      redis (>= 3, < 5)
      rufus-scheduler (~> 3.2)
-      sidekiq (>= 4, < 7)
+      sidekiq (>= 3)
+      thwait
      tilt (>= 1.4.0)
    simplecov (0.21.2)
      docile (~> 1.1)
@@ -613,7 +616,7 @@ GEM
      axlsx_styler (>= 1.0.0, < 2)
      caxlsx (>= 2.0.2, < 4)
      rodf (>= 1.0.0, < 2)
-    spring (4.1.0)
+    spring (3.0.0)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    sprockets (3.7.2)
@@ -630,49 +633,45 @@ GEM
    state_machines-activerecord (0.8.0)
      activerecord (>= 5.1)
      state_machines-activemodel (>= 0.8.0)
-    stimulus_reflex (3.5.0.pre9)
-      actioncable (>= 5.2)
-      actionpack (>= 5.2)
-      actionview (>= 5.2)
-      activesupport (>= 5.2)
-      cable_ready (>= 5.0.0.pre9)
-      nokogiri
-      rack
-      railties (>= 5.2)
-      redis
    stringex (2.8.5)
-    stripe (7.1.0)
+    stripe (5.42.0)
    temple (0.8.2)
-    test-prof (1.0.10)
-    test-unit (3.5.5)
+    test-prof (1.0.7)
+    test-unit (3.5.0)
      power_assert
    thor (1.2.1)
    thread-local (1.1.0)
-    tilt (2.0.11)
-    timecop (0.9.5)
+    thwait (0.2.0)
+      e2mmap
+    tilt (2.0.10)
+    timecop (0.9.4)
    ttfunk (1.7.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.4)
      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    uniform_notifier (1.16.0)
-    valid_email2 (4.0.4)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (2.1.0)
+    uniform_notifier (1.14.2)
+    valid_email2 (4.0.0)
      activemodel (>= 3.2)
      mail (~> 2.5)
-    vcr (6.1.0)
-    view_component (2.74.1)
+    view_component (2.41.0)
      activesupport (>= 5.0.0, < 8.0)
-      concurrent-ruby (~> 1.0)
      method_source (~> 1.0)
-    view_component_storybook (0.11.1)
+    view_component_storybook (0.10.1)
      view_component (>= 2.36)
    warden (1.2.9)
      rack (>= 2.0.9)
-    web-console (4.2.0)
+    web-console (4.1.0)
      actionview (>= 6.0.0)
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webmock (3.18.1)
+    webdrivers (5.0.0)
+      nokogiri (~> 1.6)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (~> 4.0)
+    webmock (3.14.0)
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
@@ -686,13 +685,13 @@ GEM
    websocket-extensions (0.1.5)
    whenever (1.0.0)
      chronic (>= 0.6.3)
-    wicked_pdf (2.6.3)
+    wicked_pdf (2.1.0)
      activesupport
    wkhtmltopdf-binary (0.12.6.5)
    xml-simple (1.1.8)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.1)
+    zeitwerk (2.5.3)

 PLATFORMS
  ruby
@@ -713,12 +712,15 @@ DEPENDENCIES
  angularjs-rails (= 1.8.0)
  arel-helpers (~> 2.12)
  awesome_nested_set
+  awesome_print
+  aws-sdk (= 1.67.0)
  aws-sdk-s3
  bigdecimal (= 3.0.2)
  bootsnap
  bugsnag
  bullet
-  cable_ready (= 5.0.0.pre9)
+  byebug
+  cable_ready (= 5.0.0.pre3)
  cancancan (~> 1.15.0)
  capybara
  catalog!
@@ -728,7 +730,6 @@ DEPENDENCIES
  database_cleaner
  db2fog!
  ddtrace
-  debug (>= 1.0.0)
  debugger-linecache
  devise
  devise-encryptable
@@ -764,7 +765,6 @@ DEPENDENCIES
  knapsack
  letter_opener (>= 1.4.1)
  listen
-  mime-types
  mimemagic (> 0.3.5)
  mini_racer (= 0.4.0)
  monetize (~> 1.11)
@@ -778,6 +778,7 @@ DEPENDENCIES
  pdf-reader
  pg (~> 1.2.3)
  pry (~> 0.13.0)
+  pry-byebug (~> 3.9.0)
  puma
  rack-mini-profiler (< 3.0.0)
  rack-rewrite
@@ -785,7 +786,6 @@ DEPENDENCIES
  rack-timeout
  rails (>= 6.1.4)
  rails-controller-testing
-  rails-erd
  rails-i18n
  rails_safe_tasks (~> 1.0)
  ransack (= 2.4.2)
@@ -794,8 +794,9 @@ DEPENDENCIES
  responders
  rexml
  roadie-rails
-  roo
+  roo!
  rspec-rails (>= 3.5.2)
+  rspec-retry
  rswag-api
  rswag-specs
  rswag-ui
@@ -803,6 +804,7 @@ DEPENDENCIES
  rubocop-rails
  sd_notify
  select2-rails!
+  selenium-webdriver
  shoulda-matchers
  sidekiq
  sidekiq-scheduler
@@ -811,18 +813,18 @@ DEPENDENCIES
  spring
  spring-commands-rspec
  state_machines-activerecord
-  stimulus_reflex (= 3.5.0.pre9)
  stringex (~> 2.8.5)
  stripe
  test-prof
  test-unit (~> 3.5)
  timecop
+  uglifier (>= 1.0.3)
  valid_email2
-  vcr
  view_component
  view_component_storybook
  web!
  web-console
+  webdrivers
  webmock
  webpacker (~> 5)
  whenever
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. B

 ## Licence

-Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2021 Open Food Foundation, released under the AGPL licence.

 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -22,6 +22,24 @@
 //= require angular-rails-templates
 //= require lodash.underscore.js

+// datetimepicker  (fil, nb)
+//= require flatpickr/dist/flatpickr.min
+//= require flatpickr/dist/l10n/ar
+//= require flatpickr/dist/l10n/cat
+//= require flatpickr/dist/l10n/cy
+//= require flatpickr/dist/l10n/de
+//= require flatpickr/dist/l10n/es
+//= require flatpickr/dist/l10n/fr
+//= require flatpickr/dist/l10n/it
+//= require flatpickr/dist/l10n/nl
+//= require flatpickr/dist/l10n/pl
+//= require flatpickr/dist/l10n/pt
+//= require flatpickr/dist/l10n/ru
+//= require flatpickr/dist/l10n/sv
+//= require flatpickr/dist/l10n/tr
+//= require shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min
+//= require flatpickr/dist/plugins/labelPlugin/labelPlugin
+
 // spree
 //= require admin/spree/spree
 //= require admin/spree/spree-select2
@@ -87,8 +105,6 @@
 //= require moment/locale/tr.js
 //= require moment/locale/pl.js

-//= require js-big-decimal/dist/web/js-big-decimal.min.js
-
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -256,10 +256,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout

  $scope.packVariant = (product, variant) ->
    if variant.hasOwnProperty("unit_value_with_description")
-      match = variant.unit_value_with_description.match(/^([\d\.\,]+(?= |$)|)( |)(.*)$/)
+      match = variant.unit_value_with_description.match(/^([\d\.]+(?= |$)|)( |)(.*)$/)
      if match
        product = BulkProducts.find product.id
-        variant.unit_value  = parseFloat(match[1].replace(",", "."))
+        variant.unit_value  = parseFloat(match[1])
        variant.unit_value  = null if isNaN(variant.unit_value)
        variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
        variant.unit_description = match[3]
--- a/app/assets/javascripts/admin/directives/display_as.js.coffee
+++ b/app/assets/javascripts/admin/directives/display_as.js.coffee
@@ -39,9 +39,9 @@ angular.module("ofn.admin").directive "ofnDisplayAs", (OptionValueNamer) ->
      # get relevant variant properties
      variant = scope.$eval(attrs.ofnDisplayAs) # Like this so we can switch between 'master' and 'variant'
      if variant.unit_value_with_description?
-        match = variant.unit_value_with_description.match(/^([\d\.\,]+(?= |$)|)( |)(.*)$/)
+        match = variant.unit_value_with_description.match(/^([\d\.]+(?= |$)|)( |)(.*)$/)
        if match
-          unit_value  = parseFloat(match[1].replace(",", "."))
+          unit_value  = parseFloat(match[1])
          unit_value  = null if isNaN(unit_value)
          unit_value *= variant_unit_scale if unit_value && variant_unit_scale
          unit_description = match[3]
--- a/app/assets/javascripts/admin/dropdown/directives/dropdown.js.coffee
+++ b/app/assets/javascripts/admin/dropdown/directives/dropdown.js.coffee
@@ -10,7 +10,6 @@
          scope.$emit "offClick"

    element.click (event) ->
-      return if event.target.closest(".ofn-drop-down").classList.contains "disabled" || event.target.classList.contains "disabled" 
      if !scope.expanded
        event.stopPropagation()
        scope.deregistrationCallback = scope.$on "offClick", ->
--- a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee
@@ -0,0 +1,15 @@
+angular.module("admin.enterprise_groups")
+  .controller "sideMenuCtrl", ($scope, SideMenu) ->
+    $scope.menu = SideMenu
+    $scope.select = SideMenu.select
+
+    $scope.menu.setItems [
+      { name: 'primary_details', label: t('primary_details'), icon_class: "icon-user" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
+      { name: 'about', label: t('about'), icon_class: "icon-pencil" }
+      { name: 'images', label: t('images'), icon_class: "icon-picture" }
+      { name: 'contact', label: t('admin_enterprise_groups_contact'), icon_class: "icon-phone" }
+      { name: 'web', label: t('admin_enterprise_groups_web'), icon_class: "icon-globe" }
+    ]
+
+    $scope.select(0)
--- a/app/assets/javascripts/admin/enterprises/controllers/country_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/country_controller.js.coffee
@@ -0,0 +1,20 @@
+# Used in enterprise new and edit forms to reset the state when the country is changed
+angular.module("admin.enterprises").controller 'countryCtrl', ($scope, $timeout, availableCountries) ->
+  $scope.address_type = "address"
+  $scope.countries = availableCountries
+
+  $scope.countriesById = $scope.countries.reduce (obj, country) ->
+    obj[country.id] = country
+    obj
+  , {}
+
+  $timeout ->
+    $scope.$watch 'Enterprise.' + $scope.address_type + '.country_id', (newID, oldID) ->
+      $scope.clearState() unless $scope.addressStateMatchesCountry()
+
+  $scope.clearState = ->
+    $scope.Enterprise[$scope.address_type].state_id = null
+
+  $scope.addressStateMatchesCountry = ->
+    $scope.countriesById[$scope.Enterprise[$scope.address_type].country_id].states.some (state) ->
+      state.id == $scope.Enterprise[$scope.address_type].state_id
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -1,7 +1,9 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, SideMenu, StatusMessage, RequestMonitor) ->
+  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage, RequestMonitor) ->
    $scope.Enterprise = enterprise
    $scope.Enterprises = Enterprises
+    $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
+    $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
    $scope.navClear = NavigationCheck.clear
    $scope.menu = SideMenu
    $scope.newManager = { id: null, email: (t('add_manager')) }
--- a/app/assets/javascripts/admin/enterprises/controllers/permalink_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/permalink_controller.js.coffee
@@ -0,0 +1,27 @@
+angular.module("admin.enterprises")
+  .controller "permalinkCtrl", ($scope, PermalinkChecker) ->
+    # locals
+    initialPermalink = $scope.Enterprise.permalink
+    pendingRequest = null
+
+    # variables on $scope
+    $scope.availablility = ""
+    $scope.checking = false
+
+    $scope.$watch "Enterprise.permalink", (newValue, oldValue) ->
+      if newValue == initialPermalink
+        $scope.availability = ""
+        return
+
+      $scope.checking = true
+      pendingRequest = PermalinkChecker.check(newValue)
+
+      pendingRequest.then (data) ->
+        if data.permalink == initialPermalink
+          $scope.availability = ""
+        else
+          $scope.availability = data.available
+        $scope.Enterprise.permalink = data.permalink
+        $scope.checking = false
+      , (data) ->
+        # Do nothing (this is hopefully an aborted request)
--- a/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
@@ -0,0 +1,49 @@
+angular.module("admin.enterprises")
+  .controller "sideMenuCtrl", ($scope, $parse, enterprise, SideMenu, enterprisePermissions) ->
+    $scope.Enterprise = enterprise
+    $scope.menu = SideMenu
+    $scope.select = SideMenu.select
+
+    $scope.menu.setItems [
+      { name: 'primary_details', label: t('primary_details'), icon_class: "icon-home" }
+      { name: 'address', label: t('address'), icon_class: "icon-map-marker" }
+      { name: 'contact', label: t('contact'), icon_class: "icon-phone" }
+      { name: 'social', label: t('social'), icon_class: "icon-twitter" }
+      { name: 'about', label: t('about'), icon_class: "icon-pencil" }
+      { name: 'business_details', label: t('business_details'), icon_class: "icon-briefcase" }
+      { name: 'images', label: t('images'), icon_class: "icon-picture" }
+      { name: 'properties', label: t('properties'), icon_class: "icon-tags", show: "showProperties()" }
+      { name: 'shipping_methods', label: t('shipping_methods'), icon_class: "icon-truck", show: "showShippingMethods()" }
+      { name: 'payment_methods', label: t('payment_methods'), icon_class: "icon-money", show: "showPaymentMethods()" }
+      { name: 'enterprise_fees', label: t('enterprise_fees'), icon_class: "icon-tasks", show: "showEnterpriseFees()" }
+      { name: 'enterprise_permissions', label: t('enterprise_permissions'), icon_class: "icon-plug" }
+      { name: 'inventory_settings', label: t('inventory_settings'), icon_class: "icon-list-ol", show: "enterpriseIsShop()" }
+      { name: 'tag_rules', label: t('tag_rules'), icon_class: "icon-random", show: "enterpriseIsShop()" }
+      { name: 'shop_preferences', label: t('shop_preferences'), icon_class: "icon-shopping-cart", show: "enterpriseIsShop()" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
+    ]
+
+    SideMenu.init()
+
+    $scope.showItem = (item) ->
+      if item.show?
+        $parse(item.show)($scope)
+      else
+        true
+
+    $scope.showProperties = ->
+      !!$scope.Enterprise.is_primary_producer
+
+    $scope.showShippingMethods = ->
+      enterprisePermissions.can_manage_shipping_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showPaymentMethods = ->
+      enterprisePermissions.can_manage_payment_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showEnterpriseFees = ->
+      enterprisePermissions.can_manage_enterprise_fees && ($scope.Enterprise.sells != "none" || $scope.Enterprise.is_primary_producer)
+
+    $scope.enterpriseIsShop = ->
+      $scope.Enterprise.sells != "none"
+
+    $scope.menu.redirect_function('enterprise_permissions', '/admin/enterprise_relationships')
--- a/app/assets/javascripts/admin/enterprises/services/enterprise_payment_methods.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/services/enterprise_payment_methods.js.coffee
@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .factory "EnterprisePaymentMethods", (enterprise, PaymentMethods) ->
+    new class EnterprisePaymentMethods
+      paymentMethods: PaymentMethods.all
+
+      constructor: ->
+        for payment_method in @paymentMethods
+          payment_method.selected = payment_method.id in enterprise.payment_method_ids
+
+      displayColor: ->
+        if @paymentMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @paymentMethods.reduce (count, payment_method) ->
+          count++ if payment_method.selected
+          count
+        , 0
--- a/app/assets/javascripts/admin/enterprises/services/enterprise_shipping_methods.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/services/enterprise_shipping_methods.js.coffee
@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .factory "EnterpriseShippingMethods", (enterprise, ShippingMethods) ->
+    new class EnterpriseShippingMethods
+      shippingMethods: ShippingMethods.all
+
+      constructor: ->
+        for shipping_method in @shippingMethods
+          shipping_method.selected = shipping_method.id in enterprise.shipping_method_ids
+
+      displayColor: ->
+        if @shippingMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @shippingMethods.reduce (count, shipping_method) ->
+          count++ if shipping_method.selected
+          count
+        , 0
--- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
+++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
@@ -25,10 +25,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
    $scope.resetFilters()
    $scope.refreshData()

-  $scope.$watchCollection "[startDate, endDate]", (newValues, oldValues) ->
-    if newValues != oldValues
-      $scope.refreshData()
-      
  $scope.refreshData = ->
    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
      $scope.setOrderCycleDateRange()
@@ -170,18 +166,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,

  $scope.sumUnitValues = ->
    sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
-        sum + lineItem.quantity
-      else
-        sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
+      sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
    , 0

  $scope.sumMaxUnitValues = ->
    sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
-        sum + lineItem.max_quantity
-      else
-        sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
+      sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
    , 0

  $scope.roundToThreeDecimals = (value) ->
@@ -195,8 +185,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
  $scope.getScale = (unitsProduct, unitsVariant) ->
    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume")
      unitsProduct.variant_unit_scale
-    else if unitsProduct.hasOwnProperty("variant_unit") && unitsProduct.variant_unit == "items"
-      1
    else
      null

@@ -221,11 +209,11 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,

  $scope.fulfilled = (sumOfUnitValues) ->
    # A Units Variant is an API object which holds unit properies of a variant
-    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size")&& $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
-      $scope.selectedUnitsProduct.hasOwnProperty("variant_unit")
-        if $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume"
-          scale = $scope.selectedUnitsProduct.variant_unit_scale
-          sumOfUnitValues = sumOfUnitValues * scale unless scale == 28.35 || scale == 453.6
+    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
+      $scope.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
+      ( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
+        scale = $scope.selectedUnitsProduct.variant_unit_scale
+        sumOfUnitValues = sumOfUnitValues * scale unless scale == 28.35 || scale == 453.6
        $scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size)
    else
      ''
--- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee
@@ -18,8 +18,7 @@ angular.module('admin.orderCycles')
      OrderCycle.exchangeDirection(exchange)

    $scope.enterprisesWithFees = ->
-      ids = [OrderCycle.participatingEnterpriseIds()..., [OrderCycle.order_cycle.coordinator_id]...]
-      $scope.enterprises[id] for id in Array.from(new Set(ids)) when $scope.enterpriseFeesForEnterprise(id).length > 0
+      $scope.enterprises[id] for id in [OrderCycle.participatingEnterpriseIds()..., [OrderCycle.order_cycle.coordinator_id]...] when $scope.enterpriseFeesForEnterprise(id).length > 0

    $scope.removeExchange = ($event, exchange) ->
      $event.preventDefault()
--- a/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee
+++ b/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee
@@ -1,4 +1,21 @@
 angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.enterprises'])
+  .directive 'datetimepicker', ($timeout, $parse) ->
+    require: "ngModel"
+    link: (scope, element, attrs, ngModel) ->
+      $timeout ->
+        fp = flatpickr(element,  Object.assign({},
+                            window.FLATPICKR_DATETIME_DEFAULT, {
+                            onOpen: (selectedDates, dateStr, instance) ->
+                              instance.setDate(ngModel.$modelValue)
+                              instance.input.dispatchEvent(new Event('focus', { bubbles: true }));
+                            }));
+        fp.minuteElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setMinutes(e.target.value), true)
+        fp.hourElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setHours(e.target.value), true)            
+
  .directive 'ofnOnChange', ->
    (scope, element, attrs) ->
      element.bind 'change', ->
--- a/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
@@ -93,9 +93,9 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $
      variant_ids

    participatingEnterpriseIds: ->
-      suppliers = (parseInt(exchange.enterprise_id) for exchange in this.order_cycle.incoming_exchanges)
-      distributors = (parseInt(exchange.enterprise_id) for exchange in this.order_cycle.outgoing_exchanges)
-      Array.from(new Set([suppliers..., distributors...]))
+      suppliers = (exchange.enterprise_id for exchange in this.order_cycle.incoming_exchanges)
+      distributors = (exchange.enterprise_id for exchange in this.order_cycle.outgoing_exchanges)
+      jQuery.unique(suppliers.concat(distributors)).sort()

    exchangesByDirection: (direction) ->
      if direction == 'incoming'
--- a/app/assets/javascripts/admin/orders/controllers/bulk_cancel_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/bulk_cancel_controller.js.coffee
@@ -1,14 +0,0 @@
-angular.module("admin.orders").controller "bulkCancelCtrl", ($scope, $http, $timeout) ->
-
-  $scope.cancelOrder = (orderIds, sendEmailCancellation, restock_items) ->
-    $http(
-      method: 'post'
-      url: "/admin/orders/bulk_cancel?order_ids=#{orderIds}&send_cancellation_email=#{sendEmailCancellation}&restock_items=#{restock_items}" ).then(->
-        window.location.reload()
-      )
-
-  $scope.cancelSelectedOrders = ->
-    ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
-      if confirm
-        $scope.cancelOrder $scope.selected_orders, sendEmailCancellation, restock_items
-    )
--- a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee
@@ -20,7 +20,7 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl
    $scope.distributor_id && $scope.order_cycle_id

  for oc in $scope.orderCycles
-    oc.name_and_status = "#{oc.name} (#{t("admin.order_cycles.status.#{oc.status}")})"
+    oc.name_and_status = "#{oc.name} (#{oc.status})"

  for shop in $scope.shops
    shop.disabled = !$scope.distributorHasOrderCycles(shop)
--- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
@@ -29,8 +29,6 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
    $scope.q = {
      completed_at_not_null: true
    }
-    e = new CustomEvent("flatpickr_clear");
-    window.dispatchEvent(e)

  $scope.clearFilters = () ->
    KeyValueMapStore.clearKeyValueMap()
--- a/app/assets/javascripts/admin/orders/directives/customer_search_override.js.coffee
+++ b/app/assets/javascripts/admin/orders/directives/customer_search_override.js.coffee
@@ -0,0 +1,62 @@
+angular.module("admin.orders").directive 'customerSearchOverride', ->
+  restrict: 'C'
+  scope:
+    distributorId: '@'
+  link: (scope, element, attr) ->
+    if $('#customer_autocomplete_template').length > 0
+      customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text())
+
+    formatCustomerResult = (customer) ->
+      customerTemplate
+        customer: customer
+        bill_address: customer.bill_address
+        ship_address: customer.ship_address
+
+    element.select2
+      placeholder: Spree.translations.choose_a_customer
+      minimumInputLength: 3
+      ajax:
+        url: '/admin/search/customers.json'
+        datatype: 'json'
+        data: (term, page) ->
+          {
+            q: term
+            distributor_id: scope.distributorId  # modified
+          }
+        results: (data, page) ->
+          { results: data }
+      dropdownCssClass: 'customer_search'
+      formatResult: formatCustomerResult
+      formatSelection: (customer) ->
+        _.each [
+          'bill_address'
+          'ship_address'
+        ], (address) ->
+          data = customer[address]
+          address_parts = [
+            'firstname'
+            'lastname'
+            'company'
+            'address1'
+            'address2'
+            'city'
+            'zipcode'
+            'phone'
+          ]
+          attribute_wrapper = '#order_' + address + '_attributes_'
+          if data  # modified
+            _.each address_parts, (part) ->
+              $(attribute_wrapper + part).val data[part]
+              return
+            $(attribute_wrapper + 'state_id').select2 'val', data['state_id']
+            $(attribute_wrapper + 'country_id').select2 'val', data['country_id']
+          else
+            _.each address_parts, (part) ->
+              $(attribute_wrapper + part).val ''
+              return
+            $(attribute_wrapper + 'state_id').select2 'val', ''
+            $(attribute_wrapper + 'country_id').select2 'val', ''
+          return
+        $('#order_email').val customer.email
+        $('#user_id').val customer.user_id  # modified
+        customer.email
--- a/app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee
@@ -0,0 +1,3 @@
+angular.module("admin.paymentMethods").controller "paymentMethodsCtrl", ($scope, PaymentMethods) ->
+  $scope.findPaymentMethodByID = (id) ->
+    $scope.PaymentMethod = PaymentMethods.byID[id]
--- a/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee
@@ -8,7 +8,7 @@ angular.module("admin.products")
      $scope.processVariantUnitWithScale()
      $scope.processUnitValueWithDescription()
      $scope.processUnitPrice()
-      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name() if $scope.product.variant_unit_scale
+      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name()

    $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()

@@ -21,8 +21,6 @@ angular.module("admin.products")
        else
          $scope.product.variant_unit = $scope.product.variant_unit_with_scale
          $scope.product.variant_unit_scale = null
-      else if $scope.product.variant_unit && $scope.product.variant_unit_scale
-        $scope.product.variant_unit_with_scale = VariantUnitManager.getUnitWithScale($scope.product.variant_unit, parseFloat($scope.product.variant_unit_scale))
      else
        $scope.product.variant_unit = $scope.product.variant_unit_scale = null

@@ -32,12 +30,8 @@ angular.module("admin.products")
        if match
          $scope.product.master.unit_value  = PriceParser.parse(match[1])
          $scope.product.master.unit_value  = null if isNaN($scope.product.master.unit_value)
-          $scope.product.master.unit_value = window.bigDecimal.multiply($scope.product.master.unit_value, $scope.product.variant_unit_scale, 2) if $scope.product.master.unit_value && $scope.product.variant_unit_scale
+          $scope.product.master.unit_value *= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
          $scope.product.master.unit_description = match[3]
-      else
-        value = $scope.product.master.unit_value
-        value /= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
-        $scope.product.master.unit_value_with_description = value + " " + $scope.product.master.unit_description

    $scope.processUnitPrice = ->
      price = $scope.product.price
--- a/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
@@ -23,10 +23,10 @@ angular.module("admin.products").controller "variantUnitsCtrl", ($scope, Variant

  $scope.updateValue = ->
    unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = bigDecimal.multiply(PriceParser.parse(unit_value_human), $scope.scale, 2)
+    $scope.unit_value = PriceParser.parse(unit_value_human) * $scope.scale

  variant_unit_value = angular.element('#variant_unit_value').val()
-  $scope.unit_value_human = parseFloat(bigDecimal.divide(variant_unit_value, $scope.scale, 2))
+  $scope.unit_value_human = variant_unit_value / $scope.scale

  $timeout -> $scope.processUnitPrice()
  $timeout -> $scope.updateValue()
--- a/app/assets/javascripts/admin/products/services/product_image_service.js.coffee
+++ b/app/assets/javascripts/admin/products/services/product_image_service.js.coffee
@@ -13,9 +13,3 @@ angular.module("ofn.admin").factory "ProductImageService", (FileUploader, SpreeA
      @imageUploader.onSuccessItem = (image, response) =>
        product.thumb_url = response.thumb_url
        product.image_url = response.image_url
-      @imageUploader.onErrorItem = (image, response) =>
-        if Array.isArray(response.errors)
-          message = response.errors.join("\n")
-        else
-          message = response.error.toString()
-        alert(message)
--- a/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee
+++ b/app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee
@@ -27,22 +27,16 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
        1000.0:
          name: 'kL'
          system: 'metric'
-      'items':
-        1:
-          name: 'items'

    @variantUnitOptions: ->
      available = availableUnits.split(",")
      options = for unit_type, _ of @units
        for scale in @unitScales(unit_type, available)
          name = @getUnitName(scale, unit_type)
-          ["#{I18n.t(unit_type)} (#{name})", @getUnitWithScale(unit_type, scale)]
+          ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
      options.push [[I18n.t('items'), 'items']]
      options = [].concat options...

-    @getUnitWithScale: (unit_type, scale) ->
-      "#{unit_type}_#{scale}"
-
    @getUnitName: (scale, unitType) ->
      if @units[unitType][scale]
        @units[unitType][scale]['name']
--- a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
@@ -0,0 +1,3 @@
+angular.module("admin.shippingMethods").controller "shippingMethodsCtrl", ($scope, ShippingMethods) ->
+  $scope.findShippingMethodByID = (id) ->
+    $scope.ShippingMethod = ShippingMethods.byID[id]
--- a/app/assets/javascripts/admin/spree/orders/shipments.js.erb
+++ b/app/assets/javascripts/admin/spree/orders/shipments.js.erb
@@ -25,12 +25,13 @@ $(document).ready(function() {
    var link = $(this);
    var shipment_number = link.data('shipment-number');
    var selected_shipping_rate_id = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipment_number + "']").val();
+    var unlock = link.parents('tbody').find("input[name='open_adjustment'][data-shipment-number='" + shipment_number + "']:checked").val();
    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");

    $.ajax({
      type: "PUT",
      url: url,
-      data: { shipment: { selected_shipping_rate_id: selected_shipping_rate_id  } }
+      data: { shipment: { selected_shipping_rate_id: selected_shipping_rate_id, unlock: unlock  } }
    }).done(function( msg ) {
      window.location.reload();
    }).error(function( msg ) {
@@ -39,94 +40,25 @@ $(document).ready(function() {
  }
  $('[data-hook=admin_order_edit_form] a.save-method').click(handle_shipping_method_save);

-  //handle tracking info edit/delete
-
-  // Show the input field to edit the tracking info
-  // And hide the input field when cancel is clicked
+  //handle tracking edit click
  $('a.edit-tracking').click(toggleTrackingEdit);
  $('a.cancel-tracking').click(toggleTrackingEdit);

-  saveTrackingInfo = function(){
-    let shipmentNumber = $(this).data('shipment-number');
-    let tracking = document.getElementById('tracking').value
+  handle_tracking_save = function(){
+    var link = $(this);
+    var shipment_number = link.data('shipment-number');
+    var tracking = link.parents('tbody').find('input#tracking').val();
+    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");

-    makeApiCall(trackingUrl(shipmentNumber), { shipment: { tracking: tracking } } )
-  }
-
-  deleteTrackingInfo = function(){
-    let shipmentNumber = $(this).data('shipment-number');
-    let tracking = ''
-
-    confirmDelete(trackingUrl(shipmentNumber), { shipment: { tracking: tracking } })
-  }
-
-  trackingUrl = function(shipmentNumber){
-    return Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipmentNumber + ".json");
-  }
-
-  $('[data-hook=admin_order_edit_form] a.save-tracking').click(saveTrackingInfo);
-  $('[data-hook=admin_order_edit_form] a.delete-tracking').click(deleteTrackingInfo);
-
-  // handle note edit/delete
-
-  // Show the input field to edit the note
-  // And hide the input field when cancel is clicked
-  $('a.edit-note.icon-edit').click(toggleNoteEdit);
-  $('a.cancel-note').click(toggleNoteEdit);
-
-  saveNote = function(){
-    let note = document.getElementById('note').value
-    makeApiCall(getNoteUrl(), { note: note })
-  }
-
-  deleteNote = function(){
-    let note = ''
-    confirmDelete(getNoteUrl(), { note: note })
-  }
-
-  getNoteUrl = function(){
-    return Spree.url( Spree.routes.orders_api + "/" + order_number);
-  }
-
-  confirmDelete = function(url, params){
-    displayDeleteAlert(function(confirmation) {
-      if (confirmation) {
-        makeApiCall(url, params)
-      }
-    }); 
-  }
-
-  $('[data-hook=admin_order_edit_form] a.save-note').click(saveNote);
-  $('[data-hook=admin_order_edit_form] a.delete-note').click(deleteNote);
-
-  // Makes API call for notes/tracking info
-  makeApiCall = function(url, params) {
    $.ajax({
      type: "PUT",
      url: url,
-      data: params
+      data: { shipment: { tracking: tracking } }
    }).done(function( msg ) {
      window.location.reload();
    }).error(function( msg ) {
      console.log(msg);
    });
  }
-
-  displayDeleteAlert = function(callback) {
-    i18nKey = "are_you_sure";
-    $('#custom-confirm .message').html(
-      ` ${t(i18nKey)}
-              <div class="form">
-              </div>`);
-    $('#custom-confirm button.confirm').unbind( "click" ).click(() => {
-      $('#custom-confirm').hide();
-      callback(true);
-    });
-    $('#custom-confirm button.cancel').click(() => {
-      $('#custom-confirm').hide();
-      callback(false)
-    });
-    $('#custom-confirm').show();
-  }
-
+  $('[data-hook=admin_order_edit_form] a.save-tracking').click(handle_tracking_save);
 });
--- a/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb
+++ b/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb
@@ -141,26 +141,8 @@ doAdjustItems = function(shipment_number, variant_id, quantity, inventory_units,

 toggleTrackingEdit = function(){
  var link = $(this);
-  var parent_node = link.parents('tbody')
-  let input = parent_node.find('#tracking')[0]
-  parent_node.find('tr.edit-tracking').toggle();
-  // Set focus on input and
-  // put cursor at it's end
-  input.focus()
-  input.setSelectionRange(-1, -1)
-  parent_node.find('tr.show-tracking').toggle();
-}
-
-toggleNoteEdit = function(){
-  var link = $(this);
-  var parent_node = link.parents('tbody')
-  let input = parent_node.find('#note')[0]
-  parent_node.find('tr.edit-note').toggle();
-  // Set focus on input and
-  // put cursor at it's end
-  input.focus()
-  input.setSelectionRange(-1, -1)
-  parent_node.find('tr.show-note').toggle();
+  link.parents('tbody').find('tr.edit-tracking').toggle();
+  link.parents('tbody').find('tr.show-tracking').toggle();
 }

 toggleMethodEdit = function(){
--- a/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee
+++ b/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee
@@ -8,18 +8,13 @@ handle_move = (e, data) ->
  node = data.rslt.o
  new_parent = data.rslt.np

-  url = new URL(base_url)
-  url.pathname = url.pathname + '/' + node.attr("id") 
-  data = {
-    _method: "put",
-    "taxon[position]": position,
-    "taxon[parent_id]": if !isNaN(new_parent.attr("id")) then new_parent.attr("id") else undefined
-  }
+  url = Spree.url(base_url).clone()
+  url.pathname = url.pathname + '/' + node.attr("id")
  $.ajax
    type: "POST",
    dataType: "json",
    url: url.toString(),
-    data: data,
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
    error: handle_ajax_error

  true
@@ -31,16 +26,11 @@ handle_create = (e, data) ->
  position = data.rslt.position
  new_parent = data.rslt.parent

-  data = {
-    "taxon[name]": name,
-    "taxon[position]": position
-    "taxon[parent_id]": if !isNaN(new_parent.attr("id")) then new_parent.attr("id") else undefined
-  }
  $.ajax
    type: "POST",
    dataType: "json",
    url: base_url.toString(),
-    data: data,
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
    error: handle_ajax_error,
    success: (data,result) ->
      node.attr('id', data.id)
@@ -49,10 +39,8 @@ handle_rename = (e, data) ->
  last_rollback = data.rlbk
  node = data.rslt.obj
  name = data.rslt.new_name
-  # change the name inside the main input field as well if taxon is the root one
-  document.getElementById("taxonomy_name").value = name if node.parents("[id]").attr("id") == "taxonomy_tree"

-  url = new URL(base_url)
+  url = Spree.url(base_url).clone()
  url.pathname = url.pathname + '/' + node.attr("id")

  $.ajax
@@ -65,8 +53,8 @@ handle_rename = (e, data) ->
 handle_delete = (e, data) ->
  last_rollback = data.rlbk
  node = data.rslt.obj
-  delete_url = new URL(base_url)
-  delete_url.pathname = delete_url.pathname + '/' + node.attr("id")
+  delete_url = base_url.clone()
+  delete_url.setPath delete_url.path() + '/' + node.attr("id")
  if confirm(Spree.translations.are_you_sure_delete)
    $.ajax
      type: "POST",
--- a/app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee
@@ -0,0 +1,29 @@
+angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($rootScope, $compile, $window, $templateCache, DialogDefaults, shops) ->
+  restrict: 'A'
+  scope: true
+  link: (scope, element, attr) ->
+    scope.submitted = false
+    scope.shops = shops
+    scope.shop_id = null
+
+    scope.newSubscription = ->
+      scope.new_subscription_form.$setPristine()
+      scope.submitted = true
+      if scope.shop_id?
+        $window.location.href = "/admin/subscriptions/new?subscription[shop_id]=#{scope.shop_id}"
+      return
+
+    # Compile modal template
+    template = $compile($templateCache.get('admin/new_subscription_dialog.html'))(scope)
+
+    # Set Dialog options
+    template.dialog(DialogDefaults)
+
+    # Link opening of dialog to click event on element
+    element.bind 'click', (e) ->
+      if shops.length == 1
+        scope.shop_id = shops[0].id
+        scope.newSubscription()
+      else
+        template.dialog('open')
+        $rootScope.$evalAsync()
--- a/app/assets/javascripts/admin/util.js.erb
+++ b/app/assets/javascripts/admin/util.js.erb
@@ -1,4 +1,70 @@
 $(document).ready(function() {
+  var onClickButtons = function(index, fp) {
+    var date;
+    // Memorize index used for the 'Close' button
+    // (currently it has index of 1)  
+    var closeButtonIndex = 1; 
+    switch (index) {
+      case 0:
+        date = new Date();
+        break;
+      case closeButtonIndex:
+        fp.close();
+        break;
+    }
+    // Set the date unless clicked button was the 'Close' one
+    if (index != closeButtonIndex) {
+      fp.setDate(date, true);
+    }
+  }
+  window.FLATPICKR_DATE_DEFAULT = {
+    altInput: true,
+    altFormat: Spree.translations.flatpickr_date_format,
+    dateFormat: "Y-m-d",
+    locale: I18n.base_locale,
+    plugins: [
+        ShortcutButtonsPlugin({
+          button: [
+            {
+              label: Spree.translations.today
+            },
+            {
+              label: Spree.translations.close
+            }
+          ],
+          label: "or",
+          onClick: onClickButtons
+        }),
+        labelPlugin({})
+      ]
+  }
+  window.FLATPICKR_DATETIME_DEFAULT = Object.assign(
+    {},
+    window.FLATPICKR_DATE_DEFAULT,
+    {
+      altInput: true,
+      altFormat: Spree.translations.flatpickr_datetime_format,
+      dateFormat: "Y-m-d H:i",
+      enableTime: true,
+      time_24hr: true,
+      plugins: [
+        ShortcutButtonsPlugin({
+          button: [
+            {
+              label: Spree.translations.now
+            },
+            {
+              label: Spree.translations.close
+            }
+          ],
+          label: "or",
+          onClick: onClickButtons
+        }),
+        labelPlugin({})
+      ]
+    }
+  );
+  flatpickr(".datetimepicker", window.FLATPICKR_DATETIME_DEFAULT);
  $('a.close').click(function(event){
    event.preventDefault();
    $(this).parent().slideUp(250);
--- a/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee
@@ -0,0 +1,14 @@
+angular.module("admin.utils").directive "datepicker", ($window, $timeout) ->
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    $timeout ->
+      flapickrInstance = flatpickr(element,  Object.assign(
+                            {},
+                            $window.FLATPICKR_DATE_DEFAULT, {
+                            onOpen: (selectedDates, dateStr, instance) ->
+                              instance.setDate(ngModel.$modelValue)
+                            }
+                          ));
+      ngModel.$render = () ->
+        newValue = ngModel.$viewValue;
+        flapickrInstance?.setDate(newValue)
--- a/app/assets/javascripts/admin/utils/directives/tags_with_translation.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/tags_with_translation.js.coffee
@@ -3,7 +3,6 @@ angular.module("admin.utils").directive "tagsWithTranslation", ($timeout) ->
  templateUrl: "admin/tags_input.html"
  scope:
    object: "="
-    form: "="
    tagsAttr: "@?"
    tagListAttr: "@?"
    findTags: "&"
@@ -19,15 +18,7 @@ angular.module("admin.utils").directive "tagsWithTranslation", ($timeout) ->
      scope.limitReached = scope.object[scope.tagsAttr].length >= scope.max if scope.max != undefined
      scope.object[scope.tagListAttr] = (tag.text for tag in scope.object[scope.tagsAttr]).join(",")

-    scope.$watch "object", (newObject) -> 
-      scope.object = newObject
-      init()
-
    $timeout ->
-      init()
-    
-    init = ->
-      return unless scope.object
      # Initialize properties if necessary
      scope.tagsAttr ||= "tags"
      scope.tagListAttr ||= "tag_list"
--- a/app/assets/javascripts/admin/utils/services/errors_parser.js.coffee
+++ b/app/assets/javascripts/admin/utils/services/errors_parser.js.coffee
@@ -5,16 +5,15 @@ angular.module("admin.utils").factory "ErrorsParser", ->
      return defaultContent unless errors?

      errorsString = ""
-      if Array.isArray(errors)
+      if errors.length > 0
        # it is an array of errors
        errorsString = errors.join("\n") + "\n"
-      else if typeof errors == "object"
+      else
        # it is a hash of errors
        keys = Object.keys(errors)
        for key in keys
          errorsString += errors[key].join("\n") + "\n"
-      else # string
-        errorsString = errors
+
      this.defaultIfEmpty(errorsString, defaultContent)

    defaultIfEmpty: (content, defaultContent) =>
--- a/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
@@ -20,6 +20,3 @@ angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, $http, Credit
    ).finally ->
      window.location.reload()

-
-  $scope.hasOneDefaultSavedCards = () ->
-    $scope.savedCreditCards.some((card) -> card.is_default)
--- a/app/assets/javascripts/darkswarm/directives/off_canvas_wrap.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/off_canvas_wrap.js.coffee
@@ -26,8 +26,4 @@ angular.module('mm.foundation.offcanvas').directive 'offCanvasWrap', ($window) -
      # Bind hiding of the off-canvas that only happens when screen width is over 1024px.
      win.bind 'resize.body', ->
        isolatedScope.hide() if $(window).width() > 1024
-
-      win.bind 'click.body', (e) ->
-        if e.target.closest(".left-off-canvas-menu") == null && e.target.closest(".left-off-canvas-toggle") == null
-          isolatedScope.hide()
  }
--- a/app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml
@@ -0,0 +1,14 @@
+#new-subscription-dialog
+  .text-normal.margin-bottom-30.text-center
+    = t('js.admin.subscriptions.new.please_select_a_shop')
+
+  %form{ name: 'new_subscription_form', novalidate: true, ng: { submit: "newSubscription()" }}
+
+    .text-center.margin-bottom-30
+      %input.ofn-select2.fullwidth#new_subscription_shop_id{ ng: { model: 'shop_id' }, required: true, name: 'shop_id', data: 'shops' }
+      %div{ ng: { show: "submitted && new_subscription_form.$pristine" } }
+        .error{ ng: { show: "new_subscription_form.shop_id.$error.required" } }
+          = t('js.admin.subscriptions.new.please_select_a_shop')
+
+    .text-center
+      %input.button.red.icon-plus{ type: 'submit', value: t('continue') }
--- a/app/assets/javascripts/templates/partials/contact.html.haml
+++ b/app/assets/javascripts/templates/partials/contact.html.haml
@@ -1,12 +1,8 @@
 %div.contact-container
-  %div.modal-centered{"ng-if" => "::enterprise.email_address || enterprise.website || enterprise.phone || enterprise.whatsapp_phone"}
+  %div.modal-centered{"ng-if" => "::enterprise.email_address || enterprise.website || enterprise.phone"}
    %p.modal-header {{'contact' | t}}
    %p{"ng-if" => "::enterprise.phone", "ng-bind" => "::enterprise.phone"}

-    %p{"ng-if" => "::enterprise.whatsapp_phone"}
-      %img{ src: image_path("/map_icons/social-logos/whatsapp.svg") }
-      %a{"ng-href" => "{{::enterprise.whatsapp_url}}", target: "_blank", "ng-bind" => "::enterprise.whatsapp_phone"}
-
    %p{"ng-if" => "::enterprise.email_address"}
      %a{"ng-href" => "{{::enterprise.email_address | stripUrl}}", target: "_blank", mailto: true}
        %span.obfuscatedEmail.email{"ng-bind" => "::enterprise.email_address | stripUrl"}
--- a/app/assets/javascripts/templates/price_breakdown.html.haml
+++ b/app/assets/javascripts/templates/price_breakdown.html.haml
@@ -9,19 +9,19 @@
        %span{"ng-bind" => "::'item_cost' | t"}
      %li{"ng-if" => "::variant.fees.admin"}
        .right {{ ::variant.fees.admin | localizeCurrency }}
-        %span{"ng-bind" => "::variant.fees_name.admin"}
+        %span{"ng-bind" => "::'admin_fee' | t"}
      %li{"ng-if" => "::variant.fees.sales"}
        .right {{ ::variant.fees.sales | localizeCurrency }}
-        %span{"ng-bind" => "::variant.fees_name.sales"}
+        %span{"ng-bind" => "::'sales_fee' | t"}
      %li{"ng-if" => "::variant.fees.packing"}
        .right {{ ::variant.fees.packing | localizeCurrency }}
-        %span{"ng-bind" => "::variant.fees_name.packing"}
+        %span{"ng-bind" => "::'packing_fee' | t"}
      %li{"ng-if" => "::variant.fees.transport"}
        .right {{ ::variant.fees.transport | localizeCurrency }}
-        %span{"ng-bind" => "::variant.fees_name.transport"}
+        %span{"ng-bind" => "::'transport_fee' | t"}
      %li{"ng-if" => "::variant.fees.fundraising"}
        .right {{ ::variant.fees.fundraising | localizeCurrency }}
-        %span{"ng-bind" => "::variant.fees_name.fundraising"}
+        %span{"ng-bind" => "::'fundraising_fee' | t"}
      %li
        %strong
          .right = {{ ::variant.price_with_fees | localizeCurrency }}
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module ApplicationCable
-  class Channel < ActionCable::Channel::Base
-  end
-end
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module ApplicationCable
-  class Connection < ActionCable::Connection::Base
-    identified_by :session_id, :current_user
-
-    def connect
-      # initializes Warden after a cold start, in case you're visitor #1
-      env["warden"].authenticated?
-      # the problem with only using session is that users often login on multiple devices
-      self.current_user = env["warden"].user
-      # the problem with only using user is that sometimes you might want to use SR before you login
-      self.session_id = request.session.id
-      # and so, we recommend using both
-
-      # this assumes that you want to enable SR for unauthenticated users
-      reject_unauthorized_connection unless current_user || session_id
-
-      # if you want to disable SR for unauthenticated users,
-      # comment out the line above and uncomment the line below
-      # reject_unauthorized_connection unless current_user
-    end
-  end
-end
--- a/app/components/multiple_checked_select_component.rb
+++ b/app/components/multiple_checked_select_component.rb
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class MultipleCheckedSelectComponent < ViewComponent::Base
-  def initialize(name:, options:, selected:)
-    @name = name
-    @options = options.map { |option| [option[0], option[1].to_sym] }
-    @selected = selected.nil? ? [] : selected.map(&:to_sym)
-  end
-end
--- a/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
+++ b/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
@@ -1,13 +0,0 @@
-.ofn-drop-down.ofn-drop-down-v2{ data: { controller: "multiple-checked-select" } }
-  %div.ofn-drop-down-label{ "data-multiple-checked-select-target": "button" }
-    %span{class: "label"}= t('admin.columns')
-    %span{ class: "icon-caret-down", "data-multiple-checked-select-target": "caret" }
-  %div.menu{ class: "hidden", "data-multiple-checked-select-target": "options" }
-    %div.filter
-      %input{ type: "text", "data-multiple-checked-select-target": "filter", placeholder: I18n.t('components.multiple_checked_select.filter_placeholder') }
-    %hr
-    %div.menu_items
-      - @options.each do |option|
-        %label.menu_item{ "data-multiple-checked-select-target": "option", "data-value": option[1], "data-label": option[0] }
-          %input.redesigned-input{ type: "checkbox", checked: @selected.include?(option[1]), name: "#{@name}[]", value: option[1] }
-          = option[0]
--- a/app/constraints/feature_toggle_constraint.rb
+++ b/app/constraints/feature_toggle_constraint.rb
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class FeatureToggleConstraint
-  def initialize(feature_name)
-    @feature = feature_name
-  end
-
-  def matches?(request)
-    OpenFoodNetwork::FeatureToggle.enabled?(@feature, current_user(request))
-  end
-
-  def current_user(request)
-    request.env['warden'].user
-  end
-end
--- a/app/constraints/split_checkout_constraint.rb
+++ b/app/constraints/split_checkout_constraint.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SplitCheckoutConstraint
+  def matches?(request)
+    OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, current_user(request)
+  end
+
+  def current_user(request)
+    request.env['warden'].user
+  end
+end
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -7,7 +7,6 @@ require 'open_food_network/order_cycle_permissions'
 module Admin
  class EnterprisesController < Admin::ResourceController
    include GeocodeEnterpriseAddress
-    include CablecarResponses

    # These need to run before #load_resource so that @object is initialised with sanitised values
    prepend_before_action :override_owner, only: :create
@@ -45,12 +44,7 @@ module Admin
    def edit
      @object = Enterprise.where(permalink: params[:id]).
        includes(users: [:ship_address, :bill_address]).first
-      if params[:stimulus]
-        @enterprise.is_primary_producer = params[:is_primary_producer]
-        @enterprise.sells = params[:enterprise_sells]
-        render operations: cable_car.morph("#side_menu", partial("admin/shared/side_menu"))
-          .morph("#permalink", partial("admin/enterprises/form/permalink"))
-      end
+      super
    end

    def welcome
--- a/app/controllers/admin/invoice_settings_controller.rb
+++ b/app/controllers/admin/invoice_settings_controller.rb
@@ -19,7 +19,6 @@ module Admin
        :enable_invoices?,
        :invoice_style2?,
        :enable_receipt_printing?,
-        :enterprise_number_required_on_invoices?,
      )
    end
  end
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -2,10 +2,10 @@

 module Admin
  class OrderCyclesController < Admin::ResourceController
-    include ::OrderCyclesHelper
+    include OrderCyclesHelper
    include PaperTrailLogging

-    prepend_before_action :set_order_cycle_id, only: [:incoming, :outgoing, :checkout_options]
+    prepend_before_action :set_order_cycle_id, only: [:incoming, :outgoing]
    before_action :load_data_for_index, only: :index
    before_action :require_coordinator, only: :new
    before_action :remove_protected_attrs, only: [:update]
@@ -67,12 +67,10 @@ module Admin
        update_nil_subscription_line_items_price_estimate(@order_cycle)
        respond_to do |format|
          flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
-          format.html { redirect_to_after_update_path }
+          format.html { redirect_back(fallback_location: root_path) }
          format.json { render json: { success: true } }
        end
-      elsif request.format.html?
-        render :checkout_options
-      elsif request.format.json?
+      else
        render json: { errors: @order_cycle.errors.full_messages }, status: :unprocessable_entity
      end
    end
@@ -192,16 +190,6 @@ module Admin
      end
    end

-    def redirect_to_after_update_path
-      if params[:context] == "checkout_options" && params[:save]
-        redirect_to main_app.admin_order_cycle_checkout_options_path(@order_cycle)
-      elsif params[:context] == "checkout_options" && params[:save_and_back_to_list]
-        redirect_to main_app.admin_order_cycles_path
-      else
-        redirect_back(fallback_location: root_path)
-      end
-    end
-
    def require_coordinator
      @order_cycle.coordinator =
        permitted_coordinating_enterprises_for(@order_cycle).find_by(id: params[:coordinator_id])
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -46,14 +46,6 @@ module Admin

      # Initialize data
      params[:display_summary_row] = true if request.get?
-      if OpenFoodNetwork::FeatureToggle.enabled?(:report_inverse_columns_logic,
-                                                 spree_current_user)
-        @params_fields_to_show = if request.get?
-                                   @report.columns.keys
-                                 else
-                                   params[:fields_to_show]
-                                 end
-      end

      @data = Reporting::FrontendData.new(spree_current_user)
    end
--- a/app/controllers/api/v0/orders_controller.rb
+++ b/app/controllers/api/v0/orders_controller.rb
@@ -26,13 +26,6 @@ module Api
        }
      end

-      def update
-        authorize! :admin, order
-
-        order.update!(order_params)
-        render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
-      end
-
      def ship
        authorize! :admin, order

@@ -79,10 +72,6 @@ module Api
          includes(line_items: { variant: [:product, :stock_items, :default_price] }).
          first!
      end
-
-      def order_params
-        params.permit(:note)
-      end
    end
  end
 end
--- a/app/controllers/api/v0/product_images_controller.rb
+++ b/app/controllers/api/v0/product_images_controller.rb
@@ -6,21 +6,20 @@ module Api
      respond_to :json

      def update_product_image
-        product = Spree::Product.find(params[:product_id])
-        authorize! :update, product
+        @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'
-        )
-
-        success_status = image.persisted? ? :ok : :created
-
-        if image.update(attachment: params[:file])
-          render json: image, serializer: ImageSerializer, status: success_status
+        if @product.images.first.nil?
+          @image = Spree::Image.create(
+            attachment: params[:file],
+            viewable_id: @product.master.id,
+            viewable_type: 'Spree::Variant'
+          )
+          render json: @image, serializer: ImageSerializer, status: :created
        else
-          error_json = { errors: image.errors.full_messages }
-          render json: error_json, status: :unprocessable_entity
+          @image = @product.images.first
+          @image.update(attachment: params[:file])
+          render json: @image, serializer: ImageSerializer, status: :ok
        end
      end
    end
--- a/app/controllers/api/v0/shipments_controller.rb
+++ b/app/controllers/api/v0/shipments_controller.rb
@@ -28,14 +28,19 @@ module Api
        authorize! :read, Spree::Shipment
        @shipment = @order.shipments.find_by!(number: params[:id])
        params[:shipment] ||= []
+        unlock = params[:shipment].delete(:unlock)

-        @shipment.fee_adjustment.fire_events(:open)
+        if unlock == 'yes'
+          @shipment.fee_adjustment.fire_events(:open)
+        end

        if @shipment.update(shipment_params)
          @order.updater.update_totals_and_states
        end

-        @shipment.fee_adjustment.close
+        if unlock == 'yes'
+          @shipment.fee_adjustment.close
+        end

        render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
      end
--- a/app/controllers/api/v0/taxons_controller.rb
+++ b/app/controllers/api/v0/taxons_controller.rb
@@ -73,7 +73,7 @@ module Api
      def taxon_params
        return if params[:taxon].blank?

-        params.require(:taxon).permit([:name, :parent_id, :position])
+        params.require(:taxon).permit([:name, :parent_id])
      end
    end
  end
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -40,7 +40,7 @@ module Api
      end

      def restrict_feature
-        not_found unless OpenFoodNetwork::FeatureToggle.enabled?(:api_v1, @current_api_user)
+        not_found unless Flipper.enabled?(:api_v1, @current_api_user)
      end

      def current_ability
--- a/app/controllers/api/v1/customers_controller.rb
+++ b/app/controllers/api/v1/customers_controller.rb
@@ -5,10 +5,9 @@ require 'open_food_network/permissions'
 module Api
  module V1
    class CustomersController < Api::V1::BaseController
-      include AddressTransformation
-
      skip_authorization_check only: :index

+      before_action :set_customer, only: [:show, :update, :destroy]
      before_action :authorize_action, only: [:show, :update, :destroy]

      def index
@@ -18,44 +17,44 @@ module Api
      end

      def show
-        render json: Api::V1::CustomerSerializer.new(customer, include_options)
+        render json: Api::V1::CustomerSerializer.new(@customer, include_options)
      end

      def create
        authorize! :update, Enterprise.find(customer_params[:enterprise_id])
-        customer = Customer.new(customer_params)
+        @customer = Customer.new(customer_params)

-        if customer.save
-          render json: Api::V1::CustomerSerializer.new(customer), status: :created
+        if @customer.save
+          render json: Api::V1::CustomerSerializer.new(@customer), status: :created
        else
-          invalid_resource! customer
+          invalid_resource! @customer
        end
      end

      def update
-        if customer.update(customer_params)
-          render json: Api::V1::CustomerSerializer.new(customer)
+        if @customer.update(customer_params)
+          render json: Api::V1::CustomerSerializer.new(@customer)
        else
-          invalid_resource! customer
+          invalid_resource! @customer
        end
      end

      def destroy
-        if customer.destroy
-          render json: Api::V1::CustomerSerializer.new(customer)
+        if @customer.destroy
+          render json: Api::V1::CustomerSerializer.new(@customer)
        else
-          invalid_resource! customer
+          invalid_resource! @customer
        end
      end

      private

-      def customer
-        @customer ||= Customer.find(params[:id])
+      def set_customer
+        @customer = Customer.find(params[:id])
      end

      def authorize_action
-        authorize! action_name.to_sym, customer
+        authorize! action_name.to_sym, @customer
      end

      def search_customers
@@ -78,8 +77,7 @@ module Api
            :phone, :latitude, :longitude,
            :first_name, :last_name,
            :street_address_1, :street_address_2,
-            :postal_code, :locality,
-            { region: [:name, :code], country: [:name, :code] },
+            :postal_code, :locality, :region, :country,
          ]
        ).to_h

@@ -91,6 +89,39 @@ module Api
        attributes
      end

+      def transform_address!(attributes, from, to)
+        return unless attributes.key?(from)
+
+        address = attributes.delete(from)
+
+        if address.nil?
+          attributes[to] = nil
+          return
+        end
+
+        address.transform_keys! do |key|
+          {
+            phone: :phone, latitude: :latitude, longitude: :longitude,
+            first_name: :firstname, last_name: :lastname,
+            street_address_1: :address1, street_address_2: :address2,
+            postal_code: :zipcode,
+            locality: :city,
+            region: :state_name,
+            country: :country,
+          }.with_indifferent_access[key]
+        end
+
+        if address[:state_name].present?
+          address[:state] = Spree::State.find_by(name: address[:state_name])
+        end
+
+        if address[:country].present?
+          address[:country] = Spree::Country.find_by(name: address[:country])
+        end
+
+        attributes["#{to}_attributes"] = address
+      end
+
      def editable_enterprises
        OpenFoodNetwork::Permissions.new(current_api_user).editable_enterprises.select(:id)
      end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -39,7 +39,6 @@ class ApplicationController < ActionController::Base
  include Spree::Core::ControllerHelpers::Common

  before_action :set_cache_headers # prevent cart emptying via cache when using back button #1213
-  before_action :check_disabled_user, if: :spree_user_signed_in?
  before_action :set_after_login_url

  include RawParams
@@ -160,15 +159,6 @@ class ApplicationController < ActionController::Base
    response.headers["Pragma"] = "no-cache"
    response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
  end
-
-  def check_disabled_user
-    return unless current_spree_user.disabled
-
-    flash[:success] = nil
-    flash[:error] = I18n.t("devise.failure.disabled")
-    sign_out current_spree_user
-    redirect_to main_app.root_path
-  end
 end

 require 'spree/i18n/initializer'
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -16,7 +16,12 @@ class BaseController < ApplicationController
  private

  def set_order_cycles
-    @order_cycles = Shop::OrderCyclesList.ready_for_checkout_for(@distributor, current_customer)
+    unless @distributor.ready_for_checkout?
+      @order_cycles = OrderCycle.where('false')
+      return
+    end
+
+    @order_cycles = Shop::OrderCyclesList.new(@distributor, current_customer).call

    set_order_cycle
  end
--- a/app/controllers/concerns/address_transformation.rb
+++ b/app/controllers/concerns/address_transformation.rb
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-# Our internal data structures are different to the API data strurctures.
-module AddressTransformation
-  extend ActiveSupport::Concern
-
-  def transform_address!(attributes, from, to)
-    return unless attributes.key?(from)
-
-    address = attributes.delete(from)
-
-    if address.nil?
-      attributes[to] = nil
-      return
-    end
-
-    address.transform_keys! do |key|
-      {
-        phone: :phone, latitude: :latitude, longitude: :longitude,
-        first_name: :firstname, last_name: :lastname,
-        street_address_1: :address1, street_address_2: :address2,
-        postal_code: :zipcode,
-        locality: :city,
-        region: :state,
-        country: :country,
-      }.with_indifferent_access[key]
-    end
-
-    address[:state] = find_state(address) if address[:state].present?
-    address[:country] = find_country(address) if address[:country].present?
-
-    attributes["#{to}_attributes"] = address
-  end
-
-  private
-
-  def find_state(address)
-    Spree::State.find_by("LOWER(abbr) = ? OR LOWER(name) = ?",
-                         address.dig(:state, :code)&.downcase,
-                         address.dig(:state, :name)&.downcase)
-  end
-
-  def find_country(address)
-    Spree::Country.find_by("LOWER(iso) = ? OR LOWER(name) = ?",
-                           address.dig(:country, :code)&.downcase,
-                           address.dig(:country, :name)&.downcase)
-  end
-end
--- a/app/controllers/concerns/order_completion.rb
+++ b/app/controllers/concerns/order_completion.rb
@@ -50,9 +50,7 @@ module OrderCompletion
  end

  def order_invalid!
-    Bugsnag.notify("Notice: invalid order loaded during checkout") do |payload|
-      payload.add_metadata :order, @order
-    end
+    Bugsnag.notify("Notice: invalid order loaded during checkout", order: @order)

    flash[:error] = t('checkout.order_not_loaded')
    redirect_to main_app.shop_path
@@ -83,9 +81,7 @@ module OrderCompletion
  end

  def processing_failed(error = RuntimeError.new(order_processing_error))
-    Bugsnag.notify(error) do |payload|
-      payload.add_metadata :order, @order
-    end
+    Bugsnag.notify(error, order: @order)
    flash[:error] = order_processing_error if flash.blank?
    Checkout::PostCheckoutActions.new(@order).failure
  end
--- a/app/controllers/concerns/order_stock_check.rb
+++ b/app/controllers/concerns/order_stock_check.rb
@@ -21,17 +21,12 @@ module OrderStockCheck
  def check_order_cycle_expiry
    return unless current_order_cycle&.closed?

-    Bugsnag.notify("Notice: order cycle closed during checkout completion") do |payload|
-      payload.add_metadata :order, current_order
-    end
+    Bugsnag.notify("Notice: order cycle closed during checkout completion", order: current_order)
    current_order.empty!
    current_order.set_order_cycle! nil

    flash[:info] = I18n.t('order_cycle_closed')
-    respond_to do |format|
-      format.json { render json: { path: main_app.shop_path }, status: :see_other }
-      format.html { redirect_to main_app.shop_path, status: :see_other }
-    end
+    redirect_to main_app.shop_path
  end

  private
@@ -41,7 +36,7 @@ module OrderStockCheck
  end

  def reset_order_to_cart
-    return if OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, spree_current_user
+    return if Flipper.enabled? :split_checkout, spree_current_user

    OrderCheckoutRestart.new(@order).call
  end
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class ErrorsController < ApplicationController
-  layout "errors"
-
-  def not_found
-    render status: :not_found
-  end
-
-  def internal_server_error
-    render status: :internal_server_error
-  end
-
-  def unprocessable_entity
-    render status: :unprocessable_entity
-  end
-end
--- a/app/controllers/split_checkout_controller.rb
+++ b/app/controllers/split_checkout_controller.rb
@@ -21,10 +21,6 @@ class SplitCheckoutController < ::BaseController

  def edit
    redirect_to_step_based_on_order unless params[:step]
-    check_step if params[:step]
-    recalculate_tax if params[:step] == "summary"
-
-    flash_error_when_no_shipping_method_available if available_shipping_methods.none?
  end

  def update
@@ -49,10 +45,6 @@ class SplitCheckoutController < ::BaseController

  private

-  def flash_error_when_no_shipping_method_available
-    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
-  end
-
  def clear_invalid_payments
    @order.payments.with_state(:invalid).delete_all
  end
@@ -153,18 +145,4 @@ class SplitCheckoutController < ::BaseController
    end
    redirect_to_step_based_on_order
  end
-
-  def check_step
-    case @order.state
-    when "cart", "address", "delivery"
-      redirect_to checkout_step_path(:details) unless params[:step] == "details"
-    when "payment"
-      redirect_to checkout_step_path(:payment) if params[:step] == "summary"
-    end
-  end
-
-  def recalculate_tax
-    @order.create_tax_charge!
-    @order.update_order!
-  end
 end
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -42,10 +42,6 @@ module Spree
          @order.update_order!
        end

-        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'))
@@ -59,7 +55,7 @@ module Spree
          redirect_to spree.edit_admin_order_path(@order)
        else
          # Jump to next step if order is not complete
-          redirect_to spree.admin_order_payments_path(@order)
+          redirect_to spree.admin_order_customer_path(@order)
        end
      end

@@ -67,18 +63,6 @@ module Spree
        load_spree_api_key
      end

-      def bulk_cancel
-        order_ids = params[:order_ids].split(',')
-
-        Spree::Order.where(id: order_ids).find_each do |order|
-          order.send_cancellation_email = params[:send_cancellation_email] != "false"
-          order.restock_items = params.fetch(:restock_items, "true") == "true"
-          order.cancel
-        end
-
-        flash[:success] = Spree.t(:order_updated)
-      end
-
      def fire
        event = params[:e]
        @order.send_cancellation_email = params[:send_cancellation_email] != "false"
@@ -142,7 +126,7 @@ module Spree
      end

      def require_distributor_abn
-        return if @order.distributor.can_invoice?
+        return if @order.distributor.abn.present?

        flash[:error] = t(:must_have_valid_business_number,
                          enterprise_name: @order.distributor.name)
--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -30,11 +30,12 @@ module Spree
          @object.attributes = permitted_resource_params
          if @object.save
            flash[:success] = flash_message_for(@object, :successfully_created)
-            redirect_after_save
+            if params[:button] == "add_another"
+              redirect_to spree.new_admin_product_path
+            else
+              redirect_to spree.admin_products_path
+            end
          else
-            # Re-fill the form with deleted params on product
-            @on_hand = request.params[:product][:on_hand]
-            @on_demand = request.params[:product][:on_demand]
            render :new
          end
        end
@@ -137,14 +138,6 @@ module Spree

      private

-      def redirect_after_save
-        if params[:button] == "add_another"
-          redirect_to spree.new_admin_product_path
-        else
-          redirect_to spree.admin_products_path
-        end
-      end
-
      def product_set_from_params
        collection_hash = Hash[products_bulk_params[:products].each_with_index.map { |p, i|
                                 [i, p]
@@ -227,10 +220,10 @@ module Spree

      def notify_bugsnag(error, product, variant)
        Bugsnag.notify(error) do |report|
-          report.add_metadata(:product, product.attributes)
-          report.add_metadata(:product_error, product.errors.first) unless product.valid?
-          report.add_metadata(:variant, variant.attributes)
-          report.add_metadata(:variant_error, variant.errors.first) unless variant.valid?
+          report.add_tab(:product, product.attributes)
+          report.add_tab(:product_error, product.errors.first) unless product.valid?
+          report.add_tab(:variant, variant.attributes)
+          report.add_tab(:variant_error, variant.errors.first) unless variant.valid?
        end
      end

--- a/app/controllers/spree/admin/search_controller.rb
+++ b/app/controllers/spree/admin/search_controller.rb
@@ -18,28 +18,19 @@ module Spree
      end

      def customers
-        render json: load_customers, each_serializer: ::Api::Admin::CustomerSerializer
+        @customers = []
+        if spree_current_user.enterprises.pluck(:id).include? search_params[:distributor_id].to_i
+          @customers = Customer.
+            ransack(m: 'or', email_start: search_params[:q], first_name_start: search_params[:q],
+                    last_name_start: search_params[:q]).
+            result.
+            where(enterprise_id: search_params[:distributor_id].to_i)
+        end
+        render json: @customers, each_serializer: ::Api::Admin::CustomerSerializer
      end

      private

-      def load_customers
-        return [] unless valid_enterprise_given?
-
-        Customer.ransack(
-          m: 'or', email_start: search_params[:q],
-          first_name_start: search_params[:q], last_name_start: search_params[:q]
-        ).result.where(enterprise_id: search_params[:distributor_id].to_i)
-      end
-
-      def valid_enterprise_given?
-        return true if spree_current_user.admin?
-
-        spree_current_user.enterprises.where(
-          id: search_params[:distributor_id].to_i
-        ).present?
-      end
-
      def ransack_hash
        {
          m: 'or',
--- a/app/controllers/spree/admin/shipping_methods_controller.rb
+++ b/app/controllers/spree/admin/shipping_methods_controller.rb
@@ -95,20 +95,11 @@ module Spree
      end

      def check_shipping_fee_input
-        shipping_fees = permitted_resource_params['calculator_attributes']&.slice(
-          :preferred_flat_percent, :preferred_amount,
-          :preferred_first_item, :preferred_additional_item,
-          :preferred_minimal_amount, :preferred_normal_amount,
-          :preferred_discount_amount, :preferred_per_unit
-        )
+        shipping_amount = permitted_resource_params.dig('calculator_attributes', 'preferred_amount')

-        return unless shipping_fees
-
-        shipping_fees.each do |_, shipping_amount|
-          unless shipping_amount.nil? || Float(shipping_amount, exception: false)
-            flash[:error] = I18n.t(:calculator_preferred_value_error)
-            return redirect_to location_after_save
-          end
+        unless shipping_amount.nil? || Float(shipping_amount, exception: false) 
+          flash[:error] = I18n.t(:calculator_preferred_value_error) 
+          return redirect_to location_after_save      
        end
      end
    end
--- a/app/controllers/spree/admin/users_controller.rb
+++ b/app/controllers/spree/admin/users_controller.rb
@@ -48,11 +48,30 @@ module Spree
            @user.spree_roles = roles.reject(&:blank?).collect{ |r| Spree::Role.find(r) }
          end

-          flash.now[:success] = update_message
+          message = if new_email_unconfirmed?
+                      Spree.t(:email_updated)
+                    else
+                      Spree.t(:account_updated)
+                    end
+          flash.now[:success] = message
        end
        render :edit
      end

+      def generate_api_key
+        if @user.generate_spree_api_key!
+          flash[:success] = t('spree.api.key_generated')
+        end
+        redirect_to spree.edit_admin_user_path(@user)
+      end
+
+      def clear_api_key
+        if @user.clear_spree_api_key!
+          flash[:success] = t('spree.api.key_cleared')
+        end
+        redirect_to spree.edit_admin_user_path(@user)
+      end
+
      protected

      def collection
@@ -81,16 +100,6 @@ module Spree

      private

-      def update_message
-        return Spree.t(:show_api_key_view_toggled) if @user.show_api_key_view_previously_changed?
-
-        if new_email_unconfirmed?
-          Spree.t(:email_updated)
-        else
-          Spree.t(:account_updated)
-        end
-      end
-
      # handling raise from Admin::ResourceController#destroy
      def user_destroy_with_orders_error
        render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
@@ -128,9 +137,7 @@ module Spree
      end

      def user_params
-        ::PermittedAttributes::User.new(params).call(
-          %i[enterprise_limit show_api_key_view]
-        )
+        ::PermittedAttributes::User.new(params).call([:enterprise_limit])
      end
    end
  end
--- a/app/controllers/spree/api_keys_controller.rb
+++ b/app/controllers/spree/api_keys_controller.rb
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class ApiKeysController < ::BaseController
-    include Spree::Core::ControllerHelpers
-    include I18nHelper
-
-    prepend_before_action :load_object
-
-    def create
-      @user.generate_api_key
-
-      if @user.save
-        flash[:success] = t('spree.api.key_generated')
-      end
-
-      redirect_to redirect_path
-    end
-
-    def destroy
-      @user.spree_api_key = nil
-
-      if @user.save
-        flash[:success] = t('spree.api.key_cleared')
-      end
-
-      redirect_to redirect_path
-    end
-
-    private
-
-    def load_object
-      @user ||= find_user
-      if @user
-        authorize! params[:action].to_sym, @user
-      else
-        redirect_to main_app.login_path
-      end
-    end
-
-    def find_user
-      Spree::User.find_by(id: params[:id]) || spree_current_user
-    end
-
-    def redirect_path
-      if request.referer.blank? || request.referer.include?(spree.account_path)
-        developer_settings_path
-      else
-        request.referer
-      end
-    end
-
-    def developer_settings_path
-      "#{spree.account_path}#/developer_settings"
-    end
-  end
-end
--- a/app/controllers/spree/credit_cards_controller.rb
+++ b/app/controllers/spree/credit_cards_controller.rb
@@ -49,10 +49,7 @@ module Spree

      # Using try because we may not have a card here
      if @credit_card.try(:destroy)
-        if @credit_card.is_default
-          remove_shop_authorizations
-          mark_as_default_next_credit_card if credit_cards_with_payment_profile.count > 0
-        end
+        remove_shop_authorizations if @credit_card.is_default
        flash[:success] = I18n.t(:card_has_been_removed, number: "x-#{@credit_card.last_digits}")
      else
        flash[:error] = I18n.t(:card_could_not_be_removed)
@@ -70,14 +67,6 @@ module Spree
      @credit_card.user.customers.update_all(allow_charges: false)
    end

-    def mark_as_default_next_credit_card
-      credit_cards_with_payment_profile.first.update(is_default: true)
-    end
-
-    def credit_cards_with_payment_profile
-      spree_current_user.credit_cards.with_payment_profile
-    end
-
    def create_customer(token)
      Stripe::Customer.create(email: spree_current_user.email, source: token)
    end
--- a/app/controllers/spree/orders_controller.rb
+++ b/app/controllers/spree/orders_controller.rb
@@ -4,7 +4,6 @@ module Spree
  class OrdersController < ::BaseController
    include OrderCyclesHelper
    include Rails.application.routes.url_helpers
-    include CablecarResponses

    layout 'darkswarm'

@@ -100,8 +99,7 @@ module Spree
      else
        flash[:error] = I18n.t(:orders_could_not_cancel)
      end
-      render status: :found,
-             operations: cable_car.redirect_to(url: request.referer || main_app.order_path(@order))
+      redirect_to request.referer || main_app.order_path(@order)
    end

    private
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -16,7 +16,6 @@ module Spree
    prepend_before_action :handle_unconfirmed_email
    before_action :set_checkout_redirect, only: :create
    after_action :ensure_valid_locale_persisted, only: :create
-    skip_before_action :check_disabled_user

    def create
      authenticate_spree_user!
--- a/app/controllers/spree/users_controller.rb
+++ b/app/controllers/spree/users_controller.rb
@@ -78,7 +78,7 @@ module Spree

    def load_object
      @user ||= spree_current_user
-      if @user && !@user.disabled
+      if @user
        authorize! params[:action].to_sym, @user
      else
        redirect_to main_app.login_path
--- a/app/helpers/admin/enterprise_groups_helper.rb
+++ b/app/helpers/admin/enterprise_groups_helper.rb
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  module EnterpriseGroupsHelper
-    def enterprise_group_side_menu_items
-      [
-        { name: 'primary_details', icon_class: "icon-user", selected: "selected" },
-        { name: 'users', icon_class: "icon-user" },
-        { name: 'about', icon_class: "icon-pencil" },
-        { name: 'images', icon_class: "icon-picture" },
-        { name: 'contact', icon_class: "icon-phone" },
-        { name: 'web', icon_class: "icon-globe" },
-      ]
-    end
-  end
-end
--- a/app/helpers/admin/enterprises_helper.rb
+++ b/app/helpers/admin/enterprises_helper.rb
@@ -13,34 +13,5 @@ module Admin
    def select_only_item(producers)
      producers.size == 1 ? producers.first.id : nil
    end
-
-    def enterprise_side_menu_items(enterprise)
-      is_shop = enterprise.sells != "none"
-      show_properties = !!enterprise.is_primary_producer
-      show_shipping_methods = can?(:manage_shipping_methods, enterprise) && is_shop
-      show_payment_methods = can?(:manage_payment_methods, enterprise) && is_shop
-      show_enterprise_fees = can?(:manage_enterprise_fees,
-                                  enterprise) && (is_shop || enterprise.is_primary_producer)
-
-      [
-        { name: 'primary_details', icon_class: "icon-home", show: true, selected: 'selected' },
-        { name: 'address', icon_class: "icon-map-marker", show: true },
-        { name: 'contact', icon_class: "icon-phone", show: true },
-        { name: 'social',  icon_class: "icon-twitter", show: true },
-        { name: 'about',   icon_class: "icon-pencil", show: true, form_name: "about_us" },
-        { name: 'business_details', icon_class: "icon-briefcase", show: true },
-        { name: 'images', icon_class: "icon-picture", show: true },
-        { name: 'properties', icon_class: "icon-tags", show: show_properties },
-        { name: 'shipping_methods', icon_class: "icon-truck", show: show_shipping_methods },
-        { name: 'payment_methods',  icon_class: "icon-money", show: show_payment_methods },
-        { name: 'enterprise_fees',  icon_class: "icon-tasks", show: show_enterprise_fees },
-        { name: 'enterprise_permissions', icon_class: "icon-plug", show: true,
-          href: admin_enterprise_relationships_path },
-        { name: 'inventory_settings', icon_class: "icon-list-ol", show: is_shop },
-        { name: 'tag_rules', icon_class: "icon-random", show: is_shop },
-        { name: 'shop_preferences', icon_class: "icon-shopping-cart", show: is_shop },
-        { name: 'users', icon_class: "icon-user", show: true }
-      ]
-    end
  end
 end
--- a/app/helpers/checkout_helper.rb
+++ b/app/helpers/checkout_helper.rb
@@ -32,9 +32,25 @@ module CheckoutHelper
      }
    end

+    enterprise_fee_adjustments = adjustments.select { |a|
+      a.originator_type == 'EnterpriseFee' && a.adjustable_type != 'Spree::LineItem'
+    }
+    adjustments.reject! { |a|
+      a.originator_type == 'EnterpriseFee' && a.adjustable_type != 'Spree::LineItem'
+    }
+    unless exclude.include? :admin_and_handling
+      adjustments << Spree::Adjustment.new(
+        label: I18n.t(:orders_form_admin), amount: enterprise_fee_adjustments.sum(&:amount)
+      )
+    end
+
    adjustments
  end

+  def display_line_item_fees_total_for(order)
+    Spree::Money.new order.adjustments.enterprise_fee.sum(:amount), currency: order.currency
+  end
+
  def checkout_line_item_fees(order)
    order.line_item_adjustments.enterprise_fee
  end
@@ -54,13 +70,10 @@ module CheckoutHelper
  def display_checkout_taxes_hash(order)
    totals = OrderTaxAdjustmentsFetcher.new(order).totals

-    totals.map do |tax_rate, tax_amount|
-      {
-        amount: Spree::Money.new(tax_amount, currency: order.currency),
-        percentage: number_to_percentage(tax_rate.amount * 100, precision: 1),
-        rate_amount: tax_rate.amount,
-      }
-    end.sort_by { |tax| tax[:rate_amount] }
+    totals.each_with_object({}) do |(tax_rate, tax_amount), hash|
+      hash[number_to_percentage(tax_rate.amount * 100, precision: 1)] =
+        Spree::Money.new tax_amount, currency: order.currency
+    end
  end

  def display_line_item_tax_rates(line_item)
--- a/app/helpers/enterprises_helper.rb
+++ b/app/helpers/enterprises_helper.rb
@@ -14,7 +14,15 @@ module EnterprisesHelper
  end

  def available_shipping_methods
-    OrderAvailableShippingMethods.new(current_order, current_customer).to_a
+    return [] if current_distributor.blank?
+
+    shipping_methods = current_distributor.shipping_methods.display_on_checkout.to_a
+
+    applicator = OpenFoodNetwork::TagRuleApplicator.new(current_distributor,
+                                                        "FilterShippingMethods", current_customer&.tag_list)
+    applicator.filter!(shipping_methods)
+
+    shipping_methods.uniq
  end

  def available_payment_methods
--- a/app/helpers/order_cycles_helper.rb
+++ b/app/helpers/order_cycles_helper.rb
@@ -56,6 +56,10 @@ module OrderCyclesHelper
    @simple_index ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
  end

+  def order_cycles_simple_form
+    @order_cycles_simple_form ||= @order_cycle.coordinator.sells == 'own'
+  end
+
  def pickup_time(order_cycle = current_order_cycle)
    order_cycle.exchanges.to_enterprises(current_distributor).outgoing.first.pickup_time
  end
--- a/app/helpers/spree/admin/orders_helper.rb
+++ b/app/helpers/spree/admin/orders_helper.rb
@@ -44,14 +44,6 @@ module Spree
        end
      end

-      def print_invoice_link
-        if @order.distributor.can_invoice?
-          print_invoice_link_with_url
-        else
-          notify_about_required_enterprise_number
-        end
-      end
-
      def ticket_links
        return [] unless Spree::Config[:enable_receipt_printing?]

@@ -86,20 +78,13 @@ module Spree
          confirm: t(:must_have_valid_business_number, enterprise_name: @order.distributor.name) }
      end

-      def print_invoice_link_with_url
+      def print_invoice_link
        { name: t(:print_invoice),
          url: spree.print_admin_order_path(@order),
          icon: 'icon-print',
          target: "_blank" }
      end

-      def notify_about_required_enterprise_number
-        { name: t(:print_invoice),
-          url: "#",
-          icon: 'icon-print',
-          confirm: t(:must_have_valid_business_number, enterprise_name: @order.distributor.name) }
-      end
-
      def print_ticket_link
        { name: t(:print_ticket),
          url: print_ticket_admin_order_path(@order),
--- a/app/jobs/subscription_confirm_job.rb
+++ b/app/jobs/subscription_confirm_job.rb
@@ -55,9 +55,7 @@ class SubscriptionConfirmJob < ActiveJob::Base
    if order.errors.any?
      send_failed_payment_email(order)
    else
-      Bugsnag.notify(e) do |payload|
-        payload.add_metadata :order, order
-      end
+      Bugsnag.notify(e, order: order)
      send_failed_payment_email(order, e.message)
    end
  end
@@ -108,9 +106,6 @@ class SubscriptionConfirmJob < ActiveJob::Base
    record_and_log_error(:failed_payment, order, error_message)
    SubscriptionMailer.failed_payment_email(order).deliver_now
  rescue StandardError => e
-    Bugsnag.notify(e) do |payload|
-      payload.add_metadata :order, order
-      payload.add_metadata :error_message, error_message
-    end
+    Bugsnag.notify(e, order: order, error_message: error_message)
  end
 end
--- a/app/json_schemas/customer_schema.rb
+++ b/app/json_schemas/customer_schema.rb
@@ -41,8 +41,8 @@ class CustomerSchema < JsonApiSchema
      street_address_2: "",
      postal_code: "1234",
      locality: "Melbourne",
-      region: { code: "Vic", name: "Victoria" },
-      country: { code: "AU", name: "Australia" },
+      region: "Victoria",
+      country: "Australia",
    }
  end

--- a/app/mailers/spree/shipment_mailer.rb
+++ b/app/mailers/spree/shipment_mailer.rb
@@ -2,18 +2,16 @@

 module Spree
  class ShipmentMailer < BaseMailer
-    def shipped_email(shipment, delivery:)
+    def shipped_email(shipment, resend = false)
      @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
-      @delivery = delivery
-      subject = base_subject
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '') + base_subject
      mail(to: @shipment.order.email, from: from_address, subject: subject)
    end

    private

    def base_subject
-      default_subject = !@delivery ? t('.picked_up_subject') : default_i18n_subject
-      "#{@shipment.order.distributor.name} #{default_subject} ##{@shipment.order.number}"
+      "#{@shipment.order.distributor.name} #{default_i18n_subject} ##{@shipment.order.number}"
    end
  end
 end
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -1,12 +1,5 @@
 # frozen_string_literal: true

-# A customer record is created the first time a person orders from a shop.
-#
-# It's a relationship between a user and an enterprise but for guest orders it
-# can also be between an email address and an enterprise.
-#
-# The main purpose is tagging of customers to access private shops, receive
-# discounts et cetera. A customer record is also needed for subscriptions.
 class Customer < ApplicationRecord
  include SetUnusedAddressFields

@@ -14,10 +7,10 @@ class Customer < ApplicationRecord

  searchable_attributes :first_name, :last_name, :email, :code

-  belongs_to :enterprise, optional: false
+  belongs_to :enterprise
  belongs_to :user, class_name: "Spree::User"
  has_many :orders, class_name: "Spree::Order"
-  before_destroy :update_orders_and_delete_canceled_subscriptions
+  before_destroy :check_for_orders

  belongs_to :bill_address, class_name: "Spree::Address"
  alias_attribute :billing_address, :bill_address
@@ -33,6 +26,7 @@ class Customer < ApplicationRecord
  validates :code, uniqueness: { scope: :enterprise_id, allow_nil: true }
  validates :email, presence: true, 'valid_email_2/email': true,
                    uniqueness: { scope: :enterprise_id, message: I18n.t('validation_msg_is_associated_with_an_exising_customer') }
+  validates :enterprise, presence: true

  scope :of, ->(enterprise) { where(enterprise_id: enterprise) }

@@ -58,12 +52,10 @@ class Customer < ApplicationRecord
    self.user = user || Spree::User.find_by(email: email)
  end

-  def update_orders_and_delete_canceled_subscriptions
-    if Subscription.where(customer_id: id).not_canceled.any?
-      errors.add(:base, I18n.t('admin.customers.destroy.has_associated_subscriptions'))
-      throw :abort
-    end
-    Subscription.where(customer_id: id).destroy_all
-    orders.update_all(customer_id: nil)
+  def check_for_orders
+    return true unless orders.any?
+
+    errors.add(:base, I18n.t('admin.customers.destroy.has_associated_orders'))
+    throw :abort
  end
 end
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -16,19 +16,6 @@ class Enterprise < ApplicationRecord
    large: { resize_to_fill: [1200, 260] },
  }.freeze

-  self.ignored_columns = %i(terms_and_conditions_file_name
-                            terms_and_conditions_content_type
-                            terms_and_conditions_file_size
-                            terms_and_conditions_updated_at
-                            logo_file_name
-                            logo_content_type
-                            logo_file_size
-                            logo_updated_at
-                            promo_image_file_name
-                            promo_image_content_type
-                            promo_image_file_size
-                            promo_image_updated_at)
-
  searchable_attributes :sells, :is_primary_producer
  searchable_associations :properties
  searchable_scopes :is_primary_producer, :is_distributor, :is_hub, :activated, :visible,
@@ -97,8 +84,8 @@ class Enterprise < ApplicationRecord
  has_one_attached :promo_image
  has_one_attached :terms_and_conditions

-  validates :logo, content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
-  validates :promo_image, content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+  validates :logo, content_type: %r{\Aimage/.*\Z}
+  validates :promo_image, content_type: %r{\Aimage/.*\Z}
  validates :terms_and_conditions, content_type: {
    in: "application/pdf",
    message: I18n.t(:enterprise_terms_and_conditions_type_error),
@@ -133,7 +120,6 @@ class Enterprise < ApplicationRecord
    joins(:shipping_methods).
      joins(:payment_methods).
      merge(Spree::PaymentMethod.available).
-      merge(Spree::ShippingMethod.frontend).
      select('DISTINCT enterprises.*')
  }
  scope :not_ready_for_checkout, lambda {
@@ -210,14 +196,15 @@ class Enterprise < ApplicationRecord
      joins(:enterprise_roles).where('enterprise_roles.user_id = ?', user.id)
    end
  }
-
-  scope :parents_of_one_union_others, lambda { |one, others|
+  scope :relatives_of_one_union_others, lambda { |one, others|
    where("
      enterprises.id IN
+        (SELECT child_id FROM enterprise_relationships WHERE enterprise_relationships.parent_id=?)
+      OR enterprises.id IN
        (SELECT parent_id FROM enterprise_relationships WHERE enterprise_relationships.child_id=?)
      OR enterprises.id IN
        (?)
-      ", one, others)
+    ", one, one, others)
  }

  def business_address_empty?(attributes)
@@ -272,9 +259,9 @@ class Enterprise < ApplicationRecord
    ", id, id)
  end

-  def plus_parents_and_order_cycle_producers(order_cycles)
+  def plus_relatives_and_oc_producers(order_cycles)
    oc_producer_ids = Exchange.in_order_cycle(order_cycles).incoming.pluck :sender_id
-    Enterprise.not_hidden.is_primary_producer.parents_of_one_union_others(id, oc_producer_ids | [id])
+    Enterprise.not_hidden.is_primary_producer.relatives_of_one_union_others(id, oc_producer_ids | [id])
  end

  def relatives_including_self
@@ -325,10 +312,6 @@ class Enterprise < ApplicationRecord
    correct_instagram_url self[:instagram]
  end

-  def whatsapp_url
-    correct_whatsapp_url self[:whatsapp_phone]
-  end
-
  def inventory_variants
    if prefers_product_selection_from_inventory_only?
      Spree::Variant.visible_for(self)
@@ -400,7 +383,7 @@ class Enterprise < ApplicationRecord
  end

  def ready_for_checkout?
-    shipping_methods.frontend.any? && payment_methods.available.any?
+    shipping_methods.any? && payment_methods.available.any?
  end

  def self.find_available_permalink(test_permalink)
@@ -425,8 +408,6 @@ class Enterprise < ApplicationRecord
  end

  def can_invoice?
-    return true unless Spree::Config.enterprise_number_required_on_invoices?
-
    abn.present?
  end

@@ -465,10 +446,6 @@ class Enterprise < ApplicationRecord
    url&.sub(%r{(https?://)?}, '')
  end

-  def correct_whatsapp_url(phone_number)
-    phone_number && "https://wa.me/" + phone_number.tr('+ ', '')
-  end
-
  def correct_instagram_url(url)
    url && strip_url(url).sub(%r{www.instagram.com/}, '').delete("@")
  end
--- a/Show More
+++ b/Show More