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

Fix incorrect results for multiple tax rates in report

.env.test

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

.github/ISSUE_TEMPLATE/release.md

@@ -39,11 +39,11 @@ assignees: ''
   </details>
 - [ ] Notify [#instance-managers]:
   > @instance_managers The new release has been deployed.
-- [ ] Nudge next release manager
+- [ ] [Create issue] for next release and confirm with next release manager in [#core-devs].
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
 
-[Ready To Go]: #zenhub
+[Ready To Go]: https://github.com/orgs/openfoodfoundation/projects/8?filterQuery=status%3A%22Ready+to+go+%F0%9F%9A%80%22
 [Transifex pull request]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+head%3Atransifex
 [Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A
 [releases]: https://github.com/openfoodfoundation/openfoodnetwork/releases
@@ -51,3 +51,5 @@ The full process is described at https://github.com/openfoodfoundation/openfoodn
 [#testing]: https://openfoodnetwork.slack.com/app_redirect?channel=C02TZ6X00
 [Deploy to Staging]: https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/stage.yml
 [#global-community]: https://app.slack.com/client/T02G54U79/C59ADD8F2
+[Create issue]: https://github.com/openfoodfoundation/openfoodnetwork/issues/new?assignees=&labels=&projects=&template=release.md&title=Release
+[#core-devs]: https://openfoodnetwork.slack.com/archives/GK2T38QPJ

.github/workflows/linters.yml

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

.husky/pre-commit

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

.rubocop.yml

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

.rubocop_rspec_styleguide.yml

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

.rubocop_styleguide.yml

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

.rubocop_todo.yml

@@ -1,26 +1,16 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp`
-# using RuboCop version 1.59.0.
+# using RuboCop version 1.60.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/models/spree/payment.rb'
-    - 'spec/system/admin/tag_rules_spec.rb'
-
-# Offense count: 17
+# Offense count: 16
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'lib/active_merchant/billing/gateways/stripe_payment_intents_decorator.rb'
     - 'lib/tasks/import_product_images.rake'
     - 'lib/tasks/users.rake'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
@@ -153,8 +143,8 @@ Metrics/AbcSize:
     - 'lib/tasks/enterprises.rake'
     - 'spec/services/order_checkout_restart_spec.rb'
 
-# Offense count: 44
-# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
+# Offense count: 9
+# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Exclude:
@@ -164,26 +154,6 @@ Metrics/BlockLength:
     - 'app/models/spree/shipment.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
     - 'lib/tasks/data.rake'
-    - 'spec/factories.rb'
-    - 'spec/factories/address_factory.rb'
-    - 'spec/factories/enterprise_factory.rb'
-    - 'spec/factories/line_item_factory.rb'
-    - 'spec/factories/order_cycle_factory.rb'
-    - 'spec/factories/order_factory.rb'
-    - 'spec/factories/product_factory.rb'
-    - 'spec/factories/shipment_factory.rb'
-    - 'spec/factories/shipping_method_factory.rb'
-    - 'spec/factories/subscription_factory.rb'
-    - 'spec/factories/user_factory.rb'
-    - 'spec/factories/variant_factory.rb'
-    - 'spec/requests/checkout/failed_checkout_spec.rb'
-    - 'spec/requests/checkout/stripe_sca_spec.rb'
-    - 'spec/support/cancan_helper.rb'
-    - 'spec/support/matchers/select2_matchers.rb'
-    - 'spec/support/matchers/table_matchers.rb'
-    - 'spec/system/consumer/shopping/checkout_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
-    - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: CountBlocks, Max.
@@ -445,7 +415,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/tax_rate.rb'
     - 'app/models/spree/variant.rb'
 
-# Offense count: 25
+# Offense count: 26
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -612,12 +582,11 @@ Rails/ResponseParsedBody:
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RootPathnameMethods:
   Exclude:
     - 'spec/lib/reports/orders_and_fulfillment/order_cycle_customer_totals_report_spec.rb'
-    - 'spec/models/terms_of_service_file_spec.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -790,14 +759,6 @@ Style/ClassAndModuleChildren:
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
     - 'spec/models/spree/payment_method_spec.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
-# SupportedStyles: annotated, template, unannotated
-# AllowedMethods: redirect
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -928,7 +889,12 @@ Style/PreferredHashMethods:
 Style/RedundantArgument:
   Exclude:
     - 'engines/dfc_provider/app/services/authorization_control.rb'
-    - 'spec/support/query_counter.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantAssignment:
+  Exclude:
+    - 'spec/models/database_spec.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -995,7 +961,7 @@ Style/SlicingWithRange:
     - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 28
+# Offense count: 25
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
@@ -1017,6 +983,5 @@ Style/StringConcatenation:
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/services/embedded_page_service_spec.rb'
-    - 'spec/support/api_helper.rb'
     - 'spec/support/features/datepicker_helper.rb'
     - 'spec/system/admin/products_spec.rb'

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby File.read('.ruby-version').chomp
 
-gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+gem 'dotenv', require: 'dotenv/load' # Load ENV vars before other gems
 
 gem 'rails'
 
@@ -74,7 +74,7 @@ gem 'rswag-ui'
 
 gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection'
-gem 'openid_connect', '~> 1.3'
+gem 'openid_connect'
 
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
@@ -98,9 +98,8 @@ gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
 
-gem 'hiredis'
 gem 'puma'
-gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'redis'
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
@@ -143,6 +142,8 @@ gem "private_address_check"
 
 gem 'newrelic_rpm'
 
+gem 'invisible_captcha'
+
 group :production, :staging do
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
@@ -160,6 +161,7 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry', require: false
+  gem 'rspec-sql'
   gem 'rswag'
   gem 'shoulda-matchers'
   gem 'stimulus_reflex_testing'
@@ -185,8 +187,10 @@ group :development do
   gem 'rails-erd'
   gem 'rubocop'
   gem 'rubocop-rails'
+  gem 'rubocop-rspec'
   gem 'spring'
   gem 'spring-commands-rspec'
+  gem 'spring-commands-rubocop'
   gem 'web-console'
 
   gem 'rack-mini-profiler', '< 3.0.0'

Gemfile.lock

@@ -98,11 +98,12 @@ GEM
     activejob (7.0.8)
       activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemerchant (1.123.0)
+    activemerchant (1.133.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
+      rexml (~> 3.2.5)
     activemodel (7.0.8)
       activesupport (= 7.0.8)
     activerecord (7.0.8)
@@ -135,7 +136,7 @@ GEM
       activerecord (>= 6.1, < 7.2)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
@@ -151,33 +152,34 @@ GEM
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
-    attr_required (1.0.1)
+    attr_required (1.0.2)
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.877.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.883.0)
+    aws-sdk-core (3.191.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.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)
     bigdecimal (3.0.2)
-    bindata (2.4.15)
+    bindata (2.5.0)
     bindex (0.8.1)
-    bootsnap (1.17.1)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bugsnag (6.26.2)
+    bugsnag (6.26.3)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     bullet (7.1.6)
@@ -190,11 +192,11 @@ GEM
       railties (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -220,7 +222,8 @@ GEM
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
     css_parser (1.16.0)
@@ -234,9 +237,9 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.9)
+    datafoodconsortium-connector (1.0.0.pre.alpha.10)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
-    date (3.3.3)
+    date (3.3.4)
     debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -256,10 +259,9 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.1)
     docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
+    dotenv (3.1.0)
+    email_validator (2.2.4)
+      activemodel
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -282,7 +284,7 @@ GEM
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.23.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     flipper (0.26.2)
       concurrent-ruby (< 2)
     flipper-active_record (0.26.2)
@@ -324,18 +326,18 @@ GEM
     good_migrations (0.2.1)
       activerecord (>= 3.1)
       railties (>= 3.1)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashery (2.1.2)
     hashie (5.0.0)
     highline (2.0.3)
-    hiredis (0.6.3)
     htmlentities (4.3.4)
-    httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
+      racc (~> 1.7)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
     image_processing (1.12.2)
@@ -343,6 +345,8 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     immigrant (0.3.6)
       activerecord (>= 3.0)
+    invisible_captcha (2.2.0)
+      rails (>= 5.2)
     io-console (0.7.1)
     ipaddress (0.8.3)
     irb (1.11.0)
@@ -356,16 +360,17 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (2.7.1)
-    json-canonicalization (0.4.0)
-    json-jwt (1.16.3)
+    json-canonicalization (1.0.0)
+    json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
+      base64
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json-ld (3.3.0)
+    json-ld (3.3.1)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
@@ -377,16 +382,17 @@ GEM
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.1)
+    jwt (2.8.1)
+      base64
     knapsack_pro (6.0.4)
       rake
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    letter_opener (1.8.1)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    letter_opener (1.9.0)
       launchy (>= 2.2, < 3)
     link_header (0.0.8)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.22.0)
@@ -409,8 +415,8 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
-    monetize (1.12.0)
+    minitest (5.22.2)
+    monetize (1.13.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
@@ -419,18 +425,18 @@ GEM
     multi_xml (0.6.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.2)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
-    newrelic_rpm (9.7.0)
+    newrelic_rpm (9.7.1)
     nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
@@ -439,27 +445,29 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth_openid_connect (0.6.1)
+    omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.1)
-    openid_connect (1.4.2)
+      openid_connect (~> 2.2)
+    openid_connect (2.3.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
-      net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
+      email_validator
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
+      mail
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
-      validate_email
       validate_url
-      webfinger (~> 1.2)
+      webfinger (~> 2.0)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -469,7 +477,7 @@ GEM
     parallel (1.24.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
-    parser (3.2.2.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -498,17 +506,19 @@ GEM
       railties (>= 4.2)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-oauth2 (1.21.3)
+    rack-oauth2 (2.2.1)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.6)
       rack
     rack-rewrite (1.5.1)
@@ -571,10 +581,11 @@ GEM
     rdoc (6.6.2)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis (4.8.1)
-    redis-client (0.19.1)
+    redis (5.1.0)
+      redis-client (>= 0.17.0)
+    redis-client (0.20.0)
       connection_pool
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     reline (0.4.1)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -607,7 +618,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -617,6 +628,9 @@ GEM
       rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
+    rspec-sql (0.0.1)
+      activesupport
+      rspec
     rspec-support (3.12.1)
     rswag (2.13.0)
       rswag-api (= 2.13.0)
@@ -633,24 +647,32 @@ GEM
     rswag-ui (2.13.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
-    rubocop (1.59.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
     rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -674,7 +696,7 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.1)
+    sidekiq (7.2.2)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -695,6 +717,8 @@ GEM
     spring (4.1.3)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    spring-commands-rubocop (0.4.0)
+      spring (>= 1.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -723,36 +747,34 @@ GEM
       stimulus_reflex (>= 3.3.0)
     stringex (2.8.6)
     stringio (3.1.0)
-    stripe (10.6.0)
-    swd (1.3.0)
+    stripe (10.10.0)
+    swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     temple (0.8.2)
     thor (1.3.0)
     thread-local (1.1.0)
     tilt (2.3.0)
     timecop (0.9.8)
-    timeout (0.4.0)
+    timeout (0.4.1)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     uri (0.13.0)
-    valid_email2 (5.1.1)
+    valid_email2 (5.2.1)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
     vcr (6.2.0)
-    view_component (3.10.0)
+    view_component (3.11.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -769,10 +791,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webfinger (1.2.0)
+    webfinger (2.1.3)
       activesupport
-      httpclient (>= 2.4)
-    webmock (3.19.1)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -793,7 +816,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
@@ -837,7 +860,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   digest
-  dotenv-rails
+  dotenv
   factory_bot_rails (= 6.2.0)
   faraday
   ffaker
@@ -852,11 +875,11 @@ DEPENDENCIES
   good_migrations
   haml
   highline (= 2.0.3)
-  hiredis
   i18n
   i18n-js (~> 3.9.0)
   image_processing
   immigrant
+  invisible_captcha
   jquery-rails (= 4.4.0)
   jquery-ui-rails (~> 4.2)
   json
@@ -874,7 +897,7 @@ DEPENDENCIES
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection
   omniauth_openid_connect
-  openid_connect (~> 1.3)
+  openid_connect
   order_management!
   pagy (~> 5.1)
   paper_trail
@@ -896,18 +919,20 @@ DEPENDENCIES
   rails_safe_tasks (~> 1.0)
   ransack (~> 4.1.0)
   redcarpet
-  redis (>= 4.0)
+  redis
   responders
   rexml
   roadie-rails
   roo
   rspec-rails (>= 3.5.2)
   rspec-retry
+  rspec-sql
   rswag
   rswag-api
   rswag-ui
   rubocop
   rubocop-rails
+  rubocop-rspec
   sd_notify
   select2-rails!
   shoulda-matchers
@@ -917,6 +942,7 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
+  spring-commands-rubocop
   state_machines-activerecord
   stimulus_reflex (= 3.5.0.rc3)
   stimulus_reflex_testing

README.md

@@ -32,7 +32,7 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board][welcome-qa] for some good first issues, both on manual and automated testing (RSpec/Capybara).
+If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite]. Also, do have a look in our [Welcome New QAs board][welcome-qa] for some good first issues, both on manual and automated testing (RSpec/Capybara).
 
 We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
 
@@ -53,4 +53,3 @@ Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
 [welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [welcome-qa]: https://github.com/orgs/openfoodfoundation/projects/6
-[zenhub]: https://www.zenhub.com/extension

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

@@ -1,3 +1,2 @@
-%li{ ng: { class: "{active: selector.active}" } }
-  %a{ "tooltip" => "{{selector.object.value}}", "tooltip-placement" => "bottom",
-    ng: { transclude: true, class: "{active: selector.active, 'has-tip': selector.object.value}" } }
+%li{ "ng-class": "{active: selector.active}" }
+  %a{ tooltip: "{{selector.object.value}}", "tooltip-placement": "bottom", "ng-transclude": true, "ng-class": "{active: selector.active, 'has-tip': selector.object.value}" }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-.row.pad-top{ng: { if: 'enterprise.is_distributor' } }
+.row.pad-top{ "ng-if": 'enterprise.is_distributor' }
   .cta-container.small-12.columns
     .row
       .small-4.columns

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

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

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

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

app/components/confirm_modal_component/confirm_modal_component.scss

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

app/components/modal_component.rb

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

app/components/modal_component/modal_component.html.haml

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

app/components/modal_component/modal_component.scss

@@ -3,6 +3,8 @@
   visibility: visible;
   position: fixed;
   top: 3em;
+  min-height: auto; // reset from reveal-modal
+
   &.in {
     padding: 1.2rem;
   }
@@ -16,9 +18,39 @@
   p {
     margin-bottom: 0.5em;
   }
+
+  img {
+    // Ensure image fits in container
+    max-width: 100%;
+    height: auto;
+  }
 }
 
 /* prevent arrow on selected admin menu item appearing above modal */
 body.modal-open #admin-menu li.selected a::after {
   z-index: 0;
 }
+
+.modal-actions {
+  display: flex;
+  text-align: center; // Ensure text inside fullwidth buttons are centred on small screens
+
+  &.justify-space-around {
+    justify-content: space-around;
+  }
+
+  &.justify-end {
+    justify-content: flex-end;
+    input[type="button"] {
+      margin: 0 5px;
+    }
+
+    @media only screen and (max-width: 1024px) {
+      flex-direction: column;
+      justify-content: space-around;
+      input[type="button"] {
+        margin: 5px 0;
+      }
+    }
+  }
+}

app/components/vertical_ellipsis_menu/component.scss

@@ -7,7 +7,7 @@
     text-align: center;
     border-radius: 3px;
     background-color: white;
-    padding: 10px 14px;
+    padding: 9px 14px;
   }
 
   .vertical-ellipsis-menu-content {

app/controllers/admin/customers_controller.rb

@@ -70,7 +70,7 @@ module Admin
 
     def collection
       if json_request? && params[:enterprise_id].present?
-        CustomersWithBalance.new(customers).query.
+        CustomersWithBalanceQuery.new(customers).call.
           includes(
             :enterprise,
             { bill_address: [:state, :country] },

app/controllers/admin/oidc_settings_controller.rb

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

app/controllers/admin/reports_controller.rb

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

app/controllers/api/v0/shipments_controller.rb

@@ -23,6 +23,8 @@ module Api
 
         OrderWorkflow.new(@order).advance_to_payment if @order.line_items.any?
 
+        @order.recreate_all_fees!
+
         render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
       end
 

app/controllers/api/v1/customers_controller.rb

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

app/controllers/omniauth_callbacks_controller.rb

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

app/controllers/spree/admin/images_controller.rb

@@ -36,6 +36,9 @@ module Spree
         else
           respond_with(@object)
         end
+      rescue ActiveStorage::IntegrityError
+        @object.errors.add :attachment, :integrity_error
+        respond_with(@object)
       end
 
       def update
@@ -48,6 +51,9 @@ module Spree
         else
           respond_with(@object)
         end
+      rescue ActiveStorage::IntegrityError
+        @object.errors.add :attachment, :integrity_error
+        respond_with(@object)
       end
 
       def destroy

app/controllers/spree/admin/payment_methods_controller.rb

@@ -193,7 +193,9 @@ module Spree
 
       def clear_preference_cache
         @payment_method.calculator.preferences.each_key do |key|
-          Rails.cache.delete(@payment_method.calculator.preference_cache_key(key))
+          # Only persisted models have cache keys.
+          cache_key = @payment_method.calculator.preference_cache_key(key)
+          Rails.cache.delete(cache_key) if cache_key
         end
       end
 

app/controllers/spree/admin/payments_controller.rb

@@ -59,6 +59,8 @@ module Spree
           flash[:error] = t(:cannot_perform_operation)
         end
       rescue StandardError => e
+        logger.error e.message
+        Bugsnag.notify(e)
         flash[:error] = e.message
       ensure
         redirect_to request.referer

app/controllers/spree/users_controller.rb

@@ -8,6 +8,7 @@ module Spree
 
     layout 'darkswarm'
 
+    invisible_captcha only: [:create], on_timestamp_spam: :render_alert_timestamp_error_message
     skip_before_action :set_current_order, only: :show
     prepend_before_action :load_object, only: [:show, :edit, :update]
     prepend_before_action :authorize_actions, only: :new
@@ -15,7 +16,7 @@ module Spree
     before_action :set_locale
 
     def show
-      @payments_requiring_action = PaymentsRequiringAction.new(spree_current_user).query
+      @payments_requiring_action = PaymentsRequiringActionQuery.new(spree_current_user).call
       @orders = orders_collection.includes(:line_items)
 
       customers = spree_current_user.customers
@@ -78,7 +79,7 @@ module Spree
     private
 
     def orders_collection
-      CompleteOrdersWithBalance.new(@user).query
+      CompleteOrdersWithBalanceQuery.new(@user).call
     end
 
     def load_object
@@ -101,5 +102,16 @@ module Spree
     def user_params
       ::PermittedAttributes::User.new(params).call
     end
+
+    def render_alert_timestamp_error_message
+      render cable_ready: cable_car.inner_html(
+        "#signup-feedback",
+        partial("layouts/alert",
+                locals: {
+                  type: "alert",
+                  message: InvisibleCaptcha.timestamp_error_message
+                })
+      )
+    end
   end
 end

app/helpers/shop_helper.rb

@@ -22,7 +22,7 @@ module ShopHelper
       { name: 'home', title: t(:shopping_tabs_home), show: show_home_tab?,
         default: show_home_tab? },
       { name: 'shop', title: t(:shopping_tabs_shop), show: !require_customer?,
-        default: !show_home_tab? },
+        default: !show_home_tab?, shop: true },
       { name: 'about', title: t(:shopping_tabs_about), show: true },
       { name: 'producers', title: t(:shopping_tabs_producers), show: true },
       { name: 'contact', title: t(:shopping_tabs_contact), show: true },

app/helpers/spree/admin/base_helper.rb

@@ -12,7 +12,7 @@ module Spree
                     id: "#{model}_#{method}_field")
       end
 
-      def error_message_on(object, method, _options = {})
+      def error_message_on(object, method, options = {})
         object = convert_to_model(object)
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
@@ -20,7 +20,7 @@ module Spree
           # rubocop:disable Rails/OutputSafety
           errors = obj.errors[method].map { |err| h(err) }.join('<br />').html_safe
           # rubocop:enable Rails/OutputSafety
-          content_tag(:span, errors, class: 'formError')
+          content_tag(:span, errors, class: 'formError', **options)
         else
           ''
         end

app/helpers/spree/admin/orders_helper.rb

@@ -10,6 +10,17 @@ module Spree
         links.join(' ').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),
+                         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)
+          }, icon: 'icon-plus'
+        end
+      end
+
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
       end

app/helpers/tax_helper.rb

@@ -14,9 +14,11 @@ module TaxHelper
 
   def display_line_items_taxes(line_item, display_zero: true)
     if line_item.included_tax.positive?
-      Spree::Money.new(line_item.included_tax, currency: line_item.currency)
+      tax = line_item.included_tax + enterprise_fee_adjustments(line_item).total_included_tax
+      Spree::Money.new(tax, currency: line_item.currency)
     elsif line_item.added_tax.positive?
-      Spree::Money.new(line_item.added_tax, currency: line_item.currency)
+      tax = line_item.added_tax + enterprise_fee_adjustments(line_item).total_additional_tax
+      Spree::Money.new(tax, currency: line_item.currency)
     elsif display_zero
       Spree::Money.new(0.00, currency: line_item.currency)
     end
@@ -26,4 +28,10 @@ module TaxHelper
     total = taxable.amount + taxable.additional_tax_total
     Spree::Money.new(total, currency: taxable.currency)
   end
+
+  private
+
+  def enterprise_fee_adjustments(line_item)
+    EnterpriseFeeAdjustments.new(line_item.enterprise_fee_adjustments)
+  end
 end

app/models/enterprise_fee_adjustments.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# EnterpriseFeeAdjustments represent a collection of enterprise fee adjustments
+#
+class EnterpriseFeeAdjustments
+  def initialize(adjustments)
+    @adjustments = adjustments
+  end
+
+  def total_additional_tax
+    @adjustments.sum { |enterprise_fee| enterprise_fee.additional_tax_total.to_f }
+  end
+
+  def total_included_tax
+    @adjustments.sum { |enterprise_fee| enterprise_fee.included_tax_total.to_f }
+  end
+end

app/models/invoice.rb

@@ -4,7 +4,7 @@ class Invoice < ApplicationRecord
   self.belongs_to_required_by_default = false
 
   belongs_to :order, class_name: 'Spree::Order'
-  serialize :data, Hash
+  serialize :data, Hash, coder: YAML
   before_validation :serialize_order
   after_create :cancel_previous_invoices
   default_scope { order(created_at: :desc) }

app/models/invoice/data_presenter.rb

@@ -91,6 +91,14 @@ class Invoice
       Spree::Money.new(shipment.amount + shipment.additional_tax_total, currency:)
     end
 
+    def display_line_item_tax_rate(item)
+      all_tax_adjustments.select { |a|
+        a.adjustable.type == 'Spree::LineItem' && a.adjustable.id == item.id
+      }.map(&:originator).map { |tr|
+        number_to_percentage(tr.amount * 100, precision: 1)
+      }.join(", ")
+    end
+
     def display_shipment_tax_rates
       all_eligible_adjustments.select { |a|
         a.originator.type == 'Spree::TaxRate' && a.adjustable_type == 'Spree::Shipment'

app/models/invoice/data_presenter/line_item.rb

@@ -3,21 +3,23 @@
 class Invoice
   class DataPresenter
     class LineItem < Invoice::DataPresenter::Base
-      attributes :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity,
-                 :variant_id, :unit_price_price_and_unit, :unit_presentation
+      attributes :id, :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity,
+                 :variant_id, :unit_price_price_and_unit, :unit_presentation,
+                 :enterprise_fee_additional_tax, :enterprise_fee_included_tax
       attributes_with_presenter :variant
-      array_attribute :tax_rates, class_name: 'TaxRate'
       invoice_generation_attributes :added_tax, :included_tax, :price_with_adjustments,
                                     :quantity, :variant_id
 
       delegate :name_to_display, :options_text, to: :variant
 
       def amount_with_adjustments_without_taxes
-        (price_with_adjustments * quantity) - included_tax
+        fee_tax = enterprise_fee_included_tax || 0.0
+        (price_with_adjustments * quantity) - included_tax - fee_tax
       end
 
       def amount_with_adjustments_and_with_taxes
-        ( price_with_adjustments * quantity) + added_tax
+        fee_tax = enterprise_fee_additional_tax || 0.0
+        ( price_with_adjustments * quantity) + added_tax + fee_tax
       end
 
       def display_amount_with_adjustments_without_taxes
@@ -29,21 +31,8 @@ class Invoice
       end
 
       def single_display_amount_with_adjustments
-        Spree::Money.new(price_with_adjustments - (included_tax / quantity), currency:)
-      end
-
-      def display_line_items_taxes(display_zero: true)
-        if included_tax.positive?
-          Spree::Money.new( included_tax, currency:)
-        elsif added_tax.positive?
-          Spree::Money.new( added_tax, currency:)
-        elsif display_zero
-          Spree::Money.new(0.00, currency:)
-        end
-      end
-
-      def display_line_item_tax_rates
-        tax_rates.map { |tr| number_to_percentage(tr.amount * 100, precision: 1) }.join(", ")
+        fee_tax = enterprise_fee_included_tax || 0.0
+        Spree::Money.new(price_with_adjustments - ((included_tax + fee_tax) / quantity), currency:)
       end
     end
   end

app/models/oidc_account.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class OidcAccount < ApplicationRecord
+  belongs_to :user, class_name: "Spree::User"
+
+  # When a user authenticates via token, the `uid` should be mapped to only one
+  # OFN user and therefore it needs to be unique.
+  validates :uid, presence: true, uniqueness: true
+
+  def self.link(user, auth)
+    attributes = {
+      user_id: user.id,
+      provider: auth.provider,
+      uid: auth.uid,
+      token: auth.dig(:credentials, :token),
+      refresh_token: auth.dig(:credentials, :refresh_token),
+    }
+    # This skips validations but we have database constraints in place.
+    # We may replace this at some point.
+    upsert_all([attributes], unique_by: [:user_id]) # rubocop:disable Rails/SkipsModelValidations
+  end
+end

app/models/report_rendering_options.rb

@@ -4,5 +4,5 @@ class ReportRenderingOptions < ApplicationRecord
   self.belongs_to_required_by_default = false
 
   belongs_to :user, class_name: "Spree::User"
-  serialize :options, Hash
+  serialize :options, Hash, coder: YAML
 end

app/models/spree/ability.rb

@@ -177,7 +177,7 @@ module Spree
 
       can [:admin, :create], :manager_invitation
 
-      can [:admin, :index], :oidc_setting
+      can [:admin, :index, :destroy], :oidc_setting
 
       can [:admin, :create], Voucher
     end

app/models/spree/gateway/stripe_sca.rb

@@ -4,7 +4,6 @@ require 'stripe/profile_storer'
 require 'stripe/credit_card_cloner'
 require 'stripe/authorize_response_patcher'
 require 'stripe/payment_intent_validator'
-require 'active_merchant/billing/gateways/stripe_payment_intents_decorator'
 require 'active_merchant/billing/gateways/stripe'
 
 module Spree
@@ -44,7 +43,7 @@ module Spree
         StripeAccount.find_by(enterprise_id: preferred_enterprise_id)&.stripe_user_id
       end
 
-      # NOTE: the name of this method is determined by Spree::Payment::Processing
+      # NOTE: this method is required by Spree::Payment::Processing
       def purchase(money, creditcard, gateway_options)
         begin
           payment_intent_id = fetch_payment_intent(creditcard, gateway_options)
@@ -64,7 +63,7 @@ module Spree
         provider.capture(money, payment_intent_id, options)
       end
 
-      # NOTE: the name of this method is determined by Spree::Payment::Processing
+      # NOTE: this method is required by Spree::Payment::Processing
       def charge_offline(money, creditcard, gateway_options)
         customer, payment_method =
           Stripe::CreditCardCloner.new(creditcard, stripe_account_id).find_or_clone
@@ -75,7 +74,7 @@ module Spree
         failed_activemerchant_billing_response(e.message)
       end
 
-      # NOTE: the name of this method is determined by Spree::Payment::Processing
+      # NOTE: this method is required by Spree::Payment::Processing
       def authorize(money, creditcard, gateway_options)
         authorize_response =
           provider.authorize(*options_for_authorize(money, creditcard, gateway_options))
@@ -84,26 +83,27 @@ module Spree
         failed_activemerchant_billing_response(e.message)
       end
 
-      # NOTE: the name of this method is determined by Spree::Payment::Processing
-      def void(response_code, _creditcard, gateway_options)
-        payment_intent_id = response_code
-        payment_intent_response = Stripe::PaymentIntent.retrieve(payment_intent_id,
-                                                                 stripe_account: stripe_account_id)
+      # NOTE: this method is required by Spree::Payment::Processing
+      def void(payment_intent_id, _creditcard, gateway_options)
+        payment_intent_response = Stripe::PaymentIntent.retrieve(
+          payment_intent_id, stripe_account: stripe_account_id
+        )
         gateway_options[:stripe_account] = stripe_account_id
 
         # If a payment has been confirmed it can't be voided by Stripe, and must be refunded instead
         if voidable?(payment_intent_response)
-          provider.void(response_code, gateway_options)
+          provider.void(payment_intent_id, gateway_options)
         else
-          provider.refund(refundable_amount(payment_intent_response), response_code,
-                          gateway_options)
+          provider.refund(
+            payment_intent_response.amount_received, payment_intent_id, gateway_options
+          )
         end
       end
 
-      # NOTE: the name of this method is determined by Spree::Payment::Processing
-      def credit(money, _creditcard, response_code, gateway_options)
+      # NOTE: this method is required by Spree::Payment::Processing
+      def credit(money, _creditcard, payment_intent_id, gateway_options)
         gateway_options[:stripe_account] = stripe_account_id
-        provider.refund(money, response_code, gateway_options)
+        provider.refund(money, payment_intent_id, gateway_options)
       end
 
       def create_profile(payment)
@@ -119,11 +119,6 @@ module Spree
         VOIDABLE_STATES.include? payment_intent_response.status
       end
 
-      def refundable_amount(payment_intent_response)
-        payment_intent_response.amount_received -
-          payment_intent_response.charges.data.map(&:amount_refunded).sum
-      end
-
       # In this gateway, what we call 'secret_key' is the 'login'
       def options
         options = super

app/models/spree/line_item.rb

@@ -193,6 +193,7 @@ module Spree
       adjustments.tax.additional.sum(:amount)
     end
 
+    # Some of the tax rates may not be applicable depending to the order's tax zone
     def tax_rates
       variant&.tax_category&.tax_rates || []
     end
@@ -202,7 +203,7 @@ module Spree
       # so line_item.adjustments returns an empty array
       return 0 if quantity.zero?
 
-      fees = adjustments.enterprise_fee.sum(:amount)
+      fees = enterprise_fee_adjustments.sum(:amount)
 
       (price + (fees / quantity)).round(2)
     end
@@ -241,6 +242,10 @@ module Spree
       @scoper ||= OpenFoodNetwork::ScopeVariantToHub.new(order.distributor)
     end
 
+    def enterprise_fee_adjustments
+      adjustments.enterprise_fee
+    end
+
     private
 
     def computed_weight_from_variant

app/models/spree/payment.rb

@@ -21,7 +21,8 @@ module Spree
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
     has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0").completed },
-             class_name: "Spree::Payment", foreign_key: :source_id, dependent: :restrict_with_exception
+             class_name: "Spree::Payment", foreign_key: :source_id,
+             dependent: :restrict_with_exception
     has_many :log_entries, as: :source, dependent: :destroy
 
     has_one :adjustment, as: :adjustable, dependent: :destroy

app/models/spree/preference.rb

@@ -2,8 +2,7 @@
 
 module Spree
   class Preference < ApplicationRecord
-    serialize :value
-
+    serialize :value, coder: YAML
     validates :key, presence: true
     validates :value_type, presence: true
 

app/models/spree/product.rb

@@ -287,6 +287,22 @@ module Spree
       variants << variant
     end
 
+    # Format as per WeightsAndMeasures (todo: re-orgnaise maybe after product/variant refactor)
+    def variant_unit_with_scale
+      scale_clean = ActiveSupport::NumberHelper.number_to_rounded(variant_unit_scale,
+                                                                  precision: nil,
+                                                                  strip_insignificant_zeros: true)
+      [variant_unit, scale_clean].compact_blank.join("_")
+    end
+
+    def variant_unit_with_scale=(variant_unit_with_scale)
+      values = variant_unit_with_scale.split("_")
+      assign_attributes(
+        variant_unit: values[0],
+        variant_unit_scale: values[1] || nil
+      )
+    end
+
     private
 
     def update_units

app/models/spree/user.rb

@@ -42,6 +42,7 @@ module Spree
     has_many :credit_cards, dependent: :destroy
     has_many :report_rendering_options, class_name: "::ReportRenderingOptions", dependent: :destroy
     has_many :webhook_endpoints, dependent: :destroy
+    has_one :oidc_account, dependent: :destroy
 
     accepts_nested_attributes_for :enterprise_roles, allow_destroy: true
     accepts_nested_attributes_for :webhook_endpoints
@@ -51,11 +52,6 @@ module Spree
 
     validates :email, 'valid_email_2/email': { mx: true }, if: :email_changed?
     validate :limit_owned_enterprises
-    validates :uid, uniqueness: true, if: lambda { uid.present? }
-
-    # Same validation as in the openid_connect gem.
-    # This validator is totally outdated but we indirectly depend on it.
-    validates :uid, email: true, if: lambda { uid.present? }
 
     class DestroyWithOrdersError < StandardError; end
 
@@ -63,10 +59,6 @@ module Spree
       User.admin.count > 0
     end
 
-    def link_from_omniauth(auth)
-      update!(provider: auth.provider, uid: auth.uid)
-    end
-
     # Whether a user has a role or not.
     def has_spree_role?(role_in_question)
       spree_roles.where(name: role_in_question.to_s).any?

app/models/spree/variant.rb

@@ -69,7 +69,7 @@ module Spree
       %w(weight volume).include?(variant.product&.variant_unit)
     }
 
-    validates :unit_value, numericality: { greater_than: 0 }
+    validates :unit_value, numericality: { greater_than: 0 }, allow_blank: true
     validates :price, numericality: { greater_than_or_equal_to: 0 }
 
     validates :unit_description, presence: true, if: ->(variant) {

app/queries/complete_orders_with_balance_query.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Fetches complete orders of the specified user including their balance as a computed column
-class CompleteOrdersWithBalance
+class CompleteOrdersWithBalanceQuery
   def initialize(user)
     @user = user
   end
 
-  def query
-    OutstandingBalance.new(sorted_finalized_orders).query
+  def call
+    OutstandingBalanceQuery.new(sorted_finalized_orders).call
   end
 
   private

app/queries/complete_visible_orders_query.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-class CompleteVisibleOrders
+class CompleteVisibleOrdersQuery
   def initialize(order_permissions)
     @order_permissions = order_permissions
   end
 
-  def query
+  def call
     order_permissions.visible_orders.complete
   end
 

app/queries/customers_with_balance_query.rb

@@ -2,12 +2,12 @@
 
 # Adds an aggregated 'balance_value' to each customer based on their order history
 #
-class CustomersWithBalance
+class CustomersWithBalanceQuery
   def initialize(customers)
     @customers = customers
   end
 
-  def query
+  def call
     @customers.
       joins(left_join_complete_orders).
       group("customers.id").
@@ -20,7 +20,7 @@ class CustomersWithBalance
   # The resulting orders are in states that belong after the checkout. Only these can be considered
   # for a customer's balance.
   def left_join_complete_orders
-    <<~SQL
+    <<~SQL.squish
       LEFT JOIN spree_orders ON spree_orders.customer_id = customers.id
         AND #{finalized_states.to_sql}
     SQL
@@ -32,6 +32,6 @@ class CustomersWithBalance
   end
 
   def outstanding_balance_sum
-    "SUM(#{OutstandingBalance.new.statement})::float"
+    "SUM(#{OutstandingBalanceQuery.new.statement})::float"
   end
 end

app/queries/outstanding_balance_query.rb

@@ -7,11 +7,11 @@
 # Alternatively, you can get the SQL by calling #statement, which is suitable for more complex
 # cases.
 #
-# See CompleteOrdersWithBalance or CustomersWithBalance as examples.
+# See CompleteOrdersWithBalanceQuery or CustomersWithBalanceQuery as examples.
 #
 # Note this query object and `app/models/concerns/balance.rb` should implement the same behavior
 # until we find a better way. If you change one, please, change the other too.
-class OutstandingBalance
+class OutstandingBalanceQuery
   # All the states of a finished order but that shouldn't count towards the balance (the customer
   # didn't get the order for whatever reason). Note it does not include complete
   FINALIZED_NON_SUCCESSFUL_STATES = %w(canceled returned).freeze
@@ -22,14 +22,14 @@ class OutstandingBalance
     @relation = relation
   end
 
-  def query
+  def call
     relation.select("#{statement} AS balance_value")
   end
 
   # Arel doesn't support CASE statements until v7.1.0 so we'll have to wait with SQL literals
   # a little longer. See https://github.com/rails/arel/pull/400 for details.
   def statement
-    <<~SQL
+    <<~SQL.squish
       CASE WHEN "spree_orders"."state" IN #{non_fulfilled_states_group.to_sql} THEN "spree_orders"."payment_total"
            WHEN "spree_orders"."state" IS NOT NULL THEN "spree_orders"."payment_total" - "spree_orders"."total"
       ELSE 0 END

app/queries/payments_requiring_action_query.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-class PaymentsRequiringAction
+class PaymentsRequiringActionQuery
   def initialize(user)
     @user = user
   end
 
-  def query
-    Spree::Payment.joins(:order).where("spree_orders.user_id = ?", user.id).
+  def call
+    Spree::Payment.joins(:order).where(spree_orders: { user_id: user.id }).
       requires_authorization
   end
 

app/reflexes/products_reflex.rb

@@ -77,10 +77,13 @@ class ProductsReflex < ApplicationReflex
   def edit_image
     id = current_id_from_element(element)
     product = product_finder(id).find_product
+    image = product.image
+
+    image = Spree::Image.new(viewable: product) if product.image.blank?
 
     morph "#modal-component",
           render(partial: "admin/products_v3/edit_image",
-                 locals: { product:, image: product.image, return_url: url })
+                 locals: { product:, image:, return_url: url })
   end
 
   private

app/serializers/api/admin/customer_with_balance_serializer.rb

@@ -3,8 +3,8 @@
 module Api
   module Admin
     # This serializer relies on `object` to respond to `#balance_value`. That's done in
-    # `CustomersWithBalance` due to the fact that ActiveRecord maps the DB result set's columns to
-    # instance methods. This way, the `balance_value` alias on that class ends up being
+    # `CustomersWithBalanceQuery` due to the fact that ActiveRecord maps the DB result set's
+    # columns to instance methods. This way, the `balance_value` alias on that class ends up being
     # `object.balance_value` here.
     class CustomerWithBalanceSerializer < CustomerSerializer
       attributes :balance, :balance_status

app/serializers/api/order_serializer.rb

@@ -9,8 +9,8 @@ module Api
 
     has_many :payments, serializer: Api::PaymentSerializer
 
-    # This method relies on `balance_value` as a computed DB column. See `CompleteOrdersWithBalance`
-    # for reference.
+    # This method relies on `balance_value` as a computed DB column.
+    # See `CompleteOrdersWithBalanceQuery` for reference.
     def outstanding_balance
       -object.balance_value
     end

app/serializers/invoice/line_item_serializer.rb

@@ -3,8 +3,16 @@
 class Invoice
   class LineItemSerializer < ActiveModel::Serializer
     attributes :id, :added_tax, :currency, :included_tax, :price_with_adjustments, :quantity,
-               :variant_id, :unit_price_price_and_unit, :unit_presentation
+               :variant_id, :unit_price_price_and_unit, :unit_presentation,
+               :enterprise_fee_additional_tax, :enterprise_fee_included_tax
     has_one :variant, serializer: Invoice::VariantSerializer
-    has_many :tax_rates, serializer: Invoice::TaxRateSerializer
+
+    def enterprise_fee_additional_tax
+      EnterpriseFeeAdjustments.new(object.enterprise_fee_adjustments).total_additional_tax
+    end
+
+    def enterprise_fee_included_tax
+      EnterpriseFeeAdjustments.new(object.enterprise_fee_adjustments).total_included_tax
+    end
   end
 end

app/services/permitted_attributes/product.rb

@@ -5,7 +5,8 @@ module PermittedAttributes
     def self.attributes
       [
         :id, :name, :description, :supplier_id, :price,
-        :variant_unit, :variant_unit_scale, :unit_value, :unit_description, :variant_unit_name,
+        :variant_unit, :variant_unit_scale, :variant_unit_with_scale, :unit_value,
+        :unit_description, :variant_unit_name,
         :display_as, :sku, :group_buy, :group_buy_unit_size,
         :taxon_ids, :primary_taxon_id, :tax_category_id,
         :meta_keywords, :notes, :inherits_properties,

app/services/weights_and_measures.rb

@@ -20,6 +20,44 @@ class WeightsAndMeasures
     scales[product_scale.to_f]['system']
   end
 
+  # @returns enumerable with label and value for select
+  def self.variant_unit_options
+    available_units_sorted.flat_map do |measurement, measurement_info|
+      measurement_info.filter_map do |scale, unit_info|
+        scale_clean =
+          ActiveSupport::NumberHelper.number_to_rounded(scale, precision: nil,
+                                                               strip_insignificant_zeros: true)
+        [
+          "#{I18n.t(measurement)} (#{unit_info['name']})", # Label (eg "Weight (g)")
+          "#{measurement}_#{scale_clean}", # Scale ID (eg "weight_1")
+        ]
+      end
+    end <<
+      [
+        I18n.t('items'),
+        'items'
+      ]
+  end
+
+  def self.available_units
+    Spree::Config.available_units.split(",")
+  end
+
+  def self.available_units_sorted
+    self::UNITS.transform_values do |measurement_info|
+      # Filter to only include available units
+      measurement_info.filter do |_scale, unit_info|
+        available_units.include?(unit_info['name'])
+      end.
+        # Remove duplicates by name
+        uniq do |_scale, unit_info|
+        unit_info['name']
+      end.
+        # Sort by unit number
+        sort.to_h
+    end
+  end
+
   private
 
   UNITS = {
@@ -29,10 +67,10 @@ class WeightsAndMeasures
       1000.0 => { 'name' => 'kg', 'system' => 'metric' },
       1_000_000.0 => { 'name' => 'T', 'system' => 'metric' },
 
-      28.349523125 => { 'name' => 'oz', 'system' => 'imperial' },
       28.35 => { 'name' => 'oz', 'system' => 'imperial' },
-      453.59237 => { 'name' => 'lb', 'system' => 'imperial' },
+      28.349523125 => { 'name' => 'oz', 'system' => 'imperial' },
       453.6 => { 'name' => 'lb', 'system' => 'imperial' },
+      453.59237 => { 'name' => 'lb', 'system' => 'imperial' },
     },
     'volume' => {
       0.001 => { 'name' => 'mL', 'system' => 'metric' },
@@ -49,7 +87,7 @@ class WeightsAndMeasures
     return @units[@variant.product.variant_unit] if ignore_available_units
 
     @units[@variant.product.variant_unit]&.reject { |_scale, unit_info|
-      available_units.exclude?(unit_info['name'])
+      self.class.available_units.exclude?(unit_info['name'])
     }
   end
 
@@ -67,8 +105,4 @@ class WeightsAndMeasures
 
     largest_unit
   end
-
-  def available_units
-    Spree::Config.available_units.split(",")
-  end
 end

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

@@ -14,22 +14,22 @@
 = admin_inject_shops(@shops, module: 'admin.customers')
 = admin_inject_available_countries(module: 'admin.customers')
 
-%div{ ng: { controller: 'customersCtrl' } }
+%div{ "ng-controller": 'customersCtrl' }
   .row.filters
     .sixteen.columns.alpha.omega
       .filter_select.five.columns.alpha
-        %label{ :for => 'quick_search', ng: {class: '{disabled: !shop_id}'} }=t('admin.quick_search')
+        %label{ for: 'quick_search', "ng-class": '{disabled: !shop_id}' }=t('admin.quick_search')
         %br
-        %input.fullwidth{ :type => "text", :id => 'quick_search', ng: { model: 'quickSearch', disabled: '!shop_id' }, :placeholder => t('.search_by_email') }
+        %input.fullwidth{ type: "text", id: 'quick_search', placeholder: t('.search_by_email'), "ng-model": 'quickSearch', "ng-disabled": '!shop_id' }
       .filter_select.four.columns
-        %label{ :for => 'hub_id', ng: { bind: "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" } }
+        %label{ for: 'hub_id', "ng-bind": "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" }
         %br
-        %input.ofn-select2.fullwidth#shop_id{ 'ng-model' => 'shop_id', name: 'shop_id', data: 'shops', on: { selecting: 'confirmRefresh' } }
+        %input.ofn-select2.fullwidth#shop_id{ "ng-model": 'shop_id', name: 'shop_id', data: 'shops', "on-selecting": 'confirmRefresh' }
       .seven.columns.omega  
 
-  %hr.divider{ ng: { show: "!RequestMonitor.loading && filteredCustomers.length > 0" } }
+  %hr.divider{ "ng-show": "!RequestMonitor.loading && filteredCustomers.length > 0" }
 
-  .row.controls{ ng: { show: "!RequestMonitor.loading && filteredCustomers.length > 0" } }
+  .row.controls{ "ng-show": "!RequestMonitor.loading && filteredCustomers.length > 0" }
     .thirteen.columns.alpha  
     %columns-dropdown{ action: "#{controller_name}_#{action_name}" }
 
@@ -39,13 +39,13 @@
       %h1
         = t :loading_customers
 
-  .row.margin-bottom-50{ ng: { show: "!RequestMonitor.loading" } }
+  .row.margin-bottom-50{ "ng-show": "!RequestMonitor.loading" }
     %form{ name: "customers_form" }
       %h1#no_results{ 'ng-show' => '!RequestMonitor.loading && filteredCustomers.length == 0' }
         =t :no_customers_found
 
       %save-bar{ dirty: "customers_form.$dirty", persist: "false" }
-        %input.red{ type: "button", value: t(:save_changes), ng: { click: "submitAll(customers_form)" } }
+        %input.red{ type: "button", value: t(:save_changes), "ng-click": "submitAll(customers_form)" }
 
       %table.index#customers{ 'ng-show' => '!RequestMonitor.loading && filteredCustomers.length > 0' }
         %col.email{ width: "20%", 'ng-show' => 'columns.email.visible' }
@@ -58,7 +58,7 @@
         %col.balance{ width: "10%", 'ng-show' => 'columns.balance.visible' }
         %col.actions{ width: "10%"}
         %thead
-          %tr{ ng: { controller: "ColumnsCtrl" } }
+          %tr{ "ng-controller": "ColumnsCtrl" }
             -# %th.bulk
               -# %input{ :type => "checkbox", :name => 'toggle_bulk', 'ng-click' => 'toggleAllCheckboxes()', 'ng-checked' => "allBoxesChecked()" }
             %th.email{ 'ng-show' => 'columns.email.visible' }
@@ -81,12 +81,12 @@
               %span{ 'ng-bind' => '::customer.email' }
               %span.guest-label{ 'ng-show' => 'customer.user_id == null' }= t('.guest_label')
             %td.first_name{ 'ng-show' => 'columns.first_name.visible'}
-              %input{ type: 'text', name: 'first_name', ng: { model: 'customer.first_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'first_name'}
+              %input{ type: 'text', name: 'first_name', "obj-for-update": 'customer', "attr-for-update": 'first_name', "ng-model": 'customer.first_name' }
             %td.last_name{ 'ng-show' => 'columns.last_name.visible'}
-              %input{ type: 'text', name: 'last_name', ng: { model: 'customer.last_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'last_name'}
+              %input{ type: 'text', name: 'last_name', "obj-for-update": 'customer', "attr-for-update": 'last_name', "ng-model": 'customer.last_name' }
             %td.code{ 'ng-show' => 'columns.code.visible' }
-              %input{ type: 'text', name: 'code', ng: {model: 'customer.code', change: 'checkForDuplicateCodes()'}, "obj-for-update" => "customer", "attr-for-update" => "code" }
-              %i.icon-warning-sign{ ng: {if: 'duplicate'} }
+              %input{ type: 'text', name: 'code', "obj-for-update": "customer", "attr-for-update": "code", "ng-model": 'customer.code', "ng-change": 'checkForDuplicateCodes()' }
+              %i.icon-warning-sign{ "ng-if": 'duplicate' }
                 = t('.duplicate_code')
             %td.tags{ 'ng-show' => 'columns.tags.visible' }
               .tag_watcher{ 'obj-for-update' => "customer", "attr-for-update" => "tag_list"}
@@ -101,6 +101,6 @@
             %td.actions
               %a{ 'ng-click' => "deleteCustomer(customer)", :class => "delete-customer icon-trash no-text" }
 
-      %div.text-center{ ng: { show: "filteredCustomers.length > customerLimit" } }
-        %input{ type: 'button', value: t(:show_more), ng: { click: 'customerLimit = customerLimit + 20' } }
-        %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), ng: { click: 'customerLimit = filteredCustomers.length' } }
+      %div.text-center{ "ng-show": "filteredCustomers.length > customerLimit" }
+        %input{ type: 'button', value: t(:show_more), "ng-click": 'customerLimit = customerLimit + 20' }
+        %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), "ng-click": 'customerLimit = filteredCustomers.length' }

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

@@ -29,20 +29,20 @@
         %th.actions
     %tbody
       = enterprise_fee_set_form.ng_fields_for :collection do |f|
-        %tr{ ng: { repeat: 'enterprise_fee in enterprise_fees | filter:query' } }
+        %tr{ "ng-repeat": 'enterprise_fee in enterprise_fees | filter:query' }
           %td
             = f.ng_hidden_field :id
-            %ofn-select{ :id => angular_id(:enterprise_id), data: 'enterprises', ng: { model: 'enterprise_fee.enterprise_id' }, style: "width: 90%" }
-            %input{ type: "hidden", name: angular_name(:enterprise_id), ng: { value: "enterprise_fee.enterprise_id" } }
+            %ofn-select{ id: angular_id(:enterprise_id), data: 'enterprises', style: "width: 90%", "ng-model": 'enterprise_fee.enterprise_id' }
+            %input{ type: "hidden", name: angular_name(:enterprise_id), "ng-value": "enterprise_fee.enterprise_id" }
           %td= f.ng_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.ng_text_field :name, { placeholder: t('.name_placeholder') }
           %td
-            %ofn-select{ :id => angular_id(:tax_category_id), data: 'tax_categories', include_blank: true, ng: { model: 'enterprise_fee.tax_category_id' } }
+            %ofn-select{ id: angular_id(:tax_category_id), data: 'tax_categories', include_blank: true, "ng-model": 'enterprise_fee.tax_category_id' }
             %input{ type: "hidden", name: angular_name(:tax_category_id), 'watch-tax-category' => true }
-            %input{ type: "hidden", name: angular_name(:inherits_tax_category), ng: { value: "enterprise_fee.inherits_tax_category" } }
+            %input{ type: "hidden", name: angular_name(:inherits_tax_category), "ng-value": "enterprise_fee.inherits_tax_category" }
           %td
-            %ofn-select.calculator_type{ :id => angular_id(:calculator_type), ng: { model: 'enterprise_fee.calculator_type' }, value_attr: 'name', text_attr: 'description', data: 'calculators', 'spree-ensure-calculator-preferences-match-type' => true }
-            %input{ type: "hidden", name: angular_name(:calculator_type), ng: { value: "enterprise_fee.calculator_type" } }
+            %ofn-select.calculator_type{ id: angular_id(:calculator_type), value_attr: 'name', text_attr: 'description', data: 'calculators', "spree-ensure-calculator-preferences-match-type": true, "ng-model": 'enterprise_fee.calculator_type' }
+            %input{ type: "hidden", name: angular_name(:calculator_type), "ng-value": "enterprise_fee.calculator_type" }
           %td{'ng-bind-html-unsafe-compiled' => 'enterprise_fee.calculator_settings'}
           %td.actions{'spree-delete-resource' => "1"}
 

app/views/admin/enterprise_groups/_form.html.haml

@@ -1,7 +1,7 @@
 = render 'spree/shared/error_messages', target: @enterprise
 
 = form_for [main_app, :admin, @enterprise_group] do |f|
-  .row{ ng: {app: 'admin.enterprise_groups', controller: 'enterpriseGroupCtrl'}, data: { controller: 'tabs-and-panels', "tabs-and-panels-class-name-value": "selected" } }
+  .row{ data: { controller: 'tabs-and-panels', "tabs-and-panels-class-name-value": "selected" }, "ng-app": 'admin.enterprise_groups', "ng-controller": 'enterpriseGroupCtrl' }
     .sixteen.columns.alpha
       .four.columns.alpha
         = render 'admin/shared/side_menu'

app/views/admin/enterprise_relationships/_form.html.haml

@@ -8,7 +8,7 @@
     %select.select2.fullwidth{id: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"}
   %td
     %label
-      %input{type: "checkbox", ng: {checked: "allPermissionsChecked()", click: "checkAllPermissions()"}}
+      %input{ type: "checkbox", "ng-checked": "allPermissionsChecked()", "ng-click": "checkAllPermissions()" }
         = t 'admin_enterprise_relationships_everything'
     %div{"ng-repeat" => "permission in EnterpriseRelationships.all_permissions"}
       %label

app/views/admin/enterprise_relationships/_search_input.html.haml

@@ -1,5 +1,5 @@
 %input.search{"ng-model" => "query", "placeholder" => t(:admin_enterprise_relationships_seach_placeholder)}
 
-%label{ng: {repeat: "permission in EnterpriseRelationships.all_permissions"}}
-  %input{type: "checkbox", ng: {click: "$parent.query = toggleKeyword($parent.query, permission)"}}
+%label{ "ng-repeat": "permission in EnterpriseRelationships.all_permissions" }
+  %input{ type: "checkbox", "ng-click": "$parent.query = toggleKeyword($parent.query, permission)" }
   {{ EnterpriseRelationships.permission_presentation(permission) }}

app/views/admin/enterprises/_change_type_form.html.haml

@@ -3,13 +3,13 @@
 = form_for @enterprise, url: main_app.register_admin_enterprise_path(@enterprise),
   html: { name: "change_type", id: "change_type", novalidate: true, "ng-app" => "admin.enterprises", "ng-controller"=> 'changeTypeFormCtrl' } do |change_type_form|
   -# Have to use hidden:'true' on this input rather than type:'hidden' as the latter seems to break ngPattern and therefore validation
-  %input{ hidden: "true", name: "sells", ng: { required: true, pattern: "/^(none|own|any)$/", model: 'sells', value: "sells"} }
+  %input{ hidden: "true", name: "sells", "ng-required": true, "ng-pattern": "/^(none|own|any)$/", "ng-model": 'sells', "ng-value": "sells" }
 
   .row
     .options.container
       - if @enterprise.is_primary_producer
         .basic_producer.option.six.columns.alpha
-          %a.full-width.button.selector{ ng: { click: "sells='none'", class: "{selected: sells=='none'}" } }
+          %a.full-width.button.selector{ "ng-click": "sells='none'", "ng-class": "{selected: sells=='none'}" }
             .top
               %h3= t('.producer_profile')
               %p= t('.connect_ofn')
@@ -18,7 +18,7 @@
             = t('.producer_description_text')
 
         .producer_shop.option.six.columns
-          %a.full-width.button.selector{ ng: { click: "sells='own'", class: "{selected: sells=='own'}" } }
+          %a.full-width.button.selector{ "ng-click": "sells='own'", "ng-class": "{selected: sells=='own'}" }
             .top
               %h3= t('.producer_shop')
               %p= t('.sell_your_produce')
@@ -29,7 +29,7 @@
             = t('.producer_shop_description_text2')
 
         .full_hub.option.six.columns.omega
-          %a.full-width.button.selector{ ng: { click: "sells='any'", class: "{selected: sells=='any'}" } }
+          %a.full-width.button.selector{ "ng-click": "sells='any'", "ng-class": "{selected: sells=='any'}" }
             .top
               %h3= t('.producer_hub')
               %p= t('.producer_hub_text')
@@ -40,7 +40,7 @@
         .two.columns.alpha
            
         .shop_profile.option.six.columns
-          %a.full-width.button.selector{ ng: { click: "sells='none'", class: "{selected: sells=='none'}" } }
+          %a.full-width.button.selector{ "ng-click": "sells='none'", "ng-class": "{selected: sells=='none'}" }
             .top
               %h3= t('.profile')
               %p= t('.get_listing')
@@ -49,7 +49,7 @@
             = t('.profile_description_text')
 
         .full_hub.option.six.columns
-          %a.full-width.button.selector{ ng: { click: "sells='any'", class: "{selected: sells=='any'}" } }
+          %a.full-width.button.selector{ "ng-click": "sells='any'", "ng-class": "{selected: sells=='any'}" }
             .top
               %h3= t('.hub_shop')
               %p= t('.hub_shop_text')
@@ -60,11 +60,11 @@
 
   .row
     .sixteen.columns.alpha
-      %span.error{ ng: { show: "(change_type.sells.$error.required || change_type.sells.$error.pattern) && submitted" } }
+      %span.error{ "ng-show": "(change_type.sells.$error.required || change_type.sells.$error.pattern) && submitted" }
         = t('.choose_option')
       - if @enterprise.sells == 'unspecified'
-        %input.button.big{ type: 'submit', value: t(:select_continue), ng: { click: "submit(change_type)" } }
+        %input.button.big{ type: 'submit', value: t(:select_continue), "ng-click": "submit(change_type)" }
       - else
-        %input.button.big{ type: 'submit', value: t('.change_now'), ng: { click: "submit(change_type)" } }
+        %input.button.big{ type: 'submit', value: t('.change_now'), "ng-click": "submit(change_type)" }
       %br  
       %hr

app/views/admin/enterprises/_enterprise_user_index.html.haml

@@ -1,4 +1,4 @@
-%div{ ng: { controller: 'enterprisesCtrl' } }
+%div{ "ng-controller": 'enterprisesCtrl' }
   .row{ 'ng-hide' => '!loaded' }
     .controls{ :class => "sixteen columns alpha", :style => "margin-bottom: 15px;" }
       .four.columns.alpha
@@ -15,32 +15,32 @@
   .row{ :class => "sixteen columns alpha", 'ng-show' => 'loaded && filteredEnterprises.length == 0'}
     %h1#no_results= t('.no_enterprises_found')
 
-  .row{ ng: { show: "loaded && filteredEnterprises.length > 0" } }
+  .row{ "ng-show": "loaded && filteredEnterprises.length > 0" }
     %table.index#enterprises
-      %col.name{ width: "28%", ng: { show: 'columns.name.visible' } }
-      %col.producer{ width: "18%", ng: { show: 'columns.producer.visible' }}
-      %col.package{ width: "18%", ng: { show: 'columns.package.visible' }}
-      %col.status{ width: "18%", ng: { show: 'columns.status.visible' }}
-      %col.manage{ width: "18%", ng: { show: 'columns.manage.visible' }}
+      %col.name{ width: "28%", "ng-show": 'columns.name.visible' }
+      %col.producer{ width: "18%", "ng-show": 'columns.producer.visible' }
+      %col.package{ width: "18%", "ng-show": 'columns.package.visible' }
+      %col.status{ width: "18%", "ng-show": 'columns.status.visible' }
+      %col.manage{ width: "18%", "ng-show": 'columns.manage.visible' }
       %thead
-        %tr{ ng: { controller: "ColumnsCtrl" } }
-          %th.name{ ng: { show: 'columns.name.visible' } }=t('admin.name')
-          %th.producer{ ng: { show: 'columns.producer.visible' } }=t('.producer?')
-          %th.package{ ng: { show: 'columns.package.visible' } }=t('.package')
-          %th.status{ ng: { show: 'columns.status.visible' } }=t('.status')
-          %th.manage{ ng: { show: 'columns.manage.visible' } }=t('.manage')
-      %tbody.panel-ctrl{ :id => "e_{{enterprise.id}}", object: "enterprise", ng: { repeat: "enterprise in filteredEnterprises = ( allEnterprises | filter:{ name: quickSearch } )" } }
-        %tr.enterprise{ ng: { class: { even: "'even'", odd: "'odd'"} } }
-          %td.name{ ng: { show: 'columns.name.visible' } }
-            %span{ ng: { bind: "::enterprise.name" } }
-          %td.producer.panel-toggle.text-center{ ng: { show: 'columns.producer.visible', class: "{error: enterprise.producerError}" }, name: "producer" }
-            %h5{ ng: { bind: "enterprise.producer" } }
-          %td.package.panel-toggle.text-center{ ng: { show: 'columns.package.visible', class: "{error: enterprise.packageError}" }, name: "package" }
-            %h5{ ng: { bind: "enterprise.package" } }
-          %td.status.panel-toggle.text-center{ ng: { show: 'columns.status.visible' }, name: "status" }
-            %i.icon-status{ ng: { class: "enterprise.status" } }
-          %td.manage{ ng: { show: 'columns.manage.visible' } }
-            %a.button.fullwidth{ ng: { href: '{{::enterprise.edit_path}}' } }
+        %tr{ "ng-controller": "ColumnsCtrl" }
+          %th.name{ "ng-show": 'columns.name.visible' }=t('admin.name')
+          %th.producer{ "ng-show": 'columns.producer.visible' }=t('.producer?')
+          %th.package{ "ng-show": 'columns.package.visible' }=t('.package')
+          %th.status{ "ng-show": 'columns.status.visible' }=t('.status')
+          %th.manage{ "ng-show": 'columns.manage.visible' }=t('.manage')
+      %tbody.panel-ctrl{ id: "e_{{enterprise.id}}", object: "enterprise", "ng-repeat": "enterprise in filteredEnterprises = ( allEnterprises | filter:{ name: quickSearch } )" }
+        %tr.enterprise{ "ng-class-even": "'even'", "ng-class-odd": "'odd'" }
+          %td.name{ "ng-show": 'columns.name.visible' }
+            %span{ "ng-bind": "::enterprise.name" }
+          %td.producer.panel-toggle.text-center{ name: "producer", "ng-show": 'columns.producer.visible', "ng-class": "{error: enterprise.producerError}" }
+            %h5{ "ng-bind": "enterprise.producer" }
+          %td.package.panel-toggle.text-center{ name: "package", "ng-show": 'columns.package.visible', "ng-class": "{error: enterprise.packageError}" }
+            %h5{ "ng-bind": "enterprise.package" }
+          %td.status.panel-toggle.text-center{ name: "status", "ng-show": 'columns.status.visible' }
+            %i.icon-status{ "ng-class": "enterprise.status" }
+          %td.manage{ "ng-show": 'columns.manage.visible' }
+            %a.button.fullwidth{ "ng-href": '{{::enterprise.edit_path}}' }
               = t('.manage_link')
               %i.icon-arrow-right
 

app/views/admin/enterprises/_ng_form.html.haml

@@ -8,8 +8,8 @@
   "ng-cloak" => true } do |f|
 
   %save-bar{ dirty: "enterprise_form.$dirty", persist: "true" }
-    %input.red{ type: "button", value: t(:update), ng: { click: "submit()", disabled: "!enterprise_form.$dirty" } }
-    %input{ type: "button", ng: { value: "enterprise_form.$dirty ? '#{t(:cancel)}' : '#{t(:close)}'", click: "cancel('#{main_app.admin_enterprises_path}')" } }
+    %input.red{ type: "button", value: t(:update), "ng-click": "submit()", "ng-disabled": "!enterprise_form.$dirty" }
+    %input{ type: "button", "ng-value": "enterprise_form.$dirty ? '#{t(:cancel)}' : '#{t(:close)}'", "ng-click": "cancel('#{main_app.admin_enterprises_path}')" }
 
   .row{ data: { 
     controller: "tabs-and-panels", "tabs-and-panels-class-name-value": "selected" }}

app/views/admin/enterprises/form/_images.html.haml

@@ -4,10 +4,10 @@
     %br
     = t('.logo_size')
   .omega.eight.columns
-    %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.logo.thumb }}', if: 'Enterprise.logo' } }
+    %img{ class: 'image-field-group__preview-image', "ng-src": '{{ Enterprise.logo.thumb }}', "ng-if": 'Enterprise.logo' }
     %br
     = f.file_field :logo
-    %a.button.red{ href: '', ng: {click: 'removeLogo()', if: 'Enterprise.logo'} }
+    %a.button.red{ href: '', "ng-click": 'removeLogo()', "ng-if": 'Enterprise.logo' }
       = t('.remove_logo')
 
 .row.page-admin-enterprises-form__promo-image-field-group.image-field-group
@@ -21,7 +21,7 @@
     = t('.promo_image_note3')
 
   .omega.eight.columns
-    %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.promo_image.large }}', if: 'Enterprise.promo_image' } }
+    %img{ class: 'image-field-group__preview-image', "ng-src": '{{ Enterprise.promo_image.large }}', "ng-if": 'Enterprise.promo_image' }
     = f.file_field :promo_image
-    %a.button.red{ href: '', ng: {click: 'removePromoImage()', if: 'Enterprise.promo_image'} }
+    %a.button.red{ href: '', "ng-click": 'removePromoImage()', "ng-if": 'Enterprise.promo_image' }
       = t('.remove_promo_image')

app/views/admin/enterprises/form/_shop_preferences.html.haml

@@ -23,17 +23,13 @@
     = radio_button :enterprise, :preferred_shopfront_product_sorting_method, :by_category, { 'ng-model' => 'Enterprise.preferred_shopfront_product_sorting_method' }
     = label :enterprise, :preferred_shopfront_product_sorting_method_by_category, t('.shopfront_sort_by_category')
   .eight.columns.omega
-    %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_taxon_order', name: 'enterprise[preferred_shopfront_taxon_order]', rows: 6,
-      'ofn-taxon-autocomplete' => '', 'multiple-selection' => 'true', placeholder: t('.shopfront_sort_by_category_placeholder'),
-      ng: { model: 'Enterprise.preferred_shopfront_taxon_order', readonly: "Enterprise.preferred_shopfront_product_sorting_method != 'by_category'" }}
+    %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_taxon_order', name: 'enterprise[preferred_shopfront_taxon_order]', rows: 6, "ofn-taxon-autocomplete": '', "multiple-selection": 'true', placeholder: t('.shopfront_sort_by_category_placeholder'), "ng-model": 'Enterprise.preferred_shopfront_taxon_order', "ng-readonly": "Enterprise.preferred_shopfront_product_sorting_method != 'by_category'" }
 .row
   .three.columns.alpha
     = radio_button :enterprise, :preferred_shopfront_product_sorting_method, :by_producer, { 'ng-model' => 'Enterprise.preferred_shopfront_product_sorting_method' }
     = label :enterprise, :preferred_shopfront_product_sorting_method_by_producer, t('.shopfront_sort_by_producer')
   .eight.columns.omega
-    %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_producer_order', name: 'enterprise[preferred_shopfront_producer_order]', rows: 6,
-      'ofn-producer-autocomplete' => '', 'multiple-selection' => 'true', placeholder: t('.shopfront_sort_by_producer_placeholder'),
-      ng: { model: 'Enterprise.preferred_shopfront_producer_order', readonly: "Enterprise.preferred_shopfront_product_sorting_method != 'by_producer'" }}
+    %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_producer_order', name: 'enterprise[preferred_shopfront_producer_order]', rows: 6, "ofn-producer-autocomplete": '', "multiple-selection": 'true', placeholder: t('.shopfront_sort_by_producer_placeholder'), "ng-model": 'Enterprise.preferred_shopfront_producer_order', "ng-readonly": "Enterprise.preferred_shopfront_product_sorting_method != 'by_producer'" }
 
 .row
   .three.columns.alpha
@@ -56,7 +52,7 @@
     = f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true"
     = f.label :require_login, t('.shopfront_requires_login_true'), value: :true
 
-.row{ng: {if: "!Enterprise.require_login"}}
+.row{ "ng-if": "!Enterprise.require_login" }
   .three.columns.alpha
     %label= t '.allow_guest_orders'
     %div{'ofn-with-tip' => t('.allow_guest_orders_tip')}
@@ -67,7 +63,7 @@
   .five.columns.omega
     = f.radio_button :allow_guest_orders, false, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "false"
     = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
-  .row.warning{ng: {show: 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes'}}
+  .row.warning{ "ng-show": 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes' }
     .eight.columns.alpha.omega
       %i.icon-warning-sign
       = t '.recommend_require_login'

app/views/admin/enterprises/form/_tag_rules.html.haml

@@ -1,11 +1,11 @@
-.row{ ng: { controller: "TagRulesCtrl" } }
+.row{ "ng-controller": "TagRulesCtrl" }
   .eleven.columns.alpha.omega
-    %ofn-sortable{ axis: "y", handle: ".header", items: '.customer_tag', position: "tagGroup.position", after: { sort: "updateRuleCounts()" } }
-      .no_tags{ ng: { show: "tagGroups.length == 0" } }
+    %ofn-sortable{ axis: "y", handle: ".header", items: '.customer_tag', position: "tagGroup.position", "after-sort": "updateRuleCounts()" }
+      .no_tags{ "ng-show": "tagGroups.length == 0" }
         = t('.no_tags_yet')
       = render 'admin/enterprises/form/tag_rules/default_rules'
       -# = render 'customer_tags'
-      .customer_tag{ id: "tg_{{tagGroup.position}}", ng: { repeat: "tagGroup in tagGroups" } }
+      .customer_tag{ id: "tg_{{tagGroup.position}}", "ng-repeat": "tagGroup in tagGroups" }
         .header
           %table
             %colgroup
@@ -16,12 +16,12 @@
                 %h5
                   = t('.for_customers_tagged')
               %td
-                %tags-with-translation{ object: "tagGroup", max: 1, on: { tag: { added: "updateTagsRulesFor(tagGroup)", removed: "updateTagsRulesFor(tagGroup)" } } }
+                %tags-with-translation{ object: "tagGroup", max: 1, "on-tag-added": "updateTagsRulesFor(tagGroup)", "on-tag-removed": "updateTagsRulesFor(tagGroup)" }
 
-        .no_rules{ ng: { show: "tagGroup.rules.length == 0" } }
+        .no_rules{ "ng-show": "tagGroup.rules.length == 0" }
           = t('.no_rules_yet')
-        .tag_rule{ ng: { repeat: "rule in tagGroup.rules" } }
+        .tag_rule{ "ng-repeat": "rule in tagGroup.rules" }
         .add_rule.text-center
           %input.button.icon-plus{ type: 'button', value: t('.add_new_rule'), "add-new-rule-to" => "addNewRuleTo", "tag-group" => "tagGroup", "new-tag-rule-dialog" => true }
       .add_tag
-        %input.button.red.icon-plus{ type: 'button', value: t('.add_new_tag'), ng: { click: 'addNewTag()' } }
+        %input.button.red.icon-plus{ type: 'button', value: t('.add_new_tag'), "ng-click": 'addNewTag()' }

app/views/admin/enterprises/form/_users.html.haml

@@ -21,8 +21,8 @@
     = render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.contact_tip')}
   .eight.columns.omega
     - if full_permissions
-      %select.select2.fullwidth{id: 'receives_notifications_dropdown', name: 'receives_notifications', ng: {model: 'receivesNotifications', init: "receivesNotifications = '#{@enterprise.contact.id}'"}}
-        %option{ng: {repeat: 'user in Enterprise.users', selected: "user.id == #{@enterprise.contact.id}", hide: '!user.confirmed'}, value: '{{user.id}}'}
+      %select.select2.fullwidth{ id: 'receives_notifications_dropdown', name: 'receives_notifications', "ng-model": 'receivesNotifications', "ng-init": "receivesNotifications = '#{@enterprise.contact.id}'" }
+        %option{ value: '{{user.id}}', "ng-repeat": 'user in Enterprise.users', "ng-selected": "user.id == #{@enterprise.contact.id}", "ng-hide": '!user.confirmed' }
           {{user.email}}
     - else
       = @enterprise.contact.email
@@ -41,16 +41,16 @@
             - # Ignore this input in the submit
             = hidden_field_tag :ignored, nil, class: "select2 fullwidth", 'user-select' => 'newManager', 'ng-model' => 'newManager'
           %td.actions
-        %tr.animate-repeat{ id: "manager-{{manager.id}}", ng: { repeat: 'manager in Enterprise.users' }}
+        %tr.animate-repeat{ id: "manager-{{manager.id}}", "ng-repeat": 'manager in Enterprise.users' }
           %td
             = hidden_field_tag "enterprise[user_ids][]", nil, multiple: true, 'ng-value' => 'manager.id'
             {{ manager.email }}
-            %i.confirmation.confirmed.fa.fa-check-circle{ 'ofn-with-tip' => t('.email_confirmed'), ng: {show: 'manager.confirmed'} }
-            %i.confirmation.unconfirmed.fa.fa-exclamation-triangle{ 'ofn-with-tip' => t('.email_not_confirmed'), ng: {show: '!manager.confirmed'} }
-            %i.role.contact.fa.fa-envelope-o{ 'ofn-with-tip' => t('.contact'), ng: {show: 'manager.id == receivesNotifications'} }
-            %i.role.owner.fa.fa-star{ 'ofn-with-tip' => t('.owner'), ng: {show: 'manager.id == Enterprise.owner.id'} }
+            %i.confirmation.confirmed.fa.fa-check-circle{ "ofn-with-tip": t('.email_confirmed'), "ng-show": 'manager.confirmed' }
+            %i.confirmation.unconfirmed.fa.fa-exclamation-triangle{ "ofn-with-tip": t('.email_not_confirmed'), "ng-show": '!manager.confirmed' }
+            %i.role.contact.fa.fa-envelope-o{ "ofn-with-tip": t('.contact'), "ng-show": 'manager.id == receivesNotifications' }
+            %i.role.owner.fa.fa-star{ "ofn-with-tip": t('.owner'), "ng-show": 'manager.id == Enterprise.owner.id' }
           %td.actions
-            %a{ ng: {click: 'removeManager(manager)', class: "{disabled: manager.id == Enterprise.owner.id || manager.id == receivesNotifications}"}, :class => "icon-trash no-text" }
+            %a{ class: "icon-trash no-text", "ng-click": 'removeManager(manager)', "ng-class": "{disabled: manager.id == Enterprise.owner.id || manager.id == receivesNotifications}" }
 
     - else
       - @enterprise.users.each do |manager|

app/views/admin/enterprises/form/tag_rules/_default_rules.html.haml

@@ -8,9 +8,9 @@
           %h5
             = t('.by_default')
           %i.text-big.icon-question-sign{ "data-controller": "help-modal-link", "data-action": "click->help-modal-link#open", "data-help-modal-link-target-value": "tag_rule_help_modal" }
-  .no_rules{ ng: { show: "defaultTagGroup.rules.length == 0" } }
+  .no_rules{ "ng-show": "defaultTagGroup.rules.length == 0" }
     = t('.no_rules_yet')
-  .tag_rule{ ng: { repeat: "rule in defaultTagGroup.rules" } }
+  .tag_rule{ "ng-repeat": "rule in defaultTagGroup.rules" }
   .add_rule.text-center
     %input.button.icon-plus{ type: 'button', value: t('.add_new_button'), "add-new-rule-to" => "addNewRuleTo", "tag-group" => "defaultTagGroup", "new-tag-rule-dialog" => true }