Update en.yml

Removing mentions about UFC Que choisir and changing the link

.env

@@ -61,3 +61,12 @@ SMTP_PASSWORD="f00d"
 # NEW_RELIC_AGENT_ENABLED=true
 # NEW_RELIC_APP_NAME="Open Food Network"
 # NEW_RELIC_LICENSE_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Database encryption configuration, required for VINE connected app
+# Generate with bin/rails db:encryption:init
+# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# VINE API settings
+# VINE_API_URL="https://vine-staging.openfoodnetwork.org.au/api/v1"

.env.development

@@ -24,3 +24,8 @@ SITE_URL="0.0.0.0:3000"
 RACK_TIMEOUT_SERVICE_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_OVERTIME="0"
+
+# Database encryption configuration, required for VINE connected app
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="dev_primary_key"
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="dev_determinnistic_key"
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="dev_derivation_salt"

.env.test

@@ -16,5 +16,9 @@ STRIPE_PUBLIC_TEST_API_KEY="bogus_stripe_publishable_key"
 SITE_URL="test.host"
 
 OPENID_APP_ID="test-provider"
-OPENID_APP_SECRET="12345"
+OPENID_APP_SECRET="dummy-openid-app-secret-token"
 OPENID_REFRESH_TOKEN="dummy-refresh-token"
+
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="test_primary_key"
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="test_deterministic_key"
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="test_derivation_salt"

.github/ISSUE_TEMPLATE/release.md

@@ -7,10 +7,11 @@ assignees: ''
 
 ---
 
-## 1. Preparation on Thursday
+## 1. Drafting on Friday
 
 - [ ] Merge pull requests in the [Ready To Go] column
 - [ ] Include translations: `script/release/update_locales`
+    - You need the [Transifex Client] installed on your local dev environement to run the script.
 - [ ] Increment version number: `git push upstream HEAD:refs/tags/vX.Y.Z`
     - Major: if server changes are required (eg. provision with ofn-install)
     - Minor: larger change that is irreversible (eg. migration deleting data)
@@ -25,8 +26,9 @@ assignees: ''
 - [ ] Move this issue to Test Ready.
 - [ ] Notify `@testers` in [#testing].
 - [ ] Test build: [Deploy to Staging] with release tag.
+- [ ] Notify a deployer to deploy it
 
-## 3. Finish on Tuesday
+## 3. Deployment at beginning of week
 
 - [ ] Publish and notify [#global-community] (this is automatically posted with a plugin)
 - [ ] Deploy the new release to all managed instances.
@@ -39,7 +41,7 @@ assignees: ''
   </details>
 - [ ] Notify [#instance-managers]:
   > @instance_managers The new release has been deployed.
-- [ ] [Create issue] for next release and confirm with next release manager in [#core-devs].
+- [ ] [Create issue] for next release and confirm with next release drafter in [#delivery-circle].
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
 
@@ -52,4 +54,5 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 [Deploy to Staging]: https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/stage.yml
 [#global-community]: https://app.slack.com/client/T02G54U79/C59ADD8F2
 [Create issue]: https://github.com/openfoodfoundation/openfoodnetwork/issues/new?assignees=&labels=&projects=&template=release.md&title=Release
-[#core-devs]: https://openfoodnetwork.slack.com/archives/GK2T38QPJ
+[#delivery-circle]: https://openfoodnetwork.slack.com/archives/C01T75H6G0Z
+[Transifex Client]: https://developers.transifex.com/docs/cli

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on:
   workflow_dispatch:
   push:
-    branches-ignore:    
+    branches-ignore:
       - 'dependabot/**'
   pull_request:
 
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -81,11 +81,20 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}"
         run: |
           git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
           bin/rake knapsack_pro:rspec
 
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-controllers-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
+
   models:
     runs-on: ubuntu-22.04
     services:
@@ -116,7 +125,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -141,10 +150,19 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}"
         run: |
           bin/rake knapsack_pro:rspec
 
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-models-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
+
   system_admin:
     runs-on: ubuntu-22.04
     services:
@@ -175,7 +193,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -209,16 +227,25 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}"
 
         run: |
           bin/rake knapsack_pro:queue:rspec
 
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-system-admin-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
+
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: failed-tests-screenshots
+          name: failed-admin_${{ matrix.ci_node_index }}-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
@@ -247,13 +274,13 @@ jobs:
         ci_node_total: [12]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -287,16 +314,25 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}"
 
         run: |
           bin/rake knapsack_pro:queue:rspec
 
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-system-consumer-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
+
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: failed-tests-screenshots
+          name: failed-consumer_${{ matrix.ci_node_index }}-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
@@ -331,7 +367,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -371,14 +407,14 @@ jobs:
         run: |
           bin/rake knapsack_pro:rspec
 
-      - name: Archive failed tests screenshots
+      - name: Save SimpleCov file
-        if: failure()
+        uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v3
         with:
-          name: failed-tests-screenshots
+          name: simplecov-chunk-engines-${{ matrix.ci_node_index }}
-          path: tmp/capybara/screenshots/*.png
+          path: coverage/*.*
-          retention-days: 7
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
           if-no-files-found: ignore
+          include-hidden-files: true
 
   test_the_rest:
     runs-on: ubuntu-22.04
@@ -410,7 +446,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -448,6 +484,15 @@ jobs:
         run: |
           bin/rake knapsack_pro:rspec
 
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-the-rest-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
+
   non_knapsack_jest_karma:
     runs-on: ubuntu-22.04
     services:
@@ -485,3 +530,39 @@ jobs:
 
       - name: Run jest tests
         run: yarn jest
+
+  collate_simplecov_results:
+    runs-on: ubuntu-22.04
+    needs:
+      - controllers
+      - models
+      - engines
+      - system_admin
+      - system_consumer
+      - test_the_rest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Download individual results from individual runners
+        uses: actions/download-artifact@v4
+        with:
+          pattern: simplecov-chunk-*
+          path: tmp/simplecov
+          merge-multiple: true
+
+      - name: collate results from each of the workers
+        run: bundle exec rake 'simplecov:collate_results[tmp/simplecov]'
+
+      - name: Upload collated results
+        uses: actions/upload-artifact@v4
+        with:
+          name: combined-simplecov-report
+          path: coverage/**/*.*
+          retention-days: 7
+          if-no-files-found: ignore
+          include-hidden-files: true

.github/workflows/mapi.yml

@@ -14,12 +14,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: docker/build
-    - run: docker-compose up --detach
+    - run: docker compose up --detach
     - run: until curl -f -s http://localhost:3000; do echo "waiting for api server"; sleep 1; done
-    - run: docker-compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="update spree_users set spree_api_key='testing' where login='ofn@example.com'"
+    - run: docker compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="update spree_users set spree_api_key='testing' where login='ofn@example.com'"
     # equivalent to Flipper.enable(:api_v1)
-    - run: docker-compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="insert into flipper_features (key, created_at, updated_at) values ('api_v1', localtimestamp, localtimestamp)"
+    - run: docker compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="insert into flipper_features (key, created_at, updated_at) values ('api_v1', localtimestamp, localtimestamp)"
-    - run: docker-compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="insert into flipper_gates (feature_key, key, value, created_at, updated_at) values ('api_v1', 'boolean', 'true', localtimestamp, localtimestamp)"
+    - run: docker compose exec -T db psql postgresql://ofn:f00d@localhost:5432/open_food_network_dev --command="insert into flipper_gates (feature_key, key, value, created_at, updated_at) values ('api_v1', 'boolean', 'true', localtimestamp, localtimestamp)"
 
     # Run Mayhem for API
     - name: Run Mayhem for API

.prettierignore

@@ -5,6 +5,7 @@
 *.yaml
 *.json
 *.html
+**/*.rb
 
 # JS
 # Enabled: app/webpacker/controllers/*.js and app/webpacker/packs/*.js
@@ -27,6 +28,5 @@ postcss.config.js
 /coverage/
 /engines/
 /public/
-/spec/
 /tmp/
 /vendor/

.rubocop_todo.yml

@@ -12,22 +12,6 @@ Layout/EmptyLines:
   Exclude:
     - 'app/services/products_renderer.rb'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'app/services/products_renderer.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'app/services/products_renderer.rb'
-
 # Offense count: 16
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -101,7 +85,7 @@ Lint/UselessMethodDefinition:
   Exclude:
     - 'app/models/spree/gateway.rb'
 
-# Offense count: 23
+# Offense count: 24
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -114,6 +98,7 @@ Metrics/AbcSize:
     - 'app/helpers/spree/admin/navigation_helper.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship.rb'
+    - 'app/models/product_import/entry_processor.rb'
     - 'app/models/spree/ability.rb'
     - 'app/models/spree/address.rb'
     - 'app/models/spree/order/checkout.rb'
@@ -142,7 +127,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 47
+# Offense count: 46
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -178,7 +163,6 @@ Metrics/ClassLength:
     - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
     - 'app/reflexes/admin/orders_reflex.rb'
-    - 'app/reflexes/products_reflex.rb'
     - 'app/serializers/api/cached_enterprise_serializer.rb'
     - 'app/serializers/api/enterprise_shopfront_serializer.rb'
     - 'app/services/cart_service.rb'
@@ -408,7 +392,6 @@ RSpecRails/HaveHttpStatus:
     - 'spec/controllers/stripe/webhooks_controller_spec.rb'
     - 'spec/controllers/user_passwords_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
-    - 'spec/requests/admin/images_spec.rb'
     - 'spec/requests/api/routes_spec.rb'
     - 'spec/requests/checkout/stripe_sca_spec.rb'
     - 'spec/requests/home_controller_spec.rb'
@@ -638,12 +621,6 @@ Rails/ResponseParsedBody:
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/RootPathnameMethods:
-  Exclude:
-    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb'
-
 # Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -725,7 +702,7 @@ Style/ClassAndModuleChildren:
     - 'lib/open_food_network/locking.rb'
     - 'spec/models/spree/payment_method_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never

.simplecov

@@ -14,4 +14,6 @@ SimpleCov.start 'rails' do
   add_filter '/log'
   add_filter '/db'
   add_filter '/lib/tasks/sample_data/'
+
+  formatter SimpleCov::Formatter::SimpleFormatter
 end

GETTING_STARTED.md

@@ -31,7 +31,7 @@ This project needs specific ruby/bundler versions as well as node/yarn specific
 * Install or change your Ruby version according to the one specified at [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file.
     - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
 * Install [nodenv](https://github.com/nodenv/nodenv) to ensure the correct [.node-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.node-version) is used.
-    - [nodevn](https://github.com/nodenv/nodenv) is recommended as a node version manager.
+    - [nodenv](https://github.com/nodenv/nodenv) is recommended as a node version manager.
 * PostgreSQL database
 * Redis (for background jobs)
 * Chrome (for testing)

Gemfile

@@ -16,7 +16,6 @@ gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
-gem 'awesome_nested_set'
 gem 'ransack', '~> 4.1.0'
 gem 'responders'
 gem 'webpacker', '~> 5'
@@ -105,6 +104,7 @@ gem 'sidekiq-scheduler'
 gem "cable_ready"
 gem "stimulus_reflex"
 
+gem "turbo_power"
 gem "turbo-rails"
 
 gem 'combine_pdf'

Gemfile.lock

@@ -161,8 +161,6 @@ GEM
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
     attr_required (1.0.2)
-    awesome_nested_set (3.6.0)
-      activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
     aws-partitions (1.929.0)
     aws-sdk-core (3.196.1)
@@ -248,7 +246,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.12)
+    datafoodconsortium-connector (1.0.0.pre.alpha.13)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
     date (3.3.4)
     debug (1.9.2)
@@ -358,7 +356,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    invisible_captcha (2.2.0)
+    invisible_captcha (2.3.0)
       rails (>= 5.2)
     io-console (0.7.2)
     ipaddress (0.8.3)
@@ -381,13 +379,14 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json-ld (3.3.1)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
       json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
       rdf (~> 3.3)
+      rexml (~> 3.2)
     json-schema (4.1.1)
       addressable (>= 2.8)
     json_spec (1.1.5)
@@ -417,7 +416,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
     mime-types (3.5.2)
@@ -449,7 +448,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     newrelic_rpm (9.9.0)
-    nio4r (2.7.0)
+    nio4r (2.7.1)
     nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -787,6 +786,8 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
+    turbo_power (0.6.2)
+      turbo-rails (>= 1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -837,7 +838,7 @@ GEM
     websocket-extensions (0.1.5)
     whenever (1.0.0)
       chronic (>= 0.6.3)
-    wicked_pdf (2.6.3)
+    wicked_pdf (2.8.1)
       activesupport
     wkhtmltopdf-binary (0.12.6.7)
     xml-simple (1.1.8)
@@ -863,7 +864,6 @@ DEPENDENCIES
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.8.0)
   arel-helpers (~> 2.12)
-  awesome_nested_set
   aws-sdk-s3
   bigdecimal (= 3.0.2)
   bootsnap
@@ -976,6 +976,7 @@ DEPENDENCIES
   stripe
   timecop
   turbo-rails
+  turbo_power
   valid_email2
   validates_lengths_from_database
   vcr

app/assets/javascripts/admin/all.js

@@ -10,11 +10,11 @@
 //= require jquery.ui.all
 //= require jquery.powertip
 //= require jquery.cookie
-//= require jquery.jstree/jquery.jstree
 //= require jquery.vAlign
 //= require angular
 //= require angular-resource
 //= require angular-animate
+//= require angular-sanitize
 //= require angularjs-file-upload
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ../shared/ng-tags-input.min.js
@@ -61,11 +61,6 @@
 //= require ./variant_overrides/variant_overrides
 
 // text, dates and translations
-//= require textAngular-rangy.min.js
-// This replaces angular-sanitize. We should include only one.
-// https://github.com/textAngular/textAngular#where-to-get-it
-//= require textAngular-sanitize.min.js
-//= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
 

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

@@ -187,9 +187,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     product.variants.length > 0
 
 
-  $scope.hasUnit = (product) ->
+  $scope.hasUnit = (variant) ->
-    product.variant_unit_with_scale?
+    variant.variant_unit_with_scale?
-
 
   $scope.variantSaved = (variant) ->
     variant.hasOwnProperty('id') && variant.id > 0
@@ -242,32 +241,28 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $window.location = destination
 
   $scope.packProduct = (product) ->
-    if product.variant_unit_with_scale
-      match = product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
-      if match
-        product.variant_unit = match[1]
-        product.variant_unit_scale = parseFloat(match[2])
-      else
-        product.variant_unit = product.variant_unit_with_scale
-        product.variant_unit_scale = null
-    else
-      product.variant_unit = product.variant_unit_scale = null
-
-
     if product.variants
       for id, variant of product.variants
-        $scope.packVariant product, variant
+        $scope.packVariant variant
 
 
-  $scope.packVariant = (product, variant) ->
+  $scope.packVariant = (variant) ->
+    if variant.variant_unit_with_scale
+      match = variant.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
+      if match
+        variant.variant_unit = match[1]
+        variant.variant_unit_scale = parseFloat(match[2])
+      else
+        variant.variant_unit = variant.variant_unit_with_scale
+        variant.variant_unit_scale = null
+
     if variant.hasOwnProperty("unit_value_with_description")
       match = variant.unit_value_with_description.match(/^([\d\.\,]+(?= |$)|)( |)(.*)$/)
       if match
-        product = BulkProducts.find product.id
         variant.unit_value  = parseFloat(match[1].replace(",", "."))
         variant.unit_value  = null if isNaN(variant.unit_value)
-        if variant.unit_value && product.variant_unit_scale
+        if variant.unit_value && variant.variant_unit_scale
-          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, product.variant_unit_scale, 2))
+          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, variant.variant_unit_scale, 2))
         variant.unit_description = match[3]
 
   $scope.incrementLimit = ->
@@ -321,13 +316,6 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("price")
           filteredProduct.price = product.price
           hasUpdatableProperty = true
-        if product.hasOwnProperty("variant_unit_with_scale")
-          filteredProduct.variant_unit       = product.variant_unit
-          filteredProduct.variant_unit_scale = product.variant_unit_scale
-          hasUpdatableProperty = true
-        if product.hasOwnProperty("variant_unit_name")
-          filteredProduct.variant_unit_name = product.variant_unit_name
-          hasUpdatableProperty = true
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
@@ -383,6 +371,14 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("producer_id")
       filteredVariant.supplier_id = variant.producer_id
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("variant_unit_with_scale")
+      filteredVariant.variant_unit       = variant.variant_unit
+      filteredVariant.variant_unit_scale = variant.variant_unit_scale
+      hasUpdatableProperty = true
+    if variant.hasOwnProperty("variant_unit_name")
+      filteredVariant.variant_unit_name = variant.variant_unit_name
+      hasUpdatableProperty = true
+
   {filteredVariant: filteredVariant, hasUpdatableProperty: hasUpdatableProperty}
 
 

app/assets/javascripts/admin/directives/display_as.js.coffee

@@ -4,31 +4,30 @@ angular.module("ofn.admin").directive "ofnDisplayAs", (OptionValueNamer) ->
     scope.$watchCollection ->
       return [
         scope.$eval(attrs.ofnDisplayAs).unit_value_with_description
-        scope.product.variant_unit_name
+        scope.variant.variant_unit_name
-        scope.product.variant_unit_with_scale
+        scope.variant.variant_unit_with_scale
       ]
     , ->
       [variant_unit, variant_unit_scale] = productUnitProperties()
       [unit_value, unit_description] = variantUnitProperties(variant_unit_scale)
-      variant_object = 
+      variant_object =
         unit_value: unit_value
         unit_description: unit_description
-        product:
+        variant_unit_scale: variant_unit_scale
-          variant_unit_scale: variant_unit_scale
+        variant_unit: variant_unit
-          variant_unit: variant_unit
+        variant_unit_name: scope.variant.variant_unit_name
-          variant_unit_name: scope.product.variant_unit_name
 
       scope.placeholder_text = new OptionValueNamer(variant_object).name()
 
     productUnitProperties = ->
       # get relevant product properties
-      if scope.product.variant_unit_with_scale?
+      if scope.variant.variant_unit_with_scale?
-        match = scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
+        match = scope.variant.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
         if match
           variant_unit = match[1]
           variant_unit_scale = parseFloat(match[2])
         else
-          variant_unit = scope.product.variant_unit_with_scale
+          variant_unit = scope.variant.variant_unit_with_scale
           variant_unit_scale = null
       else
         variant_unit = variant_unit_scale = null
@@ -45,4 +44,4 @@ angular.module("ofn.admin").directive "ofnDisplayAs", (OptionValueNamer) ->
           unit_value  = null if isNaN(unit_value)
           unit_value *= variant_unit_scale if unit_value && variant_unit_scale
           unit_description = match[3]
-      [unit_value, unit_description]
+      [unit_value, unit_description]

app/assets/javascripts/admin/directives/maintain_unit_scale.js.coffee

@@ -1,8 +0,0 @@
-angular.module("ofn.admin").directive "ofnMaintainUnitScale", ->
-  require: "ngModel"
-  link: (scope, element, attrs, ngModel) ->
-    scope.$watch 'product.variant_unit_with_scale', (newValue, oldValue) ->
-      if not (oldValue == newValue)
-        # Triggers track-variant directive to track the unit_value, so that changes to the unit are passed to the server
-        ngModel.$setViewValue ngModel.$viewValue
-        

app/assets/javascripts/admin/directives/track_master.js.coffee

@@ -1,8 +0,0 @@
-angular.module("ofn.admin").directive "ofnTrackMaster", (DirtyProducts) ->
-  require: "ngModel"
-  link: (scope, element, attrs, ngModel) ->
-    ngModel.$parsers.push (viewValue) ->
-      if ngModel.$dirty
-        DirtyProducts.addMasterProperty scope.product.id, scope.product.master.id, attrs.ofnTrackMaster, viewValue
-        scope.displayDirtyProducts()
-      viewValue

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

@@ -1 +1 @@
-angular.module("admin.enterprise_groups", ["admin.side_menu", "admin.users", "textAngular"])
+angular.module("admin.enterprise_groups", ["admin.side_menu", "admin.users", "ngSanitize"])

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

@@ -3,7 +3,6 @@ angular.module("admin.enterprises", [
   "admin.utils",
   "admin.shippingMethods",
   "admin.users",
-  "textAngular",
   "admin.side_menu",
   "admin.taxons",
   'admin.indexUtils',
@@ -11,16 +10,3 @@ angular.module("admin.enterprises", [
   'admin.dropdown',
   'ngSanitize']
 )
-# For more options: https://github.com/textAngular/textAngular/blob/master/src/textAngularSetup.js
-.config [
-  '$provide', ($provide) ->
-    $provide.decorator 'taTranslations', [
-      '$delegate'
-      (taTranslations) ->
-        taTranslations.insertLink = {
-          tooltip: t('admin.enterprises.form.shop_preferences.shopfront_message_link_tooltip'),
-          dialogPrompt: t('admin.enterprises.form.shop_preferences.shopfront_message_link_prompt')
-        }
-        taTranslations
-    ]
-]

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

@@ -199,14 +199,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.refreshData()
 
   $scope.getLineItemScale = (lineItem) ->
-    if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume")
+    if lineItem.units_variant && lineItem.units_variant.variant_unit_scale && (lineItem.units_variant.variant_unit == "weight" || lineItem.units_variant.variant_unit == "volume")
-      lineItem.units_product.variant_unit_scale
+      lineItem.units_variant.variant_unit_scale
     else
       1
 
   $scope.sumUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
+      if lineItem.units_variant.variant_unit == "items"
         sum + lineItem.quantity
       else
         sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
@@ -214,7 +214,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.sumMaxUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
+      if lineItem.units_variant.variant_unit == "items"
         sum + lineItem.max_quantity
       else
         sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
@@ -228,39 +228,41 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
     true
 
-  $scope.getScale = (unitsProduct, unitsVariant) ->
+  $scope.getScale = (unitsVariant) ->
-    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume")
+    if unitsVariant.hasOwnProperty("variant_unit") && (unitsVariant.variant_unit == "weight" || unitsVariant.variant_unit == "volume")
-      unitsProduct.variant_unit_scale
+      unitsVariant.variant_unit_scale
-    else if unitsProduct.hasOwnProperty("variant_unit") && unitsProduct.variant_unit == "items"
+    else if unitsVariant.hasOwnProperty("variant_unit") && unitsVariant.variant_unit == "items"
       1
     else
       null
 
-  $scope.getFormattedValueWithUnitName = (value, unitsProduct, unitsVariant, scale) ->
+  $scope.getFormattedValueWithUnitName = (value, unitsVariant, scale) ->
-    unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+    unit_name = VariantUnitManager.getUnitName(scale, unitsVariant.variant_unit)
     $scope.roundToThreeDecimals(value) + " " + unit_name
 
-  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsVariant) ->
-    scale = $scope.getScale(unitsProduct, unitsVariant)
+    scale = $scope.getScale(unitsVariant)
     if scale && value
       value = value / scale if scale != 28.35 && scale != 1 && scale != 453.6 # divide by scale if not smallest unit
-      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+      $scope.getFormattedValueWithUnitName(value, unitsVariant, scale)
     else
       ''
 
-  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+  $scope.formattedValueWithUnitName = (value, unitsVariant) ->
-    scale = $scope.getScale(unitsProduct, unitsVariant)
+    scale = $scope.getScale(unitsVariant)
     if scale
-      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+      $scope.getFormattedValueWithUnitName(value, unitsVariant, scale)
     else
       ''
 
   $scope.fulfilled = (sumOfUnitValues) ->
     # A Units Variant is an API object which holds unit properies of a variant
-    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size")&& $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
+    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
-      $scope.selectedUnitsProduct.hasOwnProperty("variant_unit")
+      $scope.selectedUnitsVariant.hasOwnProperty("variant_unit")
-        if $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume"
+
-          scale = $scope.selectedUnitsProduct.variant_unit_scale
+        if $scope.selectedUnitsVariant.variant_unit == "weight" || $scope.selectedUnitsVariant.variant_unit == "volume"
+
+          scale = $scope.selectedUnitsVariant.variant_unit_scale
           sumOfUnitValues = sumOfUnitValues * scale unless scale == 28.35 || scale == 453.6
         $scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size)
     else

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

@@ -19,6 +19,8 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
+      $scope.order_cycle?.trigger_action = $($event.target).data('trigger-action');
+      $scope.order_cycle?.confirm = $($event.target).data('confirm');
       StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
 

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

@@ -1,7 +1,11 @@
 angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, Columns, StatusMessage, RequestMonitor, OrderCycles, Enterprises, Schedules, Dereferencer) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.columns = Columns.columns
-  $scope.saveAll = -> OrderCycles.saveChanges($scope.order_cycles_form)
+  $scope.saveAll = ($event) ->
+    trigger_action = $($event.target).data('trigger-action')
+    confirm = $($event.target).data('confirm')
+    OrderCycles.saveChanges($scope.order_cycles_form, { trigger_action, confirm })
+
   $scope.ordersCloseAtLimit = -31 # days
 
   $scope.resetSelectFilters = ->

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

@@ -22,6 +22,8 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
 
   $scope.submit = ($event, destination) ->
     $event.preventDefault()
+    $scope.order_cycle?.trigger_action = $($event.target).data('trigger-action');
+    $scope.order_cycle?.confirm = $($event.target).data('confirm');
     StatusMessage.display 'progress', t('js.saving')
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination, $scope.order_cycle_form) if OrderCycle.confirmNoDistributors()

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

@@ -161,7 +161,11 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $
           StatusMessage.display('failure', t('js.order_cycles.create_failure'))
 
     update: (destination, form) ->
-      oc = new OrderCycleResource({order_cycle: this.dataForSubmit()})
+      oc = new OrderCycleResource({
+          order_cycle: this.dataForSubmit(),
+          confirm: this.order_cycle.confirm,
+          trigger_action: this.order_cycle.trigger_action
+        })
       oc.$update {order_cycle_id: this.order_cycle.id, reloading: (if destination? then 1 else 0)}, (data) =>
         form.$setPristine() if form
         if destination?
@@ -171,6 +175,8 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $
       , (response) ->
         if response.data.errors?
           StatusMessage.display('failure', response.data.errors[0])
+        else if (response.data.trigger_action)
+          StatusMessage.display('notice', t('js.order_cycles.unsaved_changes'), response.data.trigger_action)
         else
           StatusMessage.display('failure', t('js.order_cycles.update_failure'))
 

app/assets/javascripts/admin/products/controllers/edit_units_controller.js.coffee

@@ -1,24 +0,0 @@
-angular.module("admin.products").controller "editUnitsCtrl", ($scope, VariantUnitManager) ->
-
-  $scope.product =
-    variant_unit: angular.element('#variant_unit').val()
-    variant_unit_scale: angular.element('#variant_unit_scale').val()
-
-  $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
-
-  if $scope.product.variant_unit == 'items'
-    $scope.variant_unit_with_scale = 'items'
-  else
-    $scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale.replace(/\.0$/, '');
-
-  $scope.setFields = ->
-    if $scope.variant_unit_with_scale == 'items'
-      variant_unit = 'items'
-      variant_unit_scale = null
-    else
-      options = $scope.variant_unit_with_scale.split('_')
-      variant_unit = options[0]
-      variant_unit_scale = options[1]
-
-    $scope.product.variant_unit = variant_unit
-    $scope.product.variant_unit_scale = variant_unit_scale

app/assets/javascripts/admin/products/controllers/units_controller.js.coffee

@@ -1,15 +1,14 @@
 # Controller for "New Products" form (spree/admin/products/new)
 angular.module("admin.products")
   .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
-    $scope.product = { master: {} }
+    $scope.product = {}
-    $scope.product.master.product = $scope.product
     $scope.placeholder_text = ""
 
-    $scope.$watchCollection '[product.variant_unit_with_scale, product.master.unit_value_with_description, product.price, product.variant_unit_name]', ->
+    $scope.$watchCollection '[product.variant_unit_with_scale, product.unit_value_with_description, product.price, product.variant_unit_name]', ->
       $scope.processVariantUnitWithScale()
       $scope.processUnitValueWithDescription()
       $scope.processUnitPrice()
-      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name() if $scope.product.variant_unit_scale
+      $scope.placeholder_text = new OptionValueNamer($scope.product).name() if $scope.product.variant_unit_scale
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
@@ -38,24 +37,24 @@ angular.module("admin.products")
     # Extract unit_value and unit_description from text field unit_value_with_description,
     # and update hidden variant fields
     $scope.processUnitValueWithDescription = ->
-      if $scope.product.master.hasOwnProperty("unit_value_with_description")
+      if $scope.product.hasOwnProperty("unit_value_with_description")
-        match = $scope.product.master.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
+        match = $scope.product.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
         if match
-          $scope.product.master.unit_value  = PriceParser.parse(match[1])
+          $scope.product.unit_value  = PriceParser.parse(match[1])
-          $scope.product.master.unit_value  = null if isNaN($scope.product.master.unit_value)
+          $scope.product.unit_value  = null if isNaN($scope.product.unit_value)
-          $scope.product.master.unit_value = window.bigDecimal.multiply($scope.product.master.unit_value, $scope.product.variant_unit_scale, 2) if $scope.product.master.unit_value && $scope.product.variant_unit_scale
+          $scope.product.unit_value = window.bigDecimal.multiply($scope.product.unit_value, $scope.product.variant_unit_scale, 2) if $scope.product.unit_value && $scope.product.variant_unit_scale
-          $scope.product.master.unit_description = match[3]
+          $scope.product.unit_description = match[3]
       else
-        value = $scope.product.master.unit_value
+        value = $scope.product.unit_value
-        value = window.bigDecimal.divide(value, $scope.product.variant_unit_scale, 2) if $scope.product.master.unit_value && $scope.product.variant_unit_scale
+        value = window.bigDecimal.divide(value, $scope.product.variant_unit_scale, 2) if $scope.product.unit_value && $scope.product.variant_unit_scale
-        $scope.product.master.unit_value_with_description = value + " " + $scope.product.master.unit_description
+        $scope.product.unit_value_with_description = value + " " + $scope.product.unit_description
 
     # Calculate unit price based on product price and variant_unit_scale
     $scope.processUnitPrice = ->
       price = $scope.product.price
       scale = $scope.product.variant_unit_scale
       unit_type = $scope.product.variant_unit
-      unit_value = $scope.product.master.unit_value
+      unit_value = $scope.product.unit_value
       variant_unit_name = $scope.product.variant_unit_name
       $scope.unit_price = UnitPrices.displayableUnitPrice(price, scale, unit_type, unit_value, variant_unit_name)
 

app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee

@@ -1,32 +0,0 @@
-angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices, PriceParser) ->
-
-  $scope.unitName = (scale, type) ->
-    VariantUnitManager.getUnitName(scale, type)
-
-  $scope.$watchCollection "[unit_value_human, variant.price]", ->
-    $scope.processUnitPrice()
-  
-  $scope.processUnitPrice = ->
-    if ($scope.variant)
-      price = $scope.variant.price
-      scale = $scope.scale
-      unit_type = angular.element("#product_variant_unit").val()
-      if (unit_type != "items")
-        $scope.updateValue()
-        unit_value = $scope.unit_value
-      else 
-        unit_value = 1
-      variant_unit_name = angular.element("#product_variant_unit_name").val()
-      $scope.unit_price = UnitPrices.displayableUnitPrice(price, scale, unit_type, unit_value, variant_unit_name)
-
-  $scope.scale = angular.element('#product_variant_unit_scale').val()
-
-  $scope.updateValue = ->
-    unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = bigDecimal.multiply(PriceParser.parse(unit_value_human), $scope.scale, 2)
-
-  variant_unit_value = angular.element('#variant_unit_value').val()
-  $scope.unit_value_human = parseFloat(bigDecimal.divide(variant_unit_value, $scope.scale, 2))
-
-  $timeout -> $scope.processUnitPrice()
-  $timeout -> $scope.updateValue()

app/assets/javascripts/admin/products/directives/set_variant_on_demand.js.coffee

@@ -1,19 +0,0 @@
-angular.module("admin.products").directive "setOnDemand", ->
-  link: (scope, element, attr) ->
-    onHand = element.context.querySelector("#variant_on_hand")
-    onDemand = element.context.querySelector("#variant_on_demand")
-
-    disableOnHandIfOnDemand = ->
-      if onDemand.checked
-        onHand.disabled = 'disabled'
-        onHand.dataStock = onHand.value
-        onHand.value = t('admin.products.variants.infinity')
-
-    disableOnHandIfOnDemand()
-
-    onDemand.addEventListener 'change', (event) ->
-      disableOnHandIfOnDemand()
-
-      if !onDemand.checked
-        onHand.removeAttribute('disabled')
-        onHand.value = onHand.dataStock

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

@@ -1 +1 @@
-angular.module("admin.products", ["textAngular", "admin.utils", "OFNShared"])
+angular.module("admin.products", ["ngSanitize", "admin.utils", "OFNShared"])

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

@@ -13,16 +13,16 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       name_fields.join ' '
 
     value_scaled: ->
-      @variant.product.variant_unit_scale?
+      @variant.variant_unit_scale?
 
     option_value_value_unit: ->
       if @variant.unit_value?
-        if @variant.product.variant_unit in ["weight", "volume"]
+        if @variant.variant_unit in ["weight", "volume"]
           [value, unit_name] = @option_value_value_unit_scaled()
 
         else
           value = @variant.unit_value
-          unit_name = @pluralize(@variant.product.variant_unit_name, value)
+          unit_name = @pluralize(@variant.variant_unit_name, value)
 
         value = parseInt(value, 10) if value == parseInt(value, 10)
 
@@ -58,14 +58,13 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       # to >= 1 when expressed in it.
       # If there is none available where this is true, use the smallest
       # available unit.
-      product = @variant.product
+      scales = VariantUnitManager.compatibleUnitScales(@variant.variant_unit_scale, @variant.variant_unit)
-      scales = VariantUnitManager.compatibleUnitScales(product.variant_unit_scale, product.variant_unit)
       variantUnitValue = @variant.unit_value
 
       # sets largestScale = last element in filtered scales array
       [_, ..., largestScale] = (scales.filter (s) -> variantUnitValue / s >= 1)
 
       if (largestScale)
-        [largestScale, VariantUnitManager.getUnitName(largestScale, product.variant_unit)]
+        [largestScale, VariantUnitManager.getUnitName(largestScale, @variant.variant_unit)]
       else
-        [scales[0], VariantUnitManager.getUnitName(scales[0], product.variant_unit)]
+        [scales[0], VariantUnitManager.getUnitName(scales[0], @variant.variant_unit)]

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

@@ -29,13 +29,13 @@ angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCy
         deferred.reject(response)
       deferred.promise
 
-    saveChanges: (form) ->
+    saveChanges: (form, params = {}) ->
       changed = {}
       for id, orderCycle of @byID when not @saved(orderCycle)
         changed[Object.keys(changed).length] = @changesFor(orderCycle)
       if Object.keys(changed).length > 0
         StatusMessage.display('progress', "Saving...")
-        OrderCycleResource.bulkUpdate { order_cycle_set: { collection_attributes: changed } }, (data) =>
+        OrderCycleResource.bulkUpdate { order_cycle_set: { collection_attributes: changed }, confirm: params['confirm'], trigger_action: params['trigger_action'] }, (data) =>
           for orderCycle in data
             delete orderCycle.coordinator
             delete orderCycle.producers
@@ -47,8 +47,10 @@ angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCy
         , (response) =>
           if response.data.errors?
             StatusMessage.display('failure', response.data.errors[0])
+          else if (response.data.trigger_action)
+            StatusMessage.display('notice', t('js.order_cycles.unsaved_changes'), response.data.trigger_action)
           else
-            StatusMessage.display('failure', "Oh no! I was unable to save your changes.")
+            StatusMessage.display('failure', t('js.order_cycles.bulk_save_error'))
 
     saved: (order_cycle) ->
       @diff(order_cycle).length == 0

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

@@ -19,7 +19,7 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
       for server_product in serverProducts
         product = @findProductInList(server_product.id, @products)
         product.variants = server_product.variants
-        @loadVariantUnitValues product
+        @loadVariantUnitValues product.variants
 
     find: (id) ->
       @findProductInList id, @products
@@ -38,34 +38,32 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
       @products.splice(index + 1, 0, newProduct)
 
     unpackProduct: (product) ->
-      #$scope.matchProducer product
       @loadVariantUnit product
 
     loadVariantUnit: (product) ->
-      product.variant_unit_with_scale =
+      @loadVariantUnitValues product.variants if product.variants
-        if product.variant_unit && product.variant_unit_scale && product.variant_unit != 'items'
+
-          "#{product.variant_unit}_#{product.variant_unit_scale}"
+    loadVariantUnitValues: (variants) ->
-        else if product.variant_unit
+      for variant in variants
-          product.variant_unit
+        @loadVariantUnitValue variant
+
+    loadVariantUnitValue: (variant) ->
+      variant.variant_unit_with_scale =
+        if variant.variant_unit && variant.variant_unit_scale && variant.variant_unit != 'items'
+          "#{variant.variant_unit}_#{variant.variant_unit_scale}"
+        else if variant.variant_unit
+          variant.variant_unit
         else
           null
 
-      @loadVariantUnitValues product if product.variants
+      unit_value = @variantUnitValue variant
-      @loadVariantUnitValue product, product.master if product.master
-
-    loadVariantUnitValues: (product) ->
-      for variant in product.variants
-        @loadVariantUnitValue product, variant
-
-    loadVariantUnitValue: (product, variant) ->
-      unit_value = @variantUnitValue product, variant
       unit_value = if unit_value? then unit_value else ''
       variant.unit_value_with_description = "#{unit_value} #{variant.unit_description || ''}".trim()
 
-    variantUnitValue: (product, variant) ->
+    variantUnitValue: (variant) ->
       if variant.unit_value?
-        if product.variant_unit_scale
+        if variant.variant_unit_scale
-          variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
+          variant_unit_value = @divideAsInteger variant.unit_value, variant.variant_unit_scale
           parseFloat(window.bigDecimal.round(variant_unit_value, 2))
         else
           variant.unit_value

app/assets/javascripts/admin/spree/taxons/taxon_tree_menu.js.coffee

@@ -1,21 +0,0 @@
-root = exports ? this
-
-root.taxon_tree_menu = (obj, context) ->
-
-  base_url = Spree.url(Spree.routes.taxonomy_taxons)
-  admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons)
-  edit_url = Spree.url(Spree.routes.admin_taxonomy_taxons + '/' + obj.attr("id") + "/edit");
-
-  create:
-    label: "<i class='icon-plus'></i> " + Spree.translations.add,
-    action: (obj) -> context.create(obj)
-  rename:
-    label: "<i class='icon-pencil'></i> " + Spree.translations.rename,
-    action: (obj) -> context.rename(obj)
-  remove:
-    label: "<i class='icon-trash'></i> " + Spree.translations.remove,
-    action: (obj) -> context.remove(obj)
-  edit:
-    separator_before: true,
-    label: "<i class='icon-edit'></i> " + Spree.translations.edit,
-    action: (obj) -> window.location = edit_url.toString()

app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee

@@ -1,139 +0,0 @@
-handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
-  $.jstree.rollback(last_rollback)
-  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br />" + taxonomy_tree_error)
-
-handle_move = (e, data) ->
-  last_rollback = data.rlbk
-  position = data.rslt.cp
-  node = data.rslt.o
-  new_parent = data.rslt.np
-
-  url = new URL(Spree.routes.admin_taxonomy_taxons)
-  url.pathname = url.pathname + '/' + node.attr("id") 
-  data = {
-    _method: "put",
-    "taxon[position]": position,
-    "taxon[parent_id]": if !isNaN(new_parent.attr("id")) then new_parent.attr("id") else undefined
-  }
-  $.ajax
-    type: "POST",
-    dataType: "json",
-    url: url.toString(),
-    data: data,
-    error: handle_ajax_error
-
-  true
-
-handle_create = (e, data) ->
-  last_rollback = data.rlbk
-  node = data.rslt.obj
-  name = data.rslt.name
-  position = data.rslt.position
-  new_parent = data.rslt.parent
-
-  data = {
-    "taxon[name]": name,
-    "taxon[position]": position
-    "taxon[parent_id]": if !isNaN(new_parent.attr("id")) then new_parent.attr("id") else undefined
-  }
-  $.ajax
-    type: "POST",
-    dataType: "json",
-    url: base_url.toString(),
-    data: data,
-    error: handle_ajax_error,
-    success: (data,result) ->
-      node.attr('id', data.id)
-
-handle_rename = (e, data) ->
-  last_rollback = data.rlbk
-  node = data.rslt.obj
-  name = data.rslt.new_name
-  # change the name inside the main input field as well if taxon is the root one
-  document.getElementById("taxonomy_name").value = name if node.parents("[id]").attr("id") == "taxonomy_tree"
-
-  url = new URL(base_url)
-  url.pathname = url.pathname + '/' + node.attr("id")
-
-  $.ajax
-    type: "POST",
-    dataType: "json",
-    url: url.toString(),
-    data: {_method: "put", "taxon[name]": name },
-    error: handle_ajax_error
-
-handle_delete = (e, data) ->
-  last_rollback = data.rlbk
-  node = data.rslt.obj
-  delete_url = new URL(base_url)
-  delete_url.pathname = delete_url.pathname + '/' + node.attr("id")
-  if confirm(Spree.translations.are_you_sure_delete)
-    $.ajax
-      type: "POST",
-      dataType: "json",
-      url: delete_url.toString(),
-      data: {_method: "delete"},
-      error: handle_ajax_error
-  else
-    $.jstree.rollback(last_rollback)
-    last_rollback = null
-
-root = exports ? this
-root.setup_taxonomy_tree = (taxonomy_id) ->
-  if taxonomy_id != undefined
-    # this is defined within admin/taxonomies/edit
-    root.base_url = Spree.url(Spree.routes.taxonomy_taxons)
-
-    $.ajax
-      url: base_url.pathname.replace("/taxons", "/jstree"),
-      success: (taxonomy) ->
-        last_rollback = null
-
-        conf =
-          json_data:
-            data: taxonomy,
-            ajax:
-              url: (e) ->
-                base_url.pathname + '/' + e.attr('id') + '/jstree'
-          themes:
-            theme: "apple",
-            url: "/assets/jquery.jstree/themes/apple/style.css"
-          strings:
-            new_node: new_taxon,
-            loading: Spree.translations.loading + "..."
-          crrm:
-            move:
-              check_move: (m) ->
-                position = m.cp
-                node = m.o
-                new_parent = m.np
-
-                # no parent or cant drag and drop
-                if !new_parent || node.attr("rel") == "root"
-                  return false
-
-                # can't drop before root
-                if new_parent.attr("id") == "taxonomy_tree" && position == 0
-                  return false
-
-                true
-          contextmenu:
-            items: (obj) ->
-              taxon_tree_menu(obj, this)
-          plugins: ["themes", "json_data", "dnd", "crrm", "contextmenu"]
-
-        $("#taxonomy_tree").jstree(conf)
-          .bind("move_node.jstree", handle_move)
-          .bind("remove.jstree", handle_delete)
-          .bind("create.jstree", handle_create)
-          .bind("rename.jstree", handle_rename)
-          .bind "loaded.jstree", ->
-            $(this).jstree("core").toggle_node($('.jstree-icon').first())
-
-    $("#taxonomy_tree a").on "dblclick", (e) ->
-      $("#taxonomy_tree").jstree("rename", this)
-
-    # surpress form submit on enter/return
-    $(document).keypress (e) ->
-      if e.keyCode == 13
-        e.preventDefault()

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

@@ -1,6 +0,0 @@
-angular.module("admin.utils").directive "textangularLinksTargetBlank", () ->
-  restrict: 'CA'
-  link: (scope, element, attrs) ->
-    setTimeout ->
-      element.find(".ta-editor").scope().defaultTagAttributes.a.target = '_blank'
-    , 500

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

@@ -1,11 +0,0 @@
-angular.module("admin.utils").directive "textangularStrip", () ->
-  restrict: 'CA'
-  link: (scope, element, attrs) ->
-    scope.stripFormatting = ($html) ->
-      element = document.createElement("div")
-      element.innerHTML = String($html)
-      allTags = element.getElementsByTagName("*")
-      for child in allTags
-        child.removeAttribute("style")
-        child.removeAttribute("class")
-      return element.innerHTML

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

@@ -9,6 +9,7 @@ angular.module("admin.utils")
           $window.onbeforeunload = @onBeforeUnloadHandler
 
         $rootScope.$on "$locationChangeStart", @locationChangeStartHandler
+        $window.onBeforeUnloadHandler = @onBeforeUnloadHandler
 
       # Action for regular browser navigation.
       onBeforeUnloadHandler: ($event) =>

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

@@ -10,7 +10,9 @@ angular.module("admin.utils").factory "StatusMessage", ->
 
     statusMessage:
       text: ""
-      style: {}
+      style: {},
+      type: null,
+      actionName: null
 
     invalidMessage: ""
 
@@ -23,11 +25,15 @@ angular.module("admin.utils").factory "StatusMessage", ->
     active: ->
       @statusMessage.text != ''
 
-    display: (type, text) ->
+    display: (type, text, actionName = null) ->
       @statusMessage.text = text
+      @statusMessage.type = type
+      @statusMessage.actionName = actionName
       @statusMessage.style = @types[type].style
       null
 
     clear: ->
       @statusMessage.text = ''
       @statusMessage.style = {}
+      @statusMessage.type = null
+      @statusMessage.actionName = null

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

@@ -1,2 +1,3 @@
+- # NOTE: make sure that any changes in this template are reflected in app/views/admin/products_v3/product_preview.turbo_stream.haml
 %li{ "ng-class": "{active: selector.active}" }
   %a{ tooltip: "{{selector.object.value}}", "tooltip-placement": "bottom", "ng-transclude": true, "ng-class": "{active: selector.active, 'has-tip': selector.object.value}" }

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

@@ -1,7 +1,7 @@
 #save-bar.animate-show{ "ng-show": 'dirty || persist || StatusMessage.active()' }
   .container
     .seven.columns.alpha
-      %h5#status-message{ "ng-show": "StatusMessage.invalidMessage == ''", "ng-style": 'StatusMessage.statusMessage.style' }
+      %h5#status-message{ "ng-show": "StatusMessage.invalidMessage == ''", "ng-style": 'StatusMessage.statusMessage.style', data: { 'order-cycle-form-target': 'statusMessage' }, "ng-attr-data-type": "{{StatusMessage.statusMessage.type}}", "ng-attr-data-action-name": "{{StatusMessage.statusMessage.actionName}}" }
         {{ StatusMessage.statusMessage.text || " " }}
       %h5#status-message{ style: 'color: #C85136', "ng-show": "StatusMessage.invalidMessage !== ''" }
         {{ StatusMessage.invalidMessage || " " }}

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

@@ -1,3 +1,4 @@
+- # NOTE: make sure that any changes in this template are reflected in app/views/admin/products_v3/product_preview.turbo_stream.haml
 %ul
   %active-selector{ "ng-repeat": "selector in allSelectors", "ng-show": "ifDefined(selector.fits, true)" }
     %span{"ng-bind" => "::selector.object.name"}

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

@@ -1,3 +1,4 @@
+- # NOTE: make sure that any changes in this template are reflected in app/views/admin/products_v3/product_preview.turbo_stream.haml
 .row
   .columns.small-12.medium-6.large-6.product-header
     %h3{"ng-bind" => "::product.name"}

app/assets/stylesheets/mail.scss

@@ -0,0 +1 @@
+@import './mail/all.scss';

app/assets/stylesheets/mail/all.scss

@@ -0,0 +1,3 @@
+@import '../../../webpacker/css/admin/globals/palette.scss';
+@import 'email';
+@import 'payments_list';

app/components/admin_tooltip_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AdminTooltipComponent < ViewComponent::Base
+  def initialize(text:, link_text:, placement: "top", link: "", link_class: "")
+    @text = text
+    @link_text = link_text
+    @placement = placement
+    @link = link
+    @link_class = link_class
+  end
+end

app/components/admin_tooltip_component/admin_tooltip_component.html.haml

@@ -0,0 +1,8 @@
+%div{"data-controller": "tooltip", "data-tooltip-placement-value": @placement }
+  %a{"data-tooltip-target": "element", href: @link, class: @link_class}
+    = @link_text 
+  .tooltip-container
+    .tooltip{"data-tooltip-target": "tooltip"}
+      = sanitize @text
+      .arrow{"data-tooltip-target": "arrow"}
+

app/components/modal_component.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 class ModalComponent < ViewComponent::Base
-  def initialize(id:, close_button: true, instant: false, modal_class: :small)
+  def initialize(id:, close_button: true, instant: false, modal_class: :small, **options)
     @id = id
     @close_button = close_button
     @instant = instant
     @modal_class = modal_class
+    @options = options
+    @data_controller = "modal #{@options.delete(:'data-controller')}".squish
+    @data_action =
+      "keyup@document->modal#closeIfEscapeKey #{@options.delete(:'data-action')}".squish
   end
 
   private

app/components/modal_component/modal_component.html.haml

@@ -1,4 +1,4 @@
-%div{ id: @id, "data-controller": "modal", "data-action": "keyup@document->modal#closeIfEscapeKey", "data-modal-instant-value": @instant }
+%div{ id: @id, "data-controller": @data_controller, "data-action": @data_action, "data-modal-instant-value": @instant, **@options }
   .reveal-modal-bg.fade{ "data-modal-target": "background", "data-action": "click->modal#close" }
   .reveal-modal.fade.modal-component{ "data-modal-target": "modal", class: @modal_class }
     = content

app/components/modal_component/modal_component.scss

@@ -24,6 +24,19 @@
     max-width: 100%;
     height: auto;
   }
+
+  .flex-column {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .gap-1 {
+    gap: 1rem;
+  }
+
+  .gap-2 {
+    gap: 2rem;
+  }
 }
 
 /* prevent arrow on selected admin menu item appearing above modal */

app/components/searchable_dropdown_component.rb

@@ -11,7 +11,8 @@ class SearchableDropdownComponent < ViewComponent::Base
     selected_option:,
     placeholder_value:,
     include_blank: false,
-    aria_label: ''
+    aria_label: '',
+    other_attrs: {}
   )
     @f = form
     @name = name
@@ -20,11 +21,13 @@ class SearchableDropdownComponent < ViewComponent::Base
     @placeholder_value = placeholder_value
     @include_blank = include_blank
     @aria_label = aria_label
+    @other_attrs = other_attrs
   end
 
   private
 
-  attr_reader :f, :name, :options, :selected_option, :placeholder_value, :include_blank, :aria_label
+  attr_reader :f, :name, :options, :selected_option, :placeholder_value, :include_blank,
+              :aria_label, :other_attrs
 
   def classes
     "fullwidth #{remove_search_plugin? ? 'no-input' : ''}"

app/components/searchable_dropdown_component/searchable_dropdown_component.html.haml

@@ -1 +1 @@
-= f.select name, options_for_select(options, selected_option), { include_blank: }, class: classes, data:, 'aria-label': aria_label
+= f.select name, options_for_select(options, selected_option), { include_blank: }, class: classes, data:, 'aria-label': aria_label, **other_attrs

app/components/vertical_ellipsis_menu/component_controller.js

@@ -8,6 +8,10 @@ export default class extends Controller {
     window.addEventListener("click", this.#hideIfClickedOutside);
   }
 
+  disconnect() {
+    window.removeEventListener("click", this.#hideIfClickedOutside);
+  }
+
   toggle() {
     this.contentTarget.classList.toggle("show");
   }

app/controllers/admin/connected_app_settings_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Admin
+  class ConnectedAppSettingsController < Spree::Admin::BaseController
+    def update
+      Spree::Config.set(connected_apps_enabled:)
+
+      respond_to do |format|
+        format.html {
+          flash[:success] = t(:successfully_updated, resource: t('.resource'))
+          redirect_to main_app.edit_admin_connected_app_settings_path
+        }
+      end
+    end
+
+    private
+
+    def connected_apps_enabled
+      params.require(:preferences).require(:connected_apps_enabled).compact_blank.join(",")
+    end
+  end
+end

app/controllers/admin/connected_apps_controller.rb

@@ -5,12 +5,7 @@ module Admin
     def create
       authorize! :admin, enterprise
 
-      attributes = {}
+      connect
-      attributes[:type] = connected_app_params[:type] if connected_app_params[:type]
-
-      app = ConnectedApp.create!(enterprise_id: enterprise.id, **attributes)
-      app.connect(api_key: spree_current_user.spree_api_key,
-                  channel: SessionChannel.for_request(request))
 
       render_panel
     end
@@ -26,6 +21,47 @@ module Admin
 
     private
 
+    def create_connected_app
+      attributes = {}
+      attributes[:type] = connected_app_params[:type] if connected_app_params[:type]
+
+      @app = ConnectedApp.create!(enterprise_id: enterprise.id, **attributes)
+    end
+
+    def connect
+      return connect_vine if connected_app_params[:type] == "ConnectedApps::Vine"
+
+      create_connected_app
+      @app.connect(api_key: spree_current_user.spree_api_key,
+                   channel: SessionChannel.for_request(request))
+    end
+
+    def connect_vine
+      if vine_params_empty?
+        return flash[:error] =
+                 I18n.t("admin.enterprises.form.connected_apps.vine.api_parameters_empty")
+      end
+
+      create_connected_app
+
+      jwt_service = VineJwtService.new(secret: connected_app_params[:vine_secret])
+      vine_api = VineApiService.new(api_key: connected_app_params[:vine_api_key],
+                                    jwt_generator: jwt_service)
+
+      if !@app.connect(api_key: connected_app_params[:vine_api_key],
+                       secret: connected_app_params[:vine_secret], vine_api:)
+        error_message = "#{@app.errors.full_messages.to_sentence}. \
+          #{I18n.t('admin.enterprises.form.connected_apps.vine.api_parameters_error')}".squish
+        handle_error(error_message)
+      end
+    rescue Faraday::Error => e
+      log_and_notify_exception(e)
+      handle_error(I18n.t("admin.enterprises.form.connected_apps.vine.connection_error"))
+    rescue KeyError => e
+      log_and_notify_exception(e)
+      handle_error(I18n.t("admin.enterprises.form.connected_apps.vine.setup_error"))
+    end
+
     def enterprise
       @enterprise ||= Enterprise.find(params.require(:enterprise_id))
     end
@@ -34,8 +70,22 @@ module Admin
       redirect_to "#{edit_admin_enterprise_path(enterprise)}#/connected_apps_panel"
     end
 
+    def handle_error(message)
+      flash[:error] = message
+      @app.destroy
+    end
+
+    def log_and_notify_exception(exception)
+      Rails.logger.error exception.inspect
+      Bugsnag.notify(exception)
+    end
+
+    def vine_params_empty?
+      connected_app_params[:vine_api_key].empty? || connected_app_params[:vine_secret].empty?
+    end
+
     def connected_app_params
-      params.permit(:type)
+      params.permit(:type, :vine_api_key, :vine_secret)
     end
   end
 end

app/controllers/admin/dfc_product_imports_controller.rb

@@ -26,35 +26,29 @@ module Admin
       # * First step: import all products for given enterprise.
       # * Second step: render table and let user decide which ones to import.
       imported = graph.map do |subject|
-        import_product(subject, enterprise)
+        next unless subject.is_a? DataFoodConsortium::Connector::SuppliedProduct
+
+        existing_variant = enterprise.supplied_variants.linked_to(subject.semanticId)
+
+        if existing_variant
+          SuppliedProductBuilder.update_product(subject, existing_variant)
+        else
+          SuppliedProductBuilder.store_product(subject, enterprise)
+        end
       end
 
       @count = imported.compact.count
+    rescue Faraday::Error,
+           Addressable::URI::InvalidURIError,
+           ActionController::ParameterMissing => e
+      flash[:error] = e.message
+      redirect_to admin_product_import_path
     end
 
     private
 
     def fetch_catalog(url)
-      if url =~ /food-data-collaboration/
+      DfcRequest.new(spree_current_user).call(url)
-        fdc_json = FdcRequest.new(spree_current_user).call(url)
-        fdc_message = JSON.parse(fdc_json)
-        fdc_message["products"]
-      else
-        DfcRequest.new(spree_current_user).call(url)
-      end
-    end
-
-    # Most of this code is the same as in the DfcProvider::SuppliedProductsController.
-    def import_product(subject, enterprise)
-      return unless subject.is_a? DataFoodConsortium::Connector::SuppliedProduct
-
-      variant = SuppliedProductBuilder.import_variant(subject, enterprise)
-      product = variant.product
-
-      product.save! if product.new_record?
-      variant.save! if variant.new_record?
-
-      variant
     end
   end
 end

app/controllers/admin/order_cycles_controller.rb

@@ -2,6 +2,8 @@
 
 module Admin
   class OrderCyclesController < Admin::ResourceController
+    class DateTimeChangeError < StandardError; end
+
     include ::OrderCyclesHelper
     include PaperTrailLogging
 
@@ -62,9 +64,7 @@ module Admin
     end
 
     def update
-      @order_cycle_form = OrderCycles::FormService.new(@order_cycle, order_cycle_params,
+      @order_cycle_form = set_order_cycle_form
-                                                       spree_current_user)
-
       if @order_cycle_form.save
         update_nil_subscription_line_items_price_estimate(@order_cycle)
         respond_to do |format|
@@ -77,6 +77,9 @@ module Admin
       elsif request.format.json?
         render json: { errors: @order_cycle.errors.full_messages }, status: :unprocessable_entity
       end
+    rescue DateTimeChangeError
+      render json: { trigger_action: params[:trigger_action] },
+             status: :unprocessable_entity
     end
 
     def bulk_update
@@ -90,6 +93,9 @@ module Admin
         order_cycle = order_cycle_set.collection.find{ |oc| oc.errors.present? }
         render json: { errors: order_cycle.errors.full_messages }, status: :unprocessable_entity
       end
+    rescue DateTimeChangeError
+      render json: { trigger_action: params[:trigger_action] },
+             status: :unprocessable_entity
     end
 
     def bulk_update_nil_subscription_line_items_price_estimate
@@ -235,7 +241,7 @@ module Admin
       else
         begin
           yield
-        rescue ActiveRecord::InvalidForeignKey
+        rescue ActiveRecord::InvalidForeignKey, ActiveRecord::DeleteRestrictionError
           redirect_to main_app.admin_order_cycles_url
           flash[:error] = I18n.t('admin.order_cycles.destroy_errors.orders_present')
         end
@@ -270,7 +276,10 @@ module Admin
     end
 
     def order_cycle_set
-      @order_cycle_set ||= Sets::OrderCycleSet.new(@order_cycles, order_cycle_bulk_params)
+      @order_cycle_set ||= Sets::OrderCycleSet.new(
+        @order_cycles, { **order_cycle_bulk_params,
+          confirm_datetime_change: params[:confirm], error_class: DateTimeChangeError }
+      )
     end
 
     def require_order_cycle_set_params
@@ -294,5 +303,14 @@ module Admin
         collection_attributes: [:id] + PermittedAttributes::OrderCycle.basic_attributes
       ).to_h.with_indifferent_access
     end
+
+    def set_order_cycle_form
+      OrderCycles::FormService.new(
+        @order_cycle, order_cycle_params.merge(
+                        { confirm_datetime_change: params[:order_cycle][:confirm],
+                          error_class: DateTimeChangeError }
+                      ), spree_current_user
+      )
+    end
   end
 end

app/controllers/admin/product_import_controller.rb

@@ -21,8 +21,7 @@ module Admin
       @importer = ProductImport::ProductImporter.new(File.new(@filepath), spree_current_user,
                                                      params[:settings])
       @original_filename = params[:file].try(:original_filename)
-      @non_updatable_fields = ProductImport::EntryValidator.non_updatable_fields
+      @non_updatable_fields = ProductImport::EntryValidator.non_updatable_variant_fields
-
       return if contains_errors? @importer
 
       @ams_data = ams_data

app/controllers/admin/product_preview_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Admin
+  class ProductPreviewController < Spree::Admin::BaseController
+    def show
+      @product = Spree::Product.find(params[:id])
+      authorize! :show, @product
+
+      respond_with do |format|
+        format.turbo_stream {
+          render "admin/products_v3/product_preview", status: :ok
+        }
+      end
+    end
+
+    private
+
+    def model_class
+      Spree::Product
+    end
+  end
+end

app/controllers/admin/products_v3_controller.rb

@@ -11,6 +11,8 @@ module Admin
     def index
       fetch_products
       render "index", locals: { producers:, categories:, tax_category_options:, flash: }
+
+      session[:products_return_to_url] = request.url
     end
 
     def bulk_update
@@ -38,6 +40,8 @@ module Admin
         { id: params[:id] }
       ).find_product
 
+      authorize! :delete, @record
+
       @record.destroyed_by = spree_current_user
       status = :ok
 
@@ -72,6 +76,8 @@ module Admin
 
     def clone
       @product = Spree::Product.find(params[:id])
+      authorize! :clone, @product
+
       status = :ok
 
       begin
@@ -82,8 +88,8 @@ module Admin
         @producer_options = producers
         @category_options = categories
         @tax_category_options = tax_category_options
-      rescue ActiveRecord::ActiveRecordError => _e
+      rescue ActiveRecord::ActiveRecordError => e
-        flash.now[:error] = t('.error')
+        flash.now[:error] = clone_error_message(e)
         status = :unprocessable_entity
         @product_index = "-1" # Create a unique enough index
       end
@@ -207,6 +213,15 @@ module Admin
       params.permit(products: ::PermittedAttributes::Product.attributes)
         .to_h.with_indifferent_access
     end
+
+    def clone_error_message(error)
+      case error
+      when ActiveRecord::RecordInvalid
+        error.record.errors.full_messages.to_sentence
+      else
+        t('.error')
+      end
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength

app/controllers/admin/reports_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include ReportsActions
     helper ReportsHelper
 
-    before_action :authorize_report, only: [:show]
+    before_action :authorize_report, only: [:show, :create]
 
     # Define model class for Can? permissions
     def model_class
@@ -20,14 +20,17 @@ module Admin
     end
 
     def show
-      @report = report_class.new(spree_current_user, params, render: render_data?)
+      @report = report_class.new(spree_current_user, params, render: false)
-      @rendering_options = rendering_options # also stores user preferences
+      @rendering_options = rendering_options
 
-      if render_data?
+      show_report
-        render_in_background
+    end
-      else
+
-        show_report
+    def create
-      end
+      @report = report_class.new(spree_current_user, params, render: true)
+      update_rendering_options
+
+      render_in_background
     end
 
     private
@@ -54,31 +57,15 @@ module Admin
       @variant_serialized = Api::Admin::VariantSerializer.new(variant)
     end
 
-    def render_data?
-      request.post?
-    end
-
     def render_in_background
-      cable_ready[ScopedChannel.for_id(params[:uuid])]
+      @blob = ReportBlob.create_for_upload_later!(report_filename)
-        .inner_html(
-          selector: "#report-go",
-          html: helpers.button(t(:go), "report__submit-btn", "submit", disabled: true)
-        ).inner_html(
-          selector: "#report-table",
-          html: render_to_string(partial: "admin/reports/loading")
-        ).scroll_into_view(
-          selector: "#report-table",
-          block: "start"
-        ).broadcast
 
       ReportJob.perform_later(
         report_class:, user: spree_current_user, params:,
         format: report_format,
-        filename: report_filename,
+        blob: @blob,
         channel: ScopedChannel.for_id(params[:uuid]),
       )
-
-      head :no_content
     end
   end
 end

app/controllers/api/v0/products_controller.rb

@@ -21,7 +21,7 @@ module Api
         authorize! :create, Spree::Product
         @product = Spree::Product.new(product_params)
 
-        if @product.save
+        if @product.save(context: :create_and_create_standard_variant)
           render json: @product, serializer: Api::Admin::ProductSerializer, status: :created
         else
           invalid_resource!(@product)

app/controllers/api/v0/taxonomies_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  module V0
-    class TaxonomiesController < Api::V0::BaseController
-      respond_to :json
-
-      skip_authorization_check only: :jstree
-
-      def jstree
-        @taxonomy = Spree::Taxonomy.find(params[:id])
-        render json: @taxonomy.root, serializer: Api::TaxonJstreeSerializer
-      end
-    end
-  end
-end

app/controllers/api/v0/taxons_controller.rb

@@ -5,12 +5,10 @@ module Api
     class TaxonsController < Api::V0::BaseController
       respond_to :json
 
-      skip_authorization_check only: [:index, :show, :jstree]
+      skip_authorization_check only: [:index, :show]
 
       def index
-        @taxons = if taxonomy
+        @taxons = if params[:ids]
-                    taxonomy.root.children
-                  elsif params[:ids]
                     Spree::Taxon.where(id: raw_params[:ids].split(","))
                   else
                     Spree::Taxon.ransack(raw_params[:q]).result
@@ -18,23 +16,9 @@ module Api
         render json: @taxons, each_serializer: Api::TaxonSerializer
       end
 
-      def jstree
-        @taxon = taxon
-        render json: @taxon.children, each_serializer: Api::TaxonJstreeSerializer
-      end
-
       def create
         authorize! :create, Spree::Taxon
         @taxon = Spree::Taxon.new(taxon_params)
-        @taxon.taxonomy_id = params[:taxonomy_id]
-        taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
-
-        if taxonomy.nil?
-          @taxon.errors.add(:taxonomy_id, I18n.t(:invalid_taxonomy_id, scope: 'spree.api'))
-          invalid_resource!(@taxon) && return
-        end
-
-        @taxon.parent_id = taxonomy.root.id unless params.dig(:taxon, :parent_id)
 
         if @taxon.save
           render json: @taxon, serializer: Api::TaxonSerializer, status: :created
@@ -60,20 +44,14 @@ module Api
 
       private
 
-      def taxonomy
-        return if params[:taxonomy_id].blank?
-
-        @taxonomy ||= Spree::Taxonomy.find(params[:taxonomy_id])
-      end
-
       def taxon
-        @taxon ||= taxonomy.taxons.find(params[:id])
+        @taxon = Spree::Taxon.find(params[:id])
       end
 
       def taxon_params
         return if params[:taxon].blank?
 
-        params.require(:taxon).permit([:name, :parent_id, :position])
+        params.require(:taxon).permit([:name, :position])
       end
     end
   end

app/controllers/cart_controller.rb

@@ -11,6 +11,8 @@ class CartController < BaseController
       order.cap_quantity_at_stock!
       order.recreate_all_fees!
 
+      StockSyncJob.sync_linked_catalogs(order)
+
       render json: { error: false, stock_levels: stock_levels(order) }, status: :ok
     else
       render json: { error: cart_service.errors.full_messages.join(",") },

app/controllers/concerns/checkout_callbacks.rb

@@ -9,6 +9,12 @@ module CheckoutCallbacks
     # Otherwise we fail on duplicate indexes or end up with negative stock.
     prepend_around_action CurrentOrderLocker, only: [:edit, :update]
 
+    # We want to download the latest stock data before anything else happens.
+    # We don't want it to be in the same database transaction as the order
+    # locking because this action locks a different set of variants and it
+    # could cause race conditions.
+    prepend_around_action :sync_stock, only: :update
+
     prepend_before_action :check_hub_ready_for_checkout
     prepend_before_action :check_order_cycle_expiry
     prepend_before_action :require_order_cycle
@@ -25,6 +31,14 @@ module CheckoutCallbacks
 
   private
 
+  def sync_stock
+    if current_order&.state == "confirmation"
+      StockSyncJob.sync_linked_catalogs_now(current_order)
+    end
+
+    yield
+  end
+
   def load_order
     @order = current_order
     @order.manual_shipping_selection = true
@@ -63,12 +77,6 @@ module CheckoutCallbacks
     end
   end
 
-  def valid_order_line_items?
-    @order.insufficient_stock_lines.empty? &&
-      OrderCycles::DistributedVariantsService.new(@order.order_cycle, @order.distributor).
-        distributes_order_variants?(@order)
-  end
-
   def ensure_order_not_completed
     redirect_to main_app.cart_path if @order.completed?
   end

app/controllers/concerns/order_completion.rb

@@ -51,7 +51,7 @@ module OrderCompletion
 
   def order_invalid!
     Bugsnag.notify("Notice: invalid order loaded during checkout") do |payload|
-      payload.add_metadata :order, @order
+      payload.add_metadata :order, :order, @order
     end
 
     flash[:error] = t('checkout.order_not_loaded')

app/controllers/concerns/order_stock_check.rb

@@ -21,7 +21,7 @@ module OrderStockCheck
     return unless current_order_cycle&.closed?
 
     Bugsnag.notify("Notice: order cycle closed during checkout completion") do |payload|
-      payload.add_metadata :order, current_order
+      payload.add_metadata :order, :order, current_order
     end
     current_order.empty!
     current_order.set_order_cycle! nil

app/controllers/concerns/reports_actions.rb

@@ -88,14 +88,10 @@ module ReportsActions
         display_header_row: false
       }
     end
-    update_rendering_options
-    @rendering_options
   end
 
   def update_rendering_options
-    return unless request.post?
+    rendering_options.update(
-
-    @rendering_options.update(
       options: {
         fields_to_show: params[:fields_to_show],
         display_summary_row: params[:display_summary_row].present?,

app/controllers/errors_controller.rb

@@ -7,7 +7,7 @@ class ErrorsController < ApplicationController
     Bugsnag.notify("404") do |event|
       event.severity = "info"
 
-      event.add_metadata(:request, request.env)
+      event.add_metadata(:request, :env, request.env)
     end
     render status: :not_found, formats: :html
   end

app/controllers/spree/admin/base_controller.rb

@@ -19,15 +19,18 @@ module Spree
 
       before_action :authorize_admin
       before_action :set_locale
-      before_action :warn_invalid_order_cycles, if: :html_request?
+      before_action :warn_invalid_order_cycles, if: :page_load_request?
 
       # Warn the user when they have an active order cycle with hubs that are not ready
       # for checkout (ie. does not have valid shipping and payment methods).
       def warn_invalid_order_cycles
-        return if flash[:notice].present?
+        return if flash[:notice].present? || session[:displayed_order_cycle_warning]
 
         warning = OrderCycles::WarningService.new(spree_current_user).call
-        flash[:notice] = warning if warning.present?
+        return if warning.blank?
+
+        flash.now[:notice] = warning
+        session[:displayed_order_cycle_warning] = true
       end
 
       protected
@@ -81,6 +84,12 @@ module Spree
 
       private
 
+      def page_load_request?
+        return false if request.format.include?('turbo')
+
+        html_request?
+      end
+
       def html_request?
         request.format.html?
       end

app/controllers/spree/admin/products_controller.rb

@@ -10,6 +10,7 @@ module Spree
       include OpenFoodNetwork::SpreeApiKeyLoader
       include OrderCyclesHelper
       include EnterprisesHelper
+      helper ::Admin::ProductsHelper
 
       before_action :load_data
       before_action :load_producers, only: [:index, :new]
@@ -38,7 +39,7 @@ module Spree
       def create
         delete_stock_params_and_set_after do
           @object.attributes = permitted_resource_params
-          if @object.save
+          if @object.save(context: :create_and_create_standard_variant)
             flash[:success] = flash_message_for(@object, :successfully_created)
             redirect_after_save
           else
@@ -213,10 +214,10 @@ module Spree
 
       def notify_bugsnag(error, product, variant)
         Bugsnag.notify(error) do |report|
-          report.add_metadata(:product, product.attributes)
+          report.add_metadata(:product,
-          report.add_metadata(:product_error, product.errors.first) unless product.valid?
+                              { product: product.attributes, variant: variant.attributes })
-          report.add_metadata(:variant, variant.attributes)
+          report.add_metadata(:product, :product_error, product.errors.first) unless product.valid?
-          report.add_metadata(:variant_error, variant.errors.first) unless variant.valid?
+          report.add_metadata(:product, :variant_error, variant.errors.first) unless variant.valid?
         end
       end
 

app/controllers/spree/admin/return_authorizations_controller.rb

@@ -23,7 +23,7 @@ module Spree
 
       def permitted_resource_params
         params.require(:return_authorization).
-          permit(:amount, :reason, :stock_location_id)
+          permit(:amount, :reason)
       end
     end
   end

app/controllers/spree/admin/taxonomies_controller.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class TaxonomiesController < ::Admin::ResourceController
-      respond_to :json, only: [:get_children]
-
-      def get_children
-        @taxons = Taxon.find(params[:parent_id]).children
-      end
-
-      private
-
-      def location_after_save
-        if @taxonomy.created_at == @taxonomy.updated_at
-          spree.edit_admin_taxonomy_url(@taxonomy)
-        else
-          spree.admin_taxonomies_url
-        end
-      end
-
-      def permitted_resource_params
-        params.require(:taxonomy).permit(:name)
-      end
-    end
-  end
-end

app/controllers/spree/admin/taxons_controller.rb

@@ -2,122 +2,70 @@
 
 module Spree
   module Admin
-    class TaxonsController < Spree::Admin::BaseController
+    class TaxonsController < ::Admin::ResourceController
-      respond_to :html, :json, :js
+      before_action :set_taxon, except: %i[create index new]
 
-      def edit
+      def index
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxons = Taxon.order(:name)
-        @taxon = @taxonomy.taxons.find(params[:id])
-        @permalink_part = @taxon.permalink.split("/").last
       end
 
+      def new
+        @taxon = Taxon.new
+      end
+
+      def edit; end
+
       def create
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxon = Spree::Taxon.new(taxon_params)
-        @taxon = @taxonomy.taxons.build(params[:taxon])
         if @taxon.save
-          respond_with(@taxon) do |format|
+          flash[:success] = flash_message_for(@taxon, :successfully_created)
-            format.json { render json: @taxon.to_json }
+          redirect_to edit_admin_taxon_path(@taxon.id)
-          end
         else
-          flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
+          render :new, status: :unprocessable_entity
-          respond_with(@taxon) do |format|
-            format.html do
-              if redirect_to @taxonomy
-                spree.edit_admin_taxonomy_url(@taxonomy)
-              else
-                spree.admin_taxonomies_url
-              end
-            end
-          end
         end
       end
 
       def update
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
-        parent_id = params[:taxon][:parent_id]
-        new_position = params[:taxon][:position]
-
-        if parent_id || new_position # taxon is being moved
-          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
-          new_position = new_position.nil? ? -1 : new_position.to_i
-
-          # Bellow is a very complicated way of finding where in nested set we
-          # should actually move the taxon to achieve sane results,
-          # JS is giving us the desired position, which was awesome for previous setup,
-          # but now it's quite complicated to find where we should put it as we have
-          # to differenciate between moving to the same branch, up down and into
-          # first position.
-          new_siblings = new_parent.children
-          if new_position <= 0 && new_siblings.empty?
-            @taxon.move_to_child_of(new_parent)
-          elsif new_parent.id != @taxon.parent_id
-            if new_position.zero?
-              @taxon.move_to_left_of(new_siblings.first)
-            else
-              @taxon.move_to_right_of(new_siblings[new_position - 1])
-            end
-          elsif new_position < new_siblings.index(@taxon)
-            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
-          else
-            @taxon.move_to_right_of(new_siblings[new_position - 1]) # we move down
-          end
-          # Reset legacy position, if any extensions still rely on it
-          new_parent.children.reload.each do |t|
-            t.update_columns(
-              position: t.position,
-              updated_at: Time.zone.now
-            )
-          end
-
-          if parent_id
-            @taxon.reload
-            @taxon.set_permalink
-            @taxon.save!
-            @update_children = true
-          end
-        end
-
-        if params.key? "permalink_part"
-          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
-          parent_permalink += "/" if parent_permalink.present?
-          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
-        end
-        # check if we need to rename child taxons if parent name or permalink changes
-        if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
-          @update_children = true
-        end
-
         if @taxon.update(taxon_params)
           flash[:success] = flash_message_for(@taxon, :successfully_updated)
-        end
+          redirect_to edit_admin_taxon_path(@taxon.id)
-
+        else
-        # rename child taxons
+          render :edit, status: :unprocessable_entity
-        if @update_children
-          @taxon.descendants.each do |taxon|
-            taxon.reload
-            taxon.set_permalink
-            taxon.save!
-          end
-        end
-
-        respond_with(@taxon) do |format|
-          format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
-          format.json { render json: @taxon.to_json }
         end
       end
 
       def destroy
-        @taxon = Taxon.find(params[:id])
+        status = if @taxon.destroy
-        @taxon.destroy
+                   flash_message = t('.delete_taxon.success')
-        respond_with(@taxon) { |format| format.json { render json: '' } }
+                   status = :ok
+                 else
+                   flash_message = t('.delete_taxon.error')
+                   status = :unprocessable_entity
+                 end
+
+        respond_to do |format|
+          format.html {
+            flash[:success] = flash_message if status == :ok
+            flash[:error] = flash_message if status == :unprocessable_entity
+            redirect_to admin_taxons_path
+          }
+          format.turbo_stream {
+            flash[:success] = flash_message if status == :ok
+            flash[:error] = flash_message if status == :unprocessable_entity
+            render :destroy_taxon, status:
+          }
+        end
       end
 
       private
 
+      def set_taxon
+        @taxon = Taxon.find(params[:id])
+      end
+
       def taxon_params
         params.require(:taxon).permit(
-          :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
+          :name, :position, :icon, :description, :permalink,
           :meta_description, :meta_keywords, :meta_title, :dfc_id
         )
       end

app/controllers/spree/admin/variants_controller.rb

@@ -5,6 +5,8 @@ require 'open_food_network/scope_variants_for_search'
 module Spree
   module Admin
     class VariantsController < ::Admin::ResourceController
+      helper ::Admin::ProductsHelper
+
       belongs_to 'spree/product'
 
       before_action :load_data, only: [:new, :edit]

app/helpers/admin/enterprises_helper.rb

@@ -26,7 +26,8 @@ module Admin
       show_enterprise_fees = can?(:manage_enterprise_fees,
                                   enterprise) && (is_shop || enterprise.is_primary_producer)
       show_connected_apps = can?(:manage_connected_apps, enterprise) &&
-                            feature?(:connected_apps, spree_current_user, enterprise)
+                            feature?(:connected_apps, spree_current_user, enterprise) &&
+                            Spree::Config.connected_apps_enabled.present?
 
       build_enterprise_side_menu_items(
         is_shop:,
@@ -38,6 +39,11 @@ module Admin
       )
     end
 
+    def connected_apps_enabled
+      connected_apps_enabled = Spree::Config.connected_apps_enabled&.split(',') || []
+      ConnectedApp::TYPES & connected_apps_enabled
+    end
+
     private
 
     def build_enterprise_side_menu_items(

app/helpers/admin/products_helper.rb

@@ -10,22 +10,39 @@ module Admin
       end
     end
 
-    def prepare_new_variant(product)
+    def prepare_new_variant(product, producer_options)
-      product.variants.build do |variant|
+      # e.g producer_options = [['producer name', id]]
-        variant.unit_value = 1.0 * (product.variant_unit_scale || 1)
+      product.variants.build do |new_variant|
-        variant.unit_presentation = VariantUnits::OptionValueNamer.new(variant).name
+        new_variant.supplier_id = producer_options.first.second if producer_options.one?
       end
     end
 
     def unit_value_with_description(variant)
-      scaled_unit_value = variant.unit_value / (variant.product.variant_unit_scale || 1)
+      return variant.unit_description.to_s if variant.unit_value.nil?
+
+      scaled_unit_value = variant.unit_value / (variant.variant_unit_scale || 1)
       precised_unit_value = number_with_precision(
         scaled_unit_value,
         precision: nil,
-        strip_insignificant_zeros: true
+        strip_insignificant_zeros: true,
+        significant: false,
       )
 
       [precised_unit_value, variant.unit_description].compact_blank.join(" ")
     end
+
+    def products_return_to_url(url_filters)
+      if feature?(:admin_style_v3, spree_current_user)
+        return session[:products_return_to_url] || admin_products_url
+      end
+
+      "#{admin_products_path}#{url_filters.empty? ? '' : "#?#{url_filters.to_query}"}"
+    end
+
+    # if user hasn't saved any preferences on products page and there's only one producer;
+    # we need to hide producer column
+    def hide_producer_column?(producer_options)
+      spree_current_user.column_preferences.bulk_edit_product.empty? && producer_options.one?
+    end
   end
 end

app/helpers/application_helper.rb

@@ -61,15 +61,6 @@ module ApplicationHelper
     classes << shopfront_layout
   end
 
-  def pdf_stylesheet_pack_tag(source)
-    if running_in_development?
-      options = { media: "all", host: "#{Webpacker.dev_server.host}:#{Webpacker.dev_server.port}" }
-      stylesheet_pack_tag(source, **options)
-    else
-      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)

app/helpers/injection_helper.rb

@@ -8,11 +8,13 @@ module InjectionHelper
   include OrderCyclesHelper
 
   def inject_enterprises(enterprises = nil)
+    enterprises ||= default_enterprise_query
+
     inject_json_array(
       "enterprises",
-      enterprises || default_enterprise_query,
+      enterprises,
       Api::EnterpriseSerializer,
-      enterprise_injection_data,
+      enterprise_injection_data(enterprises.map(&:id)),
     )
   end
 
@@ -57,15 +59,16 @@ module InjectionHelper
     inject_json_array "enterprises",
                       enterprises_and_relatives,
                       Api::EnterpriseSerializer,
-                      enterprise_injection_data
+                      enterprise_injection_data(enterprises_and_relatives.map(&:id))
   end
 
   def inject_group_enterprises(group)
+    enterprises = group.enterprises.activated.visible.all
     inject_json_array(
       "enterprises",
-      group.enterprises.activated.visible.all,
+      enterprises,
       Api::EnterpriseSerializer,
-      enterprise_injection_data,
+      enterprise_injection_data(enterprises.map(&:id)),
     )
   end
 
@@ -73,7 +76,7 @@ module InjectionHelper
     inject_json "currentHub",
                 current_distributor,
                 Api::EnterpriseSerializer,
-                enterprise_injection_data
+                enterprise_injection_data(current_distributor ? [current_distributor.id] : nil)
   end
 
   def inject_current_order
@@ -153,7 +156,9 @@ module InjectionHelper
     Enterprise.activated.includes(address: [:state, :country]).all
   end
 
-  def enterprise_injection_data
+  def enterprise_injection_data(enterprise_ids)
-    @enterprise_injection_data ||= { data: OpenFoodNetwork::EnterpriseInjectionData.new }
+    {
+      data: OpenFoodNetwork::EnterpriseInjectionData.new(enterprise_ids)
+    }
   end
 end

app/helpers/reports_helper.rb

@@ -58,4 +58,9 @@ module ReportsHelper
       .where(order_id: orders.map(&:id))
       .pluck(:originator_id)
   end
+
+  def datepicker_time(datetime)
+    datetime = Time.zone.parse(datetime) if datetime.is_a? String
+    datetime.strftime('%Y-%m-%d %H:%M')
+  end
 end

app/helpers/spree/admin/taxons_helper.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    module TaxonsHelper
-      def taxon_path(taxon)
-        taxon.ancestors.reverse.collect(&:name).join( " >> ")
-      end
-    end
-  end
-end

app/jobs/amend_backorder_job.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# When orders are cancelled, we need to amend
+# an existing backorder as well.
+# We're not dealing with line item changes just yet.
+class AmendBackorderJob < ApplicationJob
+  sidekiq_options retry: 0
+
+  def perform(order)
+    OrderLocker.lock_order_and_variants(order) do
+      amend_backorder(order)
+    end
+  end
+
+  # The following is a mix of the BackorderJob and the CompleteBackorderJob.
+  # TODO: Move the common code into a re-usable service class.
+  def amend_backorder(order)
+    order_cycle = order.order_cycle
+    distributor = order.distributor
+    user = distributor.owner
+    items = backorderable_items(order)
+
+    return if items.empty?
+
+    # We are assuming that all variants are linked to the same wholesale
+    # shop and its catalog:
+    reference_link = items[0].variant.semantic_links[0].semantic_id
+    urls = FdcUrlBuilder.new(reference_link)
+    orderer = FdcBackorderer.new(user, urls)
+
+    backorder = orderer.find_open_order(order)
+
+    variants = order_cycle.variants_distributed_by(distributor)
+    adjust_quantities(order_cycle, user, backorder, urls, variants)
+
+    FdcBackorderer.new(user, urls).send_order(backorder)
+  end
+
+  # Check if we have enough stock to reduce the backorder.
+  #
+  # Our local stock can increase when users cancel their orders.
+  # But stock levels could also have been adjusted manually. So we review all
+  # quantities before finalising the order.
+  def adjust_quantities(order_cycle, user, order, urls, variants)
+    broker = FdcOfferBroker.new(user, urls)
+
+    order.lines.each do |line|
+      line.quantity = line.quantity.to_i
+      wholesale_product_id = line.offer.offeredItem.semanticId
+      transformation = broker.wholesale_to_retail(wholesale_product_id)
+      linked_variant = variants.linked_to(transformation.retail_product_id)
+
+      # Assumption: If a transformation is present then we only sell the retail
+      # variant. If that can't be found, it was deleted and we'll ignore that
+      # for now.
+      next if linked_variant.nil?
+
+      # Find all line items for this order cycle
+      # Update quantity accordingly
+      if linked_variant.on_demand
+        release_superfluous_stock(line, linked_variant, transformation)
+      else
+        aggregate_final_quantities(order_cycle, line, linked_variant, transformation)
+      end
+    end
+
+    # Clean up empty lines:
+    order.lines.reject! { |line| line.quantity.zero? }
+  end
+
+  # We look at all linked variants.
+  def backorderable_items(order)
+    order.line_items.select do |item|
+      # TODO: scope variants to hub.
+      # We are only supporting producer stock at the moment.
+      item.variant.semantic_links.present?
+    end
+  end
+
+  def release_superfluous_stock(line, linked_variant, transformation)
+    # Note that a division of integers dismisses the remainder, like `floor`:
+    wholesale_items_contained_in_stock = linked_variant.on_hand / transformation.factor
+
+    # But maybe we didn't actually order that much:
+    deductable_quantity = [line.quantity, wholesale_items_contained_in_stock].min
+    line.quantity -= deductable_quantity
+
+    retail_stock_changes = deductable_quantity * transformation.factor
+    linked_variant.on_hand -= retail_stock_changes
+  end
+
+  def aggregate_final_quantities(order_cycle, line, variant, transformation)
+    orders = order_cycle.orders.invoiceable
+    quantity = Spree::LineItem.where(order: orders, variant:).sum(:quantity)
+    wholesale_quantity = (quantity.to_f / transformation.factor).ceil
+    line.quantity = wholesale_quantity
+  end
+end

app/jobs/backorder_job.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+class BackorderJob < ApplicationJob
+  # In the current FDC project, one shop wants to review and adjust orders
+  # before finalising. They also run a market stall and need to adjust stock
+  # levels after the market. This should be done within four hours.
+  SALE_SESSION_DELAYS = {
+    # https://openfoodnetwork.org.uk/handleyfarm/shop
+    "https://openfoodnetwork.org.uk/api/dfc/enterprises/203468" => 4.hours,
+  }.freeze
+
+  queue_as :default
+  sidekiq_options retry: 0
+
+  def self.check_stock(order)
+    links = SemanticLink.where(subject: order.variants)
+
+    perform_later(order) if links.exists?
+  rescue StandardError => e
+    # Errors here shouldn't affect the checkout. So let's report them
+    # separately:
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata(:order, :order, order)
+    end
+  end
+
+  def perform(order)
+    OrderLocker.lock_order_and_variants(order) do
+      place_backorder(order)
+    end
+  rescue StandardError
+    # If the backordering fails, we need to tell the shop owner because they
+    # need to organgise more stock.
+    BackorderMailer.backorder_failed(order).deliver_later
+
+    raise
+  end
+
+  def place_backorder(order)
+    user = order.distributor.owner
+    items = backorderable_items(order)
+
+    return if items.empty?
+
+    # We are assuming that all variants are linked to the same wholesale
+    # shop and its catalog:
+    reference_link = items[0].variant.semantic_links[0].semantic_id
+    urls = FdcUrlBuilder.new(reference_link)
+    orderer = FdcBackorderer.new(user, urls)
+
+    backorder = orderer.find_or_build_order(order)
+    broker = load_broker(order.distributor.owner, urls)
+    ordered_quantities = {}
+
+    items.each do |item|
+      retail_quantity = add_item_to_backorder(item, broker, backorder, orderer)
+      ordered_quantities[item] = retail_quantity
+    end
+
+    place_order(user, order, orderer, backorder)
+
+    items.each do |item|
+      variant = item.variant
+      variant.on_hand += ordered_quantities[item] if variant.on_demand
+    end
+  end
+
+  # We look at linked variants which are either stock controlled or
+  # are on demand with negative stock.
+  def backorderable_items(order)
+    order.line_items.select do |item|
+      # TODO: scope variants to hub.
+      # We are only supporting producer stock at the moment.
+      variant = item.variant
+      variant.semantic_links.present? &&
+        (variant.on_demand == false || variant.on_hand&.negative?)
+    end
+  end
+
+  def add_item_to_backorder(line_item, broker, backorder, orderer)
+    variant = line_item.variant
+    needed_quantity = needed_quantity(line_item)
+    solution = broker.best_offer(variant.semantic_links[0].semantic_id)
+
+    # The number of wholesale packs we need to order to fulfill the
+    # needed quantity.
+    # For example, we order 2 packs of 12 cans if we need 15 cans.
+    wholesale_quantity = (needed_quantity.to_f / solution.factor).ceil
+
+    # The number of individual retail items we get with the wholesale order.
+    # For example, if we order 2 packs of 12 cans, we will get 24 cans
+    # and we'll account for that in our stock levels.
+    retail_quantity = wholesale_quantity * solution.factor
+
+    line = orderer.find_or_build_order_line(backorder, solution.offer)
+    line.quantity = line.quantity.to_i + wholesale_quantity
+
+    retail_quantity
+  end
+
+  # We have two different types of stock management:
+  #
+  # 1. on demand
+  #    We don't restrict sales but account for the quantity sold in our local
+  #    stock level. If it goes negative, we need more stock and trigger a
+  #    backorder.
+  # 2. limited stock
+  #    The local stock level is a copy from another catalog. We limit sales
+  #    according to that stock level. Every order reduces the local stock level
+  #    and needs to trigger a backorder of the same quantity to stay in sync.
+  def needed_quantity(line_item)
+    variant = line_item.variant
+
+    if variant.on_demand
+      -1 * variant.on_hand # on_hand is negative and we need to replenish it.
+    else
+      line_item.quantity # We need to order exactly what's we sold.
+    end
+  end
+
+  def load_broker(user, urls)
+    FdcOfferBroker.new(user, urls)
+  end
+
+  def place_order(user, order, orderer, backorder)
+    placed_order = orderer.send_order(backorder)
+
+    return unless orderer.new?(backorder)
+
+    delay = SALE_SESSION_DELAYS.fetch(backorder.client, 1.minute)
+    wait_until = order.order_cycle.orders_close_at + delay
+    CompleteBackorderJob.set(wait_until:)
+      .perform_later(
+        user, order.distributor, order.order_cycle, placed_order.semanticId
+      )
+
+    order.exchange.semantic_links.create!(semantic_id: placed_order.semanticId)
+  end
+end

app/jobs/complete_backorder_job.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# After an order cycle closed, we need to finalise open draft orders placed
+# to replenish stock.
+class CompleteBackorderJob < ApplicationJob
+  sidekiq_options retry: 0
+
+  # Required parameters:
+  #
+  # * user: to authenticate DFC requests
+  # * distributor: to reconile with its catalog
+  # * order_cycle: to scope the catalog when looking up variants
+  #                Multiple variants can be linked to the same remote product.
+  #                To reduce ambiguity, we'll reconcile only with products
+  #                from the given distributor in a given order cycle for which
+  #                the remote backorder was placed.
+  # * order_id: the remote semantic id of a draft order
+  #             Having the id makes sure that we don't accidentally finalise
+  #             someone else's order.
+  def perform(user, distributor, order_cycle, order_id)
+    order = FdcBackorderer.new(user, nil).find_order(order_id)
+
+    return if order&.lines.blank?
+
+    urls = FdcUrlBuilder.new(order.lines[0].offer.offeredItem.semanticId)
+
+    variants = order_cycle.variants_distributed_by(distributor)
+    adjust_quantities(order_cycle, user, order, urls, variants)
+
+    FdcBackorderer.new(user, urls).complete_order(order)
+
+    exchange = order_cycle.exchanges.outgoing.find_by(receiver: distributor)
+    exchange.semantic_links.find_by(semantic_id: order_id)&.destroy!
+  rescue StandardError
+    BackorderMailer.backorder_incomplete(user, distributor, order_cycle, order_id).deliver_later
+
+    raise
+  end
+
+  # Check if we have enough stock to reduce the backorder.
+  #
+  # Our local stock can increase when users cancel their orders.
+  # But stock levels could also have been adjusted manually. So we review all
+  # quantities before finalising the order.
+  def adjust_quantities(order_cycle, user, order, urls, variants)
+    broker = FdcOfferBroker.new(user, urls)
+
+    order.lines.each do |line|
+      line.quantity = line.quantity.to_i
+      wholesale_product_id = line.offer.offeredItem.semanticId
+      transformation = broker.wholesale_to_retail(wholesale_product_id)
+      linked_variant = variants.linked_to(transformation.retail_product_id)
+
+      # Assumption: If a transformation is present then we only sell the retail
+      # variant. If that can't be found, it was deleted and we'll ignore that
+      # for now.
+      next if linked_variant.nil?
+
+      # Find all line items for this order cycle
+      # Update quantity accordingly
+      if linked_variant.on_demand
+        release_superfluous_stock(line, linked_variant, transformation)
+      else
+        aggregate_final_quantities(order_cycle, line, linked_variant, transformation)
+      end
+    end
+
+    # Clean up empty lines:
+    order.lines.reject! { |line| line.quantity.zero? }
+  end
+
+  def release_superfluous_stock(line, linked_variant, transformation)
+    # Note that a division of integers dismisses the remainder, like `floor`:
+    wholesale_items_contained_in_stock = linked_variant.on_hand / transformation.factor
+
+    # But maybe we didn't actually order that much:
+    deductable_quantity = [line.quantity, wholesale_items_contained_in_stock].min
+    line.quantity -= deductable_quantity
+
+    retail_stock_changes = deductable_quantity * transformation.factor
+    linked_variant.on_hand -= retail_stock_changes
+  end
+
+  def aggregate_final_quantities(order_cycle, line, variant, transformation)
+    orders = order_cycle.orders.invoiceable
+    quantity = Spree::LineItem.where(order: orders, variant:).sum(:quantity)
+    wholesale_quantity = (quantity.to_f / transformation.factor).ceil
+    line.quantity = wholesale_quantity
+  end
+end

app/jobs/report_job.rb

@@ -9,12 +9,12 @@ class ReportJob < ApplicationJob
 
   NOTIFICATION_TIME = 5.seconds
 
-  def perform(report_class:, user:, params:, format:, filename:, channel: nil)
+  def perform(report_class:, user:, params:, format:, blob:, channel: nil)
     start_time = Time.zone.now
 
     report = report_class.new(user, params, render: true)
     result = report.render_as(format)
-    blob = ReportBlob.create!(filename, result)
+    blob.store(result)
 
     execution_time = Time.zone.now - start_time
 

app/jobs/stock_sync_job.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+class StockSyncJob < ApplicationJob
+  # No retry but stay as failed job:
+  sidekiq_options retry: 0
+
+  # We synchronise stock of stock-controlled variants linked to a remote
+  # product. These variants are rare though and we check first before we
+  # enqueue a new job. That should save some time loading the order with
+  # all the stock data to make this decision.
+  def self.sync_linked_catalogs(order)
+    user = order.distributor.owner
+    catalog_ids(order).each do |catalog_id|
+      perform_later(user, catalog_id)
+    end
+  rescue StandardError => e
+    # Errors here shouldn't affect the shopping. So let's report them
+    # separately:
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata(:order, :order, order)
+    end
+  end
+
+  def self.sync_linked_catalogs_now(order)
+    user = order.distributor.owner
+    catalog_ids(order).each do |catalog_id|
+      perform_now(user, catalog_id)
+    end
+  rescue StandardError => e
+    # Errors here shouldn't affect the shopping. So let's report them
+    # separately:
+    Bugsnag.notify(e) do |payload|
+      payload.add_metadata(:order, :order, order)
+    end
+  end
+
+  def self.catalog_ids(order)
+    stock_controlled_variants = order.variants.reject(&:on_demand)
+    links = SemanticLink.where(subject: stock_controlled_variants)
+    semantic_ids = links.pluck(:semantic_id)
+    semantic_ids.map do |product_id|
+      FdcUrlBuilder.new(product_id).catalog_url
+    end.uniq
+  end
+
+  def perform(user, catalog_id)
+    products = load_products(user, catalog_id)
+    products_by_id = products.index_by(&:semanticId)
+    product_ids = products_by_id.keys
+    variants = linked_variants(user.enterprises, product_ids)
+
+    # Avoid race condition between checkout and stock sync.
+    Spree::Variant.transaction do
+      variants.order(:id).lock.each do |variant|
+        next if variant.on_demand
+
+        product = products_by_id[variant.semantic_links[0].semantic_id]
+        catalog_item = product&.catalogItems&.first
+        CatalogItemBuilder.apply_stock(catalog_item, variant)
+        variant.stock_items[0].save!
+      end
+    end
+  end
+
+  def load_products(user, catalog_id)
+    json_catalog = DfcRequest.new(user).call(catalog_id)
+    graph = DfcIo.import(json_catalog)
+
+    graph.select do |subject|
+      subject.is_a? DataFoodConsortium::Connector::SuppliedProduct
+    end
+  end
+
+  def linked_variants(enterprises, product_ids)
+    Spree::Variant.where(supplier: enterprises)
+      .includes(:semantic_links).references(:semantic_links)
+      .where(semantic_links: { semantic_id: product_ids })
+  end
+end

app/jobs/subscription_confirm_job.rb

@@ -56,7 +56,7 @@ class SubscriptionConfirmJob < ApplicationJob
       send_failed_payment_email(order)
     else
       Bugsnag.notify(e) do |payload|
-        payload.add_metadata :order, order
+        payload.add_metadata :order, :order, order
       end
       send_failed_payment_email(order, e.message)
     end
@@ -109,8 +109,7 @@ class SubscriptionConfirmJob < ApplicationJob
     SubscriptionMailer.failed_payment_email(order).deliver_now
   rescue StandardError => e
     Bugsnag.notify(e) do |payload|
-      payload.add_metadata :order, order
+      payload.add_metadata :subscription_data, { order:, error_message: }
-      payload.add_metadata :error_message, error_message
     end
   end
 end

app/mailers/backorder_mailer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class BackorderMailer < ApplicationMailer
+  include I18nHelper
+
+  def backorder_failed(order)
+    @order = order
+    @linked_variants = order.variants
+
+    I18n.with_locale valid_locale(order.distributor.owner) do
+      mail(to: order.distributor.owner.email)
+    end
+  end
+
+  def backorder_incomplete(user, distributor, order_cycle, order_id)
+    @distributor = distributor
+    @order_cycle = order_cycle
+    @order_id = order_id
+
+    I18n.with_locale valid_locale(user) do
+      mail(to: user.email)
+    end
+  end
+end

app/models/column_preference.rb

@@ -15,10 +15,11 @@ class ColumnPreference < ApplicationRecord
   validates :column_name, presence: true, inclusion: { in: proc { |p|
                                                              valid_columns_for(p.action_name)
                                                            } }
+  scope :bulk_edit_product, -> { where(action_name: 'products_v3_index') }
 
   def self.for(user, action_name)
     stored_preferences = where(user_id: user.id, action_name:)
-    default_preferences = __send__("#{action_name}_columns")
+    default_preferences = get_default_preferences(action_name, user)
     filter(default_preferences, user, action_name)
     default_preferences.each_with_object([]) do |(column_name, default_attributes), preferences|
       stored_preference = stored_preferences.find_by(column_name:)
@@ -36,7 +37,7 @@ class ColumnPreference < ApplicationRecord
   end
 
   def self.valid_columns_for(action_name)
-    __send__("#{action_name}_columns").keys.map(&:to_s)
+    get_default_preferences(action_name, Spree::User.new).keys.map(&:to_s)
   end
 
   def self.known_actions
@@ -52,4 +53,13 @@ class ColumnPreference < ApplicationRecord
 
     default_preferences.delete(:schedules)
   end
+
+  def self.get_default_preferences(action_name, user)
+    case action_name
+    when 'products_v3_index'
+      products_v3_index_columns(user)
+    else
+      __send__("#{action_name}_columns")
+    end
+  end
 end

app/models/concerns/stock_settings_override_validation.rb

@@ -6,14 +6,14 @@
 # `count_on_hand` can either be: nil or a number
 #
 # This means that a variant override can be in six different stock states
-# but only three of them are valid.
+# but only four of them are valid.
 #
 # | on_demand | count_on_hand | stock_overridden? | use_producer_stock_settings? | valid? |
 # |-----------|---------------|-------------------|------------------------------|--------|
-# | 1         | nil           | false             | false                        | true   |
+# | 1         | nil           | true              | false                        | true   |
 # | 0         | x             | true              | false                        | true   |
 # | nil       | nil           | false             | true                         | true   |
-# | 1         | x             | ?                 | ?                            | false  |
+# | 1         | x             | true              | false                        | true   |
 # | 0         | nil           | ?                 | ?                            | false  |
 # | nil       | x             | ?                 | ?                            | false  |
 #
@@ -27,7 +27,6 @@ module StockSettingsOverrideValidation
 
   def require_compatible_on_demand_and_count_on_hand
     disallow_count_on_hand_if_using_producer_stock_settings
-    disallow_count_on_hand_if_on_demand
     require_count_on_hand_if_limited_stock
   end
 
@@ -39,14 +38,6 @@ module StockSettingsOverrideValidation
     errors.add(:count_on_hand, error_message)
   end
 
-  def disallow_count_on_hand_if_on_demand
-    return unless on_demand? && count_on_hand.present?
-
-    error_message = I18n.t("count_on_hand.on_demand_but_count_on_hand_set",
-                           scope: i18n_scope_for_stock_settings_override_validation_error)
-    errors.add(:count_on_hand, error_message)
-  end
-
   def require_count_on_hand_if_limited_stock
     return unless on_demand == false && count_on_hand.blank?
 

app/models/concerns/variant_stock.rb

@@ -43,19 +43,9 @@ module VariantStock
   def on_demand
     # A variant that has not been saved yet or has been soft-deleted doesn't have a stock item
     #   This provides a default value for variant.on_demand
-    #     using Spree::StockLocation.backorderable_default
+    return false if new_record? || deleted?
-    return Spree::StockLocation.first.backorderable_default if new_record? || deleted?
 
-    # This can be removed unless we have seen this error in Bugsnag recently
+    stock_item&.backorderable?
-    if stock_item.nil?
-      Bugsnag.notify(
-        RuntimeError.new("Variant #stock_item called, but the stock_item does not exist!"),
-        object: as_json
-      )
-      return Spree::StockLocation.first.backorderable_default
-    end
-
-    stock_item.backorderable?
   end
 
   # Sets whether the variant can be ordered on demand or not. Note that
@@ -96,7 +86,7 @@ module VariantStock
   # Here we depend only on variant.total_on_hand and variant.on_demand.
   #   This way, variant_overrides only need to override variant.total_on_hand and variant.on_demand.
   def fill_status(quantity)
-    on_hand = if total_on_hand >= quantity || on_demand
+    on_hand = if total_on_hand.to_i >= quantity || on_demand
                 quantity
               else
                 [0, total_on_hand].max
@@ -112,8 +102,7 @@ module VariantStock
   #
   # This enables us to override this behaviour for variant overrides
   def move(quantity, originator = nil)
-    # Don't change variant stock if variant is on_demand or has been deleted
+    return if deleted_at
-    return if on_demand || deleted_at
 
     raise_error_if_no_stock_item_available
 

app/models/connected_app.rb

@@ -4,11 +4,14 @@
 #
 # Here we store keys and links to access the app.
 class ConnectedApp < ApplicationRecord
+  TYPES = ['discover_regen', 'affiliate_sales_data', 'vine'].freeze
+
   belongs_to :enterprise
   after_destroy :disconnect
 
   scope :discover_regen, -> { where(type: "ConnectedApp") }
   scope :affiliate_sales_data, -> { where(type: "ConnectedApps::AffiliateSalesData") }
+  scope :vine, -> { where(type: "ConnectedApps::Vine") }
 
   scope :connecting, -> { where(data: nil) }
   scope :ready, -> { where.not(data: nil) }

app/models/connected_apps/vine.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# An enterprise can opt-in to use VINE API to manage vouchers
+#
+module ConnectedApps
+  class Vine < ConnectedApp
+    encrypts :data
+
+    def connect(api_key:, secret:, vine_api:, **_opts)
+      response = vine_api.my_team
+
+      return update data: { api_key:, secret: } if response.success?
+
+      errors.add(:base, I18n.t("activerecord.errors.models.connected_apps.vine.api_request_error"))
+
+      false
+    end
+
+    def disconnect; end
+  end
+end

app/models/custom_tab.rb

@@ -5,11 +5,6 @@ class CustomTab < ApplicationRecord
 
   validates :title, presence: true, length: { maximum: 20 }
 
-  # Remove any unsupported HTML.
-  def content
-    HtmlSanitizer.sanitize(super)
-  end
-
   # Remove any unsupported HTML.
   def content=(html)
     super(HtmlSanitizer.sanitize(html))

app/models/customer.rb

@@ -10,6 +10,8 @@
 class Customer < ApplicationRecord
   include SetUnusedAddressFields
 
+  self.ignored_columns += ['name']
+
   acts_as_taggable
 
   searchable_attributes :first_name, :last_name, :email, :code

app/models/enterprise.rb

@@ -247,14 +247,17 @@ class Enterprise < ApplicationRecord
     count(distinct: true)
   end
 
-  # Remove any unsupported HTML.
+  def long_description=(html)
-  def long_description
+    super(HtmlSanitizer.sanitize_and_enforce_link_target_blank(html))
-    HtmlSanitizer.sanitize(super)
   end
 
-  # Remove any unsupported HTML.
+  def preferred_shopfront_message=(html)
-  def long_description=(html)
+    self.prefers_shopfront_message = HtmlSanitizer.sanitize_and_enforce_link_target_blank(html)
-    super(HtmlSanitizer.sanitize(html))
+  end
+
+  def preferred_shopfront_closed_message=(html)
+    self.prefers_shopfront_closed_message =
+      HtmlSanitizer.sanitize_and_enforce_link_target_blank(html)
   end
 
   def contact
@@ -477,7 +480,7 @@ class Enterprise < ApplicationRecord
     return unless image.variable?
 
     image_variant_url_for(image.variant(name))
-  rescue ActiveStorage::Error, MiniMagick::Error, ActionView::Template::Error => e
+  rescue StandardError => e
     Bugsnag.notify "Enterprise ##{id} #{image.try(:name)} error: #{e.message}"
     Rails.logger.error(e.message)
 

app/models/enterprise_group.rb

@@ -74,14 +74,9 @@ class EnterpriseGroup < ApplicationRecord
     permalink
   end
 
-  # Remove any unsupported HTML.
-  def long_description
-    HtmlSanitizer.sanitize(super)
-  end
-
   # Remove any unsupported HTML.
   def long_description=(html)
-    super(HtmlSanitizer.sanitize(html))
+    super(HtmlSanitizer.sanitize_and_enforce_link_target_blank(html))
   end
 
   private

app/models/exchange.rb

@@ -22,6 +22,10 @@ class Exchange < ApplicationRecord
   has_many :exchange_fees, dependent: :destroy
   has_many :enterprise_fees, through: :exchange_fees
 
+  # Links to open backorders of a distributor (outgoing exchanges only)
+  # Don't allow removal of distributor from OC while we have an open backorder.
+  has_many :semantic_links, as: :subject, dependent: :restrict_with_error
+
   validates :sender_id, uniqueness: { scope: [:order_cycle_id, :receiver_id, :incoming] }
 
   before_destroy :delete_related_exchange_variants, prepend: true