Update all locales with the latest Transifex translations

Fix container issues introduced by #11123

.env.development

@@ -5,6 +5,8 @@
 #
 #     cp .env.development .env.local
 
+VERBOSE_QUERY_LOGS=true
+
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 OFN_REDIS_URL="redis://localhost:6379/1"

.github/ISSUE_TEMPLATE/release.md

@@ -40,7 +40,7 @@ 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%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%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

.github/workflows/build.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   knapsack_rspec_controllers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -86,7 +86,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   knapsack_rspec_models:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -155,7 +155,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   knapsack_rspec_system_admin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -233,7 +233,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_system_consumer:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -311,7 +311,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_engines:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -389,7 +389,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_test_the_rest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -459,7 +459,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   non_knapsack_jest_karma:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10

.github/workflows/stage.yml

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

.prettierignore

@@ -1,17 +1,26 @@
-# Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
-*.css
-*.scss
-# Except v2
-!/app/webpacker/css/admin/v2/**/*.scss
+# Ignore a lot of things, but we should enable where it can be helpful.
+
 *.md
 *.yml
 *.yaml
 *.json
 *.html
 
+# JS
+# Enabled: app/webpacker/controllers/*.js and app/webpacker/packs/*.js
 babel.config.js
 postcss.config.js
 
+# SCSS
+# Enabled: most of admin
+/app/webpacker/css/admin/globals/
+/app/webpacker/css/admin/shared/
+/app/webpacker/css/admin_v3/globals/variables.scss
+/app/webpacker/css/darkswarm/
+/app/webpacker/css/mail/
+/app/webpacker/css/shared/
+
+# More
 /app/assets/
 /config/
 /coverage/

.prettierrc.json

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

.rubocop_styleguide.yml

@@ -40,9 +40,13 @@ Metrics/BlockLength:
     "resources",
     "scenario",
     "shared_examples",
+    "shared_examples_for",
     "xdescribe",
   ]
 
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
 Rails/ApplicationRecord:
   Exclude:
     # Migrations should not contain application code:

.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.4

CONTRIBUTING.md

@@ -71,5 +71,5 @@ From here, your pull request will progress through the [Review, Test, Merge & De
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
 [ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
 [i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Internationalisation-%28i18n%29
-[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [ci]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Continuous-Integration

Gemfile

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "3.0.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
+ruby File.read('.ruby-version').chomp
+
 gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
 gem 'rails'
@@ -14,11 +15,11 @@ gem "aws-sdk-s3", require: false
 gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
-gem 'rexml'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
 gem 'ransack', '~> 2.6.0'
 gem 'responders'
+gem 'rexml'
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -63,6 +64,7 @@ gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.3'
 gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
+gem 'datafoodconsortium-connector'
 gem 'jsonapi-serializer'
 gem 'pagy', '~> 5.1'
 
@@ -70,8 +72,8 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 gem 'omniauth_openid_connect'
-gem 'openid_connect', '~> 1.3'
 gem 'omniauth-rails_csrf_protection'
+gem 'openid_connect', '~> 1.3'
 
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
@@ -114,12 +116,8 @@ gem 'spreadsheet_architect' # write spreadsheets
 
 gem 'whenever', require: false
 
-gem 'test-unit', '~> 3.5'
-
 gem 'coffee-rails', '~> 5.0.0'
 
-gem 'mini_racer'
-
 gem 'angular_rails_csrf'
 
 gem 'jquery-rails', '4.4.0'
@@ -141,7 +139,6 @@ gem "faraday"
 gem "private_address_check"
 
 group :production, :staging do
-  gem 'ddtrace'
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
 
@@ -150,6 +147,7 @@ group :test, :development do
   gem 'capybara'
   gem 'cuprite'
   gem 'database_cleaner', require: false
+  gem 'debug', '>= 1.0.0'
   gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
@@ -160,7 +158,6 @@ group :test, :development do
   gem 'rswag-specs'
   gem 'shoulda-matchers'
   gem 'timecop'
-  gem 'debug', '>= 1.0.0'
 end
 
 group :test do
@@ -175,10 +172,11 @@ end
 
 group :development do
   gem 'debugger-linecache'
-  gem 'rails-erd'
   gem 'foreman'
   gem 'listen'
   gem 'pry', '~> 0.13.0'
+  gem 'query_count'
+  gem 'rails-erd'
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring'

Gemfile.lock

@@ -44,73 +44,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    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.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      activesupport (= 7.0.4.3)
+    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.0.3)
+    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.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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)
@@ -121,14 +121,14 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -137,7 +137,7 @@ GEM
       activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.2)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
@@ -157,17 +157,17 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.742.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.780.0)
+    aws-sdk-core (3.175.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.67.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.120.1)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.126.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.2)
@@ -191,7 +191,7 @@ GEM
       railties (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.39.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -219,7 +219,7 @@ GEM
       matrix
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -234,14 +234,10 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    datafoodconsortium-connector (1.0.0.pre.alpha.6)
+      virtual_assembly-semantizer (~> 1.0, >= 1.0.4)
     date (3.3.3)
-    ddtrace (1.10.1)
-      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
-      libdatadog (~> 2.0.0.1.0)
-      libddwaf (~> 1.6.2.0.0)
-      msgpack
-    debase-ruby_core_source (3.2.0)
-    debug (1.7.2)
+    debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     debugger-linecache (1.2.0)
@@ -274,7 +270,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.4)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -321,7 +317,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.8.1)
+    geocoder (1.8.2)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gmaps4rails (2.1.2)
@@ -338,7 +334,7 @@ GEM
     hiredis (0.6.3)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -349,7 +345,7 @@ GEM
       activerecord (>= 3.0)
     io-console (0.6.0)
     ipaddress (0.8.3)
-    irb (1.6.3)
+    irb (1.6.4)
       reline (>= 0.3.0)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
@@ -359,12 +355,20 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     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.2.3)
+      htmlentities (~> 4.3)
+      json-canonicalization (~> 0.3)
+      link_header (~> 0.0, >= 0.0.8)
+      multi_json (~> 1.15)
+      rack (~> 2.2)
+      rdf (~> 3.2, >= 3.2.9)
     json-schema (3.0.0)
       addressable (>= 2.8)
     json_spec (1.1.5)
@@ -372,23 +376,21 @@ GEM
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.0)
-    knapsack_pro (3.9.0)
+    jwt (2.7.1)
+    knapsack_pro (5.1.2)
       rake
+    language_server-protocol (3.17.0.3)
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
-    libdatadog (2.0.0.1.0)
-    libddwaf (1.6.2.0.0)
-      ffi (~> 1.0)
-    libv8-node (16.10.0.0)
+    link_header (0.0.8)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -405,18 +407,16 @@ GEM
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    mini_racer (0.6.3)
-      libv8-node (~> 16.10.0.0)
-    minitest (5.18.0)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.6.1)
+    msgpack (1.7.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -426,8 +426,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -462,11 +462,12 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.22.1)
-    paranoia (2.6.1)
+    parallel (1.23.0)
+    paranoia (2.6.2)
       activerecord (>= 5.1, < 7.1)
-    parser (3.2.2.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
       xml-simple
@@ -479,17 +480,19 @@ GEM
       ruby-rc4
       ttfunk
     pg (1.2.3)
-    power_assert (2.0.2)
     private_address_check (0.5.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    puma (6.2.2)
+    puma (6.3.0)
       nio4r (~> 2.0)
+    query_count (1.1.1)
+      activerecord (>= 4.2)
+      railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-oauth2 (1.21.3)
@@ -506,41 +509,43 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    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.4.3)
+      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.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-erd (1.7.2)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    rails-i18n (7.0.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -554,11 +559,13 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rdf (3.2.9)
+      link_header (~> 0.0, >= 0.0.8)
     redcarpet (3.6.0)
     redis (4.8.1)
     redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     reline (0.3.3)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -583,48 +590,49 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.1)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.11)
-      rspec-expectations (~> 3.11)
-      rspec-mocks (~> 3.11)
-      rspec-support (~> 3.11)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.12.0)
-    rswag-api (2.8.0)
+    rswag-api (2.9.0)
       railties (>= 3.1, < 7.1)
-    rswag-specs (2.8.0)
+    rswag-specs (2.9.0)
       activesupport (>= 3.1, < 7.1)
       json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
       rspec-core (>= 2.14)
-    rswag-ui (2.8.0)
+    rswag-ui (2.9.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
-    rubocop (1.50.2)
+    rubocop (1.54.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      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.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.19.1)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -638,7 +646,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.1)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.4.25)
@@ -652,12 +660,12 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.0.8)
+    sidekiq (7.1.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.11.0)
-    sidekiq-scheduler (5.0.2)
+      redis-client (>= 0.14.0)
+    sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
@@ -680,13 +688,13 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    state_machines (0.5.0)
-    state_machines-activemodel (0.8.0)
-      activemodel (>= 5.1)
-      state_machines (>= 0.5.0)
-    state_machines-activerecord (0.8.0)
-      activerecord (>= 5.1)
-      state_machines-activemodel (>= 0.8.0)
+    state_machines (0.6.0)
+    state_machines-activemodel (0.9.0)
+      activemodel (>= 6.0)
+      state_machines (>= 0.6.0)
+    state_machines-activerecord (0.9.0)
+      activerecord (>= 6.0)
+      state_machines-activemodel (>= 0.9.0)
     stimulus_reflex (3.5.0.rc2)
       actioncable (>= 5.2, < 8)
       actionpack (>= 5.2, < 8)
@@ -697,20 +705,18 @@ GEM
       rack (>= 2, < 4)
       railties (>= 5.2, < 8)
       redis (>= 4.0, < 6.0)
-    stringex (2.8.5)
+    stringex (2.8.6)
     stripe (8.5.0)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
     temple (0.8.2)
-    test-unit (3.5.7)
-      power_assert
-    thor (1.2.1)
+    thor (1.2.2)
     thread-local (1.1.0)
     tilt (2.1.0)
     timecop (0.9.6)
-    timeout (0.3.2)
+    timeout (0.4.0)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -725,8 +731,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.1.0)
-    view_component (2.82.0)
+    vcr (6.2.0)
+    view_component (3.3.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -734,6 +740,8 @@ GEM
       rails (>= 5.2, < 8.0)
       stimulus_reflex (>= 3.5.0.pre2)
       view_component (>= 2.28.0)
+    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.0)
@@ -765,7 +773,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -799,8 +807,8 @@ DEPENDENCIES
   combine_pdf
   cuprite
   database_cleaner
+  datafoodconsortium-connector
   db2fog!
-  ddtrace
   debug (>= 1.0.0)
   debugger-linecache
   devise
@@ -841,7 +849,6 @@ DEPENDENCIES
   mime-types
   mimemagic (> 0.3.5)
   mini_portile2 (~> 2.8)
-  mini_racer
   monetize (~> 1.11)
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection
@@ -857,6 +864,7 @@ DEPENDENCIES
   private_address_check
   pry (~> 0.13.0)
   puma
+  query_count
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-timeout
@@ -892,7 +900,6 @@ DEPENDENCIES
   stimulus_reflex (= 3.5.0.rc2)
   stringex (~> 2.8.5)
   stripe
-  test-unit (~> 3.5)
   timecop
   valid_email2
   vcr
@@ -907,7 +914,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 3.0.3p157
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.4.3

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

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

app/assets/javascripts/admin/all.js

@@ -7,7 +7,6 @@
 
 // jquery and angular
 //= require jquery2
-//= require jquery_ujs
 //= require jquery.ui.all
 //= require jquery.powertip
 //= require jquery.cookie
@@ -69,25 +68,6 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment/min/moment.min.js
-//= require moment/locale/ar.js
-//= require moment/locale/ca.js
-//= require moment/locale/de.js
-//= require moment/locale/en-gb.js
-//= require moment/locale/es.js
-//= require moment/locale/fil.js
-//= require moment/locale/fr.js
-//= require moment/locale/it.js
-//= require moment/locale/nb.js
-//= require moment/locale/nl-be.js
-//= require moment/locale/pt-br.js
-//= require moment/locale/pt.js
-//= require moment/locale/ru.js
-//= require moment/locale/sv.js
-//= require moment/locale/tr.js
-//= require moment/locale/pl.js
-
-//= require js-big-decimal/dist/web/js-big-decimal.min.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -113,7 +113,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
 
   editProductUrl = (product, variant) ->
-    "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
+    "/admin/products/" + product.id + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
@@ -162,7 +162,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         if confirm(t("are_you_sure"))
           $http(
             method: "DELETE"
-            url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
+            url: "/api/v0/products/" + product.id + "/variants/" + variant.id
           ).then (response) ->
             $scope.removeVariant(product, variant)
     else
@@ -352,9 +352,6 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
-        if product.hasOwnProperty("available_on")
-          filteredProduct.available_on = product.available_on
-          hasUpdatableProperty = true
         if filteredMaster?
           filteredProduct.master_attributes = filteredMaster
           hasUpdatableProperty = true

app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee

@@ -1,5 +0,0 @@
- angular.module("admin.dropdown").directive "linksDropdown", ($window)->
-  restrict: "C"
-  scope:
-    links: "="
-  templateUrl: "admin/links_dropdown.html"

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

@@ -9,6 +9,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.sharedResource = false
   $scope.columns = Columns.columns
   $scope.sorting = SortOptions
+  $scope.sorting.toggle("order_date")
   $scope.pagination = LineItems.pagination
   $scope.per_page_options = [
     {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
@@ -22,6 +23,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     "order_bill_address_phone",
     "order_bill_address_firstname",
     "order_bill_address_lastname",
+    "order_bill_address_full_name",
     "variant_product_supplier_name",
     "order_email",
     "order_number",
@@ -60,6 +62,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.dereferenceLoadedData()
 
   $scope.loadOrders = ->
+    return $scope.orders = [] unless $scope.line_items.length
+
     RequestMonitor.load $scope.orders = Orders.index(
       "q[id_in][]": $scope.line_items.map((line_item) -> line_item.order.id)
     )
@@ -78,6 +82,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
       "q[order_completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined,
       "q[order_completed_at_lt]": if formattedEndDate then formattedEndDate else undefined,
+      "q[s]": "order_completed_at desc",
       "page": $scope.page,
       "per_page": $scope.per_page
     )
@@ -121,16 +126,16 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     else
       StatusMessage.display 'failure', t "unsaved_changes_error"
 
-  $scope.cancelOrder = (order, sendEmailCancellation) ->
+  $scope.cancelOrder = (order, sendEmailCancellation, restock_items) ->
     return $http(
       method: 'GET'
-      url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}")
+      url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}&restock_items=#{restock_items}")
   
   $scope.deleteLineItem = (lineItem) ->
     if lineItem.order.item_count == 1
-      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
+      ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
         if confirm
-          $scope.cancelOrder(lineItem.order, sendEmailCancellation).then(->
+          $scope.cancelOrder(lineItem.order, sendEmailCancellation, restock_items).then(->
             $scope.refreshData()
           )
         else
@@ -152,11 +157,11 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       willCancelOrders = true if (order.item_count == itemsPerOrder.get(order).length)
 
     if willCancelOrders
-      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
+      ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
         if confirm
           itemsPerOrder.forEach (items, order) =>
             if order.item_count == items.length
-              $scope.cancelOrder(order, sendEmailCancellation).then(-> $scope.refreshData())
+              $scope.cancelOrder(order, sendEmailCancellation, restock_items).then(-> $scope.refreshData())
             else
               Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
       , "js.admin.deleting_item_will_cancel_order")   

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@ $(document).ready(function() {
       console.log(msg);
     });
   }
-  $('[data-hook=admin_order_edit_form] a.ship').click(handle_ship_click);
+  $('.admin-order-edit-form a.ship').click(handle_ship_click);
 
   //handle shipping method edit click
   $('a.edit-method').click(toggleMethodEdit);
@@ -37,7 +37,7 @@ $(document).ready(function() {
       console.log(msg);
     });
   }
-  $('[data-hook=admin_order_edit_form] a.save-method').click(handle_shipping_method_save);
+  $('.admin-order-edit-form a.save-method').click(handle_shipping_method_save);
 
   //handle tracking info edit/delete
 
@@ -64,8 +64,8 @@ $(document).ready(function() {
     return Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipmentNumber + ".json");
   }
 
-  $('[data-hook=admin_order_edit_form] a.save-tracking').click(saveTrackingInfo);
-  $('[data-hook=admin_order_edit_form] a.delete-tracking').click(deleteTrackingInfo);
+  $('.admin-order-edit-form a.save-tracking').click(saveTrackingInfo);
+  $('.admin-order-edit-form a.delete-tracking').click(deleteTrackingInfo);
 
   // handle note edit/delete
 
@@ -96,8 +96,8 @@ $(document).ready(function() {
     }); 
   }
 
-  $('[data-hook=admin_order_edit_form] a.save-note').click(saveNote);
-  $('[data-hook=admin_order_edit_form] a.delete-note').click(deleteNote);
+  $('.admin-order-edit-form a.save-note').click(saveNote);
+  $('.admin-order-edit-form a.delete-note').click(deleteNote);
 
   // Makes API call for notes/tracking info
   makeApiCall = function(url, params) {

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

@@ -100,6 +100,7 @@ adjustItems = function(shipment_number, variant_id, quantity, restock_item){
         doAdjustItems(shipment_number, variant_id, quantity, inventory_units, restock_item, () => {
           var redirectTo = new URL(Spree.routes.cancel_order.toString());
           redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+          redirectTo.searchParams.append("restock_item", restock_item);
           window.location.href = redirectTo.toString();
         });
       }

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

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

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

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

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

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

app/assets/javascripts/admin_minimal.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+
+//= require jquery2
+//= require admin/spree/spree-select2
+//= require admin/spree/handlebar_extensions
+
+//= require i18n/translations
+//= require darkswarm/i18n.translate.js
+
+window.angular = { module: function(noop){ return { value: function(){} } } }

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

@@ -29,24 +29,6 @@
 #
 #= require angular-flash.min.js
 #
-#= require moment/min/moment.min.js
-#= require moment/locale/ar.js
-#= require moment/locale/ca.js
-#= require moment/locale/de.js
-#= require moment/locale/en-gb.js
-#= require moment/locale/es.js
-#= require moment/locale/fil.js
-#= require moment/locale/fr.js
-#= require moment/locale/it.js
-#= require moment/locale/nb.js
-#= require moment/locale/nl-be.js
-#= require moment/locale/pt-br.js
-#= require moment/locale/pt.js
-#= require moment/locale/ru.js
-#= require moment/locale/sv.js
-#= require moment/locale/tr.js
-#= require moment/locale/pl.js
-#
 #= require modernizr
 #
 #= require foundation-sites/js/foundation.js
@@ -67,11 +49,3 @@ document.addEventListener "turbo:before-render", ->
     rootscope = null
     window.injector = null
   true
-
-document.addEventListener "ajax:beforeSend", (event) =>
-  window.Turbo.navigator.adapter.progressBar.setValue(0)
-  window.Turbo.navigator.adapter.progressBar.show()
-
-document.addEventListener "ajax:complete", (event) =>
-  window.Turbo.navigator.adapter.progressBar.setValue(100)
-  window.Turbo.navigator.adapter.progressBar.hide()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/javascripts/darkswarm/services/products.js.coffee

@@ -33,9 +33,9 @@ angular.module('Darkswarm').factory 'Products', (OrderCycleResource, OrderCycle,
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
-        product.primaryImage = product.images[0]?.small_url if product.images
+        product.primaryImage = product.image?.small_url if product.image
         product.primaryImageOrMissing = product.primaryImage || "/noimage/small.png"
-        product.largeImage = product.images[0]?.large_url if product.images
+        product.largeImage = product.image?.large_url if product.image
 
     dereference: ->
       for product in @fetched_products

app/assets/javascripts/templates/admin/links_dropdown.html.haml

@@ -1,10 +0,0 @@
-.ofn-drop-down
-  %span
-    %i.icon-check
-    {{ 'admin.actions' | t }}
-    %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
-  %div.menu{ 'ng-show' => "expanded" }
-    %a.menu_item{ 'ng-repeat' => "link in links", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method || 'get' }}", confirm: "{{link.confirm}}" } }
-      %span
-        %i{ ng: { class: "link.icon" } }
-      %span {{ link.name }}

app/assets/javascripts/templates/admin/save_bar.html.haml

@@ -3,7 +3,7 @@
     .seven.columns.alpha
       %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
         {{ StatusMessage.statusMessage.text || " " }}
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #da5354' }
+      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #C85136' }
         {{ StatusMessage.invalidMessage || " " }}
     .nine.columns.omega.text-right{ ng: { transclude: true } }
 

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

@@ -15,6 +15,6 @@
 
   .columns.small-12.medium-6.large-6.product-img
     %img{"ng-src" => "{{::product.largeImage}}", "ng-if" => "::product.largeImage"}
-    %img.placeholder{ src: "/noimage/large.png", "ng-if" => "::!product.largeImage"}
+    %img.placeholder{ src: Spree::Image.default_image_url(:large), "ng-if" => "::!product.largeImage"}
 
 %ng-include{src: "'partials/close.html'"}

app/channels/scoped_channel.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ScopedChannel < ApplicationCable::Channel
+  class << self
+    def for_id(id)
+      "ScopedChannel:#{id}"
+    end
+  end
+
+  def subscribed
+    stream_from "ScopedChannel:#{params[:id]}"
+  end
+end

app/channels/session_channel.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SessionChannel < ApplicationCable::Channel
+  def self.for_request(request)
+    "SessionChannel:#{request.session.id}"
+  end
+
+  def subscribed
+    return reject if current_user.nil?
+
+    stream_from "SessionChannel:#{session_id}"
+  end
+end

app/components/confirm_modal_component.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 class ConfirmModalComponent < ModalComponent
-  def initialize(id:, confirm_actions: nil, controllers: nil, message: nil)
+  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
-    @controllers = controllers
+    @reflex = reflex
+    @confirm_reflexes = confirm_reflexes
+    @controller = controller
     @message = message
   end
 

app/components/confirm_modal_component/confirm_modal_component.html.haml

@@ -1,4 +1,4 @@
-%div{ id: @id, "data-controller": "modal #{@controllers}", "data-action": "keyup@document->modal#closeIfEscapeKey" }
+%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.help-modal{ "data-modal-target": "modal" }
     = content
@@ -7,4 +7,4 @@
 
     .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 }
+      %input{ class: "button icon-plus primary", type: 'button', value: t('js.admin.modals.confirm'), "data-action": @confirm_actions, "data-reflex": @confirm_reflexes }

app/components/product_component.rb

@@ -6,7 +6,7 @@ class ProductComponent < ViewComponentReflex::Component
   def initialize(product:, columns:)
     super
     @product = product
-    @image = @product.images[0] if product.images.any?
+    @image = @product.image if product.image.present?
     @columns = columns.map do |c|
       {
         id: c[:value],
@@ -28,7 +28,7 @@ class ProductComponent < ViewComponentReflex::Component
     when 'price'
       @product.price
     when 'unit'
-      "#{@product.unit_value} #{@product.variant_unit}"
+      "#{@product.variants.first.unit_value} #{@product.variant_unit}"
     when 'producer'
       @product.supplier.name
     when 'category'
@@ -43,8 +43,6 @@ class ProductComponent < ViewComponentReflex::Component
       @product.tax_category.name
     when 'inherits_properties'
       @product.inherits_properties
-    when 'available_on'
-      format_date(@product.available_on)
     when 'import_date'
       format_date(@product.import_date)
     end

app/components/product_component/product_component.html.haml

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

app/components/products_table_component.rb

@@ -17,7 +17,6 @@ class ProductsTableComponent < ViewComponentReflex::Component
       label: I18n.t("admin.products_page.columns_selector.inherits_properties"),
       value: "inherits_properties"
     },
-    { label: I18n.t("admin.products_page.columns_selector.available_on"), value: "available_on" },
     { label: I18n.t("admin.products_page.columns_selector.import_date"), value: "import_date" }
   ].sort do |a, b|
     a[:label] <=> b[:label]
@@ -168,13 +167,12 @@ class ProductsTableComponent < ViewComponentReflex::Component
 
   def product_query_includes
     [
-      master: [:images],
+      :image,
       variants: [
         :default_price,
         :stock_locations,
         :stock_items,
-        :variant_overrides,
-        { option_values: :option_type }
+        :variant_overrides
       ]
     ]
   end

app/controllers/admin/bulk_line_items_controller.rb

@@ -11,9 +11,8 @@ module Admin
 
       @line_items = order_permissions.
         editable_line_items.where(order_id: orders).
-        includes(variant: { option_values: :option_type }).
-        ransack(params[:q]).result.
-        reorder('spree_line_items.order_id ASC, spree_line_items.id ASC')
+        includes(:variant).
+        ransack(params[:q]).result.order(:id)
 
       @pagy, @line_items = pagy(@line_items) if pagination_required?
 
@@ -35,7 +34,8 @@ module Admin
       # and https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
       order.with_lock do
         if order.contents.update_item(@line_item, line_item_params)
-          render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
+          # No Content, does not trigger ng resource auto-update
+          render body: nil, status: :no_content
         else
           render json: { errors: @line_item.errors }, status: :precondition_failed
         end

app/controllers/admin/contents_controller.rb

@@ -18,6 +18,8 @@ module Admin
         end
       end
 
+      ContentConfig.updated_at = Time.zone.now
+
       flash[:success] =
         t(:successfully_updated, resource: I18n.t('admin.contents.edit.your_content'))
 

app/controllers/admin/customers_controller.rb

@@ -36,8 +36,10 @@ module Admin
     end
 
     def create
-      @customer = Customer.new(customer_params)
+      @customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
+
       if user_can_create_customer?
+        @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: tag_rule_mapping
@@ -83,7 +85,7 @@ module Admin
     def customers
       return @customers if @customers.present?
 
-      @customers = Customer.managed_by(spree_current_user)
+      @customers = Customer.visible.managed_by(spree_current_user)
       return @customers if params[:enterprise_id].blank?
 
       @customers = @customers.where(enterprise_id: params[:enterprise_id])

app/controllers/admin/enterprise_fees_controller.rb

@@ -7,6 +7,7 @@ module Admin
     before_action :load_enterprise_fee_set, only: :index
     before_action :load_data
     before_action :check_enterprise_fee_input, only: [:bulk_update]
+    before_action :check_calculators_compatibility_with_taxes, only: [:bulk_update]
 
     def index
       @include_calculators = params[:include_calculators].present?
@@ -24,7 +25,6 @@ module Admin
         format.json {
           render_as_json @collection, controller: self, include_calculators: @include_calculators
         }
-        # format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } }
       end
     end
 
@@ -62,7 +62,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: coordinator) if order_cycle.nil? && 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')
@@ -119,5 +119,17 @@ module Admin
         end
       end
     end
+
+    def check_calculators_compatibility_with_taxes
+      enterprise_fee_bulk_params['collection_attributes'].each do |_, enterprise_fee|
+        next unless enterprise_fee['inherits_tax_category'] == "true"
+        next unless EnterpriseFee::PER_ORDER_CALCULATORS.include?(enterprise_fee['calculator_type'])
+
+        flash[:error] = I18n.t(
+          'activerecord.errors.models.enterprise_fee.inherit_tax_requires_per_item_calculator'
+        )
+        return redirect_to redirect_path
+      end
+    end
   end
 end

app/controllers/admin/enterprise_relationships_controller.rb

@@ -16,7 +16,8 @@ module Admin
       @enterprise_relationship = EnterpriseRelationship.new enterprise_relationship_params
 
       if @enterprise_relationship.save
-        render plain: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
+        render plain: Api::Admin::EnterpriseRelationshipSerializer
+          .new(@enterprise_relationship).to_json
       else
         render status: :bad_request,
                json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }

app/controllers/admin/enterprises_controller.rb

@@ -29,7 +29,6 @@ module Admin
 
     after_action  :geocode_address_if_use_geocoder, only: [:create, :update]
 
-    helper 'spree/products'
     include OrderCyclesHelper
 
     def index
@@ -47,6 +46,7 @@ module Admin
     def edit
       @object = Enterprise.where(permalink: params[:id]).
         includes(users: [:ship_address, :bill_address]).first
+      @object.build_custom_tab if @object.custom_tab.nil?
       if params[:stimulus]
         @enterprise.is_primary_producer = params[:is_primary_producer]
         @enterprise.sells = params[:enterprise_sells]
@@ -64,6 +64,8 @@ module Admin
       update_tag_rules(tag_rules_attributes) if tag_rules_attributes.present?
       update_enterprise_notifications
 
+      delete_custom_tab if params[:custom_tab] == 'false'
+
       if @object.update(enterprise_params)
         flash[:success] = flash_message_for(@object, :successfully_updated)
         respond_with(@object) do |format|
@@ -119,8 +121,12 @@ module Admin
     def for_order_cycle
       respond_to do |format|
         format.json do
-          render json: @collection,
-                 each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer, order_cycle: @order_cycle, spree_current_user: spree_current_user
+          render(
+            json: @collection,
+            each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer,
+            order_cycle: @order_cycle,
+            spree_current_user: spree_current_user
+          )
         end
       end
     end
@@ -136,6 +142,11 @@ module Admin
 
     protected
 
+    def delete_custom_tab
+      @object.custom_tab.destroy if @object.custom_tab.present?
+      enterprise_params.delete(:custom_tab_attributes)
+    end
+
     def build_resource
       enterprise = super
       enterprise.address ||= Spree::Address.new
@@ -171,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: coordinator) if @order_cycle.nil? && coordinator.present?
+        @order_cycle ||= OrderCycle.new(coordinator: coordinator) if coordinator.present?
 
         enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle)
           .visible_enterprises
@@ -179,7 +190,7 @@ module Admin
         if enterprises.present?
           enterprises.includes(
             supplied_products:
-              [:supplier, { master: [:images], variants: { option_values: :option_type } }]
+              [:supplier, :variants, :image]
           )
         end
       when :index
@@ -188,7 +199,8 @@ module Admin
             editable_enterprises.
             order('is_primary_producer ASC, name')
         elsif json_request?
-          OpenFoodNetwork::Permissions.new(spree_current_user).editable_enterprises.ransack(params[:q]).result
+          OpenFoodNetwork::Permissions.new(spree_current_user)
+            .editable_enterprises.ransack(params[:q]).result
         else
           Enterprise.where("1=0")
         end
@@ -196,7 +208,6 @@ module Admin
         OpenFoodNetwork::Permissions.new(spree_current_user).visible_enterprises
           .includes(:shipping_methods, :payment_methods).ransack(params[:q]).result
       else
-        # TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now
         OpenFoodNetwork::Permissions.new(spree_current_user).
           editable_enterprises.
           order('is_primary_producer ASC, name')
@@ -317,7 +328,9 @@ module Admin
                                                      :producer_properties_attributes).nil?
         names = Spree::Property.pluck(:name)
         enterprise_params[:producer_properties_attributes].each do |key, property|
-          enterprise_params[:producer_properties_attributes].delete key unless names.include? property[:property_name]
+          unless names.include? property[:property_name]
+            enterprise_params[:producer_properties_attributes].delete key
+          end
         end
       end
     end

app/controllers/admin/product_import_controller.rb

@@ -37,8 +37,14 @@ module Admin
     end
 
     def reset_absent_products
-      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]),
-                                                     spree_current_user, import_into: params[:import_into], enterprises_to_reset: params[:enterprises_to_reset], updated_ids: params[:updated_ids], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(
+        File.new(file_path),
+        spree_current_user,
+        import_into: params[:import_into],
+        enterprises_to_reset: params[:enterprises_to_reset],
+        updated_ids: params[:updated_ids],
+        settings: params[:settings]
+      )
 
       if params.key?(:enterprises_to_reset) && params.key?(:updated_ids)
         @importer.reset_absent(params[:updated_ids])
@@ -56,8 +62,13 @@ module Admin
     end
 
     def process_data(method)
-      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]),
-                                                     spree_current_user, start: params[:start], end: params[:end], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(
+        File.new(file_path),
+        spree_current_user,
+        start: params[:start],
+        end: params[:end],
+        settings: params[:settings]
+      )
 
       begin
         @importer.public_send("#{method}_entries")
@@ -112,5 +123,25 @@ module Admin
     def model_class
       ProductImport::ProductImporter
     end
+
+    def file_path
+      @file_path ||= validate_file_path(sanitize_file_path(params[:filepath]))
+    end
+
+    def sanitize_file_path(file_path)
+      FilePathSanitizer.new.sanitize(file_path, on_error: method(:raise_invalid_file_path))
+    end
+
+    def validate_file_path(file_path)
+      return file_path if file_path.to_s.match?(TEMP_FILE_PATH_REGEX)
+
+      raise_invalid_file_path
+    end
+
+    def raise_invalid_file_path
+      redirect_to '/admin/product_import', notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
+      raise 'Invalid File Path'
+    end
+    TEMP_FILE_PATH_REGEX = %r{^/tmp/product_import[A-Za-z0-9-]*/import\.csv$}
   end
 end

app/controllers/admin/products_v3_controller.rb

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

app/controllers/admin/reports_controller.rb

@@ -22,24 +22,29 @@ module Admin
     def show
       @report = report_class.new(spree_current_user, params, render: render_data?)
 
+      @background_reports = OpenFoodNetwork::FeatureToggle
+        .enabled?(:background_reports, spree_current_user)
+
+      if @background_reports && request.post?
+        return background(report_format)
+      end
+
       if params[:report_format].present?
         export_report
       else
         show_report
       end
-    rescue Timeout::Error
-      render_timeout_error
     end
 
     private
 
     def export_report
-      send_data render_report_as(report_format), filename: report_filename
+      send_data @report.render_as(report_format), filename: report_filename
     end
 
     def show_report
       assign_view_data
-      @table = render_report_as(:html) if render_data?
+      @table = @report.render_as(:html) if render_data?
       render "show"
     end
 
@@ -56,45 +61,24 @@ module Admin
       request.post?
     end
 
-    def render_report_as(format)
-      if OpenFoodNetwork::FeatureToggle.enabled?(:background_reports, spree_current_user)
-        @blob = ReportBlob.create_for_upload_later!(report_filename)
-        ReportJob.perform_later(
-          report_class, spree_current_user, params, format, @blob
-        )
-        Timeout.timeout(max_wait_time) do
-          sleep 1 until @blob.content_stored?
-        end
+    def background(format)
+      cable_ready[ScopedChannel.for_id(params[:uuid])]
+        .inner_html(
+          selector: "#report-table",
+          html: render_to_string(partial: "admin/reports/loading")
+        ).scroll_into_view(
+          selector: "#report-table",
+          block: "start"
+        ).broadcast
 
-        # This result has been rendered by Rails in safe mode already.
-        @blob.result.html_safe # rubocop:disable Rails/OutputSafety
-      else
-        @report.render_as(format)
-      end
-    end
+      blob = ReportBlob.create_for_upload_later!(report_filename)
 
-    def render_timeout_error
-      assign_view_data
-      if @blob
-        @error = ".report_taking_longer_html"
-        @error_url = @blob.url
-      else
-        @error = ".report_taking_longer"
-        @error_url = ""
-      end
-      render "show"
-    end
+      ReportJob.perform_later(
+        report_class: report_class, user: spree_current_user, params: params,
+        format: format, blob: blob, channel: ScopedChannel.for_id(params[:uuid]),
+      )
 
-    def max_wait_time
-      # This value is used by rack-timeout and nginx, usually 30 seconds in
-      # staging and production:
-      server_timeout = ENV.fetch("RACK_TIMEOUT_SERVICE_TIMEOUT", "15").to_f
-
-      # Zero disables the timeout:
-      return 0 if server_timeout.zero?
-
-      # We want to time out earlier than nginx:
-      server_timeout - 2.seconds
+      head :no_content
     end
   end
 end

app/controllers/admin/schedules_controller.rb

@@ -40,8 +40,11 @@ module Admin
     def index
       respond_to do |format|
         format.json do
-          render_as_json @collection, ams_prefix: params[:ams_prefix],
-                                      editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+          render_as_json(
+            @collection,
+            ams_prefix: params[:ams_prefix],
+            editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+          )
         end
       end
     end
@@ -119,7 +122,8 @@ module Admin
         .pluck(:id)
       result = @existing_order_cycle_ids
       result |= (requested & permitted) # add any requested & permitted ids
-      result -= ((result & permitted) - requested) # remove any existing and permitted ids that were not specifically requested
+      # remove any existing and permitted ids that were not specifically requested
+      result -= ((result & permitted) - requested)
       result
     end
 

app/controllers/admin/subscriptions_controller.rb

@@ -18,7 +18,8 @@ module Admin
           if view_context.subscriptions_setup_complete?(@shops)
             @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user)
               .includes([:distributors, :cached_incoming_exchanges])
-            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).includes(:taggings)
+            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user)
+              .includes(:taggings)
             @payment_method_tags = payment_method_tags_by_id
             @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user)
           else
@@ -100,7 +101,8 @@ module Admin
     end
 
     def load_shops
-      @shops = Enterprise.managed_by(spree_current_user).is_distributor.where(enable_subscriptions: true)
+      @shops = Enterprise.managed_by(spree_current_user)
+        .is_distributor.where(enable_subscriptions: true)
     end
 
     def load_form_data
@@ -139,7 +141,9 @@ module Admin
       @open_orders_to_keep = @subscription.proxy_orders.placed_and_open.pluck(:id)
       return if @open_orders_to_keep.empty? || params[:open_orders] == 'keep'
 
-      render json: { errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') } },
+      render json: {
+               errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') }
+             },
              status: :conflict
     end
 
@@ -147,7 +151,9 @@ module Admin
       return if params[:canceled_orders] == 'notified'
       return if @subscription.proxy_orders.active.canceled.empty?
 
-      render json: { errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') } },
+      render json: {
+               errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') }
+             },
              status: :conflict
     end
 

app/controllers/admin/vouchers_controller.rb

@@ -26,11 +26,14 @@ module Admin
     private
 
     def load_enterprise
-      @enterprise = Enterprise.find_by permalink: params[:enterprise_id]
+      @enterprise = OpenFoodNetwork::Permissions
+        .new(spree_current_user)
+        .editable_enterprises
+        .find_by(permalink: params[:enterprise_id])
     end
 
     def permitted_resource_params
-      params.require(:voucher).permit(:code)
+      params.require(:voucher).permit(:code, :amount)
     end
   end
 end

app/controllers/api/v0/customers_controller.rb

@@ -6,7 +6,7 @@ module Api
       skip_authorization_check only: :index
 
       def index
-        @customers = current_api_user.customers
+        @customers = current_api_user.customers.visible
         render json: @customers, each_serializer: CustomerSerializer
       end
 

app/controllers/api/v0/order_cycles_controller.rb

@@ -80,8 +80,12 @@ module Api
       end
 
       def permitted_ransack_params
-        [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
-         :with_properties, :primary_taxon_id_in_any]
+        [
+          "#{[:name, :meta_keywords, :variants_display_as,
+              :variants_display_name, :supplier_name]
+          .join('_or_')}_cont",
+          :with_properties, :primary_taxon_id_in_any
+        ]
       end
 
       def distributor

app/controllers/api/v0/orders_controller.rb

@@ -47,17 +47,15 @@ module Api
       def capture
         authorize! :admin, order
 
-        pending_payment = order.pending_payments.first
+        payment_capture = OrderCaptureService.new(order)
 
-        return payment_capture_failed unless order.payment_required? && pending_payment
-
-        if pending_payment.capture!
+        if payment_capture.call
           render json: order.reload, serializer: Api::Admin::OrderSerializer, status: :ok
+        elsif payment_capture.gateway_error.present?
+          error_during_processing(payment_capture.gateway_error)
         else
           payment_capture_failed
         end
-      rescue Spree::Core::GatewayError => e
-        error_during_processing(e)
       end
 
       private

app/controllers/api/v0/product_images_controller.rb

@@ -9,9 +9,9 @@ module Api
         product = Spree::Product.find(params[:product_id])
         authorize! :update, product
 
-        image = product.images.first || Spree::Image.new(
-          viewable_id: product.master.id,
-          viewable_type: 'Spree::Variant'
+        image = product.image || Spree::Image.new(
+          viewable_id: product.id,
+          viewable_type: 'Spree::Product'
         )
 
         success_status = image.persisted? ? :ok : :created

app/controllers/api/v0/products_controller.rb

@@ -10,8 +10,6 @@ module Api
       respond_to :json
       DEFAULT_PER_PAGE = 15
 
-      before_action :set_default_available_on, only: :create
-
       skip_authorization_check only: [:show, :bulk_products, :overridable]
 
       def show
@@ -23,15 +21,10 @@ module Api
         authorize! :create, Spree::Product
         @product = Spree::Product.new(product_params)
 
-        begin
-          if @product.save
-            render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
-          else
-            invalid_resource!(@product)
-          end
-        rescue ActiveRecord::RecordNotUnique
-          @product.permalink = nil
-          retry
+        if @product.save
+          render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
+        else
+          invalid_resource!(@product)
         end
       end
 
@@ -96,8 +89,6 @@ module Api
       private
 
       def find_product(id)
-        product_scope.find_by!(permalink: id.to_s)
-      rescue ActiveRecord::RecordNotFound
         product_scope.find(id)
       end
 
@@ -116,9 +107,8 @@ module Api
 
       def product_query_includes
         [
-          master: [:images],
-          variants: [:default_price, :stock_locations, :stock_items, :variant_overrides,
-                     { option_values: :option_type }]
+          image: { attachment_attachment: :blob },
+          variants: [:default_price, :stock_locations, :stock_items, :variant_overrides]
         ]
       end
 
@@ -153,10 +143,6 @@ module Api
         @product_params ||=
           params.permit(product: PermittedAttributes::Product.attributes)[:product].to_h
       end
-
-      def set_default_available_on
-        product_params[:available_on] ||= Time.zone.now
-      end
     end
   end
 end

app/controllers/api/v0/shipments_controller.rb

@@ -21,7 +21,9 @@ module Api
         @shipment.refresh_rates
         @shipment.save!
 
-        render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+        OrderWorkflow.new(@order).advance_to_payment if @order.line_items.any?
+
+        render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
       end
 
       def update
@@ -32,7 +34,7 @@ module Api
         @shipment.fee_adjustment.fire_events(:open)
 
         if @shipment.update(shipment_params)
-          @order.updater.update_totals_and_states
+          @order.update_totals_and_states
         end
 
         @shipment.fee_adjustment.close

app/controllers/api/v0/variants_controller.rb

@@ -9,12 +9,12 @@ module Api
       before_action :product
 
       def index
-        @variants = scope.includes(option_values: :option_type).ransack(params[:q]).result
+        @variants = scope.ransack(params[:q]).result
         render json: @variants, each_serializer: Api::VariantSerializer
       end
 
       def show
-        @variant = scope.includes(option_values: :option_type).find(params[:id])
+        @variant = scope.find(params[:id])
         render json: @variant, serializer: Api::VariantSerializer
       end
 
@@ -50,15 +50,15 @@ module Api
       private
 
       def product
-        @product ||= Spree::Product.find_by(permalink: params[:product_id]) if params[:product_id]
+        @product ||= Spree::Product.find(params[:product_id]) if params[:product_id]
       end
 
       def scope
         if @product
           variants = if current_api_user.has_spree_role?("admin") || params[:show_deleted]
-                       @product.variants_including_master.with_deleted
+                       @product.variants.with_deleted
                      else
-                       @product.variants_including_master
+                       @product.variants
                      end
         else
           variants = Spree::Variant.where(nil)

app/controllers/api/v1/customers_controller.rb

@@ -29,7 +29,8 @@ module Api
 
       def create
         authorize! :update, Enterprise.find(customer_params[:enterprise_id])
-        customer = Customer.new(customer_params)
+        customer = Customer.find_or_initialize_by(customer_params.slice(:email, :enterprise_id))
+        customer.assign_attributes(customer_params)
 
         if customer.save
           render json: Api::V1::CustomerSerializer.new(customer), status: :created
@@ -80,7 +81,7 @@ module Api
       end
 
       def visible_customers
-        Customer.managed_by(current_api_user)
+        Customer.visible.managed_by(current_api_user)
       end
 
       def customer_params
@@ -96,6 +97,7 @@ module Api
           ]
         ).to_h
 
+        attributes.merge!(created_manually: true)
         attributes.merge!(tag_list: params[:tags]) if params.key?(:tags)
 
         transform_address!(attributes, :billing_address, :bill_address)

app/controllers/application_controller.rb

@@ -9,6 +9,7 @@ require 'spree/core/controller_helpers/common'
 require 'open_food_network/referer_parser'
 
 class ApplicationController < ActionController::Base
+  include CablecarResponses
   include Pagy::Backend
   include RequestTimeouts
 

app/controllers/checkout_controller.rb

@@ -1,187 +0,0 @@
-# frozen_string_literal: true
-
-require 'open_food_network/address_finder'
-
-class CheckoutController < ::BaseController
-  include OrderStockCheck
-  include OrderCompletion
-  include WhiteLabel
-
-  layout 'darkswarm'
-
-  helper 'terms_and_conditions'
-  helper 'checkout'
-
-  # We need pessimistic locking to avoid race conditions.
-  # Otherwise we fail on duplicate indexes or end up with negative stock.
-  prepend_around_action CurrentOrderLocker, only: [:edit, :update]
-
-  prepend_before_action :check_hub_ready_for_checkout
-  prepend_before_action :check_order_cycle_expiry
-  prepend_before_action :require_order_cycle
-  prepend_before_action :require_distributor_chosen
-
-  before_action :load_order
-
-  before_action :handle_insufficient_stock
-
-  before_action :associate_user
-  before_action :check_authorization
-
-  before_action :hide_ofn_navigation, only: :edit
-
-  helper 'spree/orders'
-
-  def edit; end
-
-  def update
-    params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
-    return action_failed unless @order.update(params_adapter.params[:order] || {})
-
-    checkout_workflow(params_adapter.shipping_method_id)
-  rescue Spree::Core::GatewayError => e
-    gateway_error(e)
-    action_failed(e)
-  rescue StandardError => e
-    flash[:error] = I18n.t("checkout.failed")
-    action_failed(e)
-  ensure
-    @order.update_order!
-  end
-
-  private
-
-  def check_authorization
-    authorize!(:edit, current_order, session[:access_token])
-  end
-
-  def load_order
-    load_checkout_order
-
-    return handle_invalid_stock unless valid_order_line_items?
-
-    before_address
-    setup_for_current_state
-  end
-
-  def handle_invalid_stock
-    reset_order_to_cart
-
-    respond_to do |format|
-      format.html do
-        redirect_to main_app.cart_path
-      end
-
-      format.json do
-        render json: { path: main_app.cart_path }, status: :bad_request
-      end
-    end
-  end
-
-  def setup_for_current_state
-    method_name = :"before_#{@order.state}"
-    __send__(method_name) if respond_to?(method_name, true)
-  end
-
-  def before_address
-    associate_user
-
-    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
-
-    @order.bill_address = finder.bill_address
-    @order.ship_address = finder.ship_address
-  end
-
-  def before_payment
-    current_order.payments.destroy_all if request.put?
-  end
-
-  def checkout_workflow(shipping_method_id)
-    while @order.state != "complete"
-      if @order.state == "payment"
-        update_payment_total
-        return if redirect_to_payment_gateway
-
-        return action_failed if @order.errors.any?
-        return action_failed unless @order.process_payments!
-      end
-
-      next if OrderWorkflow.new(@order).next({ "shipping_method_id" => shipping_method_id })
-
-      return action_failed
-    end
-
-    update_response
-  end
-
-  def update_payment_total
-    @order.updater.update_totals
-    @order.updater.update_pending_payment
-  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 json: { path: redirect_url }, status: :ok
-    true
-  end
-
-  def selected_payment_method
-    @selected_payment_method ||= Spree::PaymentMethod.find(
-      params.dig(:order, :payments_attributes, 0, :payment_method_id)
-    )
-  end
-
-  def update_response
-    if order_complete?
-      processing_succeeded
-      update_succeeded_response
-    else
-      action_failed(RuntimeError.new("Order not complete after the checkout workflow"))
-    end
-  end
-
-  def order_complete?
-    @order.state == "complete" || @order.completed?
-  end
-
-  def update_succeeded_response
-    respond_to do |format|
-      format.html do
-        respond_with(@order, location: order_completion_route)
-      end
-      format.json do
-        render json: { path: order_completion_route }, status: :ok
-      end
-    end
-  end
-
-  def action_failed(error = RuntimeError.new(order_processing_error))
-    processing_failed(error)
-    action_failed_response
-  end
-
-  def action_failed_response
-    respond_to do |format|
-      format.html do
-        render :edit
-      end
-      format.json do
-        discard_flash_errors
-        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
-      end
-    end
-  end
-
-  def permitted_params
-    PermittedAttributes::Checkout.new(params).call
-  end
-
-  def discard_flash_errors
-    # Marks flash errors for deletion after the current action has completed.
-    # This ensures flash errors generated during XHR requests are not persisted in the
-    # session for longer than expected.
-    flash.discard(:error)
-  end
-end

app/controllers/concerns/checkout_callbacks.rb

@@ -30,6 +30,8 @@ module CheckoutCallbacks
     @order.manual_shipping_selection = true
     @order.checkout_processing = true
 
+    @voucher_adjustment = @order.voucher_adjustments.first
+
     redirect_to(main_app.shop_path) && return if redirect_to_shop?
     redirect_to_cart_path && return unless valid_order_line_items?
   end

app/controllers/concerns/order_completion.rb

@@ -41,8 +41,8 @@ module OrderCompletion
     main_app.order_path(@order, order_token: @order.token)
   end
 
-  def order_failed_route
-    main_app.checkout_path
+  def order_failed_route(step: 'details')
+    main_app.checkout_step_path(step:)
   end
 
   def order_invalid_for_checkout?
@@ -60,8 +60,8 @@ module OrderCompletion
 
   def process_payment_completion!
     unless @order.process_payments!
-      processing_failed
-      return redirect_to order_failed_route
+      payment_failed
+      return redirect_to order_failed_route(step: 'payment')
     end
 
     if OrderWorkflow.new(@order).next && @order.complete?
@@ -82,12 +82,20 @@ module OrderCompletion
     order_completion_reset(@order)
   end
 
-  def processing_failed(error = RuntimeError.new(order_processing_error))
+  def payment_failed
+    notify_failure
+  end
+
+  def processing_failed
+    notify_failure
+    Checkout::PostCheckoutActions.new(@order).failure
+  end
+
+  def notify_failure(error = RuntimeError.new(order_processing_error))
     Bugsnag.notify(error) do |payload|
       payload.add_metadata :order, @order
     end
     flash[:error] = order_processing_error if flash.blank?
-    Checkout::PostCheckoutActions.new(@order).failure
   end
 
   def order_processing_error

app/controllers/concerns/order_stock_check.rb

@@ -13,8 +13,6 @@ module OrderStockCheck
   def handle_insufficient_stock
     return if sufficient_stock?
 
-    reset_order_to_cart
-
     flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
     redirect_to main_app.cart_path
   end
@@ -43,10 +41,4 @@ module OrderStockCheck
   def sufficient_stock?
     @sufficient_stock ||= @order.insufficient_stock_lines.blank?
   end
-
-  def reset_order_to_cart
-    return if OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, spree_current_user
-
-    OrderCheckoutRestart.new(@order).call
-  end
 end

app/controllers/concerns/white_label.rb

@@ -5,10 +5,15 @@ module WhiteLabel
   include EnterprisesHelper
 
   def hide_ofn_navigation(distributor = current_distributor)
-    return false unless OpenFoodNetwork::FeatureToggle.enabled?(:white_label)
-
     # if the distributor has the hide_ofn_navigation preference set to true
     # then we should hide the OFN navigation
     @hide_ofn_navigation = distributor.hide_ofn_navigation
+
+    # if the distributor has the hide_ofn_navigation preference
+    # set to false, there is no need to check the white_label_logo preference
+    return unless @hide_ofn_navigation
+
+    @white_label_logo = distributor.white_label_logo
+    @white_label_distributor = distributor
   end
 end

app/controllers/enterprises_controller.rb

@@ -4,7 +4,6 @@ require 'open_food_network/enterprise_injection_data'
 
 class EnterprisesController < BaseController
   layout "darkswarm"
-  helper Spree::ProductsHelper
   include OrderCyclesHelper
   include SerializerHelper
   include WhiteLabel

app/controllers/payment_gateways/paypal_controller.rb

@@ -27,13 +27,16 @@ module PaymentGateways
           redirect_to provider.express_checkout_url(pp_response, useraction: 'commit')
         else
           flash[:error] =
-            Spree.t('flash.generic_error', scope: 'paypal',
-                                           reasons: pp_response.errors.map(&:long_message).join(" "))
-          redirect_to main_app.checkout_state_path(:payment)
+            Spree.t(
+              'flash.generic_error',
+              scope: 'paypal',
+              reasons: pp_response.errors.map(&:long_message).join(" "),
+            )
+          redirect_to main_app.checkout_step_path(:payment)
         end
       rescue SocketError
         flash[:error] = Spree.t('flash.connection_failed', scope: 'paypal')
-        redirect_to main_app.checkout_state_path(:payment)
+        redirect_to main_app.checkout_step_path(:payment)
       end
     end
 

app/controllers/split_checkout_controller.rb

@@ -24,12 +24,13 @@ class SplitCheckoutController < ::BaseController
   def edit
     redirect_to_step_based_on_order unless params[:step]
     check_step if params[:step]
-    recalculate_tax if params[:step] == "summary"
 
     flash_error_when_no_shipping_method_available if available_shipping_methods.none?
   end
 
   def update
+    return process_voucher if params[:apply_voucher].present?
+
     if confirm_order || update_order
       return if performed?
 
@@ -59,6 +60,27 @@ class SplitCheckoutController < ::BaseController
       replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
   end
 
+  def render_voucher_section_or_redirect
+    respond_to do |format|
+      format.cable_ready { render_voucher_section }
+      format.html { redirect_to checkout_step_path(:payment) }
+    end
+  end
+
+  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
+  def render_voucher_section
+    render(
+      status: :ok,
+      cable_ready: cable_car.replace(
+        "#voucher-section",
+        partial(
+          "split_checkout/voucher_section",
+          locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
+        )
+      )
+    )
+  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?
@@ -149,7 +171,7 @@ class SplitCheckoutController < ::BaseController
 
     @order.select_shipping_method(params[:shipping_method_id])
     @order.update(order_params)
-    @order.updater.update_totals_and_states
+    @order.update_totals_and_states
 
     validate_current_step!
 
@@ -179,10 +201,48 @@ class SplitCheckoutController < ::BaseController
     selected_shipping_method.first.require_ship_address == false
   end
 
+  def process_voucher
+    if add_voucher
+      VoucherAdjustmentsService.calculate(@order)
+      render_voucher_section_or_redirect
+    elsif @order.errors.present?
+      render_error
+    end
+  end
+
+  def add_voucher
+    if params.dig(:order, :voucher_code).blank?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
+
+    # Fetch Voucher
+    voucher = Voucher.find_by(code: params[:order][:voucher_code], enterprise: @order.distributor)
+
+    if voucher.nil?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
+
+    adjustment = voucher.create_adjustment(voucher.code, @order)
+
+    unless adjustment.valid?
+      @order.errors.add(:voucher, I18n.t('split_checkout.errors.add_voucher_error'))
+      adjustment.errors.each { |error| @order.errors.import(error) }
+      return false
+    end
+
+    true
+  end
+
   def summary_step?
     params[:step] == "summary"
   end
 
+  def payment_step?
+    params[:step] == "payment"
+  end
+
   def advance_order_state
     return if @order.complete?
 
@@ -248,9 +308,4 @@ class SplitCheckoutController < ::BaseController
       redirect_to checkout_step_path(:payment) if params[:step] == "summary"
     end
   end
-
-  def recalculate_tax
-    @order.create_tax_charge!
-    @order.update_order!
-  end
 end

app/controllers/spree/admin/adjustments_controller.rb

@@ -14,7 +14,7 @@ module Spree
 
       def update_order
         @order.reload
-        @order.updater.update_totals_and_states
+        @order.update_totals_and_states
       end
 
       def collection

app/controllers/spree/admin/base_controller.rb

@@ -33,7 +33,7 @@ module Spree
 
       def model_class
         const_name = controller_name.classify
-        return "Spree::#{const_name}".constantize if Spree.const_defined?(const_name)
+        return "Spree::#{const_name}".constantize if Object.const_defined?("Spree::#{const_name}")
 
         nil
       end

app/controllers/spree/admin/images_controller.rb

@@ -6,7 +6,7 @@ module Spree
       # This will make resource controller redirect correctly after deleting product images.
       # This can be removed after upgrading to Spree 2.1.
       # See here https://github.com/spree/spree/commit/334a011d2b8e16355e4ae77ae07cd93f7cbc8fd1
-      belongs_to 'spree/product', find_by: :permalink
+      belongs_to 'spree/product'
 
       before_action :load_data
 
@@ -25,6 +25,7 @@ module Spree
         set_viewable
 
         @object.attributes = permitted_resource_params
+
         if @object.save
           flash[:success] = flash_message_for(@object, :successfully_created)
           redirect_to spree.admin_product_images_url(params[:product_id], @url_filters)
@@ -62,20 +63,28 @@ module Spree
 
       private
 
+      def collection
+        parent.image
+      end
+
+      def find_resource
+        parent.image
+      end
+
+      def build_resource
+        Spree::Image.new(viewable: parent)
+      end
+
       def location_after_save
         spree.admin_product_images_url(@product)
       end
 
       def load_data
-        @product = Product.find_by(permalink: params[:product_id])
-        @variants = @product.variants.collect do |variant|
-          [variant.options_text, variant.id]
-        end
-        @variants.insert(0, [Spree.t(:all), @product.master.id])
+        @product = Product.find(params[:product_id])
       end
 
       def set_viewable
-        @image.viewable_type = 'Spree::Variant'
+        @image.viewable_type = 'Spree::Product'
         @image.viewable_id = params[:image][:viewable_id]
       end
 

app/controllers/spree/admin/invoices_controller.rb

@@ -6,6 +6,10 @@ module Spree
       respond_to :json
       authorize_resource class: false
 
+      def index
+        @order = Spree::Order.find_by(number: params[:order_id])
+      end
+
       def create
         invoice_service = BulkInvoiceService.new
         invoice_service.start_pdf_job(params[:order_ids])
@@ -13,6 +17,24 @@ module Spree
         render json: invoice_service.id, status: :ok
       end
 
+      def generate
+        @order = Order.find_by(number: params[:order_id])
+        @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
+
       def show
         invoice_id = params[:id]
         invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
@@ -29,6 +51,12 @@ module Spree
           render json: { created: false }, status: :unprocessable_entity
         end
       end
+
+      protected
+
+      def invoice_data
+        @invoice_data ||= InvoiceDataGenerator.new(@order).generate
+      end
     end
   end
 end

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

@@ -24,7 +24,6 @@ module Spree
             end
 
             refresh_shipment_rates
-            recalculate_taxes
             OrderWorkflow.new(@order).advance_to_payment
 
             flash[:success] = Spree.t('customer_details_updated')
@@ -52,19 +51,11 @@ module Spree
           @order.shipments.map(&:refresh_rates)
         end
 
-        def recalculate_taxes
-          # If the order's address has been changed, the tax zone could be different,
-          # which means a different set of tax rates might be applicable.
-          @order.create_tax_charge!
-          Spree::TaxRate.adjust(@order, @order.adjustments.admin)
-
-          @order.updater.update_totals_and_states
-        end
-
         def order_params
           params.require(:order).permit(
             :email,
             :use_billing,
+            :customer_id,
             bill_address_attributes: ::PermittedAttributes::Address.attributes,
             ship_address_attributes: ::PermittedAttributes::Address.attributes
           )

app/controllers/spree/admin/orders_controller.rb

@@ -8,51 +8,50 @@ module Spree
       include OpenFoodNetwork::SpreeApiKeyLoader
       helper CheckoutHelper
 
-      before_action :load_order, only: [:edit, :update, :fire, :resend,
-                                        :invoice, :print]
-      before_action :load_distribution_choices, only: [:new, :edit, :update]
-
-      # Ensure that the distributor is set for an order when
-      before_action :ensure_distribution, only: :new
+      before_action :load_order, only: [:edit, :update, :fire, :resend, :invoice, :print]
+      before_action :load_distribution_choices, only: [:new, :create, :edit, :update]
       before_action :require_distributor_abn, only: :invoice
+      before_action :restore_saved_query!, only: :index
 
       respond_to :html, :json
 
+      def index
+        orders = SearchOrders.new(search_params, spree_current_user).orders
+        @pagy, @orders = pagy(orders, items: params[:per_page] || 15)
+
+        update_search_results if searching?
+      end
+
       def new
-        @order = Order.create
-        @order.created_by = spree_current_user
-        @order.save
-        redirect_to spree.edit_admin_order_url(@order)
+        @order = Spree::Order.new
       end
 
       def edit
         @order.shipments.map(&:refresh_rates)
+      end
 
-        OrderWorkflow.new(@order).advance_to_payment
-        @order.errors.clear
+      def create
+        @order = Spree::Order.new(order_params.merge(created_by: spree_current_user))
+
+        if @order.save(context: :require_distribution)
+          redirect_to spree.admin_order_customer_path(@order)
+        else
+          render :new
+        end
       end
 
       def update
-        @order.recreate_all_fees!
+        on_update
 
-        unless @order.cart?
-          @order.create_tax_charge!
-          @order.update_order!
-        end
-
-        if params[:set_distribution_step] && @order.update(order_params)
-          return redirect_to spree.admin_order_customer_path(@order)
-        end
-
-        unless order_params.present? && @order.update(order_params) && @order.line_items.present?
-          if @order.line_items.empty? && !params[:suppress_error_msg]
-            @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
-          end
+        order_updated = order_params.present? && @order.update(order_params)
 
+        unless order_updated && line_items_present?
           flash[:error] = @order.errors.full_messages.join(', ') if @order.errors.present?
           return redirect_to spree.edit_admin_order_path(@order)
         end
 
+        OrderWorkflow.new(@order).advance_to_payment
+
         if @order.complete?
           redirect_to spree.edit_admin_order_path(@order)
         else
@@ -100,11 +99,61 @@ module Spree
       end
 
       def print
+        if OpenFoodNetwork::FeatureToggle.enabled?(:invoices)
+          @order = @order.invoices.find(params[:invoice_id]).presenter
+        end
+
         render_with_wicked_pdf InvoiceRenderer.new.args(@order)
       end
 
       private
 
+      def line_items_present?
+        return true if @order.line_items.any?
+
+        @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
+        false
+      end
+
+      def update_search_results
+        session[:admin_orders_search] = search_params
+
+        render cable_ready: cable_car.inner_html(
+          "#orders-index",
+          partial("spree/admin/orders/table", locals: { pagy: @pagy, orders: @orders })
+        )
+      end
+
+      def searching?
+        params[:q].present? && request.format.symbol == :cable_ready
+      end
+
+      def search_params
+        default_filters.deep_merge(
+          params.permit(:page, :per_page, :shipping_method_id, q: {})
+        ).to_h.with_indifferent_access
+      end
+
+      def default_filters
+        { q: { completed_at_not_null: 1, s: "completed_at desc" } }
+      end
+
+      def restore_saved_query!
+        return unless request.format.html?
+
+        @_params = ActionController::Parameters.new(session[:admin_orders_search] || {})
+        @stored_query = search_params.to_query
+      end
+
+      def on_update
+        @order.recreate_all_fees!
+
+        return if @order.cart?
+
+        @order.create_tax_charge!
+        @order.update_order!
+      end
+
       def order_params
         return params[:order] if params[:order].blank?
 
@@ -142,17 +191,6 @@ module Spree
                         ocs.closed +
                         ocs.undated
       end
-
-      def ensure_distribution
-        unless @order
-          @order = Spree::Order.new
-          @order.generate_order_number
-          @order.save!
-        end
-        return if @order.distribution_set?
-
-        render 'set_distribution', locals: { order: @order }
-      end
     end
   end
 end

app/controllers/spree/admin/payment_methods_controller.rb

@@ -7,7 +7,6 @@ module Spree
       before_action :load_data
       before_action :validate_payment_method_provider, only: [:create]
       before_action :load_hubs, only: [:new, :edit, :update]
-      before_action :validate_calculator_preferred_value, only: [:update]
 
       respond_to :html
 
@@ -17,6 +16,10 @@ module Spree
         @payment_method = payment_method_class.constantize.new(base_params)
         @object = @payment_method
 
+        if !base_params["calculator_type"] && gateway_params["calculator_type"]
+          @payment_method.calculator_type = gateway_params["calculator_type"]
+        end
+
         load_hubs
 
         if @payment_method.save
@@ -44,6 +47,7 @@ module Spree
           redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           respond_with(@payment_method)
+          clear_preference_cache
         end
       end
 
@@ -182,33 +186,23 @@ module Spree
             end
           end
 
+          # Ensure the calculator to be updated is the correct type
+          if params_for_update["calculator_type"] && params_for_update["calculator_attributes"]
+            add_type_to_calculator_attributes(params_for_update)
+          end
+
           params_for_update
         end
       end
 
-      def validate_calculator_preferred_value
-        return if calculator_preferred_values.all? do |value|
-          preferred_value_from_params = gateway_params.dig(:calculator_attributes, value)
-          preferred_value_from_params.nil? || Float(preferred_value_from_params,
-                                                    exception: false)
+      def clear_preference_cache
+        @payment_method.calculator.preferences.each_key do |key|
+          Rails.cache.delete(@payment_method.calculator.preference_cache_key(key))
         end
-
-        flash[:error] = I18n.t(:calculator_preferred_value_error)
-        redirect_to spree.edit_admin_payment_method_path(@payment_method)
       end
 
-      def calculator_preferred_values
-        [
-          :preferred_amount,
-          :preferred_flat_percent,
-          :preferred_flat_percent,
-          :preferred_first_item,
-          :preferred_additional_item,
-          :preferred_max_items,
-          :preferred_normal_amount,
-          :preferred_discount_amount,
-          :preferred_minimal_amount
-        ]
+      def add_type_to_calculator_attributes(hash)
+        hash["calculator_attributes"]["type"] = hash["calculator_type"]
       end
     end
   end

app/controllers/spree/admin/payments_controller.rb

@@ -129,7 +129,8 @@ module Spree
                             @payment_methods.first
                           end
 
-        @previous_cards = @order.credit_cards.with_payment_profile
+        credit_card_ids = @order.payments.from_credit_card.pluck(:source_id).uniq
+        @previous_cards = CreditCard.where(id: credit_card_ids).with_payment_profile
       end
 
       # At this point admin should have passed through Customer Details step

app/controllers/spree/admin/product_properties_controller.rb

@@ -3,7 +3,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ::Admin::ResourceController
-      belongs_to 'spree/product', find_by: :permalink
+      belongs_to 'spree/product'
       before_action :find_properties
       before_action :setup_property, only: [:index]
 

app/controllers/spree/admin/products_controller.rb

@@ -7,7 +7,6 @@ require 'open_food_network/permissions'
 module Spree
   module Admin
     class ProductsController < ::Admin::ResourceController
-      helper 'spree/products'
       include OpenFoodNetwork::SpreeApiKeyLoader
       include OrderCyclesHelper
       include EnterprisesHelper
@@ -23,10 +22,6 @@ module Spree
 
       def create
         delete_stock_params_and_set_after do
-          if params[:product][:prototype_id].present?
-            @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-          end
-
           @object.attributes = permitted_resource_params
           if @object.save
             flash[:success] = flash_message_for(@object, :successfully_created)
@@ -108,7 +103,7 @@ module Spree
       protected
 
       def find_resource
-        Product.find_by!(permalink: params[:id])
+        Product.find(params[:id])
       end
 
       def location_after_save
@@ -117,7 +112,6 @@ module Spree
 
       def load_data
         @taxons = Taxon.order(:name)
-        @option_types = OptionType.order(:name)
         @tax_categories = TaxCategory.order(:name)
         @shipping_categories = ShippingCategory.order(:name)
       end
@@ -127,8 +121,7 @@ module Spree
       end
 
       def product_includes
-        [{ variants: [:images, { option_values: :option_type }] },
-         { master: [:images, :default_price] }]
+        [:image, { variants: [:images] }]
       end
 
       def collection_actions
@@ -188,7 +181,6 @@ module Spree
           joins(:product).
           where('spree_products.supplier_id IN (?)', editable_enterprises.collect(&:id)).
           where('spree_variants.import_date IS NOT NULL').
-          where(spree_variants: { is_master: false }).
           where(spree_variants: { deleted_at: nil }).
           order('spree_variants.import_date DESC')
       end
@@ -214,7 +206,7 @@ module Spree
       end
 
       def set_stock_levels(product, on_hand, on_demand)
-        variant = product_variant(product)
+        variant = product.variants.first
 
         begin
           variant.on_demand = on_demand if on_demand.present?
@@ -234,14 +226,6 @@ module Spree
         end
       end
 
-      def product_variant(product)
-        if product.variants.any?
-          product.variants.first
-        else
-          product.master
-        end
-      end
-
       def set_product_master_variant_price_to_zero
         @product.price = 0 if @product.price.nil?
       end

app/controllers/spree/admin/variants_controller.rb

@@ -5,10 +5,7 @@ require 'open_food_network/scope_variants_for_search'
 module Spree
   module Admin
     class VariantsController < ::Admin::ResourceController
-      helper 'spree/products'
-      belongs_to 'spree/product', find_by: :permalink
-
-      before_action :assign_default_attributes, only: :new
+      belongs_to 'spree/product'
 
       def index
         @url_filters = ::ProductFilters.new.extract(request.query_parameters)
@@ -46,6 +43,7 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_created)
           redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
         else
+          flash[:error] = @object.errors.full_messages.to_sentence if @object.errors.any?
           redirect_to spree.new_admin_product_variant_url(params[:product_id], @url_filters)
         end
 
@@ -81,18 +79,9 @@ module Spree
       end
 
       def create_before
-        option_values = params[:new_variant]
-        option_values&.each_value { |id| @object.option_values << OptionValue.find(id) }
         @object.save
       end
 
-      def assign_default_attributes
-        @object.attributes = @object.product.master.
-          attributes.except('id', 'created_at', 'deleted_at', 'sku', 'is_master')
-        # Shallow Clone of the default price to populate the price field.
-        @object.default_price = @object.product.master.default_price.clone
-      end
-
       def collection
         @deleted = params.key?(:deleted) && params[:deleted] == "on" ? "checked" : ""
 

app/controllers/spree/orders_controller.rb

@@ -10,7 +10,7 @@ module Spree
     layout 'darkswarm'
 
     rescue_from ActiveRecord::RecordNotFound, with: :render_404
-    helper 'spree/products', 'spree/orders'
+    helper 'spree/orders'
 
     respond_to :html, :json
 
@@ -78,7 +78,7 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next_transition.run_callbacks if @order.cart?
-              redirect_to main_app.checkout_state_path(@order.checkout_steps.first)
+              redirect_to main_app.checkout_step_path(@order.checkout_steps.first)
             elsif @order.complete?
               redirect_to main_app.order_path(@order)
             else

app/controllers/voucher_adjustments_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class VoucherAdjustmentsController < BaseController
+  include CablecarResponses
+
+  def destroy
+    @order = current_order
+
+    @order.voucher_adjustments.find_by(id: params[:id])&.destroy
+
+    respond_to do |format|
+      format.cable_ready { render_voucher_section }
+      format.html { redirect_to checkout_step_path(:payment) }
+    end
+  end
+
+  private
+
+  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
+  def render_voucher_section
+    render(
+      status: :ok,
+      cable_ready: cable_car.replace(
+        "#voucher-section",
+        partial(
+          "split_checkout/voucher_section",
+          locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
+        )
+      )
+    )
+  end
+end

app/helpers/admin/enterprises_helper.rb

@@ -49,13 +49,8 @@ module Admin
         { name: 'tag_rules', icon_class: "icon-random", show: is_shop },
         { name: 'shop_preferences', icon_class: "icon-shopping-cart", show: is_shop },
         { name: 'users', icon_class: "icon-user", show: true },
-      ] + [add_white_label_if_feature_activated].compact
-    end
-
-    def add_white_label_if_feature_activated
-      return nil unless OpenFoodNetwork::FeatureToggle.enabled?(:white_label)
-
-      { name: 'white_label', icon_class: "icon-leaf", show: true }
+        { name: 'white_label', icon_class: "icon-leaf", show: true },
+      ]
     end
   end
 end

app/helpers/angular_form_builder.rb

@@ -34,7 +34,13 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     options.reverse_merge!('id' => angular_id(method), 'ng-model' => angular_model(method).to_s)
 
     @template.select_tag angular_name(method),
-                         @template.ng_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
+                         @template.ng_options_from_collection_for_select(
+                           collection,
+                           value_method,
+                           text_method,
+                           angular_field
+                         ),
+                         options
   end
 
   private

app/helpers/angular_form_helper.rb

@@ -7,7 +7,8 @@ module AngularFormHelper
     container.map do |element|
       html_attributes = option_html_attributes(element)
       text, value = option_text_and_value(element).map(&:to_s)
-      %(<option value="#{ERB::Util.html_escape(value)}"#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
+      %(<option value="#{ERB::Util.html_escape(value)}"\
+        #{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
     end.join("\n").html_safe
   end
 

app/helpers/application_helper.rb

@@ -68,4 +68,14 @@ module ApplicationHelper
       wicked_pdf_stylesheet_pack_tag(source)
     end
   end
+
+  def cache_with_locale(key = nil, options = {}, &block)
+    cache(cache_key_with_locale(key, I18n.locale), options) do
+      yield(block)
+    end
+  end
+
+  def cache_key_with_locale(key, locale)
+    Array.wrap(key) + [locale.to_s, I18nDigests.for_locale(locale)]
+  end
 end

app/helpers/checkout_helper.rb

@@ -139,7 +139,7 @@ module CheckoutHelper
   def stripe_card_options(cards)
     cards.map do |cc|
       [
-        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:"\
+        "#{cc.brand} #{cc.last_digits} #{I18n.t(:card_expiry_abbreviation)}:" \
         "#{cc.month.to_s.rjust(2, '0')}/#{cc.year}", cc.id
       ]
     end

app/helpers/enterprises_helper.rb

@@ -77,7 +77,8 @@ module EnterprisesHelper
   end
 
   def subscriptions_enabled?
-    spree_current_user.admin? || spree_current_user.enterprises.where(enable_subscriptions: true).any?
+    spree_current_user.admin? ||
+      spree_current_user.enterprises.where(enable_subscriptions: true).any?
   end
 
   def enterprise_url_selector(enterprise)
@@ -87,4 +88,10 @@ module EnterprisesHelper
       main_app.producers_url
     end
   end
+
+  def main_logo_link(enterprise)
+    return enterprise.white_label_logo_link if enterprise&.white_label_logo_link.present?
+
+    main_app.root_path
+  end
 end

app/helpers/injection_helper.rb

@@ -89,16 +89,6 @@ module InjectionHelper
     render partial: "json/injection_ams", locals: { name: "orderCycleData", json: json }
   end
 
-  def inject_available_shipping_methods
-    inject_json_array "shippingMethods", available_shipping_methods,
-                      Api::ShippingMethodSerializer, current_order: current_order
-  end
-
-  def inject_available_payment_methods
-    inject_json_array "paymentMethods", available_payment_methods,
-                      Api::PaymentMethodSerializer, current_order: current_order
-  end
-
   def inject_taxons
     inject_json_array "taxons", Spree::Taxon.all.to_a, Api::TaxonSerializer
   end

app/helpers/order_cycles_helper.rb

@@ -36,6 +36,13 @@ module OrderCyclesHelper
                                  shipping_and_payment_methods: true
   end
 
+  def distributors_with_editable_shipping_and_payment_methods(order_cycle)
+    return order_cycle.distributors if Enterprise
+      .managed_by(spree_current_user).exists?(order_cycle.coordinator.id)
+
+    order_cycle.distributors.managed_by(spree_current_user)
+  end
+
   def order_cycle_status_class(order_cycle)
     if order_cycle.undated?
       'undated'
@@ -53,7 +60,8 @@ module OrderCyclesHelper
   end
 
   def simple_index
-    @simple_index ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
+    @simple_index ||=
+      !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles?
   end
 
   def pickup_time(order_cycle = current_order_cycle)
@@ -73,7 +81,8 @@ module OrderCyclesHelper
   def validated_enterprise_options(enterprises, options = {})
     enterprises.map do |e|
       disabled_message = nil
-      if options[:shipping_and_payment_methods] && (e.shipping_methods.empty? || e.payment_methods.available.empty?)
+      if options[:shipping_and_payment_methods] &&
+         (e.shipping_methods.empty? || e.payment_methods.available.empty?)
         if e.shipping_methods.empty? && e.payment_methods.available.empty?
           disabled_message = I18n.t(:no_shipping_or_payment)
         elsif e.shipping_methods.empty?