Merge branch 'active-storage' into HEAD

Creating a seperate release off the master branch.

.browserslistrc

@@ -1,2 +1 @@
 defaults
-IE 11

.dockerignore

@@ -2,4 +2,3 @@
 .gitignore
 log/*
 tmp/*
-node_modules/

.env.development

@@ -1,21 +1,9 @@
 # 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
 
-VERBOSE_QUERY_LOGS=true
-
-SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 OFN_REDIS_URL="redis://localhost:6379/1"
 OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
 
 SITE_URL="0.0.0.0:3000"
-
-# Deactivate rack-timeout in development.
-# https://github.com/zombocom/rack-timeout#configuring
-RACK_TIMEOUT_SERVICE_TIMEOUT="0"
-RACK_TIMEOUT_WAIT_TIMEOUT="0"
-RACK_TIMEOUT_WAIT_OVERTIME="0"

.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"

.gitattributes

@@ -1,11 +0,0 @@
-# Set default behavior to automatically normalize line endings.
-* text=auto
-
-# Set line endings to LF, even on Windows. Otherwise, execution within Docker fails.
-# See https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings#per-repository-settings
-*.sh text eol=lf
-
-# Same thing for following files, but they don't have an sh extension
-pre-commit eol=lf
-webpack-dev-server eol=lf
-install-bundler eol=lf

.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']

.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,13 +18,26 @@ 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
 
-- [ ] Publish and notify [#global-community] (this is automatically posted with a plugin)
+- [ ] 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.
   <details><summary>Command line instructions</summary>
   <pre>
@@ -43,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

.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. -->

.github/dependabot.yml

@@ -6,12 +6,10 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
-    # Only specific requirements are specified in Gemfile, so don't touch it.
     versioning-strategy: lockfile-only
 
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "daily"
-    # All versions are specified in package.json, so please update them.
-    versioning-strategy: increase
+    versioning-strategy: lockfile-only

.github/workflows/brakeman-analysis.yml

@@ -10,30 +10,24 @@ 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'
 
     - name: Setup Brakeman
       env:
-        BRAKEMAN_VERSION: '5.4.0'
+        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
       run: |
         gem install brakeman --version $BRAKEMAN_VERSION
 
@@ -41,11 +35,10 @@ jobs:
     - name: Scan
       continue-on-error: true
       run: |
-        git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
         brakeman -f sarif -o output.sarif.json .
 
     # 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

.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-22.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-file: .node-version
+          node-version: '14.15.5'
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
@@ -68,398 +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: |
-          git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
-          bundle exec rake knapsack_pro:rspec
-
-  knapsack_rspec_models:
-    runs-on: ubuntu-22.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-file: .node-version
-
-      - 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-22.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-file: .node-version
-
-      - 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-22.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-file: .node-version
-
-      - 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-22.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-file: .node-version
-
-      - 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-22.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-file: .node-version
-
-      - 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-22.04
+  test-the-rest:
+    runs-on: ubuntu-18.04
     services:
       postgres:
         image: postgres:10
@@ -474,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-file: .node-version
+          node-version: '14.15.5'
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
@@ -497,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"]

.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
@@ -9,11 +7,7 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v1
-
       - uses: ruby/setup-ruby@v1
-
-      - run: git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
-
       - name: rubocop
         uses: reviewdog/action-rubocop@v2
         with:
@@ -22,26 +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
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version-file: .node-version
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - run: git show --no-patch # the commit being tested (which is often a merge due to 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

.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

.github/workflows/stage.yml

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

.gitignore

@@ -50,12 +50,10 @@ vendor/bundle/
 coverage
 /reports/
 !/reports/README.md
+/spec/components/stories/**/*.stories.json
 
 /public/packs
 /public/packs-test
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
-
-/config/credentials.yml.enc
-/config/master.key

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
- yarn pretty-quick --check --staged

.node-version

@@ -1 +1 @@
-17.9.1
+14.16.1

.prettierignore

@@ -1,31 +0,0 @@
-# Ignore a lot of things, but we should enable where it can be helpful.
-
-*.md
-*.yml
-*.yaml
-*.json
-*.html
-
-# JS
-# Enabled: app/webpacker/controllers/*.js and app/webpacker/packs/*.js
-babel.config.js
-postcss.config.js
-
-# SCSS
-# Enabled: most of admin
-/app/webpacker/css/admin/globals/
-/app/webpacker/css/admin/shared/
-/app/webpacker/css/admin_v3/globals/variables.scss
-/app/webpacker/css/darkswarm/
-/app/webpacker/css/mail/
-/app/webpacker/css/shared/
-
-# More
-/app/assets/
-/config/
-/coverage/
-/engines/
-/public/
-/spec/
-/tmp/
-/vendor/

.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "printWidth": 100
-}

.rubocop_styleguide.yml

@@ -2,8 +2,9 @@
 #
 # These are the rules we agreed upon and we work towards.
 AllCops:
-  NewCops: enable
+  NewCops: disable
   SuggestExtensions: false
+  TargetRailsVersion: 5.0
   Exclude:
     - 'bin/**/*'
     - 'db/**/*'
@@ -22,7 +23,7 @@ Metrics:
   Enabled: true
 
 Metrics/BlockLength:
-  AllowedMethods: [
+  IgnoredMethods: [
     "class_eval",
     "collection",
     "context",
@@ -40,15 +41,8 @@ Metrics/BlockLength:
     "resources",
     "scenario",
     "shared_examples",
-    "shared_examples_for",
-    "xdescribe",
   ]
 
-Rails/ApplicationRecord:
-  Exclude:
-    # Migrations should not contain application code:
-    - "db/migrate/*.rb"
-
 Rails/SkipsModelValidations:
   AllowedMethods:
     - "touch"

.storybook/main.js

@@ -0,0 +1,7 @@
+module.exports = {
+  stories: ['../spec/components/stories/**/*.stories.json'],
+  addons: [
+    '@storybook/addon-docs',
+    '@storybook/addon-controls',
+  ],
+};

.storybook/preview-head.html

@@ -0,0 +1,2 @@
+<link href='https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" media="screen" href="http://localhost:3000/assets/darkswarm/all.css" />

.storybook/preview.js

@@ -0,0 +1,5 @@
+export const parameters = {
+  server: {
+    url: `http://localhost:3000/rails/stories`,
+  },
+};

.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

CONTRIBUTING.md

@@ -57,7 +57,6 @@ TL;DR:
 * Maintain a clean commit history
 * Use a style consistent with the rest of the codebase
 * Before submitting, [rebase your work][rebase] on the current master branch
-* After submitting, be sure to check the [CI test results](ci). Click on a ❌ result to view the logged results and investigate.
 
 From here, your pull request will progress through the [Review, Test, Merge & Deploy process][process].
 
@@ -71,5 +70,4 @@ From here, your pull request will progress through the [Review, Test, Merge & De
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
 [ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
 [i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Internationalisation-%28i18n%29
-[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
-[ci]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Continuous-Integration
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2

Dockerfile

@@ -28,18 +28,14 @@ RUN apt-get update && apt-get install -y \
   gnupg
 
 # Setup ENV variables
-ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:/usr/local/src/nodenv/shims:/usr/local/src/nodenv/bin:$PATH
+ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
 ENV RBENV_ROOT /usr/local/src/rbenv
-ENV NODENV_ROOT /usr/local/src/nodenv
 ENV CONFIGURE_OPTS --disable-install-doc
 ENV BUNDLE_PATH /bundles
 ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
 
 WORKDIR /usr/src/app
-
-# trim spaces and line return from .ruby-version file
-COPY .ruby-version .ruby-version.raw
-RUN cat .ruby-version.raw | tr -d '\r\t ' > .ruby-version
+COPY .ruby-version .
 
 # Install Rbenv & Ruby
 RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
@@ -54,19 +50,10 @@ RUN sh -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-10 libpq-dev
 
-
-# trim spaces and line return from .node-version file
-COPY .node-version .node-version.raw
-RUN cat .node-version.raw | tr -d '\r\t ' > .node-version
-
-# Install Node and Yarn with Nodenv
-RUN git clone --depth 1 https://github.com/nodenv/nodenv.git ${NODENV_ROOT} && \
-    git clone --depth 1 https://github.com/nodenv/node-build.git ${NODENV_ROOT}/plugins/node-build && \
-    git clone --depth 1 https://github.com/pine/nodenv-yarn-install.git ${NODENV_ROOT}/plugins/nodenv-yarn-install && \
-    git clone --depth 1 https://github.com/nodenv/nodenv-package-rehash.git ${NODENV_ROOT}/plugins/nodenv-package-rehash && \
-    echo 'eval "$(nodenv init -)"' >> /etc/profile.d/nodenv.sh && \
-    nodenv install $(cat .node-version) && \
-    nodenv global $(cat .node-version)
+# Install NodeJs and yarn
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install --no-install-recommends -y nodejs \
+    && npm install -g yarn
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \

GETTING_STARTED.md

@@ -11,9 +11,6 @@ Head to our wiki on [Learning Rails](https://github.com/openfoodfoundation/openf
 The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](docker/README.md).
 Otherwise, for a local setup you will need:
 * Ruby and bundler (check current Ruby version in [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file)
-    - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/)
-* Node and yarn (check current Node version in [.node-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.node-version) file)
-    - [nodevn](https://github.com/nodenv/nodenv) is recommended.
 * PostgreSQL database
 * Redis (for background jobs)
 * Chrome (for testing)
@@ -23,13 +20,15 @@ The following guides will provide OS-specific step-by-step instructions to get t
 - [Debian Setup Guide][debian]
 - [OSX Setup Guide][osx]
 
+If you are likely to need to manage multiple version of ruby on your local machine, we recommend version managers such as [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
+
 For those new to Rails, the following tutorial will help get you up to speed with configuring a [Rails environment](http://guides.rubyonrails.org/getting_started.html).
 
 ### Get it
 
 So you have set up your local environment according to the requirements listed above. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine:
 
-    git clone git@github.com:YOUR_GITHUB_USERNAME_HERE/openfoodnetwork.git
+    git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
 
 Jump into your new local copy of the Open Food Network:
 
@@ -37,7 +36,7 @@ Jump into your new local copy of the Open Food Network:
 
 And then add an `upstream` remote that points to the main repo:
 
-    git remote add upstream git@github.com:openfoodfoundation/openfoodnetwork.git
+    git remote add upstream https://github.com/openfoodfoundation/openfoodnetwork
 
 Fetch the latest version of `master` from `upstream` (ie. the main repo):
 
@@ -48,14 +47,14 @@ Fetch the latest version of `master` from `upstream` (ie. the main repo):
 First, you need to create the database user the app will use by manually typing the following in your terminal:
 
 ```sh
-sudo --login --user=postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"
+$ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"
 ```
 
 This will create the "ofn" user as superuser and allowing it to create databases. If this command fails, check the [troubleshooting section](#creating-the-database) for an alternative.
 
 Next, it is _strongly recommended_ to run the setup script.
 ```sh
-./script/setup
+$ script/setup
 ```
 If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
@@ -69,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
 
@@ -84,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.
 
@@ -114,13 +111,13 @@ Below are fixes to potential issues that can happen during the installation proc
 
 #### Creating the database
 
-If the `sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"` command doesn't work, you can run the following commands instead:
+If the ```$ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"``` command doesn't work, you can run the following commands instead:
 ```
-createuser --superuser --pwprompt ofn
-# Enter password for new role: f00d
-# Enter it again: f00d
-createdb open_food_network_dev --owner=ofn
-createdb open_food_network_test --owner=ofn
+$ createuser --superuser --pwprompt ofn
+Enter password for new role: f00d
+Enter it again: f00d
+$ createdb open_food_network_dev --owner=ofn
+$ createdb open_food_network_test --owner=ofn
 ```
 If these commands succeed, you should be able to [continue the setup process](#get-it-running).
 
@@ -132,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

Gemfile

@@ -6,7 +6,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
-gem 'rails'
+gem 'rails', '>= 6.1.4'
 
 # Active Storage
 gem "active_storage_validations"
@@ -14,11 +14,11 @@ gem "aws-sdk-s3", require: false
 gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
+gem 'rexml'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '~> 2.6.0'
+gem 'ransack', '2.4.2'
 gem 'responders'
-gem 'rexml'
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -27,9 +27,8 @@ gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-7"
+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"
 
@@ -63,18 +62,14 @@ gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.3'
 gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
-gem 'datafoodconsortium-connector'
 gem 'jsonapi-serializer'
 gem 'pagy', '~> 5.1'
 
 gem 'rswag-api'
 gem 'rswag-ui'
 
-gem 'omniauth_openid_connect'
-gem 'omniauth-rails_csrf_protection'
-gem 'openid_connect', '~> 1.3'
-
 gem 'angularjs-rails', '1.8.0'
+gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
 gem 'haml'
 gem 'redcarpet'
@@ -84,16 +79,16 @@ gem 'actionpack-action_caching'
 #   AMS is deprecated, we will introduce an alternative at some point
 gem "active_model_serializers", "0.8.4"
 gem 'activerecord-session_store'
-gem 'acts-as-taggable-on'
+gem 'acts-as-taggable-on', '~> 8.1'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'bigdecimal', '3.0.2'
 gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 12.1'
+gem 'paper_trail', '~> 12.1.0'
 gem 'rack-rewrite'
-gem 'rack-timeout'
+gem 'rack-ssl', require: 'rack/ssl'
 gem 'roadie-rails'
 
 gem 'hiredis'
@@ -102,16 +97,15 @@ gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
-gem "cable_ready", "5.0.0.rc2"
-gem "stimulus_reflex", "3.5.0.rc2"
+gem "cable_ready", "5.0.0.pre3"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
 gem 'immigrant'
-gem 'roo' # read spreadsheets
-gem 'spreadsheet_architect' # write spreadsheets
+gem 'roo', github: "roo-rb/roo" # master is currently needed for Ruby 3.x (awaiting new release)
+gem 'spreadsheet_architect'
 
 gem 'whenever', require: false
 
@@ -119,55 +113,60 @@ gem 'test-unit', '~> 3.5'
 
 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'
 gem 'jquery-ui-rails', '~> 4.2'
 gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 
+gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
+
 gem 'good_migrations'
 
 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 "faraday"
-gem "private_address_check"
+gem "view_component", require: "view_component/engine"
 
 group :production, :staging do
   gem 'ddtrace'
+  gem 'rack-timeout'
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
 
 group :test, :development do
+  # Pretty printed test output
+  gem 'awesome_print'
   gem 'bullet'
   gem 'capybara'
   gem 'cuprite'
   gem 'database_cleaner', require: false
-  gem 'debug', '>= 1.0.0'
   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 '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
@@ -177,13 +176,14 @@ group :development do
   gem 'foreman'
   gem 'listen'
   gem 'pry', '~> 0.13.0'
-  gem 'query_count'
-  gem 'rails-erd'
+  gem 'pry-byebug', '~> 3.9.0'
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'web-console'
 
+  gem "view_component_storybook", require: "view_component/storybook/engine"
+
   gem 'rack-mini-profiler', '< 3.0.0'
 end

Procfile

@@ -1,5 +1,5 @@
 # Foreman Procfile. Start all dev server processes with: `foreman start`
 
-rails:      DEV_CACHING=true bundle exec rails s -p 3000
+rails:      bundle exec rails s -p 3000
 webpack:    ./bin/webpack-dev-server
-sidekiq:    DEV_CACHING=true bundle exec sidekiq -q mailers -q default
+sidekiq:    bundle exec sidekiq -q mailers -q default

README.md

@@ -33,25 +33,18 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-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][welcome-qa] 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)
+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! 
 
 ## 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
 [ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
-[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
-[welcome-qa]: https://github.com/orgs/openfoodfoundation/projects/6
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
 [zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -8,3 +8,6 @@ require_relative 'config/application'
 
 Openfoodnetwork::Application.load_tasks
 
+if !ENV['DISABLE_KNAPSACK'] && defined?(Knapsack)
+  Knapsack.load_tasks
+end

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

@@ -12,6 +12,5 @@ angular.module("ofn.admin", [
   "admin.orders"
 ]).config ($httpProvider, $locationProvider, $qProvider) ->
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
-  # for the next line, you should also probably check file: app/assets/javascripts/admin/utils/utils.js.coffee
   $locationProvider.hashPrefix('')
   $qProvider.errorOnUnhandledRejections(false)

app/assets/javascripts/admin/all.js

@@ -7,6 +7,7 @@
 
 // jquery and angular
 //= require jquery2
+//= require jquery_ujs
 //= require jquery.ui.all
 //= require jquery.powertip
 //= require jquery.cookie
@@ -21,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
@@ -86,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
 

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 = ->

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]

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", ->

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)

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

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')) }
@@ -55,12 +57,28 @@ angular.module("admin.enterprises")
         else
           alert ("#{manager.email}" + " " + t("is_already_manager"))
 
+    $scope.inviteManager = ->
+      $scope.invite_errors = $scope.invite_success = null
+      email = $scope.newUser
+
+      $http.post("/admin/manager_invitations", {email: email, enterprise_id: $scope.Enterprise.id}).then (response)->
+          $scope.addManager({id: response.data.user, email: email})
+          $scope.invite_success = t('user_invited', email: email)
+        .catch (response) ->
+          $scope.invite_errors = response.data.errors
+
+    $scope.resetModal = ->
+      $scope.newUser = $scope.invite_errors = $scope.invite_success = null
+
     $scope.removeLogo = ->
       $scope.performEnterpriseAction("removeLogo", "immediate_logo_removal_warning", "removed_logo_successfully")
 
     $scope.removePromoImage = ->
       $scope.performEnterpriseAction("removePromoImage", "immediate_promo_image_removal_warning", "removed_promo_image_successfully")
 
+    $scope.removeTermsAndConditions = ->
+      $scope.performEnterpriseAction("removeTermsAndConditions", "immediate_terms_and_conditions_removal_warning", "removed_terms_and_conditions_successfully")
+
     $scope.performEnterpriseAction = (enterpriseActionName, warning_message_key, success_message_key) ->
       return unless confirm($scope.translation(warning_message_key))
 

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)

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')

app/assets/javascripts/admin/enterprises/directives/terms_and_conditions_warning.js.coffee

@@ -0,0 +1,32 @@
+angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($rootScope, $compile, $templateCache, DialogDefaults, $timeout) ->
+  restrict: 'A'
+  scope: true
+
+  link: (scope, element, attr) ->
+    # This file input click handler will hold the browser file input dialog and show a warning modal
+    scope.hold_file_input_and_show_warning_modal = (event) ->
+      event.preventDefault()
+      scope.template = $compile($templateCache.get('admin/modals/terms_and_conditions_warning.html'))(scope)
+      if scope.template.dialog
+        scope.template.dialog(DialogDefaults)
+        scope.template.dialog('open')
+      $rootScope.$evalAsync()
+
+    element.bind 'click', scope.hold_file_input_and_show_warning_modal
+
+    # When the user presses continue in the warning modal, we open the browser file input dialog
+    scope.continue = ->
+      scope.template.dialog('close')
+      $rootScope.$evalAsync()
+
+      # unbind warning modal handler and click file input again to open the browser file input dialog
+      element.unbind('click').trigger('click')
+      # afterwards, bind warning modal handler again so that the warning is shown the next time
+      $timeout ->
+        element.bind 'click', scope.hold_file_input_and_show_warning_modal
+      return
+
+    scope.close = ->
+      scope.template.dialog('close')
+      $rootScope.$evalAsync()
+      return

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

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

app/assets/javascripts/admin/index_utils/directives/show_more.js.coffee

@@ -0,0 +1,12 @@
+angular.module("admin.indexUtils").component 'showMore',
+  templateUrl: 'admin/show_more.html'
+  bindings:
+    data: "="
+    limit: "="
+    increment: "="
+
+# For now, this component is not being used.
+# Something about binding "data" to a variable on the parent scope that is continually refreshed by
+# being assigned within an ng-repeat means that we get $digest iteration errors. Seems to be solved
+# by using the new "as" syntax for ng-repeat to assign and alias the outcome of the filters, but this
+# has the limitation of not being able to be limited AFTER the assignment has been made, which we need

app/assets/javascripts/admin/index_utils/services/sort_options.js.coffee

@@ -11,6 +11,5 @@ angular.module("admin.indexUtils").factory 'SortOptions', ->
       sortingExpr
 
     toggle: (predicate) ->
-      # predicate is a string or an array of strings
-      @reverse = (JSON.stringify(@predicate) == JSON.stringify(predicate)) && !@reverse
+      @reverse = (@predicate == predicate) && !@reverse
       @predicate = predicate

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

@@ -3,31 +3,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.RequestMonitor = RequestMonitor
   $scope.line_items = LineItems.all
   $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.bulkActions = [ { name: t("admin.orders.bulk_management.actions_delete"), callback: 'deleteLineItems' } ]
   $scope.selectedUnitsProduct = {}
   $scope.selectedUnitsVariant = {}
   $scope.sharedResource = false
   $scope.columns = Columns.columns
   $scope.sorting = SortOptions
-  $scope.sorting.toggle("order_date")
-  $scope.pagination = LineItems.pagination
-  $scope.per_page_options = [
-    {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
-    {id: 50, name: t('js.admin.orders.index.per_page', results: 50)},
-    {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
-  ]
-  $scope.page = 1
-  $scope.per_page = $scope.per_page_options[0].id
-  $scope.filterByVariantId = null
-  searchThrough = ["order_distributor_name",
-    "order_bill_address_phone",
-    "order_bill_address_firstname",
-    "order_bill_address_lastname",
-    "order_bill_address_full_name",
-    "variant_product_supplier_name",
-    "order_email",
-    "order_number",
-    "product_name"].join("_or_") + "_cont"
 
   $scope.confirmRefresh = ->
     LineItems.allSaved() || confirm(t("unsaved_changes_warning"))
@@ -36,24 +19,22 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.distributorFilter = ''
     $scope.supplierFilter = ''
     $scope.orderCycleFilter = ''
-    $scope.query = ''
-    $scope.startDate = undefined
-    $scope.endDate = undefined
-    event = new CustomEvent('flatpickr:clear')
-    window.dispatchEvent(event)
+    $scope.quickSearch = ''
 
   $scope.resetSelectFilters = ->
     $scope.resetFilters()
     $scope.refreshData()
 
-  $scope.fetchResults = ->
-    # creates indirection in order to factorize the code between orders and bulk orders
-    # used in app/views/admin/shared/_angular_per_page_controls.html.haml
-    $scope.refreshData()
-
   $scope.refreshData = ->
-    return "cancel" unless $scope.confirmRefresh()
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
+      $scope.setOrderCycleDateRange()
 
+    $scope.formattedStartDate = moment($scope.startDate).format()
+    $scope.formattedEndDate = moment($scope.endDate).add(1,'day').format()
+
+    return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()
+
+    $scope.loadOrders()
     $scope.loadLineItems()
 
     unless $scope.initialized
@@ -61,52 +42,49 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
     $scope.dereferenceLoadedData()
 
-  $scope.loadOrders = ->
-    return $scope.orders = [] unless $scope.line_items.length
+  $scope.setOrderCycleDateRange = ->
+    start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
+    end_date = OrderCycles.byID[$scope.orderCycleFilter].orders_close_at
+    format = "YYYY-MM-DD HH:mm:ss Z"
+    $scope.startDate = moment(start_date, format).format('YYYY-MM-DD')
+    $scope.endDate = moment(end_date, format).startOf('day').format('YYYY-MM-DD')
 
+  $scope.loadOrders = ->
     RequestMonitor.load $scope.orders = Orders.index(
-      "q[id_in][]": $scope.line_items.map((line_item) -> line_item.order.id)
+      "q[state_not_eq]": "canceled",
+      "q[shipment_state_not_eq]": "shipped",
+      "q[completed_at_not_null]": "true",
+      "q[distributor_id_eq]": $scope.distributorFilter,
+      "q[order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[completed_at_gteq]": $scope.formattedStartDate,
+      "q[completed_at_lt]": $scope.formattedEndDate
     )
 
   $scope.loadLineItems = ->
-    [formattedStartDate, formattedEndDate] = $scope.formatDates($scope.startDate, $scope.endDate)
-
     RequestMonitor.load LineItems.index(
-      "q[#{searchThrough}]": $scope.query,
-      "q[variant_id_eq]": $scope.filterByVariantId if $scope.filterByVariantId,
       "q[order_state_not_eq]": "canceled",
       "q[order_shipment_state_not_eq]": "shipped",
       "q[order_completed_at_not_null]": "true",
       "q[order_distributor_id_eq]": $scope.distributorFilter,
       "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
       "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
-      "q[order_completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined,
-      "q[order_completed_at_lt]": if formattedEndDate then formattedEndDate else undefined,
-      "q[s]": "order_completed_at desc",
-      "page": $scope.page,
-      "per_page": $scope.per_page
+      "q[order_completed_at_gteq]": $scope.formattedStartDate,
+      "q[order_completed_at_lt]": $scope.formattedEndDate
     )
 
-  $scope.formatDates = (startDate, endDate) ->
-    formattedStartDate = moment(startDate).format('YYYY-MM-DD') if startDate
-    formattedEndDate = moment(endDate).add(1,'day').format('YYYY-MM-DD') if endDate
-    return [formattedStartDate, formattedEndDate]
-
   $scope.loadAssociatedData = ->
     RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
     RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
     RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
 
   $scope.dereferenceLoadedData = ->
-    RequestMonitor.load $q.all([$scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.line_items.$promise]).then ->
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.line_items.$promise]).then ->
+      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
       Dereferencer.dereferenceAttr $scope.line_items, "supplier", Enterprises.byID
-      $scope.loadOrders()
-      RequestMonitor.load $q.all([$scope.orders.$promise]).then ->
-        Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID  
-        Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
-        Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
-        $scope.bulk_order_form.$setPristine()
-        StatusMessage.clear()
+      Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID
+      $scope.bulk_order_form.$setPristine()
+      StatusMessage.clear()
 
       unless $scope.initialized
         $scope.initialized = true
@@ -126,16 +104,16 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     else
       StatusMessage.display 'failure', t "unsaved_changes_error"
 
-  $scope.cancelOrder = (order, sendEmailCancellation, restock_items) ->
+  $scope.cancelOrder = (order, sendEmailCancellation) ->
     return $http(
       method: 'GET'
-      url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}&restock_items=#{restock_items}")
+      url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}")
   
   $scope.deleteLineItem = (lineItem) ->
     if lineItem.order.item_count == 1
-      ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
+      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
         if confirm
-          $scope.cancelOrder(lineItem.order, sendEmailCancellation, restock_items).then(->
+          $scope.cancelOrder(lineItem.order, sendEmailCancellation).then(->
             $scope.refreshData()
           )
         else
@@ -157,18 +135,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       willCancelOrders = true if (order.item_count == itemsPerOrder.get(order).length)
 
     if willCancelOrders
-      ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
+      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
         if confirm
           itemsPerOrder.forEach (items, order) =>
             if order.item_count == items.length
-              $scope.cancelOrder(order, sendEmailCancellation, restock_items).then(-> $scope.refreshData())
+              $scope.cancelOrder(order, sendEmailCancellation).then(-> $scope.refreshData())
             else
               Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
       , "js.admin.deleting_item_will_cancel_order")   
-    else
-      ofnDeleteLineItemsAlert(() ->
-        Promise.all(LineItems.delete(item) for item in lineItemsToDelete).then(-> $scope.refreshData())
-      , lineItemsToDelete.length)
 
   $scope.allBoxesChecked = ->
     checkedCount = $scope.filteredLineItems.reduce (count,lineItem) ->
@@ -183,17 +157,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.setSelectedUnitsVariant = (unitsProduct,unitsVariant) ->
     $scope.selectedUnitsProduct = unitsProduct
     $scope.selectedUnitsVariant = unitsVariant
-    $scope.filterByVariantId = unitsVariant.id
-    $scope.page = 1
-    $scope.refreshData()
-
-  $scope.resetSelectedUnitsVariant = ->
-    $scope.selectedUnitsProduct = { }
-    $scope.selectedUnitsVariant = { }
-    $scope.filterByVariantId = null
-    $scope.sharedResource = false
-    $scope.page = 1
-    $scope.refreshData()
 
   $scope.getLineItemScale = (lineItem) ->
     if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume") 
@@ -203,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) ->
@@ -228,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
 
@@ -239,7 +194,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
     scale = $scope.getScale(unitsProduct, unitsVariant)
-    if scale && value
+    if scale
       value = value / scale if scale != 28.35 && scale != 1 && scale != 453.6 # divide by scale if not smallest unit
       $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
     else
@@ -254,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
       ''
@@ -283,8 +238,5 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
       $scope.weightAdjustedPrice(lineItem)
 
-  $scope.changePage = (newPage) ->
-    $scope.page = newPage
-    $scope.refreshData()
-
-  $scope.resetSelectFilters()
+  $scope.resetFilters()
+  $scope.refreshData()

app/assets/javascripts/admin/line_items/filters/variant_filter.js.coffee

@@ -0,0 +1,6 @@
+angular.module("admin.lineItems").filter "variantFilter", ->
+    return (lineItems,selectedUnitsProduct,selectedUnitsVariant,sharedResource) ->
+      filtered = []
+      filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedUnitsProduct,{}) ||
+        (lineItem.units_product.id == selectedUnitsProduct.id && (sharedResource || lineItem.units_variant.id == selectedUnitsVariant.id ) ) )
+      filtered

app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee

@@ -18,6 +18,7 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
+      NavigationCheck.clear()
       StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
 

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

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()
@@ -35,11 +34,7 @@ angular.module('admin.orderCycles')
       OrderCycle.removeExchangeFee(exchange, index)
       $scope.order_cycle_form.$dirty = true
 
-    $scope.setPickupTimeFieldDirty = (index, pickup_time) ->
-      # if the pickup_time is already set we are in edit mode, so no need to set pickup_time field as dirty
-      # to show it is required (it has a red border when set to dirty)
-      return if pickup_time
-
+    $scope.setPickupTimeFieldDirty = (index) ->
       $timeout ->
         pickup_time_field_name = "order_cycle_outgoing_exchange_" + index + "_pickup_time"
         $scope.order_cycle_form[pickup_time_field_name].$setDirty()

app/assets/javascripts/admin/order_cycles/controllers/order_cycles_controller.js.coffee

@@ -33,11 +33,9 @@ angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, C
     StatusMessage.display 'notice', "You have unsaved changes" if newVal
 
   $scope.showMore = (days) ->
-    orderCycles = OrderCycles.index(ams_prefix: "index", 
-    "q[orders_close_at_gt]": "#{daysFromToday($scope.ordersCloseAtLimit - days)}", 
-    "q[orders_close_at_lteq]": "#{daysFromToday($scope.ordersCloseAtLimit)}"
-    )
     $scope.ordersCloseAtLimit -= days
+    existingIDs = Object.keys(OrderCycles.byID)
+    orderCycles = OrderCycles.index(ams_prefix: "index", "q[orders_close_at_gt]": "#{daysFromToday($scope.ordersCloseAtLimit)}", "q[id_not_in][]": existingIDs)
     orderCycles.$promise.then ->
       $scope.orderCycles.push(orderCycle) for orderCycle in orderCycles
       compileData()

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', ->

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

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

app/assets/javascripts/admin/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'

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

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

app/assets/javascripts/admin/orders/controllers/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)

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

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

app/assets/javascripts/admin/orders/directives/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

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

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

app/assets/javascripts/admin/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]

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,14 +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
-        # Preserves variant_unit_with_scale when form validation fails and reload triggers
-        if $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_with_scale = $scope.product.variant_unit
       else
         $scope.product.variant_unit = $scope.product.variant_unit_scale = null
 
@@ -38,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

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()

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)

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']

app/assets/javascripts/admin/resources/resources/enterprise_resource.js.coffee

@@ -14,4 +14,7 @@ angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
     'removePromoImage':
       url: '/api/v0/enterprises/:id/promo_image.json'
       method: 'DELETE'
+    'removeTermsAndConditions':
+      url: '/api/v0/enterprises/:id/terms_and_conditions.json'
+      method: 'DELETE'
   })

app/assets/javascripts/admin/resources/services/enterprises.js.coffee

@@ -63,3 +63,4 @@ angular.module("admin.resources").factory 'Enterprises', ($q, $filter, Enterpris
 
     removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
     removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)
+    removeTermsAndConditions: performActionOnEnterpriseResource(EnterpriseResource.removeTermsAndConditions)

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

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]

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

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

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

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

app/assets/javascripts/admin/spree/orders/shipments.js.erb

@@ -15,7 +15,7 @@ $(document).ready(function() {
       console.log(msg);
     });
   }
-  $('.admin-order-edit-form a.ship').click(handle_ship_click);
+  $('[data-hook=admin_order_edit_form] a.ship').click(handle_ship_click);
 
   //handle shipping method edit click
   $('a.edit-method').click(toggleMethodEdit);
@@ -25,108 +25,40 @@ $(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 ) {
       console.log(msg);
     });
   }
-  $('.admin-order-edit-form a.save-method').click(handle_shipping_method_save);
+  $('[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");
-  }
-
-  $('.admin-order-edit-form a.save-tracking').click(saveTrackingInfo);
-  $('.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)
-      }
-    }); 
-  }
-
-  $('.admin-order-edit-form a.save-note').click(saveNote);
-  $('.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);
 });

app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb

@@ -4,8 +4,7 @@ $(document).ready(function() {
 
   initAlert()
   initConfirm()
-  initButtonCancel()
-  initLinkCancel()
+  initCancelOrder()
 
   if ($('#variant_autocomplete_template').length > 0) {
     window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
@@ -100,7 +99,6 @@ adjustItems = function(shipment_number, variant_id, quantity, restock_item){
         doAdjustItems(shipment_number, variant_id, quantity, inventory_units, restock_item, () => {
           var redirectTo = new URL(Spree.routes.cancel_order.toString());
           redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
-          redirectTo.searchParams.append("restock_item", restock_item);
           window.location.href = redirectTo.toString();
         });
       }
@@ -143,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(){
@@ -252,18 +232,6 @@ ofnCancelOrderAlert = function(callback, i18nKey) {
   $('#custom-confirm').show();
 }
 
-ofnDeleteLineItemsAlert = function(callback, count) {
-  $('#custom-confirm .message').html(`${t("js.admin.orders.delete_line_items_html", {count: count})}`);
-  $('#custom-confirm button.confirm').click(() => {
-    $('#custom-confirm').hide();
-    callback();
-  });
-  $('#custom-confirm button.cancel').click(() => {
-    $('#custom-confirm').hide();
-  });
-  $('#custom-confirm').show();
-}
-
 ofnConfirm = function(callback) {
   $('#custom-confirm .message').html(
       ` ${t("are_you_sure")}
@@ -278,23 +246,17 @@ ofnConfirm = function(callback) {
   $('#custom-confirm').show();
 }
 
-initCancelAction = function(e){
-  ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => {
-      if (confirm) {
-          var redirectTo = new URL(Spree.routes.cancel_order.toString());
-          redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
-          redirectTo.searchParams.append("restock_items", restock_items);
-          window.location.href = redirectTo.toString();
-      }
+initCancelOrder = function() {
+    $('#cancel_order_form').submit(function(e){
+        ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => {
+            if (confirm) {
+                var redirectTo = new URL(Spree.routes.cancel_order.toString());
+                redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+                redirectTo.searchParams.append("restock_items", restock_items);
+                window.location.href = redirectTo.toString();
+            }
+        });
+        e.preventDefault();
+        return false;
     });
-  e.preventDefault();
-  return false;
-};
-
-initButtonCancel = function() {
-  $('#cancel_order_form').submit(initCancelAction)
-}
-
-initLinkCancel = function() {
-  $('#links-dropdown a[href$="cancel"]').click(initCancelAction);
 }

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(Spree.routes.admin_taxonomy_taxons)
-  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",

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()

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);

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)

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"

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

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

app/assets/javascripts/admin/utils/services/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) =>

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

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

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

@@ -1,4 +1,2 @@
-angular.module("admin.utils", ["templates", "ngSanitize"]).config ($httpProvider, $locationProvider) ->
- # for the next line, you should also probably check file: app/assets/javascripts/admin/admin_ofn.js.coffee
- $locationProvider.hashPrefix('')
+angular.module("admin.utils", ["templates", "ngSanitize"]).config ($httpProvider) ->
  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin_minimal.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/javascripts/darkswarm/controllers/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)

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

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

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

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

app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee

@@ -7,12 +7,8 @@ angular.module('Darkswarm').controller "RegistrationFormCtrl", ($scope, Registra
     form.$valid
 
   $scope.create = (form) ->
-    if ($scope.valid(form)) 
-      $scope.disableButton()
-      EnterpriseRegistrationService.create().then(() ->
-        $scope.enableButton()
-      )
-    end
+    $scope.disableButton()
+    EnterpriseRegistrationService.create($scope.enableButton) if $scope.valid(form)
 
   $scope.update = (nextStep, form) ->
     EnterpriseRegistrationService.update(nextStep) if $scope.valid(form)

app/assets/javascripts/darkswarm/directives/fill_vertical.js.coffee

@@ -0,0 +1,9 @@
+angular.module('Darkswarm').directive "fillVertical", ($window)->
+  # Makes something fill the window vertically. Used on the Google Map.
+  restrict: 'A'
+  link: (scope, element, attrs)->
+    setSize = ->
+      element.css "height", ($window.innerHeight - element.offset().top)
+    setSize()
+    angular.element($window).bind "resize", ->
+      setSize()

app/assets/javascripts/darkswarm/directives/flash.js.coffee

@@ -17,12 +17,9 @@ angular.module('Darkswarm').directive "ofnFlash", (flash, $timeout, RailsFlashLo
     
     # Callback when a new flash message is pushed to flash service
     show = (message, type)=>
-      return unless message
-      # if same message already exists, don't add it again
-      return if $scope.flashes.some((flash) -> flash.message == message)
-
-      $scope.flashes.push({message: message, type: typePairings[type]})
-      $timeout($scope.delete, 10000)
+      if message
+        $scope.flashes.push({message: message, type: typePairings[type]})
+        $timeout($scope.delete, 10000)
 
     $scope.delete = ->
       $scope.flashes.shift()

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()
   }