Merge branch 'active-storage' into HEAD

Creating a seperate release off the master branch.
2026-02-27 01:43:22 +00:00 · 2022-06-08 12:05:56 +10:00
659 changed files with 8502 additions and 42394 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,11 +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"
-
-OPENID_APP_ID="test-provider"
-OPENID_APP_SECRET="12345"
--- 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
@@ -1,7 +1,7 @@
 ---
 name: Release task
 about: Track the process of a new release
-title: Release v
+title: 'Release v'
 labels: ''
 assignees: ''

@@ -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` in [#testing].
- [ ] 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.
@@ -44,6 +57,5 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 [Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A
 [releases]: https://github.com/openfoodfoundation/openfoodnetwork/releases
 [#instance-managers]: https://app.slack.com/client/T02G54U79/CG7NJ966B
-[#testing]: https://openfoodnetwork.slack.com/app_redirect?channel=C02TZ6X00
 [Find build]: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master
 [#global-community]: https://app.slack.com/client/T02G54U79/C59ADD8F2
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 #### What? Why?

- Closes # <!-- Insert issue number here. -->
+Closes # <!-- Insert issue number here. -->

 <!-- Explain why this change is needed and the solution you propose.
     Provide context for others to understand it. -->
--- a/.github/workflows/brakeman-analysis.yml
+++ b/.github/workflows/brakeman-analysis.yml
@@ -10,24 +10,18 @@ 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:
    # Checkout the repository to the GitHub Actions runner
    - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2

    # Customize the ruby version depending on your needs
    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: actions/setup-ruby@v1
      with:
        ruby-version: '2.7'

@@ -45,6 +39,6 @@ jobs:

    # Upload the SARIF file generated in the previous step
    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v1
      with:
        sarif_file: output.sarif.json
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,22 +3,18 @@ name: Build
 on:
  workflow_dispatch:
  push:
-    branches-ignore:    
-      - 'dependabot/**'
  pull_request:

 env:
-  DISABLE_KNAPSACK_PRO: false
+  DISABLE_KNAPSACK: true
  TIMEZONE: UTC
  COVERAGE: true
+  RSPEC_RETRY_RETRY_COUNT: 3
  RAILS_ENV: test

-permissions:
-  contents: read
-
 jobs:
-  knapsack_rspec_controllers:
-    runs-on: ubuntu-20.04
+  rspec:
+    runs-on: ubuntu-18.04
    services:
      postgres:
        image: postgres:10
@@ -33,31 +29,30 @@ jobs:
          POSTGRES_USER: ofn
          POSTGRES_PASSWORD: f00d
    strategy:
-      fail-fast: false
      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [8]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7]
+        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.rb"
+          - "spec/system/admin/[p-z]*_spec.rb"
+          - "spec/system/consumer"
+          - "engines/*/spec"
+      fail-fast: false
    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
+      - uses: actions/checkout@v2

      - name: Set up Ruby
        uses: ruby/setup-ruby@v1
        with:
          bundler-cache: true # runs 'bundle install' and caches installed gems automatically

-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
        with:
-          node-version: 16
+          node-version: '14.15.5'

      - name: Install JS dependencies
        run: yarn install --frozen-lockfile
@@ -68,399 +63,19 @@ jobs:
          bundle exec rake db:schema:load

      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: 864ef557d85ea8e603e086c0387d5154
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}" 
-        
-        run: |
-          bundle exec rake knapsack_pro:rspec
-
-  knapsack_rspec_models:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [7]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: 09476e2ce491c12083df62768667c674
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}" 
-        
-        run: |
-          bundle exec rake knapsack_pro:rspec
-
-  knapsack_rspec_system_admin:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [10]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: ff2456e64c9f2aa5157eb0daf711d3c3
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          KNAPSACK_PRO_FIXED_QUEUE_SPLIT: true
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}" 
-
-        run: |
-          bundle exec rake knapsack_pro:queue:rspec
+        run: bundle exec rspec --profile -- ${{ matrix.specs }}

      - name: Archive failed tests screenshots
        if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
        with:
          name: failed-tests-screenshots
          path: tmp/capybara/screenshots/*.png
          retention-days: 7
          if-no-files-found: ignore

-  knapsack_rspec_system_consumer:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [10]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: e52bd4390c853e6c5bdfe4d0334586c1
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          KNAPSACK_PRO_FIXED_QUEUE_SPLIT: true
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}" 
-
-        run: |
-          bundle exec rake knapsack_pro:queue:rspec
-
-      - name: Archive failed tests screenshots
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: failed-tests-screenshots
-          path: tmp/capybara/screenshots/*.png
-          retention-days: 7
-          if-no-files-found: ignore
-
-  knapsack_rspec_engines:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [5]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: d6ea7ceb766404ccd016c19aa2c81b1c
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/serializers/**/*_spec.rb,engines/**/*_spec.rb}"
-
-        run: |
-          bundle exec rake knapsack_pro:rspec
-
-      - name: Archive failed tests screenshots
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: failed-tests-screenshots
-          path: tmp/capybara/screenshots/*.png
-          retention-days: 7
-          if-no-files-found: ignore
-
-  knapsack_rspec_test_the_rest:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [n] - where the n is a number of parallel jobs you want to run your tests on.
-        # Use a higher number if you have slow tests to split them between more parallel jobs.
-        # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [5]
-        # Indexes for parallel jobs (starting from zero).
-        # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: e3b8800198d2d89b70c7edbdd85f8fd8
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
-          # RSpec split test files by test examples feature - it's optional
-          # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
-          #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_EXCLUDE_PATTERN: "{engines/**/*_spec.rb,spec/models/**/*_spec.rb,spec/controllers/**/*_spec.rb,spec/serializers/**/*_spec.rb,spec/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/system/**/*_spec.rb}"
-                                            
-        
-        run: |
-          bundle exec rake knapsack_pro:rspec
-
-  non_knapsack_jest_karma:
-    runs-on: ubuntu-20.04
+  test-the-rest:
+    runs-on: ubuntu-18.04
    services:
      postgres:
        image: postgres:10
@@ -475,21 +90,16 @@ jobs:
          POSTGRES_USER: ofn
          POSTGRES_PASSWORD: f00d
    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
+      - uses: actions/checkout@v2

      - name: Set up Ruby
        uses: ruby/setup-ruby@v1
        with:
          bundler-cache: true # runs 'bundle install' and caches installed gems automatically

-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
        with:
-          node-version: 16
+          node-version: '14.15.5'

      - name: Install JS dependencies
        run: yarn install --frozen-lockfile
@@ -498,8 +108,12 @@ jobs:
        run: |
          bundle exec rake db:create
          bundle exec rake db:schema:load
+
      - name: Run JS tests
        run: bundle exec rake karma:run

      - name: Run jest tests
        run: yarn jest
+
+      - name: Run all other tests
+        run: bundle exec rake ofn:specs:run:excluding_folders["models,controllers,serializers,features,lib,migrations,system"]
--- 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@v3
-      - 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,18 +1,13 @@
 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:
      fail-fast: true
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - run: docker/build
    - run: docker-compose up --detach
    - run: until curl -f -s http://localhost:3000; do echo "waiting for api server"; sleep 1; done
@@ -39,13 +34,13 @@ jobs:

    # Archive HTML report
    - name: Archive Mayhem for API report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: mapi-report
        path: mapi.html

    # Upload SARIF file (only available on public repos or github enterprise)
    - name: Upload SARIF file
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v1
      with:
        sarif_file: mapi.sarif
--- 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,23 +0,0 @@
-# Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
-*.css
-*.scss
-# Except v2
-!/app/webpacker/css/admin/v2/**/*.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,11 +483,10 @@ Metrics/BlockNesting:
  Exclude:
    - 'app/models/spree/payment/processing.rb'

-# Offense count: 45
+# Offense count: 50
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
  Exclude:
-    - 'app/components/products_table_component.rb'
    - 'app/controllers/admin/customers_controller.rb'
    - 'app/controllers/admin/enterprises_controller.rb'
    - 'app/controllers/admin/order_cycles_controller.rb'
@@ -456,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'
@@ -479,17 +526,19 @@ Metrics/ClassLength:
    - 'app/serializers/api/enterprise_shopfront_serializer.rb'
    - 'app/services/cart_service.rb'
    - 'app/services/order_syncer.rb'
-    - 'app/services/order_cycle_form.rb'
    - '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'
@@ -516,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'
@@ -540,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:
@@ -585,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'
@@ -611,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'
@@ -620,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'
@@ -655,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:
@@ -664,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'
@@ -679,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/base_controller.rb'
+    - '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'
@@ -696,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:
@@ -728,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:
@@ -736,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'
@@ -745,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:
@@ -771,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:
@@ -813,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'
@@ -836,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'
@@ -853,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'
@@ -867,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:
@@ -902,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'
@@ -923,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:
@@ -958,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:
@@ -973,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'
@@ -982,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'
@@ -1017,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'
@@ -1030,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'
@@ -1045,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:
@@ -1057,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'
@@ -1064,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:
@@ -1072,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'
@@ -1112,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'
@@ -1129,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/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com

-[o:open-food-foundation:p:open-food-network:r:enyml]
+[open-food-network.enyml]
 file_filter = config/locales/<lang>.yml
 source_lang = en
 type = YML
--- a/GETTING_STARTED.md
+++ b/GETTING_STARTED.md
@@ -68,8 +68,6 @@ To login as the default user, use:

    email: ofn@example.com
    password: ofn123
-    
-Seee [Locale and sample data] about loading data.

 ### Testing

@@ -83,7 +81,7 @@ Then the main application tests can be run with:

 The tests of all custom engines can be run with:

-    bundle exec rspec ./engines
+    bundle exec rake ofn:specs:engines:rspec

 Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop.

@@ -131,4 +129,3 @@ If these commands succeed, you should be able to [continue the setup process](#g
 [rubocop]: https://rubocop.readthedocs.io/en/latest/
 [karma]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
-[Locale and sample data]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Locale-and-sample-data
--- a/36
+++ b/36
@@ -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"

@@ -69,11 +68,8 @@ gem 'pagy', '~> 5.1'
 gem 'rswag-api'
 gem 'rswag-ui'

-gem 'gitlab-omniauth-openid-connect', require: 'omniauth_openid_connect'
-gem 'openid_connect', '~> 1.3'
-gem 'omniauth-rails_csrf_protection'
-
 gem 'angularjs-rails', '1.8.0'
+gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
 gem 'haml'
 gem 'redcarpet'
@@ -101,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
@@ -120,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'
@@ -134,10 +131,7 @@ gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'

-gem "view_component"
-gem 'view_component_reflex', '3.1.14.pre9'
-
-gem 'mini_portile2', '~> 2.8'
+gem "view_component", require: "view_component/engine"

 group :production, :staging do
  gem 'ddtrace'
@@ -146,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'
@@ -153,39 +149,41 @@ group :test, :development do
  gem "factory_bot_rails", '6.2.0', require: false
  gem 'fuubar', '~> 2.5.1'
  gem 'json_spec', '~> 1.1.4'
-  gem 'knapsack_pro'
+  gem 'knapsack'
  gem 'letter_opener', '>= 1.4.1'
  gem 'rspec-rails', ">= 3.5.2"
-  gem 'rspec-retry', require: false
+  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 'vcr', require: false
-  gem 'webmock', require: false
+  gem 'test-prof'
+  gem 'webmock'
  # See spec/spec_helper.rb for instructions
  # gem 'perftools.rb'
 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.3)
+    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)
-    aes_key_wrap (1.1.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)
-    attr_required (1.0.1)
-    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.669.0)
-    aws-sdk-core (3.168.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.651.0)
-      aws-sigv4 (~> 1.5)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.60.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.117.2)
-      aws-sdk-core (~> 3, >= 3.165.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.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+    aws-sdk-v1 (1.67.0)
+      json (~> 1.4)
+      nokogiri (~> 1)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.18)
+    axlsx_styler (1.1.0)
+      activesupport (>= 3.1)
+      caxlsx (>= 2.0.2)
+    bcrypt (3.1.16)
    bigdecimal (3.0.2)
-    bindata (2.4.12)
    bindex (0.8.1)
-    bootsnap (1.15.0)
+    bootsnap (1.10.1)
      msgpack (~> 1.2)
-    bugsnag (6.25.0)
+    bugsnag (6.24.1)
      concurrent-ruby (~> 1.0)
    builder (3.2.4)
-    bullet (7.0.4)
+    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.38.0)
+    capybara (3.36.0)
      addressable
      matrix
      mini_mime (>= 0.1.3)
@@ -203,13 +212,14 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
-    caxlsx (3.3.0)
+    caxlsx (3.1.1)
      htmlentities (~> 4.3, >= 4.3.4)
      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)
    coffee-rails (5.0.0)
      coffee-script (>= 2.2.0)
@@ -218,19 +228,18 @@ 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.14.3)
-      capybara (~> 3.0)
-      ferrum (~> 0.13.0)
+    cuprite (0.13)
+      capybara (>= 2.1, < 4)
+      ferrum (~> 0.11.0)
    database_cleaner (2.0.1)
      database_cleaner-active_record (~> 2.0.0)
    database_cleaner-active_record (2.0.0)
@@ -241,11 +250,8 @@ GEM
      debase-ruby_core_source (= 0.10.12)
      msgpack
    debase-ruby_core_source (0.10.12)
-    debug (1.7.0)
-      irb (>= 1.5.0)
-      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)
@@ -253,19 +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)
-    digest (3.1.1)
+    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)
-    erubi (1.11.0)
-    et-orbi (1.2.7)
+    dry-inflector (0.2.1)
+    e2mmap (0.1.0)
+    erubi (1.10.0)
+    et-orbi (1.2.4)
      tzinfo
    excon (0.81.0)
    execjs (2.7.0)
@@ -274,18 +282,21 @@ GEM
    factory_bot_rails (6.2.0)
      factory_bot (~> 6.2.0)
      railties (>= 5.0.0)
-    faraday (2.6.0)
-      faraday-net_http (>= 2.0, < 3.1)
+    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-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
-    faraday-net_http (3.0.1)
-    ferrum (0.13)
+    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)
-      webrick (~> 1.7)
      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,21 +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)
-    gitlab-omniauth-openid-connect (0.10.0)
-      addressable (~> 2.7)
-      omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.2)
+    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)
@@ -335,57 +342,46 @@ GEM
      tilt
    hashdiff (1.0.1)
    hashery (2.1.2)
-    hashie (5.0.0)
    highline (2.0.3)
    hiredis (0.6.3)
    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    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.5.1)
-      reline (>= 0.3.0)
-    jmespath (1.6.2)
+    jmespath (1.6.1)
    jquery-rails (4.4.0)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (4.2.1)
      railties (>= 3.2.16)
-    json (2.6.3)
-    json-jwt (1.16.0)
-      activesupport (>= 4.2)
-      aes_key_wrap
-      bindata
-      faraday (~> 2.0)
-      faraday-follow_redirects
-    json-schema (3.0.0)
-      addressable (>= 2.8)
+    json (2.6.1)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
    json_spec (1.1.5)
      multi_json (~> 1.0)
      rspec (>= 2.0, < 4.0)
    jsonapi-serializer (2.2.0)
      activesupport (>= 4.2)
-    jwt (2.5.0)
-    knapsack_pro (3.6.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.1)
+    loofah (2.13.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@@ -393,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
@@ -404,87 +397,62 @@ 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.6.0)
+    msgpack (1.4.2)
    multi_json (1.15.0)
    multi_xml (0.6.0)
-    net-protocol (0.1.3)
-      timeout
-    net-smtp (0.3.2)
-      net-protocol
+    multipart-post (2.1.1)
    nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.13.3)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    oauth2 (1.4.11)
-      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, < 4)
-    omniauth (2.1.0)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
-      actionpack (>= 4.2)
-      omniauth (~> 2.0)
-    openid_connect (1.4.2)
-      activemodel
-      attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
-      net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (~> 1.2)
+      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.1)
-      activerecord (>= 5.1, < 7.1)
-    parser (3.1.3.0)
+    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.11.0)
+    pdf-reader (2.5.0)
      Ascii85 (~> 1.0)
      afm (~> 0.2.1)
      hashery (~> 2.0)
      ruby-rc4
      ttfunk
    pg (1.2.3)
-    power_assert (2.0.2)
+    power_assert (2.0.1)
    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.1)
-    rack (2.2.4)
-    rack-mini-profiler (2.3.4)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-mini-profiler (2.3.3)
      rack (>= 1.2.0)
-    rack-oauth2 (1.21.3)
-      activesupport
-      attr_required
-      httpclient
-      json-jwt (>= 1.11.0)
-      rack (>= 2.1.0)
    rack-protection (2.1.0)
      rack
    rack-proxy (0.7.0)
@@ -492,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)
@@ -517,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.4)
-      loofah (~> 2.19, >= 2.19.1)
-    rails-i18n (7.0.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    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)
@@ -544,41 +507,37 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redcarpet (3.5.1)
-    redis (4.8.0)
-    regexp_parser (2.6.1)
-    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)
-    rodf (1.2.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)
@@ -588,42 +547,38 @@ GEM
      rspec-support (~> 3.10)
    rspec-retry (0.6.2)
      rspec-core (> 3.3)
-    rspec-support (3.10.3)
-    rswag-api (2.8.0)
-      railties (>= 3.1, < 7.1)
-    rswag-specs (2.8.0)
-      activesupport (>= 3.1, < 7.1)
-      json-schema (>= 2.2, < 4.0)
-      railties (>= 3.1, < 7.1)
-      rspec-core (>= 2.14)
-    rswag-ui (2.8.0)
-      actionpack (>= 3.1, < 7.1)
-      railties (>= 3.1, < 7.1)
-    rubocop (1.40.0)
-      json (~> 2.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.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.23.0, < 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.24.0)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.17.3)
+    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)
@@ -633,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.8)
-      connection_pool (>= 2.2.5, < 3)
+    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)
@@ -651,10 +612,11 @@ GEM
      simplecov_json_formatter (~> 0.1)
    simplecov-html (0.12.3)
    simplecov_json_formatter (0.1.3)
-    spreadsheet_architect (5.0.0)
-      caxlsx (>= 3.3.0, < 4)
+    spreadsheet_architect (4.2.0)
+      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)
@@ -671,66 +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 (8.0.0)
-    swd (1.3.0)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+    stripe (5.42.0)
    temple (0.8.2)
-    test-unit (3.5.7)
+    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.6)
-    timeout (0.3.0)
+    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)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.15)
-      activemodel (>= 3.0.0)
-      public_suffix
-    vcr (6.1.0)
-    view_component (2.79.0)
+    view_component (2.41.0)
      activesupport (>= 5.0.0, < 8.0)
-      concurrent-ruby (~> 1.0)
      method_source (~> 1.0)
-    view_component_reflex (3.1.14.pre9)
-      rails (>= 5.2, < 8.0)
-      stimulus_reflex (>= 3.5.0.pre2)
-      view_component (>= 2.28.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)
-    webfinger (1.2.0)
-      activesupport
-      httpclient (>= 2.4)
-    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)
@@ -739,19 +680,18 @@ GEM
      rack-proxy (>= 0.6.1)
      railties (>= 5.2)
      semantic_range (>= 2.3.0)
-    webrick (1.7.0)
    websocket-driver (0.7.5)
      websocket-extensions (>= 0.1.0)
    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.6)
+    wkhtmltopdf-binary (0.12.6.5)
    xml-simple (1.1.8)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.5.3)

 PLATFORMS
  ruby
@@ -772,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!
@@ -787,7 +730,6 @@ DEPENDENCIES
  database_cleaner
  db2fog!
  ddtrace
-  debug (>= 1.0.0)
  debugger-linecache
  devise
  devise-encryptable
@@ -805,7 +747,6 @@ DEPENDENCIES
  foreman
  fuubar (~> 2.5.1)
  geocoder
-  gitlab-omniauth-openid-connect
  gmaps4rails
  good_migrations
  haml
@@ -821,18 +762,14 @@ DEPENDENCIES
  json_spec (~> 1.1.4)
  jsonapi-serializer
  jwt (~> 2.3)
-  knapsack_pro
+  knapsack
  letter_opener (>= 1.4.1)
  listen
-  mime-types
  mimemagic (> 0.3.5)
-  mini_portile2 (~> 2.8)
  mini_racer (= 0.4.0)
  monetize (~> 1.11)
  oauth2 (~> 1.4.7)
  ofn-qz!
-  omniauth-rails_csrf_protection
-  openid_connect (~> 1.3)
  order_management!
  pagy (~> 5.1)
  paper_trail (~> 12.1.0)
@@ -841,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
@@ -848,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)
@@ -857,7 +794,7 @@ DEPENDENCIES
  responders
  rexml
  roadie-rails
-  roo
+  roo!
  rspec-rails (>= 3.5.2)
  rspec-retry
  rswag-api
@@ -867,6 +804,7 @@ DEPENDENCIES
  rubocop-rails
  sd_notify
  select2-rails!
+  selenium-webdriver
  shoulda-matchers
  sidekiq
  sidekiq-scheduler
@@ -875,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_reflex (= 3.1.14.pre9)
  view_component_storybook
  web!
  web-console
+  webdrivers
  webmock
  webpacker (~> 5)
  whenever
--- a/README.md
+++ b/README.md
@@ -35,17 +35,11 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration

 If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board](https://github.com/orgs/openfoodfoundation/projects/1) for some good first issues, both on manual and automated testing (RSpec/Capybara).

-We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
-
-
-We use [KnapsackPro](https://knapsackpro.com/) for optimal parallelisation of our automated tests. KnapsackPro offers unlimited plans for non-commercial open source projects, like ours - a big thanks to them!
-
-![image](https://user-images.githubusercontent.com/49817236/201330047-e64147a7-d91c-4c10-bd4d-ca519d8fe945.png)
-
+We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them! 

 ## 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/3
+++ b/3
@@ -8,3 +8,6 @@ require_relative 'config/application'

 Openfoodnetwork::Application.load_tasks

+if !ENV['DISABLE_KNAPSACK'] && defined?(Knapsack)
+  Knapsack.load_tasks
+end
--- 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,13 +256,12 @@ 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)
-        if variant.unit_value && product.variant_unit_scale
-          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, product.variant_unit_scale, 2))
+        variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
        variant.unit_description = match[3]

  $scope.incrementLimit = ->
--- 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
@@ -5,8 +5,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
  $scope.confirmDelete = true
  $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
  $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
-  $scope.previousDates = { startDate: $scope.startDate, endDate: $scope.endDate }
-  $scope.datesChangedOnCancelEvent = false
  $scope.bulkActions = [ { name: t("admin.orders.bulk_management.actions_delete"), callback: 'deleteLineItems' } ]
  $scope.selectedUnitsProduct = {}
  $scope.selectedUnitsVariant = {}
@@ -27,28 +25,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
    $scope.resetFilters()
    $scope.refreshData()

-  $scope.$watchCollection "[startDate, endDate]", (newValues, oldValues) ->
-    if newValues != oldValues && !$scope.datesChangedOnCancelEvent
-        state = $scope.refreshData()
-        if (state == "cancel")
-          $scope.datesChangedOnCancelEvent = true
-          $scope.cancelDateChange()
-  
-  $scope.cancelDateChange = ->
-    # Reset the date filters to the previous values
-    $scope.startDate = $scope.previousDates.startDate
-    $scope.endDate = $scope.previousDates.endDate
-    # throw a flatpickr:change event to change the date back in the datepicker
-    event = new CustomEvent('flatpickr:change', {
-      detail: { 
-        startDate: $scope.previousDates.startDate,
-        endDate: $scope.previousDates.endDate
-      }
-    })
-    window.dispatchEvent(event)
-    $timeout ->
-      $scope.datesChangedOnCancelEvent = false
- 
  $scope.refreshData = ->
    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
      $scope.setOrderCycleDateRange()
@@ -58,8 +34,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,

    return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()

-    return "cancel" unless $scope.confirmRefresh()
-
    $scope.loadOrders()
    $scope.loadLineItems()

@@ -67,11 +41,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
      $scope.loadAssociatedData()

    $scope.dereferenceLoadedData()
-    
-    $timeout ->
-      # update the previous dates with the current ones since loading was successful
-      $scope.previousDates.startDate = $scope.startDate
-      $scope.previousDates.endDate = $scope.endDate

  $scope.setOrderCycleDateRange = ->
    start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
@@ -197,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) ->
@@ -222,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

@@ -248,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_basic_controller.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee
@@ -38,4 +38,3 @@ angular.module('admin.orderCycles')
    $scope.removeCoordinatorFee = ($event, index) ->
      $event.preventDefault()
      OrderCycle.removeCoordinatorFee(index)
-      $scope.order_cycle_form.$dirty = true
--- 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 = window.bigDecimal.divide(value, $scope.product.variant_unit_scale, 2) 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/services/bulk_products.js.coffee
+++ b/app/assets/javascripts/admin/services/bulk_products.js.coffee
@@ -65,8 +65,7 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
    variantUnitValue: (product, variant) ->
      if variant.unit_value?
        if product.variant_unit_scale
-          variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
-          parseFloat(window.bigDecimal.round(variant_unit_value, 2))
+          @divideAsInteger variant.unit_value, product.variant_unit_scale
        else
          variant.unit_value
      else
--- 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/components/pagination_component.rb
+++ b/app/components/pagination_component.rb
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class PaginationComponent < ViewComponentReflex::Component
-  def initialize(pagy:, data:)
-    super
-    @count = pagy.count
-    @page = pagy.page
-    @per_page = pagy.items
-    @pages = pagy.pages
-    @next = pagy.next
-    @prev = pagy.prev
-    @data = data
-    @series = pagy.series
-  end
-end
--- a/app/components/pagination_component/pagination_component.html.haml
+++ b/app/components/pagination_component/pagination_component.html.haml
@@ -1,16 +0,0 @@
-= component_controller do
-  %nav{"aria-label": "pagination"}
-    .pagination
-      .pagination-prev{data: @prev.nil? ? nil : @data, "data-page": @prev, class: "#{'inactive' if @prev.nil?}"}
-        = I18n.t "components.pagination.previous"
-      .pagination-pages
-        - @series.each do |page|
-          - if page == :gap
-            .pagination-gap
-              …
-          - else
-            .pagination-page{data: @data, "data-page": page, class: "#{'active' if page.to_i == @page}"}
-              = page
-      .pagination-next{data: @next.nil? ? nil : @data, "data-page": @next, class: "#{'inactive' if @next.nil?}"}
-        = I18n.t "components.pagination.next"
-
--- a/app/components/pagination_component/pagination_component.scss
+++ b/app/components/pagination_component/pagination_component.scss
@@ -1,69 +0,0 @@
-nav {
-  .pagination {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    font-size: 14px;
-
-    .pagination-prev, .pagination-next {
-      cursor: pointer;
-
-      &:after, &:before {
-        font-size: 2em;
-        position: relative;
-        top: 3px;
-      }
-
-      &.inactive {
-        cursor: default;
-        color: $disabled-dark;
-      }
-    }
-
-    .pagination-prev {
-      margin-left: 10px;
-
-      &:before {
-        content: "‹";
-        margin-left: 10px;
-        margin-right: 10px;
-      }
-    }
-
-    .pagination-next {
-      margin-right: 10px;
-
-      &:after {
-        content: "›";
-        margin-left: 10px;
-        margin-right: 10px;
-      }
-    }
-
-
-    .pagination-pages {
-      display: flex;
-      align-items: flex-end;
-
-      .pagination-gap, .pagination-page {
-        padding: 0 0.5rem;
-        margin-left: 10px;
-        margin-right: 10px;
-      }
-
-      .pagination-gap {
-        color: $disabled-dark;
-      }
-
-      .pagination-page {
-        color: $color-4;
-        cursor: pointer;
-        &.active {
-          border-top: 3px solid $spree-blue;
-          color: $spree-blue;
-          cursor: default;
-        }
-      }
-    }
-  }
-}
--- a/app/components/product_component.rb
+++ b/app/components/product_component.rb
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class ProductComponent < ViewComponentReflex::Component
-  def initialize(product:, columns:)
-    super
-    @product = product
-    @image = @product.images[0] if product.images.any?
-    @columns = columns.map { |c|
-      {
-        id: c[:value],
-        value: column_value(c[:value])
-      }
-    }
-  end
-
-  def column_value(column)
-    case column
-    when 'name'
-      @product.name
-    when 'price'
-      @product.price
-    when 'unit'
-      "#{@product.unit_value} #{@product.variant_unit}"
-    when 'producer'
-      @product.supplier.name
-    when 'category'
-      @product.taxons.map(&:name).join(', ')
-    end
-  end
-end
--- a/app/components/product_component/product_component.html.haml
+++ b/app/components/product_component/product_component.html.haml
@@ -1,6 +0,0 @@
-%tr
-  - @columns.each do |column|
-    %td.products_column{class: column[:id]}
-      - if column[:id] == "name" && @image
-        = image_tag @image.url(:mini)
-      = column[:value]
--- a/app/components/product_component/product_component.scss
+++ b/app/components/product_component/product_component.scss
--- a/app/components/products_table_component.rb
+++ b/app/components/products_table_component.rb
@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-class ProductsTableComponent < ViewComponentReflex::Component
-  include Pagy::Backend
-
-  SORTABLE_COLUMNS = ["name"].freeze
-  SELECTABLE_COMUMNS = [{ label: I18n.t("admin.products_page.columns_selector.price"),
-                          value: "price" },
-                        { label: I18n.t("admin.products_page.columns_selector.unit"),
-                          value: "unit" },
-                        { label: I18n.t("admin.products_page.columns_selector.producer"),
-                          value: "producer" },
-                        { label: I18n.t("admin.products_page.columns_selector.category"),
-                          value: "category" }].sort { |a, b|
-    a[:label] <=> b[:label]
-  }.freeze
-  PER_PAGE_VALUE = [10, 25, 50, 100].freeze
-  PER_PAGE = PER_PAGE_VALUE.map { |value| { label: value, value: value } }
-  NAME_COLUMN = { label: I18n.t("admin.products_page.columns.name"), value: "name",
-                  sortable: true }.freeze
-
-  def initialize(user:)
-    super
-    @user = user
-    @selectable_columns = SELECTABLE_COMUMNS
-    @columns_selected = ["price", "unit"]
-    @per_page = PER_PAGE
-    @per_page_selected = [10]
-    @categories = [{ label: "All", value: "all" }] +
-                  Spree::Taxon.order(:name)
-                    .map { |taxon| { label: taxon.name, value: taxon.id.to_s } }
-    @categories_selected = ["all"]
-    @producers = [{ label: "All", value: "all" }] +
-                 OpenFoodNetwork::Permissions.new(@user)
-                   .managed_product_enterprises.is_primary_producer.by_name
-                   .map { |producer| { label: producer.name, value: producer.id.to_s } }
-    @producers_selected = ["all"]
-    @page = 1
-    @sort = { column: "name", direction: "asc" }
-    @search_term = ""
-  end
-
-  def before_render
-    fetch_products
-    refresh_columns
-  end
-
-  def search_term
-    @search_term = element.dataset['value']
-  end
-
-  def toggle_column
-    column = element.dataset['value']
-    @columns_selected = if @columns_selected.include?(column)
-                          @columns_selected - [column]
-                        else
-                          @columns_selected + [column]
-                        end
-  end
-
-  def click_sort
-    @sort = { column: element.dataset['sort-value'],
-              direction: element.dataset['sort-direction'] == "asc" ? "desc" : "asc" }
-  end
-
-  def toggle_per_page
-    selected = element.dataset['value'].to_i
-    @per_page_selected = [selected] if PER_PAGE_VALUE.include?(selected)
-  end
-
-  def toggle_category
-    category_clicked = element.dataset['value']
-    @categories_selected = toggle_selector_with_filter(category_clicked, @categories_selected)
-  end
-
-  def toggle_producer
-    producer_clicked = element.dataset['value']
-    @producers_selected = toggle_selector_with_filter(producer_clicked, @producers_selected)
-  end
-
-  def change_page
-    page = element.dataset['page'].to_i
-    @page = page if page > 0
-  end
-
-  private
-
-  def refresh_columns
-    @columns = @columns_selected.map { |column|
-      { label: I18n.t("admin.products_page.columns.#{column}"), value: column,
-        sortable: SORTABLE_COLUMNS.include?(column) }
-    }.sort! { |a, b| a[:label] <=> b[:label] }
-    @columns.unshift(NAME_COLUMN)
-  end
-
-  def toggle_selector_with_filter(clicked, selected)
-    selected = if selected.include?(clicked)
-                 selected - [clicked]
-               else
-                 selected + [clicked]
-               end
-
-    if clicked == "all" || selected.empty?
-      selected = ["all"]
-    elsif selected.include?("all") && selected.length > 1
-      selected -= ["all"]
-    end
-    selected
-  end
-
-  def fetch_products
-    product_query = OpenFoodNetwork::Permissions.new(@user).editable_products.merge(product_scope)
-    @products = product_query.ransack(ransack_query).result
-    @pagy, @products = pagy(@products, items: @per_page_selected.first, page: @page)
-  end
-
-  def product_scope
-    scope = if @user.has_spree_role?("admin") || @user.enterprises.present?
-              Spree::Product
-            else
-              Spree::Product.active
-            end
-
-    scope.includes(product_query_includes)
-  end
-
-  def ransack_query
-    query = { s: "#{@sort[:column]} #{@sort[:direction]}" }
-
-    query = if @producers_selected.include?("all")
-              query.merge({ supplier_id_eq: "" })
-            else
-              query.merge({ supplier_id_in: @producers_selected })
-            end
-
-    query = query.merge({ name_cont: @search_term }) if @search_term.present?
-
-    if @categories_selected.include?("all")
-      query.merge({ primary_taxon_id_eq: "" })
-    else
-      query.merge({ primary_taxon_id_in: @categories_selected })
-    end
-  end
-
-  def product_query_includes
-    [
-      master: [:images],
-      variants: [:default_price, :stock_locations, :stock_items, :variant_overrides,
-                 { option_values: :option_type }]
-    ]
-  end
-end
--- a/app/components/products_table_component/products_table_component.html.haml
+++ b/app/components/products_table_component/products_table_component.html.haml
@@ -1,21 +0,0 @@
-= component_controller(class: "products-table") do
-  .products-table-form
-    .products-table-form_filter_results
-      = render(SearchInputComponent.new(value: @search_term, data: reflex_data_attributes(:search_term)))
-    .products-table-form_categories_selector
-      = render(SelectorWithFilterComponent.new(title: t("admin.products_page.filters.categories.title"), selected: @categories_selected, items: @categories, data: reflex_data_attributes(:toggle_category), selected_items_i18n_key: "admin.products_page.filters.categories.selected_categories"))
-    .products-table-form_producers_selector
-      = render(SelectorWithFilterComponent.new(title: t("admin.products_page.filters.producers.title"), selected: @producers_selected, items: @producers, data: reflex_data_attributes(:toggle_producer), selected_items_i18n_key: "admin.products_page.filters.producers.selected_producers"))
-    .products-table-form_per-page_selector
-      = render(SelectorComponent.new(title: t('admin.products_page.filters.per_page', count: @per_page_selected[0]), selected: @per_page_selected, items: @per_page, data: reflex_data_attributes(:toggle_per_page)))
-    .products-table-form_columns_selector
-      = render(SelectorComponent.new(title: t("admin.products_page.filters.columns"), selected: @columns_selected, items: @selectable_columns, data: reflex_data_attributes(:toggle_column)))
-
-  .products-table_table
-    %table
-      = render(TableHeaderComponent.new(columns: @columns, sort: @sort, data: reflex_data_attributes(:click_sort)))
-      %tbody
-        = render(ProductComponent.with_collection(@products, columns: @columns))
-
-  .products-table-form_pagination
-    = render(PaginationComponent.new(pagy: @pagy, data: reflex_data_attributes(:change_page)))
--- a/app/components/products_table_component/products_table_component.scss
+++ b/app/components/products_table_component/products_table_component.scss
@@ -1,47 +0,0 @@
-.products-table {
-  .products-table-form {
-    display: grid;
-    grid-template-columns: repeat( auto-fit, minmax(250px, 1fr) );
-    grid-gap: 10px;
-    margin-bottom: 10px;
-  }
-
-  .products-table_table {
-    box-shadow: 0 10px 10px -1px rgb(0 0 0 / 10%);
-  }
-
-  .products-table-form_pagination {
-    position: relative;
-    top: -15px;
-
-    nav, .pagination {
-      margin-top: 0;
-      padding-top: 0;
-    }
-  }
-}
-
-.products-table.loading {
-  .products-table-form_pagination, .products-table_table {
-    position: relative;
-
-    &:before {
-      content: "";
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background-color: rgba(255, 255, 255, 0.5);
-    }
-  }
-
-  .products-table_table {
-    &:before {
-      background-position: center;
-      background-repeat: no-repeat;
-      background-size: 50px 50px;
-      background-image: url("../images/spinning-circles.svg");
-    }
-  }
-}
--- a/app/components/search_input_component.rb
+++ b/app/components/search_input_component.rb
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class SearchInputComponent < ViewComponentReflex::Component
-  def initialize(value: nil, data: {})
-    super
-    @value = value
-    @data = data
-  end
-end
--- a/app/components/search_input_component/search_input_component.html.haml
+++ b/app/components/search_input_component/search_input_component.html.haml
@@ -1,5 +0,0 @@
-= component_controller do
-  %div.search-input
-    %input{type: 'text', placeholder: t("components.search_input.placeholder"), id: 'search_query', data: {action: 'debounced:input->search-input#search'}, value: @value}
-    .search-button{data: @data}
-      %i.fa.fa-search
--- a/app/components/search_input_component/search_input_component.scss
+++ b/app/components/search_input_component/search_input_component.scss
@@ -1,23 +0,0 @@
-.search-input {
-  border: 1px solid $disabled-light;
-  height: 3em;
-  display: flex;
-  line-height: 3em;
-  align-items: center;
-
-  input {
-    border: none;
-    height: 3em;
-    width: 100%;
-    box-sizing: border-box;
-    padding-right: 5px;
-  }
-
-  .search-button {
-    padding-right: 10px;
-    padding-left: 5px;
-    cursor: pointer;
-    color: $color-4;
-  }
-
-}
--- a/app/components/selector_component.rb
+++ b/app/components/selector_component.rb
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class SelectorComponent < ViewComponentReflex::Component
-  def initialize(title:, selected:, items:, data: {})
-    super
-    @title = title
-    @items = items.map do |item|
-      {
-        label: item[:label],
-        value: item[:value],
-        selected: selected.include?(item[:value])
-      }
-    end
-    @selected = selected
-    @data = data
-  end
-end
--- a/app/components/selector_component/selector_component.html.haml
+++ b/app/components/selector_component/selector_component.html.haml
@@ -1,11 +0,0 @@
-= component_controller do
-  .selector.selector-close
-    .selector-main{ data: { action: "click->selector#toggle" } }
-      .selector-main-title 
-        = @title
-      .selector-arrow
-    .selector-wrapper
-      .selector-items
-        - @items.each do |item|
-          .selector-item{ class: ("selected" if item[:selected]), data: @data, "data-value": item[:value] }
-            = item[:label]
--- a/app/components/selector_component/selector_component.scss
+++ b/app/components/selector_component/selector_component.scss
@@ -1,86 +0,0 @@
-.selector {
-  position: relative;
-
-  .selector-main {
-    border: 1px solid $disabled-light;
-    height: 3em;
-    position: relative;
-    cursor: pointer;
-
-    .selector-main-title {
-      line-height: 3em;
-      padding-left: 10px;
-      padding-right: 10px;
-    }
-    
-    .selector-arrow {
-      position: absolute;
-      right: 0px;
-      height: 3em;
-      width: 1.5em;
-      top: -1px;
-
-      &:after {
-        content: "";
-        position: absolute;
-        top: 50%;
-        right: 5px;
-        margin-top: -5px;
-        width: 0;
-        height: 0;
-        border-left: 5px solid transparent;
-        border-right: 5px solid transparent;
-        border-top: 5px solid $disabled-light;
-      }
-    }
-  }
-
-  .selector-wrapper {
-    position: absolute;
-    left: 0px;
-    right: 0px;
-    z-index: 1;
-    background-color: white;
-    margin-top: -1px;
-    border: 1px solid $disabled-light;
-
-    .selector-items {
-      overflow-y: auto;
-      min-height: 6em;
-  
-      .selector-item {
-        padding-left: 10px;
-        padding-right: 10px;
-        border-bottom: 1px solid $disabled-light;
-        position: relative;
-        height: 3em;
-        line-height: 3em;
-
-        &:hover {
-          background-color: #eee;
-          cursor: pointer;
-        }
-
-        &:last-child {
-          border-bottom: none;
-        }
-
-        &.selected {
-          &:after {
-            content: "✓";
-            display: inline-block;
-            position: absolute;
-            right: 10px;
-          }
-        }
-      }
-    }
-  }
-  
-
-  &.selector-close {
-    .selector-wrapper {
-      display: none;
-    }
-  }
-}
--- a/app/components/selector_with_filter_component.rb
+++ b/app/components/selector_with_filter_component.rb
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class SelectorWithFilterComponent < SelectorComponent
-  def initialize(title:, selected:, items:, data: {},
-                 selected_items_i18n_key: 'components.selector_with_filter.selected_items')
-    super(title: title, selected: selected, items: items, data: data)
-    @selected_items = items.select { |item| @selected.include?(item[:value]) }
-    @selected_items_i18n_key = selected_items_i18n_key
-    @items = items
-  end
-end
--- a/app/components/selector_with_filter_component/selector_with_filter_component.html.haml
+++ b/app/components/selector_with_filter_component/selector_with_filter_component.html.haml
@@ -1,22 +0,0 @@
-= component_controller do
-  .super-selector.selector.selector-close
-    .selector-main{ data: { action: "click->selector-with-filter#toggle" } }
-      .super-selector-label
-        = @title
-      .super-selector-selected-items
-        - case @selected_items.length
-        - when 1, 2
-          - @selected_items.each do |item|
-            .super-selector-selected-item
-              = item[:label]
-        - else
-          .super-selector-selected-item
-            = t(@selected_items_i18n_key, count: @selected_items.length)
-      .selector-arrow
-    .selector-wrapper
-      .super-selector-search
-        %input{type: "text", placeholder: t("components.selector_with_filter.search_placeholder"), data: { action: "debounced:input->selector-with-filter#filter" } }
-      .selector-items
-        - @items.each do |item|
-          .selector-item{ class: ("selected" if item[:selected]), data: @data.merge({ "selector-with-filter-target": "items" }), "data-value": item[:value] }
-            = item[:label]
--- a/app/components/selector_with_filter_component/selector_with_filter_component.scss
+++ b/app/components/selector_with_filter_component/selector_with_filter_component.scss
@@ -1,51 +0,0 @@
-
-.super-selector {
-  position: relative;
-
-  .selector-main {
-    .super-selector-label {
-      padding-left: 5px;
-      padding-right: 5px;
-      margin-left: 10px;
-      position: absolute;
-      top: -1em;
-      background-color: white;
-    }
-  }
-
-  .super-selector-selected-items {
-    margin-left: 5px;
-    margin-right: 2em;
-    margin-top: 7px;
-    display: flex;
-
-    .super-selector-selected-item {
-      border: 1px solid $pale-blue;
-      background-color: $spree-light-blue;
-      border-radius: 20px;
-      height: 2em;
-      padding-left: 10px;
-      padding-right: 10px;
-      display: inline-block;
-      margin-right: 5px;
-      padding-top: 2px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  .selector-wrapper {
-    .super-selector-search {
-      border-bottom: 1px solid $disabled-light;
-      padding: 10px 5px;
-
-      input {
-        border: 1px solid $disabled-light;
-        box-sizing: border-box;
-        border-radius: 4px;
-        width: 100%;
-      }
-    }
-  }
-}
--- a/app/components/table_header_component.rb
+++ b/app/components/table_header_component.rb
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class TableHeaderComponent < ViewComponentReflex::Component
-  def initialize(columns:, sort:, data: {})
-    super
-    @columns = columns
-    @sort = sort
-    @data = data
-  end
-end
--- a/app/components/table_header_component/table_header_component.html.haml
+++ b/app/components/table_header_component/table_header_component.html.haml
@@ -1,7 +0,0 @@
-
-= component_controller do
-  %thead.table-header
-    %tr
-      - @columns.each do |column|
-        %th{class: (column[:sortable] ? "th-sortable " : "" ) + (@sort[:column] == column[:value] ? " th-sorted-#{@sort[:direction]}" : ""), data: (@data if column[:sortable] == true), "data-sort-value": column[:value], "data-sort-direction": @sort[:direction]}
-          = column[:label]
--- a/app/components/table_header_component/table_header_component.scss
+++ b/app/components/table_header_component/table_header_component.scss
@@ -1,23 +0,0 @@
-thead.table-header {
-  th {
-    &.th-sortable {
-      cursor: pointer;
-    }
-    &.th-sorted-asc, &.th-sorted-desc {
-      &:after {
-        display: inline-block;
-        padding-left: 10px;
-      } 
-    }
-    &.th-sorted-asc {
-      &:after {
-        content: "⇧";
-      }
-    }
-    &.th-sorted-desc {
-      &:after {
-        content: "⇩";
-      }
-    }
-  }
-}
--- a/app/constraints/feature_toggle_constraint.rb
+++ b/app/constraints/feature_toggle_constraint.rb
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "open_food_network/feature_toggle"
-
-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/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -116,7 +116,21 @@ module Admin

    # Fetches tags for all customers of the enterprise and returns a hash indexed by customer_id
    def customer_tags_by_id
-      BatchTaggableTagsQuery.call(Customer.of(managed_enterprise_id))
+      customer_tags = ::ActsAsTaggableOn::Tag.
+        joins(:taggings).
+        includes(:taggings).
+        where(taggings:
+                { taggable_type: 'Customer',
+                  taggable_id: Customer.of(managed_enterprise_id),
+                  context: 'tags' })
+
+      customer_tags.each_with_object({}) do |tag, indexed_hash|
+        tag.taggings.each do |tagging|
+          customer_id = tagging.taggable_id
+          indexed_hash[customer_id] ||= []
+          indexed_hash[customer_id] << tag.name
+        end
+      end
    end
  end
 end
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -6,7 +6,6 @@ module Admin
  class EnterpriseFeesController < Admin::ResourceController
    before_action :load_enterprise_fee_set, only: :index
    before_action :load_data
-    before_action :check_enterprise_fee_input, only: [:bulk_update]

    def index
      @include_calculators = params[:include_calculators].present?
@@ -36,6 +35,13 @@ module Admin
    end

    def bulk_update
+      @flat_percent_value = enterprise_fee_bulk_params.dig('collection_attributes', '0', 'calculator_attributes', 'preferred_flat_percent')
+
+      unless @flat_percent_value.nil? || Float(@flat_percent_value, exception: false)
+        flash[:error] = I18n.t(:calculator_preferred_value_error)
+        return redirect_to redirect_path
+      end
+
      @enterprise_fee_set = Sets::EnterpriseFeeSet.new(enterprise_fee_bulk_params)

      if @enterprise_fee_set.save
@@ -99,25 +105,5 @@ module Admin
        ]
      )
    end
-
-    def check_enterprise_fee_input
-      enterprise_fee_bulk_params['collection_attributes'].each do |_, fee_row|
-        enterprise_fees = fee_row['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
-        )
-
-        next unless enterprise_fees
-
-        enterprise_fees.each do |_, enterprise_amount|
-          unless enterprise_amount.nil? || Float(enterprise_amount, exception: false)
-            flash[:error] = I18n.t(:calculator_preferred_value_error)
-            return redirect_to redirect_path
-          end
-        end
-      end
-    end
  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/oidc_settings_controller.rb
+++ b/app/controllers/admin/oidc_settings_controller.rb
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class OidcSettingsController < Spree::Admin::BaseController
-    def index; end
-  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/products_controller.rb
+++ b/app/controllers/admin/products_controller.rb
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class ProductsController < Spree::Admin::BaseController
-    def index; end
-  end
-end
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -43,12 +43,10 @@ module Admin
      @report_type = report_type
      @report_subtypes = report_subtypes
      @report_subtype = report_subtype
-      @report_title = if report_subtype
-                        report_subtype_title
-                      else
-                        I18n.t(:name, scope: [:admin, :reports, @report_type])
-                      end
-      @rendering_options = rendering_options
+
+      # Initialize data
+      params[:display_summary_row] = true if request.get?
+
      @data = Reporting::FrontendData.new(spree_current_user)
    end
  end
--- a/app/controllers/admin/subscriptions_controller.rb
+++ b/app/controllers/admin/subscriptions_controller.rb
@@ -162,20 +162,25 @@ module Admin
      [:index]
    end

-    def managed_enterprise_id
-      Enterprise.managed_by(spree_current_user).select('enterprises.id').
-        find_by(id: params[:enterprise_id])
-    end
-
    def subscription_params
      @subscription_params ||= PermittedAttributes::Subscription.new(params).call.
        to_h.with_indifferent_access
    end

    def payment_method_tags_by_id
-      @payment_method_tags_by_id ||= BatchTaggableTagsQuery.call(
-        Spree::PaymentMethod.from(managed_enterprise_id)
-      )
+      payment_method_tags = ::ActsAsTaggableOn::Tag.
+        joins(:taggings).
+        includes(:taggings).
+        where(taggings: { taggable_type: "Spree::PaymentMethod",
+                          taggable_id: Spree::PaymentMethod.from(Enterprise.managed_by(spree_current_user).
+                          select('enterprises.id').find_by(id: params[:enterprise_id])),
+                          context: 'tags' })
+
+      payment_method_tags.each_with_object({}) do |tag, hash|
+        payment_method_id = tag.taggings.first.taggable_id
+        hash[payment_method_id] ||= []
+        hash[payment_method_id] << tag.name
+      end
    end
  end
 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/Show More
+++ b/Show More