Update all locales with the latest Transifex translations

chore(deps): bump roadie-rails from 3.1.0 to 3.2.0

.github/ISSUE_TEMPLATE/release.md

@@ -45,7 +45,7 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 
 [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
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?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

.github/dependabot.yml

@@ -1,3 +1,8 @@
+# Dependabot configuration
+#
+# The `directory` and `schedule.interval` options are mandatory.
+# Most of the configuration here is not used for security updates though.
+
 version: 2
 updates:
 
@@ -5,7 +10,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    open-pull-requests-limit: 10
+
     # Only specific requirements are specified in Gemfile, so don't touch it.
     versioning-strategy: lockfile-only
 
@@ -13,5 +18,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+
     # All versions are specified in package.json, so please update them.
     versioning-strategy: increase

.github/workflows/build.yml

@@ -55,6 +55,7 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates containing image urls
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
@@ -64,8 +65,7 @@ jobs:
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
         env:
@@ -123,20 +123,11 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
-      - uses: actions/setup-node@v3
-        with:
-          node-version-file: .node-version
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
-
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: 09476e2ce491c12083df62768667c674
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -150,7 +141,6 @@ jobs:
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
           KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}" 
-        
         run: |
           bundle exec rake knapsack_pro:rspec
 
@@ -201,8 +191,7 @@ jobs:
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
 
@@ -279,8 +268,7 @@ jobs:
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
 
@@ -348,6 +336,7 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates linking to mail.css
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
@@ -357,8 +346,7 @@ jobs:
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
 
@@ -426,6 +414,7 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates linking to mail.css
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
@@ -435,11 +424,9 @@ jobs:
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bundle exec rake db:create db:schema:load
 
       - name: Run tests
-
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: e3b8800198d2d89b70c7edbdd85f8fd8
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -453,8 +440,6 @@ jobs:
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
           KNAPSACK_PRO_TEST_FILE_EXCLUDE_PATTERN: "{engines/**/*_spec.rb,spec/models/**/*_spec.rb,spec/controllers/**/*_spec.rb,spec/serializers/**/*_spec.rb,spec/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/system/**/*_spec.rb}"
-                                            
-        
         run: |
           bundle exec rake knapsack_pro:rspec
 
@@ -476,11 +461,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
+      # Rails is required for the Karma rake script
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -493,10 +474,6 @@ jobs:
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
       - name: Run JS tests
         run: bundle exec rake karma:run
 

.github/workflows/linters.yml

@@ -7,10 +7,11 @@ jobs:
     name: runner / rubocop
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - run: git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
 
@@ -21,6 +22,8 @@ jobs:
           rubocop_extensions: rubocop-rails:gemfile rubocop-rspec:gemfile
           reporter: github-pr-check
           level: error
+          filter_mode: nofilter
+          use_bundler: true
           fail_on_error: true
   prettier:
     name: runner / prettier

.rspec

@@ -0,0 +1 @@
+--require base_spec_helper

.rubocop.yml

@@ -5,8 +5,12 @@
 # The configuration is split into three files. Look into those files for more details.
 #
 require:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
+
 inherit_from:
 
   # The automatically generated todo list to ignore all current violations.

.rubocop_styleguide.yml

@@ -3,7 +3,6 @@
 # These are the rules we agreed upon and we work towards.
 AllCops:
   NewCops: enable
-  SuggestExtensions: false
   Exclude:
     - bin/**/*
     - db/**/*
@@ -125,6 +124,9 @@ Rails/SkipsModelValidations:
     - update_column
     - update_columns
 
+Rails/WhereExists:
+  EnforcedStyle: where # Cf. conversion https://github.com/openfoodfoundation/openfoodnetwork/pull/12363
+
 Style/Documentation:
   Enabled: false
 

.rubocop_todo.yml

@@ -6,44 +6,11 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 16
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: enums
-Lint/ConstantDefinitionInBlock:
-  Exclude:
-    - 'lib/tasks/import_product_images.rake'
-    - 'lib/tasks/users.rake'
-    - 'spec/controllers/spree/admin/base_controller_spec.rb'
-    - 'spec/helpers/serializer_helper_spec.rb'
-    - 'spec/lib/reports/line_items_spec.rb'
-    - 'spec/models/spree/ability_spec.rb'
-    - 'spec/models/spree/gateway_spec.rb'
-    - 'spec/models/spree/preferences/configuration_spec.rb'
-    - 'spec/models/spree/preferences/preferable_spec.rb'
-    - 'spec/validators/date_time_string_validator_spec.rb'
-    - 'spec/validators/integer_array_validator_spec.rb'
-
-# Offense count: 6
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'app/helpers/spree/admin/base_helper.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/spree/calculator.rb'
-    - 'app/models/spree/preference.rb'
-    - 'app/models/spree/preferences/preferable.rb'
-
 # Offense count: 2
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/DuplicateRequire:
-  Exclude:
-    - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
-
 # Offense count: 16
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -197,6 +164,7 @@ Metrics/ClassLength:
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
+    - 'app/reflexes/admin/orders_reflex.rb'
     - 'app/reflexes/products_reflex.rb'
     - 'app/serializers/api/cached_enterprise_serializer.rb'
     - 'app/serializers/api/enterprise_shopfront_serializer.rb'
@@ -390,41 +358,213 @@ Naming/VariableNumber:
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/requests/api/orders_spec.rb'
 
-# Offense count: 11
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasManyOrHasOneDependent:
+# Offense count: 142
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ResponseMethods.
+# ResponseMethods: response, last_response
+RSpecRails/HaveHttpStatus:
   Exclude:
-    - 'app/models/enterprise.rb'
-    - 'app/models/spree/address.rb'
-    - 'app/models/spree/stock_item.rb'
-    - 'app/models/spree/tax_rate.rb'
-    - 'app/models/spree/variant.rb'
-
-# Offense count: 26
-# Configuration parameters: Include.
-# Include: app/helpers/**/*.rb
-Rails/HelperInstanceVariable:
-  Exclude:
-    - 'app/helpers/injection_helper.rb'
-    - 'app/helpers/shared_helper.rb'
-    - 'app/helpers/spree/admin/orders_helper.rb'
-    - 'app/helpers/spree/orders_helper.rb'
+    - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
+    - 'spec/controllers/admin/order_cycles_controller_spec.rb'
+    - 'spec/controllers/admin/subscriptions_controller_spec.rb'
+    - 'spec/controllers/api/v0/base_controller_spec.rb'
+    - 'spec/controllers/api/v0/customers_controller_spec.rb'
+    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
+    - 'spec/controllers/api/v0/logos_controller_spec.rb'
+    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
+    - 'spec/controllers/api/v0/orders_controller_spec.rb'
+    - 'spec/controllers/api/v0/product_images_controller_spec.rb'
+    - 'spec/controllers/api/v0/products_controller_spec.rb'
+    - 'spec/controllers/api/v0/promo_images_controller_spec.rb'
+    - 'spec/controllers/api/v0/reports/packing_report_spec.rb'
+    - 'spec/controllers/api/v0/reports_controller_spec.rb'
+    - 'spec/controllers/api/v0/shipments_controller_spec.rb'
+    - 'spec/controllers/api/v0/statuses_controller_spec.rb'
+    - 'spec/controllers/api/v0/taxons_controller_spec.rb'
+    - 'spec/controllers/api/v0/terms_and_conditions_controller_spec.rb'
+    - 'spec/controllers/api/v0/variants_controller_spec.rb'
+    - 'spec/controllers/cart_controller_spec.rb'
+    - 'spec/controllers/checkout_controller_spec.rb'
+    - 'spec/controllers/enterprises_controller_spec.rb'
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/shop_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
+    - 'spec/controllers/spree/admin/products_controller_spec.rb'
+    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
+    - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/controllers/stripe/callbacks_controller_spec.rb'
+    - 'spec/controllers/stripe/webhooks_controller_spec.rb'
+    - 'spec/controllers/user_passwords_controller_spec.rb'
+    - 'spec/controllers/user_registrations_controller_spec.rb'
+    - 'spec/requests/admin/images_spec.rb'
+    - 'spec/requests/api/routes_spec.rb'
+    - 'spec/requests/checkout/failed_checkout_spec.rb'
+    - 'spec/requests/checkout/stripe_sca_spec.rb'
+    - 'spec/requests/home_controller_spec.rb'
+    - 'spec/requests/omniauth_callbacks_controller_spec.rb'
+    - 'spec/services/embedded_page_service_spec.rb'
+    - 'spec/support/api_helper.rb'
 
 # Offense count: 8
-# Configuration parameters: Include.
-# Include: spec/**/*.rb, test/**/*.rb
-Rails/I18nLocaleAssignment:
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: numeric, symbolic, be_status
+RSpecRails/HttpStatus:
   Exclude:
-    - 'spec/controllers/user_registrations_controller_spec.rb'
-    - 'spec/helpers/i18n_helper_spec.rb'
-    - 'spec/models/spree/variant_spec.rb'
-    - 'spec/system/admin/order_cycles/list_spec.rb'
+    - 'spec/controllers/spree/admin/products_controller_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
 
-# Offense count: 3
-Rails/I18nLocaleTexts:
+# Offense count: 146
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpecRails/InferredSpecType:
   Exclude:
-    - 'app/controllers/admin/stripe_accounts_controller.rb'
+    - 'engines/dfc_provider/spec/requests/addresses_spec.rb'
+    - 'engines/dfc_provider/spec/requests/catalog_items_spec.rb'
+    - 'engines/dfc_provider/spec/requests/enterprise_groups/affiliated_by_spec.rb'
+    - 'engines/dfc_provider/spec/requests/enterprise_groups_spec.rb'
+    - 'engines/dfc_provider/spec/requests/enterprises_spec.rb'
+    - 'engines/dfc_provider/spec/requests/offers_spec.rb'
+    - 'engines/dfc_provider/spec/requests/persons_spec.rb'
+    - 'engines/dfc_provider/spec/requests/social_medias_spec.rb'
+    - 'engines/dfc_provider/spec/requests/supplied_products_spec.rb'
+    - 'engines/web/spec/helpers/cookies_policy_helper_spec.rb'
+    - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
+    - 'spec/controllers/admin/column_preferences_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/product_import_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/terms_of_service_files_controller_spec.rb'
+    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
+    - 'spec/controllers/api/v0/customers_controller_spec.rb'
+    - 'spec/controllers/api/v0/enterprise_fees_controller_spec.rb'
+    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
+    - 'spec/controllers/api/v0/exchange_products_controller_spec.rb'
+    - 'spec/controllers/api/v0/logos_controller_spec.rb'
+    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
+    - 'spec/controllers/api/v0/orders_controller_spec.rb'
+    - 'spec/controllers/api/v0/product_images_controller_spec.rb'
+    - 'spec/controllers/api/v0/products_controller_spec.rb'
+    - 'spec/controllers/api/v0/promo_images_controller_spec.rb'
+    - 'spec/controllers/api/v0/reports/packing_report_spec.rb'
+    - 'spec/controllers/api/v0/reports_controller_spec.rb'
+    - 'spec/controllers/api/v0/shipments_controller_spec.rb'
+    - 'spec/controllers/api/v0/shops_controller_spec.rb'
+    - 'spec/controllers/api/v0/statuses_controller_spec.rb'
+    - 'spec/controllers/api/v0/terms_and_conditions_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/checkout_controller_spec.rb'
+    - 'spec/controllers/enterprises_controller_spec.rb'
+    - 'spec/controllers/groups_controller_spec.rb'
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/payment_gateways/paypal_controller_spec.rb'
+    - 'spec/controllers/payment_gateways/stripe_controller_spec.rb'
+    - 'spec/controllers/registration_controller_spec.rb'
+    - 'spec/controllers/shop_controller_spec.rb'
+    - 'spec/controllers/shops_controller_spec.rb'
+    - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
+    - 'spec/controllers/spree/admin/base_controller_spec.rb'
+    - 'spec/controllers/spree/admin/countries_controller_spec.rb'
+    - 'spec/controllers/spree/admin/general_settings_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/invoices_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/overview_controller_spec.rb'
+    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/products_controller_spec.rb'
+    - 'spec/controllers/spree/admin/return_authorizations_controller_spec.rb'
+    - 'spec/controllers/spree/admin/search_controller_spec.rb'
+    - 'spec/controllers/spree/admin/shipping_categories_controller_spec.rb'
+    - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/tax_rates_controller_spec.rb'
+    - 'spec/controllers/spree/admin/tax_settings_controller_spec.rb'
+    - 'spec/controllers/spree/admin/variants_controller_spec.rb'
+    - 'spec/controllers/spree/api_keys_controller_spec.rb'
+    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
+    - 'spec/controllers/spree/orders_controller_spec.rb'
+    - 'spec/controllers/spree/user_sessions_controller_spec.rb'
+    - 'spec/controllers/spree/users_controller_spec.rb'
+    - 'spec/controllers/stripe/callbacks_controller_spec.rb'
+    - 'spec/controllers/stripe/webhooks_controller_spec.rb'
+    - 'spec/controllers/user_confirmations_controller_spec.rb'
+    - 'spec/controllers/user_passwords_controller_spec.rb'
+    - 'spec/controllers/user_registrations_controller_spec.rb'
+    - 'spec/controllers/webhook_endpoints_controller_spec.rb'
+    - 'spec/helpers/admin/enterprises_helper_spec.rb'
+    - 'spec/helpers/admin/orders_helper_spec.rb'
+    - 'spec/helpers/admin/reports_helper_spec.rb'
+    - 'spec/helpers/admin/subscriptions_helper_spec.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/helpers/checkout_helper_spec.rb'
+    - 'spec/helpers/i18n_helper_spec.rb'
+    - 'spec/helpers/injection_helper_spec.rb'
+    - 'spec/helpers/link_helper_spec.rb'
+    - 'spec/helpers/navigation_helper_spec.rb'
+    - 'spec/helpers/order_cycles_helper_spec.rb'
+    - 'spec/helpers/serializer_helper_spec.rb'
+    - 'spec/helpers/shared_helper_spec.rb'
+    - 'spec/helpers/shop_helper_spec.rb'
+    - 'spec/helpers/spree/admin/base_helper_spec.rb'
+    - 'spec/helpers/spree/admin/general_settings_helper_spec.rb'
+    - 'spec/helpers/spree/admin/orders_helper_spec.rb'
+    - 'spec/helpers/spree/orders_helper_spec.rb'
+    - 'spec/helpers/tax_helper_spec.rb'
+    - 'spec/helpers/terms_and_conditions_helper_spec.rb'
+    - 'spec/jobs/connect_app_job_spec.rb'
+    - 'spec/mailers/producer_mailer_spec.rb'
+    - 'spec/mailers/subscription_mailer_spec.rb'
+    - 'spec/models/column_preference_spec.rb'
+    - 'spec/models/connected_app_spec.rb'
+    - 'spec/models/customer_spec.rb'
+    - 'spec/models/invoice_spec.rb'
+    - 'spec/models/oidc_account_spec.rb'
+    - 'spec/models/proxy_order_spec.rb'
+    - 'spec/models/report_blob_spec.rb'
+    - 'spec/models/semantic_link_spec.rb'
+    - 'spec/models/spree/gateway/stripe_sca_spec.rb'
+    - 'spec/models/subscription_spec.rb'
+    - 'spec/models/tag_rule/filter_order_cycles_spec.rb'
+    - 'spec/models/tag_rule/filter_payment_methods_spec.rb'
+    - 'spec/models/tag_rule/filter_products_spec.rb'
+    - 'spec/models/tag_rule/filter_shipping_methods_spec.rb'
+    - 'spec/models/tag_rule_spec.rb'
+    - 'spec/models/webhook_endpoint_spec.rb'
+    - 'spec/requests/admin/images_spec.rb'
+    - 'spec/requests/admin/product_import_spec.rb'
+    - 'spec/requests/admin/vouchers_spec.rb'
+    - 'spec/requests/api/orders_spec.rb'
+    - 'spec/requests/api/routes_spec.rb'
+    - 'spec/requests/api/v1/customers_spec.rb'
+    - 'spec/requests/api_docs_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/errors_spec.rb'
+    - 'spec/requests/home_controller_spec.rb'
+    - 'spec/requests/large_request_spec.rb'
+    - 'spec/requests/omniauth_callbacks_controller_spec.rb'
+    - 'spec/requests/spree/admin/overview_spec.rb'
+    - 'spec/requests/spree/admin/payments_spec.rb'
+    - 'spec/requests/voucher_adjustments_spec.rb'
+    - 'spec/routing/stripe_spec.rb'
 
 # Offense count: 22
 # Configuration parameters: IgnoreScopes, Include.
@@ -470,16 +610,6 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
 
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/NegateInclude:
-  Exclude:
-    - 'app/controllers/admin/resource_controller.rb'
-    - 'app/models/calculator/weight.rb'
-    - 'app/models/product_import/spreadsheet_entry.rb'
-    - 'lib/spree/localized_number.rb'
-    - 'spec/support/matchers/table_matchers.rb'
-
 # Offense count: 32
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/Pluck:
@@ -520,22 +650,12 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/models/spree/variant.rb'
     - 'spec/system/admin/product_import_spec.rb'
 
-# Offense count: 20
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RedundantPresenceValidationOnBelongsTo:
   Exclude:
-    - 'app/models/enterprise_fee.rb'
-    - 'app/models/exchange.rb'
-    - 'app/models/inventory_item.rb'
-    - 'app/models/order_cycle.rb'
-    - 'app/models/spree/address.rb'
     - 'app/models/spree/line_item.rb'
     - 'app/models/spree/order.rb'
-    - 'app/models/spree/product_property.rb'
-    - 'app/models/spree/return_authorization.rb'
-    - 'app/models/spree/state.rb'
-    - 'app/models/spree/stock_item.rb'
-    - 'app/models/spree/stock_movement.rb'
     - 'app/models/spree/tax_rate.rb'
     - 'app/models/subscription_line_item.rb'
     - 'app/models/tag_rule.rb'
@@ -547,7 +667,7 @@ Rails/RelativeDateConstant:
   Exclude:
     - 'lib/tasks/data/remove_transient_data.rb'
 
-# Offense count: 58
+# Offense count: 56
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Include.
 # Include: spec/controllers/**/*.rb, spec/requests/**/*.rb, test/controllers/**/*.rb, test/integration/**/*.rb
@@ -633,53 +753,6 @@ Rails/UnusedRenderContent:
     - 'app/controllers/api/v0/taxons_controller.rb'
     - 'app/controllers/api/v0/variants_controller.rb'
 
-# Offense count: 54
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/WhereEquals:
-  Exclude:
-    - 'app/controllers/spree/admin/products_controller.rb'
-    - 'app/mailers/producer_mailer.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/enterprise_fee.rb'
-    - 'app/models/enterprise_group.rb'
-    - 'app/models/enterprise_relationship.rb'
-    - 'app/models/exchange.rb'
-    - 'app/models/order_cycle.rb'
-    - 'app/models/product_import/entry_processor.rb'
-    - 'app/models/proxy_order.rb'
-    - 'app/models/schedule.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/payment_method.rb'
-    - 'app/models/spree/product.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/variant.rb'
-    - 'app/models/subscription.rb'
-    - 'app/serializers/api/enterprise_shopfront_serializer.rb'
-    - '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/products_and_inventory/base.rb'
-    - 'lib/tasks/data.rake'
-    - 'lib/tasks/data/anonymize_data.rake'
-    - 'lib/tasks/data/remove_transient_data.rb'
-    - 'spec/services/product_tag_rules_filterer_spec.rb'
-
-# Offense count: 8
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: exists, where
-Rails/WhereExists:
-  Exclude:
-    - 'app/controllers/spree/admin/overview_controller.rb'
-    - 'app/controllers/spree/admin/tax_rates_controller.rb'
-    - 'app/controllers/spree/user_sessions_controller.rb'
-    - 'app/models/spree/preferences/store.rb'
-    - 'lib/tasks/sample_data/customer_factory.rb'
-    - 'lib/tasks/sample_data/group_factory.rb'
-    - 'lib/tasks/sample_data/order_cycle_factory.rb'
-    - 'lib/tasks/sample_data/taxon_factory.rb'
-
 # Offense count: 1
 Security/Open:
   Exclude:

GETTING_STARTED.md

@@ -29,7 +29,7 @@ Fetch the latest version of `master` from `upstream` (ie. the main repo):
 This project needs specific ruby/bundler versions as well as node/yarn specific versions. For a local setup you will need:
 
 * Install or change your Ruby version according to the one specified at [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file.
-    - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv).
+    - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
 * Install [nodenv](https://github.com/nodenv/nodenv) to ensure the correct [.node-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.node-version) is used.
     - [nodevn](https://github.com/nodenv/nodenv) is recommended as a node version manager.
 * PostgreSQL database

Gemfile.lock

@@ -156,30 +156,30 @@ GEM
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.899.0)
-    aws-sdk-core (3.191.4)
+    aws-partitions (1.914.0)
+    aws-sdk-core (3.192.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.78.0)
+    aws-sdk-kms (1.79.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.147.0)
+      aws-sdk-core (~> 3, >= 3.192.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcp47_spec (0.2.1)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     bigdecimal (3.0.2)
     bindata (2.5.0)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bugsnag (6.26.3)
+    bugsnag (6.26.4)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     bullet (7.1.6)
@@ -207,6 +207,7 @@ GEM
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     cgi (0.3.6)
+    childprocess (5.0.0)
     choice (0.2.0)
     chronic (0.10.2)
     coderay (1.1.3)
@@ -226,8 +227,9 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.17.1)
       addressable
+    csv (3.3.0)
     cuprite (0.15)
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
@@ -237,14 +239,14 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.10)
+    datafoodconsortium-connector (1.0.0.pre.alpha.12)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
     date (3.3.4)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debugger-linecache (1.2.0)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -259,7 +261,7 @@ GEM
     diff-lcs (1.5.1)
     digest (3.1.1)
     docile (1.4.0)
-    dotenv (3.1.0)
+    dotenv (3.1.2)
     email_validator (2.2.4)
       activemodel
     erubi (1.12.0)
@@ -285,16 +287,17 @@ GEM
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.23.0)
     ffi (1.16.3)
-    flipper (0.26.2)
+    flipper (1.3.0)
       concurrent-ruby (< 2)
-    flipper-active_record (0.26.2)
+    flipper-active_record (1.3.0)
       activerecord (>= 4.2, < 8)
-      flipper (~> 0.26.2)
-    flipper-ui (0.26.2)
+      flipper (~> 1.3.0)
+    flipper-ui (1.3.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 0.26.2)
-      rack (>= 1.4, < 3)
-      rack-protection (>= 1.5.3, <= 4.0.0)
+      flipper (~> 1.3.0)
+      rack (>= 1.4, < 4)
+      rack-protection (>= 1.5.3, < 5.0.0)
+      rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 7)
     fog-aws (2.0.1)
       fog-core (~> 1.38)
@@ -311,7 +314,7 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foreman (0.87.2)
+    foreman (0.88.1)
     formatador (0.2.5)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
@@ -319,7 +322,9 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     gmaps4rails (2.1.2)
@@ -335,7 +340,7 @@ GEM
     hashie (5.0.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -346,11 +351,11 @@ GEM
       activerecord (>= 3.0)
     invisible_captcha (2.2.0)
       rails (>= 5.2)
-    io-console (0.7.1)
+    io-console (0.7.2)
     ipaddress (0.8.3)
-    irb (1.11.0)
+    irb (1.12.0)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -358,7 +363,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (2.7.1)
+    json (2.7.2)
     json-canonicalization (1.0.0)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
@@ -383,13 +388,14 @@ GEM
       activesupport (>= 4.2)
     jwt (2.8.1)
       base64
-    knapsack_pro (6.0.4)
+    knapsack_pro (7.2.0)
       rake
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     link_header (0.0.8)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -404,7 +410,7 @@ GEM
       net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1205)
@@ -413,7 +419,7 @@ GEM
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     monetize (1.13.0)
       money (~> 6.12)
@@ -431,11 +437,11 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    newrelic_rpm (9.7.1)
+    newrelic_rpm (9.9.0)
     nio4r (2.7.0)
-    nokogiri (1.16.3)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -448,7 +454,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth_openid_connect (0.7.1)
@@ -476,7 +482,7 @@ GEM
     parallel (1.24.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -497,7 +503,7 @@ GEM
       method_source (~> 1.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     query_count (1.1.1)
@@ -521,6 +527,8 @@ GEM
     rack-proxy (0.7.6)
       rack
     rack-rewrite (1.5.1)
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
@@ -566,7 +574,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     ransack (4.1.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
@@ -580,12 +588,12 @@ GEM
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis (5.1.0)
-      redis-client (>= 0.17.0)
-    redis-client (0.20.0)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.1)
       connection_pool
     regexp_parser (2.9.0)
-    reline (0.4.1)
+    reline (0.5.0)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -593,10 +601,10 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
-    roadie (5.2.0)
+    roadie (5.2.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.15)
-    roadie-rails (3.1.0)
+    roadie-rails (3.2.0)
       railties (>= 5.1, < 8.0)
       roadie (~> 5.0)
     rodf (1.2.0)
@@ -627,7 +635,7 @@ GEM
       rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-sql (0.0.1)
+    rspec-sql (0.0.2)
       activesupport
       rspec
     rspec-support (3.13.1)
@@ -646,7 +654,7 @@ GEM
     rswag-ui (2.13.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
-    rubocop (1.62.1)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -657,8 +665,8 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
@@ -668,10 +676,13 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.27.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -681,7 +692,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.2)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.4.25)
@@ -695,7 +706,7 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.2)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -713,7 +724,7 @@ GEM
     spreadsheet_architect (5.0.0)
       caxlsx (>= 3.3.0, < 4)
       rodf (>= 1.0.0, < 2)
-    spring (4.1.3)
+    spring (4.2.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-rubocop (0.4.0)
@@ -746,7 +757,7 @@ GEM
       stimulus_reflex (>= 3.3.0)
     stringex (2.8.6)
     stringio (3.1.0)
-    stripe (10.13.0)
+    stripe (11.1.0)
     swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -764,7 +775,7 @@ GEM
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     uri (0.13.0)
-    valid_email2 (5.2.1)
+    valid_email2 (5.2.3)
       activemodel (>= 3.2)
       mail (~> 2.5)
     validate_url (1.0.15)
@@ -773,7 +784,7 @@ GEM
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
     vcr (6.2.0)
-    view_component (3.11.0)
+    view_component (3.12.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -781,7 +792,7 @@ GEM
       rails (>= 5.2, < 8.0)
       stimulus_reflex (>= 3.5.0.pre2)
       view_component (>= 2.28.0)
-    virtual_assembly-semantizer (1.0.5)
+    virtual_assembly-semantizer (1.1.1)
       json-ld (~> 3.2, >= 3.2.3)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -811,11 +822,11 @@ GEM
       chronic (>= 0.6.3)
     wicked_pdf (2.6.3)
       activesupport
-    wkhtmltopdf-binary (0.12.6.6)
+    wkhtmltopdf-binary (0.12.6.7)
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby

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

@@ -48,7 +48,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     params = {
       'q[name_cont]': $scope.q.query,
       'q[supplier_id_eq]': $scope.q.producerFilter,
-      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
+      'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter,
       'q[s]': $scope.sorting,
       import_date: $scope.q.importDateFilter,
       page: $scope.page,
@@ -136,6 +136,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       on_hand: null
       price: null
       tax_category_id: null
+      category_id: null
     DisplayProperties.setShowVariants product.id, true
 
 
@@ -217,7 +218,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         filters:
           'q[name_cont]': $scope.q.query
           'q[supplier_id_eq]': $scope.q.producerFilter
-          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
+          'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter
           'q[s]': $scope.sorting
           import_date: $scope.q.importDateFilter
         page: $scope.page
@@ -332,9 +333,6 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("on_demand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_demand = product.on_demand
           hasUpdatableProperty = true
-        if product.hasOwnProperty("category_id")
-          filteredProduct.primary_taxon_id = product.category_id
-          hasUpdatableProperty = true
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
@@ -375,6 +373,9 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("tax_category_id")
       filteredVariant.tax_category_id = variant.tax_category_id
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("category_id")
+      filteredVariant.primary_taxon_id = variant.category_id
+      hasUpdatableProperty = true
     if variant.hasOwnProperty("display_as")
       filteredVariant.display_as = variant.display_as
       hasUpdatableProperty = true

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

@@ -1,3 +1,4 @@
+# Controller for "New Products" form (spree/admin/products/new)
 angular.module("admin.products")
   .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
     $scope.product = { master: {} }
@@ -12,13 +13,15 @@ angular.module("admin.products")
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
+    # Extract variant_unit and variant_unit_scale from dropdown variant_unit_with_scale,
+    # and update hidden product fields
     $scope.processVariantUnitWithScale = ->
       if $scope.product.variant_unit_with_scale
-        match = $scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
+        match = $scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/) # matches string like "weight_1000"
         if match
           $scope.product.variant_unit = match[1]
           $scope.product.variant_unit_scale = parseFloat(match[2])
-        else
+        else # "items"
           $scope.product.variant_unit = $scope.product.variant_unit_with_scale
           $scope.product.variant_unit_scale = null
       else if $scope.product.variant_unit
@@ -32,6 +35,8 @@ angular.module("admin.products")
       else
         $scope.product.variant_unit = $scope.product.variant_unit_scale = null
 
+    # Extract unit_value and unit_description from text field unit_value_with_description,
+    # and update hidden variant fields
     $scope.processUnitValueWithDescription = ->
       if $scope.product.master.hasOwnProperty("unit_value_with_description")
         match = $scope.product.master.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
@@ -45,6 +50,7 @@ angular.module("admin.products")
         value = window.bigDecimal.divide(value, $scope.product.variant_unit_scale, 2) if $scope.product.master.unit_value && $scope.product.variant_unit_scale
         $scope.product.master.unit_value_with_description = value + " " + $scope.product.master.unit_description
 
+    # Calculate unit price based on product price and variant_unit_scale
     $scope.processUnitPrice = ->
       price = $scope.product.price
       scale = $scope.product.variant_unit_scale

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

@@ -1,4 +1,5 @@
 angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager) ->
+  # Javascript clone of VariantUnits::OptionValueNamer, for bulk product editing.
   class OptionValueNamer
     constructor: (@variant) ->
 

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

@@ -68,7 +68,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       per_page: $scope.per_page,
       'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
       'q[with_properties][]': $scope.activeProperties,
-      'q[primary_taxon_id_in_any][]': $scope.activeTaxons
+      'q[variants_primary_taxon_id_in_any][]': $scope.activeTaxons
     }
 
   $scope.searchKeypress = (e)->

app/components/searchable_dropdown_component.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class SearchableDropdownComponent < ViewComponent::Base
+  REMOVED_SEARCH_PLUGIN = { 'tom-select-options-value': '{ "plugins": [] }' }.freeze
+  MINIMUM_OPTIONS_FOR_SEARCH_FIELD = 11 # at least 11 options are required for the search field
+
+  def initialize(
+    form:,
+    name:,
+    options:,
+    selected_option:,
+    placeholder_value:,
+    include_blank: false,
+    aria_label: ''
+  )
+    @f = form
+    @name = name
+    @options = options
+    @selected_option = selected_option
+    @placeholder_value = placeholder_value
+    @include_blank = include_blank
+    @aria_label = aria_label
+  end
+
+  private
+
+  attr_reader :f, :name, :options, :selected_option, :placeholder_value, :include_blank, :aria_label
+
+  def classes
+    "fullwidth #{remove_search_plugin? ? 'no-input' : ''}"
+  end
+
+  def data
+    {
+      controller: "tom-select",
+      'tom-select-placeholder-value': placeholder_value
+    }.merge(remove_search_plugin? ? REMOVED_SEARCH_PLUGIN : {})
+  end
+
+  def remove_search_plugin?
+    @remove_search_plugin ||= options.count < MINIMUM_OPTIONS_FOR_SEARCH_FIELD
+  end
+end

app/components/searchable_dropdown_component/searchable_dropdown_component.html.haml

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

app/controllers/admin/products_v3_controller.rb

@@ -2,6 +2,146 @@
 
 module Admin
   class ProductsV3Controller < Spree::Admin::BaseController
-    def index; end
+    before_action :init_filters_params
+    before_action :init_pagination_params
+
+    def index
+      fetch_products
+      render "index", locals: { producers:, categories:, tax_category_options:, flash: }
+    end
+
+    def bulk_update
+      product_set = product_set_from_params
+
+      product_set.collection.each { |p| authorize! :update, p }
+      @products = product_set.collection # use instance variable mainly for testing
+
+      if product_set.save
+        flash[:success] = I18n.t('admin.products_v3.bulk_update.success')
+        redirect_to [:index,
+                     { page: @page, per_page: @per_page, search_term: @search_term,
+                       producer_id: @producer_id, category_id: @category_id }]
+      elsif product_set.errors.present?
+        @error_counts = { saved: product_set.saved_count, invalid: product_set.invalid.count }
+
+        render "index", status: :unprocessable_entity,
+                        locals: { producers:, categories:, tax_category_options:, flash: }
+      end
+    end
+
+    def index_url(params)
+      "/admin/products?#{params.to_query}" # todo: fix routing so this can be automaticly generated
+    end
+
+    private
+
+    def init_filters_params
+      # params comes from the form
+      # _params comes from the url
+      # priority is given to params from the form (if present) over url params
+      @search_term = params[:search_term] || params[:_search_term]
+      @producer_id = params[:producer_id] || params[:_producer_id]
+      @category_id = params[:category_id] || params[:_category_id]
+    end
+
+    def init_pagination_params
+      # prority is given to element dataset (if present) over url params
+      @page = params[:page].presence || 1
+      @per_page = params[:per_page].presence || 15
+      @q = params.permit(q: {})[:q] || { s: 'name asc' }
+    end
+
+    def producers
+      producers = OpenFoodNetwork::Permissions.new(spree_current_user)
+        .managed_product_enterprises.is_primary_producer.by_name
+      producers.map { |p| [p.name, p.id] }
+    end
+
+    def categories
+      Spree::Taxon.order(:name).map { |c| [c.name, c.id] }
+    end
+
+    def tax_category_options
+      Spree::TaxCategory.order(:name).pluck(:name, :id)
+    end
+
+    def fetch_products
+      product_query = OpenFoodNetwork::Permissions.new(spree_current_user)
+        .editable_products.merge(product_scope).ransack(ransack_query).result
+      @pagy, @products = pagy(product_query.order(:name), items: @per_page, page: @page,
+                                                          size: [1, 2, 2, 1])
+    end
+
+    def product_scope
+      user = spree_current_user
+      scope = if user.has_spree_role?("admin") || user.enterprises.present?
+                Spree::Product
+              else
+                Spree::Product.active
+              end
+
+      scope.includes(product_query_includes).distinct
+    end
+
+    def ransack_query
+      query = {}
+      query.merge!(supplier_id_in: @producer_id) if @producer_id.present?
+      if @search_term.present?
+        query.merge!(Spree::Variant::SEARCH_KEY => @search_term)
+      end
+      query.merge!(variants_primary_taxon_id_in: @category_id) if @category_id.present?
+      query.merge!(@q) if @q
+
+      query
+    end
+
+    # Optimise by pre-loading required columns
+    def product_query_includes
+      [
+        :image,
+        :supplier,
+        { variants: [
+          :default_price,
+          :primary_taxon,
+          :product,
+          :stock_items,
+          :tax_category,
+        ] },
+      ]
+    end
+
+    # Similar to spree/admin/products_controller
+    def product_set_from_params
+      # Form field names:
+      #   '[products][0][id]' (hidden field)
+      #   '[products][0][name]'
+      #   '[products][0][variants_attributes][0][id]' (hidden field)
+      #   '[products][0][variants_attributes][0][display_name]'
+      #
+      # Resulting in params:
+      #     "products" => {
+      #       "0" =>  {
+      #         "id" => "123"
+      #         "name" => "Pommes",
+      #         "variants_attributes" => {
+      #           "0" => {
+      #           "id" => "1234",
+      #           "display_name" => "Large box",
+      #         }
+      #       }
+      #     }
+      collection_hash = products_bulk_params[:products]
+        .transform_values { |product|
+          # Convert variants_attributes form hash to an array if present
+          product[:variants_attributes] &&= product[:variants_attributes].values
+          product
+        }.with_indifferent_access
+      Sets::ProductSet.new(collection_attributes: collection_hash)
+    end
+
+    def products_bulk_params
+      params.permit(products: ::PermittedAttributes::Product.attributes)
+        .to_h.with_indifferent_access
+    end
   end
 end

app/controllers/admin/resource_controller.rb

@@ -229,7 +229,7 @@ module Admin
     end
 
     def member_action?
-      !collection_actions.include? action
+      collection_actions.exclude? action
     end
 
     def new_actions

app/controllers/admin/stripe_accounts_controller.rb

@@ -16,14 +16,14 @@ module Admin
       authorize! :destroy, stripe_account
 
       if stripe_account.deauthorize_and_destroy
-        flash[:success] = "Stripe account disconnected."
+        flash[:success] = I18n.t('stripe.success_code.disconnected')
       else
-        flash[:error] = "Failed to disconnect Stripe."
+        flash[:error] = I18n.t('stripe.error_code.disconnect_failure')
       end
 
       redirect_to main_app.edit_admin_enterprise_path(stripe_account.enterprise)
     rescue ActiveRecord::RecordNotFound
-      flash[:error] = "Failed to disconnect Stripe."
+      flash[:error] = I18n.t('stripe.error_code.disconnect_failure')
       redirect_to spree.admin_dashboard_path
     end
 

app/controllers/api/v0/order_cycles_controller.rb

@@ -70,22 +70,7 @@ module Api
       end
 
       def search_params
-        permitted_search_params = params.slice :q, :page, :per_page
-
-        if permitted_search_params.key? :q
-          permitted_search_params[:q].slice!(*permitted_ransack_params)
-        end
-
-        permitted_search_params
-      end
-
-      def permitted_ransack_params
-        [
-          "#{[:name, :meta_keywords, :variants_display_as,
-              :variants_display_name, :supplier_name]
-          .join('_or_')}_cont",
-          :with_properties, :primary_taxon_id_in_any
-        ]
+        params.slice :q, :page, :per_page
       end
 
       def distributor

app/controllers/spree/admin/invoices_controller.rb

@@ -19,8 +19,13 @@ module Spree
 
       def generate
         @order = Order.find_by(number: params[:order_id])
-        authorize! :invoice, @order
-        ::Orders::GenerateInvoiceService.new(@order).generate_or_update_latest_invoice
+        if @order.distributor.can_invoice?
+          authorize! :invoice, @order
+          ::Orders::GenerateInvoiceService.new(@order).generate_or_update_latest_invoice
+        else
+          flash[:error] = t(:must_have_valid_business_number,
+                            enterprise_name: @order.distributor.name)
+        end
         redirect_back(fallback_location: spree.admin_dashboard_path)
       end
 

app/controllers/spree/admin/products_controller.rb

@@ -175,7 +175,7 @@ module Spree
         Spree::Variant.
           select('DISTINCT spree_variants.import_date').
           joins(:product).
-          where('spree_products.supplier_id IN (?)', editable_enterprises.collect(&:id)).
+          where(spree_products: { supplier_id: editable_enterprises.collect(&:id) }).
           where.not(spree_variants: { import_date: nil }).
           where(spree_variants: { deleted_at: nil }).
           order('spree_variants.import_date DESC')

app/controllers/spree/orders_controller.rb

@@ -60,7 +60,7 @@ module Spree
       @insufficient_stock_lines = []
       @order = order_to_update
       unless @order
-        flash[:error] = t(:order_not_found)
+        flash[:error] = t(:order_not_updated)
         redirect_to(main_app.root_path) && return
       end
 
@@ -82,7 +82,7 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next_transition.run_callbacks if @order.cart?
-              redirect_to main_app.checkout_step_path(@order.checkout_steps.first)
+              redirect_to main_app.checkout_step_path("address")
             elsif @order.complete?
               redirect_to main_app.order_path(@order)
             else

app/helpers/injection_helper.rb

@@ -154,7 +154,6 @@ module InjectionHelper
   end
 
   def enterprise_injection_data
-    @enterprise_injection_data ||= OpenFoodNetwork::EnterpriseInjectionData.new
-    { data: @enterprise_injection_data }
+    @enterprise_injection_data ||= { data: OpenFoodNetwork::EnterpriseInjectionData.new }
   end
 end

app/helpers/shared_helper.rb

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
 
 module SharedHelper
-  def distributor_link_class(distributor)
-    cart = current_order(true)
-    @active_distributors ||= Enterprise.distributors_with_active_order_cycles
-
-    klass = "shop-distributor"
-    klass += " empties-cart" unless cart.line_items.empty? || cart.distributor == distributor
-    klass += @active_distributors.include?(distributor) ? ' active' : ' inactive'
-    klass
-  end
-
   def enterprise_user?
     spree_current_user&.enterprises&.count.to_i > 0
   end

app/helpers/spree/admin/base_helper.rb

@@ -33,8 +33,6 @@ module Spree
         when :boolean
           hidden_field_tag(name, 0) +
             check_box_tag(name, 1, value, preference_field_options(options))
-        when :string
-          text_field_tag(name, value, preference_field_options(options))
         when :password
           password_field_tag(name, value, preference_field_options(options))
         when :text
@@ -88,8 +86,6 @@ module Spree
             { size: 10, class: 'input_integer', step: :any }
           when :boolean
             {}
-          when :string
-            { size: 10, class: 'input_string fullwidth' }
           when :password
             { size: 10, class: 'password_string fullwidth' }
           when :text

app/helpers/spree/admin/orders_helper.rb

@@ -3,20 +3,20 @@
 module Spree
   module Admin
     module OrdersHelper
-      def event_links
+      def event_links(order)
         links = []
-        links << cancel_event_link if @order.can_cancel?
-        links << resume_event_link if @order.can_resume?
+        links << cancel_event_link(order) if order.can_cancel?
+        links << resume_event_link(order) if order.can_resume?
         links.join('&nbsp;').html_safe # rubocop:disable Rails/OutputSafety
       end
 
       def generate_invoice_button(order)
         if order.distributor.can_invoice?
-          button_link_to t(:create_or_update_invoice), generate_admin_order_invoices_path(@order),
+          button_link_to t(:create_or_update_invoice), generate_admin_order_invoices_path(order),
                          data: { method: 'post' }, icon: 'icon-plus'
         else
           button_link_to t(:create_or_update_invoice), "#", data: {
-            confirm: t(:must_have_valid_business_number, enterprise_name: @order.distributor.name)
+            confirm: t(:must_have_valid_business_number, enterprise_name: order.distributor.name)
           }, icon: 'icon-plus'
         end
       end
@@ -26,82 +26,85 @@ module Spree
       end
 
       def order_links(order)
-        @order ||= order
         links = []
-        links << edit_order_link unless action_name == "edit"
-        links.concat(complete_order_links) if @order.complete? || @order.resumed?
-        links << ship_order_link if @order.ready_to_ship?
-        links << cancel_order_link if @order.can_cancel?
+        links << edit_order_link(order) unless action_name == "edit"
+        links.concat(complete_order_links(order)) if order.complete? || order.resumed?
+        links << ship_order_link if order.ready_to_ship?
+        links << cancel_order_link(order) if order.can_cancel?
         links
       end
 
+      def order_shipment_ready?(order)
+        order.ready_to_ship?
+      end
+
       private
 
-      def complete_order_links
-        [resend_confirmation_link] + invoice_links
+      def complete_order_links(order)
+        [resend_confirmation_link(order)] + invoice_links(order)
       end
 
-      def invoice_links
+      def invoice_links(order)
         return [] unless Spree::Config[:enable_invoices?]
 
-        [send_invoice_link, print_invoice_link]
+        [send_invoice_link(order), print_invoice_link(order)]
       end
 
-      def send_invoice_link
-        if @order.distributor.can_invoice?
-          send_invoice_link_with_url
+      def send_invoice_link(order)
+        if order.distributor.can_invoice?
+          send_invoice_link_with_url(order)
         else
-          send_invoice_link_without_url
+          send_invoice_link_without_url(order)
         end
       end
 
-      def print_invoice_link
-        if @order.distributor.can_invoice?
-          print_invoice_link_with_url
+      def print_invoice_link(order)
+        if order.distributor.can_invoice?
+          print_invoice_link_with_url(order)
         else
-          notify_about_required_enterprise_number
+          notify_about_required_enterprise_number(order)
         end
       end
 
-      def edit_order_link
+      def edit_order_link(order)
         { name: t(:edit_order),
-          url: spree.edit_admin_order_path(@order),
+          url: spree.edit_admin_order_path(order),
           icon: 'icon-edit' }
       end
 
-      def resend_confirmation_link
+      def resend_confirmation_link(order)
         { name: t(:resend_confirmation),
-          url: spree.resend_admin_order_path(@order),
+          url: spree.resend_admin_order_path(order),
           icon: 'icon-email',
           confirm: t(:confirm_resend_order_confirmation) }
       end
 
-      def send_invoice_link_with_url
+      def send_invoice_link_with_url(order)
         { name: t(:send_invoice),
-          url: invoice_admin_order_path(@order),
+          url: invoice_admin_order_path(order),
           icon: 'icon-email',
           confirm: t(:confirm_send_invoice) }
       end
 
-      def send_invoice_link_without_url
+      def send_invoice_link_without_url(order)
         { name: t(:send_invoice),
           url: "#",
           icon: 'icon-email',
-          confirm: t(:must_have_valid_business_number, enterprise_name: @order.distributor.name) }
+          confirm: t(:must_have_valid_business_number, enterprise_name: order.distributor.name) }
       end
 
-      def print_invoice_link_with_url
+      def print_invoice_link_with_url(order)
         { name: t(:print_invoice),
-          url: spree.print_admin_order_path(@order),
+          url: spree.print_admin_order_path(order),
           icon: 'icon-print',
           target: "_blank" }
       end
 
-      def notify_about_required_enterprise_number
+      def notify_about_required_enterprise_number(order)
         { name: t(:print_invoice),
           url: "#",
           icon: 'icon-print',
-          confirm: t(:must_have_valid_business_number, enterprise_name: @order.distributor.name) }
+          confirm: t(:must_have_valid_business_number, enterprise_name: order.distributor.name) }
       end
 
       def ship_order_link
@@ -110,24 +113,24 @@ module Spree
           icon: 'icon-truck' }
       end
 
-      def cancel_order_link
+      def cancel_order_link(order)
         { name: t(:cancel_order),
-          url: spree.fire_admin_order_path(@order.number, e: 'cancel'),
+          url: spree.fire_admin_order_path(order.number, e: 'cancel'),
           icon: 'icon-trash' }
       end
 
-      def cancel_event_link
+      def cancel_event_link(order)
         event_label = I18n.t("cancel", scope: "actions")
         button_link_to(event_label,
-                       fire_admin_order_url(@order, e: "cancel"),
+                       fire_admin_order_url(order, e: "cancel"),
                        method: :put, icon: "icon-cancel", form_id: "cancel_order_form")
       end
 
-      def resume_event_link
+      def resume_event_link(order)
         event_label = I18n.t("resume", scope: "actions")
         confirm_message = I18n.t("admin.orders.edit.order_sure_want_to", event: event_label)
         button_link_to(event_label,
-                       fire_admin_order_url(@order, e: "resume"),
+                       fire_admin_order_url(order, e: "resume"),
                        method: :put, icon: "icon-resume",
                        data: { confirm: confirm_message })
       end

app/helpers/spree/orders_helper.rb

@@ -17,17 +17,18 @@ module Spree
 
     def changeable_orders
       # Only returns open order for the current user + shop + oc combo
-      return @changeable_orders unless @changeable_orders.nil?
-      return @changeable_orders = [] unless spree_current_user &&
-                                            current_distributor && current_order_cycle
-      return @changeable_orders = [] unless current_distributor.allow_order_changes?
+      @changeable_orders ||= if spree_current_user &&
+                                current_order_cycle && current_distributor&.allow_order_changes?
 
-      @changeable_orders = Spree::Order.complete.where(
-        state: 'complete',
-        user_id: spree_current_user.id,
-        distributor_id: current_distributor.id,
-        order_cycle_id: current_order_cycle.id
-      )
+                               Spree::Order.complete.where(
+                                 state: 'complete',
+                                 user_id: spree_current_user.id,
+                                 distributor_id: current_distributor.id,
+                                 order_cycle_id: current_order_cycle.id
+                               )
+                             else
+                               []
+                             end
     end
 
     def changeable_orders_link_path

app/jobs/bulk_invoice_job.rb

@@ -7,9 +7,10 @@ class BulkInvoiceJob < ApplicationJob
 
   def perform(order_ids, filepath, options = {})
     @options = options
-    orders = sorted_orders(order_ids)
-    orders.filter!(&:invoiceable?) if OpenFoodNetwork::FeatureToggle.enabled?(:invoices,
-                                                                              current_user)
+
+    # The `find` method returns records in the same order as the given ids.
+    orders = Spree::Order.find(order_ids)
+
     orders.each(&method(:generate_invoice))
 
     ensure_directory_exists filepath
@@ -21,12 +22,6 @@ class BulkInvoiceJob < ApplicationJob
 
   private
 
-  # Ensures the records are returned in the same order the ids were originally given in
-  def sorted_orders(order_ids)
-    orders_by_id = Spree::Order.where(id: order_ids).to_a.index_by(&:id)
-    order_ids.map { |id| orders_by_id[id.to_i] }
-  end
-
   def renderer
     @renderer ||= InvoiceRenderer.new
   end

app/jobs/connect_app_job.rb

@@ -4,7 +4,7 @@ class ConnectAppJob < ApplicationJob
   include CableReady::Broadcaster
 
   def perform(app, token, channel: nil)
-    url = "https://n8n.openfoodnetwork.org.uk/webhook/regen/connect-enterprise"
+    url = I18n.t("connect_app.url")
     event = "connect-app"
     enterprise = app.enterprise
     payload = {

app/mailers/producer_mailer.rb

@@ -52,7 +52,7 @@ class ProducerMailer < ApplicationMailer
   def distributors_pickup_times_for(line_items)
     @order_cycle.distributors.
       joins(:distributed_orders).
-      where("spree_orders.id IN (?)", line_items.map(&:order_id).uniq).
+      where(spree_orders: { id: line_items.map(&:order_id).uniq }).
       map do |distributor|
       [distributor.name, @order_cycle.pickup_time_for(distributor)]
     end

app/models/calculator/weight.rb

@@ -10,7 +10,7 @@ module Calculator
     end
 
     def set_preference(name, value)
-      if name == :unit_from_list && !["kg", "lb"].include?(value)
+      if name == :unit_from_list && ["kg", "lb"].exclude?(value)
         calculable.errors.add(:preferred_unit_from_list, I18n.t(:calculator_preferred_unit_error))
       else
         __send__ self.class.preference_setter_method(name), value

app/models/enterprise.rb

@@ -43,25 +43,31 @@ class Enterprise < ApplicationRecord
                                foreign_key: 'supplier_id',
                                dependent: :destroy
   has_many :supplied_variants, through: :supplied_products, source: :variants
-  has_many :distributed_orders, class_name: 'Spree::Order', foreign_key: 'distributor_id'
+  has_many :distributed_orders, class_name: 'Spree::Order',
+                                foreign_key: 'distributor_id',
+                                dependent: :restrict_with_exception
   belongs_to :address, class_name: 'Spree::Address'
   belongs_to :business_address, optional: true, class_name: 'Spree::Address', dependent: :destroy
-  has_many :enterprise_fees
+  has_many :enterprise_fees, dependent: :restrict_with_exception
   has_many :enterprise_roles, dependent: :destroy
   has_many :users, through: :enterprise_roles
   belongs_to :owner, class_name: 'Spree::User',
                      inverse_of: :owned_enterprises
   has_many :distributor_payment_methods,
-           inverse_of: :distributor, foreign_key: :distributor_id
+           inverse_of: :distributor,
+           foreign_key: :distributor_id,
+           dependent: :restrict_with_exception
   has_many :distributor_shipping_methods,
-           inverse_of: :distributor, foreign_key: :distributor_id
+           inverse_of: :distributor,
+           foreign_key: :distributor_id,
+           dependent: :restrict_with_exception
   has_many :payment_methods, through: :distributor_payment_methods
   has_many :shipping_methods, through: :distributor_shipping_methods
   has_many :customers, dependent: :destroy
   has_many :inventory_items, dependent: :destroy
   has_many :tag_rules, dependent: :destroy
   has_one :stripe_account, dependent: :destroy
-  has_many :vouchers
+  has_many :vouchers, dependent: :restrict_with_exception
   has_many :connected_apps, dependent: :destroy
   has_one :custom_tab, dependent: :destroy
 
@@ -128,6 +134,7 @@ class Enterprise < ApplicationRecord
 
   after_create :set_default_contact
   after_create :relate_to_owners_enterprises
+
   after_rollback :restore_permalink
   after_touch :touch_distributors
   after_create_commit :send_welcome_email
@@ -161,7 +168,7 @@ class Enterprise < ApplicationRecord
   scope :is_hub, -> { where(sells: 'any') }
   scope :supplying_variant_in, lambda { |variants|
     joins(supplied_products: :variants).
-      where('spree_variants.id IN (?)', variants).
+      where(spree_variants: { id: variants }).
       select('DISTINCT enterprises.*')
   }
 
@@ -205,7 +212,7 @@ class Enterprise < ApplicationRecord
       ").
       joins('INNER JOIN exchange_variants ON (exchange_variants.exchange_id = exchanges.id)').
       joins('INNER JOIN spree_variants ON (spree_variants.id = exchange_variants.variant_id)').
-      where('spree_variants.product_id IN (?)', product_ids).select('DISTINCT enterprises.id')
+      where(spree_variants: { product_id: product_ids }).select('DISTINCT enterprises.id')
 
     where(id: exchanges)
   }
@@ -214,7 +221,7 @@ class Enterprise < ApplicationRecord
     if user.has_spree_role?('admin')
       where(nil)
     else
-      joins(:enterprise_roles).where('enterprise_roles.user_id = ?', user.id)
+      joins(:enterprise_roles).where(enterprise_roles: { user_id: user.id })
     end
   }
 
@@ -240,6 +247,16 @@ class Enterprise < ApplicationRecord
     count(distinct: true)
   end
 
+  # Remove any unsupported HTML.
+  def long_description
+    HtmlSanitizer.sanitize(super)
+  end
+
+  # Remove any unsupported HTML.
+  def long_description=(html)
+    super(HtmlSanitizer.sanitize(html))
+  end
+
   def contact
     contact = users.where(enterprise_roles: { receives_notifications: true }).first
     contact || owner
@@ -369,10 +386,10 @@ class Enterprise < ApplicationRecord
       :producer_shop # Producer with shopfront and supplies other hubs.
     when "producer_sells_none"
       :producer # Producer only supplies through others.
-    when "non_producer_sells_any"
-      :hub # Hub selling others products in order cycles.
-    when "non_producer_sells_own"
-      :hub # Wholesaler selling through own shopfront? Does this need a separate name or even exist?
+    when "non_producer_sells_any", "non_producer_sells_own"
+      # Hub selling others products in order cycles
+      # Or Wholesaler selling through own shopfront? Does this need a separate name or even exist?
+      :hub
     when "non_producer_sells_none"
       :hub_profile # Hub selling outside the system.
     end
@@ -382,7 +399,7 @@ class Enterprise < ApplicationRecord
   def distributed_taxons
     Spree::Taxon.
       joins(:products).
-      where('spree_products.id IN (?)', Spree::Product.in_distributor(self).select(&:id)).
+      where(spree_products: { id: Spree::Product.in_distributor(self).select(&:id) }).
       select('DISTINCT spree_taxons.*')
   end
 
@@ -398,7 +415,7 @@ class Enterprise < ApplicationRecord
   def supplied_taxons
     Spree::Taxon.
       joins(:products).
-      where('spree_products.id IN (?)', Spree::Product.in_supplier(self).select(&:id)).
+      where(spree_products: { id: Spree::Product.in_supplier(self).select(&:id) }).
       select('DISTINCT spree_taxons.*')
   end
 
@@ -472,7 +489,7 @@ class Enterprise < ApplicationRecord
     ExchangeVariant.joins(exchange: :order_cycle)
       .merge(Exchange.outgoing)
       .select("DISTINCT exchange_variants.variant_id, exchanges.receiver_id AS enterprise_id")
-      .where("exchanges.receiver_id = ?", id)
+      .where(exchanges: { receiver_id: id })
       .merge(OrderCycle.active.with_distributor(id))
   end
 

app/models/enterprise_fee.rb

@@ -21,7 +21,6 @@ class EnterpriseFee < ApplicationRecord
 
   validates :fee_type, inclusion: { in: FEE_TYPES }
   validates :name, presence: true
-  validates :enterprise_id, presence: true
 
   before_save :ensure_valid_tax_category_settings
 
@@ -32,7 +31,7 @@ class EnterpriseFee < ApplicationRecord
     if user.has_spree_role?('admin')
       where(nil)
     else
-      where('enterprise_id IN (?)', user.enterprises.select(&:id))
+      where(enterprise_id: user.enterprises.select(&:id))
     end
   }
 
@@ -40,7 +39,7 @@ class EnterpriseFee < ApplicationRecord
     joins(:calculator).where.not(spree_calculators: { type: PER_ORDER_CALCULATORS })
   }
   scope :per_order, lambda {
-    joins(:calculator).where('spree_calculators.type IN (?)', PER_ORDER_CALCULATORS)
+    joins(:calculator).where(spree_calculators: { type: PER_ORDER_CALCULATORS })
   }
 
   def self.clear_all_adjustments(order)

app/models/enterprise_group.rb

@@ -41,7 +41,7 @@ class EnterpriseGroup < ApplicationRecord
     if user.has_spree_role?('admin')
       where(nil)
     else
-      where('owner_id = ?', user.id)
+      where(owner_id: user.id)
     end
   }
 

app/models/enterprise_relationship.rb

@@ -27,12 +27,12 @@ class EnterpriseRelationship < ApplicationRecord
     where('parent_id IN (?) OR child_id IN (?)', enterprises.select(&:id), enterprises.select(&:id))
   }
 
-  scope :permitting, ->(enterprise_ids) { where('child_id IN (?)', enterprise_ids) }
-  scope :permitted_by, ->(enterprise_ids) { where('parent_id IN (?)', enterprise_ids) }
+  scope :permitting, ->(enterprise_ids) { where(child_id: enterprise_ids) }
+  scope :permitted_by, ->(enterprise_ids) { where(parent_id: enterprise_ids) }
 
   scope :with_permission, ->(permission) {
     joins(:permissions).
-      where('enterprise_relationship_permissions.name = ?', permission)
+      where(enterprise_relationship_permissions: { name: permission })
   }
 
   scope :by_name, -> { with_enterprises.order('child_enterprises.name, parent_enterprises.name') }
@@ -108,6 +108,6 @@ class EnterpriseRelationship < ApplicationRecord
 
   def child_variant_overrides
     VariantOverride.unscoped.for_hubs(child)
-      .joins(variant: :product).where("spree_products.supplier_id IN (?)", parent)
+      .joins(variant: :product).where(spree_products: { supplier_id: parent })
   end
 end

app/models/exchange.rb

@@ -10,8 +10,6 @@
 # shopfront (outgoing products). But the set of shown products can be smaller
 # than all incoming products.
 class Exchange < ApplicationRecord
-  self.belongs_to_required_by_default = false
-
   acts_as_taggable
 
   belongs_to :order_cycle
@@ -24,7 +22,6 @@ class Exchange < ApplicationRecord
   has_many :exchange_fees, dependent: :destroy
   has_many :enterprise_fees, through: :exchange_fees
 
-  validates :order_cycle, :sender, :receiver, presence: true
   validates :sender_id, uniqueness: { scope: [:order_cycle_id, :receiver_id, :incoming] }
 
   before_destroy :delete_related_exchange_variants, prepend: true
@@ -38,8 +35,8 @@ class Exchange < ApplicationRecord
   scope :outgoing, -> { where(incoming: false) }
   scope :from_enterprise, lambda { |enterprise| where(sender_id: enterprise) }
   scope :to_enterprise, lambda { |enterprise| where(receiver_id: enterprise) }
-  scope :from_enterprises, lambda { |enterprises| where('exchanges.sender_id IN (?)', enterprises) }
-  scope :to_enterprises, lambda { |enterprises| where('exchanges.receiver_id IN (?)', enterprises) }
+  scope :from_enterprises, lambda { |enterprises| where(exchanges: { sender_id: enterprises }) }
+  scope :to_enterprises, lambda { |enterprises| where(exchanges: { receiver_id: enterprises }) }
   scope :involving, lambda { |enterprises|
     where('exchanges.receiver_id IN (?) OR exchanges.sender_id IN (?)', enterprises, enterprises).
       select('DISTINCT exchanges.*')
@@ -48,7 +45,7 @@ class Exchange < ApplicationRecord
     where('exchanges.incoming OR exchanges.receiver_id = ?', distributor)
   }
   scope :with_variant, lambda { |variant|
-    joins(:exchange_variants).where('exchange_variants.variant_id = ?', variant)
+    joins(:exchange_variants).where(exchange_variants: { variant_id: variant })
   }
   scope :with_any_variant, lambda { |variant_ids|
     joins(:exchange_variants).
@@ -57,7 +54,7 @@ class Exchange < ApplicationRecord
   }
   scope :with_product, lambda { |product|
     joins(:exchange_variants).
-      where('exchange_variants.variant_id IN (?)', product.variants.select(&:id))
+      where(exchange_variants: { variant_id: product.variants.select(&:id) })
   }
   scope :by_enterprise_name, -> {
     joins('INNER JOIN enterprises AS sender   ON (sender.id   = exchanges.sender_id)').

app/models/inventory_item.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 class InventoryItem < ApplicationRecord
-  self.belongs_to_required_by_default = false
-
   belongs_to :enterprise
   belongs_to :variant, class_name: "Spree::Variant"
 
   validates :variant_id, uniqueness: { scope: :enterprise_id }
-  validates :enterprise, presence: true
-  validates :variant, presence: true
   validates :visible,
             inclusion: { in: [true, false], message: I18n.t(:inventory_item_visibility_error) }
 

app/models/order_cycle.rb

@@ -3,8 +3,6 @@
 require 'open_food_network/scope_variant_to_hub'
 
 class OrderCycle < ApplicationRecord
-  self.belongs_to_required_by_default = false
-
   searchable_attributes :orders_open_at, :orders_close_at, :coordinator_id
   searchable_scopes :active, :inactive, :active_or_complete, :upcoming, :closed, :not_closed,
                     :dated, :undated, :soonest_opening, :soonest_closing, :most_recently_closed
@@ -44,7 +42,7 @@ class OrderCycle < ApplicationRecord
   before_update :reset_processed_at, if: :will_save_change_to_orders_close_at?
   after_save :sync_subscriptions, if: :opening?
 
-  validates :name, :coordinator_id, presence: true
+  validates :name, presence: true
   validate :orders_close_at_after_orders_open_at?
 
   preference :product_selection_from_coordinator_inventory_only, :boolean, default: false
@@ -165,13 +163,13 @@ class OrderCycle < ApplicationRecord
   def attachable_distributor_payment_methods
     DistributorPaymentMethod.joins(:payment_method).
       merge(Spree::PaymentMethod.available).
-      where("distributor_id IN (?)", distributor_ids)
+      where(distributor_id: distributor_ids)
   end
 
   def attachable_distributor_shipping_methods
     DistributorShippingMethod.joins(:shipping_method).
       merge(Spree::ShippingMethod.frontend).
-      where("distributor_id IN (?)", distributor_ids)
+      where(distributor_id: distributor_ids)
   end
 
   def clone!

app/models/product_import/entry_processor.rb

@@ -56,7 +56,7 @@ module ProductImport
           else
             Spree::Variant.
               joins(:product).
-              where('spree_products.supplier_id IN (?)', enterprise_id).
+              where(spree_products: { supplier_id: enterprise_id }).
               count
           end
 

app/models/product_import/entry_validator.rb

@@ -24,7 +24,6 @@ module ProductImport
 
     def self.non_updatable_fields
       {
-        category: :primary_taxon_id,
         description: :description,
         unit_type: :variant_unit_scale,
         variant_unit_name: :variant_unit_name,
@@ -69,7 +68,7 @@ module ProductImport
     def mark_as_new_variant(entry, product_id)
       variant_attributes = entry.assignable_attributes.except(
         'id', 'product_id', 'on_hand', 'on_demand', 'variant_unit', 'variant_unit_name',
-        'variant_unit_scale', 'primary_taxon_id'
+        'variant_unit_scale'
       )
       # Variant needs a product. Product needs to be assigned first in order for
       # delegate to work. name= will fail otherwise.
@@ -398,7 +397,7 @@ module ProductImport
     def mark_as_existing_variant(entry, existing_variant)
       existing_variant.assign_attributes(
         entry.assignable_attributes.except('id', 'product_id', 'variant_unit', 'variant_unit_name',
-                                           'variant_unit_scale', 'primary_taxon_id')
+                                           'variant_unit_scale')
       )
       check_on_hand_nil(entry, existing_variant)
 

app/models/product_import/spreadsheet_entry.rb

@@ -94,7 +94,7 @@ module ProductImport
       units = UnitConverter.new(attrs)
 
       units.converted_attributes.each do |attr, value|
-        if respond_to?("#{attr}=") && !NON_PRODUCT_ATTRIBUTES.include?(attr)
+        if respond_to?("#{attr}=") && NON_PRODUCT_ATTRIBUTES.exclude?(attr)
           public_send("#{attr}=", value)
         end
       end

app/models/proxy_order.rb

@@ -17,7 +17,7 @@ class ProxyOrder < ApplicationRecord
   scope :closed, -> { joins(:order_cycle).merge(OrderCycle.closed) }
   scope :not_closed, -> { joins(:order_cycle).merge(OrderCycle.not_closed) }
   scope :canceled, -> { where.not(proxy_orders: { canceled_at: nil }) }
-  scope :not_canceled, -> { where('proxy_orders.canceled_at IS NULL') }
+  scope :not_canceled, -> { where(proxy_orders: { canceled_at: nil }) }
   scope :placed_and_open, -> {
                             joins(:order).not_closed
                               .where(spree_orders: { state: ['complete', 'resumed'] })

app/models/schedule.rb

@@ -8,7 +8,8 @@ class Schedule < ApplicationRecord
   has_many :coordinators, -> { distinct }, through: :order_cycles
 
   scope :with_coordinator, lambda { |enterprise|
-                             joins(:order_cycles).where('coordinator_id = ?', enterprise.id)
+                             joins(:order_cycles)
+                               .where(order_cycles: { coordinator_id: enterprise.id })
                                .select('DISTINCT schedules.*')
                            }
 

app/models/spree/ability.rb

@@ -192,7 +192,7 @@ module Spree
         OpenFoodNetwork::Permissions.new(user).managed_product_enterprises.include? product.supplier
       end
 
-      can [:admin, :index], :products_v3
+      can [:admin, :index, :bulk_update], :products_v3
 
       can [:create], Spree::Variant
       can [:admin, :index, :read, :edit,

app/models/spree/address.rb

@@ -4,19 +4,17 @@ module Spree
   class Address < ApplicationRecord
     include AddressDisplay
 
-    self.belongs_to_required_by_default = false
-
     searchable_attributes :firstname, :lastname, :phone, :full_name, :full_name_reversed,
                           :full_name_with_comma, :full_name_with_comma_reversed
     searchable_associations :country, :state
 
     belongs_to :country, class_name: "Spree::Country"
-    belongs_to :state, class_name: "Spree::State"
+    belongs_to :state, class_name: "Spree::State", optional: true
 
     has_one :enterprise, dependent: :restrict_with_exception
-    has_many :shipments
+    has_many :shipments, dependent: :restrict_with_exception
 
-    validates :address1, :city, :country, :phone, presence: true
+    validates :address1, :city, :phone, presence: true
     validates :company, presence: true, unless: -> { first_name.blank? || last_name.blank? }
     validates :firstname, :lastname, presence: true, if: -> do
       company.blank? || company == 'unused'

app/models/spree/calculator.rb

@@ -44,9 +44,9 @@ module Spree
     # Given an object which might be an Order or a LineItem (amongst
     # others), return a collection of line items.
     def line_items_for(object)
-      if object.is_a?(Spree::LineItem)
-        [object]
-      elsif object.respond_to? :line_items
+      return [object] if object.is_a?(Spree::LineItem)
+
+      if object.respond_to? :line_items
         object.line_items
       elsif object.respond_to?(:order) && object.order.present?
         object.order.line_items

app/models/spree/credit_card.rb

@@ -152,7 +152,7 @@ module Spree
     end
 
     def default_missing?
-      !user.credit_cards.exists?(is_default: true)
+      !user.credit_cards.where(is_default: true).exists?
     end
 
     def default_card_needs_updating?

app/models/spree/line_item.rb

@@ -85,7 +85,7 @@ module Spree
 
     scope :from_order_cycle, lambda { |order_cycle|
       joins(order: :order_cycle).
-        where('order_cycles.id = ?', order_cycle)
+        where(order_cycles: { id: order_cycle })
     }
 
     # Here we are simply joining the line item to its variant and product
@@ -94,12 +94,12 @@ module Spree
     scope :supplied_by_any, lambda { |enterprises|
       product_ids = Spree::Product.unscoped.where(supplier_id: enterprises).select(:id)
       variant_ids = Spree::Variant.unscoped.where(product_id: product_ids).select(:id)
-      where("spree_line_items.variant_id IN (?)", variant_ids)
+      where(spree_line_items: { variant_id: variant_ids })
     }
 
     scope :with_tax, -> {
       joins(:adjustments).
-        where('spree_adjustments.originator_type = ?', 'Spree::TaxRate').
+        where(spree_adjustments: { originator_type: 'Spree::TaxRate' }).
         select('DISTINCT spree_line_items.*')
     }
 
@@ -110,7 +110,7 @@ module Spree
           ON (spree_adjustments.adjustable_id=spree_line_items.id
             AND spree_adjustments.adjustable_type = 'Spree::LineItem'
             AND spree_adjustments.originator_type='Spree::TaxRate')").
-        where('spree_adjustments.id IS NULL')
+        where(spree_adjustments: { id: nil })
     }
 
     def copy_price

app/models/spree/order.rb

@@ -141,7 +141,7 @@ module Spree
       if user.has_spree_role?('admin')
         where(nil)
       else
-        where('spree_orders.distributor_id IN (?)', user.enterprises.select(&:id))
+        where(spree_orders: { distributor_id: user.enterprises.select(&:id) })
       end
     }
 
@@ -165,6 +165,7 @@ module Spree
     scope :finalized, -> { where(state: FINALIZED_STATES) }
     scope :complete, -> { where.not(completed_at: nil) }
     scope :incomplete, -> { where(completed_at: nil) }
+    scope :invoiceable, -> { where(state: [:complete, :resumed]) }
     scope :by_state, lambda { |state| where(state:) }
     scope :not_state, lambda { |state| where.not(state:) }
 
@@ -213,10 +214,6 @@ module Spree
       completed_at.present?
     end
 
-    def invoiceable?
-      complete? || resumed?
-    end
-
     # Indicates whether or not the user is allowed to proceed to checkout.
     # Currently this is implemented as a check for whether or not there is at
     # least one LineItem in the Order.  Feel free to override this logic in your
@@ -697,7 +694,7 @@ module Spree
     end
 
     def registered_email?
-      Spree::User.exists?(email:)
+      Spree::User.where(email:).exists?
     end
 
     def adjustments_fetcher

app/models/spree/order/checkout.rb

@@ -8,7 +8,6 @@ module Spree
           class_attribute :next_event_transitions
           class_attribute :previous_states
           class_attribute :checkout_flow
-          class_attribute :checkout_steps
 
           def self.checkout_flow(&block)
             if block_given?
@@ -20,7 +19,6 @@ module Spree
           end
 
           def self.define_state_machine!
-            self.checkout_steps = {}
             self.next_event_transitions = []
             self.previous_states = [:cart]
 
@@ -97,7 +95,6 @@ module Spree
           end
 
           def self.go_to_state(name, options = {})
-            checkout_steps[name] = options
             previous_states.each do |state|
               add_transition({ from: state, to: name }.merge(options))
             end
@@ -112,30 +109,14 @@ module Spree
             @next_event_transitions ||= []
           end
 
-          def self.checkout_steps
-            @checkout_steps ||= {}
-          end
-
           def self.add_transition(options)
             next_event_transitions << { options.delete(:from) => options.delete(:to) }.
               merge(options)
           end
 
-          def checkout_steps
-            steps = self.class.checkout_steps.
-              each_with_object([]) { |(step, options), checkout_steps|
-              next if options.include?(:if) && !options[:if].call(self)
-
-              checkout_steps << step
-            }.map(&:to_s)
-            # Ensure there is always a complete step
-            steps << "complete" unless steps.include?("complete")
-            steps
-          end
-
           def restart_checkout_flow
             update_columns(
-              state: checkout_steps.first,
+              state: "address",
               updated_at: Time.zone.now,
             )
           end

app/models/spree/payment.rb

@@ -246,7 +246,7 @@ module Spree
     # and this is it. Related to #1998.
     # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
     def set_unique_identifier
-      self.identifier = generate_identifier while self.class.exists?(identifier:)
+      self.identifier = generate_identifier while self.class.where(identifier:).exists?
     end
 
     def generate_identifier

app/models/spree/payment_method.rb

@@ -29,8 +29,7 @@ module Spree
       return where(nil) if user.admin?
 
       joins(:distributors).
-        where('distributors_payment_methods.distributor_id IN (?)',
-              user.enterprises.select(&:id)).
+        where(distributors_payment_methods: { distributor_id: user.enterprises.select(&:id) }).
         select('DISTINCT spree_payment_methods.*')
     }
 
@@ -40,7 +39,7 @@ module Spree
     }
 
     scope :for_distributor, ->(distributor) {
-      joins(:distributors).where('enterprises.id = ?', distributor)
+      joins(:distributors).where(enterprises: { id: distributor })
     }
 
     scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }

app/models/spree/payment_method/check.rb

@@ -25,6 +25,10 @@ module Spree
         ActiveMerchant::Billing::Response.new(true, "", {}, {})
       end
 
+      def payment_source_class
+        nil
+      end
+
       def source_required?
         false
       end

app/models/spree/preference.rb

@@ -16,9 +16,7 @@ module Spree
     def value
       if self[:value_type].present?
         case self[:value_type].to_sym
-        when :string, :text
-          self[:value].to_s
-        when :password
+        when :string, :text, :password
           self[:value].to_s
         when :decimal
           BigDecimal(self[:value].to_s, exception: false)&.round(2, BigDecimal::ROUND_HALF_UP) ||

app/models/spree/preferences/preferable.rb

@@ -111,9 +111,7 @@ module Spree
 
       def convert_preference_value(value, type)
         case type
-        when :string, :text
-          value.to_s
-        when :password
+        when :string, :text, :password
           value.to_s
         when :decimal
           value = 0 if value.blank?

app/models/spree/product.rb

@@ -28,16 +28,11 @@ module Spree
 
     acts_as_paranoid
 
-    after_create :ensure_standard_variant
-    around_destroy :destruction
-    after_save :update_units
-
-    searchable_attributes :supplier_id, :primary_taxon_id, :meta_keywords, :sku
-    searchable_associations :supplier, :properties, :primary_taxon, :variants
+    searchable_attributes :supplier_id, :meta_keywords, :sku
+    searchable_associations :supplier, :properties, :variants
     searchable_scopes :active, :with_properties
 
     belongs_to :supplier, class_name: 'Enterprise', optional: false, touch: true
-    belongs_to :primary_taxon, class_name: 'Spree::Taxon', optional: false, touch: true
 
     has_one :image, class_name: "Spree::Image", as: :viewable, dependent: :destroy
 
@@ -77,7 +72,11 @@ module Spree
     # Transient attributes used temporarily when creating a new product,
     # these values are persisted on the product's variant
     attr_accessor :price, :display_as, :unit_value, :unit_description, :tax_category_id,
-                  :shipping_category_id
+                  :shipping_category_id, :primary_taxon_id
+
+    after_create :ensure_standard_variant
+    around_destroy :destruction
+    after_save :update_units
 
     scope :with_properties, ->(*property_ids) {
       left_outer_joins(:product_properties).
@@ -160,7 +159,7 @@ module Spree
     scope :in_order_cycle, lambda { |order_cycle|
       with_order_cycles_inner.
         merge(Exchange.outgoing).
-        where('order_cycles.id = ?', order_cycle)
+        where(order_cycles: { id: order_cycle })
     }
 
     scope :in_an_active_order_cycle, lambda {
@@ -177,7 +176,7 @@ module Spree
       if user.has_spree_role?('admin')
         where(nil)
       else
-        where('supplier_id IN (?)', user.enterprises.select("enterprises.id"))
+        where(supplier_id: user.enterprises.select("enterprises.id"))
       end
     }
 
@@ -188,10 +187,10 @@ module Spree
         .with_permission(:add_to_order_cycle)
         .where(enterprises: { is_primary_producer: true })
         .pluck(:parent_id)
-      where('spree_products.supplier_id IN (?)', [enterprise.id] | permitted_producer_ids)
+      where(spree_products: { supplier_id: [enterprise.id] | permitted_producer_ids })
     }
 
-    scope :active, lambda { where("spree_products.deleted_at IS NULL") }
+    scope :active, lambda { where(spree_products: { deleted_at: nil }) }
 
     def self.group_by_products_id
       group(column_names.map { |col_name| "#{table_name}.#{col_name}" })
@@ -266,8 +265,8 @@ module Spree
         touch_distributors
 
         ExchangeVariant.
-          where('exchange_variants.variant_id IN (?)', variants.with_deleted.
-          select(:id)).destroy_all
+          where(exchange_variants: { variant_id: variants.with_deleted.
+          select(:id) }).destroy_all
 
         yield
       end
@@ -284,6 +283,7 @@ module Spree
       variant.unit_description = unit_description
       variant.tax_category_id = tax_category_id
       variant.shipping_category_id = shipping_category_id
+      variant.primary_taxon_id = primary_taxon_id
       variants << variant
     end
 

app/models/spree/product_property.rb

@@ -2,12 +2,9 @@
 
 module Spree
   class ProductProperty < ApplicationRecord
-    self.belongs_to_required_by_default = false
-
     belongs_to :product, class_name: "Spree::Product", touch: true
     belongs_to :property, class_name: 'Spree::Property'
 
-    validates :property, presence: true
     validates :value, length: { maximum: 255 }
 
     default_scope -> { order("#{table_name}.position") }

app/models/spree/return_authorization.rb

@@ -2,8 +2,6 @@
 
 module Spree
   class ReturnAuthorization < ApplicationRecord
-    self.belongs_to_required_by_default = false
-
     acts_as_paranoid
 
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
@@ -13,7 +11,6 @@ module Spree
     before_save :force_positive_amount
     before_create :generate_number
 
-    validates :order, presence: true
     validates :amount, numericality: true
     validate :must_have_shipped_units
 

app/models/spree/shipping_method.rb

@@ -41,8 +41,7 @@ module Spree
         where(nil)
       else
         joins(:distributors).
-          where('distributors_shipping_methods.distributor_id IN (?)',
-                user.enterprises.select(&:id)).
+          where(distributors_shipping_methods: { distributor_id: user.enterprises.select(&:id) }).
           select('DISTINCT spree_shipping_methods.*')
       end
     }
@@ -53,7 +52,7 @@ module Spree
     }
     scope :for_distributor, lambda { |distributor|
       joins(:distributors).
-        where('enterprises.id = ?', distributor)
+        where(enterprises: { id: distributor })
     }
 
     scope :by_name, -> { order('spree_shipping_methods.name ASC') }

app/models/spree/state.rb

@@ -2,11 +2,9 @@
 
 module Spree
   class State < ApplicationRecord
-    self.belongs_to_required_by_default = false
-
     belongs_to :country, class_name: 'Spree::Country'
 
-    validates :country, :name, presence: true
+    validates :name, presence: true
 
     def self.find_all_by_name_or_abbr(name_or_abbr)
       where('name = ? OR abbr = ?', name_or_abbr, name_or_abbr)

app/models/spree/stock_item.rb

@@ -2,15 +2,12 @@
 
 module Spree
   class StockItem < ApplicationRecord
-    self.belongs_to_required_by_default = false
-
     acts_as_paranoid
 
     belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
     belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
-    has_many :stock_movements
+    has_many :stock_movements, dependent: :destroy
 
-    validates :stock_location, :variant, presence: true
     validates :variant_id, uniqueness: { scope: [:stock_location_id, :deleted_at] }
     validates :count_on_hand, numericality: { greater_than_or_equal_to: 0, unless: :backorderable? }
 

app/models/spree/stock_movement.rb

@@ -2,22 +2,15 @@
 
 module Spree
   class StockMovement < ApplicationRecord
-    self.belongs_to_required_by_default = false
-
     belongs_to :stock_item, class_name: 'Spree::StockItem'
-    belongs_to :originator, polymorphic: true
+    belongs_to :originator, polymorphic: true, optional: true
 
     after_create :update_stock_item_quantity
 
-    validates :stock_item, presence: true
     validates :quantity, presence: true
 
     scope :recent, -> { order('created_at DESC') }
 
-    def readonly?
-      !new_record?
-    end
-
     private
 
     def update_stock_item_quantity

app/models/spree/tax_rate.rb

@@ -21,7 +21,7 @@ module Spree
 
     belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
     belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates
-    has_many :adjustments, as: :originator
+    has_many :adjustments, as: :originator, dependent: nil
 
     validates :amount, presence: true, numericality: true
     validates :tax_category, presence: true

app/models/spree/taxon.rb

@@ -7,9 +7,12 @@ module Spree
     acts_as_nested_set dependent: :destroy
 
     belongs_to :taxonomy, class_name: 'Spree::Taxonomy', touch: true
-    has_many :products, class_name: "Spree::Product", foreign_key: "primary_taxon_id",
+
+    has_many :variants, class_name: "Spree::Variant", foreign_key: "primary_taxon_id",
                         inverse_of: :primary_taxon, dependent: :restrict_with_error
 
+    has_many :products, through: :variants, dependent: nil
+
     before_create :set_permalink
 
     validates :name, presence: true
@@ -77,7 +80,7 @@ module Spree
 
       taxons = Spree::Taxon
         .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id")
-        .joins(products: :variants)
+        .joins(:variants)
         .joins("
           INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars
           ON spree_variants.id = ents_and_vars.variant_id")

app/models/spree/variant.rb

@@ -13,8 +13,8 @@ module Spree
 
     acts_as_paranoid
 
-    searchable_attributes :sku, :display_as, :display_name
-    searchable_associations :product, :default_price
+    searchable_attributes :sku, :display_as, :display_name, :primary_taxon_id
+    searchable_associations :product, :default_price, :primary_taxon
     searchable_scopes :active, :deleted
 
     NAME_FIELDS = ["display_name", "display_as", "weight", "unit_value", "unit_description"].freeze
@@ -28,11 +28,12 @@ module Spree
     belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product'
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', optional: false
+    belongs_to :primary_taxon, class_name: 'Spree::Taxon', touch: true, optional: false
 
     delegate :name, :name=, :description, :description=, :meta_keywords, to: :product
 
-    has_many :inventory_units, inverse_of: :variant
-    has_many :line_items, inverse_of: :variant
+    has_many :inventory_units, inverse_of: :variant, dependent: nil
+    has_many :line_items, inverse_of: :variant, dependent: nil
 
     has_many :stock_items, dependent: :destroy, inverse_of: :variant
     has_many :stock_locations, through: :stock_items
@@ -52,7 +53,7 @@ module Spree
              :currency, :currency=,
              to: :find_or_build_default_price
 
-    has_many :exchange_variants
+    has_many :exchange_variants, dependent: nil
     has_many :exchanges, through: :exchange_variants
     has_many :variant_overrides, dependent: :destroy
     has_many :inventory_items, dependent: :destroy
@@ -82,6 +83,7 @@ module Spree
     before_validation :ensure_unit_value
     before_validation :update_weight_from_unit_value, if: ->(v) { v.product.present? }
     before_validation :convert_variant_weight_to_decimal
+    before_validation :assign_related_taxon, if: ->(v) { v.primary_taxon.blank? }
 
     before_save :assign_units, if: ->(variant) {
       variant.new_record? || variant.changed_attributes.keys.intersection(NAME_FIELDS).any?
@@ -99,7 +101,7 @@ module Spree
     scope :in_order_cycle, lambda { |order_cycle|
       with_order_cycles_inner.
         merge(Exchange.outgoing).
-        where('order_cycles.id = ?', order_cycle).
+        where(order_cycles: { id: order_cycle }).
         select('DISTINCT spree_variants.*')
     }
 
@@ -111,8 +113,8 @@ module Spree
     }
 
     scope :for_distribution, lambda { |order_cycle, distributor|
-      where('spree_variants.id IN (?)', order_cycle.variants_distributed_by(distributor).
-        select(&:id))
+      where(spree_variants: { id: order_cycle.variants_distributed_by(distributor).
+        select(&:id) })
     }
 
     scope :visible_for, lambda { |enterprise|
@@ -159,12 +161,12 @@ module Spree
     def self.active(currency = nil)
       # "where(id:" is necessary so that the returned relation has no includes
       # The relation without includes will not be readonly and allow updates on it
-      where("spree_variants.id in (?)", joins(:prices).
+      where(spree_variants: { id: joins(:prices).
                                           where(deleted_at: nil).
                                           where('spree_prices.currency' =>
                                             currency || CurrentConfig.get(:currency)).
                                           where.not(spree_prices: { amount: nil }).
-                                          select("spree_variants.id"))
+                                          select("spree_variants.id") })
     end
 
     def tax_category
@@ -208,6 +210,10 @@ module Spree
 
     private
 
+    def assign_related_taxon
+      self.primary_taxon ||= product.variants.last&.primary_taxon
+    end
+
     def check_currency
       return unless currency.nil?
 

app/models/subscription.rb

@@ -34,8 +34,8 @@ class Subscription < ApplicationRecord
                       where('subscriptions.ends_at > (?) OR subscriptions.ends_at IS NULL',
                             Time.zone.now)
                     }
-  scope :not_canceled, -> { where('subscriptions.canceled_at IS NULL') }
-  scope :not_paused, -> { where('subscriptions.paused_at IS NULL') }
+  scope :not_canceled, -> { where(subscriptions: { canceled_at: nil }) }
+  scope :not_paused, -> { where(subscriptions: { paused_at: nil }) }
   scope :active, -> {
                    not_canceled.not_ended.not_paused.where('subscriptions.begins_at <= (?)',
                                                            Time.zone.now)

app/queries/product_scope_query.rb

@@ -20,7 +20,7 @@ class ProductScopeQuery
 
     product_query.
       ransack(query_params_with_defaults).
-      result
+      result(distinct: true)
   end
 
   def find_product

app/reflexes/admin/orders_reflex.rb

@@ -21,7 +21,8 @@ module Admin
     def ship
       @order.send_shipment_email = false unless params[:send_shipment_email]
       if @order.ship
-        return set_param_for_controller if request.url.match?('edit')
+        paths = %w[edit customer payments adjustments invoices return_authorizations].freeze
+        return set_param_for_controller if Regexp.union(paths).match? request.url
 
         morph dom_id(@order), render(partial: "spree/admin/orders/table_row",
                                      locals: { order: @order.reload, success: true })
@@ -32,11 +33,18 @@ module Admin
     end
 
     def bulk_invoice(params)
-      visible_orders = editable_orders.where(id: params[:bulk_ids]).filter(&:invoiceable?)
-      if Spree::Config.enterprise_number_required_on_invoices? &&
-         !all_distributors_can_invoice?(visible_orders)
-        render_business_number_required_error(visible_orders)
-        return
+      visible_orders = editable_orders.invoiceable.where(id: params[:bulk_ids])
+
+      if Spree::Config.enterprise_number_required_on_invoices?
+        distributors_without_abn = Enterprise.where(
+          id: visible_orders.select(:distributor_id),
+          abn: nil,
+        )
+
+        if distributors_without_abn.exists?
+          render_business_number_required_error(distributors_without_abn)
+          return
+        end
       end
 
       cable_ready.append(
@@ -44,8 +52,13 @@ module Admin
         html: render(partial: "spree/admin/orders/bulk/invoice_modal")
       ).broadcast
 
+      # Preserve order of bulk_ids.
+      # The ids are supplied in the sequence of the orders screen and may be
+      # sorted, for example by last name of the customer.
+      visible_order_ids = params[:bulk_ids].map(&:to_i) & visible_orders.pluck(:id)
+
       BulkInvoiceJob.perform_later(
-        visible_orders.pluck(:id),
+        visible_order_ids,
         "tmp/invoices/#{Time.zone.now.to_i}-#{SecureRandom.hex(2)}.pdf",
         channel: SessionChannel.for_request(request),
         current_user_id: current_user.id
@@ -82,8 +95,8 @@ module Admin
 
     def send_invoices(params)
       count = 0
-      editable_orders.where(id: params[:bulk_ids]).find_each do |o|
-        next unless o.distributor.can_invoice? && o.invoiceable?
+      editable_orders.invoiceable.where(id: params[:bulk_ids]).find_each do |o|
+        next unless o.distributor.can_invoice?
 
         Spree::OrderMailer.invoice_email(o.id, current_user_id: current_user.id).deliver_later
         count += 1
@@ -114,14 +127,8 @@ module Admin
       params[:id] = @order.number
     end
 
-    def all_distributors_can_invoice?(orders)
-      distributor_ids = orders.map(&:distributor_id)
-      Enterprise.where(id: distributor_ids, abn: nil).empty?
-    end
-
-    def render_business_number_required_error(orders)
-      distributor_ids = orders.map(&:distributor_id)
-      distributor_names = Enterprise.where(id: distributor_ids, abn: nil).pluck(:name)
+    def render_business_number_required_error(distributors)
+      distributor_names = distributors.pluck(:name)
 
       flash[:error] = I18n.t(:must_have_valid_business_number,
                              enterprise_name: distributor_names.join(", "))

app/reflexes/products_reflex.rb

@@ -5,10 +5,6 @@ class ProductsReflex < ApplicationReflex
 
   before_reflex :init_filters_params, :init_pagination_params
 
-  def fetch
-    fetch_and_render_products_with_flash
-  end
-
   def change_per_page
     @per_page = element.value.to_i
     @page = 1
@@ -16,12 +12,6 @@ class ProductsReflex < ApplicationReflex
     fetch_and_render_products_with_flash
   end
 
-  def filter
-    @page = 1
-
-    fetch_and_render_products_with_flash
-  end
-
   def clear_search
     @search_term = nil
     @producer_id = nil
@@ -31,21 +21,6 @@ class ProductsReflex < ApplicationReflex
     fetch_and_render_products_with_flash
   end
 
-  def bulk_update
-    product_set = product_set_from_params
-
-    product_set.collection.each { |p| authorize! :update, p }
-    @products = product_set.collection # use instance variable mainly for testing
-
-    if product_set.save
-      flash[:success] = I18n.t('admin.products_v3.bulk_update.success')
-    elsif product_set.errors.present?
-      @error_counts = { saved: product_set.saved_count, invalid: product_set.invalid.count }
-    end
-
-    render_products_form_with_flash
-  end
-
   def delete_product
     id = current_id_from_element(element)
     product = product_finder(id).find_product
@@ -114,8 +89,8 @@ class ProductsReflex < ApplicationReflex
       html: render(partial: "admin/products_v3/content",
                    locals: { products: @products, pagy: @pagy, search_term: @search_term,
                              producer_options: producers, producer_id: @producer_id,
-                             category_options: categories, category_id: @category_id,
-                             flashes: flash })
+                             category_options: categories, tax_category_options:,
+                             category_id: @category_id, flashes: flash })
     )
 
     cable_ready.replace_state(
@@ -150,9 +125,13 @@ class ProductsReflex < ApplicationReflex
     Spree::Taxon.order(:name).map { |c| [c.name, c.id] }
   end
 
+  def tax_category_options
+    Spree::TaxCategory.order(:name).pluck(:name, :id)
+  end
+
   def fetch_products
     product_query = OpenFoodNetwork::Permissions.new(current_user)
-      .editable_products.merge(product_scope).ransack(ransack_query).result
+      .editable_products.merge(product_scope).ransack(ransack_query).result(distinct: true)
     @pagy, @products = pagy(product_query.order(:name), items: @per_page, page: @page,
                                                         size: [1, 2, 2, 1])
   end
@@ -173,7 +152,7 @@ class ProductsReflex < ApplicationReflex
     if @search_term.present?
       query.merge!(Spree::Variant::SEARCH_KEY => @search_term)
     end
-    query.merge!(primary_taxon_id_in: @category_id) if @category_id.present?
+    query.merge!(variants_primary_taxon_id_in: @category_id) if @category_id.present?
     query
   end
 

app/serializers/api/admin/product_serializer.rb

@@ -8,7 +8,6 @@ module Api
                  :thumb_url, :variants
 
       has_one :supplier, key: :producer_id, embed: :id
-      has_one :primary_taxon, key: :category_id, embed: :id
 
       def variants
         ActiveModel::ArraySerializer.new(

app/serializers/api/admin/variant_serializer.rb

@@ -8,6 +8,8 @@ module Api
                  :display_as, :display_name, :name_to_display, :variant_overrides_count,
                  :price, :on_demand, :on_hand, :in_stock, :stock_location_id, :stock_location_name
 
+      has_one :primary_taxon, key: :category_id, embed: :id
+
       def name
         if object.full_name.present?
           "#{object.name} - #{object.full_name}"

app/serializers/api/enterprise_shopfront_serializer.rb

@@ -145,7 +145,7 @@ module Api
       require_shipping = type == :delivery ? 't' : 'f'
       Spree::ShippingMethod.
         joins(:distributor_shipping_methods).
-        where('distributors_shipping_methods.distributor_id = ?', enterprise.id).
+        where(distributors_shipping_methods: { distributor_id: enterprise.id }).
         where("spree_shipping_methods.require_ship_address = '#{require_shipping}'").exists?
     end
   end

app/serializers/api/order_serializer.rb

@@ -16,7 +16,7 @@ module Api
     end
 
     def payments
-      object.payments.joins(:payment_method).where('state IN (?)', %w(completed pending))
+      object.payments.joins(:payment_method).where(state: %w(completed pending))
     end
 
     def shop_id

app/serializers/api/product_serializer.rb

@@ -9,8 +9,6 @@ class Api::ProductSerializer < ActiveModel::Serializer
 
   has_many :variants, serializer: Api::VariantSerializer
 
-  has_one :primary_taxon, serializer: Api::TaxonSerializer
-
   has_one :image, serializer: Api::ImageSerializer
   has_one :supplier, serializer: Api::IdSerializer
 

app/services/html_sanitizer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Keeps only allowed HTML.
+#
+# We store some rich text as HTML in attributes of models like Enterprise.
+# We offer an editor which supports certain tags but you can't insert just any
+# HTML, which would be dangerous.
+class HtmlSanitizer
+  def self.sanitize(html)
+    @sanitizer ||= Rails::HTML5::SafeListSanitizer.new
+    @sanitizer.sanitize(
+      html, tags: %w[h1 h2 h3 h4 p br b i u a], attributes: %w[href target],
+    )
+  end
+end

app/services/order_cycles/distributed_products_service.rb

@@ -15,6 +15,22 @@ module OrderCycles
       Spree::Product.where(id: stocked_products).group("spree_products.id")
     end
 
+    # Joins on the first product variant to allow us to filter product by taxon. This is so
+    # enterprise can display product sorted by category in a custom order on their shopfront.
+    #
+    # Caveat, the category sorting won't work properly if there are multiple variant with different
+    # category for a given product.
+    #
+    def products_taxons_relation
+      Spree::Product.where(id: stocked_products).
+        joins("LEFT JOIN (
+                 SELECT DISTINCT ON(product_id) id, product_id, primary_taxon_id
+                 FROM spree_variants WHERE deleted_at IS NULL
+               ) first_variant ON spree_products.id = first_variant.product_id").
+        select("spree_products.*, first_variant.primary_taxon_id").
+        group("spree_products.id, first_variant.primary_taxon_id")
+    end
+
     def variants_relation
       order_cycle.
         variants_distributed_by(distributor).

app/services/permitted_attributes/variant.rb

@@ -7,7 +7,7 @@ module PermittedAttributes
         :id, :sku, :on_hand, :on_demand, :shipping_category_id,
         :price, :unit_value, :unit_description,
         :display_name, :display_as, :tax_category_id,
-        :weight, :height, :width, :depth
+        :weight, :height, :width, :depth, :taxon_ids, :primary_taxon_id
       ]
     end
   end

app/services/products_renderer.rb

@@ -35,7 +35,7 @@ class ProductsRenderer
 
     @products ||= begin
       results = distributed_products.
-        products_relation.
+        products_taxons_relation.
         order(Arel.sql(products_order))
 
       filter_and_paginate(results).
@@ -54,7 +54,7 @@ class ProductsRenderer
   def filter_and_paginate(query)
     results = query.ransack(args[:q]).result
 
-    _pagy, paginated_results = pagy(
+    _pagy, paginated_results = pagy_arel(
       results,
       page: args[:page] || 1,
       items: args[:per_page] || DEFAULT_PER_PAGE
@@ -78,7 +78,7 @@ class ProductsRenderer
           distributor.preferred_shopfront_taxon_order.present?
       distributor
         .preferred_shopfront_taxon_order
-        .split(",").map { |id| "spree_products.primary_taxon_id=#{id} DESC" }
+        .split(",").map { |id| "first_variant.primary_taxon_id=#{id} DESC" }
         .join(", ") + ", spree_products.name ASC, spree_products.id ASC"
     else
       "spree_products.name ASC, spree_products.id"

app/services/sets/product_set.rb

@@ -46,18 +46,12 @@ module Sets
     #   variant.update( { price: xx.x } )
     #
     def update_product_attributes(attributes)
-      split_taxon_ids!(attributes)
-
       product = find_model(@collection, attributes[:id])
       return if product.nil?
 
       update_product(product, attributes)
     end
 
-    def split_taxon_ids!(attributes)
-      attributes[:taxon_ids] = attributes[:taxon_ids].split(',') if attributes[:taxon_ids].present?
-    end
-
     def update_product(product, attributes)
       return false unless update_product_only_attributes(product, attributes)
 

app/views/admin/products_v3/_content.html.haml

@@ -1,4 +1,8 @@
-#products-content
+%turbo-frame#products-content{ target: "_top", refresh: "morph" }
+  .spinner-overlay{ "data-controller": "loading", "data-products-target": "loading", class: "hidden" }
+    .spinner-container
+      .spinner
+      = t('.loading')
   .container
     .sixteen.columns
       = render partial: 'admin/shared/flashes', locals: { flashes: } if defined? flashes
@@ -11,9 +15,9 @@
     .container.results
       .sixteen.columns
         = render partial: 'sort', locals: { pagy: pagy, search_term: search_term, producer_id: producer_id, category_id: category_id }
-        = render partial: 'table', locals: { products: products }
-    - if pagy.pages > 1
-      = render partial: 'admin/shared/v3/pagy', locals: { pagy: pagy, reflex: "click->Products#fetch" }
+        = render partial: 'table', locals: { products:, producer_options:, category_options:, tax_category_options: }
+    - if pagy.present? && pagy.pages > 1
+      = render partial: 'admin/shared/stimulus_pagination', locals: { pagy: pagy }
   - else
     #no-products
       = render partial: "no_products", locals: { search_term: search_term, producer_id: producer_id, category_id: category_id }

app/views/admin/products_v3/_filters.html.haml

@@ -1,4 +1,8 @@
-%form{ id: "filters", 'data-reflex-serialize-form': true, 'data-reflex': 'submit->products#filter' }
+= form_with url: admin_products_path, id: "filters", method: :get, data: { "search-target": "form", 'turbo-frame': "_self" } do
+  = hidden_field_tag :page, nil, class: "page"
+  = hidden_field_tag :per_page, nil, class: "per-page"
+  = hidden_field_tag '[q][s]', params.dig(:q, :s) || 'name asc', class: 'sort', 'data-default': 'name asc'
+
   .query
     .search-input
       = text_field_tag :search_term, search_term, placeholder: t('.search_products')
@@ -15,4 +19,4 @@
       data: { "controller": "tom-select", 'tom-select-placeholder-value': t('.search_for_categories')}
   .submit
     .search-button
-      = button_tag t(".search"), class: "secondary icon-search relaxed"
+      = button_tag t(".search"), class: "secondary icon-search relaxed", name: nil

app/views/admin/products_v3/_product_row.html.haml

@@ -2,14 +2,16 @@
   %a.image-field{ href: admin_product_images_path(product), data: { controller: "modal", reflex: "click->products#edit_image", "current-id": product.id} }
     = image_tag product.image&.url(:mini) || Spree::Image.default_image_url(:mini), width: 40, height: 40
     .button.secondary.mini= t('admin.products_page.image.edit')
-%td.field.align-left.header
+%td.field.align-left.header.naked_inputs
   = f.hidden_field :id
   = f.text_field :name, 'aria-label': t('admin.products_page.columns.name')
   = error_message_on product, :name
-%td.field
+%td.field.naked_inputs
   = f.text_field :sku, 'aria-label': t('admin.products_page.columns.sku')
   = error_message_on product, :sku
-%td.multi-field{ 'data-controller': 'toggle-control', 'data-toggle-control-match-value': 'items' }
+%td.field.naked_inputs{ 'data-controller': 'toggle-control', 'data-toggle-control-match-value': 'items' }
+  = f.hidden_field :variant_unit
+  = f.hidden_field :variant_unit_scale
   = f.select :variant_unit_with_scale,
       options_for_select(WeightsAndMeasures.variant_unit_options, product.variant_unit_with_scale),
       {},
@@ -25,17 +27,22 @@
   -# empty
 %td.align-right
   -# empty
+%td.naked_inputs
+  = render(SearchableDropdownComponent.new(form: f,
+      name: :supplier_id,
+      aria_label: t('.producer_field_name'),
+      options: producer_options,
+      selected_option: product.supplier_id,
+      placeholder_value: t('admin.products_v3.filters.search_for_producers')))
 %td.align-left
-  .content= product.supplier&.name
-%td.align-left
-  .content= product.primary_taxon&.name
+  -# empty
 %td.align-left
 %td.align-left
   .content= product.inherits_properties ? 'YES' : 'NO' #TODO: consider using https://github.com/RST-J/human_attribute_values, else use I18n.t (also below)
 %td.align-right
   = render(VerticalEllipsisMenu::Component.new) do
-    = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product)
-    = link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product)
+    = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product), 'data-turbo': false
+    = link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product), 'data-turbo': false
     %a{ "data-controller": "modal-link", "data-action": "click->modal-link#setModalDataSetOnConfirm click->modal-link#open",
         "data-modal-link-target-value": "product-delete-modal", "class": "delete",
         "data-modal-link-modal-dataset-value": {'data-current-id': product.id}.to_json }

app/views/admin/products_v3/_sort.html.haml

@@ -1,9 +1,15 @@
 #sort
   %div
-    = t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to)
+    - if pagy.present?
+      = t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to)
+
     - if search_term.present? || producer_id.present? || category_id.present?
-      %a{ href: "#", class: "button disruptive", data: { reflex: "click->products#clear_search" } }
-        = t(".pagination.clear_search")  
+      %a{ href: url_for(page: 1), class: "button disruptive", 'data-turbo-frame': "_self" }
+        = t(".pagination.clear_search")
+
   %form.with-dropdown
     = t(".pagination.per_page.show")
-    = select_tag :per_page, options_for_select([15, 25, 50, 100].collect{|i| [t('.pagination.per_page.per_page', num: i), i]}, pagy.items), class: "no-input per-page", data: { reflex: "change->products#change_per_page", controller: "tom-select", "tom-select-options-value": '{ "plugins": [] }'}
+    = select_tag :per_page,
+        options_for_select([15, 25, 50, 100].collect{|i| [t('.pagination.per_page.per_page', num: i), i]}, pagy&.items),
+        class: "no-input per-page",
+        data: { controller: "tom-select search", action: "change->search#changePerPage", "tom-select-options-value": '{ "plugins": [] }'}

app/views/admin/products_v3/_table.html.haml

@@ -1,17 +1,25 @@
-= form_with url: bulk_update_admin_products_path, method: :patch, id: "products-form",
+= form_with url: bulk_update_admin_products_path, method: :post, id: "products-form",
             builder: BulkFormBuilder,
-            html: { data: { reflex: 'submit->products#bulk_update', 'reflex-serialize-form': true,
-              controller: "bulk-form", 'bulk-form-disable-selector-value': "#sort,#filters",
-              'bulk-form-error-value': defined?(error_counts),
+            html: { data: { 'turbo-frame': "_self",
+              controller: "bulk-form",
+              'bulk-form-disable-selector-value': "#sort,#filters",
+              'bulk-form-error-value': defined?(@error_counts),
               } } do |form|
   = render(partial: "admin/shared/flashes", locals: { flashes: }) if defined? flashes
+
+  = hidden_field_tag :page, @page
+  = hidden_field_tag :per_page, @per_page
+  = hidden_field_tag :search_term, @search_term
+  = hidden_field_tag :producer_id, @producer_id
+  = hidden_field_tag :category_id, @category_id
+
   %table.products
     %colgroup
       %col{ width:"56" }= #  Img (size + padding)
       %col= # (grow to fill) Name
-      %col{ width:"8%"}
-      %col{ width:"8%"}
       %col{ width:"5%"}
+      %col{ width:"8%"}
+      %col{ width:"8%"}
       %col{ width:"5%"}
       %col{ width:"10%"}
       %col{ width:"15%"}= # Producer
@@ -23,27 +31,29 @@
       %tr
         %td.form-actions-wrapper{ colspan: 12 }
           .form-actions-wrapper2
-            %fieldset.form-actions{ class: ("hidden" unless defined?(error_counts)), 'data-bulk-form-target': "actions" }
+            %fieldset.form-actions{ class: ("hidden" unless defined?(@error_counts)), 'data-bulk-form-target': "actions" }
               .container
                 .status
                   .modified_summary{ 'data-bulk-form-target': "changedSummary", 'data-translation-key': 'admin.products_v3.table.changed_summary'}
-                  - if defined?(error_counts)
+                  - if defined?(@error_counts)
                     .error_summary
-                      - if error_counts[:saved] > 0
+                      - if @error_counts[:saved] > 0
                         -# X products were saved correctly, but Y products could not be saved correctly. Please review errors and try again
-                        = t('.error_summary.saved', count: error_counts[:saved]) + t('.error_summary.invalid', count: error_counts[:invalid])
+                        = t('.error_summary.saved', count: @error_counts[:saved]) + t('.error_summary.invalid', count: @error_counts[:invalid])
                       - else 
                         -# Y products could not be saved correctly. Please review errors and try again
-                        = t('.error_summary.invalid', count: error_counts[:invalid])
+                        = t('.error_summary.invalid', count: @error_counts[:invalid])
                 .form-buttons
-                  = form.submit t('.reset'), type: :reset, class: "medium", 'data-reflex': 'click->products#fetch'
+                  %a.button.reset.medium{ href: admin_products_path(page: @page, per_page: @per_page, search_term: @search_term, producer_id: @producer_id, category_id: @category_id), 'data-turbo': "false" }
+                    = t('.reset')
                   = form.submit t('.save'), class: "medium"
       %tr
         %th.align-left= # image
-        %th.align-left.with-input= t('admin.products_page.columns.name')
+        = render partial: 'spree/admin/shared/stimulus_sortable_header',
+            locals: { column: :name, sorted: params.dig(:q, :s), default: 'name asc' }
         %th.align-left.with-input= t('admin.products_page.columns.sku')
         %th.align-left.with-input= t('admin.products_page.columns.unit_scale')
-        %th.align-right= t('admin.products_page.columns.unit')
+        %th.align-left.with-input= t('admin.products_page.columns.unit')
         %th.align-left.with-input= t('admin.products_page.columns.price')
         %th.align-left.with-input= t('admin.products_page.columns.on_hand')
         %th.align-left= t('admin.products_page.columns.producer')
@@ -53,21 +63,21 @@
         %th.align-right= t('admin.products_page.columns.actions')
     - products.each_with_index do |product, product_index|
       = form.fields_for("products", product, index: product_index) do |product_form|
-        %tbody.relaxed.naked_inputs{ data: { 'record-id': product_form.object.id,
-                                controller: "nested-form",
-                                action: 'rails-nested-form:add->bulk-form#registerElements' } }
+        %tbody.relaxed{ data: { 'record-id': product_form.object.id,
+                                controller: "nested-form product",
+                                action: 'rails-nested-form:add->bulk-form#registerElements rails-nested-form:remove->bulk-form#toggleFormChanged' } }
           %tr
-            = render partial: 'product_row', locals: { product:, f: product_form }
+            = render partial: 'product_row', locals: { f: product_form, product:, producer_options: }
 
           - product.variants.each_with_index do |variant, variant_index|
             = form.fields_for("products][#{product_index}][variants_attributes][", variant, index: variant_index) do |variant_form|
-              %tr.condensed
-                = render partial: 'variant_row', locals: { variant:, f: variant_form }
+              %tr.condensed{ 'data-controller': "variant", 'class': "nested-form-wrapper", 'data-new-record': variant.new_record? ? "true" : false }
+                = render partial: 'variant_row', locals: { variant:, f: variant_form, category_options:, tax_category_options: }
 
           = form.fields_for("products][#{product_index}][variants_attributes][NEW_RECORD", product.variants.build) do |new_variant_form|
             %template{ 'data-nested-form-target': "template" }
-              %tr.condensed
-                = render partial: 'variant_row', locals: { variant: new_variant_form.object, f: new_variant_form }
+              %tr.condensed{ 'data-controller': "variant", 'class': "nested-form-wrapper", 'data-new-record': "true" }
+                = render partial: 'variant_row', locals: { variant: new_variant_form.object, f: new_variant_form, category_options:, tax_category_options:  }
 
           %tr{ 'data-nested-form-target': "target" }
           %tr.condensed

app/views/admin/products_v3/_variant_row.html.haml

@@ -1,28 +1,37 @@
 %td
   -# empty
-%td.field
+%td.field.naked_inputs
   = f.hidden_field :id
   = f.text_field :display_name, 'aria-label': t('admin.products_page.columns.name'), placeholder: variant.product.name
   = error_message_on variant, :display_name
-%td.field
+%td.field.naked_inputs
   = f.text_field :sku, 'aria-label': t('admin.products_page.columns.sku')
   = error_message_on variant, :sku
 %td
   -# empty
-- if variant.persisted?
-  %td.align-right
-    .content= variant.unit_to_display
-- else # until unit component is developed, use a basic input just so we can create new records
-  %td.field
-    = f.number_field :unit_value, 'aria-label': t('admin.products_page.columns.unit')
-    = error_message_on variant, :unit_value
-%td.field
+%td.field.popout{'data-controller': "popout", 'data-popout-update-display-value': "false"}
+  = f.button :unit_to_display, class: "popout__button", 'aria-label': t('admin.products_page.columns.unit'), 'data-popout-target': "button" do
+    = variant.unit_to_display # Show the generated summary of unit values
+  %div.popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
+    .field
+      -# Show a composite field for unit_value and unit_description
+      = f.hidden_field :unit_value
+      = f.hidden_field :unit_description
+      -# todo: create a method for value_with_description
+      = f.text_field :unit_value_with_description,
+          value: [number_with_precision((variant.unit_value || 1) / (variant.product.variant_unit_scale || 1), precision: nil, strip_insignificant_zeros: true), variant.unit_description].compact_blank.join(" "),
+          'aria-label': t('admin.products_page.columns.unit_value'), required: true
+    .field
+      = f.label :display_as, t('admin.products_page.columns.display_as')
+      = f.text_field :display_as, placeholder: VariantUnits::OptionValueNamer.new(variant).name
+  = error_message_on variant, :unit_value
+%td.field.naked_inputs
   = f.text_field :price, 'aria-label': t('admin.products_page.columns.price'), value: number_to_currency(variant.price, unit: '')&.strip # TODO: add a spec to prove that this formatting is necessary. If so, it should be in a shared form helper for currency inputs
   = error_message_on variant, :price
-%td.field.on-hand__wrapper{'data-controller': "popout"}
-  %button.on-hand__button{'data-popout-target': "button", 'aria-label': t('admin.products_page.columns.on_hand')}
+%td.field.popout{'data-controller': "popout"}
+  %button.popout__button{'data-popout-target': "button", 'aria-label': t('admin.products_page.columns.on_hand')}
     = variant.on_demand ? t(:on_demand) : variant.on_hand
-  %div.on-hand__popout{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
+  %div.popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
     .field
       = f.number_field :on_hand, min: 0, 'aria-label': t('admin.products_page.columns.on_hand'), 'data-toggle-control-target': 'control', disabled: f.object.on_demand
       = error_message_on variant, :on_hand
@@ -31,19 +40,33 @@
         = f.check_box :on_demand, 'data-action': 'change->toggle-control#disableIfPresent change->popout#closeIfChecked'
         = t(:on_demand)
 %td.align-left
-  .content= variant.product.supplier&.name # same as product
-%td.align-left
-  -# empty
-%td.align-left
-  .content= variant.tax_category&.name || "None" # TODO: convert to dropdown, else translate hardcoded string.
+  -# empty producer name
+%td.field.naked_inputs
+  = render(SearchableDropdownComponent.new(form: f,
+      name: :primary_taxon_id,
+      options: category_options,
+      selected_option: variant.primary_taxon_id,
+      aria_label: t('.category_field_name'),
+      placeholder_value: t('admin.products_v3.filters.search_for_categories')))
+%td.field.naked_inputs
+  = render(SearchableDropdownComponent.new(form: f,
+      name: :tax_category_id,
+      options: tax_category_options,
+      selected_option: variant.tax_category_id,
+      include_blank: t('.none_tax_category'),
+      aria_label: t('.tax_category_field_name'),
+      placeholder_value: t('.search_for_tax_categories')))
 %td.align-left
   -# empty
 %td.align-right
-  - if variant.persisted?
-    = render(VerticalEllipsisMenu::Component.new) do
+  = render(VerticalEllipsisMenu::Component.new) do
+    - if variant.persisted?
       = link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(variant.product, variant)
       - if variant.product.variants.size > 1
         %a{ "data-controller": "modal-link", "data-action": "click->modal-link#setModalDataSetOnConfirm click->modal-link#open",
             "data-modal-link-target-value": "variant-delete-modal", "class": "delete",
             "data-modal-link-modal-dataset-value": {'data-current-id': variant.id}.to_json }
           = t('admin.products_page.actions.delete')
+    - else
+      %a{ 'data-action': "nested-form#remove", class: 'delete' }
+        = t('admin.products_page.actions.remove')

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

@@ -1,5 +1,3 @@
-- content_for :body_class do
-  products_v3_page
 - content_for :page_title do
   = t('.header.title')
 - content_for :page_actions do
@@ -8,15 +6,16 @@
       %li#new_product_link
         = button_link_to t(:new_product), "/admin/products/new", { :icon => 'icon-plus', :id => 'admin_new_product' }
 
+%script= render partial: "admin/shared/global_var_ofn", formats: :js,
+  locals: { name: :available_units_sorted, value: WeightsAndMeasures.available_units_sorted }
+
 = render partial: 'spree/admin/shared/product_sub_menu'
 
-#products_v3_page{ "data-controller": "products" }
-
-  .spinner-overlay{ "data-controller": "loading", "data-products-target": "loading" }
-    .spinner-container
-      .spinner
-      = t('.loading')
-  #products-content
+#products_v3_page{ "data-controller": "products", 'data-turbo': true }
+  = render partial: "content", locals: { products: @products, pagy: @pagy, search_term: @search_term,
+                               producer_options: producers, producer_id: @producer_id,
+                               category_options: categories, category_id: @category_id,
+                               tax_category_options:, flashes: flash }
   - %w[product variant].each do |object_type|
     = render partial: 'delete_modal', locals: { object_type: }
   #modal-component

app/views/admin/shared/_global_var_ofn.js.erb

@@ -0,0 +1 @@
+var ofn_<%= name %> = <%= value.to_json.html_safe %>;

app/views/admin/shared/v3/_pagy.html.haml

@@ -1,15 +0,0 @@
-%nav.pagy_nav.pagination{"aria-label" => "pager", :role => "navigation"}
-  - if pagy.prev
-    %a.page.prev{ href: "#", id: "pagy-prev", "data-reflex": reflex, "data-perPage": pagy.items, "data-page": pagy.prev || 1, "aria-label": "previous"}
-      %i.icon-chevron-left
-  - pagy.series.each do |item|       # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-    - if item.is_a?(Integer)         # page link
-      %a.page{ href: "#", id:"pagy-#{item}", "data-reflex": reflex, "data-perPage": pagy.items, "data-page": item, "aria-label": "page #{item}"}
-        = item
-    - elsif item.is_a?(String)       # current page
-      %span.page.current= item
-    - elsif item == :gap             # page gap
-      %span.page.gap …
-  - if pagy.next
-    %a.page.next{ href: "#", id:"pagy-next", "data-reflex": reflex, "data-perPage": pagy.items, "data-page": pagy.next || pagy.last, "aria-label": "next"}
-      %i.icon-chevron-right

app/views/checkout/_details.html.haml

@@ -96,11 +96,6 @@
           #distributor_address.panel
             - if shipping_method.description.present?
               %span #{shipping_method.description}
-              %br/
-              %br/
-            - if @order.order_cycle.pickup_time_for(@order.distributor)
-              = t :checkout_ready_for
-            = @order.order_cycle.pickup_time_for(@order.distributor)
 
       = f.error_message_on :shipping_method, standalone: true
 

app/views/checkout/payment/_gateway.html.haml

@@ -1,27 +0,0 @@
-= f.fields :bill_address, model: @order.bill_address do |bill_address|
-  %div.checkout-input
-    = bill_address.label :firstname, t("checkout.step1.your_details.first_name.label")
-    = bill_address.text_field :firstname, { placeholder: t("checkout.step1.your_details.first_name.placeholder") }
-    = f.error_message_on "bill_address.firstname"
-
-  %div.checkout-input
-    = bill_address.label :lastname, t("checkout.step1.your_details.last_name.label")
-    = bill_address.text_field :lastname, { placeholder: t("checkout.step1.your_details.last_name.placeholder") }
-    = f.error_message_on "bill_address.lastname"
-
-.flex{style: "justify-content: space-between; gap: 10px;" }
-  %div.checkout-input{style: "flex-grow: 2;" }
-    = f.label :card_number, t("checkout.step2.form.card_number.label")
-    = f.text_field :card_number, { placeholder: t("checkout.step2.form.card_number.placeholder") }
-
-  %div.checkout-input{style: "flex: 0 1 100px;"}
-    = f.label :card_verification_value, t("checkout.step2.form.card_verification_value.label")
-    = f.number_field :card_verification_value, { placeholder: t("checkout.step2.form.card_verification_value.placeholder") }
-
-  %div.checkout-input{style: "flex: 0 1 70px;"}
-    = f.label :card_month, t("checkout.step2.form.card_month.label")
-    = f.number_field :card_month, { placeholder: t("checkout.step2.form.card_month.placeholder"), max: 12 }
-
-  %div.checkout-input{style: "flex: 0 1 70px;"}
-    = f.label :card_year, t("checkout.step2.form.card_year.label")
-    = f.number_field :card_year, { placeholder: t("checkout.step2.form.card_year.placeholder"), min: Time.now.year, max: Time.now.year + 10 }

app/views/home/_connect.html.haml

@@ -1,7 +0,0 @@
-#connect.pane
-  .row
-    .small-12.medium-6.medium-offset-3.columns.text-center
-      %h2= t :label_connect
-      %p.text-normal= t :connect_body
-      %a.button.transparent{href: "https://openfoodnetwork.org/au/connect/"}
-        = t :connect_cta

app/views/home/_learn.html.haml

@@ -1,7 +0,0 @@
-#learn.pane
-  .row
-    .small-12.medium-6.medium-offset-3.columns.text-center
-      %h2= t :label_learn
-      %p.text-normal= t :learn_body
-      %a.button.transparent{href: "https://openfoodnetwork.org/au/learn/"}
-        = t :learn_cta

app/views/shared/_distributor.html.haml

@@ -1,3 +0,0 @@
-= succeed ',' do
-  = link_to "<strong>#{distributor.name}</strong>".html_safe, enterprise_shop_path(distributor), {class: distributor_link_class(distributor)}
-%span.secondary= distributor.city

app/views/spree/admin/orders/edit.html.haml

@@ -5,7 +5,7 @@
 
 - content_for :page_actions do
   - if can?(:fire, @order)
-    %li= event_links
+    %li= event_links(@order)
   = render partial: 'spree/admin/shared/order_links'
   - if can?(:admin, Spree::Order)
     %li

app/views/spree/admin/payments/index.html.haml

@@ -20,5 +20,3 @@
 
 - if @payments.any?
   = render partial: 'list', locals: { payments: @payments }
-- else
-  .alpha.twelve.columns.no-objects-found= t(:order_has_no_payments)

app/views/spree/admin/products/_form.html.haml

@@ -27,8 +27,6 @@
           = f.text_field :variant_unit_name, {placeholder: t('admin.products.unit_name_placeholder')}
           = f.error_message_on :variant_unit_name
 
-    = render 'spree/admin/products/primary_taxon_form', f: f
-
     = f.field_container :supplier do
       = f.label :supplier, t(:spree_admin_supplier)
       %br

app/views/spree/admin/products/_primary_taxon_form.html.haml

@@ -1,6 +1,6 @@
 = f.field_container :primary_taxon do
-  = f.label :primary_taxon, t('.product_category')
+  = f.label :primary_taxon_id, t('.product_category')
   %span.required *
   %br
   = f.collection_select(:primary_taxon_id, Spree::Taxon.order(:name), :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
-  = f.error_message_on :primary_taxon
+  = f.error_message_on :primary_taxon_id

app/views/spree/admin/products/index/_products_product.html.haml

@@ -24,7 +24,6 @@
   %td.on_demand{ 'ng-show' => 'columns.on_demand.visible' }
     %input.field{ 'ng-model' => 'product.on_demand', :name => 'on_demand', 'ofn-track-product' => 'on_demand', :type => 'checkbox', 'ng-hide' => 'hasVariants(product)' }
   %td.category{ 'ng-if' => 'columns.category.visible' }
-    %input.fullwidth{ :type => 'text', id: "p{{product.id}}_category_id", 'ng-model' => 'product.category_id', 'ofn-taxon-autocomplete' => '', 'ofn-track-product' => 'category_id', 'multiple-selection' => 'false', placeholder: 'Category' }
   %td.tax_category{ 'ng-if' => 'columns.tax_category.visible' }
   %td.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' }
     %input{ 'ng-model' => 'product.inherits_properties', :name => 'inherits_properties', 'ofn-track-product' => 'inherits_properties', type: "checkbox" }

app/views/spree/admin/products/index/_products_variant.html.haml

@@ -21,6 +21,7 @@
   %td{ 'ng-show' => 'columns.on_demand.visible' }
     %input.field{ 'ng-model' => 'variant.on_demand', :name => 'variant_on_demand', 'ofn-track-variant' => 'on_demand', :type => 'checkbox' }
   %td{ 'ng-show' => 'columns.category.visible' }
+    %input.fullwidth{ type: 'text', id: "p{{product.id}}_category_id", 'ng-model' => 'variant.category_id', 'ofn-taxon-autocomplete' => '', 'ofn-track-variant' => 'category_id', 'multiple-selection' => 'false', placeholder: 'Category' }
   %td{ 'ng-show' => 'columns.tax_category.visible' }
     %select.select2{ name: 'variant_tax_category_id', "ofn-track-variant": 'tax_category_id', "ng-model": 'variant.tax_category_id', "ng-options": 'tax_category.id as tax_category.name for tax_category in tax_categories' }
       %option{ value: '' }= t(:none)