Rescue ImageMagick errors

.env

@@ -52,8 +52,6 @@ SMTP_PASSWORD="f00d"
 
 # see="https://developers.google.com/maps/documentation/javascript/get-api-key
 # GOOGLE_MAPS_API_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-# see https://developers.google.com/maps/documentation/javascript/localization#Region
-# GOOGLE_MAPS_REGION="XX"
 
 # Stripe details for instance account
 # Find these under 'Developers' -> 'API keys' in your Stripe account dashboard.
@@ -63,9 +61,3 @@ SMTP_PASSWORD="f00d"
 # STRIPE_INSTANCE_PUBLISHABLE_KEY="pk_test_xxxx" # This can be a test key or a live key
 # STRIPE_CLIENT_ID="ca_xxxx" # This can be a development ID or a production ID
 # STRIPE_ENDPOINT_SECRET="whsec_xxxx"
-
-# New relic settings
-# see: https://one.eu.newrelic.com/admin-portal/, Administration > API keys to get the license key
-# NEW_RELIC_AGENT_ENABLED=true
-# NEW_RELIC_APP_NAME="Open Food Network"
-# NEW_RELIC_LICENSE_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

.env.test

@@ -4,9 +4,6 @@
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 STRIPE_SECRET_TEST_API_KEY="bogus_key"
 STRIPE_CUSTOMER="bogus_customer"
-STRIPE_ACCOUNT="bogus_account"
-STRIPE_CLIENT_ID="bogus_client_id"
-STRIPE_PUBLIC_TEST_API_KEY="bogus_stripe_publishable_key"
 
 SITE_URL="test.host"
 

.github/ISSUE_TEMPLATE/release.md

@@ -10,21 +10,16 @@ assignees: ''
 ## 1. Preparation on Thursday
 
 - [ ] Merge pull requests in the [Ready To Go] column
-- [ ] Include translations: `script/release/update_locales`
-- [ ] Increment version number: `git push upstream HEAD:refs/tags/vX.Y.Z`
-    - Major: if server changes are required (eg. provision with ofn-install)
-    - Minor: larger change that is irreversible (eg. migration deleting data)
-    - Patch: all others. Shortcut: `script/release/tag`
+- [ ] Include translations: `tx pull --force`
 - [ ] [Draft new release]. Look at previous [releases] for inspiration.
-    - Select new release tag
-    - _Generate release notes_ and check to ensure all items are arranged in the right category.
-- [ ] Notify [#instance-managers] of user-facing :eyes:, API :warning: and experimental :construction: changes.
+- [ ] Notify [#instance-managers] of user-facing changes.
 
 ## 2. Testing
 
+- [ ] [Find build] of the release commit and copy it below.
 - [ ] Move this issue to Test Ready.
 - [ ] Notify `@testers` in [#testing].
-- [ ] Test build: [Deploy to Staging] with release tag.
+- [ ] Test build: <!-- paste build link here, e.g. https://semaphore...builds/1234 -->
 
 ## 3. Finish on Tuesday
 
@@ -34,7 +29,7 @@ assignees: ''
   <pre>
   cd ofn-install
   git pull
-  ansible-playbook --limit all_prod --extra-vars "git_version=vX.Y.Z" playbooks/deploy.yml
+  ansible-playbook --limit all-prod --extra-vars "git_version=vx.y.z" playbooks/deploy.yml
   </pre>
   </details>
 - [ ] Notify [#instance-managers]:
@@ -45,9 +40,9 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 
 [Ready To Go]: #zenhub
 [Transifex pull request]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+head%3Atransifex
-[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A
+[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%23%23%23+Experimental+features+for+testing+:sunglasses:%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
-[Deploy to Staging]: https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/stage.yml
+[Find build]: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master
 [#global-community]: https://app.slack.com/client/T02G54U79/C59ADD8F2

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,12 +20,7 @@
 
 <!-- Please select one for your PR and delete the other. -->
 
-Changelog Category (reviewers may add a label for the release notes):
-
-- [x] User facing changes
-- [ ] API changes (V0, V1, DFC or Webhook)
-- [ ] Technical changes only
-- [ ] Feature toggled
+Changelog Category: User facing changes | Technical changes
 
 <!-- Choose a pull request title above which explains your change to a
      a user of the Open Food Network app. -->

.github/release.yml

@@ -1,30 +0,0 @@
-changelog:
-  # Categorise according to what an instance manager needs to know
-  categories:
-    # Posted in advance for #instance-managers
-    - title: "User-facing changes 👀"
-      labels:
-        - '*'
-      exclude:
-        labels:
-          - api changes
-          - dependencies
-          - feature toggled
-          - technical changes only
-
-    - title: "API changes ⚠️"
-      labels:
-        - api changes
-
-    - title: "Experimental features for testing 🚧" # may be tested by instance managers
-      labels:
-        - feature toggled
-
-    # Instance managers ignore below
-    - title: "Technical changes 🛠️"
-      labels:
-        - technical changes only
-
-    - title: "Dependencies 📦"
-      labels:
-        - dependencies

.github/workflows/build.yml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 jobs:
-  controllers:
+  knapsack_rspec_controllers:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -85,7 +85,7 @@ jobs:
           git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
           bundle exec rake knapsack_pro:rspec
 
-  models:
+  knapsack_rspec_models:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -106,10 +106,10 @@ jobs:
         # [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]
+        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]
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6]
     steps:
       - uses: actions/checkout@v3
 
@@ -154,7 +154,7 @@ jobs:
         run: |
           bundle exec rake knapsack_pro:rspec
 
-  system_admin:
+  knapsack_rspec_system_admin:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -175,10 +175,10 @@ jobs:
         # [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: [13]
+        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, 10, 11, 12] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
     steps:
       - uses: actions/checkout@v3
 
@@ -232,7 +232,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  system_consumer:
+  knapsack_rspec_system_consumer:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -253,10 +253,10 @@ jobs:
         # [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: [12]
+        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, 10, 11] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
     steps:
       - uses: actions/checkout@v3
 
@@ -310,7 +310,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  engines:
+  knapsack_rspec_engines:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -331,10 +331,10 @@ jobs:
         # [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: [2]
+        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]
+        ci_node_index: [0, 1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v3
 
@@ -388,7 +388,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  test_the_rest:
+  knapsack_rspec_test_the_rest:
     runs-on: ubuntu-22.04
     services:
       postgres:

.github/workflows/mapi.yml

@@ -28,7 +28,7 @@ jobs:
       with:
         mapi-token: ${{ secrets.MAPI_TOKEN }}
         api-url: http://localhost:3000
-        api-spec: swagger/v1.yaml
+        api-spec: swagger/v1/swagger.yaml
         target: openfoodfoundation/openfoodnetwork
         duration: 1min
         sarif-report: mapi.sarif

.github/workflows/stage.yml

@@ -13,10 +13,6 @@ on:
           - staging.openfoodnetwork.org.uk
           - staging.openfoodnetwork.org.au
           - staging.coopcircuits.fr
-      commit_ref:
-        description: "Commit Reference"
-        type: string
-        required: false
 
 jobs:
   deploy_pr:
@@ -63,4 +59,4 @@ jobs:
       - name: Deploy to Staging
         if: success()
         run: |
-          ssh ofn-deploy@${{ inputs.server }} -o LogLevel=ERROR "$GITHUB_REF_NAME ${{ inputs.commit_ref || github.sha }}"
+          ssh ofn-deploy@${{ inputs.server }} -o LogLevel=ERROR "$GITHUB_REF_NAME $GITHUB_SHA"

.prettierignore

@@ -13,8 +13,7 @@ postcss.config.js
 
 # SCSS
 # Enabled: most of admin
-/app/webpacker/css/admin/globals/mixins.scss
-/app/webpacker/css/admin/globals/variables.scss
+/app/webpacker/css/admin/globals/
 /app/webpacker/css/admin/shared/
 /app/webpacker/css/admin_v3/globals/variables.scss
 /app/webpacker/css/darkswarm/

.rubocop_styleguide.yml

@@ -39,7 +39,6 @@ Metrics/BlockLength:
     "put",
     "resource",
     "resources",
-    "response",
     "scenario",
     "shared_examples",
     "shared_examples_for",
@@ -54,13 +53,6 @@ Rails/ApplicationRecord:
     # Migrations should not contain application code:
     - "db/migrate/*.rb"
 
-# Allow many-to-many associations without explicit model.
-# - It avoids the additional code of a model class.
-# - It simplifies the declaration of the association.
-# - Rails may know that there are no callbacks associated.
-Rails/HasAndBelongsToMany:
-  Enabled: false
-
 Rails/SkipsModelValidations:
   AllowedMethods:
     - "touch"
@@ -70,10 +62,6 @@ Rails/SkipsModelValidations:
     - "update_column"
     - "update_columns"
 
-Rails/OutputSafety:
-  Exclude:
-    - 'spec/**/*'
-
 Style/Documentation:
   Enabled: false
 

Gemfile

@@ -17,7 +17,7 @@ gem "image_processing"
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '~> 4.1.0'
+gem 'ransack', '~> 2.6.0'
 gem 'responders'
 gem 'rexml'
 gem 'webpacker', '~> 5'
@@ -32,7 +32,6 @@ gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-7"
 gem "fog-aws", "~> 2.0" # db2fog does not support v3
 gem "mime-types" # required by fog
 
-gem "validates_lengths_from_database"
 gem "valid_email2"
 
 gem "catalog", path: "./engines/catalog"
@@ -93,7 +92,7 @@ gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail'
+gem 'paper_trail', '~> 12.1'
 gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
@@ -104,8 +103,8 @@ gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
-gem "cable_ready", "5.0.1"
-gem "stimulus_reflex", "3.5.0.rc3"
+gem "cable_ready", "5.0.0.rc2"
+gem "stimulus_reflex", "3.5.0.rc2"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -134,15 +133,11 @@ gem 'flipper-ui'
 gem "view_component"
 gem 'view_component_reflex', '3.1.14.pre9'
 
-# mini_portile2 is needed when installing with Vargant
-# https://openfoodnetwork.slack.com/archives/CEBMTRCNS/p1668439152992899
 gem 'mini_portile2', '~> 2.8'
 
 gem "faraday"
 gem "private_address_check"
 
-gem 'newrelic_rpm'
-
 group :production, :staging do
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
@@ -160,9 +155,8 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry', require: false
-  gem 'rswag'
+  gem 'rswag-specs'
   gem 'shoulda-matchers'
-  gem 'stimulus_reflex_testing'
   gem 'timecop'
 end
 

Gemfile.lock

@@ -41,110 +41,109 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailbox (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (7.0.6)
+      actionpack (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actiontext (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actiontext (7.0.6)
+      actionpack (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (1.1.4)
+    active_storage_validations (1.0.4)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.3.6)
     activemerchant (1.123.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activerecord-import (1.5.1)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
+    activerecord-import (1.4.1)
       activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activerecord-session_store (2.1.0)
-      actionpack (>= 6.1)
-      activerecord (>= 6.1)
-      cgi (>= 0.3.6)
+    activerecord-session_store (2.0.0)
+      actionpack (>= 5.2.4.1)
+      activerecord (>= 5.2.4.1)
       multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 2.0.8, < 4)
-      railties (>= 6.1)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+      rack (>= 2.0.8, < 3)
+      railties (>= 5.2.4.1)
+    activestorage (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activesupport (= 7.0.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.8)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    acts-as-taggable-on (10.0.0)
-      activerecord (>= 6.1, < 7.2)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.5)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
-    angular-rails-templates (1.2.1)
-      railties (>= 5.0, < 7.2)
+    angular-rails-templates (1.2.0)
+      railties (>= 5.0, < 7.1)
       sprockets (>= 3.0, < 5)
       sprockets-rails
       tilt
-    angular_rails_csrf (6.0.0)
+    angular_rails_csrf (5.0.0)
       railties (>= 3, < 8)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.8.0)
@@ -152,38 +151,37 @@ GEM
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
     attr_required (1.0.1)
-    awesome_nested_set (3.6.0)
-      activerecord (>= 4.0.0, < 7.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.877.0)
-    aws-sdk-core (3.190.1)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+    awesome_nested_set (3.5.0)
+      activerecord (>= 4.0.0, < 7.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.792.0)
+    aws-sdk-core (3.179.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcp47_spec (0.2.1)
-    bcrypt (3.1.19)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bcrypt (3.1.18)
     bigdecimal (3.0.2)
     bindata (2.4.15)
     bindex (0.8.1)
-    bootsnap (1.17.0)
+    bootsnap (1.16.0)
       msgpack (~> 1.2)
-    bugsnag (6.26.1)
+    bugsnag (6.26.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
-    bullet (7.1.5)
+    bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    cable_ready (5.0.1)
+    cable_ready (5.0.0.rc2)
       actionpack (>= 5.2)
       actionview (>= 5.2)
       activesupport (>= 5.2)
@@ -204,7 +202,6 @@ GEM
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
-    cgi (0.3.6)
     choice (0.2.0)
     chronic (0.10.2)
     coderay (1.1.3)
@@ -215,7 +212,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    combine_pdf (1.0.26)
+    combine_pdf (1.0.23)
       matrix
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.2.2)
@@ -223,25 +220,25 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.11.0)
       addressable
-    cuprite (0.15)
+    cuprite (0.14.3)
       capybara (~> 3.0)
-      ferrum (~> 0.14.0)
+      ferrum (~> 0.13.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.9)
-      virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
+    datafoodconsortium-connector (1.0.0.pre.alpha.6)
+      virtual_assembly-semantizer (~> 1.0, >= 1.0.4)
     date (3.3.3)
-    debug (1.9.1)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     debugger-linecache (1.2.0)
-    devise (4.9.3)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -249,7 +246,7 @@ GEM
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-i18n (1.12.0)
+    devise-i18n (1.11.0)
       devise (>= 4.9.0)
     devise-token_authenticatable (1.1.0)
       devise (>= 4.0.0, < 5.0.0)
@@ -270,18 +267,18 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.1.0)
-      net-http
-    ferrum (0.14)
+    faraday-net_http (3.0.2)
+    ferrum (0.13)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffaker (2.23.0)
+    ffaker (2.21.0)
     ffi (1.15.5)
     flipper (0.26.2)
       concurrent-ruby (< 2)
@@ -318,8 +315,8 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.8.2)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     gmaps4rails (2.1.2)
     good_migrations (0.2.1)
       activerecord (>= 3.1)
@@ -343,11 +340,10 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    io-console (0.7.1)
+    io-console (0.6.0)
     ipaddress (0.8.3)
-    irb (1.11.0)
-      rdoc
-      reline (>= 0.3.8)
+    irb (1.6.4)
+      reline (>= 0.3.0)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -355,22 +351,22 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (2.7.1)
-    json-canonicalization (0.4.0)
+    json (2.6.3)
+    json-canonicalization (0.3.1)
     json-jwt (1.16.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json-ld (3.3.0)
+    json-ld (3.2.3)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
-      rack (>= 2.2, < 4)
-      rdf (~> 3.3)
-    json-schema (4.1.1)
+      rack (~> 2.2)
+      rdf (~> 3.2, >= 3.2.9)
+    json-schema (3.0.0)
       addressable (>= 2.8)
     json_spec (1.1.5)
       multi_json (~> 1.0)
@@ -378,7 +374,7 @@ GEM
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwt (2.7.1)
-    knapsack_pro (6.0.4)
+    knapsack_pro (5.3.4)
       rake
     language_server-protocol (3.17.0.3)
     launchy (2.5.0)
@@ -389,7 +385,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -400,37 +396,34 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.2)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2021.0225)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.11.0)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
+    minitest (5.18.1)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.7.2)
+    msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-http (0.4.1)
-      uri
-    net-imap (0.4.2)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.3.3)
       net-protocol
-    newrelic_rpm (9.7.0)
-    nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -463,13 +456,13 @@ GEM
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    paper_trail (15.1.0)
-      activerecord (>= 6.1)
-      request_store (~> 1.4)
-    parallel (1.24.0)
-    paranoia (2.6.3)
-      activerecord (>= 5.1, < 7.2)
-    parser (3.2.2.4)
+    paper_trail (12.3.0)
+      activerecord (>= 5.2)
+      request_store (~> 1.1)
+    parallel (1.23.0)
+    paranoia (2.6.2)
+      activerecord (>= 5.1, < 7.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -477,7 +470,7 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.12.0)
+    pdf-reader (2.11.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -488,17 +481,15 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.1.2)
-      stringio
-    public_suffix (5.0.4)
-    puma (6.4.2)
+    public_suffix (5.0.3)
+    puma (6.3.0)
       nio4r (~> 2.0)
     query_count (1.1.1)
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.7.3)
-    rack (2.2.8)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-oauth2 (1.21.3)
@@ -515,25 +506,25 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rails (7.0.6)
+      actioncable (= 7.0.6)
+      actionmailbox (= 7.0.6)
+      actionmailer (= 7.0.6)
+      actionpack (= 7.0.6)
+      actiontext (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activemodel (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       bundler (>= 1.15.0)
-      railties (= 7.0.8)
+      railties (= 7.0.6)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.1.1)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -545,49 +536,46 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
-    ransack (4.1.1)
-      activerecord (>= 6.1.5)
-      activesupport (>= 6.1.5)
+    rake (13.0.6)
+    ransack (2.6.0)
+      activerecord (>= 6.0.4)
+      activesupport (>= 6.0.4)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.3.1)
-      bcp47_spec (~> 0.2)
+    rdf (3.2.9)
       link_header (~> 0.0, >= 0.0.8)
-    rdoc (6.6.2)
-      psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    redis-client (0.18.0)
+    redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.8.3)
-    reline (0.4.1)
+    regexp_parser (2.8.1)
+    reline (0.3.3)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
-    roadie (5.2.0)
+    roadie (5.0.1)
       css_parser (~> 1.4)
-      nokogiri (~> 1.15)
-    roadie-rails (3.1.0)
-      railties (>= 5.1, < 8.0)
+      nokogiri (~> 1.8)
+    roadie-rails (3.0.0)
+      railties (>= 5.1, < 7.1)
       roadie (~> 5.0)
     rodf (1.2.0)
       builder (>= 3.0)
@@ -604,10 +592,10 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -618,45 +606,40 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.12.1)
-    rswag (2.13.0)
-      rswag-api (= 2.13.0)
-      rswag-specs (= 2.13.0)
-      rswag-ui (= 2.13.0)
-    rswag-api (2.13.0)
-      activesupport (>= 3.1, < 7.2)
-      railties (>= 3.1, < 7.2)
-    rswag-specs (2.13.0)
-      activesupport (>= 3.1, < 7.2)
-      json-schema (>= 2.2, < 5.0)
-      railties (>= 3.1, < 7.2)
+    rswag-api (2.10.1)
+      railties (>= 3.1, < 7.1)
+    rswag-specs (2.10.1)
+      activesupport (>= 3.1, < 7.1)
+      json-schema (>= 2.2, < 4.0)
+      railties (>= 3.1, < 7.1)
       rspec-core (>= 2.14)
-    rswag-ui (2.13.0)
-      actionpack (>= 3.1, < 7.2)
-      railties (>= 3.1, < 7.2)
-    rubocop (1.59.0)
+    rswag-ui (2.10.1)
+      actionpack (>= 3.1, < 7.1)
+      railties (>= 3.1, < 7.1)
+    rubocop (1.55.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
@@ -672,9 +655,9 @@ GEM
       tilt (>= 1.1, < 3)
     sd_notify (0.1.1)
     semantic_range (3.0.0)
-    shoulda-matchers (6.0.0)
+    shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.0)
+    sidekiq (7.1.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -692,7 +675,7 @@ GEM
     spreadsheet_architect (5.0.0)
       caxlsx (>= 3.3.0, < 4)
       rodf (>= 1.0.0, < 2)
-    spring (4.1.3)
+    spring (4.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.2)
@@ -709,38 +692,34 @@ GEM
     state_machines-activerecord (0.9.0)
       activerecord (>= 6.0)
       state_machines-activemodel (>= 0.9.0)
-    stimulus_reflex (3.5.0.rc3)
+    stimulus_reflex (3.5.0.rc2)
       actioncable (>= 5.2, < 8)
       actionpack (>= 5.2, < 8)
       actionview (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
-      cable_ready (~> 5.0)
+      cable_ready (>= 5.0.0.rc2)
       nokogiri (~> 1.0)
       rack (>= 2, < 4)
       railties (>= 5.2, < 8)
       redis (>= 4.0, < 6.0)
-    stimulus_reflex_testing (0.3.0)
-      stimulus_reflex (>= 3.3.0)
     stringex (2.8.6)
-    stringio (3.1.0)
-    stripe (10.3.0)
+    stripe (8.6.0)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
     temple (0.8.2)
-    thor (1.3.0)
+    thor (1.2.2)
     thread-local (1.1.0)
-    tilt (2.3.0)
-    timecop (0.9.8)
+    tilt (2.1.0)
+    timecop (0.9.6)
     timeout (0.4.0)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    uri (0.13.0)
-    valid_email2 (5.1.1)
+    valid_email2 (4.0.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
     validate_email (0.1.6)
@@ -749,10 +728,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    validates_lengths_from_database (0.8.0)
-      activerecord (>= 4)
     vcr (6.2.0)
-    view_component (3.10.0)
+    view_component (3.5.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -760,11 +737,11 @@ GEM
       rails (>= 5.2, < 8.0)
       stimulus_reflex (>= 3.5.0.pre2)
       view_component (>= 2.28.0)
-    virtual_assembly-semantizer (1.0.5)
+    virtual_assembly-semantizer (1.0.4)
       json-ld (~> 3.2, >= 3.2.3)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.1)
+    web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -772,7 +749,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.19.1)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -781,8 +758,8 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.8.1)
-    websocket-driver (0.7.6)
+    webrick (1.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
@@ -793,7 +770,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -819,7 +796,7 @@ DEPENDENCIES
   bootsnap
   bugsnag
   bullet
-  cable_ready (= 5.0.1)
+  cable_ready (= 5.0.0.rc2)
   cancancan (~> 1.15.0)
   capybara
   catalog!
@@ -870,14 +847,13 @@ DEPENDENCIES
   mimemagic (> 0.3.5)
   mini_portile2 (~> 2.8)
   monetize (~> 1.11)
-  newrelic_rpm
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection
   omniauth_openid_connect
   openid_connect (~> 1.3)
   order_management!
   pagy (~> 5.1)
-  paper_trail
+  paper_trail (~> 12.1)
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
   pdf-reader
@@ -894,7 +870,7 @@ DEPENDENCIES
   rails-erd
   rails-i18n
   rails_safe_tasks (~> 1.0)
-  ransack (~> 4.1.0)
+  ransack (~> 2.6.0)
   redcarpet
   redis (>= 4.0)
   responders
@@ -903,8 +879,8 @@ DEPENDENCIES
   roo
   rspec-rails (>= 3.5.2)
   rspec-retry
-  rswag
   rswag-api
+  rswag-specs
   rswag-ui
   rubocop
   rubocop-rails
@@ -918,13 +894,11 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   state_machines-activerecord
-  stimulus_reflex (= 3.5.0.rc3)
-  stimulus_reflex_testing
+  stimulus_reflex (= 3.5.0.rc2)
   stringex (~> 2.8.5)
   stripe
   timecop
   valid_email2
-  validates_lengths_from_database
   vcr
   view_component
   view_component_reflex (= 3.1.14.pre9)

README.md

@@ -1,4 +1,5 @@
 [![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
+[![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
 
@@ -44,7 +45,7 @@ We use [KnapsackPro](https://knapsackpro.com/) for optimal parallelisation of ou
 
 ## Licence
 
-Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A

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

@@ -135,7 +135,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       display_name: null
       on_hand: null
       price: null
-      tax_category_id: null
     DisplayProperties.setShowVariants product.id, true
 
 
@@ -248,6 +247,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     else
       product.variant_unit = product.variant_unit_scale = null
 
+    $scope.packVariant product, product.master if product.master
 
     if product.variants
       for id, variant of product.variants
@@ -298,6 +298,7 @@ filterSubmitProducts = (productsToFilter) ->
       if product.hasOwnProperty("id")
         filteredProduct = {id: product.id}
         filteredVariants = []
+        filteredMaster = null
         hasUpdatableProperty = false
 
         if product.hasOwnProperty("variants")
@@ -307,6 +308,16 @@ filterSubmitProducts = (productsToFilter) ->
             variantHasUpdatableProperty = result.hasUpdatableProperty
             filteredVariants.push filteredVariant  if variantHasUpdatableProperty
 
+        if product.master?.hasOwnProperty("unit_value")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.unit_value = product.master.unit_value
+        if product.master?.hasOwnProperty("unit_description")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.unit_description = product.master.unit_description
+        if product.master?.hasOwnProperty("display_as")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.display_as = product.master.display_as
+
         if product.hasOwnProperty("sku")
           filteredProduct.sku = product.sku
           hasUpdatableProperty = true
@@ -335,9 +346,15 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("category_id")
           filteredProduct.primary_taxon_id = product.category_id
           hasUpdatableProperty = true
+        if product.hasOwnProperty("tax_category_id")
+          filteredProduct.tax_category_id = product.tax_category_id
+          hasUpdatableProperty = true
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
+        if filteredMaster?
+          filteredProduct.master_attributes = filteredMaster
+          hasUpdatableProperty = true
         if filteredVariants.length > 0 # Note that the name of the property changes to enable mass assignment of variants attributes with rails
           filteredProduct.variants_attributes = filteredVariants
           hasUpdatableProperty = true
@@ -372,9 +389,6 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("display_name")
       filteredVariant.display_name = variant.display_name
       hasUpdatableProperty = true
-    if variant.hasOwnProperty("tax_category_id")
-      filteredVariant.tax_category_id = variant.tax_category_id
-      hasUpdatableProperty = true
     if variant.hasOwnProperty("display_as")
       filteredVariant.display_as = variant.display_as
       hasUpdatableProperty = true

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

@@ -11,8 +11,14 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
         pendingChanges.remove(scope.object().id, scope.attr)
         scope.clear()
       else
+        change =
+          object: scope.object()
+          type: scope.type
+          attr: scope.attr
+          value: if value? then value else ""
+          scope: scope
         scope.pending()
-        addPendingChange(scope.attr, value ? "")
+        pendingChanges.add(scope.object().id, scope.attr, change)
 
     scope.reset = (value) ->
       scope.savedValue = value
@@ -28,33 +34,3 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
 
     scope.clear = ->
       switchClass( element, "", ["update-pending", "update-error", "update-success"], false )
-
-    # When a list of customer is filtered and we removed the "filtered value" from a customer, we
-    # want to make sure the customer is updated. IE. filtering by tag, and removing said tag.
-    # Deleting the "filtered value" from a customer will remove the customer entry, thus
-    # removing "objForUpdate" directive from the active scope. That means $watch won't pick up
-    # the attribute changed.
-    # To ensure the customer is still updated, we check on the $destroy event to see if
-    # the attribute has changed, if so we queue up the change.
-    scope.$on '$destroy', (value) ->
-      # No update
-      return if scope.object()[scope.attr] is scope.savedValue
-
-      # For some reason the code attribute is removed from the object when cleared, so we add
-      # an emptyvalue so it gets updated properly
-      if scope.attr is "code" and scope.object()[scope.attr] is undefined
-        scope.object()["code"] = ""
-
-      # Queuing up change
-      addPendingChange(scope.attr, scope.object()[scope.attr])
-
-    # private
-
-    addPendingChange = (attr, value) ->
-      change =
-        object: scope.object()
-        type: scope.type
-        attr: attr
-        value: value
-        scope: scope
-      pendingChanges.add(scope.object().id, attr, change)

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

@@ -24,9 +24,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     "order_bill_address_firstname",
     "order_bill_address_lastname",
     "order_bill_address_full_name",
-    "order_bill_address_full_name_reversed",
-    "order_bill_address_full_name_with_comma",
-    "order_bill_address_full_name_with_comma_reversed",
     "variant_product_supplier_name",
     "order_email",
     "order_number",

app/assets/javascripts/admin/payments/services/payment.js.coffee

@@ -42,10 +42,8 @@ angular.module('admin.payments').factory 'Payment', (AdminStripeElements, curren
 
     submit: =>
       munged = @preprocess()
-      PaymentResource.create({order_id: munged.order_id}, munged, (response, headers, status) ->
-        rawHtml = Object.values(response).join('').replace('[object Object]true', '')
-        document.body.innerHTML = rawHtml
-        $window.history.pushState({}, '', "/admin/orders/" + munged.order_id + "/payments")
+      PaymentResource.create({order_id: munged.order_id}, munged, (response, headers, status)=>
+        $window.location.pathname = "/admin/orders/" + munged.order_id + "/payments"
       , (response) ->
         StatusMessage.display 'error', t("spree.admin.payments.source_forms.stripe.error_saving_payment")
       )

app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee

@@ -2,9 +2,6 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
   class VariantUnitManager
     @units:
       'weight':
-        0.001:
-          name: 'mg'
-          system: 'metric'
         1.0:
           name: 'g'
           system: 'metric'
@@ -24,21 +21,12 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
         0.001:
           name: 'mL'
           system: 'metric'
-        0.01:
-          name: 'cL'
-          system: 'metric'
-        0.1:
-          name: 'dL'
-          system: 'metric'
         1.0:
           name: 'L'
           system: 'metric'
         1000.0:
           name: 'kL'
           system: 'metric'
-        4.54609:
-          name: 'gal'
-          system: 'metric'
       'items':
         1:
           name: 'items'
@@ -72,13 +60,8 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
 
     @compatibleUnitScales: (scale, unitType) ->
       scaleSystem = @units[unitType][scale]['system']
-      if availableUnits
-        available = availableUnits.split(",")
-        (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem and available.includes(scaleInfo['name'])).sort (a, b) ->
-          a - b
-      else
-        (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem).sort (a, b) ->
-          a - b
+      (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem).sort (a, b) ->
+         a - b
 
     @systemOfMeasurement: (scale, unitType) ->
       if @units[unitType][scale]

app/assets/javascripts/admin/spree/base.js.erb

@@ -32,6 +32,9 @@ jQuery(function($) {
     });
   }
 
+  // Make flash messages dissapear
+  setTimeout('$(".flash").fadeOut()', 5000);
+
   // Highlight hovered table column
   $('table tbody tr td.actions a').hover(function(){
     var tr = $(this).closest('tr');

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

@@ -50,11 +50,11 @@ $(document).ready(function() {
       if (quantity > maxQuantity) {
         quantity = maxQuantity;
         save.parents('tr').find('input.line_item_quantity').val(maxQuantity);
-        ofnAlert(t("js.admin.orders.quantity_unavailable"));
-      } else {
-        adjustItems(shipment_number, variant_id, quantity, true);
+        ofnAlert(t("js.admin.orders.quantity_adjusted"));
       }
+      toggleItemEdit();
 
+      adjustItems(shipment_number, variant_id, quantity, true);
       return false;
     }
     $('a.save-item').click(handle_save_click);

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

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

app/assets/javascripts/templates/admin/panels/exchange_products_distributed.html.haml

@@ -19,7 +19,7 @@
             .name {{ product.name }}
           .supplier {{ product.supplier_name }}
 
-        .exchange-product-variant{'ng-repeat' => 'variant in product.variants | visibleVariants:exchange:order_cycle.visible_variants_for_outgoing_exchanges | filter:variantSuppliedToOrderCycle as filteredVariants'}
+        .exchange-product-variant{'ng-repeat' => 'variant in product.variants | visibleVariants:exchange:order_cycle.visible_variants_for_outgoing_exchanges | filter:variantSuppliedToOrderCycle'}
           %label
             %input{ type: 'checkbox', name: 'order_cycle_outgoing_exchange_{{ $parent.$parent.$index }}_variants_{{ variant.id }}',
               value: 1,
@@ -27,8 +27,5 @@
               'id' => 'order_cycle_outgoing_exchange_{{ $parent.$parent.$index }}_variants_{{ variant.id }}',
               'ng-disabled' => '!order_cycle.editable_variants_for_outgoing_exchanges.hasOwnProperty(exchange.enterprise_id) || order_cycle.editable_variants_for_outgoing_exchanges[exchange.enterprise_id].indexOf(variant.id) < 0' }
             {{ variant.label }}
-        
-        %em{ 'ng-if' => 'filteredVariants.length === 0' }
-          {{ 'js.admin.panels.exchange_products.no_variants' | t }}
 
     %div{ 'ng-include' => "'admin/panels/exchange_products_panel_footer.html'" }

app/assets/javascripts/templates/admin/panels/exchange_products_panel_header.html.haml

@@ -1,7 +1,5 @@
 .exchange-load-all-variants
   %div
     {{ 'js.admin.panels.exchange_products.variants_loaded' | t:{ num_of_variants_loaded: enterprises[exchange.enterprise_id].loaded_variants, total_number_of_variants: exchangeTotalVariants(exchange) } }}
-    %em{ 'ng-if': 'enterprises[exchange.enterprise_id].loaded_variants > exchangeTotalVariants(exchange)' }
-      {{ 'js.admin.panels.exchange_products.some_variants_hidden' | t }}
     %a{ 'ng-click' => 'loadAllExchangeProducts(exchange)', 'ng-show' => 'enterprises[exchange.enterprise_id].last_page_loaded < enterprises[exchange.enterprise_id].num_of_pages' }
       {{ 'js.admin.panels.exchange_products.load_all_variants' | t }}

app/assets/javascripts/templates/partials/hub_details.html.haml

@@ -14,7 +14,7 @@
             {{'hubs_delivery' | t}}
     .row
       .columns.small-12
-        %a.cta-hub{"ng-href" => "{{::enterprise.path}}#/shop_panel", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
+        %a.cta-hub{"ng-href" => "{{::enterprise.path}}#/shop", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
         "ng-class" => "{primary: enterprise.active, secondary: !enterprise.active}",
         "ng-click" => "$close()",
         "ofn-change-hub" => "enterprise"}

app/assets/javascripts/templates/partials/producer_details.html.haml

@@ -12,7 +12,7 @@
     .row
       .columns.small-12
         %a.cta-hub{"ng-repeat" => "hub in enterprise.hubs | filter:{id: '!'+enterprise.id} | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}#/shop_panel", "ofn-empties-cart" => "hub",
+        "ng-href" => "{{::hub.path}}#/shop", "ofn-empties-cart" => "hub",
         "ng-class" => "::{primary: hub.active, secondary: !hub.active}",
         "ng-click" => "$close()",
         "ofn-change-hub" => "hub"}

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

@@ -11,7 +11,7 @@
       %filter-selector{ 'selector-set' => "productPropertySelectors", objects: "[product] | propertiesWithValuesOf" }
 
     .product-description{"ng-if" => "product.description_html"}
-      %p.text-small{"ng-bind-html" => "::product.description_html", "data-controller" => "add-blank-to-link"}
+      %p.text-small{"ng-bind-html" => "::product.description_html"}
 
   .columns.small-12.medium-6.large-6.product-img
     %img{"ng-src" => "{{::product.largeImage}}", "ng-if" => "::product.largeImage"}

app/assets/javascripts/templates/shared/question_mark_with_tooltip_icon.html.haml

@@ -1 +1 @@
-.question-mark-icon{"ng-class" => "{open: tt_isOpen}", type: 'button'}
+%button.question-mark-icon{"ng-class" => "{open: tt_isOpen}", type: 'button'}

app/components/confirm_modal_component.rb

@@ -1,29 +1,14 @@
 # frozen_string_literal: true
 
 class ConfirmModalComponent < ModalComponent
-  # @param actions_alignment_class [String] possible classes: 'justify-space-around', 'justify-end'
-  def initialize(
-    id:,
-    reflex: nil,
-    controller: nil,
-    message: nil,
-    confirm_actions: nil,
-    confirm_reflexes: nil,
-    confirm_button_class: :primary,
-    confirm_button_text: I18n.t('js.admin.modals.confirm'),
-    cancel_button_text: I18n.t('js.admin.modals.cancel'),
-    actions_alignment_class: 'justify-space-around'
-  )
-    super(id:, close_button: true)
+  def initialize(id:, confirm_actions: nil, reflex: nil, controller: nil, message: nil,
+                 confirm_reflexes: nil)
+    super(id: id, close_button: true)
     @confirm_actions = confirm_actions
     @reflex = reflex
     @confirm_reflexes = confirm_reflexes
     @controller = controller
     @message = message
-    @confirm_button_class = confirm_button_class
-    @confirm_button_text = confirm_button_text
-    @cancel_button_text = cancel_button_text
-    @actions_alignment_class = actions_alignment_class
   end
 
   private

app/components/confirm_modal_component/confirm_modal_component.html.haml

@@ -1,10 +1,10 @@
 %div{ id: @id, "data-controller": "modal #{@controller}", "data-action": "keyup@document->modal#closeIfEscapeKey", "data-#{@controller}-reflex-value": @reflex }
   .reveal-modal-bg.fade{ "data-modal-target": "background", "data-action": "click->modal#close" }
-  .reveal-modal.fade.tiny.modal-component{ "data-modal-target": "modal" }
+  .reveal-modal.fade.tiny.help-modal{ "data-modal-target": "modal" }
     = content
 
     = render @message if @message
 
-    %div{ class: "modal-actions #{@actions_alignment_class}" }
-      %input{ class: "button icon-plus #{close_button_class}", type: 'button', value: @cancel_button_text, "data-action": "click->modal#close" }
-      %input{ id: 'modal-confirm-button', class: "button icon-plus #{@confirm_button_class}", type: 'button', value: @confirm_button_text, "data-action": @confirm_actions, "data-reflex": @confirm_reflexes }
+    .modal-actions
+      %input{ class: "button icon-plus #{close_button_class}", type: 'button', value: t('js.admin.modals.cancel'), "data-action": "click->modal#close" }
+      %input{ class: "button icon-plus primary", type: 'button', value: t('js.admin.modals.confirm'), "data-action": @confirm_actions, "data-reflex": @confirm_reflexes }

app/components/confirm_modal_component/confirm_modal_component.scss

@@ -1,22 +1,4 @@
 .modal-actions {
   display: flex;
-
-  &.justify-space-around {
-    justify-content: space-around;
-  }
-
-  &.justify-end {
-    justify-content: flex-end;
-    input[type="button"] {
-      margin: 0 5px;
-    }
-
-    @media only screen and (max-width: 1024px) {
-      flex-direction: column;
-      justify-content: space-around;
-      input[type="button"] {
-        margin: 5px 0;
-      }
-    }
-  }
+  justify-content: space-around;
 }

app/components/help_modal_component.rb

@@ -2,6 +2,6 @@
 
 class HelpModalComponent < ModalComponent
   def initialize(id:, close_button: true)
-    super(id:, close_button:)
+    super(id: id, close_button: close_button)
   end
 end

app/components/help_modal_component/help_modal_component.html.haml

@@ -1,6 +1,6 @@
 %div{ id: @id, "data-controller": "help-modal", "data-action": "keyup@document->help-modal#closeIfEscapeKey" }
   .reveal-modal-bg.fade{ "data-help-modal-target": "background", "data-action": "click->help-modal#close" }
-  .reveal-modal.fade.small.modal-component{ "data-help-modal-target": "modal" }
+  .reveal-modal.fade.small.help-modal{ "data-help-modal-target": "modal" }
     = content
 
     - if close_button?

app/components/help_modal_component/help_modal_component.scss

@@ -0,0 +1,10 @@
+.help-modal {
+  visibility: visible;
+  position: fixed;
+  top: 3em;
+}
+
+/* prevent arrow on selected admin menu item appearing above modal */
+body.modal-open #admin-menu li.selected a::after {
+  z-index: 0;
+}

app/components/modal_component.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 class ModalComponent < ViewComponent::Base
-  def initialize(id:, close_button: true, instant: false)
+  def initialize(id:, close_button: true)
     @id = id
     @close_button = close_button
-    @instant = instant
   end
 
   private

app/components/modal_component/modal_component.html.haml

@@ -1,8 +0,0 @@
-%div{ id: @id, "data-controller": "modal", "data-action": "keyup@document->modal#closeIfEscapeKey", "data-modal-instant-value": @instant }
-  .reveal-modal-bg.fade{ "data-modal-target": "background", "data-action": "click->modal#close" }
-  .reveal-modal.fade.small.modal-component{ "data-modal-target": "modal" }
-    = content
-
-    - if close_button?
-      .text-center
-        %input{ class: "button icon-plus #{close_button_class}", type: 'button', value: t('js.admin.modals.close'), "data-action": "click->modal#close" }

app/components/modal_component/modal_component.scss

@@ -1,24 +0,0 @@
-// class name 'modal' is already taken by 'custom-alert' and 'custom-confirm'.
-.modal-component {
-  visibility: visible;
-  position: fixed;
-  top: 3em;
-  &.in {
-    padding: 1.2rem;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6,
-  p {
-    margin-bottom: 0.5em;
-  }
-}
-
-/* prevent arrow on selected admin menu item appearing above modal */
-body.modal-open #admin-menu li.selected a::after {
-  z-index: 0;
-}

app/components/pagination_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PaginationComponent < ViewComponentReflex::Component
+  def initialize(pagy:, data:)
+    super
+    @count = pagy.count
+    @page = pagy.page
+    @per_page = pagy.items
+    @pages = pagy.pages
+    @next = pagy.next
+    @prev = pagy.prev
+    @data = data
+    @series = pagy.series
+  end
+end

app/components/pagination_component/pagination_component.html.haml

@@ -0,0 +1,16 @@
+= component_controller do
+  %nav{"aria-label": "pagination"}
+    .pagination
+      .pagination-prev{data: @prev.nil? ? nil : @data, "data-page": @prev, class: "#{'inactive' if @prev.nil?}"}
+        = I18n.t "components.pagination.previous"
+      .pagination-pages
+        - @series.each do |page|
+          - if page == :gap
+            .pagination-gap
+              …
+          - else
+            .pagination-page{data: @data, "data-page": page, class: "#{'active' if page.to_i == @page}"}
+              = page
+      .pagination-next{data: @next.nil? ? nil : @data, "data-page": @next, class: "#{'inactive' if @next.nil?}"}
+        = I18n.t "components.pagination.next"
+

app/components/pagination_component/pagination_component.scss

@@ -0,0 +1,69 @@
+nav {
+  .pagination {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    font-size: 14px;
+
+    .pagination-prev, .pagination-next {
+      cursor: pointer;
+
+      &:after, &:before {
+        font-size: 2em;
+        position: relative;
+        top: 3px;
+      }
+
+      &.inactive {
+        cursor: default;
+        color: $disabled-dark;
+      }
+    }
+
+    .pagination-prev {
+      margin-left: 10px;
+
+      &:before {
+        content: "‹";
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+
+    .pagination-next {
+      margin-right: 10px;
+
+      &:after {
+        content: "›";
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+
+
+    .pagination-pages {
+      display: flex;
+      align-items: flex-end;
+
+      .pagination-gap, .pagination-page {
+        padding: 0 0.5rem;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+
+      .pagination-gap {
+        color: $disabled-dark;
+      }
+
+      .pagination-page {
+        color: $color-4;
+        cursor: pointer;
+        &.active {
+          border-top: 3px solid $spree-blue;
+          color: $spree-blue;
+          cursor: default;
+        }
+      }
+    }
+  }
+}

app/components/product_component.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class ProductComponent < ViewComponentReflex::Component
+  DATETIME_FORMAT = '%F %T'
+
+  def initialize(product:, columns:)
+    super
+    @product = product
+    @image = @product.image if product.image.present?
+    @columns = columns.map do |c|
+      {
+        id: c[:value],
+        value: column_value(c[:value])
+      }
+    end
+  end
+
+  # This must be define when using ProductComponent.with_collection()
+  def collection_key
+    @product.id
+  end
+
+  # rubocop:disable Metrics/CyclomaticComplexity
+  def column_value(column)
+    case column
+    when 'name'
+      @product.name
+    when 'price'
+      @product.price
+    when 'unit'
+      "#{@product.variants.first.unit_value} #{@product.variant_unit}"
+    when 'producer'
+      @product.supplier.name
+    when 'category'
+      @product.taxons.map(&:name).join(', ')
+    when 'sku'
+      @product.sku
+    when 'on_hand'
+      @product.on_hand || 0
+    when 'on_demand'
+      @product.on_demand
+    when 'tax_category'
+      @product.tax_category.name
+    when 'inherits_properties'
+      @product.inherits_properties
+    when 'import_date'
+      format_date(@product.import_date)
+    end
+  end
+  # rubocop:enable Metrics/CyclomaticComplexity
+
+  private
+
+  def format_date(date)
+    date&.strftime(DATETIME_FORMAT) || ''
+  end
+end

app/components/product_component/product_component.html.haml

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

app/components/products_table_component.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+class ProductsTableComponent < ViewComponentReflex::Component
+  include Pagy::Backend
+
+  SORTABLE_COLUMNS = ['name', 'import_date'].freeze
+  SELECTABLE_COLUMNS = [
+    { label: I18n.t("admin.products_page.columns_selector.price"), value: "price" },
+    { label: I18n.t("admin.products_page.columns_selector.unit"), value: "unit" },
+    { label: I18n.t("admin.products_page.columns_selector.producer"), value: "producer" },
+    { label: I18n.t("admin.products_page.columns_selector.category"), value: "category" },
+    { label: I18n.t("admin.products_page.columns_selector.sku"), value: "sku" },
+    { label: I18n.t("admin.products_page.columns_selector.on_hand"), value: "on_hand" },
+    { label: I18n.t("admin.products_page.columns_selector.on_demand"), value: "on_demand" },
+    { label: I18n.t("admin.products_page.columns_selector.tax_category"), value: "tax_category" },
+    {
+      label: I18n.t("admin.products_page.columns_selector.inherits_properties"),
+      value: "inherits_properties"
+    },
+    { label: I18n.t("admin.products_page.columns_selector.import_date"), value: "import_date" }
+  ].sort do |a, b|
+    a[:label] <=> b[:label]
+  end.freeze
+
+  PER_PAGE_VALUE = [10, 25, 50, 100].freeze
+  PER_PAGE = PER_PAGE_VALUE.map { |value| { label: value, value: value } }
+  NAME_COLUMN = {
+    label: I18n.t("admin.products_page.columns.name"), value: "name", sortable: true
+  }.freeze
+
+  def initialize(user:)
+    super
+    @user = user
+    @selectable_columns = SELECTABLE_COLUMNS
+    @columns_selected = ['unit', 'price', 'on_hand', 'category', 'import_date']
+    @per_page = PER_PAGE
+    @per_page_selected = [10]
+    @categories = [{ label: "All", value: "all" }] +
+                  Spree::Taxon.order(:name)
+                    .map { |taxon| { label: taxon.name, value: taxon.id.to_s } }
+    @categories_selected = ["all"]
+    @producers = [{ label: "All", value: "all" }] +
+                 OpenFoodNetwork::Permissions.new(@user)
+                   .managed_product_enterprises.is_primary_producer.by_name
+                   .map { |producer| { label: producer.name, value: producer.id.to_s } }
+    @producers_selected = ["all"]
+    @page = 1
+    @sort = { column: "name", direction: "asc" }
+    @search_term = ""
+  end
+
+  # any change on a "reflex_data_attributes" (defined in the template) will trigger a re render
+  def before_render
+    fetch_products
+    refresh_columns
+  end
+
+  # Element refers to the component the data is set on
+  def search_term
+    # Element is SearchInputComponent
+    @search_term = element.dataset['value']
+  end
+
+  def toggle_column
+    # Element is SelectorComponent
+    column = element.dataset['value']
+    @columns_selected = if @columns_selected.include?(column)
+                          @columns_selected - [column]
+                        else
+                          @columns_selected + [column]
+                        end
+  end
+
+  def click_sort
+    # Element is TableHeaderComponent
+    @sort = {
+      column: element.dataset['sort-value'],
+      direction: element.dataset['sort-direction'] == "asc" ? "desc" : "asc"
+    }
+  end
+
+  def toggle_per_page
+    # Element is SelectorComponent
+    selected = element.dataset['value'].to_i
+    @per_page_selected = [selected] if PER_PAGE_VALUE.include?(selected)
+  end
+
+  def toggle_category
+    # Element is SelectorWithFilterComponent
+    category_clicked = element.dataset['value']
+    @categories_selected = toggle_selector_with_filter(category_clicked, @categories_selected)
+  end
+
+  def toggle_producer
+    # Element is SelectorWithFilterComponent
+    producer_clicked = element.dataset['value']
+    @producers_selected = toggle_selector_with_filter(producer_clicked, @producers_selected)
+  end
+
+  def change_page
+    # Element is PaginationComponent
+    page = element.dataset['page'].to_i
+    @page = page if page > 0
+  end
+
+  private
+
+  def refresh_columns
+    @columns = @columns_selected.map do |column|
+      {
+        label: I18n.t("admin.products_page.columns.#{column}"),
+        value: column,
+        sortable: SORTABLE_COLUMNS.include?(column)
+      }
+    end.sort! { |a, b| a[:label] <=> b[:label] }
+    @columns.unshift(NAME_COLUMN)
+  end
+
+  def toggle_selector_with_filter(clicked, selected)
+    selected = if selected.include?(clicked)
+                 selected - [clicked]
+               else
+                 selected + [clicked]
+               end
+
+    if clicked == "all" || selected.empty?
+      selected = ["all"]
+    elsif selected.include?("all") && selected.length > 1
+      selected -= ["all"]
+    end
+    selected
+  end
+
+  def fetch_products
+    product_query = OpenFoodNetwork::Permissions.new(@user).editable_products.merge(product_scope)
+    @products = product_query.ransack(ransack_query).result
+    @pagy, @products = pagy(@products, items: @per_page_selected.first, page: @page)
+  end
+
+  def product_scope
+    scope = if @user.has_spree_role?("admin") || @user.enterprises.present?
+              Spree::Product
+            else
+              Spree::Product.active
+            end
+
+    scope.includes(product_query_includes)
+  end
+
+  def ransack_query
+    query = { s: "#{@sort[:column]} #{@sort[:direction]}" }
+
+    query = if @producers_selected.include?("all")
+              query.merge({ supplier_id_eq: "" })
+            else
+              query.merge({ supplier_id_in: @producers_selected })
+            end
+
+    query = query.merge({ name_cont: @search_term }) if @search_term.present?
+
+    if @categories_selected.include?("all")
+      query.merge({ primary_taxon_id_eq: "" })
+    else
+      query.merge({ primary_taxon_id_in: @categories_selected })
+    end
+  end
+
+  def product_query_includes
+    [
+      :image,
+      variants: [
+        :default_price,
+        :stock_locations,
+        :stock_items,
+        :variant_overrides
+      ]
+    ]
+  end
+end

app/components/products_table_component/products_table_component.html.haml

@@ -0,0 +1,21 @@
+= component_controller(class: "products-table") do
+  .products-table-form
+    .products-table-form_filter_results
+      = render(SearchInputComponent.new(value: @search_term, data: reflex_data_attributes(:search_term)))
+    .products-table-form_categories_selector
+      = render(SelectorWithFilterComponent.new(title: t("admin.products_page.filters.categories.title"), selected: @categories_selected, items: @categories, data: reflex_data_attributes(:toggle_category), selected_items_i18n_key: "admin.products_page.filters.categories.selected_categories"))
+    .products-table-form_producers_selector
+      = render(SelectorWithFilterComponent.new(title: t("admin.products_page.filters.producers.title"), selected: @producers_selected, items: @producers, data: reflex_data_attributes(:toggle_producer), selected_items_i18n_key: "admin.products_page.filters.producers.selected_producers"))
+    .products-table-form_per-page_selector
+      = render(SelectorComponent.new(title: t('admin.products_page.filters.per_page', count: @per_page_selected[0]), selected: @per_page_selected, items: @per_page, data: reflex_data_attributes(:toggle_per_page)))
+    .products-table-form_columns_selector
+      = render(SelectorComponent.new(title: t("admin.products_page.filters.columns"), selected: @columns_selected, items: @selectable_columns, data: reflex_data_attributes(:toggle_column)))
+
+  .products-table_table
+    %table
+      = render(TableHeaderComponent.new(columns: @columns, sort: @sort, data: reflex_data_attributes(:click_sort)))
+      %tbody
+        = render(ProductComponent.with_collection(@products, columns: @columns))
+
+  .products-table-form_pagination
+    = render(PaginationComponent.new(pagy: @pagy, data: reflex_data_attributes(:change_page)))

app/components/products_table_component/products_table_component.scss

@@ -0,0 +1,47 @@
+.products-table {
+  .products-table-form {
+    display: grid;
+    grid-template-columns: repeat( auto-fit, minmax(250px, 1fr) );
+    grid-gap: 10px;
+    margin-bottom: 10px;
+  }
+
+  .products-table_table {
+    box-shadow: 0 10px 10px -1px rgb(0 0 0 / 10%);
+  }
+
+  .products-table-form_pagination {
+    position: relative;
+    top: -15px;
+
+    nav, .pagination {
+      margin-top: 0;
+      padding-top: 0;
+    }
+  }
+}
+
+.products-table.loading {
+  .products-table-form_pagination, .products-table_table {
+    position: relative;
+
+    &:before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(255, 255, 255, 0.5);
+    }
+  }
+
+  .products-table_table {
+    &:before {
+      background-position: center;
+      background-repeat: no-repeat;
+      background-size: 50px 50px;
+      background-image: url("../images/spinning-circles.svg");
+    }
+  }
+}

app/components/search_input_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SearchInputComponent < ViewComponentReflex::Component
+  def initialize(value: nil, data: {})
+    super
+    @value = value
+    @data = data
+  end
+end

app/components/search_input_component/search_input_component.html.haml

@@ -0,0 +1,5 @@
+= component_controller do
+  %div.search-input
+    %input{type: 'text', placeholder: t("components.search_input.placeholder"), id: 'search_query', data: {action: 'debounced:input->search-input#search'}, value: @value}
+    .search-button{data: @data}
+      %i.fa.fa-search

app/components/search_input_component/search_input_component.scss

@@ -0,0 +1,23 @@
+.search-input {
+  border: 1px solid $disabled-light;
+  height: 3em;
+  display: flex;
+  line-height: 3em;
+  align-items: center;
+
+  input {
+    border: none;
+    height: 3em;
+    width: 100%;
+    box-sizing: border-box;
+    padding-right: 5px;
+  }
+
+  .search-button {
+    padding-right: 10px;
+    padding-left: 5px;
+    cursor: pointer;
+    color: $color-4;
+  }
+
+}

app/components/selector_component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class SelectorComponent < ViewComponentReflex::Component
+  def initialize(title:, selected:, items:, data: {})
+    super
+    @title = title
+    @items = items.map do |item|
+      {
+        label: item[:label],
+        value: item[:value],
+        selected: selected.include?(item[:value])
+      }
+    end
+    @selected = selected
+    @data = data
+  end
+end

app/components/selector_component/selector_component.html.haml

@@ -0,0 +1,11 @@
+= component_controller do
+  .selector.selector-close
+    .selector-main{ data: { action: "click->selector#toggle" } }
+      .selector-main-title 
+        = @title
+      .selector-arrow
+    .selector-wrapper
+      .selector-items
+        - @items.each do |item|
+          .selector-item{ class: ("selected" if item[:selected]), data: @data, "data-value": item[:value] }
+            = item[:label]

app/components/selector_component/selector_component.scss

@@ -0,0 +1,86 @@
+.selector {
+  position: relative;
+
+  .selector-main {
+    border: 1px solid $disabled-light;
+    height: 3em;
+    position: relative;
+    cursor: pointer;
+
+    .selector-main-title {
+      line-height: 3em;
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+    
+    .selector-arrow {
+      position: absolute;
+      right: 0px;
+      height: 3em;
+      width: 1.5em;
+      top: -1px;
+
+      &:after {
+        content: "";
+        position: absolute;
+        top: 50%;
+        right: 5px;
+        margin-top: -5px;
+        width: 0;
+        height: 0;
+        border-left: 5px solid transparent;
+        border-right: 5px solid transparent;
+        border-top: 5px solid $disabled-light;
+      }
+    }
+  }
+
+  .selector-wrapper {
+    position: absolute;
+    left: 0px;
+    right: 0px;
+    z-index: 1;
+    background-color: white;
+    margin-top: -1px;
+    border: 1px solid $disabled-light;
+
+    .selector-items {
+      overflow-y: auto;
+      min-height: 6em;
+  
+      .selector-item {
+        padding-left: 10px;
+        padding-right: 10px;
+        border-bottom: 1px solid $disabled-light;
+        position: relative;
+        height: 3em;
+        line-height: 3em;
+
+        &:hover {
+          background-color: #eee;
+          cursor: pointer;
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        &.selected {
+          &:after {
+            content: "✓";
+            display: inline-block;
+            position: absolute;
+            right: 10px;
+          }
+        }
+      }
+    }
+  }
+  
+
+  &.selector-close {
+    .selector-wrapper {
+      display: none;
+    }
+  }
+}

app/components/selector_with_filter_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SelectorWithFilterComponent < SelectorComponent
+  def initialize(title:, selected:, items:, data: {},
+                 selected_items_i18n_key: 'components.selector_with_filter.selected_items')
+    super(title: title, selected: selected, items: items, data: data)
+    @selected_items = items.select { |item| @selected.include?(item[:value]) }
+    @selected_items_i18n_key = selected_items_i18n_key
+    @items = items
+  end
+end

app/components/selector_with_filter_component/selector_with_filter_component.html.haml

@@ -0,0 +1,22 @@
+= component_controller do
+  .super-selector.selector.selector-close
+    .selector-main{ data: { action: "click->selector-with-filter#toggle" } }
+      .super-selector-label
+        = @title
+      .super-selector-selected-items
+        - case @selected_items.length
+        - when 1, 2
+          - @selected_items.each do |item|
+            .super-selector-selected-item
+              = item[:label]
+        - else
+          .super-selector-selected-item
+            = t(@selected_items_i18n_key, count: @selected_items.length)
+      .selector-arrow
+    .selector-wrapper
+      .super-selector-search
+        %input{type: "text", placeholder: t("components.selector_with_filter.search_placeholder"), data: { action: "debounced:input->selector-with-filter#filter" } }
+      .selector-items
+        - @items.each do |item|
+          .selector-item{ class: ("selected" if item[:selected]), data: @data.merge({ "selector-with-filter-target": "items" }), "data-value": item[:value] }
+            = item[:label]

app/components/selector_with_filter_component/selector_with_filter_component.scss

@@ -0,0 +1,51 @@
+
+.super-selector {
+  position: relative;
+
+  .selector-main {
+    .super-selector-label {
+      padding-left: 5px;
+      padding-right: 5px;
+      margin-left: 10px;
+      position: absolute;
+      top: -1em;
+      background-color: white;
+    }
+  }
+
+  .super-selector-selected-items {
+    margin-left: 5px;
+    margin-right: 2em;
+    margin-top: 7px;
+    display: flex;
+
+    .super-selector-selected-item {
+      border: 1px solid $pale-blue;
+      background-color: $spree-light-blue;
+      border-radius: 20px;
+      height: 2em;
+      padding-left: 10px;
+      padding-right: 10px;
+      display: inline-block;
+      margin-right: 5px;
+      padding-top: 2px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+
+  .selector-wrapper {
+    .super-selector-search {
+      border-bottom: 1px solid $disabled-light;
+      padding: 10px 5px;
+
+      input {
+        border: 1px solid $disabled-light;
+        box-sizing: border-box;
+        border-radius: 4px;
+        width: 100%;
+      }
+    }
+  }
+}

app/components/table_header_component.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class TableHeaderComponent < ViewComponentReflex::Component
+  def initialize(columns:, sort:, data: {})
+    super
+    @columns = columns
+    @sort = sort
+    @data = data
+  end
+end

app/components/table_header_component/table_header_component.html.haml

@@ -0,0 +1,7 @@
+
+= component_controller do
+  %thead.table-header
+    %tr
+      - @columns.each do |column|
+        %th{class: (column[:sortable] ? "th-sortable " : "" ) + (@sort[:column] == column[:value] ? " th-sorted-#{@sort[:direction]}" : ""), data: (@data if column[:sortable] == true), "data-sort-value": column[:value], "data-sort-direction": @sort[:direction]}
+          = column[:label]

app/components/table_header_component/table_header_component.scss

@@ -0,0 +1,23 @@
+thead.table-header {
+  th {
+    &.th-sortable {
+      cursor: pointer;
+    }
+    &.th-sorted-asc, &.th-sorted-desc {
+      &:after {
+        display: inline-block;
+        padding-left: 10px;
+      } 
+    }
+    &.th-sorted-asc {
+      &:after {
+        content: "⇧";
+      }
+    }
+    &.th-sorted-desc {
+      &:after {
+        content: "⇩";
+      }
+    }
+  }
+}

app/components/vertical_ellipsis_menu/component.html.haml

@@ -1,4 +0,0 @@
-.vertical-ellipsis-menu{ "data-controller": "vertical-ellipsis-menu--component" }
-  %i.fa.fa-ellipsis-v{ "data-action": "click->vertical-ellipsis-menu--component#toggle" }
-  .vertical-ellipsis-menu-content{ "data-vertical-ellipsis-menu--component-target": "content" }
-    = content

app/components/vertical_ellipsis_menu/component.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module VerticalEllipsisMenu
-  class Component < ViewComponent::Base
-  end
-end

app/components/vertical_ellipsis_menu/component.scss

@@ -1,59 +0,0 @@
-.vertical-ellipsis-menu {
-  position: relative;
-
-  i.fa-ellipsis-v {
-    cursor: pointer;
-    display: block;
-    text-align: center;
-    border-radius: 3px;
-    background-color: white;
-    padding: 10px 14px;
-  }
-
-  .vertical-ellipsis-menu-content {
-    position: absolute;
-    top: 0;
-    right: 0;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    background-color: white;
-    box-shadow: $box-shadow;
-    border-radius: 3px;
-    min-width: 80px;
-    display: none;
-    z-index: 100;
-
-    &.show {
-      display: block;
-    }
-
-    & > a {
-      display: block;
-      padding: 5px 10px;
-      cursor: pointer;
-      text-align: left;
-      border-left: 3px solid white;
-      color: $near-black;
-      text-decoration: none;
-      border-bottom: none;
-
-      &:hover {
-        background-color: $light-grey;
-        border-left: 3px solid $spree-blue;
-      }
-
-      &.delete {
-        color: $red;
-
-        &:hover {
-          border-left: 3px solid $red;
-          background-color: $fair-pink;
-        }
-      }
-    }
-  }
-}
-
-table.products td .vertical-ellipsis-menu {
-  float: right;
-}

app/components/vertical_ellipsis_menu/component_controller.js

@@ -1,25 +0,0 @@
-import { Controller } from "stimulus";
-
-export default class extends Controller {
-  static targets = ["content"];
-
-  connect() {
-    super.connect();
-    window.addEventListener("click", this.#hideIfClickedOutside);
-  }
-
-  toggle() {
-    this.contentTarget.classList.toggle("show");
-  }
-
-  #hideIfClickedOutside = (event) => {
-    if (this.element.contains(event.target)) {
-      return;
-    }
-    this.#hide();
-  };
-
-  #hide() {
-    this.contentTarget.classList.remove("show");
-  }
-}

app/controllers/admin/customers_controller.rb

@@ -11,7 +11,7 @@ module Admin
     respond_override update: { json: {
       success: lambda {
         tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
-        render_as_json @customer, tag_rule_mapping:
+        render_as_json @customer, tag_rule_mapping: tag_rule_mapping
       },
       failure: lambda {
                  render json: { errors: @customer.errors.full_messages },
@@ -25,7 +25,7 @@ module Admin
         format.json do
           render json: @collection,
                  each_serializer: ::Api::Admin::CustomerWithBalanceSerializer,
-                 tag_rule_mapping:,
+                 tag_rule_mapping: tag_rule_mapping,
                  customer_tags: customer_tags_by_id
         end
       end
@@ -42,7 +42,7 @@ module Admin
         @customer.created_manually = true
         if @customer.save
           tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
-          render_as_json @customer, tag_rule_mapping:
+          render_as_json @customer, tag_rule_mapping: tag_rule_mapping
         else
           render json: { errors: @customer.errors.full_messages }, status: :bad_request
         end

app/controllers/admin/enterprise_fees_controller.rb

@@ -38,8 +38,7 @@ module Admin
       @enterprise_fee_set = EnterpriseFeesBulkUpdate.new(params)
 
       if @enterprise_fee_set.save
-        flash[:success] = I18n.t(:enterprise_fees_update_notice)
-        redirect_to redirect_path
+        redirect_to redirect_path, notice: I18n.t(:enterprise_fees_update_notice)
       else
         redirect_to redirect_path,
                     flash: { error: @enterprise_fee_set.errors.full_messages.to_sentence }
@@ -49,7 +48,7 @@ module Admin
     private
 
     def load_enterprise_fee_set
-      @enterprise_fee_set = Sets::EnterpriseFeeSet.new collection:
+      @enterprise_fee_set = Sets::EnterpriseFeeSet.new collection: collection
     end
 
     def load_data
@@ -62,7 +61,7 @@ module Admin
       when :for_order_cycle
         order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id]
         coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id]
-        order_cycle ||= OrderCycle.new(coordinator:) if coordinator.present?
+        order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user,
                                                                  order_cycle).visible_enterprises
         EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')

app/controllers/admin/enterprise_groups_controller.rb

@@ -39,7 +39,7 @@ module Admin
     # The ! version is important to raise a RecordNotFound error.
     def find_resource
       permalink = params[:id] || params[:enterprise_group_id]
-      EnterpriseGroup.find_by!(permalink:)
+      EnterpriseGroup.find_by!(permalink: permalink)
     end
 
     private

app/controllers/admin/enterprise_roles_controller.rb

@@ -3,8 +3,9 @@
 module Admin
   class EnterpriseRolesController < Admin::ResourceController
     def index
-      @enterprise_roles, @users, @all_enterprises = Admin::EnterpriseRolesQuery.query
-      @my_enterprises = @all_enterprises
+      @enterprise_roles = EnterpriseRole.by_user_email
+      @users = Spree::User.order('spree_users.email')
+      @my_enterprises = @all_enterprises = Enterprise.by_name
     end
 
     def create

app/controllers/admin/enterprises_controller.rb

@@ -38,7 +38,7 @@ module Admin
         format.html
         format.json {
           render_as_json @collection, ams_prefix: params[:ams_prefix],
-                                      spree_current_user:
+                                      spree_current_user: spree_current_user
         }
       end
     end
@@ -47,12 +47,12 @@ module Admin
       @object = Enterprise.where(permalink: params[:id]).
         includes(users: [:ship_address, :bill_address]).first
       @object.build_custom_tab if @object.custom_tab.nil?
-      return unless params[:stimulus]
-
-      @enterprise.is_primary_producer = params[:is_primary_producer]
-      @enterprise.sells = params[:enterprise_sells]
-      render cable_ready: cable_car.morph("#side_menu", partial("admin/shared/side_menu"))
-        .morph("#permalink", partial("admin/enterprises/form/permalink"))
+      if params[:stimulus]
+        @enterprise.is_primary_producer = params[:is_primary_producer]
+        @enterprise.sells = params[:enterprise_sells]
+        render cable_ready: cable_car.morph("#side_menu", partial("admin/shared/side_menu"))
+          .morph("#permalink", partial("admin/enterprises/form/permalink"))
+      end
     end
 
     def welcome
@@ -63,7 +63,6 @@ module Admin
       tag_rules_attributes = params[object_name].delete :tag_rules_attributes
       update_tag_rules(tag_rules_attributes) if tag_rules_attributes.present?
       update_enterprise_notifications
-      update_vouchers
 
       delete_custom_tab if params[:custom_tab] == 'false'
 
@@ -73,7 +72,7 @@ module Admin
           format.html { redirect_to location_after_save }
           format.js   { render layout: false }
           format.json {
-            render_as_json @object, ams_prefix: 'index', spree_current_user:
+            render_as_json @object, ams_prefix: 'index', spree_current_user: spree_current_user
           }
         end
       else
@@ -126,7 +125,7 @@ module Admin
             json: @collection,
             each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer,
             order_cycle: @order_cycle,
-            spree_current_user:
+            spree_current_user: spree_current_user
           )
         end
       end
@@ -136,7 +135,7 @@ module Admin
       respond_to do |format|
         format.json do
           render_as_json @collection, ams_prefix: params[:ams_prefix] || 'basic',
-                                      spree_current_user:
+                                      spree_current_user: spree_current_user
         end
       end
     end
@@ -183,7 +182,7 @@ module Admin
       when :for_order_cycle
         @order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id]
         coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id]
-        @order_cycle ||= OrderCycle.new(coordinator:) if coordinator.present?
+        @order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
 
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle)
           .visible_enterprises
@@ -264,44 +263,32 @@ module Admin
     def update_enterprise_notifications
       user_id = params[:receives_notifications].to_i
 
-      return unless user_id.positive? && @enterprise.user_ids.include?(user_id)
-
-      @enterprise.update_contact(user_id)
-    end
-
-    def update_vouchers
-      params_voucher_ids = params[:enterprise][:voucher_ids].to_a.map(&:to_i)
-      voucher_ids = @enterprise.vouchers.map(&:id)
-      deleted_voucher_ids = @enterprise.vouchers.only_deleted.map(&:id)
-
-      vouchers_to_destroy = voucher_ids - params_voucher_ids
-      Voucher.where(id: vouchers_to_destroy).destroy_all if vouchers_to_destroy.present?
-
-      vouchers_to_restore = deleted_voucher_ids.intersection(params_voucher_ids)
-      Voucher.restore(vouchers_to_restore) if vouchers_to_restore.present?
+      if user_id.positive? && @enterprise.user_ids.include?(user_id)
+        @enterprise.update_contact(user_id)
+      end
     end
 
     def create_calculator_for(rule, attrs)
-      return unless attrs[:calculator_type].present? && attrs[:calculator_attributes].present?
-
-      rule.update(calculator_type: attrs[:calculator_type])
-      attrs[:calculator_attributes].merge!( id: rule.calculator.id )
+      if attrs[:calculator_type].present? && attrs[:calculator_attributes].present?
+        rule.update(calculator_type: attrs[:calculator_type])
+        attrs[:calculator_attributes].merge!( id: rule.calculator.id )
+      end
     end
 
     def check_can_change_bulk_sells
-      return if spree_current_user.admin?
-
-      params[:sets_enterprise_set][:collection_attributes].each do |_i, enterprise_params|
-        unless spree_current_user == Enterprise.find_by(id: enterprise_params[:id]).owner
-          enterprise_params.delete :sells
+      unless spree_current_user.admin?
+        params[:sets_enterprise_set][:collection_attributes].each do |_i, enterprise_params|
+          unless spree_current_user == Enterprise.find_by(id: enterprise_params[:id]).owner
+            enterprise_params.delete :sells
+          end
         end
       end
     end
 
     def check_can_change_sells
-      return if spree_current_user.admin? || spree_current_user == @enterprise.owner
-
-      enterprise_params.delete :sells
+      unless spree_current_user.admin? || spree_current_user == @enterprise.owner
+        enterprise_params.delete :sells
+      end
     end
 
     def override_owner
@@ -309,31 +296,31 @@ module Admin
     end
 
     def override_sells
-      return if spree_current_user.admin?
-
-      has_hub = spree_current_user.owned_enterprises.is_hub.any?
-      new_enterprise_is_producer = Enterprise.new(enterprise_params).is_primary_producer
-      enterprise_params[:sells] = has_hub && !new_enterprise_is_producer ? 'any' : 'none'
+      unless spree_current_user.admin?
+        has_hub = spree_current_user.owned_enterprises.is_hub.any?
+        new_enterprise_is_producer = Enterprise.new(enterprise_params).is_primary_producer
+        enterprise_params[:sells] = has_hub && !new_enterprise_is_producer ? 'any' : 'none'
+      end
     end
 
     def check_can_change_owner
-      return if ( spree_current_user == @enterprise.owner ) || spree_current_user.admin?
-
-      enterprise_params.delete :owner_id
-    end
-
-    def check_can_change_bulk_owner
-      return if spree_current_user.admin?
-
-      bulk_params[:collection_attributes].each do |_i, enterprise_params|
+      unless ( spree_current_user == @enterprise.owner ) || spree_current_user.admin?
         enterprise_params.delete :owner_id
       end
     end
 
-    def check_can_change_managers
-      return if ( spree_current_user == @enterprise.owner ) || spree_current_user.admin?
+    def check_can_change_bulk_owner
+      unless spree_current_user.admin?
+        bulk_params[:collection_attributes].each do |_i, enterprise_params|
+          enterprise_params.delete :owner_id
+        end
+      end
+    end
 
-      enterprise_params.delete :user_ids
+    def check_can_change_managers
+      unless ( spree_current_user == @enterprise.owner ) || spree_current_user.admin?
+        enterprise_params.delete :user_ids
+      end
     end
 
     def strip_new_properties

app/controllers/admin/order_cycles_controller.rb

@@ -48,7 +48,7 @@ module Admin
       @order_cycle_form = OrderCycleForm.new(@order_cycle, order_cycle_params, spree_current_user)
 
       if @order_cycle_form.save
-        flash[:success] = t('.success')
+        flash[:notice] = I18n.t(:order_cycles_create_notice)
         render json: { success: true,
                        edit_path: main_app.admin_order_cycle_incoming_path(@order_cycle) }
       else
@@ -66,7 +66,7 @@ module Admin
       if @order_cycle_form.save
         update_nil_subscription_line_items_price_estimate(@order_cycle)
         respond_to do |format|
-          flash[:success] = t('.success') if params[:reloading] == '1'
+          flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
           format.html { redirect_to_after_update_path }
           format.json { render json: { success: true } }
         end
@@ -118,7 +118,7 @@ module Admin
       @order_cycle = OrderCycle.find params[:id]
       @order_cycle.clone!
       redirect_to main_app.admin_order_cycles_path,
-                  flash: { success: t('.success', name: @order_cycle.name) }
+                  notice: I18n.t(:order_cycles_clone_notice, name: @order_cycle.name)
     end
 
     # Send notifications to all producers who are part of the order cycle
@@ -126,7 +126,7 @@ module Admin
       OrderCycleNotificationJob.perform_later params[:id].to_i
 
       redirect_to main_app.admin_order_cycles_path,
-                  flash: { success: t('.success') }
+                  notice: I18n.t(:order_cycles_email_to_producers_notice)
     end
 
     protected
@@ -182,17 +182,17 @@ module Admin
     end
 
     def load_data_for_index
-      return unless json_request?
-
-      # Split ransack params into all those that currently exist and new ones
-      #   to limit returned ocs to recent or undated
-      orders_close_at_gt = raw_params[:q]&.delete(:orders_close_at_gt) || 31.days.ago
-      raw_params[:q] = {
-        g: [raw_params.delete(:q) || {}, { m: 'or',
-                                           orders_close_at_gt:,
-                                           orders_close_at_null: true }]
-      }
-      @collection = collection
+      if json_request?
+        # Split ransack params into all those that currently exist and new ones
+        #   to limit returned ocs to recent or undated
+        orders_close_at_gt = raw_params[:q]&.delete(:orders_close_at_gt) || 31.days.ago
+        raw_params[:q] = {
+          g: [raw_params.delete(:q) || {}, { m: 'or',
+                                             orders_close_at_gt: orders_close_at_gt,
+                                             orders_close_at_null: true }]
+        }
+        @collection = collection
+      end
     end
 
     def redirect_to_after_update_path
@@ -245,10 +245,10 @@ module Admin
 
       order_cycle_params.delete :coordinator_id
 
-      return if Enterprise.managed_by(spree_current_user).include?(@order_cycle.coordinator)
-
-      order_cycle_params.delete_if do |k, _v|
-        [:name, :orders_open_at, :orders_close_at].include? k.to_sym
+      unless Enterprise.managed_by(spree_current_user).include?(@order_cycle.coordinator)
+        order_cycle_params.delete_if do |k, _v|
+          [:name, :orders_open_at, :orders_close_at].include? k.to_sym
+        end
       end
     end
 

app/controllers/admin/product_import_controller.rb

@@ -56,9 +56,9 @@ module Admin
     private
 
     def validate_upload_presence
-      return if params[:file] || (params[:filepath] && File.exist?(params[:filepath]))
-
-      redirect_to '/admin/product_import', notice: I18n.t(:product_import_file_not_found_notice)
+      unless params[:file] || (params[:filepath] && File.exist?(params[:filepath]))
+        redirect_to '/admin/product_import', notice: I18n.t(:product_import_file_not_found_notice)
+      end
     end
 
     def process_data(method)
@@ -90,11 +90,11 @@ module Admin
     end
 
     def check_spreadsheet_has_data(importer)
-      return if importer.item_count
-
-      redirect_to '/admin/product_import',
-                  notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
-      true
+      unless importer.item_count
+        redirect_to '/admin/product_import',
+                    notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
+        true
+      end
     end
 
     def save_uploaded_file(upload)

app/controllers/admin/products_controller.rb

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

app/controllers/admin/proxy_orders_controller.rb

@@ -13,7 +13,7 @@ module Admin
       if @proxy_order.cancel
         render_as_json @proxy_order
       else
-        render json: { errors: [t('.could_not_cancel_the_order')] },
+        render json: { errors: [t('admin.proxy_orders.cancel.could_not_cancel_the_order')] },
                status: :unprocessable_entity
       end
     end
@@ -22,7 +22,7 @@ module Admin
       if @proxy_order.resume
         render_as_json @proxy_order
       else
-        render json: { errors: [t('.could_not_resume_the_order')] },
+        render json: { errors: [t('admin.proxy_orders.resume.could_not_resume_the_order')] },
                status: :unprocessable_entity
       end
     end

app/controllers/admin/reports_controller.rb

@@ -26,8 +26,6 @@ module Admin
         .enabled?(:background_reports, spree_current_user)
 
       if @background_reports && request.post?
-        rendering_options # stores user preferences
-
         return background(report_format)
       end
 
@@ -57,15 +55,6 @@ module Admin
       @report_title = report_title
       @rendering_options = rendering_options
       @data = Reporting::FrontendData.new(spree_current_user)
-
-      variant_id_in = params[:variant_id_in]&.compact_blank
-      load_selected_variant if variant_id_in.present?
-    end
-
-    # Orders and Fulfillment Reports include a per product filter, load any selected product
-    def load_selected_variant
-      variant = Spree::Variant.find(params[:variant_id_in][0])
-      @variant_serialized = Api::Admin::VariantSerializer.new(variant)
     end
 
     def render_data?
@@ -82,10 +71,11 @@ module Admin
           block: "start"
         ).broadcast
 
+      blob = ReportBlob.create_for_upload_later!(report_filename)
+
       ReportJob.perform_later(
-        report_class:, user: spree_current_user, params:,
-        format:, filename: report_filename,
-        channel: ScopedChannel.for_id(params[:uuid]),
+        report_class: report_class, user: spree_current_user, params: params,
+        format: format, blob: blob, channel: ScopedChannel.for_id(params[:uuid]),
       )
 
       head :no_content

app/controllers/admin/resource_controller.rb

@@ -24,6 +24,18 @@ module Admin
       end
     end
 
+    def update
+      if @object.update(permitted_resource_params)
+        flash[:success] = flash_message_for(@object, :successfully_updated)
+        respond_with(@object) do |format|
+          format.html { redirect_to location_after_save }
+          format.js   { render layout: false }
+        end
+      else
+        respond_with(@object)
+      end
+    end
+
     def create
       @object.attributes = permitted_resource_params
       if @object.save
@@ -37,21 +49,9 @@ module Admin
       end
     end
 
-    def update
-      if @object.update(permitted_resource_params)
-        flash[:success] = flash_message_for(@object, :successfully_updated)
-        respond_with(@object) do |format|
-          format.html { redirect_to location_after_save }
-          format.js   { render layout: false }
-        end
-      else
-        respond_with(@object)
-      end
-    end
-
     def update_positions
       params[:positions].each do |id, index|
-        model_class.where(id:).update_all(position: index)
+        model_class.where(id: id).update_all(position: index)
       end
 
       respond_to do |format|

app/controllers/admin/schedules_controller.rb

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
 require 'open_food_network/permissions'
+require 'order_management/subscriptions/proxy_order_syncer'
 
 module Admin
   class SchedulesController < Admin::ResourceController
     include PaperTrailLogging
 
     before_action :adapt_params, only: [:update]
+    before_action :editable_order_cycle_ids_for_create, only: [:create]
+    before_action :editable_order_cycle_ids_for_update, only: [:update]
     before_action :check_dependent_subscriptions, only: [:destroy]
 
     after_action :sync_subscriptions_for_update, only: :update
 
     respond_to :json
 
-    OVERRIDE_RESPONSE = { json: {
+    respond_override create: { json: {
       success: lambda {
                  render_as_json @schedule,
                                 editable_schedule_ids: permissions.editable_schedules.pluck(:id)
@@ -22,10 +25,17 @@ module Admin
                  render json: { errors: @schedule.errors.full_messages },
                         status: :unprocessable_entity
                }
-    } }.freeze
-
-    respond_override create: OVERRIDE_RESPONSE
-    respond_override update: OVERRIDE_RESPONSE
+    } }
+    respond_override update: { json: {
+      success: lambda {
+                 render_as_json @schedule,
+                                editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+               },
+      failure: lambda {
+                 render json: { errors: @schedule.errors.full_messages },
+                        status: :unprocessable_entity
+               }
+    } }
 
     def index
       respond_to do |format|
@@ -40,23 +50,22 @@ module Admin
     end
 
     def create
-      @schedule_form = ScheduleForm.new(params, spree_current_user, @schedule)
+      return respond_with(@schedule) if params[:order_cycle_ids].blank?
+
+      @schedule.attributes = permitted_resource_params
+
+      if @schedule.save
+        @schedule.order_cycle_ids = params[:order_cycle_ids]
+        @schedule.save!
 
-      if @schedule_form.save
-        flash[:success] = flash_message_for(@schedule, :successfully_created)
-        @existing_order_cycle_ids = []
         sync_subscriptions_for_create
+
+        flash[:success] = flash_message_for(@schedule, :successfully_created)
       end
 
       respond_with(@schedule)
     end
 
-    def update
-      @existing_order_cycle_ids = @schedule.order_cycle_ids
-      @object = ScheduleForm.new(params, spree_current_user, @schedule)
-      super
-    end
-
     private
 
     def collection
@@ -87,6 +96,37 @@ module Admin
       params[:schedule][:order_cycle_ids] = params[:order_cycle_ids]
     end
 
+    def editable_order_cycle_ids_for_create
+      return unless params[:order_cycle_ids]
+
+      @existing_order_cycle_ids = []
+      result = editable_order_cycles(params[:order_cycle_ids])
+
+      params[:order_cycle_ids] = result
+    end
+
+    def editable_order_cycle_ids_for_update
+      return unless params[:schedule][:order_cycle_ids]
+
+      @existing_order_cycle_ids = @schedule.order_cycle_ids
+      result = editable_order_cycles(params[:schedule][:order_cycle_ids])
+
+      params[:schedule][:order_cycle_ids] = result
+      @schedule.order_cycle_ids = result
+    end
+
+    def editable_order_cycles(requested)
+      permitted = OrderCycle
+        .where(id: params[:order_cycle_ids] | @existing_order_cycle_ids)
+        .merge(OrderCycle.managed_by(spree_current_user))
+        .pluck(:id)
+      result = @existing_order_cycle_ids
+      result |= (requested & permitted) # add any requested & permitted ids
+      # remove any existing and permitted ids that were not specifically requested
+      result -= ((result & permitted) - requested)
+      result
+    end
+
     def check_dependent_subscriptions
       return if Subscription.where(schedule_id: @schedule).empty?
 
@@ -100,14 +140,14 @@ module Admin
       @permissions = OpenFoodNetwork::Permissions.new(spree_current_user)
     end
 
-    def sync_subscriptions_for_create
-      return unless params[:order_cycle_ids]
+    def sync_subscriptions_for_update
+      return unless params[:schedule][:order_cycle_ids] && @object.errors.blank?
 
       sync_subscriptions
     end
 
-    def sync_subscriptions_for_update
-      return unless params[:schedule][:order_cycle_ids] && @schedule.errors.blank?
+    def sync_subscriptions_for_create
+      return unless params[:order_cycle_ids]
 
       sync_subscriptions
     end
@@ -115,7 +155,6 @@ module Admin
     def sync_subscriptions
       removed_ids = @existing_order_cycle_ids - @schedule.order_cycle_ids
       new_ids = @schedule.order_cycle_ids - @existing_order_cycle_ids
-
       return unless removed_ids.any? || new_ids.any?
 
       subscriptions = Subscription.where(schedule_id: @schedule)

app/controllers/admin/stripe_connect_settings_controller.rb

@@ -21,7 +21,7 @@ module Admin
     def update
       Spree::Config.set(settings_params.to_h)
       resource = t('admin.controllers.stripe_connect_settings.resource')
-      flash[:success] = t(:successfully_updated, resource:)
+      flash[:success] = t(:successfully_updated, resource: resource)
       redirect_to_edit
     end
 

app/controllers/admin/vouchers_controller.rb

@@ -9,33 +9,19 @@ module Admin
     end
 
     def create
-      @voucher = Voucher.new(
-        permitted_resource_params.merge(enterprise: @enterprise)
-      )
+      @voucher = Voucher.create(permitted_resource_params.merge(enterprise: @enterprise))
 
       if @voucher.save
-        flash[:success] = I18n.t(:successfully_created, resource: "Voucher")
+        flash[:success] = flash_message_for(@voucher, :successfully_created)
         redirect_to edit_admin_enterprise_path(@enterprise, anchor: :vouchers_panel)
       else
-        render_error
+        flash[:error] = @voucher.errors.full_messages.to_sentence
+        render :new
       end
-    rescue ActiveRecord::SubclassNotFound
-      @voucher.errors.add(:type)
-      render_error
-    rescue ActiveRecord::RecordNotUnique
-      # Rails unique validation doesn't work with soft deleted object, so we rescue the database
-      # exception  to display a nice message to the user
-      @voucher.errors.add(:code, :taken)
-      render_error
     end
 
     private
 
-    def render_error
-      flash[:error] = @voucher.errors.full_messages.to_sentence
-      render :new
-    end
-
     def load_enterprise
       @enterprise = OpenFoodNetwork::Permissions
         .new(spree_current_user)
@@ -44,7 +30,7 @@ module Admin
     end
 
     def permitted_resource_params
-      params.require(:voucher).permit(:code, :amount, :type)
+      params.require(:voucher).permit(:code, :amount)
     end
   end
 end

app/controllers/api/v0/enterprise_attachment_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'api/admin/enterprise_serializer'
+
 module Api
   module V0
     class EnterpriseAttachmentController < Api::V0::BaseController
@@ -19,7 +21,7 @@ module Api
         @enterprise.update!(attachment_name => nil)
         render json: @enterprise,
                serializer: Admin::EnterpriseSerializer,
-               spree_current_user:
+               spree_current_user: spree_current_user
       end
 
       protected

app/controllers/api/v0/orders_controller.rb

@@ -5,6 +5,11 @@ module Api
     class OrdersController < Api::V0::BaseController
       include PaginationData
 
+      def show
+        authorize! :read, order
+        render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
+      end
+
       def index
         authorize! :admin, Spree::Order
 
@@ -21,11 +26,6 @@ module Api
         }
       end
 
-      def show
-        authorize! :read, order
-        render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
-      end
-
       def update
         authorize! :admin, order
 

app/controllers/api/v0/products_controller.rb

@@ -13,7 +13,7 @@ module Api
       skip_authorization_check only: [:show, :bulk_products, :overridable]
 
       def show
-        @product = product_finder.find_product
+        @product = find_product(params[:id])
         render json: @product, serializer: Api::Admin::ProductSerializer
       end
 
@@ -30,7 +30,7 @@ module Api
 
       def update
         authorize! :update, Spree::Product
-        @product = product_finder.find_product
+        @product = find_product(params[:id])
         if @product.update(product_params)
           render json: @product, serializer: Api::Admin::ProductSerializer, status: :ok
         else
@@ -40,20 +40,36 @@ module Api
 
       def destroy
         authorize! :delete, Spree::Product
-        @product = product_finder.find_product
+        @product = find_product(params[:id])
         authorize! :delete, @product
         @product.destroy
         render json: @product, serializer: Api::Admin::ProductSerializer, status: :no_content
       end
 
       def bulk_products
-        @products = product_finder.bulk_products
+        product_query = OpenFoodNetwork::Permissions.
+          new(current_api_user).
+          editable_products.
+          merge(product_scope)
+
+        if params[:import_date].present?
+          product_query = product_query.
+            imported_on(params[:import_date]).
+            group_by_products_id
+        end
+
+        @products = product_query.
+          ransack(query_params_with_defaults).
+          result
 
         render_paged_products @products
       end
 
       def overridable
-        @products = product_finder.paged_products_for_producers
+        producer_ids = OpenFoodNetwork::Permissions.new(current_api_user).
+          variant_override_producers.by_name.select('enterprises.id')
+
+        @products = paged_products_for_producers producer_ids
 
         render_paged_products @products, ::Api::Admin::ProductSimpleSerializer
       end
@@ -62,7 +78,7 @@ module Api
       #
       def clone
         authorize! :create, Spree::Product
-        original_product = product_finder.find_product_to_be_cloned
+        original_product = find_product(params[:product_id])
         authorize! :update, original_product
 
         @product = original_product.duplicate
@@ -72,8 +88,37 @@ module Api
 
       private
 
-      def product_finder
-        ProductScopeQuery.new(current_api_user, params)
+      def find_product(id)
+        product_scope.find(id)
+      end
+
+      def product_scope
+        if current_api_user.has_spree_role?("admin") || current_api_user.enterprises.present?
+          scope = Spree::Product
+          if params[:show_deleted]
+            scope = scope.with_deleted
+          end
+        else
+          scope = Spree::Product.active
+        end
+
+        scope.includes(product_query_includes)
+      end
+
+      def product_query_includes
+        [
+          image: { attachment_attachment: :blob },
+          variants: [:default_price, :stock_locations, :stock_items, :variant_overrides]
+        ]
+      end
+
+      def paged_products_for_producers(producer_ids)
+        Spree::Product.where(nil).
+          merge(product_scope).
+          includes(variants: [:product, :default_price, :stock_items]).
+          where(supplier_id: producer_ids).
+          by_producer.by_name.
+          ransack(params[:q]).result
       end
 
       def render_paged_products(products, product_serializer = ::Api::Admin::ProductSerializer)
@@ -90,6 +135,10 @@ module Api
         }
       end
 
+      def query_params_with_defaults
+        (params[:q] || {}).reverse_merge(s: 'created_at desc')
+      end
+
       def product_params
         @product_params ||=
           params.permit(product: PermittedAttributes::Product.attributes)[:product].to_h

app/controllers/api/v0/shipments_controller.rb

@@ -44,16 +44,14 @@ module Api
 
       def ready
         authorize! :read, Spree::Shipment
-
-        unless @shipment.ready? || @shipment.can_ready?
-          return render(
-            json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
-            status: :unprocessable_entity
-          )
+        unless @shipment.ready?
+          if @shipment.can_ready?
+            @shipment.ready!
+          else
+            render(json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
+                   status: :unprocessable_entity) && return
+          end
         end
-
-        @shipment.ready! unless @shipment.ready?
-
         render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
       end
 
@@ -110,7 +108,7 @@ module Api
       end
 
       def get_or_create_shipment(stock_location_id)
-        @order.shipment || @order.shipments.create(stock_location_id:)
+        @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
       end
 
       def shipment_params

app/controllers/api/v1/base_controller.rb

@@ -69,14 +69,14 @@ module Api
       end
 
       def missing_parameter(error)
-        message = I18n.t('api.missing_parameter', param: error.param)
+        message = I18n.t(:missing_parameter, param: error.param, scope: :api)
 
         render status: :unprocessable_entity,
                json: json_api_error(message)
       end
 
       def unpermitted_parameters(error)
-        message = I18n.t('api.unpermitted_parameters', params: error.params.join(", "))
+        message = I18n.t(:unpermitted_parameters, params: error.params.join(", "), scope: :api)
 
         render status: :unprocessable_entity,
                json: json_api_error(message)

app/controllers/application_controller.rb

@@ -115,25 +115,25 @@ class ApplicationController < ActionController::Base
   end
 
   def require_distributor_chosen
-    return if (@distributor = current_distributor)
-
-    redirect_to main_app.root_path
-    false
+    unless (@distributor = current_distributor)
+      redirect_to main_app.root_path
+      false
+    end
   end
 
   def require_order_cycle
-    return if current_order_cycle
-
-    redirect_to main_app.shop_path
+    unless current_order_cycle
+      redirect_to main_app.shop_path
+    end
   end
 
   def check_hub_ready_for_checkout
-    return unless current_distributor_closed?
-
-    current_order.empty!
-    current_order.set_distribution! nil, nil
-    flash[:info] = I18n.t('order_cycles_closed_for_hub')
-    redirect_to main_app.root_url
+    if current_distributor_closed?
+      current_order.empty!
+      current_order.set_distribution! nil, nil
+      flash[:info] = I18n.t('order_cycles_closed_for_hub')
+      redirect_to main_app.root_url
+    end
   end
 
   def current_distributor_closed?

app/controllers/checkout_controller.rb

@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-require 'open_food_network/address_finder'
-
-class CheckoutController < BaseController
-  layout 'darkswarm'
-
-  include OrderStockCheck
-  include Spree::BaseHelper
-  include CheckoutCallbacks
-  include CheckoutSteps
-  include OrderCompletion
-  include CablecarResponses
-  include WhiteLabel
-
-  helper 'terms_and_conditions'
-  helper 'checkout'
-  helper 'spree/orders'
-  helper EnterprisesHelper
-  helper OrderHelper
-
-  before_action :set_checkout_redirect
-  before_action :hide_ofn_navigation, only: [:edit, :update]
-
-  def edit
-    if params[:step].blank?
-      redirect_to_step_based_on_order
-    else
-      update_order_state
-      check_step
-    end
-
-    return if available_shipping_methods.any?
-
-    flash[:error] = I18n.t('checkout.errors.no_shipping_methods_available')
-  end
-
-  def update
-    if confirm_order || update_order
-      return if performed?
-
-      check_payments_adjustments
-      clear_invalid_payments
-      advance_order_state
-      redirect_to_step
-    else
-      render_error
-    end
-  rescue Spree::Core::GatewayError => e
-    flash[:error] = I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message)
-    @order.update_column(:state, "payment")
-    render cable_ready: cable_car.redirect_to(url: checkout_step_path(:payment))
-  end
-
-  private
-
-  def render_error
-    flash.now[:error] ||= I18n.t('checkout.errors.saving_failed')
-
-    render status: :unprocessable_entity, cable_ready: cable_car.
-      replace("#checkout", partial("checkout/checkout")).
-      replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
-  end
-
-  def check_payments_adjustments
-    @order.payments.each(&:ensure_correct_adjustment)
-  end
-
-  def clear_invalid_payments
-    @order.payments.with_state(:invalid).delete_all
-  end
-
-  def confirm_order
-    return unless summary_step? && @order.confirmation?
-    return unless validate_current_step
-
-    @order.customer.touch :terms_and_conditions_accepted_at
-
-    return true if redirect_to_payment_gateway
-
-    @order.process_payments!
-    @order.confirm!
-    order_completion_reset @order
-  end
-
-  def redirect_to_payment_gateway
-    return unless selected_payment_method&.external_gateway?
-    return unless (redirect_url = selected_payment_method.external_payment_url(order: @order))
-
-    render cable_ready: cable_car.redirect_to(url: redirect_url)
-    true
-  end
-
-  def selected_payment_method
-    @selected_payment_method ||= Checkout::PaymentMethodFetcher.new(@order).call
-  end
-
-  def update_order
-    return if params[:confirm_order] || @order.errors.any?
-
-    # Checking if shipping method updated before @order get updated. We can't use this guard
-    # clause in recalculate_voucher as by then the @order.shipping method would be the new one
-    shipping_method_updated = @order.shipping_method&.id != params[:shipping_method_id].to_i
-
-    @order.select_shipping_method(params[:shipping_method_id])
-    @order.update(order_params)
-    # We need to update voucher to take into account:
-    #  * when moving away from "details" step : potential change in shipping method fees
-    #  * when moving away from "payment" step : payment fees
-    recalculate_voucher(shipping_method_updated) if details_step? || payment_step?
-    @order.update_totals_and_states
-
-    validate_current_step
-  end
-
-  def recalculate_voucher(shipping_method_updated)
-    return if @order.voucher_adjustments.empty?
-
-    return unless shipping_method_updated
-
-    VoucherAdjustmentsService.new(@order).update
-  end
-
-  def validate_current_step
-    Checkout::Validation.new(@order, params).call && @order.errors.empty?
-  end
-
-  def advance_order_state
-    return if @order.complete?
-
-    OrderWorkflow.new(@order).advance_checkout(raw_params.slice(:shipping_method_id))
-  end
-
-  def order_params
-    @order_params ||= Checkout::Params.new(@order, params, spree_current_user).call
-  end
-
-  # Update order state based on the step we are loading to avoid discrepancy between step and order
-  # state. We need to do this when moving back to a previous checkout step, the update action takes
-  # care of moving the order state forward.
-  def update_order_state
-    return @order.back_to_payment if @order.confirmation? && payment_step?
-
-    return unless @order.after_delivery_state? && details_step?
-
-    @order.back_to_address
-  end
-end

app/controllers/concerns/checkout_steps.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module CheckoutSteps
-  extend ActiveSupport::Concern
-
-  private
-
-  def summary_step?
-    params[:step] == "summary"
-  end
-
-  def payment_step?
-    params[:step] == "payment"
-  end
-
-  def details_step?
-    params[:step] == "details"
-  end
-
-  def redirect_to_step_based_on_order
-    case @order.state
-    when "cart", "address", "delivery"
-      redirect_to checkout_step_path(:details)
-    when "payment"
-      redirect_to checkout_step_path(:payment)
-    when "confirmation"
-      redirect_to checkout_step_path(:summary)
-    else
-      redirect_to order_path(@order, order_token: @order.token)
-    end
-  end
-
-  def redirect_to_step
-    case params[:step]
-    when "details"
-      return redirect_to checkout_step_path(:payment)
-    when "payment"
-      return redirect_to checkout_step_path(:summary)
-    end
-    redirect_to_step_based_on_order
-  end
-
-  # Checkout step and allowed order state
-  # * step details : order state in cart, address or delivery
-  # * step payment : order state is payment
-  # * step summary : order state is confirmation
-  def check_step
-    case @order.state
-    when "cart", "address", "delivery"
-      redirect_to checkout_step_path(:details) unless details_step?
-    when "payment"
-      redirect_to checkout_step_path(:payment) if summary_step?
-    end
-  end
-end

app/controllers/concerns/extra_fields.rb

@@ -5,11 +5,11 @@ module ExtraFields
   extend ActiveSupport::Concern
 
   def invalid_query_param(name, status, msg)
-    render status:, json: json_api_error(msg, error_options:
+    render status: status, json: json_api_error(msg, error_options:
       {
         title: I18n.t("api.query_param.error.title"),
         source: { parameter: name },
-        status:,
+        status: status,
         code: Rack::Utils::SYMBOL_TO_STATUS_CODE[status]
       })
   end

app/controllers/concerns/manager_invitations.rb

@@ -5,7 +5,7 @@ module ManagerInvitations
 
   def create_new_manager(email, enterprise)
     password = Devise.friendly_token
-    new_user = Spree::User.create(email:, unconfirmed_email: email, password:)
+    new_user = Spree::User.create(email: email, unconfirmed_email: email, password: password)
     new_user.reset_password_token = Devise.friendly_token
     # Same time as used in Devise's lib/devise/models/recoverable.rb.
     new_user.reset_password_sent_at = Time.now.utc

app/controllers/concerns/reports_actions.rb

@@ -74,8 +74,8 @@ module ReportsActions
   def rendering_options
     @rendering_options ||= ReportRenderingOptions.where(
       user: spree_current_user,
-      report_type:,
-      report_subtype:
+      report_type: report_type,
+      report_subtype: report_subtype
     ).first_or_create do |report_rendering_options|
       report_rendering_options.options = {
         fields_to_show: if request.get?

app/controllers/concerns/request_timeouts.rb

@@ -16,7 +16,7 @@ module RequestTimeouts
     respond_to do |type|
       type.html {
         render status: :gateway_timeout,
-               file: Rails.public_path.join('500.html'),
+               file: Rails.root.join("public/500.html"),
                formats: [:html],
                layout: nil
       }

app/controllers/errors_controller.rb

@@ -9,7 +9,7 @@ class ErrorsController < ApplicationController
 
       event.add_metadata(:request, request.env)
     end
-    render status: :not_found, formats: :html
+    render status: :not_found
   end
 
   def internal_server_error

app/controllers/home_controller.rb

@@ -4,14 +4,14 @@ class HomeController < BaseController
   layout 'darkswarm'
 
   def index
-    return unless ContentConfig.home_show_stats
-
-    @num_distributors = cached_count('distributors', Enterprise.is_distributor.activated.visible)
-    @num_producers = cached_count('producers', Enterprise.is_primary_producer.activated.visible)
-    @num_orders = cached_count('orders', Spree::Order.complete)
-    @num_users = cached_count(
-      'users', Spree::Order.complete.select('DISTINCT spree_orders.user_id')
-    )
+    if ContentConfig.home_show_stats
+      @num_distributors = cached_count('distributors', Enterprise.is_distributor.activated.visible)
+      @num_producers = cached_count('producers', Enterprise.is_primary_producer.activated.visible)
+      @num_orders = cached_count('orders', Spree::Order.complete)
+      @num_users = cached_count(
+        'users', Spree::Order.complete.select('DISTINCT spree_orders.user_id')
+      )
+    end
   end
 
   def sell; end

app/controllers/line_items_controller.rb

@@ -31,7 +31,7 @@ class LineItemsController < BaseController
 
   def unauthorized
     status = spree_current_user ? 403 : 401
-    render(body: nil, status:) && return
+    render(body: nil, status: status) && return
   end
 
   def not_found

app/controllers/payment_gateways/paypal_controller.rb

@@ -50,7 +50,7 @@ module PaymentGateways
           payer_id: params[:PayerID]
         ),
         amount: @order.total,
-        payment_method:
+        payment_method: payment_method
       )
 
       process_payment_completion!

app/controllers/split_checkout_controller.rb

@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require 'open_food_network/address_finder'
+
+class SplitCheckoutController < ::BaseController
+  layout 'darkswarm'
+
+  include OrderStockCheck
+  include Spree::BaseHelper
+  include CheckoutCallbacks
+  include OrderCompletion
+  include CablecarResponses
+  include WhiteLabel
+
+  helper 'terms_and_conditions'
+  helper 'checkout'
+  helper 'spree/orders'
+  helper EnterprisesHelper
+  helper OrderHelper
+
+  before_action :set_checkout_redirect
+  before_action :hide_ofn_navigation, only: [:edit, :update]
+
+  def edit
+    redirect_to_step_based_on_order unless params[:step]
+    check_step if params[:step]
+
+    return if available_shipping_methods.any?
+
+    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
+  end
+
+  def update
+    if confirm_order || update_order
+      return if performed?
+
+      check_payments_adjustments
+      clear_invalid_payments
+      advance_order_state
+      redirect_to_step
+    else
+      render_error
+    end
+  rescue Spree::Core::GatewayError => e
+    flash[:error] = I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message)
+    @order.update_column(:state, "payment")
+    render cable_ready: cable_car.redirect_to(url: checkout_step_path(:payment))
+  end
+
+  private
+
+  def render_error
+    flash.now[:error] ||= I18n.t(
+      'split_checkout.errors.saving_failed',
+      messages: order_error_messages
+    )
+
+    render status: :unprocessable_entity, cable_ready: cable_car.
+      replace("#checkout", partial("split_checkout/checkout")).
+      replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
+  end
+
+  def order_error_messages
+    # Remove ship_address.* errors if no shipping method is not selected
+    remove_ship_address_errors if no_ship_address_needed?
+
+    # Reorder errors to make sure the most important ones are shown first
+    # and finally, return the error messages to sentence
+    reorder_errors.map(&:full_message).to_sentence
+  end
+
+  def no_ship_address_needed?
+    @order.errors[:shipping_method].present? || params[:ship_address_same_as_billing] == "1"
+  end
+
+  def remove_ship_address_errors
+    @order.errors.delete("ship_address.firstname")
+    @order.errors.delete("ship_address.address1")
+    @order.errors.delete("ship_address.city")
+    @order.errors.delete("ship_address.phone")
+    @order.errors.delete("ship_address.lastname")
+    @order.errors.delete("ship_address.zipcode")
+  end
+
+  def reorder_errors
+    @order.errors.sort_by do |e|
+      case e.attribute
+      when /email/i then 0
+      when /phone/i then 1
+      when /bill_address/i then 2 + bill_address_error_order(e)
+      else 20
+      end
+    end
+  end
+
+  def bill_address_error_order(error)
+    case error.attribute
+    when /firstname/i then 0
+    when /lastname/i then 1
+    when /address1/i then 2
+    when /city/i then 3
+    when /zipcode/i then 4
+    else 5
+    end
+  end
+
+  def check_payments_adjustments
+    @order.payments.each(&:ensure_correct_adjustment)
+  end
+
+  def clear_invalid_payments
+    @order.payments.with_state(:invalid).delete_all
+  end
+
+  def confirm_order
+    return unless summary_step? && @order.confirmation?
+    return unless validate_summary! && @order.errors.empty?
+
+    @order.customer.touch :terms_and_conditions_accepted_at
+
+    return true if redirect_to_payment_gateway
+
+    @order.process_payments!
+    @order.confirm!
+    order_completion_reset @order
+  end
+
+  def redirect_to_payment_gateway
+    return unless selected_payment_method&.external_gateway?
+    return unless (redirect_url = selected_payment_method.external_payment_url(order: @order))
+
+    render cable_ready: cable_car.redirect_to(url: redirect_url)
+    true
+  end
+
+  def selected_payment_method
+    @selected_payment_method ||= Checkout::PaymentMethodFetcher.new(@order).call
+  end
+
+  def update_order
+    return if params[:confirm_order] || @order.errors.any?
+
+    # If we have "pick up" shipping method (require_ship_address is set to false), use the
+    # distributor address as shipping address
+    use_shipping_address_from_distributor if shipping_method_ship_address_not_required?
+
+    @order.select_shipping_method(params[:shipping_method_id])
+    @order.update(order_params)
+    @order.update_totals_and_states
+
+    validate_current_step!
+
+    @order.errors.empty?
+  end
+
+  def use_shipping_address_from_distributor
+    @order.ship_address = @order.address_from_distributor
+
+    # Add the missing data
+    bill_address = params[:order][:bill_address_attributes]
+    @order.ship_address.firstname = bill_address[:firstname]
+    @order.ship_address.lastname = bill_address[:lastname]
+    @order.ship_address.phone = bill_address[:phone]
+
+    # Remove shipping address from parameter so we don't override the address we just set
+    params[:order].delete(:ship_address_attributes)
+  end
+
+  def shipping_method_ship_address_not_required?
+    selected_shipping_method = available_shipping_methods&.select do |sm|
+      sm.id.to_s == params[:shipping_method_id]
+    end
+
+    return false if selected_shipping_method.empty?
+
+    selected_shipping_method.first.require_ship_address == false
+  end
+
+  def summary_step?
+    params[:step] == "summary"
+  end
+
+  def payment_step?
+    params[:step] == "payment"
+  end
+
+  def advance_order_state
+    return if @order.complete?
+
+    OrderWorkflow.new(@order).advance_checkout(raw_params.slice(:shipping_method_id))
+  end
+
+  def validate_current_step!
+    step = ([params[:step]] & ["details", "payment", "summary"]).first
+    send("validate_#{step}!")
+  end
+
+  def validate_details!
+    return true if params[:shipping_method_id].present?
+
+    @order.errors.add :shipping_method, I18n.t('split_checkout.errors.select_a_shipping_method')
+  end
+
+  def validate_payment!
+    return true if params.dig(:order, :payments_attributes, 0, :payment_method_id).present?
+    return true if @order.zero_priced_order?
+
+    @order.errors.add :payment_method, I18n.t('split_checkout.errors.select_a_payment_method')
+  end
+
+  def validate_summary!
+    return true if params[:accept_terms]
+    return true unless TermsOfService.required?(@order.distributor)
+
+    @order.errors.add(:terms_and_conditions, t("split_checkout.errors.terms_not_accepted"))
+  end
+
+  def order_params
+    @order_params ||= Checkout::Params.new(@order, params, spree_current_user).call
+  end
+
+  def redirect_to_step_based_on_order
+    case @order.state
+    when "cart", "address", "delivery"
+      redirect_to checkout_step_path(:details)
+    when "payment"
+      redirect_to checkout_step_path(:payment)
+    when "confirmation"
+      redirect_to checkout_step_path(:summary)
+    else
+      redirect_to order_path(@order, order_token: @order.token)
+    end
+  end
+
+  def redirect_to_step
+    case params[:step]
+    when "details"
+      return redirect_to checkout_step_path(:payment)
+    when "payment"
+      return redirect_to checkout_step_path(:summary)
+    end
+    redirect_to_step_based_on_order
+  end
+
+  def check_step
+    case @order.state
+    when "cart", "address", "delivery"
+      redirect_to checkout_step_path(:details) unless params[:step] == "details"
+    when "payment"
+      redirect_to checkout_step_path(:payment) if params[:step] == "summary"
+    end
+  end
+end

app/controllers/spree/admin/base_controller.rb

@@ -9,7 +9,6 @@ module Spree
       helper 'admin/injection'
       helper 'admin/orders'
       helper 'admin/enterprises'
-      helper 'admin/terms_of_service'
       helper 'enterprise_fees'
       helper 'angular_form'
 

app/controllers/spree/admin/images_controller.rb

@@ -20,10 +20,6 @@ module Spree
         render layout: !request.xhr?
       end
 
-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
       def create
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
         set_viewable
@@ -32,19 +28,23 @@ module Spree
 
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
-          redirect_to location_after_save
+          redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
         else
           respond_with(@object)
         end
       end
 
+      def edit
+        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+      end
+
       def update
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
         set_viewable
 
         if @object.update(permitted_resource_params)
           flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to location_after_save
+          redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
         else
           respond_with(@object)
         end
@@ -58,7 +58,7 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_removed)
         end
 
-        redirect_to location_after_save
+        redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
       end
 
       private
@@ -76,7 +76,7 @@ module Spree
       end
 
       def location_after_save
-        params[:return_url] || spree.admin_product_images_url(params[:product_id], @url_filters)
+        spree.admin_product_images_url(@product)
       end
 
       def load_data

app/controllers/spree/admin/invoices_controller.rb

@@ -10,24 +10,57 @@ module Spree
         authorize! :invoice, @order
       end
 
-      def show
-        invoice_id = params[:id]
-        invoice_pdf = filepath(invoice_id)
+      def create
+        Spree::Order.where(id: params[:order_ids]).find_each do |order|
+          authorize! :invoice, order
+        end
+        invoice_service = BulkInvoiceService.new
+        invoice_service.start_pdf_job(params[:order_ids])
 
-        send_file(invoice_pdf, type: 'application/pdf', disposition: :inline)
+        render json: invoice_service.id, status: :ok
       end
 
       def generate
         @order = Order.find_by(number: params[:order_id])
         authorize! :invoice, @order
-        OrderInvoiceGenerator.new(@order).generate_or_update_latest_invoice
+
+        @comparator = OrderInvoiceComparator.new(@order)
+        if @comparator.can_generate_new_invoice?
+          @order.invoices.create!(
+            date: Time.zone.today,
+            number: @order.invoices.count + 1,
+            data: invoice_data
+          )
+        elsif @comparator.can_update_latest_invoice?
+          @order.invoices.last.update!(
+            date: Time.zone.today,
+            data: invoice_data
+          )
+        end
         redirect_back(fallback_location: spree.admin_dashboard_path)
       end
 
-      private
+      def show
+        invoice_id = params[:id]
+        invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
 
-      def filepath(invoice_id)
-        "tmp/invoices/#{invoice_id}.pdf"
+        send_file(invoice_pdf, type: 'application/pdf', disposition: :inline)
+      end
+
+      def poll
+        invoice_id = params[:invoice_id]
+
+        if BulkInvoiceService.new.invoice_created? invoice_id
+          render json: { created: true }, status: :ok
+        else
+          render json: { created: false }, status: :unprocessable_entity
+        end
+      end
+
+      protected
+
+      def invoice_data
+        @invoice_data ||= InvoiceDataGenerator.new(@order).generate
       end
     end
   end

app/controllers/spree/admin/mail_methods_controller.rb

@@ -23,7 +23,7 @@ module Spree
           flash[:error] = Spree.t('admin.mail_methods.testmail.delivery_error')
         end
       rescue StandardError => e
-        flash[:error] = Spree.t('admin.mail_methods.testmail.error') % ({ e: })
+        flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e }
       ensure
         redirect_to spree.edit_admin_mail_methods_url
       end

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

@@ -43,8 +43,8 @@ module Spree
 
         def build_addresses
           country_id = Address.default.country.id
-          @order.build_bill_address(country_id:) if @order.bill_address.nil?
-          @order.build_ship_address(country_id:) if @order.ship_address.nil?
+          @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
+          @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
         end
 
         def refresh_shipment_rates

app/controllers/spree/admin/orders_controller.rb

@@ -90,8 +90,7 @@ module Spree
       end
 
       def invoice
-        Spree::OrderMailer.invoice_email(@order.id,
-                                         current_user_id: spree_current_user.id ).deliver_later
+        Spree::OrderMailer.invoice_email(@order.id).deliver_later
         flash[:success] = t('admin.orders.invoice_email_sent')
 
         respond_with(@order) { |format|
@@ -100,16 +99,11 @@ module Spree
       end
 
       def print
-        if OpenFoodNetwork::FeatureToggle.enabled?(:invoices, spree_current_user)
-          @order = if params[:invoice_id].present?
-                     @order.invoices.find(params[:invoice_id]).presenter
-                   else
-                     OrderInvoiceGenerator.new(@order).generate_or_update_latest_invoice
-                     @order.invoices.first.presenter
-                   end
+        if OpenFoodNetwork::FeatureToggle.enabled?(:invoices)
+          @order = @order.invoices.find(params[:invoice_id]).presenter
         end
 
-        render_with_wicked_pdf InvoiceRenderer.new.args(@order, spree_current_user)
+        render_with_wicked_pdf InvoiceRenderer.new.args(@order)
       end
 
       private

app/controllers/spree/admin/payment_methods_controller.rb

@@ -128,6 +128,10 @@ module Spree
       def load_providers
         providers = Gateway.providers.sort_by(&:name)
 
+        unless Rails.env.development? || Rails.env.test?
+          providers.reject! { |provider| provider.name.include? "Bogus" }
+        end
+
         unless show_stripe?
           providers.reject! { |provider| stripe_provider?(provider) }
         end