Update all locales with the latest Transifex translations

Make default time at 00 00 instead of 12 00

.browserslistrc

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

.env.test

@@ -6,3 +6,6 @@ STRIPE_SECRET_TEST_API_KEY="bogus_key"
 STRIPE_CUSTOMER="bogus_customer"
 
 SITE_URL="test.host"
+
+OPENID_APP_ID="test-provider"
+OPENID_APP_SECRET="12345"

.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: ''
 
@@ -18,7 +18,7 @@ assignees: ''
 
 - [ ] [Find build] of the release commit and copy it below.
 - [ ] Move this issue to Test Ready.
-- [ ] Notify testers.
+- [ ] Notify `@testers` in [#testing].
 - [ ] Test build: <!-- paste build link here, e.g. https://semaphore...builds/1234 -->
 
 ## Finish on Tuesday
@@ -44,5 +44,6 @@ 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/workflows/brakeman-analysis.yml

@@ -23,11 +23,11 @@ jobs:
     steps:
     # Checkout the repository to the GitHub Actions runner
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Customize the ruby version depending on your needs
     - name: Setup Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'
 
@@ -45,6 +45,6 @@ jobs:
 
     # Upload the SARIF file generated in the previous step
     - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v1
+      uses: github/codeql-action/upload-sarif@v2
       with:
         sarif_file: output.sarif.json

.github/workflows/build.yml

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

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: prettier
         uses: EPMatt/reviewdog-action-prettier@v1
         with:

.github/workflows/mapi.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - 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 +39,13 @@ jobs:
 
     # Archive HTML report
     - name: Archive Mayhem for API report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       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@v1
+      uses: github/codeql-action/upload-sarif@v2
       with:
         sarif_file: mapi.sarif

.prettierignore

@@ -1,6 +1,8 @@
 # Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
 *.css
 *.scss
+# Except v2
+!/app/webpacker/css/admin/v2/**/*.scss
 *.md
 *.yml
 *.yaml

.rubocop_todo.yml

@@ -478,6 +478,7 @@ Metrics/ClassLength:
     - 'app/serializers/api/enterprise_shopfront_serializer.rb'
     - 'app/services/cart_service.rb'
     - 'app/services/order_syncer.rb'
+    - 'app/services/order_cycle_form.rb'
     - 'engines/order_management/app/services/order_management/order/updater.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[open-food-network.enyml]
+[o:open-food-foundation:p:open-food-network:r:enyml]
 file_filter = config/locales/<lang>.yml
 source_lang = en
 type = YML

GETTING_STARTED.md

@@ -68,6 +68,8 @@ To login as the default user, use:
 
     email: ofn@example.com
     password: ofn123
+    
+Seee [Locale and sample data] about loading data.
 
 ### Testing
 
@@ -81,7 +83,7 @@ Then the main application tests can be run with:
 
 The tests of all custom engines can be run with:
 
-    bundle exec rake ofn:specs:engines:rspec
+    bundle exec rspec ./engines
 
 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.
 
@@ -129,3 +131,4 @@ 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

@@ -69,6 +69,10 @@ gem 'pagy', '~> 5.1'
 gem 'rswag-api'
 gem 'rswag-ui'
 
+gem 'gitlab-omniauth-openid-connect', require: 'omniauth_openid_connect'
+gem 'openid_connect', '~> 1.3'
+gem 'omniauth-rails_csrf_protection'
+
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
 gem 'haml'
@@ -116,7 +120,6 @@ gem 'coffee-rails', '~> 5.0.0'
 
 gem 'mini_racer', '0.4.0'
 
-
 gem 'angular_rails_csrf'
 
 gem 'jquery-rails', '4.4.0'
@@ -133,6 +136,8 @@ gem 'flipper-ui'
 
 gem "view_component"
 
+gem 'mini_portile2', '~> 2.8'
+
 group :production, :staging do
   gem 'ddtrace'
   gem 'rack-timeout'
@@ -147,10 +152,10 @@ group :test, :development do
   gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
-  gem 'knapsack'
+  gem 'knapsack_pro'
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
-  gem 'rspec-retry'
+  gem 'rspec-retry', require: false
   gem 'rswag-specs'
   gem 'shoulda-matchers'
   gem 'timecop'
@@ -161,9 +166,9 @@ group :test do
   gem 'pdf-reader'
   gem 'rails-controller-testing'
   gem 'simplecov', require: false
-  gem 'test-prof'
-  gem 'vcr'
-  gem 'webmock'
+  gem 'test-prof', require: false
+  gem 'vcr', require: false
+  gem 'webmock', require: false
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
 end

Gemfile.lock

@@ -93,7 +93,7 @@ GEM
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (0.9.8)
+    active_storage_validations (1.0.3)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
@@ -111,7 +111,7 @@ GEM
     activerecord (6.1.7)
       activemodel (= 6.1.7)
       activesupport (= 6.1.7)
-    activerecord-import (1.4.0)
+    activerecord-import (1.4.1)
       activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -140,6 +140,7 @@ GEM
       activerecord (>= 4.2)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    aes_key_wrap (1.1.0)
     afm (0.2.2)
     angular-rails-templates (1.2.0)
       railties (>= 5.0, < 7.1)
@@ -153,36 +154,35 @@ GEM
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
+    attr_required (1.0.1)
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.601.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.669.0)
+    aws-sdk-core (3.168.2)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.60.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.117.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    axlsx_styler (1.1.0)
-      activesupport (>= 3.1)
-      caxlsx (>= 2.0.2)
     bcrypt (3.1.18)
     bigdecimal (3.0.2)
+    bindata (2.4.12)
     bindex (0.8.1)
-    bootsnap (1.13.0)
+    bootsnap (1.15.0)
       msgpack (~> 1.2)
     bugsnag (6.24.2)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
-    bullet (7.0.3)
+    bullet (7.0.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     cable_ready (5.0.0.pre9)
@@ -194,7 +194,7 @@ GEM
       railties (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.37.1)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -203,14 +203,13 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    caxlsx (3.1.1)
+    caxlsx (3.3.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     choice (0.2.0)
     chronic (0.10.2)
-    cliver (0.3.2)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -229,9 +228,9 @@ GEM
     crass (1.0.6)
     css_parser (1.11.0)
       addressable
-    cuprite (0.13)
-      capybara (>= 2.1, < 4)
-      ferrum (~> 0.11.0)
+    cuprite (0.14.3)
+      capybara (~> 3.0)
+      ferrum (~> 0.13.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.0)
@@ -242,7 +241,7 @@ GEM
       debase-ruby_core_source (= 0.10.12)
       msgpack
     debase-ruby_core_source (0.10.12)
-    debug (1.6.2)
+    debug (1.6.3)
       irb (>= 1.3.6)
       reline (>= 0.3.1)
     debugger-linecache (1.2.0)
@@ -265,7 +264,6 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    dry-inflector (0.2.1)
     erubi (1.11.0)
     et-orbi (1.2.7)
       tzinfo
@@ -276,14 +274,16 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.6.0)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
-    ferrum (0.11)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.1)
+    ferrum (0.13)
       addressable (~> 2.5)
-      cliver (~> 0.3)
       concurrent-ruby (~> 1.1)
+      webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.21.0)
     ffi (1.15.5)
@@ -313,13 +313,17 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     foreman (0.87.2)
     formatador (0.2.5)
-    fugit (1.5.3)
+    fugit (1.7.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.8.1)
+    gitlab-omniauth-openid-connect (0.10.0)
+      addressable (~> 2.7)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 1.2)
     globalid (1.0.0)
       activesupport (>= 5.0)
     gmaps4rails (2.1.2)
@@ -331,9 +335,11 @@ GEM
       tilt
     hashdiff (1.0.1)
     hashery (2.1.2)
+    hashie (5.0.0)
     highline (2.0.3)
     hiredis (0.6.3)
     htmlentities (4.3.4)
+    httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
@@ -345,9 +351,9 @@ GEM
       activerecord (>= 3.0)
     io-console (0.5.11)
     ipaddress (0.8.3)
-    irb (1.4.1)
+    irb (1.4.2)
       reline (>= 0.3.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -355,15 +361,21 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (2.6.2)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
+    json-jwt (1.16.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    json-schema (3.0.0)
+      addressable (>= 2.8)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwt (2.5.0)
-    knapsack (4.0.0)
+    knapsack_pro (3.4.2)
       rake
     launchy (2.5.0)
       addressable (~> 2.7)
@@ -373,7 +385,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -397,19 +409,41 @@ GEM
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.5.4)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.2)
+      net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.10)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
+    omniauth (2.1.0)
+      hashie (>= 3.4.6)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-rails_csrf_protection (1.0.1)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
+    openid_connect (1.4.2)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.15.0)
+      net-smtp
+      rack-oauth2 (~> 1.21)
+      swd (~> 1.3)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (~> 1.2)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -417,7 +451,7 @@ GEM
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.22.1)
-    paranoia (2.6.0)
+    paranoia (2.6.1)
       activerecord (>= 5.1, < 7.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -426,7 +460,7 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.10.0)
+    pdf-reader (2.11.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -445,6 +479,12 @@ GEM
     rack (2.2.4)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
+    rack-oauth2 (1.21.3)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-protection (2.1.0)
       rack
     rack-proxy (0.7.0)
@@ -484,7 +524,7 @@ GEM
       ruby-graphviz (~> 1.2)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rails-i18n (7.0.5)
+    rails-i18n (7.0.6)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
@@ -505,7 +545,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.8.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.1)
     reline (0.3.1)
       io-console (~> 0.5)
     request_store (1.5.0)
@@ -520,9 +560,8 @@ GEM
     roadie-rails (3.0.0)
       railties (>= 5.1, < 7.1)
       roadie (~> 5.0)
-    rodf (1.1.1)
+    rodf (1.2.0)
       builder (>= 3.0)
-      dry-inflector (~> 0.1)
       rubyzip (>= 1.0)
     roo (2.9.0)
       nokogiri (~> 1)
@@ -550,28 +589,29 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.10.3)
-    rswag-api (2.6.0)
+    rswag-api (2.8.0)
       railties (>= 3.1, < 7.1)
-    rswag-specs (2.6.0)
+    rswag-specs (2.8.0)
       activesupport (>= 3.1, < 7.1)
-      json-schema (~> 2.2)
+      json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
-    rswag-ui (2.6.0)
+      rspec-core (>= 2.14)
+    rswag-ui (2.8.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
-    rubocop (1.36.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-rails (2.16.1)
+    rubocop-rails (2.17.3)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -583,7 +623,7 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    rufus-scheduler (3.8.1)
+    rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
     sass (3.4.25)
     sass-rails (5.0.8)
@@ -596,14 +636,14 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (5.2.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
+    sidekiq (6.5.8)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    sidekiq-scheduler (4.0.2)
+    sidekiq-scheduler (4.0.3)
       redis (>= 4.2.0)
       rufus-scheduler (~> 3.2)
-      sidekiq (>= 4)
+      sidekiq (>= 4, < 7)
       tilt (>= 1.4.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -611,9 +651,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    spreadsheet_architect (4.2.0)
-      axlsx_styler (>= 1.0.0, < 2)
-      caxlsx (>= 2.0.2, < 4)
+    spreadsheet_architect (5.0.0)
+      caxlsx (>= 3.3.0, < 4)
       rodf (>= 1.0.0, < 2)
     spring (4.1.0)
     spring-commands-rspec (1.0.4)
@@ -643,15 +682,20 @@ GEM
       railties (>= 5.2)
       redis
     stringex (2.8.5)
-    stripe (7.1.0)
+    stripe (8.0.0)
+    swd (1.3.0)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
     temple (0.8.2)
-    test-prof (1.0.10)
+    test-prof (1.0.11)
     test-unit (3.5.5)
       power_assert
     thor (1.2.1)
     thread-local (1.1.0)
     tilt (2.0.11)
-    timecop (0.9.5)
+    timecop (0.9.6)
+    timeout (0.3.0)
     ttfunk (1.7.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
@@ -660,11 +704,14 @@ GEM
     valid_email2 (4.0.4)
       activemodel (>= 3.2)
       mail (~> 2.5)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.15)
+      activemodel (>= 3.0.0)
+      public_suffix
     vcr (6.1.0)
-      activesupport (>= 5.0.0, < 8.0)
-      concurrent-ruby (~> 1.0)
-      method_source (~> 1.0)
-    view_component (2.74.0)
+    view_component (2.78.0)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -677,6 +724,9 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
+    webfinger (1.2.0)
+      activesupport
+      httpclient (>= 2.4)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -686,6 +736,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webrick (1.7.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -693,11 +744,11 @@ GEM
       chronic (>= 0.6.3)
     wicked_pdf (2.6.3)
       activesupport
-    wkhtmltopdf-binary (0.12.6.5)
+    wkhtmltopdf-binary (0.12.6.6)
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
@@ -751,6 +802,7 @@ DEPENDENCIES
   foreman
   fuubar (~> 2.5.1)
   geocoder
+  gitlab-omniauth-openid-connect
   gmaps4rails
   good_migrations
   haml
@@ -766,15 +818,18 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   jsonapi-serializer
   jwt (~> 2.3)
-  knapsack
+  knapsack_pro
   letter_opener (>= 1.4.1)
   listen
   mime-types
   mimemagic (> 0.3.5)
+  mini_portile2 (~> 2.8)
   mini_racer (= 0.4.0)
   monetize (~> 1.11)
   oauth2 (~> 1.4.7)
   ofn-qz!
+  omniauth-rails_csrf_protection
+  openid_connect (~> 1.3)
   order_management!
   pagy (~> 5.1)
   paper_trail (~> 12.1.0)

README.md

@@ -35,7 +35,13 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board](https://github.com/orgs/openfoodfoundation/projects/1) for some good first issues, both on manual and automated testing (RSpec/Capybara).
 
-We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them! 
+We use [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)
+
 
 ## Licence
 

Rakefile

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

app/assets/javascripts/admin/all.js

@@ -22,24 +22,6 @@
 //= 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

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

@@ -261,7 +261,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         product = BulkProducts.find product.id
         variant.unit_value  = parseFloat(match[1].replace(",", "."))
         variant.unit_value  = null if isNaN(variant.unit_value)
-        variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
+        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_description = match[3]
 
   $scope.incrementLimit = ->

app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

@@ -1,8 +1,7 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, EnterprisePaymentMethods, SideMenu, StatusMessage, RequestMonitor) ->
+  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, SideMenu, StatusMessage, RequestMonitor) ->
     $scope.Enterprise = enterprise
     $scope.Enterprises = Enterprises
-    $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.navClear = NavigationCheck.clear
     $scope.menu = SideMenu
     $scope.newManager = { id: null, email: (t('add_manager')) }

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

@@ -1,20 +0,0 @@
-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/line_items/controllers/line_items_controller.js.coffee

@@ -5,6 +5,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.confirmDelete = true
   $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
   $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
+  $scope.previousDates = { startDate: $scope.startDate, endDate: $scope.endDate }
+  $scope.datesChangedOnCancelEvent = false
   $scope.bulkActions = [ { name: t("admin.orders.bulk_management.actions_delete"), callback: 'deleteLineItems' } ]
   $scope.selectedUnitsProduct = {}
   $scope.selectedUnitsVariant = {}
@@ -25,6 +27,28 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.resetFilters()
     $scope.refreshData()
 
+  $scope.$watchCollection "[startDate, endDate]", (newValues, oldValues) ->
+    if newValues != oldValues && !$scope.datesChangedOnCancelEvent
+        state = $scope.refreshData()
+        if (state == "cancel")
+          $scope.datesChangedOnCancelEvent = true
+          $scope.cancelDateChange()
+  
+  $scope.cancelDateChange = ->
+    # Reset the date filters to the previous values
+    $scope.startDate = $scope.previousDates.startDate
+    $scope.endDate = $scope.previousDates.endDate
+    # throw a flatpickr:change event to change the date back in the datepicker
+    event = new CustomEvent('flatpickr:change', {
+      detail: { 
+        startDate: $scope.previousDates.startDate,
+        endDate: $scope.previousDates.endDate
+      }
+    })
+    window.dispatchEvent(event)
+    $timeout ->
+      $scope.datesChangedOnCancelEvent = false
+ 
   $scope.refreshData = ->
     unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
       $scope.setOrderCycleDateRange()
@@ -34,6 +58,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
     return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()
 
+    return "cancel" unless $scope.confirmRefresh()
+
     $scope.loadOrders()
     $scope.loadLineItems()
 
@@ -41,6 +67,11 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       $scope.loadAssociatedData()
 
     $scope.dereferenceLoadedData()
+    
+    $timeout ->
+      # update the previous dates with the current ones since loading was successful
+      $scope.previousDates.startDate = $scope.startDate
+      $scope.previousDates.endDate = $scope.endDate
 
   $scope.setOrderCycleDateRange = ->
     start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at

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

@@ -18,7 +18,8 @@ angular.module('admin.orderCycles')
       OrderCycle.exchangeDirection(exchange)
 
     $scope.enterprisesWithFees = ->
-      $scope.enterprises[id] for id in [OrderCycle.participatingEnterpriseIds()..., [OrderCycle.order_cycle.coordinator_id]...] when $scope.enterpriseFeesForEnterprise(id).length > 0
+      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.removeExchange = ($event, exchange) ->
       $event.preventDefault()

app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee

@@ -1,21 +1,4 @@
 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/order_cycle.js.coffee

@@ -93,9 +93,9 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $
       variant_ids
 
     participatingEnterpriseIds: ->
-      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()
+      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...]))
 
     exchangesByDirection: (direction) ->
       if direction == 'incoming'

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

@@ -29,6 +29,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
     $scope.q = {
       completed_at_not_null: true
     }
+    e = new CustomEvent("flatpickr_clear");
+    window.dispatchEvent(e)
 
   $scope.clearFilters = () ->
     KeyValueMapStore.clearKeyValueMap()

app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee

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

@@ -36,7 +36,7 @@ angular.module("admin.products")
           $scope.product.master.unit_description = match[3]
       else
         value = $scope.product.master.unit_value
-        value /= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
+        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 = ->

app/assets/javascripts/admin/services/bulk_products.js.coffee

@@ -65,7 +65,8 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
     variantUnitValue: (product, variant) ->
       if variant.unit_value?
         if product.variant_unit_scale
-          @divideAsInteger variant.unit_value, product.variant_unit_scale
+          variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
+          parseFloat(window.bigDecimal.round(variant_unit_value, 2))
         else
           variant.unit_value
       else

app/assets/javascripts/admin/util.js.erb

@@ -1,70 +1,4 @@
 $(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

@@ -1,14 +0,0 @@
-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/components/multiple_checked_select_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class MultipleCheckedSelectComponent < ViewComponent::Base
+  def initialize(name:, options:, selected:)
+    @name = name
+    @options = options.map { |option| [option[0], option[1].to_sym] }
+    @selected = selected.nil? ? [] : selected.map(&:to_sym)
+  end
+end

app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml

@@ -0,0 +1,13 @@
+.ofn-drop-down.ofn-drop-down-v2{ data: { controller: "multiple-checked-select" } }
+  %div.ofn-drop-down-label{ "data-multiple-checked-select-target": "button" }
+    %span{class: "label"}= t('admin.columns')
+    %span{ class: "icon-caret-down", "data-multiple-checked-select-target": "caret" }
+  %div.menu{ class: "hidden", "data-multiple-checked-select-target": "options" }
+    %div.filter
+      %input{ type: "text", "data-multiple-checked-select-target": "filter", placeholder: I18n.t('components.multiple_checked_select.filter_placeholder') }
+    %hr
+    %div.menu_items
+      - @options.each do |option|
+        %label.menu_item{ "data-multiple-checked-select-target": "option", "data-value": option[1], "data-label": option[0] }
+          %input.redesigned-input{ type: "checkbox", checked: @selected.include?(option[1]), name: "#{@name}[]", value: option[1] }
+          = option[0]

app/constraints/feature_toggle_constraint.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "open_food_network/feature_toggle"
+
+class FeatureToggleConstraint
+  def initialize(feature_name)
+    @feature = feature_name
+  end
+
+  def matches?(request)
+    OpenFoodNetwork::FeatureToggle.enabled?(@feature, current_user(request))
+  end
+
+  def current_user(request)
+    request.env['warden']&.user
+  end
+end

app/constraints/split_checkout_constraint.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class SplitCheckoutConstraint
-  def matches?(request)
-    OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, current_user(request)
-  end
-
-  def current_user(request)
-    request.env['warden'].user
-  end
-end

app/controllers/admin/enterprise_fees_controller.rb

@@ -6,6 +6,7 @@ module Admin
   class EnterpriseFeesController < Admin::ResourceController
     before_action :load_enterprise_fee_set, only: :index
     before_action :load_data
+    before_action :check_enterprise_fee_input, only: [:bulk_update]
 
     def index
       @include_calculators = params[:include_calculators].present?
@@ -35,13 +36,6 @@ module Admin
     end
 
     def bulk_update
-      @flat_percent_value = enterprise_fee_bulk_params.dig('collection_attributes', '0', 'calculator_attributes', 'preferred_flat_percent')
-
-      unless @flat_percent_value.nil? || Float(@flat_percent_value, exception: false)
-        flash[:error] = I18n.t(:calculator_preferred_value_error)
-        return redirect_to redirect_path
-      end
-
       @enterprise_fee_set = Sets::EnterpriseFeeSet.new(enterprise_fee_bulk_params)
 
       if @enterprise_fee_set.save
@@ -105,5 +99,25 @@ module Admin
         ]
       )
     end
+
+    def check_enterprise_fee_input
+      enterprise_fee_bulk_params['collection_attributes'].each do |_, fee_row|
+        enterprise_fees = fee_row['calculator_attributes']&.slice(
+          :preferred_flat_percent, :preferred_amount,
+          :preferred_first_item, :preferred_additional_item,
+          :preferred_minimal_amount, :preferred_normal_amount,
+          :preferred_discount_amount, :preferred_per_unit
+        )
+
+        next unless enterprise_fees
+
+        enterprise_fees.each do |_, enterprise_amount|
+          unless enterprise_amount.nil? || Float(enterprise_amount, exception: false)
+            flash[:error] = I18n.t(:calculator_preferred_value_error)
+            return redirect_to redirect_path
+          end
+        end
+      end
+    end
   end
 end

app/controllers/admin/oidc_settings_controller.rb

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

app/controllers/admin/reports_controller.rb

@@ -43,17 +43,19 @@ module Admin
       @report_type = report_type
       @report_subtypes = report_subtypes
       @report_subtype = report_subtype
+      @report_title = if report_subtype
+                        report_subtype_title
+                      else
+                        I18n.t(:name, scope: [:admin, :reports, @report_type])
+                      end
 
       # Initialize data
       params[:display_summary_row] = true if request.get?
-      if OpenFoodNetwork::FeatureToggle.enabled?(:report_inverse_columns_logic,
-                                                 spree_current_user)
-        @params_fields_to_show = if request.get?
-                                   @report.columns.keys
-                                 else
-                                   params[:fields_to_show]
-                                 end
-      end
+      @params_fields_to_show = if request.get?
+                                 @report.columns.keys - @report.fields_to_hide
+                               else
+                                 params[:fields_to_show]
+                               end
 
       @data = Reporting::FrontendData.new(spree_current_user)
     end

app/controllers/api/v1/base_controller.rb

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

app/controllers/base_controller.rb

@@ -22,12 +22,8 @@ class BaseController < ApplicationController
   end
 
   # Default to the only order cycle if there's only one
-  #
-  # Here we need to use @order_cycles.size not @order_cycles.count
-  #   because OrderCyclesList returns a modified ActiveRecord::Relation
-  #     and these modifications are not seen if it is reloaded with count
   def set_order_cycle
-    return if @order_cycles.size != 1
+    return if @order_cycles.count != 1
 
     current_order(true).set_order_cycle! @order_cycles.first
   end

app/controllers/concerns/order_completion.rb

@@ -50,7 +50,9 @@ module OrderCompletion
   end
 
   def order_invalid!
-    Bugsnag.notify("Notice: invalid order loaded during checkout", order: @order)
+    Bugsnag.notify("Notice: invalid order loaded during checkout") do |payload|
+      payload.add_metadata :order, @order
+    end
 
     flash[:error] = t('checkout.order_not_loaded')
     redirect_to main_app.shop_path
@@ -81,7 +83,9 @@ module OrderCompletion
   end
 
   def processing_failed(error = RuntimeError.new(order_processing_error))
-    Bugsnag.notify(error, order: @order)
+    Bugsnag.notify(error) do |payload|
+      payload.add_metadata :order, @order
+    end
     flash[:error] = order_processing_error if flash.blank?
     Checkout::PostCheckoutActions.new(@order).failure
   end

app/controllers/concerns/order_stock_check.rb

@@ -21,7 +21,9 @@ module OrderStockCheck
   def check_order_cycle_expiry
     return unless current_order_cycle&.closed?
 
-    Bugsnag.notify("Notice: order cycle closed during checkout completion", order: current_order)
+    Bugsnag.notify("Notice: order cycle closed during checkout completion") do |payload|
+      payload.add_metadata :order, current_order
+    end
     current_order.empty!
     current_order.set_order_cycle! nil
 
@@ -39,7 +41,7 @@ module OrderStockCheck
   end
 
   def reset_order_to_cart
-    return if Flipper.enabled? :split_checkout, spree_current_user
+    return if OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, spree_current_user
 
     OrderCheckoutRestart.new(@order).call
   end

app/controllers/concerns/reports_actions.rb

@@ -39,6 +39,10 @@ module ReportsActions
     params[:report_subtype] || report_subtypes_codes.first
   end
 
+  def report_subtype_title
+    report_subtypes.select { |_name, key| key.to_sym == report_subtype.to_sym }.first[0]
+  end
+
   def ransack_params
     raw_params[:q]
   end

app/controllers/omniauth_callbacks_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def openid_connect
+    spree_current_user.link_from_omniauth(request.env["omniauth.auth"])
+
+    redirect_to admin_oidc_settings_path
+  end
+
+  def failure
+    error_message = request.env["omniauth.error"].to_s
+    flash[:error] = t("devise.oidc.failure", error: error_message)
+
+    super
+  end
+end

app/controllers/spree/admin/products_controller.rb

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

app/controllers/spree/admin/shipping_methods_controller.rb

@@ -95,11 +95,20 @@ module Spree
       end
 
       def check_shipping_fee_input
-        shipping_amount = permitted_resource_params.dig('calculator_attributes', 'preferred_amount')
+        shipping_fees = permitted_resource_params['calculator_attributes']&.slice(
+          :preferred_flat_percent, :preferred_amount,
+          :preferred_first_item, :preferred_additional_item,
+          :preferred_minimal_amount, :preferred_normal_amount,
+          :preferred_discount_amount, :preferred_per_unit
+        )
 
-        unless shipping_amount.nil? || Float(shipping_amount, exception: false) 
-          flash[:error] = I18n.t(:calculator_preferred_value_error) 
-          return redirect_to location_after_save      
+        return unless shipping_fees
+
+        shipping_fees.each do |_, shipping_amount|
+          unless shipping_amount.nil? || Float(shipping_amount, exception: false)
+            flash[:error] = I18n.t(:calculator_preferred_value_error)
+            return redirect_to location_after_save
+          end
         end
       end
     end

app/controllers/spree/api_keys_controller.rb

@@ -32,7 +32,7 @@ module Spree
     def load_object
       @user ||= find_user
       if @user
-        authorize! params[:action].to_sym, @user
+        authorize! :update, @user
       else
         redirect_to main_app.login_path
       end

app/controllers/spree/user_registrations_controller.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require "spree/core/controller_helpers/auth"
-require "spree/core/controller_helpers/common"
-require "spree/core/controller_helpers/order"
-
-module Spree
-  class UserRegistrationsController < Devise::RegistrationsController
-    helper 'spree/base'
-
-    include Spree::Core::ControllerHelpers::Auth
-    include Spree::Core::ControllerHelpers::Common
-    include Spree::Core::ControllerHelpers::Order
-
-    before_action :check_permissions, only: [:edit, :update]
-    skip_before_action :require_no_authentication
-
-    # GET /resource/edit
-    def edit
-      super
-    end
-
-    # PUT /resource
-    def update
-      super
-    end
-
-    # DELETE /resource
-    def destroy
-      super
-    end
-
-    # GET /resource/cancel
-    # Forces the session data which is usually expired after sign
-    # in to be expired now. This is useful if the user wants to
-    # cancel oauth signing in/up in the middle of the process,
-    # removing all OAuth session data.
-    def cancel
-      super
-    end
-
-    protected
-
-    def check_permissions
-      authorize!(:create, resource)
-    end
-  end
-end

app/controllers/user_registrations_controller.rb

@@ -1,13 +1,23 @@
 # frozen_string_literal: true
 
 require 'open_food_network/error_logger'
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
 
-class UserRegistrationsController < Spree::UserRegistrationsController
+class UserRegistrationsController < Devise::RegistrationsController
   I18N_SCOPE = 'devise.user_registrations.spree_user'
 
-  before_action :set_checkout_redirect, only: :create
+  helper 'spree/base'
 
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
   include I18nHelper
+
+  skip_before_action :require_no_authentication
+
+  before_action :set_checkout_redirect, only: :create
   before_action :set_locale
 
   # POST /resource/sign_up

app/helpers/checkout_helper.rb

@@ -32,25 +32,9 @@ module CheckoutHelper
       }
     end
 
-    enterprise_fee_adjustments = adjustments.select { |a|
-      a.originator_type == 'EnterpriseFee' && a.adjustable_type != 'Spree::LineItem'
-    }
-    adjustments.reject! { |a|
-      a.originator_type == 'EnterpriseFee' && a.adjustable_type != 'Spree::LineItem'
-    }
-    unless exclude.include? :admin_and_handling
-      adjustments << Spree::Adjustment.new(
-        label: I18n.t(:orders_form_admin), amount: enterprise_fee_adjustments.sum(&:amount)
-      )
-    end
-
     adjustments
   end
 
-  def display_line_item_fees_total_for(order)
-    Spree::Money.new order.adjustments.enterprise_fee.sum(:amount), currency: order.currency
-  end
-
   def checkout_line_item_fees(order)
     order.line_item_adjustments.enterprise_fee
   end

app/helpers/enterprises_helper.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'open_food_network/available_payment_method_filter'
-
 module EnterprisesHelper
   def current_distributor
     @current_distributor ||= current_order(false)&.distributor
@@ -18,18 +16,7 @@ module EnterprisesHelper
   end
 
   def available_payment_methods
-    return [] if current_distributor.blank?
-
-    payment_methods = current_distributor.payment_methods.available(:both).to_a
-
-    filter = OpenFoodNetwork::AvailablePaymentMethodFilter.new
-    filter.filter!(payment_methods)
-
-    applicator = OpenFoodNetwork::TagRuleApplicator.new(current_distributor,
-                                                        "FilterPaymentMethods", current_customer&.tag_list)
-    applicator.filter!(payment_methods)
-
-    payment_methods
+    OrderAvailablePaymentMethods.new(current_order, current_customer).to_a
   end
 
   def managed_enterprises

app/helpers/spree/admin/navigation_helper.rb

@@ -34,6 +34,7 @@ module Spree
           link = link_to_with_icon(options[:icon], titleized_label, destination_url)
           css_classes << 'tab-with-icon'
         else
+          titleized_label = raw("<span class='text'>#{titleized_label}</span>")
           link = link_to(titleized_label, destination_url)
         end
 

app/jobs/subscription_confirm_job.rb

@@ -55,7 +55,9 @@ class SubscriptionConfirmJob < ActiveJob::Base
     if order.errors.any?
       send_failed_payment_email(order)
     else
-      Bugsnag.notify(e, order: order)
+      Bugsnag.notify(e) do |payload|
+        payload.add_metadata :order, order
+      end
       send_failed_payment_email(order, e.message)
     end
   end
@@ -106,6 +108,9 @@ class SubscriptionConfirmJob < ActiveJob::Base
     record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver_now
   rescue StandardError => e
-    Bugsnag.notify(e, order: order, error_message: error_message)
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata :order, order
+      payload.add_metadata :error_message, error_message
+    end
   end
 end

app/mailers/spree/shipment_mailer.rb

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

app/models/concerns/payment_method_distributors.rb

@@ -9,9 +9,9 @@ module PaymentMethodDistributors
   extend ActiveSupport::Concern
 
   included do
-    has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods',
-                                           class_name: 'Enterprise',
-                                           foreign_key: 'payment_method_id',
-                                           association_foreign_key: 'distributor_id'
+    has_many :distributor_payment_methods, dependent: :destroy
+    has_many :distributors, through: :distributor_payment_methods,
+                            class_name: 'Enterprise',
+                            foreign_key: 'distributor_id'
   end
 end

app/models/concerns/product_stock.rb

@@ -6,20 +6,12 @@ module ProductStock
   extend ActiveSupport::Concern
 
   def on_demand
-    if variants?
-      raise 'Cannot determine product on_demand value of product with multiple variants' if variants.size > 1
+    raise 'Cannot determine product on_demand value of product with multiple variants' if variants.size > 1
 
-      variants.first.on_demand
-    else
-      master.on_demand
-    end
+    variants.first.on_demand
   end
 
   def on_hand
-    if variants?
-      variants.map(&:on_hand).reduce(:+)
-    else
-      master.on_hand
-    end
+    variants.map(&:on_hand).reduce(:+)
   end
 end

app/models/distributor_payment_method.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class DistributorPaymentMethod < ApplicationRecord
+  self.table_name = "distributors_payment_methods"
+  belongs_to :payment_method, class_name: "Spree::PaymentMethod", touch: true
+  belongs_to :distributor, class_name: "Enterprise", touch: true
+end

app/models/enterprise.rb

@@ -6,9 +6,9 @@ class Enterprise < ApplicationRecord
   # The next Rails version will have named variants but we need to store them
   # ourselves for now.
   LOGO_SIZES = {
-    thumb: { resize_to_limit: [100, 100] },
-    small: { resize_to_limit: [180, 180] },
-    medium: { resize_to_limit: [300, 300] },
+    thumb: { gravity: "Center", resize: "100x100^", crop: '100x100+0+0' },
+    small: { gravity: "Center", resize: "180x180^", crop: '180x180+0+0' },
+    medium: { gravity: "Center", resize: "300x300^", crop: '300x300+0+0' },
   }.freeze
   PROMO_IMAGE_SIZES = {
     thumb: { resize_to_limit: [100, 100] },
@@ -56,10 +56,9 @@ class Enterprise < ApplicationRecord
   has_many :users, through: :enterprise_roles
   belongs_to :owner, class_name: 'Spree::User',
                      inverse_of: :owned_enterprises
-  has_and_belongs_to_many :payment_methods, join_table: 'distributors_payment_methods',
-                                            class_name: 'Spree::PaymentMethod',
-                                            foreign_key: 'distributor_id'
+  has_many :distributor_payment_methods, foreign_key: :distributor_id
   has_many :distributor_shipping_methods, foreign_key: :distributor_id
+  has_many :payment_methods, through: :distributor_payment_methods
   has_many :shipping_methods, through: :distributor_shipping_methods
   has_many :customers
   has_many :inventory_items
@@ -197,15 +196,14 @@ class Enterprise < ApplicationRecord
       joins(:enterprise_roles).where('enterprise_roles.user_id = ?', user.id)
     end
   }
-  scope :relatives_of_one_union_others, lambda { |one, others|
+
+  scope :parents_of_one_union_others, lambda { |one, others|
     where("
       enterprises.id IN
-        (SELECT child_id FROM enterprise_relationships WHERE enterprise_relationships.parent_id=?)
-      OR enterprises.id IN
         (SELECT parent_id FROM enterprise_relationships WHERE enterprise_relationships.child_id=?)
       OR enterprises.id IN
         (?)
-    ", one, one, others)
+      ", one, others)
   }
 
   def business_address_empty?(attributes)
@@ -260,9 +258,9 @@ class Enterprise < ApplicationRecord
     ", id, id)
   end
 
-  def plus_relatives_and_oc_producers(order_cycles)
+  def plus_parents_and_order_cycle_producers(order_cycles)
     oc_producer_ids = Exchange.in_order_cycle(order_cycles).incoming.pluck :sender_id
-    Enterprise.not_hidden.is_primary_producer.relatives_of_one_union_others(id, oc_producer_ids | [id])
+    Enterprise.not_hidden.is_primary_producer.parents_of_one_union_others(id, oc_producer_ids | [id])
   end
 
   def relatives_including_self
@@ -388,7 +386,7 @@ class Enterprise < ApplicationRecord
   end
 
   def ready_for_checkout?
-    shipping_methods.frontend.any? && payment_methods.available.any?
+    shipping_methods.frontend.any? && payment_methods.available.any?(&:configured?)
   end
 
   def self.find_available_permalink(test_permalink)

app/models/order_cycle.rb

@@ -24,6 +24,9 @@ class OrderCycle < ApplicationRecord
   has_many :distributors, -> { distinct }, source: :receiver, through: :cached_outgoing_exchanges
   has_many :order_cycle_schedules
   has_many :schedules, through: :order_cycle_schedules
+  has_and_belongs_to_many :selected_distributor_payment_methods,
+                          class_name: 'DistributorPaymentMethod',
+                          join_table: 'order_cycles_distributor_payment_methods'
   has_and_belongs_to_many :selected_distributor_shipping_methods,
                           class_name: 'DistributorShippingMethod',
                           join_table: 'order_cycles_distributor_shipping_methods'
@@ -152,12 +155,10 @@ class OrderCycle < ApplicationRecord
     ]
   end
 
-  def attachable_payment_methods
-    Spree::PaymentMethod.available(:both).
-      joins("INNER JOIN distributors_payment_methods
-             ON payment_method_id = spree_payment_methods.id").
-      where("distributor_id IN (?)", distributor_ids).
-      distinct
+  def attachable_distributor_payment_methods
+    DistributorPaymentMethod.joins(:payment_method).
+      merge(Spree::PaymentMethod.available).
+      where("distributor_id IN (?)", distributor_ids)
   end
 
   def attachable_distributor_shipping_methods
@@ -167,21 +168,7 @@ class OrderCycle < ApplicationRecord
   end
 
   def clone!
-    oc = dup
-    oc.name = I18n.t("models.order_cycle.cloned_order_cycle_name", order_cycle: oc.name)
-    oc.orders_open_at = oc.orders_close_at = oc.mails_sent = oc.processed_at = nil
-    oc.coordinator_fee_ids = coordinator_fee_ids
-    # rubocop:disable Layout/LineLength
-    oc.preferred_product_selection_from_coordinator_inventory_only = preferred_product_selection_from_coordinator_inventory_only
-    # rubocop:enable Layout/LineLength
-    oc.schedule_ids = schedule_ids
-    oc.save!
-    exchanges.each { |e| e.clone!(oc) }
-    oc.selected_distributor_shipping_method_ids = (
-      attachable_distributor_shipping_methods.map(&:id) & selected_distributor_shipping_method_ids
-    )
-    sync_subscriptions
-    oc.reload
+    OrderCycleClone.new(self).create
   end
 
   def variants
@@ -293,6 +280,18 @@ class OrderCycle < ApplicationRecord
     items.each { |li| scoper.scope(li.variant) }
   end
 
+  def distributor_payment_methods
+    if simple? || selected_distributor_payment_methods.none?
+      attachable_distributor_payment_methods
+    else
+      attachable_distributor_payment_methods.where(
+        "distributors_payment_methods.id IN (?) OR distributor_id NOT IN (?)",
+        selected_distributor_payment_methods.map(&:id),
+        selected_distributor_payment_methods.map(&:distributor_id)
+      )
+    end
+  end
+
   def distributor_shipping_methods
     if simple? || selected_distributor_shipping_methods.none?
       attachable_distributor_shipping_methods

app/models/product_import/entry_validator.rb

@@ -299,7 +299,7 @@ module ProductImport
         entry.public_send("#{type}_category_id=", index[category])
       else
         mark_as_invalid(entry, attribute: "#{type}_category",
-                               error: I18n.t('admin.product_import.model.not_found'))
+                               error: I18n.t('admin.product_import.model.category_not_found'))
       end
     end
 

app/models/product_import/spreadsheet_entry.rb

@@ -68,7 +68,7 @@ module ProductImport
 
     def invalid_attributes
       invalid_attrs = {}
-      errors = @product_validations ? self.errors.messages.merge(@product_validations.messages) : self.errors.messages
+      errors = @product_validations ? @product_validations.messages.merge(self.errors.messages) : self.errors.messages
       errors.each do |attr, message|
         invalid_attrs[attr.to_s] = "#{attr.to_s.capitalize} #{message.first}"
       end

app/models/product_import/unit_converter.rb

@@ -54,7 +54,7 @@ module ProductImport
     end
 
     def assign_weight_or_volume_attributes
-      units = @attrs['units'].to_f
+      units = @attrs['units'].to_d
       unit_type = @attrs['unit_type'].to_s.downcase
 
       return unless valid_unit_type? unit_type

app/models/spree/ability.rb

@@ -177,6 +177,8 @@ module Spree
       end
 
       can [:admin, :create], :manager_invitation
+
+      can [:admin, :index], :oidc_setting
     end
 
     def add_product_management_abilities(user)

app/models/spree/address.rb

@@ -29,12 +29,7 @@ module Spree
     delegate :name, to: :state, prefix: true, allow_nil: true
 
     def self.default
-      country = begin
-        DefaultCountry.country
-      rescue StandardError
-        Spree::Country.first
-      end
-      new(country: country)
+      new(country: DefaultCountry.country)
     end
 
     def full_name

app/models/spree/country.rb

@@ -6,6 +6,12 @@ module Spree
 
     validates :name, :iso_name, presence: true
 
+    def self.cached_find_by(attrs)
+      Rails.cache.fetch("countries/#{attrs.hash}", expires_in: 1.hour) do
+        find_by(attrs)
+      end
+    end
+
     def <=>(other)
       name <=> other.name
     end

app/models/spree/line_item.rb

@@ -28,6 +28,7 @@ module Spree
     before_validation :adjust_quantity
     before_validation :copy_price
     before_validation :copy_tax_category
+    before_validation :copy_dimensions
 
     validates :variant, presence: true
     validates :quantity, numericality: {
@@ -122,6 +123,15 @@ module Spree
       self.tax_category = variant.product.tax_category
     end
 
+    def copy_dimensions
+      return unless variant
+
+      self.weight ||= computed_weight_from_variant
+      self.height ||= variant.height
+      self.width ||= variant.width
+      self.depth ||= variant.depth
+    end
+
     def amount
       price * quantity
     end
@@ -226,6 +236,14 @@ module Spree
 
     private
 
+    def computed_weight_from_variant
+      if variant.product.variant_unit == "weight"
+        variant.unit_value / variant.product.variant_unit_scale
+      else
+        variant.weight
+      end
+    end
+
     def update_inventory
       return unless changed?
 

app/models/spree/order.rb

@@ -25,7 +25,7 @@ module Spree
         order.payment_required?
       }
       go_to_state :confirmation, if: ->(order) {
-        Flipper.enabled? :split_checkout, order.created_by
+        OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, order.created_by
       }
       go_to_state :complete
     end
@@ -311,7 +311,7 @@ module Spree
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
-      return if state.in?(["cart", "address", "delivery"]) && Flipper.enabled?(:split_checkout)
+      return if state.in?(["cart", "address", "delivery"]) && OpenFoodNetwork::FeatureToggle.enabled?(:split_checkout)
 
       clear_legacy_taxes!
 
@@ -376,10 +376,6 @@ module Spree
       payment_state == 'paid' || payment_state == 'credit_owed'
     end
 
-    def available_payment_methods
-      @available_payment_methods ||= PaymentMethod.available(:both)
-    end
-
     # "Checkout" is the initial state and, for card payments, "pending" is the state after auth
     # These are both valid states to process the payment
     def pending_payments
@@ -540,9 +536,9 @@ module Spree
       # And the shipping fee is already up-to-date when this error occurs.
       # https://github.com/openfoodfoundation/openfoodnetwork/issues/3924
       Bugsnag.notify(e) do |report|
-        report.add_tab(:order, attributes)
-        report.add_tab(:shipment, shipment.attributes)
-        report.add_tab(:shipment_in_db, Spree::Shipment.find_by(id: shipment.id).attributes)
+        report.add_metadata(:order, attributes)
+        report.add_metadata(:shipment, shipment.attributes)
+        report.add_metadata(:shipment_in_db, Spree::Shipment.find_by(id: shipment.id).attributes)
       end
     end
 

app/models/spree/payment_method.rb

@@ -20,6 +20,8 @@ module Spree
 
     after_initialize :init
 
+    scope :inactive_or_backend, -> { where("active = false OR display_on = 'back_end'") }
+
     scope :production, -> { where(environment: 'production') }
 
     scope :managed_by, lambda { |user|
@@ -57,6 +59,10 @@ module Spree
       Rails.application.config.spree.payment_methods
     end
 
+    def configured?
+      !stripe? || stripe_configured?
+    end
+
     def provider_class
       raise 'You must implement provider_class method for this gateway.'
     end
@@ -71,6 +77,10 @@ module Spree
       nil
     end
 
+    def frontend?
+      active? && display_on != "back_end"
+    end
+
     # The class that will process payments for this payment type, used for @payment.source
     # e.g. CreditCard in the case of a the Gateway payment type
     # nil means the payment method doesn't require a source e.g. check
@@ -120,5 +130,17 @@ module Spree
     def distributor_validation
       validates_with DistributorsValidator
     end
+
+    def stripe?
+      type.ends_with?("StripeSCA")
+    end
+
+    def stripe_configured?
+      Spree::Config.stripe_connect_enabled &&
+        Stripe.publishable_key &&
+        preferred_enterprise_id.present? &&
+        preferred_enterprise_id > 0 &&
+        stripe_account_id.present?
+    end
   end
 end

app/models/spree/product.rb

@@ -251,11 +251,6 @@ module Spree
       permalink.present? ? permalink : (permalink_was || UrlGenerator.to_url(name))
     end
 
-    # the master variant is not a member of the variants array
-    def variants?
-      variants.any?
-    end
-
     def tax_category
       if self[:tax_category_id].nil?
         TaxCategory.find_by(is_default: true)

app/models/spree/shipment.rb

@@ -343,7 +343,8 @@ module Spree
     end
 
     def send_shipped_email
-      ShipmentMailer.shipped_email(id).deliver_later
+      delivery = !!shipping_method.require_ship_address
+      ShipmentMailer.shipped_email(id, delivery: delivery).deliver_later
     end
 
     def update_adjustments

app/models/spree/user.rb

@@ -7,8 +7,10 @@ module Spree
     searchable_attributes :email
 
     devise :database_authenticatable, :token_authenticatable, :registerable, :recoverable,
-           :rememberable, :trackable, :validatable,
-           :encryptable, :confirmable, encryptor: 'authlogic_sha512', reconfirmable: true
+           :rememberable, :trackable, :validatable, :omniauthable,
+           :encryptable, :confirmable,
+           encryptor: 'authlogic_sha512', reconfirmable: true,
+           omniauth_providers: [:openid_connect]
 
     has_many :orders
     belongs_to :ship_address, class_name: 'Spree::Address'
@@ -44,6 +46,8 @@ module Spree
     after_create :associate_customers, :associate_orders
 
     validate :limit_owned_enterprises
+    validates :uid, uniqueness: true, if: lambda { uid.present? }
+    validates_email :uid, if: lambda { uid.present? }
 
     class DestroyWithOrdersError < StandardError; end
 
@@ -51,6 +55,10 @@ module Spree
       User.admin.count > 0
     end
 
+    def link_from_omniauth(auth)
+      update!(provider: auth.provider, uid: auth.uid)
+    end
+
     # Whether a user has a role or not.
     def has_spree_role?(role_in_question)
       spree_roles.where(name: role_in_question.to_s).any?

app/serializers/api/enterprise_shopfront_serializer.rb

@@ -54,7 +54,7 @@ module Api
 
     def producers
       ActiveModel::ArraySerializer.new(
-        enterprise.plus_relatives_and_oc_producers(
+        enterprise.plus_parents_and_order_cycle_producers(
           OrderCycle.not_closed.with_distributor(enterprise)
         ),
         each_serializer: Api::EnterpriseThinSerializer
@@ -63,7 +63,7 @@ module Api
 
     def hubs
       ActiveModel::ArraySerializer.new(
-        enterprise.distributors, each_serializer: Api::EnterpriseThinSerializer
+        enterprise.distributors.not_hidden, each_serializer: Api::EnterpriseThinSerializer
       )
     end
 

app/services/default_country.rb

@@ -10,6 +10,6 @@ class DefaultCountry
   end
 
   def self.country
-    Spree::Country.find_by(iso: ENV["DEFAULT_COUNTRY_CODE"]) || Spree::Country.first
+    Spree::Country.cached_find_by(iso: ENV["DEFAULT_COUNTRY_CODE"]) || Spree::Country.first
   end
 end

app/services/default_stock_location.rb

@@ -5,17 +5,6 @@
 class DefaultStockLocation
   NAME = 'default'
 
-  def self.create!
-    country = Spree::Country.find_by(iso: ENV['DEFAULT_COUNTRY_CODE'])
-    state = country.states.first
-    Spree::StockLocation.create!(name: NAME, country_id: country.id, state_id: state.id,
-                                 backorderable_default: false)
-  end
-
-  def self.destroy_all
-    Spree::StockLocation.where(name: NAME).destroy_all
-  end
-
   def self.find_or_create
     Spree::StockLocation.find_or_create_by(name: NAME)
   end

app/services/order_available_payment_methods.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class OrderAvailablePaymentMethods
+  attr_reader :order, :customer
+
+  delegate :distributor,
+           :order_cycle,
+           to: :order
+
+  def initialize(order, customer = nil)
+    @order, @customer = order, customer
+  end
+
+  def to_a
+    return [] if distributor.blank?
+
+    payment_methods = payment_methods_before_tag_rules_applied
+
+    applicator = OpenFoodNetwork::TagRuleApplicator.new(distributor,
+                                                        "FilterPaymentMethods", customer&.tag_list)
+    applicator.filter!(payment_methods)
+
+    payment_methods.uniq
+  end
+
+  private
+
+  def payment_methods_before_tag_rules_applied
+    if order_cycle.nil? || order_cycle.simple?
+      distributor.payment_methods
+    else
+      distributor.payment_methods.where(
+        id: order_cycle.distributor_payment_methods.select(:payment_method_id)
+      )
+    end.available.select(&:configured?)
+  end
+end

app/services/order_cycle_clone.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'order_management/subscriptions/proxy_order_syncer'
+
+class OrderCycleClone
+  def initialize(order_cycle)
+    @original_order_cycle = order_cycle
+  end
+
+  def create
+    oc = @original_order_cycle.dup
+    oc.name = I18n.t("models.order_cycle.cloned_order_cycle_name", order_cycle: oc.name)
+    oc.orders_open_at = oc.orders_close_at = oc.mails_sent = oc.processed_at = nil
+    oc.coordinator_fee_ids = @original_order_cycle.coordinator_fee_ids
+    oc.preferred_product_selection_from_coordinator_inventory_only =
+      @original_order_cycle.preferred_product_selection_from_coordinator_inventory_only
+    oc.schedule_ids = @original_order_cycle.schedule_ids
+    oc.save!
+    @original_order_cycle.exchanges.each { |e| e.clone!(oc) }
+    oc.selected_distributor_payment_method_ids = selected_distributor_payment_method_ids
+    oc.selected_distributor_shipping_method_ids = selected_distributor_shipping_method_ids
+    sync_subscriptions
+    oc.reload
+  end
+
+  private
+
+  def selected_distributor_payment_method_ids
+    @original_order_cycle.attachable_distributor_payment_methods.map(&:id) &
+      @original_order_cycle.selected_distributor_payment_method_ids
+  end
+
+  def selected_distributor_shipping_method_ids
+    @original_order_cycle.attachable_distributor_shipping_methods.map(&:id) &
+      @original_order_cycle.selected_distributor_shipping_method_ids
+  end
+
+  def sync_subscriptions
+    return unless @original_order_cycle.schedule_ids.any?
+
+    OrderManagement::Subscriptions::ProxyOrderSyncer.new(
+      Subscription.where(schedule_id: @original_order_cycle.schedule_ids)
+    ).sync!
+  end
+end

app/services/order_cycle_form.rb

@@ -12,6 +12,9 @@ class OrderCycleForm
     @user = user
     @permissions = OpenFoodNetwork::Permissions.new(user)
     @schedule_ids = order_cycle_params.delete(:schedule_ids)
+    @selected_distributor_payment_method_ids = order_cycle_params.delete(
+      :selected_distributor_payment_method_ids
+    )
     @selected_distributor_shipping_method_ids = order_cycle_params.delete(
       :selected_distributor_shipping_method_ids
     )
@@ -27,6 +30,7 @@ class OrderCycleForm
       order_cycle.schedule_ids = schedule_ids if parameter_specified?(:schedule_ids)
       order_cycle.save!
       apply_exchange_changes
+      attach_selected_distributor_payment_methods
       attach_selected_distributor_shipping_methods
       sync_subscriptions
       true
@@ -49,16 +53,29 @@ class OrderCycleForm
     return if exchanges_unchanged?
 
     OpenFoodNetwork::OrderCycleFormApplicator.new(order_cycle, user).go!
+
+    # reload so outgoing exchanges are up-to-date for shipping/payment method validations
+    order_cycle.reload
+  end
+
+  def attach_selected_distributor_payment_methods
+    return if @selected_distributor_payment_method_ids.nil?
+
+    order_cycle.selected_distributor_payment_method_ids = selected_distributor_payment_method_ids
+    order_cycle.save!
   end
 
   def attach_selected_distributor_shipping_methods
     return if @selected_distributor_shipping_method_ids.nil?
 
-    order_cycle.reload # so outgoing exchanges are up-to-date for shipping method validations
     order_cycle.selected_distributor_shipping_method_ids = selected_distributor_shipping_method_ids
     order_cycle.save!
   end
 
+  def attachable_distributor_payment_method_ids
+    @attachable_distributor_payment_method_ids ||= order_cycle.attachable_distributor_payment_methods.map(&:id)
+  end
+
   def attachable_distributor_shipping_method_ids
     @attachable_distributor_shipping_method_ids ||= order_cycle.attachable_distributor_shipping_methods.map(&:id)
   end
@@ -69,6 +86,19 @@ class OrderCycleForm
     end
   end
 
+  def selected_distributor_payment_method_ids
+    @selected_distributor_payment_method_ids = (
+      attachable_distributor_payment_method_ids &
+      @selected_distributor_payment_method_ids.reject(&:blank?).map(&:to_i)
+    )
+
+    if attachable_distributor_payment_method_ids.sort == @selected_distributor_payment_method_ids.sort
+      @selected_distributor_payment_method_ids = []
+    end
+
+    @selected_distributor_payment_method_ids
+  end
+
   def selected_distributor_shipping_method_ids
     @selected_distributor_shipping_method_ids = (
       attachable_distributor_shipping_method_ids &

app/services/permitted_attributes/order_cycle.rb

@@ -17,7 +17,8 @@ module PermittedAttributes
         :name, :orders_open_at, :orders_close_at, :coordinator_id,
         :preferred_product_selection_from_coordinator_inventory_only,
         :automatic_notifications,
-        { schedule_ids: [], selected_distributor_shipping_method_ids: [], coordinator_fee_ids: [] }
+        { schedule_ids: [], selected_distributor_payment_method_ids: [],
+          selected_distributor_shipping_method_ids: [], coordinator_fee_ids: [] }
       ]
     end
 

app/services/place_proxy_order.rb

@@ -24,7 +24,9 @@ class PlaceProxyOrder
     send_placement_email
   rescue StandardError => e
     summarizer.record_and_log_error(:processing, order, e.message)
-    Bugsnag.notify(e, order: order)
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata :order, order
+    end
   end
 
   private
@@ -54,7 +56,10 @@ class PlaceProxyOrder
 
     true
   rescue StandardError => e
-    Bugsnag.notify(e, subscription: subscription, proxy_order: proxy_order)
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata :subscription, subscription
+      payload.add_metadata :proxy_order, proxy_order
+    end
     false
   end
 

app/services/sets/product_set.rb

@@ -47,10 +47,9 @@ module Sets
     end
 
     def update_product(product, attributes)
-      original_supplier = product.supplier_id
       return false unless update_product_only_attributes(product, attributes)
 
-      ExchangeVariantDeleter.new.delete(product) if original_supplier != product.supplier_id
+      ExchangeVariantDeleter.new.delete(product) if product.saved_change_to_supplier_id?
 
       update_product_variants(product, attributes) &&
         update_product_master(product, attributes)
@@ -110,6 +109,8 @@ module Sets
     end
 
     def create_variant(product, variant_attributes)
+      return if variant_attributes.blank?
+
       on_hand = variant_attributes.delete(:on_hand)
       on_demand = variant_attributes.delete(:on_demand)
 
@@ -131,11 +132,11 @@ module Sets
 
     def notify_bugsnag(error, product, variant, variant_attributes)
       Bugsnag.notify(error) do |report|
-        report.add_tab(:product, product.attributes)
-        report.add_tab(:product_error, product.errors.first) unless product.valid?
-        report.add_tab(:variant_attributes, variant_attributes)
-        report.add_tab(:variant, variant.attributes)
-        report.add_tab(:variant_error, variant.errors.first) unless variant.valid?
+        report.add_metadata(:product, product.attributes)
+        report.add_metadata(:product_error, product.errors.first) unless product.valid?
+        report.add_metadata(:variant_attributes, variant_attributes)
+        report.add_metadata(:variant, variant.attributes)
+        report.add_metadata(:variant_error, variant.errors.first) unless variant.valid?
       end
     end
 

app/services/shop/order_cycles_list.rb

@@ -8,9 +8,11 @@ module Shop
     end
 
     def self.ready_for_checkout_for(distributor, customer)
-      return OrderCycle.none unless distributor.ready_for_checkout?
-
-      new(distributor, customer).call
+      new(distributor, customer).call.select do |order_cycle|
+        order = Spree::Order.new(distributor: distributor, order_cycle: order_cycle)
+        OrderAvailablePaymentMethods.new(order, customer).to_a.any? &&
+          OrderAvailableShippingMethods.new(order, customer).to_a.any?
+      end
     end
 
     def initialize(distributor, customer)

app/views/admin/enterprises/_form.html.haml

@@ -5,12 +5,6 @@
       %legend= t(".#{ item[:name] }.legend")
       = render "admin/enterprises/form/#{ item[:form_name] || item[:name] }", f: f
 
-  - when 'address'
-    = f.fields_for :address do |af|
-      %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
-        %legend= t(".#{ item[:name] }.legend")
-        = render 'admin/enterprises/form/address', af: af
-
   - when 'enterprise_permissions'
     %fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
       %legend= t(".#{ item[:name] }.legend")

app/views/admin/enterprises/_new_form.html.haml

@@ -87,22 +87,21 @@
       = af.text_field :city, { placeholder: t(:city_placeholder)}
     .five.columns.omega
       = af.text_field :zipcode, { placeholder: t(:postcode_placeholder)}
-  %div{"data-controller": "dependant-select", "data-dependant-select-options-value": countries_with_states }
+  %div{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
     .row
       .three.columns.alpha
         = af.label :state_id, t(:state)
         \/
         = af.label :country_id, t(:country)
       .four.columns
-        = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange", class: "primary" }
+        = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
       .five.columns.omega
-        = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependant-select-target": "select", class: "primary" }
+        = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
   .row
     .three.columns.alpha
       = af.label :latitude, t(:latitude)
       \/
       = af.label :longitude, t(:longitude)
-      %span.required *
       %div{'ofn-with-tip' => t('latitude_longitude_tip')}
         %a= t('admin.whats_this')
     .four.columns

app/views/admin/enterprises/form/_address.html.haml

@@ -1,54 +1,54 @@
 -# redo denoting required fields in the whole project
-.row
-  = t(:required_fields)
-  (
-  %span.required *
-  )
-.row
-  .three.columns.alpha
-    = af.label :address1, t(:address)
+= f.fields_for :address do |af|
+  .row
+    = t(:required_fields)
+    (
     %span.required *
-  .eight.columns.omega
-    = af.text_field :address1, { placeholder: t(:address_placeholder) }
-.row
-  .alpha.three.columns
-    = af.label :address2, t(:address2)
-  .eight.columns.omega
-    = af.text_field :address2
-.row
-  .three.columns.alpha
-    = af.label :city, t(:city)
-    \/
-    = af.label :zipcode, t(:postcode)
-    %span.required *
-  .four.columns
-    = af.text_field :city, { placeholder: t(:city_placeholder) }
-  .four.columns.omega
-    = af.text_field :zipcode, { placeholder: t(:postcode_placeholder) }
-.row{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
-  .three.columns.alpha
-    = af.label :state_id, t(:state)
-    \/
-    = af.label :country_id, t(:country)
-    %span.required *
-  .four.columns
-    = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
-  .four.columns.omega{ data: { controller: "primary-details" }}
-    = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
-.row
-  .three.columns.alpha
-    = af.label :latitude, t(:latitude)
-    \/
-    = af.label :longitude, t(:longitude)
-    %span.required *
-    = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('latitude_longitude_tip')}
-  .four.columns
-    = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
-  .four.columns.omega
-    = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
-.row
-  .three.columns.alpha
-    = " ".html_safe
-  .five.columns.omega
-    = check_box_tag "use_geocoder"
-    = label_tag "use_geocoder", t('use_geocoder')
+    )
+  .row
+    .three.columns.alpha
+      = af.label :address1, t(:address)
+      %span.required *
+    .eight.columns.omega
+      = af.text_field :address1, { placeholder: t(:address_placeholder) }
+  .row
+    .alpha.three.columns
+      = af.label :address2, t(:address2)
+    .eight.columns.omega
+      = af.text_field :address2
+  .row
+    .three.columns.alpha
+      = af.label :city, t(:city)
+      \/
+      = af.label :zipcode, t(:postcode)
+      %span.required *
+    .four.columns
+      = af.text_field :city, { placeholder: t(:city_placeholder) }
+    .four.columns.omega
+      = af.text_field :zipcode, { placeholder: t(:postcode_placeholder) }
+  .row{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
+    .three.columns.alpha
+      = af.label :state_id, t(:state)
+      \/
+      = af.label :country_id, t(:country)
+      %span.required *
+    .four.columns
+      = af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
+    .four.columns.omega{ data: { controller: "primary-details" }}
+      = af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
+  .row
+    .three.columns.alpha
+      = af.label :latitude, t(:latitude)
+      \/
+      = af.label :longitude, t(:longitude)
+      = render partial: 'admin/shared/tooltip', locals: {tooltip_text: t('latitude_longitude_tip')}
+    .four.columns
+      = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
+    .four.columns.omega
+      = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
+  .row
+    .three.columns.alpha
+      = " ".html_safe
+    .five.columns.omega
+      = check_box_tag "use_geocoder"
+      = label_tag "use_geocoder", t('use_geocoder')

app/views/admin/enterprises/form/_business_address.html.haml

@@ -9,6 +9,7 @@
   .three.columns.alpha
     = bf.label :address1, t('.address1')
     %i.text-big.icon-question-sign{ "data-controller": "help-modal-link", "data-action": "click->help-modal-link#open", "data-help-modal-link-target-value": "business_address_info_modal" }
+  .eight.columns.omega
     = bf.text_field :address1, { placeholder: t(".address1_placeholder") }
 .row
   .alpha.three.columns
@@ -24,16 +25,16 @@
     = bf.text_field :city, { placeholder: t(:city_placeholder) }
   .four.columns.omega
     = bf.text_field :zipcode, { placeholder: t(:postcode_placeholder) }
-.row
+.row{"data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
   .three.columns.alpha
     = bf.label :country_id, t(:country)
     \/
     = bf.label :state_id, t(:state)
-  %div{"data-controller": "dependant-select", "data-dependant-select-options-value": countries_with_states }
-    .four.columns
-      = bf.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange", class: "primary" }
-    .four.columns.omega
-      = bf.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependant-select-target": "select", class: "primary" }
+  .four.columns
+    = bf.select :country_id, options_for_select(available_countries.map { |c| [c.name, c.id] }, @enterprise.business_address.country_id), {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
+  .four.columns.omega
+    - states = @enterprise.business_address.country.present? ? @enterprise.business_address.country&.states&.map { |s| [s.name, s.id] } : []
+    = bf.select :state_id, states, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
 
 .row
   .three.columns.alpha

app/views/admin/enterprises/form/_images.html.haml

@@ -4,7 +4,8 @@
     %br
     100 x 100 pixels
   .omega.eight.columns
-    %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.logo.medium }}', if: 'Enterprise.logo' } }
+    %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.logo.thumb }}', if: 'Enterprise.logo' } }
+    %br
     = f.file_field :logo
     %a.button.red{ href: '', ng: {click: 'removeLogo()', if: 'Enterprise.logo'} }
       = t('.remove_logo')

app/views/admin/enterprises/form/_payment_methods.html.haml

@@ -10,9 +10,9 @@
         %th
     %tbody
       - @payment_methods.each do |payment_method|
-        %tr{ ng: { controller: 'paymentMethodsCtrl', init: "findPaymentMethodByID(#{payment_method.id})" } }
+        %tr
           %td= payment_method.name
-          %td= f.check_box :payment_method_ids, { multiple: true, 'ng-model' => 'PaymentMethod.selected' }, payment_method.id, nil
+          %td= f.check_box :payment_method_ids, { multiple: true }, payment_method.id, nil
           %td= link_to t(:edit), edit_admin_payment_method_path(payment_method)
   %br
   .row

app/views/admin/enterprises/form/_primary_details.html.haml

@@ -32,6 +32,8 @@
     .four.columns.omega
       = f.radio_button :sells, "any", 'ng-model' => 'Enterprise.sells', data: {action: "change->primary-details#enterpriseSellsChanged"}
       = f.label :sells, t('.any'), value: "any"
+      %span{ style: "width: 30px; height: 30px;", class: "hidden", data: { "primary-details-target": "spinner" } }
+        = render partial: "components/admin_spinner"
 .row
   .three.columns.alpha
     %label= t('.visible_in_search')

app/views/admin/oidc_settings/index.html.haml

@@ -0,0 +1,25 @@
+- content_for :page_title do
+  = t(".title")
+
+= render 'admin/shared/enterprises_sub_menu'
+
+%div
+  %h2= t(".connect")
+  %br
+
+  - if spree_current_user.provider == 'openid_connect' && spree_current_user.uid.present?
+    = t(".already_connected")
+    = spree_current_user.uid
+    %br
+    %br
+
+    = t(".view_account")
+    = link_to t(".les_communs_link"), "#{ Devise.omniauth_configs[:openid_connect].options[:issuer] }/account"
+
+  - else
+    = t(".link_your_account")
+    %br
+    %br
+    = button_to t(".link_account_button"),
+      Spree::Core::Engine.routes.url_helpers.spree_user_openid_connect_omniauth_authorize_path(auth_type: "login"),
+      method: :post

app/views/admin/order_cycles/_name_and_timing_form.html.haml

@@ -11,7 +11,7 @@
     = f.label :orders_open_at, t('.orders_open')
   .omega.six.columns.fullwidth_inputs
     - if viewing_as_coordinator_of?(@order_cycle)
-      = f.text_field :orders_open_at, 'datetimepicker' => 'order_cycle.orders_open_at', 'ng-model' => 'order_cycle.orders_open_at', 'ng-if' => 'loaded()', 'change-warning' => 'order_cycle', class: "datetimepicker"
+      = f.text_field :orders_open_at,  data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'ng-model' => 'order_cycle.orders_open_at', 'ng-if' => 'loaded()', 'change-warning' => 'order_cycle', class: "datetimepicker"
     - else
       {{ order_cycle.orders_open_at }}
 
@@ -24,7 +24,7 @@
     = f.label :orders_close, t('.orders_close')
   .six.columns.omega.fullwidth_inputs
     - if viewing_as_coordinator_of?(@order_cycle)
-      = f.text_field :orders_close_at, 'datetimepicker' => 'order_cycle.orders_close_at', 'ng-model' => 'order_cycle.orders_close_at', 'ng-if' => 'loaded()', 'change-warning' => 'order_cycle', class: "datetimepicker"
+      = f.text_field :orders_close_at, data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'ng-model' => 'order_cycle.orders_close_at', 'ng-if' => 'loaded()', 'change-warning' => 'order_cycle', class: "datetimepicker"
     - else
       {{ order_cycle.orders_close_at }}
 

app/views/admin/order_cycles/_row.html.haml

@@ -7,10 +7,10 @@
         {{ schedule.name + ($last ? '' : ',') }}
     %span{ ng: { show: 'orderCycle.schedules.length == 0'}} None
   %td.orders_open_at{ ng: { show: 'columns.open.visible' } }
-    %input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_open_at', name: 'oc{{::orderCycle.id}}[orders_open_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_open_at' }, datetimepicker: 'orderCycle.orders_open_at', 'change-warning' => 'orderCycle' }
+    %input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_open_at', name: 'oc{{::orderCycle.id}}[orders_open_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_open_at' }, data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'change-warning' => 'orderCycle' }
     %input{ id: 'oc{{::orderCycle.id}}_orders_open_at', name: 'oc{{::orderCycle.id}}[orders_open_at]', type: 'text', ng: { if: '!orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_open_at'}, disabled: true }
   %td.orders_close_at{ ng: { show: 'columns.close.visible' } }
-    %input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_close_at', name: 'oc{{::orderCycle.id}}[orders_close_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_close_at' }, datetimepicker: 'orderCycle.orders_close_at', 'change-warning' => 'orderCycle'  }
+    %input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_close_at', name: 'oc{{::orderCycle.id}}[orders_close_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_close_at' }, data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'change-warning' => 'orderCycle'  }
     %input{ id: 'oc{{::orderCycle.id}}_orders_close_at', name: 'oc{{::orderCycle.id}}[orders_close_at]', type: 'text', ng: { if: '!orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_close_at'}, disabled: true }
 
   - unless simple_index

app/views/admin/order_cycles/checkout_options.html.haml

@@ -10,8 +10,6 @@
   %fieldset.no-border-bottom
     %legend{ align: 'center'}= t('.checkout_options')
 
-  = hidden_field_tag "order_cycle[selected_distributor_shipping_method_ids][]", ""
-
   .row
     .three.columns
        
@@ -19,10 +17,12 @@
       %table.checkout-options
         %thead
           %tr
-            %th{ colspan: 2 }= t('.shipping_methods')
+            %th{ colspan: 2 }
+              = t('.shipping_methods')
+              = hidden_field_tag "order_cycle[selected_distributor_shipping_method_ids][]", ""
           - @order_cycle.distributors.each do |distributor|
             - distributor_shipping_methods = @order_cycle.attachable_distributor_shipping_methods.where("distributor_id = ?", distributor.id).includes(:shipping_method)
-            %tr{ "data-controller": "select-all" }
+            %tr{ class: "distributor-#{distributor.id}-shipping-methods", "data-controller": "select-all" }
               %td.text-center
                 - if distributor_shipping_methods.many?
                   %label
@@ -48,17 +48,36 @@
                   %p
                     = t('.no_shipping_methods')
           %tr
-            %th{ colspan: 2 }= t('.payment_methods')
-          %tr
-            %td
-            %td
-              - if @order_cycle.attachable_payment_methods.available(:both).any?
-                %ul
-                  - @order_cycle.attachable_payment_methods.available(:both).each do |payment_method|
-                    %li= payment_method.name
-              - else
-                %p
-                  = t('.no_payment_methods')
+            %th{ colspan: 2 }
+              = t('.payment_methods')
+              = hidden_field_tag "order_cycle[selected_distributor_payment_method_ids][]", ""
+          - @order_cycle.distributors.each do |distributor|
+            - distributor_payment_methods = @order_cycle.attachable_distributor_payment_methods.where("distributor_id = ?", distributor.id).includes(:payment_method)
+            %tr{ class: "distributor-#{distributor.id}-payment-methods", "data-controller": "select-all" }
+              %td.text-center
+                - if distributor_payment_methods.many?
+                  %label
+                    = check_box_tag nil, nil, nil, { "data-action": "change->select-all#toggleAll", "data-select-all-target": "all" }
+                    = t(".select_all")
+              %td
+                %em= distributor.name
+                - distributor_payment_methods.each do |distributor_payment_method|
+                  %p
+                    %label{ class: ("disabled" if distributor_payment_methods.one? || !distributor_payment_method.payment_method.frontend?) }
+                      = check_box_tag "order_cycle[selected_distributor_payment_method_ids][]",
+                          distributor_payment_method.id,
+                          @order_cycle.distributor_payment_methods.include?(distributor_payment_method),
+                          id: "order_cycle_selected_distributor_payment_method_ids_#{distributor_payment_method.id}",
+                          data: ({ "action" => "change->select-all#toggleCheckbox", "select-all-target" => "checkbox" } if distributor_payment_method.payment_method.frontend?)
+                      = distributor_payment_method.payment_method.name
+                - distributor.payment_methods.inactive_or_backend.each do |payment_method|
+                  %label.disabled
+                    = check_box_tag nil, nil, false, disabled: true
+                    = payment_method.name
+                    = "(#{t('.back_end')})"
+                - if distributor.payment_methods.available.none?
+                  %p
+                    = t('.no_payment_methods')
 
   %div#save-bar
     %div.container

app/views/admin/reports/_date_range_form.html.haml

@@ -4,7 +4,7 @@
 .row.date-range-filter
   .alpha.two.columns= label_tag nil, t(:date_range)
   .omega.fourteen.columns
-    = f.text_field "#{field}_gt", :class => 'datetimepicker datepicker-from', :placeholder => t(:start)
+    = f.text_field "#{field}_gt", :class => 'datetimepicker datepicker-from', :placeholder => t(:start), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "startOfDay" }
     %span.range-divider
       %i.icon-arrow-right
-    = f.text_field "#{field}_lt", :class => 'datetimepicker datepicker-to', :placeholder => t(:stop)
+    = f.text_field "#{field}_lt", :class => 'datetimepicker datepicker-to', :placeholder => t(:stop), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "endOfDay" }

app/views/admin/reports/_rendering_options.html.haml

@@ -1,11 +1,5 @@
 - if @report_subtypes.present? && @report_subtypes.count > 1
-  - if feature?(:report_inverse_columns_logic, spree_current_user)
-    %input{type: 'hidden', name: 'report_subtype', value: @report_subtype}
-  - else
-    .row
-      .alpha.two.columns= label_tag nil, t(:report_type)
-      .omega.fourteen.columns
-        = select_tag(:report_subtype, options_for_select(@report_subtypes, @report_subtype))  
+  %input{type: 'hidden', name: 'report_subtype', value: @report_subtype}
 
 .row.rendering-options{ "data-controller": "csv-select" }
   .alpha.two.columns
@@ -31,13 +25,7 @@
 
 - if @report.available_headers.present?
   .row
-    - if feature? :report_inverse_columns_logic, spree_current_user
-      .alpha.two.columns= label_tag nil, t(:report_columns)
-      .omega.fourteen.columns
-        = select_tag(:fields_to_show, options_for_select(@report.available_headers, @params_fields_to_show),
-                    class: "select2 fullwidth", multiple: true)
-    - else
-      .alpha.two.columns= label_tag nil, t(:report_hide_columns)
-      .omega.fourteen.columns
-        = select_tag(:fields_to_hide, options_for_select(@report.available_headers, params[:fields_to_hide]),
-                    class: "select2 fullwidth", multiple: true)
+    .alpha.two.columns= label_tag nil, t(:report_columns)
+    .omega.fourteen.columns
+      = render MultipleCheckedSelectComponent.new(name: "fields_to_show", options: @report.available_headers, selected: @params_fields_to_show)
+  

app/views/admin/reports/filters/_orders_and_distributors.html.haml

@@ -1 +1,5 @@
 = render 'admin/reports/date_range_form', f: f
+
+.row
+  .alpha.two.columns= label_tag nil, t(:report_hubs)
+  .omega.fourteen.columns= f.collection_select(:distributor_id_in, @data.orders_distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true})

app/views/admin/reports/filters/_xero_invoices.html.haml

@@ -16,10 +16,10 @@
     .fourteen.columns.omega= number_field_tag :initial_invoice_number, params[:initial_invoice_number]
   .row
     .two.columns.alpha= label_tag :invoice_date, t(:invoice_date)
-    .fourteen.columns.omega= text_field_tag :invoice_date, params[:invoice_date], class: 'datetimepicker'
+    .fourteen.columns.omega= text_field_tag :invoice_date, params[:invoice_date], class: 'datetimepicker', data: { controller: "flatpickr", "flatpickr-enable-time-value": true }
   .row
     .two.columns.alpha= label_tag :due_date, t(:due_date)
-    .fourteen.columns.omega= text_field_tag :due_date, params[:due_date], class: 'datetimepicker'
+    .fourteen.columns.omega= text_field_tag :due_date, params[:due_date], class: 'datetimepicker', data: { controller: "flatpickr", "flatpickr-enable-time-value": true }
   .row
     .two.columns.alpha= label_tag :account_code, t(:account_code)
     .fourteen.columns.omega= text_field_tag :account_code, params[:account_code]

app/views/admin/reports/index.html.haml

@@ -11,13 +11,9 @@
       - @reports.each do |report_type, report_subtypes|
         %tr
           %td
-            - name = I18n.t(:name, scope: [:admin, :reports, report_type])
-            - url = main_app.admin_report_url(report_type: report_type)
-            = link_to name, url
+            = I18n.t(:name, scope: [:admin, :reports, report_type])
           %td
-            - begin
-              = I18n.t!(:description, scope: [:admin, :reports, report_type])
-              - if feature? :report_inverse_columns_logic, spree_current_user
-                = render partial: "report_subtype", locals: { report_subtypes: report_subtypes, report_type: report_type }
-            - rescue I18n::MissingTranslationData
-              = render partial: "report_subtype", locals: { report_subtypes: report_subtypes, report_type: report_type }
+            - if report_subtypes.empty?
+              - name = I18n.t(:name, scope: [:admin, :reports, report_type])
+              - report_subtypes = [[name, nil]]
+            = render partial: "report_subtype", locals: { report_subtypes: report_subtypes, report_type: report_type }

app/views/admin/reports/show.html.haml

@@ -1,3 +1,6 @@
+- content_for :page_title do
+  = @report_title
+
 = form_for @report.search, :url => url_for(only_path: false) do |f|
   %fieldset.no-border-bottom.print-hidden
     %legend{ align: 'center'}= t(:report_filters)

app/views/admin/shared/_enterprises_sub_menu.html.haml

@@ -2,3 +2,5 @@
   %ul#sub_nav.inline-menu{"data-hook" => "admin_enterprise_sub_tabs"}
     = tab :enterprises, url: main_app.admin_enterprises_path
     = tab :enterprise_relationships, url: main_app.admin_enterprise_relationships_path
+    - if ENV["OPENID_APP_ID"].present? && ENV["OPENID_APP_SECRET"].present?
+      = tab :oidc_settings, url: main_app.admin_oidc_settings_path

app/views/admin/subscriptions/_details.html.haml

@@ -34,11 +34,11 @@
   .row
     .seven.columns.alpha.field
       %label{ for: 'begins_at'}= t('admin.begins_at')
-      %input.fullwidth#begins_at{ name: 'begins_at', type: 'text', placeholder: "#{t('.begins_at_placeholder')}", datepicker: 'subscription.begins_at', required: true, ng: { model: 'subscription.begins_at' } }
+      %input.fullwidth#begins_at{ name: 'begins_at', type: 'text', placeholder: "#{t('.begins_at_placeholder')}", data: { controller: "flatpickr" }, required: true, ng: { model: 'subscription.begins_at' } }
       .error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.begins_at.$error.required' } }= t(:error_required)
       .error{ ng: { repeat: 'error in errors.begins_at', show: 'subscription_details_form.begins_at.$pristine' } } {{ error }}
     .two.columns  
     .seven.columns.omega.field
       %label{ for: 'ends_at'}= t('admin.ends_at')
-      %input.fullwidth#ends_at{ name: 'ends_at', type: 'text', placeholder: "#{t('.ends_at_placeholder')}", datepicker: 'subscription.begins_at', ng: { model: 'subscription.ends_at' } }
+      %input.fullwidth#ends_at{ name: 'ends_at', type: 'text', placeholder: "#{t('.ends_at_placeholder')}",  data: { controller: "flatpickr" }, ng: { model: 'subscription.ends_at' } }
       .error{ ng: { repeat: 'error in errors.ends_at', show: 'subscription_details_form.ends_at.$pristine' } } {{ error }}

app/views/admin/subscriptions/_new_subscription_dialog.html.haml

@@ -4,6 +4,6 @@
 
   = form_with url: "/admin/subscriptions/new", method: :get  do |f|
     .text-left.margin-bottom-30
-      = select_tag "subscription[shop_id]", options_from_collection_for_select(@shops, "id", "name"), { "data-controller": "tom-select", "data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange", class: "primary" }
+      = select_tag "subscription[shop_id]", options_from_collection_for_select(@shops, "id", "name"), { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
     .text-center
-      = f.submit "Continue", class: "button red icon-plus"
+      = f.submit "Continue", class: "button red icon-plus"