Merge pull request #12206 from cyrillefr/Invoices-Several-tax-rates-are-showing-up-on-the-invoice-for-the-same-product

Fix incorrect results for multiple tax rates in report

.env.test

@@ -1,9 +1,14 @@
 # ENV vars for the test environment
 # Override locally with `.env.test.local`
 
+OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
+
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-STRIPE_SECRET_TEST_API_KEY="bogus_key"
+STRIPE_INSTANCE_SECRET_KEY="bogus_key"
 STRIPE_CUSTOMER="bogus_customer"
+STRIPE_ACCOUNT="bogus_account"
+STRIPE_CLIENT_ID="bogus_client_id"
+STRIPE_PUBLIC_TEST_API_KEY="bogus_stripe_publishable_key"
 
 SITE_URL="test.host"
 

.github/ISSUE_TEMPLATE/release.md

@@ -10,20 +10,15 @@ assignees: ''
 ## 1. Preparation on Thursday
 
 - [ ] Merge pull requests in the [Ready To Go] column
-- [ ] Include translations 
-  <details><summary>Command line instructions:</summary>
-    <pre>
-    git checkout master
-    git pull upstream master
-    tx pull --force
-    git commit -a -m "Update all locales with the latest Transifex translations"
-    git push upstream master</pre>
-  </details>
-- [ ] Create a tag: `git push upstream HEAD:refs/tags/vX.Y.Z`
+- [ ] Include translations: `script/release/update_locales`
+- [ ] Increment version number: `git push upstream HEAD:refs/tags/vX.Y.Z`
+    - Major: if server changes are required (eg. provision with ofn-install)
+    - Minor: larger change that is irreversible (eg. migration deleting data)
+    - Patch: all others. Shortcut: `script/release/tag`
 - [ ] [Draft new release]. Look at previous [releases] for inspiration.
     - Select new release tag
-    - _Generate release notes_ and arrange into categories as required.
-- [ ] Notify [#instance-managers] of user-facing changes.
+    - _Generate release notes_ and check to ensure all items are arranged in the right category.
+- [ ] Notify [#instance-managers] of user-facing :eyes:, API :warning: and experimental :construction: changes.
 
 ## 2. Testing
 
@@ -39,20 +34,22 @@ assignees: ''
   <pre>
   cd ofn-install
   git pull
-  ansible-playbook --limit all-prod --extra-vars "git_version=vX.Y.Z" playbooks/deploy.yml
+  ansible-playbook --limit all_prod --extra-vars "git_version=vX.Y.Z" playbooks/deploy.yml
   </pre>
   </details>
 - [ ] Notify [#instance-managers]:
   > @instance_managers The new release has been deployed.
-- [ ] Nudge next release manager
+- [ ] [Create issue] for next release and confirm with next release manager in [#core-devs].
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
 
-[Ready To Go]: #zenhub
+[Ready To Go]: https://github.com/orgs/openfoodfoundation/projects/8?filterQuery=status%3A%22Ready+to+go+%F0%9F%9A%80%22
 [Transifex pull request]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+head%3Atransifex
-[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%23%23%23+Experimental+features+for+testing+:sunglasses:%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A
 [releases]: https://github.com/openfoodfoundation/openfoodnetwork/releases
 [#instance-managers]: https://app.slack.com/client/T02G54U79/CG7NJ966B
 [#testing]: https://openfoodnetwork.slack.com/app_redirect?channel=C02TZ6X00
 [Deploy to Staging]: https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/stage.yml
 [#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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/release.yml

@@ -1,11 +1,37 @@
 changelog:
+  # Categorise according to what an instance manager needs to know
   categories:
-    - title: "User-facing changes 👀" # Other categories will need to be manually arrange for now.
+    # Add the right label if anything appears in here.
+    # Then re-generate the release notes.
+    - title: "❓❓❓ Uncategorised ❓❓❓"
       labels:
         - '*'
       exclude:
         labels:
+          - api changes
           - dependencies
-    - title: Dependencies 📦
+          - feature toggled
+          - technical changes only
+          - user facing changes
+
+    # Posted in advance for #instance-managers
+    - title: "User-facing changes 👀"
+      labels:
+        - user facing changes
+
+    - title: "API changes ⚠️"
+      labels:
+        - api changes
+
+    - title: "Experimental features for testing 🚧" # may be tested by instance managers
+      labels:
+        - feature toggled
+
+    # Instance managers ignore below
+    - title: "Technical changes 🛠️"
+      labels:
+        - technical changes only
+
+    - title: "Dependencies 📦"
       labels:
         - dependencies

.github/workflows/build.yml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 jobs:
-  knapsack_rspec_controllers:
+  controllers:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -85,7 +85,7 @@ jobs:
           git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
           bundle exec rake knapsack_pro:rspec
 
-  knapsack_rspec_models:
+  models:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -106,10 +106,10 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [7]
+        ci_node_total: [5]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6]
+        ci_node_index: [0, 1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v3
 
@@ -154,7 +154,7 @@ jobs:
         run: |
           bundle exec rake knapsack_pro:rspec
 
-  knapsack_rspec_system_admin:
+  system_admin:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -175,10 +175,10 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [10]
+        ci_node_total: [13]
         # 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] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] 
     steps:
       - uses: actions/checkout@v3
 
@@ -232,7 +232,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  knapsack_rspec_system_consumer:
+  system_consumer:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -253,10 +253,10 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [10]
+        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] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] 
     steps:
       - uses: actions/checkout@v3
 
@@ -310,7 +310,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  knapsack_rspec_engines:
+  engines:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -331,10 +331,10 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [5]
+        ci_node_total: [2]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4]
+        ci_node_index: [0, 1]
     steps:
       - uses: actions/checkout@v3
 
@@ -388,7 +388,7 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-  knapsack_rspec_test_the_rest:
+  test_the_rest:
     runs-on: ubuntu-22.04
     services:
       postgres:

.github/workflows/linters.yml

@@ -18,7 +18,7 @@ jobs:
         uses: reviewdog/action-rubocop@v2
         with:
           rubocop_version: gemfile
-          rubocop_extensions: rubocop-rails:gemfile
+          rubocop_extensions: rubocop-rails:gemfile rubocop-rspec:gemfile
           reporter: github-pr-check
           level: error
           fail_on_error: true

.github/workflows/mapi.yml

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

.husky/pre-commit

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

.rubocop.yml

@@ -4,7 +4,9 @@
 #
 # The configuration is split into three files. Look into those files for more details.
 #
-require: rubocop-rails
+require:
+  - rubocop-rails
+  - rubocop-rspec
 inherit_from:
 
   # The automatically generated todo list to ignore all current violations.
@@ -13,9 +15,10 @@ inherit_from:
   # The relaxed style rules as a common starting point which we can refine.
   - .rubocop_relaxed_styleguide.yml
 
-  # Our Open Food Network style guide. If you want to see all violations,
+  # Our Open Food Network style guides. If you want to see all violations,
   # then use only that configuration:
   #
   #     bundle exec rubocop -c .rubocop_styleguide.yml
   #
   - .rubocop_styleguide.yml
+  - .rubocop_rspec_styleguide.yml

.rubocop_rspec_styleguide.yml

@@ -0,0 +1,21 @@
+# OFN styleguide for rubocop-rspec
+# Because there are so many, we will disable by default, and enable rules as needed.
+
+Capybara:
+  Enabled: false
+
+RSpec:
+  Enabled: false
+
+FactoryBot:
+  Enabled: false
+
+# Enabled rules
+
+Capybara/NegationMatcher:
+  Enabled: true
+  EnforcedStyle: not_to
+
+RSpec/ExpectChange:
+  Enabled: true
+  EnforcedStyle: block

.rubocop_styleguide.yml

@@ -5,22 +5,55 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
   Exclude:
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'script/**/*'
-    - 'vendor/**/*'
-    - 'node_modules/**/*'
+    - bin/**/*
+    - db/**/*
+    - config/**/*
+    - script/**/*
+    - vendor/**/*
+    - node_modules/**/*
     # Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
-    - 'engines/web/Gemfile'
+    - engines/web/Gemfile
 
-## OFN SETTINGS
-#
-# Cop settings that have been agreed upon by the OFN community
+Bundler/DuplicatedGem:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: true
+  Max: 100
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+# Don't think this is a big issue, mostly picking up RPSEC scope definitions
+# with lamdas and RSpec '.to change{}' blocks
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/MissingSuper:
+  Exclude:
+    - app/components/**/*
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+# Heaps of offences (> 100) in specs, mostly in situations where two or more
+# instances of a model are required, but only one is referenced. Difficult to
+# fix without making the spec look messy or rewriting it.
+# Should definitely fix at some point.
+Lint/UselessAssignment:
+  Exclude:
+    - spec/**/*
 
 Metrics:
   Enabled: true
 
+Metrics/AbcSize:
+  Max: 30 # default 17
+
 Metrics/BlockLength:
   AllowedMethods: [
     "class_eval",
@@ -39,19 +72,38 @@ Metrics/BlockLength:
     "put",
     "resource",
     "resources",
+    "response",
     "scenario",
     "shared_examples",
     "shared_examples_for",
     "xdescribe",
   ]
 
+Metrics/MethodLength:
+  Enabled: true
+  Max: 25 # default 10
+
 Metrics/ParameterLists:
   CountKeywordArgs: false
 
+Metrics/PerceivedComplexity:
+  Enabled: true
+  Max: 14 # default 8
+
+Naming/PredicateName:
+  Enabled: false
+
+Naming/VariableNumber:
+  AllowedIdentifiers:
+    - street_address_1
+    - street_address_2
+  AllowedPatterns:
+    - _v[\d]+
+
 Rails/ApplicationRecord:
   Exclude:
     # Migrations should not contain application code:
-    - "db/migrate/*.rb"
+    - db/migrate/*.rb
 
 # Allow many-to-many associations without explicit model.
 # - It avoids the additional code of a model class.
@@ -60,19 +112,23 @@ Rails/ApplicationRecord:
 Rails/HasAndBelongsToMany:
   Enabled: false
 
+Rails/OutputSafety:
+  Exclude:
+    - spec/**/*
+
 Rails/SkipsModelValidations:
   AllowedMethods:
-    - "touch"
-    - "touch_all"
-    - "update_all"
-    - "update_attribute"
-    - "update_column"
-    - "update_columns"
+    - touch
+    - touch_all
+    - update_all
+    - update_attribute
+    - update_column
+    - update_columns
 
 Style/Documentation:
   Enabled: false
 
-Style/StringLiterals:
+Style/FormatStringToken:
   Enabled: false
 
 Style/HashSyntax:
@@ -82,62 +138,5 @@ Style/HashSyntax:
 Style/Send:
   Enabled: true
 
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/LineLength:
-  Enabled: true
-  Max: 100
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Naming/VariableNumber:
-  AllowedIdentifiers:
-    - street_address_1
-    - street_address_2
-  AllowedPatterns:
-    - _v[\d]+
-
-Bundler/DuplicatedGem:
-  Enabled: false
-
-## TEMPORARY/CONTESTED SETTINGS
-#
-# These are still to be decided upon, but recommended for inclusion by
-# oeoeaio after scrutinising offenses the codebase
-
-# Don't think this is a big issue, mostly picking up RPSEC scope definitions
-# with lamdas and RSpec '.to change{}' blocks
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-# Heaps of offences (> 100) in specs, mostly in situations where two or more
-# instances of a model are required, but only one is referenced. Difficult to
-# fix without making the spec look messy or rewriting it.
-# Should definitely fix at some point.
-Lint/UselessAssignment:
-  Exclude:
-  - spec/**/*
-
-Lint/MissingSuper:
-  Exclude:
-    - 'app/components/**/*'
-
-Metrics/AbcSize:
-  Max: 30 # default 17
-
-Metrics/MethodLength:
-  Enabled: true
-  Max: 25 # default 10
-
-Metrics/PerceivedComplexity:
-  Enabled: true
-  Max: 14 # default 8
-
-Naming/PredicateName:
+Style/StringLiterals:
   Enabled: false

.rubocop_todo.yml

@@ -1,25 +1,16 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp`
-# using RuboCop version 1.56.0.
+# using RuboCop version 1.60.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'spec/system/admin/tag_rules_spec.rb'
-
-# Offense count: 17
+# Offense count: 16
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'lib/active_merchant/billing/gateways/stripe_payment_intents_decorator.rb'
     - 'lib/tasks/import_product_images.rake'
     - 'lib/tasks/users.rake'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
@@ -98,12 +89,6 @@ Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'app/controllers/payment_gateways/stripe_controller.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/NonAtomicFileOperation:
-  Exclude:
-    - 'app/services/bulk_invoice_service.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/RedundantDirGlobSort:
@@ -121,6 +106,11 @@ Lint/RedundantSafeNavigation:
   Exclude:
     - 'app/models/spree/payment.rb'
 
+# Offense count: 1
+Lint/SelfAssignment:
+  Exclude:
+    - 'app/models/spree/order/checkout.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/UselessMethodDefinition:
@@ -153,8 +143,8 @@ Metrics/AbcSize:
     - 'lib/tasks/enterprises.rake'
     - 'spec/services/order_checkout_restart_spec.rb'
 
-# Offense count: 46
-# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
+# Offense count: 9
+# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Exclude:
@@ -164,27 +154,6 @@ Metrics/BlockLength:
     - 'app/models/spree/shipment.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
     - 'lib/tasks/data.rake'
-    - 'spec/factories.rb'
-    - 'spec/factories/address_factory.rb'
-    - 'spec/factories/enterprise_factory.rb'
-    - 'spec/factories/line_item_factory.rb'
-    - 'spec/factories/order_cycle_factory.rb'
-    - 'spec/factories/order_factory.rb'
-    - 'spec/factories/product_factory.rb'
-    - 'spec/factories/shipment_factory.rb'
-    - 'spec/factories/shipping_method_factory.rb'
-    - 'spec/factories/subscription_factory.rb'
-    - 'spec/factories/user_factory.rb'
-    - 'spec/factories/variant_factory.rb'
-    - 'spec/requests/api/orders_spec.rb'
-    - 'spec/requests/checkout/failed_checkout_spec.rb'
-    - 'spec/requests/checkout/stripe_sca_spec.rb'
-    - 'spec/support/cancan_helper.rb'
-    - 'spec/support/matchers/select2_matchers.rb'
-    - 'spec/support/matchers/table_matchers.rb'
-    - 'spec/system/consumer/shopping/checkout_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
-    - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: CountBlocks, Max.
@@ -192,7 +161,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 45
+# Offense count: 46
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -210,6 +179,7 @@ Metrics/ClassLength:
     - 'app/controllers/spree/admin/users_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/models/enterprise.rb'
+    - 'app/models/invoice/data_presenter.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/product_import/entry_processor.rb'
     - 'app/models/product_import/entry_validator.rb'
@@ -232,13 +202,13 @@ Metrics/ClassLength:
     - 'app/services/cart_service.rb'
     - 'app/services/order_cycle_form.rb'
     - 'app/services/order_syncer.rb'
-    - 'app/services/sets/product_set.rb'
     - 'engines/order_management/app/services/order_management/order/updater.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/order_cycle_permissions.rb'
     - 'lib/open_food_network/permissions.rb'
     - 'lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb'
+    - 'lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer.rb'
     - 'lib/reporting/reports/enterprise_fee_summary/scope.rb'
     - 'lib/reporting/reports/xero_invoices/base.rb'
 
@@ -296,7 +266,7 @@ Metrics/MethodLength:
     - 'lib/spree/localized_number.rb'
     - 'lib/tasks/sample_data/product_factory.rb'
 
-# Offense count: 49
+# Offense count: 48
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ModuleLength:
   Exclude:
@@ -347,7 +317,6 @@ Metrics/ModuleLength:
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/variant_units/option_value_namer_spec.rb'
-    - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/stripe_stubs.rb'
 
 # Offense count: 7
@@ -420,50 +389,39 @@ Naming/VariableNumber:
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/requests/api/orders_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: app/models/**/*.rb
-Rails/ActiveRecordOverride:
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+# AllowedMethods: order, limit, select, lock
+Rails/FindEach:
   Exclude:
-    - 'app/models/spree/product.rb'
+    - 'app/controllers/admin/order_cycles_controller.rb'
+    - 'app/jobs/subscription_confirm_job.rb'
+    - 'app/services/orders_bulk_cancel_service.rb'
+    - 'app/services/products_renderer.rb'
+    - 'lib/tasks/data.rake'
+    - 'lib/tasks/subscriptions/debug.rake'
+    - 'spec/system/admin/bulk_order_management_spec.rb'
+    - 'spec/system/admin/enterprise_relationships_spec.rb'
 
-# Offense count: 47
+# Offense count: 11
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
-    - 'app/models/customer.rb'
     - 'app/models/enterprise.rb'
-    - 'app/models/order_cycle.rb'
     - 'app/models/spree/address.rb'
-    - 'app/models/spree/adjustment.rb'
-    - 'app/models/spree/country.rb'
-    - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/payment.rb'
-    - 'app/models/spree/payment_method.rb'
-    - 'app/models/spree/property.rb'
-    - 'app/models/spree/return_authorization.rb'
-    - 'app/models/spree/shipment.rb'
-    - 'app/models/spree/shipping_category.rb'
-    - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/stock_item.rb'
     - 'app/models/spree/tax_rate.rb'
-    - 'app/models/spree/taxonomy.rb'
-    - 'app/models/spree/user.rb'
     - 'app/models/spree/variant.rb'
 
-# Offense count: 59
+# Offense count: 26
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
-    - 'app/helpers/admin/injection_helper.rb'
-    - 'app/helpers/application_helper.rb'
     - 'app/helpers/injection_helper.rb'
-    - 'app/helpers/order_cycles_helper.rb'
     - 'app/helpers/shared_helper.rb'
-    - 'app/helpers/shop_helper.rb'
     - 'app/helpers/spree/admin/orders_helper.rb'
     - 'app/helpers/spree/orders_helper.rb'
 
@@ -537,29 +495,12 @@ Rails/NegateInclude:
     - 'lib/spree/localized_number.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
-# Offense count: 17
-Rails/OutputSafety:
-  Exclude:
-    - 'app/helpers/angular_form_helper.rb'
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/reports_helper.rb'
-    - 'app/helpers/spree/admin/base_helper.rb'
-    - 'app/helpers/spree/admin/navigation_helper.rb'
-    - 'app/helpers/spree/admin/orders_helper.rb'
-    - 'app/helpers/spree/admin/zones_helper.rb'
-    - 'app/serializers/api/product_serializer.rb'
-    - 'lib/reporting/queries/query_builder.rb'
-    - 'lib/reporting/queries/query_interface.rb'
-    - 'lib/spree/money.rb'
-
-# Offense count: 29
+# Offense count: 32
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/Pluck:
   Exclude:
     - 'app/controllers/admin/variant_overrides_controller.rb'
-    - 'app/helpers/shop_helper.rb'
     - 'app/services/cart_service.rb'
-    - 'app/services/sets/product_set.rb'
     - 'lib/reporting/report_headers_builder.rb'
     - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -573,6 +514,7 @@ Rails/Pluck:
     - 'spec/lib/reports/lettuce_share_report_spec.rb'
     - 'spec/lib/reports/users_and_enterprises_report_spec.rb'
     - 'spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb'
+    - 'spec/support/api_helper.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -582,7 +524,18 @@ Rails/PluckInWhere:
   Exclude:
     - 'app/models/spree/variant.rb'
 
-# Offense count: 22
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
+Rails/RedundantActiveRecordAllMethod:
+  Exclude:
+    - 'app/models/spree/tax_rate.rb'
+    - 'app/models/spree/user.rb'
+    - 'app/models/spree/variant.rb'
+    - 'spec/system/admin/product_import_spec.rb'
+
+# Offense count: 20
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RedundantPresenceValidationOnBelongsTo:
   Exclude:
@@ -599,7 +552,6 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/spree/stock_item.rb'
     - 'app/models/spree/stock_movement.rb'
     - 'app/models/spree/tax_rate.rb'
-    - 'app/models/spree/variant.rb'
     - 'app/models/subscription_line_item.rb'
     - 'app/models/tag_rule.rb'
     - 'app/models/variant_override.rb'
@@ -630,13 +582,17 @@ Rails/ResponseParsedBody:
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
 
-# Offense count: 3
+# 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'
-    - 'spec/models/terms_of_service_file_spec.rb'
-    - 'spec/system/admin/configuration/terms_of_service_files_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/SelectMap:
+  Exclude:
+    - 'app/models/enterprise.rb'
 
 # Offense count: 4
 # Configuration parameters: ForbiddenMethods, AllowedMethods.
@@ -654,7 +610,7 @@ Rails/SquishedSQLHeredocs:
     - 'app/queries/outstanding_balance.rb'
     - 'spec/queries/outstanding_balance_spec.rb'
 
-# Offense count: 3
+# Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -663,8 +619,10 @@ Rails/TimeZone:
     - 'app/models/spree/gateway/pay_pal_express.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/services/customer_order_cancellation_spec.rb'
+    - 'spec/services/order_cycle_webhook_service_spec.rb'
 
 # Offense count: 1
+# Configuration parameters: TransactionMethods.
 Rails/TransactionExitStatement:
   Exclude:
     - 'app/services/place_proxy_order.rb'
@@ -687,7 +645,18 @@ Rails/UnknownEnv:
   Exclude:
     - 'app/models/spree/app_configuration.rb'
 
-# Offense count: 56
+# Offense count: 7
+# Configuration parameters: Severity.
+Rails/UnusedRenderContent:
+  Exclude:
+    - 'app/controllers/admin/bulk_line_items_controller.rb'
+    - 'app/controllers/admin/tag_rules_controller.rb'
+    - 'app/controllers/api/v0/enterprise_fees_controller.rb'
+    - 'app/controllers/api/v0/products_controller.rb'
+    - 'app/controllers/api/v0/taxons_controller.rb'
+    - 'app/controllers/api/v0/variants_controller.rb'
+
+# Offense count: 55
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/WhereEquals:
   Exclude:
@@ -714,7 +683,6 @@ Rails/WhereEquals:
     - 'app/serializers/api/order_serializer.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/order_cycle_permissions.rb'
-    - 'lib/reporting/reports/customers/base.rb'
     - 'lib/reporting/reports/products_and_inventory/base.rb'
     - 'lib/tasks/data.rake'
     - 'lib/tasks/data/anonymize_data.rake'
@@ -741,7 +709,7 @@ Security/Open:
   Exclude:
     - 'app/services/image_importer.rb'
 
-# Offense count: 11
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ArrayIntersect:
   Exclude:
@@ -791,26 +759,6 @@ Style/ClassAndModuleChildren:
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
     - 'spec/models/spree/payment_method_spec.rb'
 
-# Offense count: 1
-Style/ClassVars:
-  Exclude:
-    - 'lib/spree/core/delegate_belongs_to.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/FileRead:
-  Exclude:
-    - 'lib/tasks/karma.rake'
-    - 'spec/services/upload_sanitizer_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
-# SupportedStyles: annotated, template, unannotated
-# AllowedMethods: redirect
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -829,33 +777,6 @@ Style/GlobalStdStream:
     - 'lib/tasks/subscriptions/debug.rake'
     - 'lib/tasks/subscriptions/test.rake'
 
-# Offense count: 38
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
-  Exclude:
-    - 'app/controllers/admin/enterprises_controller.rb'
-    - 'app/controllers/admin/order_cycles_controller.rb'
-    - 'app/controllers/admin/product_import_controller.rb'
-    - 'app/controllers/api/v0/shipments_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/home_controller.rb'
-    - 'app/controllers/spree/orders_controller.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/enterprise_group.rb'
-    - 'app/models/producer_property.rb'
-    - 'app/models/product_import/entry_processor.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/preferences/preferable_class_methods.rb'
-    - 'app/services/order_syncer.rb'
-    - 'engines/order_management/app/services/order_management/order/updater.rb'
-    - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/spree/core/controller_helpers/respond_with.rb'
-    - 'spec/support/request/distribution_helper.rb'
-    - 'spec/support/request/shop_workflow.rb'
-    - 'spec/system/support/precompile_assets.rb'
-
 # Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSplatArgument.
@@ -872,404 +793,28 @@ Style/HashConversion:
     - 'spec/controllers/admin/inventory_items_controller_spec.rb'
     - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
 
+# Offense count: 13
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: Thread.current
+Style/HashEachMethods:
+  Exclude:
+    - 'app/controllers/admin/enterprises_controller.rb'
+    - 'app/controllers/spree/admin/shipping_methods_controller.rb'
+    - 'app/forms/enterprise_fees_bulk_update.rb'
+    - 'app/models/product_import/entry_processor.rb'
+    - 'app/models/spree/preferences/configuration.rb'
+    - 'app/services/sets/model_set.rb'
+    - 'lib/reporting/reports/sales_tax/sales_tax_totals_by_producer.rb'
+    - 'spec/models/product_importer_spec.rb'
+    - 'spec/support/cancan_helper.rb'
+
 # Offense count: 1
 # Configuration parameters: MinBranchesCount.
 Style/HashLikeCase:
   Exclude:
     - 'app/models/enterprise.rb'
 
-# Offense count: 1784
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent
-Style/HashSyntax:
-  Exclude:
-    - 'app/components/confirm_modal_component.rb'
-    - 'app/components/help_modal_component.rb'
-    - 'app/controllers/admin/customers_controller.rb'
-    - 'app/controllers/admin/enterprise_fees_controller.rb'
-    - 'app/controllers/admin/enterprise_groups_controller.rb'
-    - 'app/controllers/admin/enterprises_controller.rb'
-    - 'app/controllers/admin/order_cycles_controller.rb'
-    - 'app/controllers/admin/reports_controller.rb'
-    - 'app/controllers/admin/resource_controller.rb'
-    - 'app/controllers/admin/stripe_connect_settings_controller.rb'
-    - 'app/controllers/api/v0/enterprise_attachment_controller.rb'
-    - 'app/controllers/api/v0/shipments_controller.rb'
-    - 'app/controllers/concerns/extra_fields.rb'
-    - 'app/controllers/concerns/manager_invitations.rb'
-    - 'app/controllers/concerns/reports_actions.rb'
-    - 'app/controllers/line_items_controller.rb'
-    - 'app/controllers/payment_gateways/paypal_controller.rb'
-    - 'app/controllers/spree/admin/mail_methods_controller.rb'
-    - 'app/controllers/spree/admin/orders/customer_details_controller.rb'
-    - 'app/helpers/admin/injection_helper.rb'
-    - 'app/helpers/checkout_helper.rb'
-    - 'app/helpers/injection_helper.rb'
-    - 'app/helpers/serializer_helper.rb'
-    - 'app/helpers/spree/admin/base_helper.rb'
-    - 'app/helpers/tax_helper.rb'
-    - 'app/jobs/report_job.rb'
-    - 'app/jobs/webhook_delivery_job.rb'
-    - 'app/json_schemas/json_api_schema/structure.rb'
-    - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/payment_mailer.rb'
-    - 'app/mailers/producer_mailer.rb'
-    - 'app/mailers/spree/order_mailer.rb'
-    - 'app/mailers/spree/shipment_mailer.rb'
-    - 'app/mailers/spree/test_mailer.rb'
-    - 'app/mailers/spree/user_mailer.rb'
-    - 'app/mailers/subscription_mailer.rb'
-    - 'app/models/column_preference.rb'
-    - 'app/models/concerns/calculated_adjustments.rb'
-    - 'app/models/concerns/order_shipment.rb'
-    - 'app/models/concerns/variant_stock.rb'
-    - 'app/models/customer.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/enterprise_relationship.rb'
-    - 'app/models/exchange.rb'
-    - 'app/models/exchange_variant.rb'
-    - 'app/models/invoice/data_presenter.rb'
-    - 'app/models/invoice/data_presenter/adjustment.rb'
-    - 'app/models/invoice/data_presenter/line_item.rb'
-    - 'app/models/invoice/data_presenter/payment.rb'
-    - 'app/models/producer_property.rb'
-    - 'app/models/product_import/entry_validator.rb'
-    - 'app/models/product_import/product_importer.rb'
-    - 'app/models/report_blob.rb'
-    - 'app/models/spree/address.rb'
-    - 'app/models/spree/adjustment.rb'
-    - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/gateway/pay_pal_express.rb'
-    - 'app/models/spree/gateway/stripe_sca.rb'
-    - 'app/models/spree/inventory_unit.rb'
-    - 'app/models/spree/item_adjustments.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/order/checkout.rb'
-    - 'app/models/spree/order_contents.rb'
-    - 'app/models/spree/payment.rb'
-    - 'app/models/spree/payment/processing.rb'
-    - 'app/models/spree/preferences/store.rb'
-    - 'app/models/spree/price.rb'
-    - 'app/models/spree/product.rb'
-    - 'app/models/spree/product_property.rb'
-    - 'app/models/spree/return_authorization.rb'
-    - 'app/models/spree/shipment.rb'
-    - 'app/models/spree/shipping_rate.rb'
-    - 'app/models/spree/stock_location.rb'
-    - 'app/models/spree/tax_rate.rb'
-    - 'app/models/spree/taxonomy.rb'
-    - 'app/models/spree/user.rb'
-    - 'app/models/spree/variant.rb'
-    - 'app/models/stripe_account.rb'
-    - 'app/models/voucher.rb'
-    - 'app/reflexes/admin/orders_reflex.rb'
-    - 'app/reflexes/invite_manager_reflex.rb'
-    - 'app/reflexes/white_label_reflex.rb'
-    - 'app/serializers/api/admin/enterprise_serializer.rb'
-    - 'app/services/address_geocoder.rb'
-    - 'app/services/customer_syncer.rb'
-    - 'app/services/exchange_variant_bulk_updater.rb'
-    - 'app/services/image_importer.rb'
-    - 'app/services/order_cycle_warning.rb'
-    - 'app/services/order_invoice_comparator.rb'
-    - 'app/services/order_syncer.rb'
-    - 'app/services/products_renderer.rb'
-    - 'app/services/recurring_payments.rb'
-    - 'app/services/shop/order_cycles_list.rb'
-    - 'app/services/voucher_adjustments_service.rb'
-    - 'engines/dfc_provider/app/services/dfc_builder.rb'
-    - 'engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb'
-    - 'engines/dfc_provider/spec/support/authorization_helper.rb'
-    - 'engines/order_management/app/services/order_management/stock/estimator.rb'
-    - 'engines/order_management/app/services/order_management/subscriptions/proxy_order_syncer.rb'
-    - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
-    - 'engines/order_management/spec/services/order_management/order/updater_spec.rb'
-    - 'engines/order_management/spec/services/order_management/stock/package_spec.rb'
-    - 'engines/order_management/spec/services/order_management/stock/packer_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/stripe_payment_setup_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb'
-    - 'engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb'
-    - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
-    - 'engines/web/lib/web/cookies_consent.rb'
-    - 'lib/open_food_network/address_finder.rb'
-    - 'lib/open_food_network/enterprise_fee_applicator.rb'
-    - 'lib/open_food_network/enterprise_fee_calculator.rb'
-    - 'lib/open_food_network/i18n_inflections.rb'
-    - 'lib/open_food_network/order_cycle_form_applicator.rb'
-    - 'lib/open_food_network/scope_variant_to_hub.rb'
-    - 'lib/reporting/report_headers_builder.rb'
-    - 'lib/reporting/report_renderer.rb'
-    - 'lib/reporting/report_rows_builder.rb'
-    - 'lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb'
-    - 'lib/reporting/reports/enterprise_fee_summary/fee_summary.rb'
-    - 'lib/reporting/reports/list.rb'
-    - 'lib/reporting/reports/order_cycle_management/base.rb'
-    - 'lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb'
-    - 'lib/reporting/reports/packing/customer.rb'
-    - 'lib/reporting/reports/packing/product.rb'
-    - 'lib/reporting/reports/packing/supplier.rb'
-    - 'lib/reporting/reports/sales_tax/sales_tax_totals_by_order.rb'
-    - 'lib/reporting/reports/sales_tax/sales_tax_totals_by_producer.rb'
-    - 'lib/spree/core/controller_helpers/respond_with.rb'
-    - 'lib/stripe/account_connector.rb'
-    - 'lib/stripe/credit_card_clone_destroyer.rb'
-    - 'lib/stripe/credit_card_clone_finder.rb'
-    - 'lib/stripe/payment_intent_validator.rb'
-    - 'lib/tasks/sample_data/addressing.rb'
-    - 'lib/tasks/sample_data/enterprise_factory.rb'
-    - 'lib/tasks/sample_data/order_cycle_factory.rb'
-    - 'lib/tasks/sample_data/payment_method_factory.rb'
-    - 'lib/tasks/sample_data/user_factory.rb'
-    - 'lib/tasks/subscriptions/debug.rake'
-    - 'lib/tasks/subscriptions/test.rake'
-    - 'spec/constraints/feature_toggle_constraint_spec.rb'
-    - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
-    - 'spec/controllers/admin/customers_controller_spec.rb'
-    - 'spec/controllers/admin/enterprises_controller_spec.rb'
-    - 'spec/controllers/admin/inventory_items_controller_spec.rb'
-    - 'spec/controllers/admin/invoice_settings_controller_spec.rb'
-    - 'spec/controllers/admin/matomo_settings_controller_spec.rb'
-    - 'spec/controllers/admin/order_cycles_controller_spec.rb'
-    - 'spec/controllers/admin/proxy_orders_controller_spec.rb'
-    - 'spec/controllers/admin/reports_controller_spec.rb'
-    - 'spec/controllers/admin/schedules_controller_spec.rb'
-    - 'spec/controllers/admin/stripe_accounts_controller_spec.rb'
-    - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb'
-    - 'spec/controllers/admin/subscription_line_items_controller_spec.rb'
-    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
-    - 'spec/controllers/admin/tag_rules_controller_spec.rb'
-    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
-    - 'spec/controllers/api/v0/customers_controller_spec.rb'
-    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
-    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
-    - 'spec/controllers/api/v0/orders_controller_spec.rb'
-    - 'spec/controllers/api/v0/products_controller_spec.rb'
-    - 'spec/controllers/api/v0/reports/packing_report_spec.rb'
-    - 'spec/controllers/api/v0/shipments_controller_spec.rb'
-    - 'spec/controllers/api/v0/taxonomies_controller_spec.rb'
-    - 'spec/controllers/api/v0/taxons_controller_spec.rb'
-    - 'spec/controllers/api/v0/variants_controller_spec.rb'
-    - 'spec/controllers/base_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/enterprises_controller_spec.rb'
-    - 'spec/controllers/line_items_controller_spec.rb'
-    - 'spec/controllers/payment_gateways/stripe_controller_spec.rb'
-    - 'spec/controllers/split_checkout_controller_spec.rb'
-    - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
-    - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb'
-    - 'spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
-    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
-    - 'spec/controllers/spree/admin/search_controller_spec.rb'
-    - 'spec/controllers/spree/admin/taxons_controller_spec.rb'
-    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
-    - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/controllers/stripe/webhooks_controller_spec.rb'
-    - 'spec/factories/line_item_factory.rb'
-    - 'spec/factories/order_cycle_factory.rb'
-    - 'spec/factories/order_factory.rb'
-    - 'spec/factories/shipment_factory.rb'
-    - 'spec/factories/subscription_factory.rb'
-    - 'spec/helpers/admin/orders_helper_spec.rb'
-    - 'spec/helpers/checkout_helper_spec.rb'
-    - 'spec/helpers/spree/base_helper_spec.rb'
-    - 'spec/jobs/report_job_spec.rb'
-    - 'spec/jobs/subscription_confirm_job_spec.rb'
-    - 'spec/jobs/webhook_delivery_job_spec.rb'
-    - 'spec/lib/open_food_network/address_finder_spec.rb'
-    - 'spec/lib/open_food_network/enterprise_fee_applicator_spec.rb'
-    - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
-    - 'spec/lib/open_food_network/order_cycle_permissions_spec.rb'
-    - 'spec/lib/open_food_network/property_merge_spec.rb'
-    - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
-    - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
-    - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
-    - 'spec/lib/reports/bulk_coop_report_spec.rb'
-    - 'spec/lib/reports/customers_report_spec.rb'
-    - 'spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb'
-    - 'spec/lib/reports/enterprise_fee_summary/permissions_spec.rb'
-    - 'spec/lib/reports/lettuce_share_report_spec.rb'
-    - 'spec/lib/reports/line_items_spec.rb'
-    - 'spec/lib/reports/order_cycle_management_report_spec.rb'
-    - 'spec/lib/reports/orders_and_distributors_report_spec.rb'
-    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb'
-    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_distributor_totals_by_supplier_report_spec.rb'
-    - 'spec/lib/reports/orders_and_fulfillment/order_cycle_supplier_totals_by_distributor_report_spec.rb'
-    - 'spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb'
-    - 'spec/lib/reports/packing/packing_report_spec.rb'
-    - 'spec/lib/reports/products_and_inventory_report_spec.rb'
-    - 'spec/lib/spree/core/product_duplicator_spec.rb'
-    - 'spec/lib/stripe/account_connector_spec.rb'
-    - 'spec/lib/tasks/data/remove_transient_data_spec.rb'
-    - 'spec/lib/tasks/data/truncate_data_spec.rb'
-    - 'spec/mailers/order_mailer_spec.rb'
-    - 'spec/mailers/producer_mailer_spec.rb'
-    - 'spec/mailers/report_mailer_spec.rb'
-    - 'spec/mailers/shipment_mailer_spec.rb'
-    - 'spec/mailers/subscription_mailer_spec.rb'
-    - 'spec/migrations/migrate_admin_tax_amounts_spec.rb'
-    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
-    - 'spec/models/calculator/flexi_rate_spec.rb'
-    - 'spec/models/calculator/price_sack_spec.rb'
-    - 'spec/models/calculator/weight_spec.rb'
-    - 'spec/models/column_preference_spec.rb'
-    - 'spec/models/concerns/calculated_adjustments_spec.rb'
-    - 'spec/models/concerns/order_shipment_spec.rb'
-    - 'spec/models/concerns/product_stock_spec.rb'
-    - 'spec/models/customer_spec.rb'
-    - 'spec/models/enterprise_fee_spec.rb'
-    - 'spec/models/enterprise_relationship_spec.rb'
-    - 'spec/models/enterprise_spec.rb'
-    - 'spec/models/exchange_spec.rb'
-    - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/product_import/entry_validator_spec.rb'
-    - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
-    - 'spec/models/product_importer_spec.rb'
-    - 'spec/models/proxy_order_spec.rb'
-    - 'spec/models/spree/ability_spec.rb'
-    - 'spec/models/spree/address_spec.rb'
-    - 'spec/models/spree/adjustment_spec.rb'
-    - 'spec/models/spree/calculator_spec.rb'
-    - 'spec/models/spree/credit_card_spec.rb'
-    - 'spec/models/spree/gateway/stripe_sca_spec.rb'
-    - 'spec/models/spree/inventory_unit_spec.rb'
-    - 'spec/models/spree/line_item_spec.rb'
-    - 'spec/models/spree/order/checkout_spec.rb'
-    - 'spec/models/spree/order/state_machine_spec.rb'
-    - 'spec/models/spree/order/tax_spec.rb'
-    - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/spree/payment_method_spec.rb'
-    - 'spec/models/spree/payment_spec.rb'
-    - 'spec/models/spree/preference_spec.rb'
-    - 'spec/models/spree/product_spec.rb'
-    - 'spec/models/spree/return_authorization_spec.rb'
-    - 'spec/models/spree/shipment_spec.rb'
-    - 'spec/models/spree/shipping_method_spec.rb'
-    - 'spec/models/spree/shipping_rate_spec.rb'
-    - 'spec/models/spree/stock/availability_validator_spec.rb'
-    - 'spec/models/spree/stock_movement_spec.rb'
-    - 'spec/models/spree/tax_rate_spec.rb'
-    - 'spec/models/spree/user_spec.rb'
-    - 'spec/models/spree/variant_spec.rb'
-    - 'spec/models/spree/zone_spec.rb'
-    - 'spec/models/stripe_account_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
-    - 'spec/models/voucher_spec.rb'
-    - 'spec/queries/complete_orders_with_balance_spec.rb'
-    - 'spec/queries/customers_with_balance_spec.rb'
-    - 'spec/queries/outstanding_balance_spec.rb'
-    - 'spec/queries/payments_requiring_action_spec.rb'
-    - 'spec/requests/api/v1/customers_spec.rb'
-    - 'spec/requests/checkout/failed_checkout_spec.rb'
-    - 'spec/requests/checkout/paypal_spec.rb'
-    - 'spec/requests/checkout/routes_spec.rb'
-    - 'spec/requests/checkout/stripe_sca_spec.rb'
-    - 'spec/requests/voucher_adjustments_spec.rb'
-    - 'spec/serializers/api/admin/customer_serializer_spec.rb'
-    - 'spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb'
-    - 'spec/serializers/api/admin/index_enterprise_serializer_spec.rb'
-    - 'spec/serializers/api/admin/order_serializer_spec.rb'
-    - 'spec/serializers/api/admin/variant_override_serializer_spec.rb'
-    - 'spec/serializers/api/enterprise_serializer_spec.rb'
-    - 'spec/serializers/api/order_serializer_spec.rb'
-    - 'spec/serializers/api/product_serializer_spec.rb'
-    - 'spec/services/cap_quantity_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
-    - 'spec/services/checkout/payment_method_fetcher_spec.rb'
-    - 'spec/services/default_stock_location_spec.rb'
-    - 'spec/services/invoice_data_generator_spec.rb'
-    - 'spec/services/order_available_payment_methods_spec.rb'
-    - 'spec/services/order_available_shipping_methods_spec.rb'
-    - 'spec/services/order_cart_reset_spec.rb'
-    - 'spec/services/order_checkout_restart_spec.rb'
-    - 'spec/services/order_cycle_distributed_products_spec.rb'
-    - 'spec/services/order_cycle_form_spec.rb'
-    - 'spec/services/order_cycle_webhook_service_spec.rb'
-    - 'spec/services/order_data_masker_spec.rb'
-    - 'spec/services/order_factory_spec.rb'
-    - 'spec/services/order_fees_handler_spec.rb'
-    - 'spec/services/order_invoice_comparator_spec.rb'
-    - 'spec/services/order_payment_finder_spec.rb'
-    - 'spec/services/order_syncer_spec.rb'
-    - 'spec/services/order_tax_adjustments_fetcher_spec.rb'
-    - 'spec/services/order_workflow_spec.rb'
-    - 'spec/services/paypal_items_builder_spec.rb'
-    - 'spec/services/permissions/order_spec.rb'
-    - 'spec/services/place_proxy_order_spec.rb'
-    - 'spec/services/process_payment_intent_spec.rb'
-    - 'spec/services/product_tag_rules_filterer_spec.rb'
-    - 'spec/services/products_renderer_spec.rb'
-    - 'spec/services/search_orders_spec.rb'
-    - 'spec/services/sets/product_set_spec.rb'
-    - 'spec/services/tax_rate_finder_spec.rb'
-    - 'spec/services/user_default_address_setter_spec.rb'
-    - 'spec/services/variants_stock_levels_spec.rb'
-    - 'spec/services/voucher_adjustments_service_spec.rb'
-    - 'spec/support/controller_helper.rb'
-    - 'spec/support/controller_requests_helper.rb'
-    - 'spec/support/request/stripe_stubs.rb'
-    - 'spec/support/request/ui_component_helper.rb'
-    - 'spec/support/request/web_helper.rb'
-    - 'spec/system/admin/adjustments_spec.rb'
-    - 'spec/system/admin/bulk_product_update_spec.rb'
-    - 'spec/system/admin/configuration/states_spec.rb'
-    - 'spec/system/admin/configuration/tax_rates_spec.rb'
-    - 'spec/system/admin/customers_spec.rb'
-    - 'spec/system/admin/enterprises_spec.rb'
-    - 'spec/system/admin/invoice_print_spec.rb'
-    - 'spec/system/admin/order_cycles/complex_creating_specific_time_spec.rb'
-    - 'spec/system/admin/order_cycles/complex_updating_specific_time_spec.rb'
-    - 'spec/system/admin/order_cycles/simple_spec.rb'
-    - 'spec/system/admin/order_spec.rb'
-    - 'spec/system/admin/orders_spec.rb'
-    - 'spec/system/admin/payments_stripe_spec.rb'
-    - 'spec/system/admin/reports/enterprise_fee_summaries_spec.rb'
-    - 'spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb'
-    - 'spec/system/admin/reports/orders_and_fulfillment_spec.rb'
-    - 'spec/system/admin/reports/packing_report_spec.rb'
-    - 'spec/system/admin/reports/payments_report_spec.rb'
-    - 'spec/system/admin/reports/revenues_by_hub_spec.rb'
-    - 'spec/system/admin/reports/sales_tax/sales_tax_totals_by_order_spec.rb'
-    - 'spec/system/admin/reports/sales_tax/sales_tax_totals_by_producer_spec.rb'
-    - 'spec/system/admin/reports_spec.rb'
-    - 'spec/system/admin/subscriptions_spec.rb'
-    - 'spec/system/admin/tag_rules_spec.rb'
-    - 'spec/system/admin/variant_overrides_spec.rb'
-    - 'spec/system/admin/vouchers_spec.rb'
-    - 'spec/system/consumer/account/cards_spec.rb'
-    - 'spec/system/consumer/account/developer_settings_spec.rb'
-    - 'spec/system/consumer/account/payments_spec.rb'
-    - 'spec/system/consumer/account_spec.rb'
-    - 'spec/system/consumer/authentication_spec.rb'
-    - 'spec/system/consumer/multilingual_spec.rb'
-    - 'spec/system/consumer/shopping/cart_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_paypal_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
-    - 'spec/system/consumer/shopping/orders_spec.rb'
-    - 'spec/system/consumer/shopping/products_spec.rb'
-    - 'spec/system/consumer/shopping/shopping_spec.rb'
-    - 'spec/system/consumer/shopping/unit_price_spec.rb'
-    - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
-    - 'spec/system/consumer/split_checkout_spec.rb'
-    - 'spec/system/consumer/split_checkout_tax_incl_spec.rb'
-    - 'spec/system/consumer/split_checkout_tax_not_incl_spec.rb'
-    - 'spec/system/consumer/user_password_spec.rb'
-    - 'spec/system/consumer/white_label_spec.rb'
-    - 'spec/system/support/cuprite_setup.rb'
-    - 'spec/views/spree/orders/edit.html.haml_spec.rb'
-    - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
@@ -1286,19 +831,6 @@ Style/MissingRespondToMissing:
     - 'app/models/spree/gateway.rb'
     - 'app/models/spree/preferences/configuration.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineTernaryOperator:
-  Exclude:
-    - 'spec/system/admin/subscriptions_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/NegatedIfElseCondition:
-  Exclude:
-    - 'app/mailers/spree/shipment_mailer.rb'
-    - 'spec/support/matchers/table_matchers.rb'
-
 # Offense count: 22
 # This cop supports safe autocorrection (--autocorrect).
 Style/NestedModifier:
@@ -1327,7 +859,7 @@ Style/OpenStructUse:
     - 'spec/lib/reports/users_and_enterprises_report_spec.rb'
     - 'spec/serializers/api/enterprise_serializer_spec.rb'
 
-# Offense count: 16
+# Offense count: 15
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
@@ -1341,16 +873,8 @@ Style/OptionalBooleanParameter:
     - 'app/models/spree/shipment.rb'
     - 'engines/order_management/app/services/order_management/stock/estimator.rb'
     - 'lib/spree/core/controller_helpers/order.rb'
-    - 'lib/spree/core/delegate_belongs_to.rb'
     - 'spec/support/request/web_helper.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
-Style/ParenthesesAroundCondition:
-  Exclude:
-    - 'spec/system/support/precompile_assets.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -1359,46 +883,18 @@ Style/PreferredHashMethods:
   Exclude:
     - 'app/controllers/api/v0/shipments_controller.rb'
 
-# Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
-Style/QuotedSymbols:
-  Exclude:
-    - 'app/services/exchange_products_renderer.rb'
-    - 'lib/stripe/credit_card_cloner.rb'
-    - 'spec/controllers/api/v0/exchange_products_controller_spec.rb'
-    - 'spec/requests/api/orders_spec.rb'
-    - 'spec/requests/api/v1/customers_spec.rb'
-    - 'spec/support/request/stripe_stubs.rb'
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
 Style/RedundantArgument:
   Exclude:
     - 'engines/dfc_provider/app/services/authorization_control.rb'
-    - 'spec/support/query_counter.rb'
-
-# Offense count: 13
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantConstantBase:
-  Exclude:
-    - 'app/controllers/split_checkout_controller.rb'
-    - 'app/controllers/webhook_endpoints_controller.rb'
-    - 'config.ru'
-    - 'spec/helpers/checkout_helper_spec.rb'
-    - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/spree/payment_method_spec.rb'
-    - 'spec/models/spree/payment_spec.rb'
-    - 'spec/queries/complete_visible_orders_spec.rb'
-    - 'spec/services/paypal_items_builder_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-Style/RedundantDoubleSplatHashBraces:
+Style/RedundantAssignment:
   Exclude:
-    - 'spec/system/support/cuprite_setup.rb'
+    - 'spec/models/database_spec.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -1414,32 +910,6 @@ Style/RedundantInterpolation:
     - 'lib/tasks/karma.rake'
     - 'spec/base_spec_helper.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpArgument:
-  Exclude:
-    - 'app/models/spree/shipping_method.rb'
-    - 'lib/spree/i18n.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/models/product_import/entry_validator.rb'
-    - 'app/models/spree/stock/availability_validator.rb'
-    - 'lib/reporting/reports/enterprise_fee_summary/summarizer.rb'
-    - 'lib/stripe/authorize_response_patcher.rb'
-    - 'lib/tasks/data.rake'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantStringEscape:
-  Exclude:
-    - 'app/models/spree/calculator.rb'
-    - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
-    - 'spec/system/admin/enterprise_fees_spec.rb'
-
 # Offense count: 19
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -1491,7 +961,7 @@ Style/SlicingWithRange:
     - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 28
+# Offense count: 25
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
@@ -1513,6 +983,5 @@ Style/StringConcatenation:
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/services/embedded_page_service_spec.rb'
-    - 'spec/support/api_helper.rb'
     - 'spec/support/features/datepicker_helper.rb'
     - 'spec/system/admin/products_spec.rb'

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby File.read('.ruby-version').chomp
 
-gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+gem 'dotenv', require: 'dotenv/load' # Load ENV vars before other gems
 
 gem 'rails'
 
@@ -17,7 +17,7 @@ gem "image_processing"
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '~> 2.6.0'
+gem 'ransack', '~> 4.1.0'
 gem 'responders'
 gem 'rexml'
 gem 'webpacker', '~> 5'
@@ -32,6 +32,7 @@ gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-7"
 gem "fog-aws", "~> 2.0" # db2fog does not support v3
 gem "mime-types" # required by fog
 
+gem "validates_lengths_from_database"
 gem "valid_email2"
 
 gem "catalog", path: "./engines/catalog"
@@ -73,7 +74,7 @@ gem 'rswag-ui'
 
 gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection'
-gem 'openid_connect', '~> 1.3'
+gem 'openid_connect'
 
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
@@ -92,14 +93,13 @@ gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 12.1'
+gem 'paper_trail'
 gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
 
-gem 'hiredis'
 gem 'puma'
-gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'redis'
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
@@ -133,6 +133,8 @@ gem 'flipper-ui'
 gem "view_component"
 gem 'view_component_reflex', '3.1.14.pre9'
 
+# mini_portile2 is needed when installing with Vargant
+# https://openfoodnetwork.slack.com/archives/CEBMTRCNS/p1668439152992899
 gem 'mini_portile2', '~> 2.8'
 
 gem "faraday"
@@ -140,6 +142,8 @@ gem "private_address_check"
 
 gem 'newrelic_rpm'
 
+gem 'invisible_captcha'
+
 group :production, :staging do
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
@@ -157,7 +161,8 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry', require: false
-  gem 'rswag-specs'
+  gem 'rspec-sql'
+  gem 'rswag'
   gem 'shoulda-matchers'
   gem 'stimulus_reflex_testing'
   gem 'timecop'
@@ -182,8 +187,10 @@ group :development do
   gem 'rails-erd'
   gem 'rubocop'
   gem 'rubocop-rails'
+  gem 'rubocop-rspec'
   gem 'spring'
   gem 'spring-commands-rspec'
+  gem 'spring-commands-rubocop'
   gem 'web-console'
 
   gem 'rack-mini-profiler', '< 3.0.0'

Gemfile.lock

@@ -41,145 +41,148 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.7.2)
-      actionview (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actiontext (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (1.0.4)
+    active_storage_validations (1.1.4)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
       activesupport (>= 5.2.0)
-    activejob (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemerchant (1.123.0)
+    activemerchant (1.133.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord-import (1.5.0)
+      rexml (~> 3.2.5)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activerecord-import (1.5.1)
       activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activerecord-session_store (2.0.0)
-      actionpack (>= 5.2.4.1)
-      activerecord (>= 5.2.4.1)
+    activerecord-session_store (2.1.0)
+      actionpack (>= 6.1)
+      activerecord (>= 6.1)
+      cgi (>= 0.3.6)
       multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 2.0.8, < 3)
-      railties (>= 5.2.4.1)
-    activestorage (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+      rack (>= 2.0.8, < 4)
+      railties (>= 6.1)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    acts-as-taggable-on (9.0.1)
-      activerecord (>= 6.0, < 7.1)
+    acts-as-taggable-on (10.0.0)
+      activerecord (>= 6.1, < 7.2)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
-    angular-rails-templates (1.2.0)
-      railties (>= 5.0, < 7.1)
+    angular-rails-templates (1.2.1)
+      railties (>= 5.0, < 7.2)
       sprockets (>= 3.0, < 5)
       sprockets-rails
       tilt
-    angular_rails_csrf (5.0.0)
+    angular_rails_csrf (6.0.0)
       railties (>= 3, < 8)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.8.0)
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
-    attr_required (1.0.1)
-    awesome_nested_set (3.5.0)
-      activerecord (>= 4.0.0, < 7.1)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.809.0)
-    aws-sdk-core (3.181.0)
-      aws-eventstream (~> 1, >= 1.0.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.883.0)
+    aws-sdk-core (3.191.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.133.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.1.1)
-    bcrypt (3.1.18)
+    base64 (0.2.0)
+    bcp47_spec (0.2.1)
+    bcrypt (3.1.19)
     bigdecimal (3.0.2)
-    bindata (2.4.15)
+    bindata (2.5.0)
     bindex (0.8.1)
-    bootsnap (1.16.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bugsnag (6.26.0)
+    bugsnag (6.26.3)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
-    bullet (7.0.7)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     cable_ready (5.0.1)
@@ -189,11 +192,11 @@ GEM
       railties (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -203,6 +206,7 @@ GEM
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
+    cgi (0.3.6)
     choice (0.2.0)
     chronic (0.10.2)
     coderay (1.1.3)
@@ -213,33 +217,34 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    combine_pdf (1.0.23)
+    combine_pdf (1.0.26)
       matrix
       ruby-rc4 (>= 0.1.5)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.11.0)
+    css_parser (1.16.0)
       addressable
-    cuprite (0.14.3)
+    cuprite (0.15)
       capybara (~> 3.0)
-      ferrum (~> 0.13.0)
+      ferrum (~> 0.14.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.8)
+    datafoodconsortium-connector (1.0.0.pre.alpha.10)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
-    date (3.3.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    date (3.3.4)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     debugger-linecache (1.2.0)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -247,17 +252,16 @@ GEM
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-i18n (1.11.0)
+    devise-i18n (1.12.0)
       devise (>= 4.9.0)
     devise-token_authenticatable (1.1.0)
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.5.0)
     digest (3.1.1)
     docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
+    dotenv (3.1.0)
+    email_validator (2.2.4)
+      activemodel
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -268,19 +272,19 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
-    ferrum (0.13)
+    faraday-net_http (3.1.0)
+      net-http
+    ferrum (0.14)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffaker (2.21.0)
-    ffi (1.15.5)
+    ffaker (2.23.0)
+    ffi (1.16.3)
     flipper (0.26.2)
       concurrent-ruby (< 2)
     flipper-active_record (0.26.2)
@@ -316,24 +320,24 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.8.2)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     gmaps4rails (2.1.2)
     good_migrations (0.2.1)
       activerecord (>= 3.1)
       railties (>= 3.1)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashery (2.1.2)
     hashie (5.0.0)
     highline (2.0.3)
-    hiredis (0.6.3)
     htmlentities (4.3.4)
-    httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
+      racc (~> 1.7)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
     image_processing (1.12.2)
@@ -341,10 +345,13 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    io-console (0.6.0)
+    invisible_captcha (2.2.0)
+      rails (>= 5.2)
+    io-console (0.7.1)
     ipaddress (0.8.3)
-    irb (1.6.4)
-      reline (>= 0.3.0)
+    irb (1.11.0)
+      rdoc
+      reline (>= 0.3.8)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -352,41 +359,43 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (2.6.3)
-    json-canonicalization (0.3.2)
-    json-jwt (1.16.3)
+    json (2.7.1)
+    json-canonicalization (1.0.0)
+    json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
+      base64
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json-ld (3.2.5)
+    json-ld (3.3.1)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
-      rdf (~> 3.2, >= 3.2.10)
-    json-schema (3.0.0)
+      rdf (~> 3.3)
+    json-schema (4.1.1)
       addressable (>= 2.8)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.1)
-    knapsack_pro (5.4.1)
+    jwt (2.8.1)
+      base64
+    knapsack_pro (6.0.4)
       rake
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    letter_opener (1.8.1)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    letter_opener (1.9.0)
       launchy (>= 2.2, < 3)
     link_header (0.0.8)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -397,35 +406,37 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1205)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
-    minitest (5.19.0)
-    monetize (1.12.0)
+    mini_portile2 (2.8.5)
+    minitest (5.22.2)
+    monetize (1.13.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.7.1)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.7)
+    net-http (0.4.1)
+      uri
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0.1)
       net-protocol
-    newrelic_rpm (9.4.2)
-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    newrelic_rpm (9.7.1)
+    nio4r (2.7.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -434,37 +445,39 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth_openid_connect (0.6.1)
+    omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.1)
-    openid_connect (1.4.2)
+      openid_connect (~> 2.2)
+    openid_connect (2.3.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
-      net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
+      email_validator
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
+      mail
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
-      validate_email
       validate_url
-      webfinger (~> 1.2)
+      webfinger (~> 2.0)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    paper_trail (12.3.0)
-      activerecord (>= 5.2)
-      request_store (~> 1.1)
-    parallel (1.23.0)
-    paranoia (2.6.2)
-      activerecord (>= 5.1, < 7.1)
-    parser (3.2.2.3)
+    paper_trail (15.1.0)
+      activerecord (>= 6.1)
+      request_store (~> 1.4)
+    parallel (1.24.0)
+    paranoia (2.6.3)
+      activerecord (>= 5.1, < 7.2)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -472,7 +485,7 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.11.0)
+    pdf-reader (2.12.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -483,45 +496,49 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
-    puma (6.3.1)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.4)
+    puma (6.4.2)
       nio4r (~> 2.0)
     query_count (1.1.1)
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.7.1)
-    rack (2.2.8)
+    racc (1.7.3)
+    rack (2.2.8.1)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-oauth2 (1.21.3)
+    rack-oauth2 (2.2.1)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.6)
       rack
     rack-rewrite (1.5.1)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.7.2)
-      actioncable (= 7.0.7.2)
-      actionmailbox (= 7.0.7.2)
-      actionmailer (= 7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actiontext (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 7.0.7.2)
+      railties (= 7.0.8)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -542,47 +559,51 @@ GEM
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.0.6)
-    ransack (2.6.0)
-      activerecord (>= 6.0.4)
-      activesupport (>= 6.0.4)
+    rake (13.1.0)
+    ransack (4.1.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.2.11)
+    rdf (3.3.1)
+      bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis (4.8.1)
-    redis-client (0.14.1)
+    redis (5.1.0)
+      redis-client (>= 0.17.0)
+    redis-client (0.20.0)
       connection_pool
-    regexp_parser (2.8.1)
-    reline (0.3.3)
+    regexp_parser (2.9.0)
+    reline (0.4.1)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
-    roadie (5.0.1)
+    roadie (5.2.0)
       css_parser (~> 1.4)
-      nokogiri (~> 1.8)
-    roadie-rails (3.0.0)
-      railties (>= 5.1, < 7.1)
+      nokogiri (~> 1.15)
+    roadie-rails (3.1.0)
+      railties (>= 5.1, < 8.0)
       roadie (~> 5.0)
     rodf (1.2.0)
       builder (>= 3.0)
       rubyzip (>= 1.0)
-    roo (2.10.0)
+    roo (2.10.1)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
     rspec (3.12.0)
@@ -594,10 +615,10 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -607,42 +628,57 @@ GEM
       rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
+    rspec-sql (0.0.1)
+      activesupport
+      rspec
     rspec-support (3.12.1)
-    rswag-api (2.10.1)
-      railties (>= 3.1, < 7.1)
-    rswag-specs (2.10.1)
-      activesupport (>= 3.1, < 7.1)
-      json-schema (>= 2.2, < 4.0)
-      railties (>= 3.1, < 7.1)
+    rswag (2.13.0)
+      rswag-api (= 2.13.0)
+      rswag-specs (= 2.13.0)
+      rswag-ui (= 2.13.0)
+    rswag-api (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rswag-specs (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      json-schema (>= 2.2, < 5.0)
+      railties (>= 3.1, < 7.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.10.1)
-      actionpack (>= 3.1, < 7.1)
-      railties (>= 3.1, < 7.1)
-    rubocop (1.56.1)
-      base64 (~> 0.1.1)
+    rswag-ui (2.13.0)
+      actionpack (>= 3.1, < 7.2)
+      railties (>= 3.1, < 7.2)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-rails (2.20.2)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
@@ -658,13 +694,13 @@ GEM
       tilt (>= 1.1, < 3)
     sd_notify (0.1.1)
     semantic_range (3.0.0)
-    shoulda-matchers (5.3.0)
+    shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.1.2)
+    sidekiq (7.2.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.14.0)
+      redis-client (>= 0.19.0)
     sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
@@ -678,9 +714,11 @@ GEM
     spreadsheet_architect (5.0.0)
       caxlsx (>= 3.3.0, < 4)
       rodf (>= 1.0.0, < 2)
-    spring (4.1.1)
+    spring (4.1.3)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    spring-commands-rubocop (0.4.0)
+      spring (>= 1.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -708,33 +746,35 @@ GEM
     stimulus_reflex_testing (0.3.0)
       stimulus_reflex (>= 3.3.0)
     stringex (2.8.6)
-    stripe (9.0.0)
-    swd (1.3.0)
+    stringio (3.1.0)
+    stripe (10.10.0)
+    swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     temple (0.8.2)
-    thor (1.2.2)
+    thor (1.3.0)
     thread-local (1.1.0)
-    tilt (2.1.0)
+    tilt (2.3.0)
     timecop (0.9.8)
-    timeout (0.4.0)
+    timeout (0.4.1)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    valid_email2 (4.0.6)
+    uri (0.13.0)
+    valid_email2 (5.2.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
+    validates_lengths_from_database (0.8.0)
+      activerecord (>= 4)
     vcr (6.2.0)
-    view_component (3.5.0)
+    view_component (3.11.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -746,15 +786,16 @@ GEM
       json-ld (~> 3.2, >= 3.2.3)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.0)
+    web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webfinger (1.2.0)
+    webfinger (2.1.3)
       activesupport
-      httpclient (>= 2.4)
-    webmock (3.18.1)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -763,7 +804,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -775,7 +816,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
@@ -819,7 +860,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   digest
-  dotenv-rails
+  dotenv
   factory_bot_rails (= 6.2.0)
   faraday
   ffaker
@@ -834,11 +875,11 @@ DEPENDENCIES
   good_migrations
   haml
   highline (= 2.0.3)
-  hiredis
   i18n
   i18n-js (~> 3.9.0)
   image_processing
   immigrant
+  invisible_captcha
   jquery-rails (= 4.4.0)
   jquery-ui-rails (~> 4.2)
   json
@@ -856,10 +897,10 @@ DEPENDENCIES
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection
   omniauth_openid_connect
-  openid_connect (~> 1.3)
+  openid_connect
   order_management!
   pagy (~> 5.1)
-  paper_trail (~> 12.1)
+  paper_trail
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
   pdf-reader
@@ -876,20 +917,22 @@ DEPENDENCIES
   rails-erd
   rails-i18n
   rails_safe_tasks (~> 1.0)
-  ransack (~> 2.6.0)
+  ransack (~> 4.1.0)
   redcarpet
-  redis (>= 4.0)
+  redis
   responders
   rexml
   roadie-rails
   roo
   rspec-rails (>= 3.5.2)
   rspec-retry
+  rspec-sql
+  rswag
   rswag-api
-  rswag-specs
   rswag-ui
   rubocop
   rubocop-rails
+  rubocop-rspec
   sd_notify
   select2-rails!
   shoulda-matchers
@@ -899,6 +942,7 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
+  spring-commands-rubocop
   state_machines-activerecord
   stimulus_reflex (= 3.5.0.rc3)
   stimulus_reflex_testing
@@ -906,6 +950,7 @@ DEPENDENCIES
   stripe
   timecop
   valid_email2
+  validates_lengths_from_database
   vcr
   view_component
   view_component_reflex (= 3.1.14.pre9)

README.md

@@ -1,5 +1,4 @@
 [![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
-[![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
 
@@ -33,7 +32,7 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board][welcome-qa] for some good first issues, both on manual and automated testing (RSpec/Capybara).
+If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite]. Also, do have a look in our [Welcome New QAs board][welcome-qa] for some good first issues, both on manual and automated testing (RSpec/Capybara).
 
 We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
 
@@ -45,7 +44,7 @@ We use [KnapsackPro](https://knapsackpro.com/) for optimal parallelisation of ou
 
 ## Licence
 
-Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
@@ -54,4 +53,3 @@ Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
 [welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [welcome-qa]: https://github.com/orgs/openfoodfoundation/projects/6
-[zenhub]: https://www.zenhub.com/extension

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

@@ -248,7 +248,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     else
       product.variant_unit = product.variant_unit_scale = null
 
-    $scope.packVariant product, product.master if product.master
 
     if product.variants
       for id, variant of product.variants
@@ -299,7 +298,6 @@ filterSubmitProducts = (productsToFilter) ->
       if product.hasOwnProperty("id")
         filteredProduct = {id: product.id}
         filteredVariants = []
-        filteredMaster = null
         hasUpdatableProperty = false
 
         if product.hasOwnProperty("variants")
@@ -309,16 +307,6 @@ filterSubmitProducts = (productsToFilter) ->
             variantHasUpdatableProperty = result.hasUpdatableProperty
             filteredVariants.push filteredVariant  if variantHasUpdatableProperty
 
-        if product.master?.hasOwnProperty("unit_value")
-          filteredMaster ?= { id: product.master.id }
-          filteredMaster.unit_value = product.master.unit_value
-        if product.master?.hasOwnProperty("unit_description")
-          filteredMaster ?= { id: product.master.id }
-          filteredMaster.unit_description = product.master.unit_description
-        if product.master?.hasOwnProperty("display_as")
-          filteredMaster ?= { id: product.master.id }
-          filteredMaster.display_as = product.master.display_as
-
         if product.hasOwnProperty("sku")
           filteredProduct.sku = product.sku
           hasUpdatableProperty = true
@@ -350,9 +338,6 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
-        if filteredMaster?
-          filteredProduct.master_attributes = filteredMaster
-          hasUpdatableProperty = true
         if filteredVariants.length > 0 # Note that the name of the property changes to enable mass assignment of variants attributes with rails
           filteredProduct.variants_attributes = filteredVariants
           hasUpdatableProperty = true

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

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

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

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

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

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

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

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

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

@@ -1,22 +1,6 @@
 // Shipments AJAX API
 
 $(document).ready(function() {
-
-  handle_ship_click = function(){
-    var link = $(this);
-    var shipment_number = link.data('shipment-number');
-    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + "/ship.json");
-    $.ajax({
-      type: "PUT",
-      url: url
-    }).done(function( msg ) {
-      window.location.reload();
-    }).error(function( msg ) {
-      console.log(msg);
-    });
-  }
-  $('.admin-order-edit-form a.ship').click(handle_ship_click);
-
   //handle shipping method edit click
   $('a.edit-method').click(toggleMethodEdit);
   $('a.cancel-method').click(toggleMethodEdit);

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

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

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

@@ -1,3 +1,2 @@
-%li{ ng: { class: "{active: selector.active}" } }
-  %a{ "tooltip" => "{{selector.object.value}}", "tooltip-placement" => "bottom",
-    ng: { transclude: true, class: "{active: selector.active, 'has-tip': selector.object.value}" } }
+%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/alert_row.html.haml

@@ -1,8 +1,8 @@
-.sixteen.columns.alpha.omega.alert-row{ ng: { show: '!dismissed' } }
+.sixteen.columns.alpha.omega.alert-row{ "ng-show": '!dismissed' }
   .fifteen.columns.pad.alpha
-    %span.message.text-big{ ng: { bind: 'message'} }
+    %span.message.text-big{ "ng-bind": 'message' }
        
-    %input{ type: 'button', ng: { value: "buttonText", show: 'buttonText && buttonAction', click: "buttonAction()" } }
+    %input{ type: 'button', "ng-value": "buttonText", "ng-show": 'buttonText && buttonAction', "ng-click": "buttonAction()" }
   .one.column.omega.pad.text-center
-    %a.close{ href: "#", ng: { click: "dismiss()" } }
+    %a.close{ href: "#", "ng-click": "dismiss()" }
       ×

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

@@ -1,13 +1,13 @@
-.ofn-drop-down.ofn-drop-down-v2.right#columns-dropdown{ ng: { controller: 'ColumnsDropdownCtrl' } }
+.ofn-drop-down.ofn-drop-down-v2.right#columns-dropdown{ "ng-controller": 'ColumnsDropdownCtrl' }
   .ofn-drop-down-label
     = "  #{t('admin.columns')}".html_safe
     %span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
   %div.menu{ 'ng-show' => "expanded" }
     .menu_items
-      .menu_item{ ng: { repeat: "column in columns", click: "toggle(column);" } }
-        %input.redesigned-input{ type: "checkbox", ng: { checked: "column.visible" } }
+      .menu_item{ "ng-repeat": "column in columns", "ng-click": "toggle(column);" }
+        %input.redesigned-input{ type: "checkbox", "ng-checked": "column.visible" }
         {{ column.name }}
       %hr
       %div.menu_item.text-center
-        %input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
-        %input.fullwidth.red{ type: "button", :value => t('admin.column_save_as_default').html_safe, ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }
+        %input.fullwidth.orange{ type: "button", "ng-value": "saved() ? 'Saved': 'Saving'", "ng-show": "saved() || saving", "ng-disabled": "saved()" }
+        %input.fullwidth.red{ type: "button", value: t('admin.column_save_as_default').html_safe, "ng-show": "!saved() && !saving", "ng-click": "saveColumnPreferences(action)" }

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

@@ -1,8 +1,8 @@
-#confirm-dialog{ ng: { class: "dialog_class" } }
+#confirm-dialog{ "ng-class": "dialog_class" }
   .message.clearfix.margin-bottom-30
     .icon.text-center
       %i.icon-question-sign
-    .text{ ng: { bind: "::message" } }
+    .text{ "ng-bind": "::message" }
   .action-buttons.text-center
-    %button.cancel{ ng: { click: "close()", bind: "::cancelText" } }
-    %button.confirm.red{ ng: { click: "confirm()", bind: "::confirmText" } }
+    %button.cancel{ "ng-click": "close()", "ng-bind": "::cancelText" }
+    %button.confirm.red{ "ng-click": "confirm()", "ng-bind": "::confirmText" }

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

@@ -1,12 +1,12 @@
 #edit-address-dialog
   %h2 {{ addressType === 'bill_address' ?  "#{t('admin.customers.index.edit_bill_address')}" : "#{t('admin.customers.index.edit_ship_address')}" }}
-  %form{ name: 'edit_address_form', novalidate: true, ng: { submit: 'updateAddress()'}}
+  %form{ name: 'edit_address_form', novalidate: true, "ng-submit": 'updateAddress()' }
     .row
       {{ 'admin.customers.index.required_fileds' | t }}
       (
       %span.required *
       )
-    .error{ ng: { repeat: "error in errors", bind: "error" } }
+    .error{ "ng-repeat": "error in errors", "ng-bind": "error" }
 
     %table.no-borders
       %tr
@@ -14,61 +14,55 @@
           {{ 'first_name' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'firstname', required: true, ng: { model: 'address.firstname'} }
+          %input{ type: 'text', name: 'firstname', required: true, "ng-model": 'address.firstname' }
       %tr
         %td
           {{ 'last_name' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'lastname', required: true, ng: { model: 'address.lastname'} }
+          %input{ type: 'text', name: 'lastname', required: true, "ng-model": 'address.lastname' }
       %tr
         %td
           {{ 'address' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'address1', required: true, ng: { model: 'address.address1'} }
+          %input{ type: 'text', name: 'address1', required: true, "ng-model": 'address.address1' }
       %tr
         %td
           {{ 'address2' | t }}
         %td
-          %input{ type: 'text', name: 'address2', ng: { model: 'address.address2'} }
+          %input{ type: 'text', name: 'address2', "ng-model": 'address.address2' }
       %tr
         %td
           {{ 'city' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'city', required: true, ng: { model: 'address.city'} }
+          %input{ type: 'text', name: 'city', required: true, "ng-model": 'address.city' }
       %tr
         %td
           {{ 'postcode' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'zipcode', required: true, ng: { model: 'address.zipcode'} }
+          %input{ type: 'text', name: 'zipcode', required: true, "ng-model": 'address.zipcode' }
       %tr
         %td
           {{ 'country' | t }}
           %span.required *
         %td
-          %input.ofn-select2.fullwidth#country_id{ type: 'number',
-          name: 'country_id', required: true,
-          placeholder: "{{ 'admin.customers.index.select_country' | t }}",
-          data: 'availableCountries', ng: { model: 'address.country_id' } }
+          %input.ofn-select2.fullwidth#country_id{ type: 'number', name: 'country_id', required: true, placeholder: "{{ 'admin.customers.index.select_country' | t }}", data: 'availableCountries', "ng-model": 'address.country_id' }
       %tr
         %td
           {{ 'state' | t }}
           %span.required *
         %td
-          %input.ofn-select2.fullwidth#state_id{ type: 'number',
-          name: 'state_id', required: true,
-          placeholder: "{{ 'admin.customers.index.select_state' | t }}",
-          data: 'states', ng: { model: 'address.state_id' } }
+          %input.ofn-select2.fullwidth#state_id{ type: 'number', name: 'state_id', required: true, placeholder: "{{ 'admin.customers.index.select_state' | t }}", data: 'states', "ng-model": 'address.state_id' }
 
       %tr
         %td
           {{ 'phone' | t }}
           %span.required *
         %td
-          %input{ type: 'text', name: 'phone', required: true, ng: { model: 'address.phone'} }
+          %input{ type: 'text', name: 'phone', required: true, "ng-model": 'address.phone' }
 
     .text-center
       %input.button.red.icon-plus{ type: 'submit', value: t('admin.customers.index.update_address')}

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

@@ -1,9 +1,9 @@
-#info-dialog{ ng: { class: "dialog_class" } }
+#info-dialog{ "ng-class": "dialog_class" }
   .message.clearfix.margin-bottom-30
     .icon.text-center
-      %i{ ng: { class: "icon_class" } }
+      %i{ "ng-class": "icon_class" }
     .text
       {{ message }}
   .action-buttons.text-center
-    %button{ ng: { click: "close()" } }
+    %button{ "ng-click": "close()" }
       = t(:ok)

app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml

@@ -1,15 +1,15 @@
 %h4.modal-title
   = t('js.admin.orders.index.compiling_invoices')
 
-%p.message{ ng: { show: 'message' } }
+%p.message{ "ng-show": 'message' }
   {{message}}
-%p.error{ ng: { show: 'error' } }
+%p.error{ "ng-show": 'error' }
   {{error}}
 
-%img.spinner{ src: image_path("/spinning-circles.svg"), ng: { show: "loading" } }
-%p{ ng: { show: "loading" } }
+%img.spinner{ src: image_path("/spinning-circles.svg"), "ng-show": "loading" }
+%p{ "ng-show": "loading" }
   = t('js.admin.orders.index.please_wait')
 
-%a.button{ target: '_blank', ng: { click: 'showBulkInvoice()', href: '/admin/orders/invoices/{{invoice_id}}', show: "!loading && !error" } }
+%a.button{ target: '_blank', "ng-click": 'showBulkInvoice()', "ng-href": '/admin/orders/invoices/{{invoice_id}}', "ng-show": "!loading && !error" }
   = t('js.admin.orders.index.view_file')
 

app/assets/javascripts/templates/admin/modals/image_upload.html.haml

@@ -1,10 +1,10 @@
 %a.close-reveal-modal{"ng-click" => "$close()"}
   %i.fa.fa-times-circle{'aria-hidden' => "true"}
 
-%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
+%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, "ng-controller": "ProductImageCtrl" }
   %div.image-preview
-    %img.spinner{ src: image_path("/spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
-    %img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
+    %img.spinner{ src: image_path("/spinning-circles.svg"), "ng-hide": "!imageUploader.isUploading" }
+    %img.preview{ "ng-src": "{{imagePreview}}", "ng-class": "{'faded': imageUploader.isUploading}" }
 
   %label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}
   %input#image-upload{hidden: true, type: 'file', 'nv-file-select' => true, uploader: "imageUploader"}

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

@@ -2,14 +2,14 @@
   .text-normal.margin-bottom-30.text-center
     {{ 'js.admin.customers.index.add_a_new_customer_for' | t:{ shop_name: CurrentShop.shop.name } }}
 
-  %form{ name: 'new_customer_form', novalidate: true, ng: { submit: "addCustomer()" }}
+  %form{ name: 'new_customer_form', novalidate: true, "ng-submit": "addCustomer()" }
 
     .text-center.margin-bottom-30
-      %input.fullwidth{ type: 'email', name: 'email', required: true, placeholder: "{{ 'js.admin.customers.index.customer_placeholder' | t }}", ng: { model: "email" } }
-      %div{ ng: { show: "submitted && new_customer_form.$pristine" } }
-        .error{ ng: { show: "(new_customer_form.email.$error.email || new_customer_form.email.$error.required)" } }
+      %input.fullwidth{ type: 'email', name: 'email', required: true, placeholder: "{{ 'js.admin.customers.index.customer_placeholder' | t }}", "ng-model": "email" }
+      %div{ "ng-show": "submitted && new_customer_form.$pristine" }
+        .error{ "ng-show": "(new_customer_form.email.$error.email || new_customer_form.email.$error.required)" }
           {{ 'js.admin.customers.index.valid_email_error' | t }}
-        .error{ ng: { repeat: "error in errors", bind: "error" } }
+        .error{ "ng-repeat": "error in errors", "ng-bind": "error" }
 
     .text-center
       %input.button.red.icon-plus{ type: 'submit', value: "{{ 'js.admin.customers.index.add_customer' | t }}" }

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

@@ -4,7 +4,7 @@
 
   .text-center.margin-bottom-30
     -# %select.fullwidth{ 'select2-min-search' => 5, 'ng-model' => 'newRuleType', 'ng-options' => 'ruleType.id as ruleType.name for ruleType in availableRuleTypes' }
-    %input.ofn-select2.fullwidth{ :id => 'rule_type_selector', ng: { model: "ruleType" }, data: "ruleTypes", 'min-search' => "5" }
+    %input.ofn-select2.fullwidth{ id: 'rule_type_selector', data: "ruleTypes", "min-search": "5", "ng-model": "ruleType" }
 
   .text-center
-    %input.button.red.icon-plus{ type: 'button', value: "{{ 'js.admin.new_tag_rule_dialog.add_rule' | t }}", ng: { click: 'addRule(tagGroup, ruleType)' } }
+    %input.button.red.icon-plus{ type: 'button', value: "{{ 'js.admin.new_tag_rule_dialog.add_rule' | t }}", "ng-click": 'addRule(tagGroup, ruleType)' }

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

@@ -3,16 +3,16 @@
     %td#available-order-cycles
       {{ 'js.admin.order_cycles.schedules.available' | t }}
       .order-cycles
-        .order-cycle{ ng: { repeat: 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', click: 'selections.available = orderCycle', dblclick: 'add(orderCycle)', class: '{selected: selections.available == orderCycle}' } }
+        .order-cycle{ "ng-repeat": 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', "ng-click": 'selections.available = orderCycle', "ng-dblclick": 'add(orderCycle)', "ng-class": '{selected: selections.available == orderCycle}' }
           {{ orderCycle.name }}
     %td#add-remove-buttons
-      %a.add.button{ href: 'javascript:void(0)', ng: { click: 'add()' } }
+      %a.add.button{ href: 'javascript:void(0)', "ng-click": 'add()' }
         %i.icon-chevron-right
-      %a.remove.button{ href: 'javascript:void(0)', ng: { click: 'remove()' } }
+      %a.remove.button{ href: 'javascript:void(0)', "ng-click": 'remove()' }
         %i.icon-chevron-left
     %td#selected-order-cycles
       {{ 'js.admin.order_cycles.schedules.selected' | t }}
       .order-cycles
-        .order-cycle{ ng: { repeat: 'orderCycle in selectedOrderCycles', click: 'selections.selected = orderCycle', dblclick: 'remove(orderCycle)', class: '{selected: selections.selected == orderCycle}' } }
+        .order-cycle{ "ng-repeat": 'orderCycle in selectedOrderCycles', "ng-click": 'selections.selected = orderCycle', "ng-dblclick": 'remove(orderCycle)', "ng-class": '{selected: selections.selected == orderCycle}' }
           {{ orderCycle.name }}
-.error{ ng: { repeat: "error in errors", bind: "error" } }
+.error{ "ng-repeat": "error in errors", "ng-bind": "error" }

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

@@ -1,2 +1,2 @@
-%td{ colspan: "{{columnCount}}", ng: { if: "template" } }
-  .panel{ ng: { include: "template" } }
+%td{ colspan: "{{columnCount}}", "ng-if": "template" }
+  .panel{ "ng-include": "template" }

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

@@ -1,7 +1,7 @@
-.row.enterprise_package_panel{ ng: { controller: 'indexPackagePanelCtrl' } }
+.row.enterprise_package_panel{ "ng-controller": 'indexPackagePanelCtrl' }
   .alpha.eight.columns
-    %div{ ng: { if: "!enterprise.is_primary_producer", switch: "enterprise.sells" } }
-      .info{ ng: { switch: { when: "none" } } }
+    %div{ "ng-if": "!enterprise.is_primary_producer", "ng-switch": "enterprise.sells" }
+      .info{ "ng-switch-when": "none" }
         %h3
           {{ 'js.admin.panels.enterprise_package.hub_profile' | t }}
 
@@ -15,7 +15,7 @@
         %p
           {{ 'js.admin.panels.enterprise_package.hub_profile_text2' | t }}
 
-      .info{ ng: { switch: { when: "any" } } }
+      .info{ "ng-switch-when": "any" }
         %h3
           {{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
 
@@ -28,7 +28,7 @@
         %p
           {{ 'js.admin.panels.enterprise_package.hub_shop_text3' | t }}
 
-      .info{ ng: { switch: { default: true } } }
+      .info{ "ng-switch-default": true }
         %h3
           {{ 'js.admin.panels.enterprise_package.choose_package' | t }}
           %i.icon-arrow-right
@@ -40,8 +40,8 @@
         %p
           {{ 'js.admin.panels.enterprise_package.choose_package_text2' | t }}
 
-    %div{ ng: { if: "enterprise.is_primary_producer", switch: "enterprise.sells" } }
-      .info{ ng: { switch: { when: "none" } } }
+    %div{ "ng-if": "enterprise.is_primary_producer", "ng-switch": "enterprise.sells" }
+      .info{ "ng-switch-when": "none" }
         %h3
           {{ 'js.admin.panels.enterprise_package.profile_only' | t }}
 
@@ -58,7 +58,7 @@
         %p
           {{ 'js.admin.panels.enterprise_package.profile_only_text3' | t }}
 
-      .info{ ng: { switch: { when: "own" } } }
+      .info{ "ng-switch-when": "own" }
         %h3
           {{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
 
@@ -68,7 +68,7 @@
         %p
           {{ 'js.admin.panels.enterprise_package.producer_shop_text2' | t }}
 
-      .info{ ng: { switch: { when: "any" } } }
+      .info{ "ng-switch-when": "any" }
         %h3
           {{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
 
@@ -81,7 +81,7 @@
         %p
           {{ 'js.admin.panels.enterprise_package.producer_hub_text3' | t }}
 
-      .info{ ng: { switch: { default: true } } }
+      .info{ "ng-switch-default": true }
         %h3
           {{ 'js.admin.panels.enterprise_package.choose_package' | t }}
           %i.icon-arrow-right
@@ -93,9 +93,9 @@
         %p
           {{ 'js.admin.panels.enterprise_package.choose_package_text2' | t }}
 
-  .omega.eight.columns{ ng: { switch: "enterprise.is_primary_producer" } }
-    %div{ ng: { switch: { when: "false" } } }
-      %a.button.selector.hub-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
+  .omega.eight.columns{ "ng-switch": "enterprise.is_primary_producer" }
+    %div{ "ng-switch-when": "false" }
+      %a.button.selector.hub-profile{ "ng-click": "enterprise.owned && (enterprise.sells='none')", "ng-class": "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" }
         .top
           %h3
             {{ 'js.admin.panels.enterprise_package.profile_only' | t }}
@@ -103,15 +103,15 @@
             {{ 'js.admin.panels.enterprise_package.get_listing' | t }}
         .bottom
           {{ 'js.admin.panels.enterprise_package.always_free' | t }}
-      %a.button.selector.hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
+      %a.button.selector.hub{ "ng-click": "enterprise.owned && (enterprise.sells='any')", "ng-class": "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
         .top
           %h3
             {{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_produce_others' | t }}
 
-    %div{ ng: { switch: { when: "true" } } }
-      %a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
+    %div{ "ng-switch-when": "true" }
+      %a.button.selector.producer-profile{ "ng-click": "enterprise.owned && (enterprise.sells='none')", "ng-class": "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" }
         .top
           %h3
             {{ 'js.admin.panels.enterprise_package.profile_only' | t }}
@@ -119,27 +119,27 @@
             {{ 'js.admin.panels.enterprise_package.get_listing' | t }}
         .bottom
           {{ 'js.admin.panels.enterprise_package.always_free' | t }}
-      %a.button.selector.producer-shop{ ng: { click: "enterprise.owned && (enterprise.sells='own')", class: "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" } }
+      %a.button.selector.producer-shop{ "ng-click": "enterprise.owned && (enterprise.sells='own')", "ng-class": "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" }
         .top
           %h3
             {{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_own_produce' | t }}
 
-      %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
+      %a.button.selector.producer-hub{ "ng-click": "enterprise.owned && (enterprise.sells='any')", "ng-class": "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
         .top
           %h3
             {{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_both' | t }}
 
-    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
-      %span{ ng: {hide: "saved() || saving" } }
+    %a.button.update.fullwidth{ "ng-show": "enterprise.owned", "ng-class": "{disabled: saved() && !saving, saving: saving}", "ng-click": "save()" }
+      %span{ "ng-hide": "saved() || saving" }
         {{ 'js.admin.panels.save' | t }}
         %i.icon-save
-      %span{ ng: {show: "saved() && !saving" } }
+      %span{ "ng-show": "saved() && !saving" }
         {{ 'js.admin.panels.saved' | t }}
         %i.icon-ok-sign
-      %span{ ng: {show: "saving" } }
+      %span{ "ng-show": "saving" }
         {{ 'js.admin.panels.saving' | t }}
         %i.icon-refresh

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

@@ -1,6 +1,6 @@
-.row.enterprise_producer_panel{ ng: { controller: 'indexProducerPanelCtrl' } }
+.row.enterprise_producer_panel{ "ng-controller": 'indexProducerPanelCtrl' }
   .alpha.eight.columns
-    .info{ ng: { show: "enterprise.is_primary_producer==true" } }
+    .info{ "ng-show": "enterprise.is_primary_producer==true" }
       %h3
         {{ 'js.admin.panels.enterprise_producer.producer' | t }}
       %p
@@ -8,7 +8,7 @@
       %p
         {{ 'js.admin.panels.enterprise_producer.producer_text2' | t }}
 
-    .info{ ng: { show: "enterprise.is_primary_producer==false" } }
+    .info{ "ng-show": "enterprise.is_primary_producer==false" }
       %h3
         {{ 'js.admin.panels.enterprise_producer.non_producer' | t }}
       %p
@@ -17,7 +17,7 @@
         {{ 'js.admin.panels.enterprise_producer.non_producer_text2' | t }}
 
   .omega.eight.columns
-    %a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', class: "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" } }
+    %a.button.selector.producer{ "ng-click": 'enterprise.owned && changeToProducer()', "ng-class": "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" }
       .top
         %h3
           {{ 'js.admin.panels.enterprise_producer.producer' | t }}
@@ -26,7 +26,7 @@
       .bottom
         {{ 'js.admin.panels.enterprise_producer.producer_example' | t }}
 
-    %a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', class: "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" } }
+    %a.button.selector.non-producer{ "ng-click": 'enterprise.owned && changeToNonProducer()', "ng-class": "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" }
       .top
         %h3
           {{ 'js.admin.panels.enterprise_producer.non_producer' | t }}
@@ -35,13 +35,13 @@
       .bottom
         {{ 'js.admin.panels.enterprise_producer.non_producer_example' | t }}
 
-    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
-      %span{ ng: {hide: "saved() || saving" } }
+    %a.button.update.fullwidth{ "ng-show": "enterprise.owned", "ng-class": "{disabled: saved() && !saving, saving: saving}", "ng-click": "save()" }
+      %span{ "ng-hide": "saved() || saving" }
         {{ 'js.admin.panels.save' | t }}
         %i.icon-save
-      %span{ ng: {show: "saved() && !saving" } }
+      %span{ "ng-show": "saved() && !saving" }
         {{ 'js.admin.panels.saved' | t }}
         %i.icon-ok-sign
-      %span{ ng: {show: "saving" } }
+      %span{ "ng-show": "saving" }
         {{ 'js.admin.panels.saving' | t }}
         %i.icon-refresh

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

@@ -1,10 +1,10 @@
-.row.enterprise_status_panel{ ng: { controller: 'indexStatusPanelCtrl' } }
+.row.enterprise_status_panel{ "ng-controller": 'indexStatusPanelCtrl' }
   .alpha.omega.sixteen.columns
-    %h4.status-ok.text-center{ ng: { show: "issues.length == 0 && warnings.length == 0" } }
+    %h4.status-ok.text-center{ "ng-show": "issues.length == 0 && warnings.length == 0" }
       %i.icon-ok-sign
       {{ 'js.admin.panels.enterprise_status.status_title' | t:{ name: object.name } }}
 
-    %table{ ng: { show: "issues.length > 0 || warnings.length > 0" } }
+    %table{ "ng-show": "issues.length > 0 || warnings.length > 0" }
       %thead
         %th.severity
           {{ 'js.admin.panels.enterprise_status.severity' | t }}
@@ -12,17 +12,17 @@
           {{ 'js.admin.panels.enterprise_status.description' | t }}
         %th.resolve
           {{ 'js.admin.panels.enterprise_status.resolve' | t }}
-      %tr{ ng: { repeat: "issue in issues"} }
+      %tr{ "ng-repeat": "issue in issues" }
         %td.severity
           %i.icon-warning-sign.issue
         %td.description
-          %span{ ng: { bind: "::issue.description" } }
+          %span{ "ng-bind": "::issue.description" }
         %td.resolve
-          %div{ ng: { bind: { html: "issue.link" } } }
-      %tr{ ng: { repeat: "warning in warnings"} }
+          %div{ "ng-bind-html": "issue.link" }
+      %tr{ "ng-repeat": "warning in warnings" }
         %td.severity
           %i.icon-warning-sign.warning
         %td.description
-          %span{ ng: { bind: "::warning.description" } }
+          %span{ "ng-bind": "::warning.description" }
         %td.resolve
-          %div{ ng: { bind: { html: "warning.link" } } }
+          %div{ "ng-bind-html": "warning.link" }

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

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

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

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

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

@@ -1,9 +1,9 @@
-#save-bar.animate-show{ ng: { show: 'dirty || persist || StatusMessage.active()' } }
+#save-bar.animate-show{ "ng-show": 'dirty || persist || StatusMessage.active()' }
   .container
     .seven.columns.alpha
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
+      %h5#status-message{ "ng-show": "StatusMessage.invalidMessage == ''", "ng-style": 'StatusMessage.statusMessage.style' }
         {{ StatusMessage.statusMessage.text || " " }}
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #C85136' }
+      %h5#status-message{ style: 'color: #C85136', "ng-show": "StatusMessage.invalidMessage !== ''" }
         {{ StatusMessage.invalidMessage || " " }}
-    .nine.columns.omega.text-right{ ng: { transclude: true } }
+    .nine.columns.omega.text-right{ "ng-transclude": true }
 

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

@@ -1,24 +1,24 @@
 #schedule-dialog
   .text-normal.margin-bottom-30.text-center
-    %span{ ng: { hide: 'schedule.id' } }
+    %span{ "ng-hide": 'schedule.id' }
       {{ 'js.admin.order_cycles.schedules.adding_a_new_schedule' | t }}
-    %span{ ng: { show: 'schedule.id' } }
+    %span{ "ng-show": 'schedule.id' }
       {{ 'js.admin.order_cycles.schedules.updating_a_schedule' | t }}
 
-  %form{ name: 'schedule_form', novalidate: true, ng: { submit: "submit()" }}
+  %form{ name: 'schedule_form', novalidate: true, "ng-submit": "submit()" }
 
     .text-center.margin-bottom-20
-      %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", ng: { model: "schedule.name" } }
-      %div{ ng: { show: "submitted && schedule_form.$pristine" } }
-        .error{ ng: { show: "(schedule_form.name.$error.required)" } }
+      %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", "ng-model": "schedule.name" }
+      %div{ "ng-show": "submitted && schedule_form.$pristine" }
+        .error{ "ng-show": "(schedule_form.name.$error.required)" }
           {{ 'js.admin.order_cycles.schedules.name_required_error' | t }}
 
     .order-cycles-selector.text-center.margin-bottom-30
 
     .text-center
 
-      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", ng: { hide: 'schedule.id' } }
-      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } }
-      %span{ ng: { show: 'schedule.id' } } or
-      %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} }
-      %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } }
+      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", "ng-hide": 'schedule.id' }
+      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", "ng-show": 'schedule.id' }
+      %span{ "ng-show": 'schedule.id' } or
+      %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", "ng-show": 'schedule.id', "ng-click": 'delete()' }
+      %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", "ng-click": 'close()' }

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

@@ -1,8 +1,8 @@
 .tag-template
   %div
-    %span.tag-with-rules{ ng: { if: "data.rules" }, "ofn-with-tip" => "{{ 'admin.tag_has_rules' | t:{num: data.rules} }}" }
+    %span.tag-with-rules{ "ofn-with-tip": "{{ 'admin.tag_has_rules' | t:{num: data.rules} }}", "ng-if": "data.rules" }
       {{$getDisplayText()}}
-    %span{ ng: { if: "!data.rules" } }
+    %span{ "ng-if": "!data.rules" }
       {{$getDisplayText()}}
-    %a.remove-button{ ng: {click: "$removeTag()"} }
+    %a.remove-button{ "ng-click": "$removeTag()" }
       ✖

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

@@ -1,11 +1,11 @@
 .autocomplete-template
-  %span.tag-with-rules{ ng: { if: "data.rules" } }
+  %span.tag-with-rules{ "ng-if": "data.rules" }
     {{$getDisplayText()}}
-    %span.tag-with-rules{ ng: { if: "data.rules == 1" } }
+    %span.tag-with-rules{ "ng-if": "data.rules == 1" }
       —
       {{ 'admin.has_one_rule' | t }}
-    %span.tag-with-rules{ ng: { if: "data.rules > 1" } }
+    %span.tag-with-rules{ "ng-if": "data.rules > 1" }
       —
       {{ 'admin.has_n_rules' | t:{ num: data.rules } }}
-  %span{ ng: { if: "!data.rules" } }
+  %span{ "ng-if": "!data.rules" }
     {{$getDisplayText()}}

app/assets/javascripts/templates/admin/tag_rules/discount_order_input.html.haml

@@ -1,7 +1,3 @@
 %div
-  %input{ type: "number",
-    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_calculator_attributes_preferred_flat_percent",
-    min: -100,
-    max: 100,
-    ng: { model: "rule.calculator.preferred_flat_percent" }, 'invert-number' => true }
+  %input{ type: "number", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_calculator_attributes_preferred_flat_percent", min: -100, max: 100, "invert-number": true, "ng-model": "rule.calculator.preferred_flat_percent" }
   %span.text-normal %

app/assets/javascripts/templates/admin/tag_rules/filter_order_cycles_input.html.haml

@@ -1,11 +1,5 @@
 %div
-  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
-    ng: { model: "rule.preferred_matched_order_cycles_visibility", if: "!rule.is_default" },
-    data: 'visibilityOptions', "min-search" => 5 }
-  %input{ type: "hidden",
-    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
-    ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } }
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]", data: 'visibilityOptions', "min-search": 5, "ng-model": "rule.preferred_matched_order_cycles_visibility", "ng-if": "!rule.is_default" }
+  %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]", "ng-value": "'hidden'", "ng-if": "rule.is_default" }
+  %span.text-normal{ "ng-if": "rule.is_default" }
     =t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_payment_methods_input.html.haml

@@ -1,11 +1,5 @@
 %div
-  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
-    ng: { model: "rule.preferred_matched_payment_methods_visibility", if: "!rule.is_default" },
-    data: 'visibilityOptions', "min-search" => 5 }
-  %input{ type: "hidden",
-    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
-    ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } }
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]", data: 'visibilityOptions', "min-search": 5, "ng-model": "rule.preferred_matched_payment_methods_visibility", "ng-if": "!rule.is_default" }
+  %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]", "ng-value": "'hidden'", "ng-if": "rule.is_default" }
+  %span.text-normal{ "ng-if": "rule.is_default" }
     = t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_products_input.html.haml

@@ -1,11 +1,5 @@
 %div
-  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
-    ng: { model: "rule.preferred_matched_variants_visibility", if: "!rule.is_default" },
-    data: 'visibilityOptions', "min-search" => 5 }
-  %input{ type: "hidden",
-    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
-    ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } }
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]", data: 'visibilityOptions', "min-search": 5, "ng-model": "rule.preferred_matched_variants_visibility", "ng-if": "!rule.is_default" }
+  %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]", "ng-value": "'hidden'", "ng-if": "rule.is_default" }
+  %span.text-normal{ "ng-if": "rule.is_default" }
     = t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_shipping_methods_input.html.haml

@@ -1,12 +1,6 @@
 %div
-  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
-    ng: { model: "rule.preferred_matched_shipping_methods_visibility", if: "!rule.is_default" },
-    data: 'visibilityOptions', "min-search" => 5 }
-  %input{ type: "hidden",
-    id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
-    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
-    ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } }
+  %input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]", data: 'visibilityOptions', "min-search": 5, "ng-model": "rule.preferred_matched_shipping_methods_visibility", "ng-if": "!rule.is_default" }
+  %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]", "ng-value": "'hidden'", "ng-if": "rule.is_default" }
+  %span.text-normal{ "ng-if": "rule.is_default" }
     = t(:not_visible)
 

app/assets/javascripts/templates/admin/tag_rules/tag_rule.html.haml

@@ -6,45 +6,27 @@
       %col.actions{ width: "10%" }
     %tr
       %td
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_id",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][id]",
-          ng: { value: "rule.id" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_id", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][id]", "ng-value": "rule.id" }
 
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_type",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][type]",
-          ng: { value: "rule.type" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_type", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][type]", "ng-value": "rule.type" }
 
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_priority",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][priority]",
-          ng: { value: "tagGroup.startIndex + $index" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_priority", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][priority]", "ng-value": "tagGroup.startIndex + $index" }
 
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_is_default",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][is_default]",
-          ng: { value: "rule.is_default" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_is_default", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][is_default]", "ng-value": "rule.is_default" }
 
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_customer_tags",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_customer_tags]",
-          ng: { value: "rule.preferred_customer_tags" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_customer_tags", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_customer_tags]", "ng-value": "rule.preferred_customer_tags" }
 
-        %input{ type: "hidden",
-          id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_{{opt[rule.type].taggable}}_tags",
-          name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_{{opt[rule.type].taggable}}_tags]",
-          ng: { value: "opt[rule.type].tagListFor(rule)" } }
+        %input{ type: "hidden", id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_{{opt[rule.type].taggable}}_tags", name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_{{opt[rule.type].taggable}}_tags]", "ng-value": "opt[rule.type].tagListFor(rule)" }
 
         %span.text-normal {{ opt[rule.type].textTop }}
       %td
         %tags-with-translation{ object: "rule", max: 1, "tags-attr" => "{{opt[rule.type].tagsAttr}}", "tag-list-attr" => "{{opt[rule.type].tagListAttr}}" }
       %td.actions{ rowspan: 2 }
-        %a{ ng: { click: "deleteTagRule(tagGroup || defaultTagGroup, rule)" }, :class => "delete-tag-rule icon-trash no-text" }
+        %a{ class: "delete-tag-rule icon-trash no-text", "ng-click": "deleteTagRule(tagGroup || defaultTagGroup, rule)" }
     %tr
       %td
         %span.text-normal {{ opt[rule.type].textBottom }}
       %td
-        %div{ ng: { include: "opt[rule.type].inputTemplate"} }
+        %div{ "ng-include": "opt[rule.type].inputTemplate" }
 
   %hr

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

@@ -1,10 +1,2 @@
-%tags-input{ template: 'admin/tag.html',
-  "placeholder" => t('admin.order_cycles.form.add_a_tag'),
-  ng: { model: 'object[tagsAttr]', class: "{'limit-reached': limitReached}"},
-  on: { tag: { added: 'tagAdded($tag)', removed:'tagRemoved()' } } }
-  %auto-complete{ ng: { if: "findTags" }, source: "findTags({query: $query})",
-                 template: "admin/tag_autocomplete.html",
-                 "min-length" => "0",
-                 "load-on-focus" => "true",
-                 "load-on-empty" => "true",
-                 "max-results-to-show" => "32"}
+%tags-input{ template: 'admin/tag.html', placeholder: t('admin.order_cycles.form.add_a_tag'), "ng-model": 'object[tagsAttr]', "ng-class": "{'limit-reached': limitReached}", "on-tag-added": 'tagAdded($tag)', "on-tag-removed": 'tagRemoved()' }
+  %auto-complete{ source: "findTags({query: $query})", template: "admin/tag_autocomplete.html", "min-length": "0", "load-on-focus": "true", "load-on-empty": "true", "max-results-to-show": "32", "ng-if": "findTags" }

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

@@ -22,24 +22,22 @@
     .variant-bulk-buy-quantity-label
       {{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
     %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
+      %button.bulk-buy-add.variant-quantity{ type: "button", "ng-click": "add(-1)", "ng-disabled": "!canAdd(-1)" }>
         -# U+FF0D Fullwidth Hyphen-Minus
         －
-      %input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
-        ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
+      %input.bulk-buy.variant-quantity{ type: "number", min: "0", max: "{{ available() }}", "ng-model": "variant.line_item.quantity", "ng-max": "Infinity" }>
+      %button.bulk-buy-add.variant-quantity{ type: "button", "ng-click": "add(1)", "ng-disabled": "!canAdd(1)" }
         -# U+FF0B Fullwidth Plus Sign
         ＋
   .columns.small-12.medium-6
     .variant-bulk-buy-quantity-label
       {{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
     %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
+      %button.bulk-buy-add.variant-quantity{ type: "button", "ng-click": "addMax(-1)", "ng-disabled": "!canAddMax(-1)" }>
         -# U+FF0D Fullwidth Hyphen-Minus
         －
-      %input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
-        ng: {model: "variant.line_item.max_quantity", max: "Infinity"}}>
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
+      %input.bulk-buy.variant-quantity{ type: "number", min: "0", max: "{{ available() }}", "ng-model": "variant.line_item.max_quantity", "ng-max": "Infinity" }>
+      %button.bulk-buy-add.variant-quantity{ type: "button", "ng-click": "addMax(1)", "ng-disabled": "!canAddMax(1)" }
         -# U+FF0B Fullwidth Plus Sign
         ＋
 

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

@@ -1,3 +1,3 @@
 %ul
-  %active-selector{ ng: { repeat: "selector in allSelectors", show: "ifDefined(selector.fits, true)" } }
+  %active-selector{ "ng-repeat": "selector in allSelectors", "ng-show": "ifDefined(selector.fits, true)" }
     %span{"ng-bind" => "::selector.object.name"}

app/assets/javascripts/templates/help-modal.html.haml

@@ -5,5 +5,5 @@
   .small-12.columns.text-center
     {{ helpText }}
 .row.text-center
-  %button.primary.small{ ng: { click: '$close()' } }
+  %button.primary.small{ "ng-click": '$close()' }
     = t(:ok)

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

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

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

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

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

@@ -1,6 +1,6 @@
-.joyride-tip-guide.price_breakdown{ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
+.joyride-tip-guide.price_breakdown{ "ng-class": "{ in: tt_isOpen, fade: tt_animation }", "ng-show": "tt_isOpen" }
   %span.joyride-nub.top
-  .background{ng: {click: "tt_isOpen = false"}}
+  .background{ "ng-click": "tt_isOpen = false" }
   .joyride-content-wrapper
     %h6 {{ "js.shopfront.price_breakdown" | t }}
     %ul

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

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

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

@@ -1,5 +1,5 @@
-.joyride-tip-guide.question-mark-tooltip{class: "{{ context }}", ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
-  .background{ng: {click: "tt_isOpen = false"}}
+.joyride-tip-guide.question-mark-tooltip{ class: "{{ context }}", "ng-class": "{ in: tt_isOpen, fade: tt_animation }", "ng-show": "tt_isOpen" }
+  .background{ "ng-click": "tt_isOpen = false" }
   .joyride-content-wrapper
     {{ key  | t }}
   %span.joyride-nub.bottom

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

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

app/components/confirm_modal_component.rb

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

app/components/confirm_modal_component/confirm_modal_component.html.haml

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

app/components/confirm_modal_component/confirm_modal_component.scss

@@ -1,4 +0,0 @@
-.modal-actions {
-  display: flex;
-  justify-content: space-around;
-}

app/components/help_modal_component.rb

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

app/components/help_modal_component/help_modal_component.html.haml

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

app/components/help_modal_component/help_modal_component.scss

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

app/components/modal_component.rb

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

app/components/modal_component/modal_component.html.haml

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

app/components/modal_component/modal_component.scss

@@ -0,0 +1,56 @@
+// class name 'modal' is already taken by 'custom-alert' and 'custom-confirm'.
+.modal-component {
+  visibility: visible;
+  position: fixed;
+  top: 3em;
+  min-height: auto; // reset from reveal-modal
+
+  &.in {
+    padding: 1.2rem;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  p {
+    margin-bottom: 0.5em;
+  }
+
+  img {
+    // Ensure image fits in container
+    max-width: 100%;
+    height: auto;
+  }
+}
+
+/* prevent arrow on selected admin menu item appearing above modal */
+body.modal-open #admin-menu li.selected a::after {
+  z-index: 0;
+}
+
+.modal-actions {
+  display: flex;
+  text-align: center; // Ensure text inside fullwidth buttons are centred on small screens
+
+  &.justify-space-around {
+    justify-content: space-around;
+  }
+
+  &.justify-end {
+    justify-content: flex-end;
+    input[type="button"] {
+      margin: 0 5px;
+    }
+
+    @media only screen and (max-width: 1024px) {
+      flex-direction: column;
+      justify-content: space-around;
+      input[type="button"] {
+        margin: 5px 0;
+      }
+    }
+  }
+}

app/components/ship_order_component.html.haml

@@ -0,0 +1,8 @@
+= render ConfirmModalComponent.new(id: dom_id(@order, :ship), confirm_reflexes: "click->Admin::OrdersReflex#ship", controller: "orders", reflex: "Admin::Orders#ship") do
+  %div{class: "margin-bottom-30"}
+    %p= t('spree.admin.orders.shipment.mark_as_shipped_message_html')
+  %div{class: "margin-bottom-30"}
+    = hidden_field_tag :id, @order.id
+    = label_tag do
+      = check_box_tag :send_shipment_email, "1", true
+      = t('spree.admin.orders.shipment.mark_as_shipped_label_message')

app/components/ship_order_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ShipOrderComponent < ViewComponent::Base
+  def initialize(order:)
+    @order = order
+  end
+end

app/components/vertical_ellipsis_menu/component.html.haml

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

app/components/vertical_ellipsis_menu/component.rb

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

app/components/vertical_ellipsis_menu/component.scss

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

app/components/vertical_ellipsis_menu/component_controller.js

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

app/controllers/admin/customers_controller.rb

@@ -11,7 +11,7 @@ module Admin
     respond_override update: { json: {
       success: lambda {
         tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
-        render_as_json @customer, tag_rule_mapping: tag_rule_mapping
+        render_as_json @customer, tag_rule_mapping:
       },
       failure: lambda {
                  render json: { errors: @customer.errors.full_messages },
@@ -25,7 +25,7 @@ module Admin
         format.json do
           render json: @collection,
                  each_serializer: ::Api::Admin::CustomerWithBalanceSerializer,
-                 tag_rule_mapping: tag_rule_mapping,
+                 tag_rule_mapping:,
                  customer_tags: customer_tags_by_id
         end
       end
@@ -42,7 +42,7 @@ module Admin
         @customer.created_manually = true
         if @customer.save
           tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
-          render_as_json @customer, tag_rule_mapping: tag_rule_mapping
+          render_as_json @customer, tag_rule_mapping:
         else
           render json: { errors: @customer.errors.full_messages }, status: :bad_request
         end
@@ -70,7 +70,7 @@ module Admin
 
     def collection
       if json_request? && params[:enterprise_id].present?
-        CustomersWithBalance.new(customers).query.
+        CustomersWithBalanceQuery.new(customers).call.
           includes(
             :enterprise,
             { bill_address: [:state, :country] },

app/controllers/admin/enterprise_fees_controller.rb

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

app/controllers/admin/enterprise_groups_controller.rb

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

app/controllers/admin/enterprise_roles_controller.rb

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

app/controllers/admin/enterprises_controller.rb

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

app/controllers/admin/oidc_settings_controller.rb

@@ -2,6 +2,13 @@
 
 module Admin
   class OidcSettingsController < Spree::Admin::BaseController
-    def index; end
+    def index
+      @account = spree_current_user.oidc_account
+    end
+
+    def destroy
+      spree_current_user.oidc_account&.destroy
+      redirect_to admin_oidc_settings_path
+    end
   end
 end

app/controllers/admin/order_cycles_controller.rb

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

app/controllers/admin/product_import_controller.rb

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

app/controllers/admin/reports_controller.rb

@@ -21,16 +21,10 @@ module Admin
 
     def show
       @report = report_class.new(spree_current_user, params, render: render_data?)
+      @rendering_options = rendering_options # also stores user preferences
 
-      @background_reports = OpenFoodNetwork::FeatureToggle
-        .enabled?(:background_reports, spree_current_user)
-
-      if @background_reports && request.post?
-        return background(report_format)
-      end
-
-      if params[:report_format].present?
-        export_report
+      if render_data?
+        render_in_background
       else
         show_report
       end
@@ -38,13 +32,8 @@ module Admin
 
     private
 
-    def export_report
-      send_data @report.render_as(report_format), filename: report_filename
-    end
-
     def show_report
       assign_view_data
-      @table = @report.render_as(:html) if render_data?
       render "show"
     end
 
@@ -53,7 +42,6 @@ module Admin
       @report_subtypes = report_subtypes
       @report_subtype = report_subtype
       @report_title = report_title
-      @rendering_options = rendering_options
       @data = Reporting::FrontendData.new(spree_current_user)
 
       variant_id_in = params[:variant_id_in]&.compact_blank
@@ -70,7 +58,7 @@ module Admin
       request.post?
     end
 
-    def background(format)
+    def render_in_background
       cable_ready[ScopedChannel.for_id(params[:uuid])]
         .inner_html(
           selector: "#report-table",
@@ -80,11 +68,11 @@ module Admin
           block: "start"
         ).broadcast
 
-      blob = ReportBlob.create_for_upload_later!(report_filename)
-
       ReportJob.perform_later(
-        report_class: report_class, user: spree_current_user, params: params,
-        format: format, blob: blob, channel: ScopedChannel.for_id(params[:uuid]),
+        report_class:, user: spree_current_user, params:,
+        format: report_format,
+        filename: report_filename,
+        channel: ScopedChannel.for_id(params[:uuid]),
       )
 
       head :no_content

app/controllers/admin/resource_controller.rb

@@ -51,7 +51,7 @@ module Admin
 
     def update_positions
       params[:positions].each do |id, index|
-        model_class.where(id: id).update_all(position: index)
+        model_class.where(id:).update_all(position: index)
       end
 
       respond_to do |format|

app/controllers/admin/schedules_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open_food_network/permissions'
-require 'order_management/subscriptions/proxy_order_syncer'
 
 module Admin
   class SchedulesController < Admin::ResourceController

app/controllers/admin/stripe_connect_settings_controller.rb

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

app/controllers/admin/vouchers_controller.rb

@@ -22,6 +22,11 @@ module Admin
     rescue ActiveRecord::SubclassNotFound
       @voucher.errors.add(:type)
       render_error
+    rescue ActiveRecord::RecordNotUnique
+      # Rails unique validation doesn't work with soft deleted object, so we rescue the database
+      # exception  to display a nice message to the user
+      @voucher.errors.add(:code, :taken)
+      render_error
     end
 
     private

app/controllers/api/v0/enterprise_attachment_controller.rb

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

app/controllers/api/v0/shipments_controller.rb

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

app/controllers/api/v1/customers_controller.rb

@@ -59,7 +59,7 @@ module Api
 
       def customer
         @customer ||= if action_name == "show"
-                        CustomersWithBalance.new(Customer.where(id: params[:id])).query.first!
+                        CustomersWithBalanceQuery.new(Customer.where(id: params[:id])).call.first!
                       else
                         Customer.find(params[:id])
                       end
@@ -74,7 +74,7 @@ module Api
         customers = customers.where(enterprise_id: params[:enterprise_id]) if params[:enterprise_id]
 
         if @extra_customer_fields.include?(:balance)
-          customers = CustomersWithBalance.new(customers).query
+          customers = CustomersWithBalanceQuery.new(customers).call
         end
 
         customers.ransack(params[:q]).result.order(:id)

app/controllers/application_controller.rb

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

app/controllers/checkout_controller.rb

@@ -2,7 +2,7 @@
 
 require 'open_food_network/address_finder'
 
-class SplitCheckoutController < ::BaseController
+class CheckoutController < BaseController
   layout 'darkswarm'
 
   include OrderStockCheck
@@ -23,12 +23,16 @@ class SplitCheckoutController < ::BaseController
   before_action :hide_ofn_navigation, only: [:edit, :update]
 
   def edit
-    redirect_to_step_based_on_order unless params[:step]
-    check_step if params[:step]
+    if params[:step].blank?
+      redirect_to_step_based_on_order
+    else
+      update_order_state
+      check_step
+    end
 
     return if available_shipping_methods.any?
 
-    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
+    flash[:error] = I18n.t('checkout.errors.no_shipping_methods_available')
   end
 
   def update
@@ -51,10 +55,10 @@ class SplitCheckoutController < ::BaseController
   private
 
   def render_error
-    flash.now[:error] ||= I18n.t('split_checkout.errors.saving_failed')
+    flash.now[:error] ||= I18n.t('checkout.errors.saving_failed')
 
     render status: :unprocessable_entity, cable_ready: cable_car.
-      replace("#checkout", partial("split_checkout/checkout")).
+      replace("#checkout", partial("checkout/checkout")).
       replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
   end
 
@@ -94,13 +98,29 @@ class SplitCheckoutController < ::BaseController
   def update_order
     return if params[:confirm_order] || @order.errors.any?
 
+    # Checking if shipping method updated before @order get updated. We can't use this guard
+    # clause in recalculate_voucher as by then the @order.shipping method would be the new one
+    shipping_method_updated = @order.shipping_method&.id != params[:shipping_method_id].to_i
+
     @order.select_shipping_method(params[:shipping_method_id])
     @order.update(order_params)
+    # We need to update voucher to take into account:
+    #  * when moving away from "details" step : potential change in shipping method fees
+    #  * when moving away from "payment" step : payment fees
+    recalculate_voucher(shipping_method_updated) if details_step? || payment_step?
     @order.update_totals_and_states
 
     validate_current_step
   end
 
+  def recalculate_voucher(shipping_method_updated)
+    return if @order.voucher_adjustments.empty?
+
+    return unless shipping_method_updated
+
+    VoucherAdjustmentsService.new(@order).update
+  end
+
   def validate_current_step
     Checkout::Validation.new(@order, params).call && @order.errors.empty?
   end
@@ -114,4 +134,15 @@ class SplitCheckoutController < ::BaseController
   def order_params
     @order_params ||= Checkout::Params.new(@order, params, spree_current_user).call
   end
+
+  # Update order state based on the step we are loading to avoid discrepancy between step and order
+  # state. We need to do this when moving back to a previous checkout step, the update action takes
+  # care of moving the order state forward.
+  def update_order_state
+    return @order.back_to_payment if @order.confirmation? && payment_step?
+
+    return unless @order.after_delivery_state? && details_step?
+
+    @order.back_to_address
+  end
 end

app/controllers/concerns/checkout_steps.rb

@@ -13,6 +13,10 @@ module CheckoutSteps
     params[:step] == "payment"
   end
 
+  def details_step?
+    params[:step] == "details"
+  end
+
   def redirect_to_step_based_on_order
     case @order.state
     when "cart", "address", "delivery"
@@ -36,12 +40,16 @@ module CheckoutSteps
     redirect_to_step_based_on_order
   end
 
+  # Checkout step and allowed order state
+  # * step details : order state in cart, address or delivery
+  # * step payment : order state is payment
+  # * step summary : order state is confirmation
   def check_step
     case @order.state
     when "cart", "address", "delivery"
-      redirect_to checkout_step_path(:details) unless params[:step] == "details"
+      redirect_to checkout_step_path(:details) unless details_step?
     when "payment"
-      redirect_to checkout_step_path(:payment) if params[:step] == "summary"
+      redirect_to checkout_step_path(:payment) if summary_step?
     end
   end
 end

app/controllers/concerns/extra_fields.rb

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

app/controllers/concerns/manager_invitations.rb

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

app/controllers/concerns/reports_actions.rb

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

app/controllers/home_controller.rb

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

app/controllers/line_items_controller.rb

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

app/controllers/omniauth_callbacks_controller.rb

@@ -2,7 +2,7 @@
 
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def openid_connect
-    spree_current_user.link_from_omniauth(request.env["omniauth.auth"])
+    OidcAccount.link(spree_current_user, request.env["omniauth.auth"])
 
     redirect_to admin_oidc_settings_path
   end

app/controllers/payment_gateways/paypal_controller.rb

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