Update all locales with the latest Transifex translations

Bump hotkeys-js from 3.13.9 to 3.13.10

.env

@@ -10,10 +10,10 @@ TIMEZONE="Melbourne"
 DEFAULT_COUNTRY_CODE="AU"
 
 # Locale for translation.
-LOCALE="en"
+LOCALE="en_AU"
 
 # For multilingual - ENV doesn't have array so pass it as string with commas
-AVAILABLE_LOCALES="en,es"
+AVAILABLE_LOCALES="en_AU,es"
 
 # Spree zone.
 CHECKOUT_ZONE="Australia"
@@ -42,14 +42,6 @@ SMTP_PASSWORD="f00d"
 # Javascript error reporting via Bugsnag.
 # BUGSNAG_JS_KEY=""
 
-# SingleSignOn login for Discourse
-#
-# DISCOURSE_SSO_SECRET should be a random string. It must be the same as provided to your Discourse instance.
-# DISCOURSE_SSO_SECRET=""
-#
-# DISCOURSE_URL must be the URL of your Discourse instance.
-# DISCOURSE_URL="https://noticeboard.openfoodnetwork.org.au"
-
 # see="https://developers.google.com/maps/documentation/javascript/get-api-key
 # GOOGLE_MAPS_API_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 # see https://developers.google.com/maps/documentation/javascript/localization#Region
@@ -69,3 +61,12 @@ SMTP_PASSWORD="f00d"
 # NEW_RELIC_AGENT_ENABLED=true
 # NEW_RELIC_APP_NAME="Open Food Network"
 # NEW_RELIC_LICENSE_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Database encryption configuration, required for VINE connected app
+# Generate with bin/rails db:encryption:init
+# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# VINE API settings
+# VINE_API_URL="https://vine-staging.openfoodnetwork.org.au/api/v1"

.env.development

@@ -5,17 +5,28 @@
 #
 #     cp .env.development .env.local
 
+# Locale for translation. Using a locale other than `en` tests the
+# successful fallback to `en`. To see up-to-date text used in production,
+# set another locale in a local env file.
+LOCALE="en_TST"
+
 VERBOSE_QUERY_LOGS=true
 
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 OFN_REDIS_URL="redis://localhost:6379/1"
 OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
+OFN_REDIS_CABLE_URL="redis://localhost:6379/0"
 
-SITE_URL="0.0.0.0:3000"
+SITE_URL="localhost:3000"
 
 # Deactivate rack-timeout in development.
 # https://github.com/zombocom/rack-timeout#configuring
 RACK_TIMEOUT_SERVICE_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_OVERTIME="0"
+
+# Database encryption configuration, required for VINE connected app
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="dev_primary_key"
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="dev_determinnistic_key"
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="dev_derivation_salt"

.env.test

@@ -1,11 +1,29 @@
 # ENV vars for the test environment
 # Override locally with `.env.test.local`
 
+# Locale for translation. Using a locale other than `en` tests the
+# successful fallback to `en`.
+LOCALE="en_TST"
+
+OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
+
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-STRIPE_SECRET_TEST_API_KEY="bogus_key"
+STRIPE_INSTANCE_SECRET_KEY="bogus_key"
 STRIPE_CUSTOMER="bogus_customer"
+STRIPE_ACCOUNT="bogus_account"
+STRIPE_CLIENT_ID="bogus_client_id"
+STRIPE_PUBLIC_TEST_API_KEY="bogus_stripe_publishable_key"
 
 SITE_URL="test.host"
 
+# OIDC Settings for DFC authentication
+# Find secrets in BitWarden.
+# To get a refresh token: log into the OIDC provider, connect your OFN user to it at /admin/oidc_settings, then copy the token from the database:
+#  ./bin/rails runner 'puts "OPENID_REFRESH_TOKEN=\"#{OidcAccount.last.refresh_token}\""'
 OPENID_APP_ID="test-provider"
-OPENID_APP_SECRET="12345"
+OPENID_APP_SECRET="dummy-openid-app-secret-token"
+OPENID_REFRESH_TOKEN="dummy-refresh-token"
+
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="test_primary_key"
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="test_deterministic_key"
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="test_derivation_salt"

.github/ISSUE_TEMPLATE/release.md

@@ -7,24 +7,16 @@ assignees: ''
 
 ---
 
-## 1. Preparation on Thursday
+## 1. Drafting on Friday
 
 - [ ] Merge pull requests in the [Ready To Go] column
-- [ ] Include translations
-  <details><summary>Command line instructions:</summary>
-    <pre>
-    <code>
-    git checkout master
-    git pull upstream master
-    tx pull --force
-    git commit -a -m "Update all locales with the latest Transifex translations"
-    git push upstream master
-    </code>
-    </pre>
-  </details>
-- [ ] Create a tag:
-    - `script/tag_release` will auto increment patch version, otherwise
-    - `git push upstream HEAD:refs/tags/vX.Y.Z`
+- [ ] Include translations: `script/release/update_locales`
+    - You need the [Transifex Client] installed on your local dev environement to run the script.
+- [ ] Increment version number: `git push upstream HEAD:refs/tags/vX.Y.Z`
+    Check for [minor or major breaking changes]
+    - Major: if server changes are required (eg. provision with ofn-install)
+    - Minor: larger change that is irreversible (eg. migration deleting data)
+    - Patch: all others. Shortcut: `script/release/tag`
 - [ ] [Draft new release]. Look at previous [releases] for inspiration.
     - Select new release tag
     - _Generate release notes_ and check to ensure all items are arranged in the right category.
@@ -35,8 +27,9 @@ assignees: ''
 - [ ] Move this issue to Test Ready.
 - [ ] Notify `@testers` in [#testing].
 - [ ] Test build: [Deploy to Staging] with release tag.
+- [ ] Notify a deployer to deploy it
 
-## 3. Finish on Tuesday
+## 3. Deployment at beginning of week
 
 - [ ] Publish and notify [#global-community] (this is automatically posted with a plugin)
 - [ ] Deploy the new release to all managed instances.
@@ -49,15 +42,19 @@ 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 drafter in [#delivery-circle].
 
 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
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A
 [releases]: https://github.com/openfoodfoundation/openfoodnetwork/releases
 [#instance-managers]: https://app.slack.com/client/T02G54U79/CG7NJ966B
 [#testing]: https://openfoodnetwork.slack.com/app_redirect?channel=C02TZ6X00
 [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
+[#delivery-circle]: https://openfoodnetwork.slack.com/archives/C01T75H6G0Z
+[Transifex Client]: https://developers.transifex.com/docs/cli
+[minor or major breaking changes]: https://github.com/openfoodfoundation/openfoodnetwork/pulls?q=label%3A%22breaking+change%22%2C%22major+breaking+change%22

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,7 +22,7 @@
 
 Changelog Category (reviewers may add a label for the release notes):
 
-- [x] User facing changes
+- [ ] User facing changes
 - [ ] API changes (V0, V1, DFC or Webhook)
 - [ ] Technical changes only
 - [ ] Feature toggled

.github/dependabot.yml

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

.github/release.yml

@@ -1,8 +1,9 @@
 changelog:
   # Categorise according to what an instance manager needs to know
   categories:
-    # Posted in advance for #instance-managers
-    - title: "User-facing changes 👀"
+    # Add the right label if anything appears in here.
+    # Then re-generate the release notes.
+    - title: "❓❓❓ Uncategorised ❓❓❓"
       labels:
         - '*'
       exclude:
@@ -11,6 +12,18 @@ changelog:
           - dependencies
           - feature toggled
           - technical changes only
+          - user facing changes
+
+    # These will require a minor or major version increment
+    - title: "Significant changes 🚀"
+      labels:
+        - breaking change
+        - major breaking change
+
+    # Posted in advance for #instance-managers
+    - title: "User-facing changes 👀"
+      labels:
+        - user facing changes
 
     - title: "API changes ⚠️"
       labels:

.github/workflows/auto-author-assign.yml

@@ -0,0 +1,14 @@
+name: Auto Author Assign
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  assign-author:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: toshimaru/auto-author-assign@v2.1.0

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on:
   workflow_dispatch:
   push:
-    branches-ignore:    
+    branches-ignore:
       - 'dependabot/**'
   pull_request:
 
@@ -38,16 +38,16 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [8]
+        ci_node_total: [4]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7]
+        ci_node_index: [0, 1, 2, 3]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -55,17 +55,18 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates containing image urls
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
         env:
@@ -80,10 +81,19 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}"
         run: |
           git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
-          bundle exec rake knapsack_pro:rspec
+          bin/rails assets:precompile knapsack_pro:rspec
+
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-controllers-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
 
   models:
     runs-on: ubuntu-22.04
@@ -106,16 +116,16 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [5]
+        ci_node_total: [2]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4]
+        ci_node_index: [0, 1]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -123,20 +133,11 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
-      - uses: actions/setup-node@v3
-        with:
-          node-version-file: .node-version
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
-
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: 09476e2ce491c12083df62768667c674
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -149,10 +150,18 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}" 
-        
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}"
         run: |
-          bundle exec rake knapsack_pro:rspec
+          bin/rake knapsack_pro:rspec
+
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-models-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
 
   system_admin:
     runs-on: ubuntu-22.04
@@ -175,16 +184,16 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [13]
+        ci_node_total: [10]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] 
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -195,14 +204,14 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
 
@@ -218,16 +227,25 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}"
 
         run: |
-          bundle exec rake knapsack_pro:queue:rspec
+          bin/rails assets:precompile knapsack_pro:queue:rspec
+
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-system-admin-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
 
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: failed-tests-screenshots
+          name: failed-admin_${{ matrix.ci_node_index }}-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
@@ -253,16 +271,16 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [12]
+        ci_node_total: [6]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] 
+        ci_node_index: [0, 1, 2, 3, 4, 5]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -273,14 +291,14 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
 
@@ -296,16 +314,25 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}" 
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}"
 
         run: |
-          bundle exec rake knapsack_pro:queue:rspec
+          bin/rails assets:precompile knapsack_pro:queue:rspec
+
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-system-consumer-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
 
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: failed-tests-screenshots
+          name: failed-consumer_${{ matrix.ci_node_index }}-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
@@ -340,7 +367,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -348,17 +375,18 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates linking to mail.css
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
 
@@ -377,16 +405,16 @@ jobs:
           KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/serializers/**/*_spec.rb,engines/**/*_spec.rb}"
 
         run: |
-          bundle exec rake knapsack_pro:rspec
+          bin/rails assets:precompile knapsack_pro:rspec
 
-      - name: Archive failed tests screenshots
-        if: failure()
-        uses: actions/upload-artifact@v3
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
         with:
-          name: failed-tests-screenshots
-          path: tmp/capybara/screenshots/*.png
-          retention-days: 7
+          name: simplecov-chunk-engines-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
           if-no-files-found: ignore
+          include-hidden-files: true
 
   test_the_rest:
     runs-on: ubuntu-22.04
@@ -409,16 +437,16 @@ jobs:
         # [n] - where the n is a number of parallel jobs you want to run your tests on.
         # Use a higher number if you have slow tests to split them between more parallel jobs.
         # Remember to update the value of the `ci_node_index` below to (0..n-1).
-        ci_node_total: [5]
+        ci_node_total: [3]
         # Indexes for parallel jobs (starting from zero).
         # E.g. use [0, 1] for 2 parallel jobs, [0, 1, 2] for 3 parallel jobs, etc.
-        ci_node_index: [0, 1, 2, 3, 4]
+        ci_node_index: [0, 1, 2]
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with: 
+        with:
           redis-version: 6
 
       - name: Set up Ruby
@@ -426,20 +454,20 @@ jobs:
         with:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      # JS is required in order for webpacker to compile, in order to render templates linking to mail.css
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
       - name: Set up database
         run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
+          bin/rails db:create db:schema:load
 
       - name: Run tests
-
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: e3b8800198d2d89b70c7edbdd85f8fd8
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -453,10 +481,17 @@ jobs:
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
           KNAPSACK_PRO_TEST_FILE_EXCLUDE_PATTERN: "{engines/**/*_spec.rb,spec/models/**/*_spec.rb,spec/controllers/**/*_spec.rb,spec/serializers/**/*_spec.rb,spec/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/system/**/*_spec.rb}"
-                                            
-        
         run: |
-          bundle exec rake knapsack_pro:rspec
+          bin/rails assets:precompile knapsack_pro:rspec
+
+      - name: Save SimpleCov file
+        uses: actions/upload-artifact@v4
+        with:
+          name: simplecov-chunk-the-rest-${{ matrix.ci_node_index }}
+          path: coverage/*.*
+          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
+          if-no-files-found: ignore
+          include-hidden-files: true
 
   non_knapsack_jest_karma:
     runs-on: ubuntu-22.04
@@ -476,11 +511,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with: 
-          redis-version: 6
-
+      # Rails is required for the Karma rake script
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -489,16 +520,48 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version-file: .node-version
+          cache: yarn
 
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up database
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:schema:load
       - name: Run JS tests
-        run: bundle exec rake karma:run
+        run: bin/rake karma:run
 
       - name: Run jest tests
         run: yarn jest
+
+  collate_simplecov_results:
+    runs-on: ubuntu-22.04
+    needs:
+      - controllers
+      - models
+      - engines
+      - system_admin
+      - system_consumer
+      - test_the_rest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Download individual results from individual runners
+        uses: actions/download-artifact@v4
+        with:
+          pattern: simplecov-chunk-*
+          path: tmp/simplecov
+
+      - name: collate results from each of the workers
+        run: bundle exec rake 'simplecov:collate_results[tmp/simplecov]'
+
+      - name: Upload collated results
+        uses: actions/upload-artifact@v4
+        with:
+          name: combined-simplecov-report
+          path: coverage/**/*.*
+          retention-days: 7
+          if-no-files-found: ignore
+          include-hidden-files: true

.github/workflows/linters.yml

@@ -7,10 +7,11 @@ jobs:
     name: runner / rubocop
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - run: git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
 
@@ -18,10 +19,12 @@ 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
+          filter_mode: nofilter
+          use_bundler: true
+          fail_level: any
   prettier:
     name: runner / prettier
     runs-on: ubuntu-latest

.github/workflows/mapi.yml

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

.husky/pre-commit

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

.prettierignore

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

.rspec

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

.rubocop.yml

@@ -4,7 +4,13 @@
 #
 # The configuration is split into three files. Look into those files for more details.
 #
-require: rubocop-rails
+require:
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-rails
+  - rubocop-rspec
+  - rubocop-rspec_rails
+
 inherit_from:
 
   # The automatically generated todo list to ignore all current violations.
@@ -13,9 +19,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,24 @@
+# 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
+
+RSpec/NotToNot:
+  Enabled: true

.rubocop_styleguide.yml

@@ -3,24 +3,60 @@
 # These are the rules we agreed upon and we work towards.
 AllCops:
   NewCops: enable
-  SuggestExtensions: false
+  MigratedSchemaVersion: "20250111000000"
   Exclude:
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'script/**/*'
-    - 'vendor/**/*'
-    - 'node_modules/**/*'
+    - bin/**/*
+    - config/**/*
+    - db/bad_migrations/*
+    - db/migrate/201*
+    - db/migrate/202[0-4]*
+    - db/schema.rb
+    - 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 +82,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,19 +115,42 @@ Rails/ApplicationRecord:
 Rails/HasAndBelongsToMany:
   Enabled: false
 
+# Cf. conversation https://github.com/openfoodfoundation/openfoodnetwork/pull/13251
+Rails/LexicallyScopedActionFilter:
+  Enabled: false
+
+Rails/OutputSafety:
+  Exclude:
+    - spec/**/*
+
+Rails/RedundantActiveRecordAllMethod:
+  AllowedReceivers:
+    - ActionMailer::Preview
+    - ActiveSupport::TimeZone
+
 Rails/SkipsModelValidations:
   AllowedMethods:
-    - "touch"
-    - "touch_all"
-    - "update_all"
-    - "update_attribute"
-    - "update_column"
-    - "update_columns"
+    - touch
+    - touch_all
+    - update_all
+    - update_attribute
+    - update_column
+    - update_columns
+
+Rails/UnknownEnv:
+  Environments:
+    - development
+    - production
+    - staging
+    - test
+
+Rails/WhereExists:
+  EnforcedStyle: where # Cf. conversion https://github.com/openfoodfoundation/openfoodnetwork/pull/12363
 
 Style/Documentation:
   Enabled: false
 
-Style/StringLiterals:
+Style/FormatStringToken:
   Enabled: false
 
 Style/HashSyntax:
@@ -83,62 +160,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

.simplecov

@@ -1,4 +1,5 @@
 #!/bin/env ruby
+# frozen_string_literal: true
 
 SimpleCov.start 'rails' do
   add_filter '/bin/'
@@ -14,4 +15,6 @@ SimpleCov.start 'rails' do
   add_filter '/log'
   add_filter '/db'
   add_filter '/lib/tasks/sample_data/'
+
+  formatter SimpleCov::Formatter::SimpleFormatter
 end

Dockerfile

@@ -1,92 +1,32 @@
-FROM ubuntu:20.04
+FROM ruby:3.1.4-alpine3.19 AS base
+ENV LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    TZ=Europe/London \
+    RAILS_ROOT=/usr/src/app
+RUN apk --no-cache upgrade && \
+    apk add --no-cache tzdata postgresql-client imagemagick imagemagick-jpeg && \
+    apk add --no-cache --virtual wkhtmltopdf
 
-ENV TZ Europe/London
+WORKDIR $RAILS_ROOT
 
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+# Development dependencies
+FROM base AS development-base
+RUN apk add --no-cache --virtual .build-deps \
+    build-base postgresql-dev git nodejs yarn && \
+    apk add --no-cache --virtual .dev-utils \
+    bash curl less vim chromium-chromedriver zlib-dev openssl-dev \
+    readline-dev yaml-dev sqlite-dev libxml2-dev libxslt-dev libffi-dev vips-dev && \
+    curl -o /usr/local/bin/wait-for-it https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
+    chmod +x /usr/local/bin/wait-for-it
 
-RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
+# Install yarn dependencies separately for caching
+FROM development-base AS yarn-dependencies
+COPY package.json yarn.lock ./
+RUN yarn install --frozen-lockfile
 
-# Install all the requirements
-RUN apt-get update && apt-get install -y \
-  curl \
-  git \
-  build-essential \
-  software-properties-common \
-  wget \
-  zlib1g-dev \
-  libreadline-dev \
-  libyaml-dev \
-  libffi-dev \
-  libxml2-dev \
-  libxslt1-dev \
-  wait-for-it \
-  imagemagick \
-  unzip \
-  libjemalloc-dev \
-  libssl-dev \
-  ca-certificates \
-  gnupg
-
-# Setup ENV variables
-ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:/usr/local/src/nodenv/shims:/usr/local/src/nodenv/bin:$PATH
-ENV RBENV_ROOT /usr/local/src/rbenv
-ENV NODENV_ROOT /usr/local/src/nodenv
-ENV CONFIGURE_OPTS --disable-install-doc
-ENV BUNDLE_PATH /bundles
-ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
-
-WORKDIR /usr/src/app
-
-# trim spaces and line return from .ruby-version file
-COPY .ruby-version .ruby-version.raw
-RUN cat .ruby-version.raw | tr -d '\r\t ' > .ruby-version
-
-# Install Rbenv & Ruby
-RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
-    git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
-    RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install $(cat .ruby-version) && \
-    rbenv global $(cat .ruby-version)
-
-# Install Postgres
-RUN sh -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main' >> /etc/apt/sources.list.d/pgdg.list" && \
-    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null && \
-    apt-get update && \
-    apt-get install -yqq --no-install-recommends postgresql-client-10 libpq-dev
-
-
-# trim spaces and line return from .node-version file
-COPY .node-version .node-version.raw
-RUN cat .node-version.raw | tr -d '\r\t ' > .node-version
-
-# Install Node and Yarn with Nodenv
-RUN git clone --depth 1 https://github.com/nodenv/nodenv.git ${NODENV_ROOT} && \
-    git clone --depth 1 https://github.com/nodenv/node-build.git ${NODENV_ROOT}/plugins/node-build && \
-    git clone --depth 1 https://github.com/pine/nodenv-yarn-install.git ${NODENV_ROOT}/plugins/nodenv-yarn-install && \
-    git clone --depth 1 https://github.com/nodenv/nodenv-package-rehash.git ${NODENV_ROOT}/plugins/nodenv-package-rehash && \
-    echo 'eval "$(nodenv init -)"' >> /etc/profile.d/nodenv.sh && \
-    nodenv install $(cat .node-version) && \
-    nodenv global $(cat .node-version)
-
-# Install Chrome
-RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    sh -c "echo 'deb [arch=amd64]  http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" && \
-    apt-get update && \
-    apt-get install -fy google-chrome-stable
-
-# Install Chromedriver
-RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip && \
-    unzip chromedriver_linux64.zip -d /usr/bin && \
-    chmod u+x /usr/bin/chromedriver
-
-# Copy code and install app dependencies
-COPY . /usr/src/app/
-
-# Install Bundler
-RUN ./script/install-bundler
-
-# Install front-end dependencies
-RUN yarn install
-
-# Run bundler install in parallel with the amount of available CPUs
-RUN bundle install --jobs="$(nproc)"
+# Install Ruby gems
+FROM development-base
+COPY . $RAILS_ROOT
+COPY Gemfile Gemfile.lock ./
+RUN bundle install --jobs "$(nproc)"
+COPY --from=yarn-dependencies $RAILS_ROOT/node_modules ./node_modules

Dockerfile.ubuntu

@@ -0,0 +1,92 @@
+FROM ubuntu:20.04
+
+ENV TZ Europe/London
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
+
+# Install all the requirements
+RUN apt-get update && apt-get install -y \
+  curl \
+  git \
+  build-essential \
+  software-properties-common \
+  wget \
+  zlib1g-dev \
+  libreadline-dev \
+  libyaml-dev \
+  libffi-dev \
+  libxml2-dev \
+  libxslt1-dev \
+  wait-for-it \
+  imagemagick \
+  unzip \
+  libjemalloc-dev \
+  libssl-dev \
+  ca-certificates \
+  gnupg
+
+# Setup ENV variables
+ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:/usr/local/src/nodenv/shims:/usr/local/src/nodenv/bin:$PATH
+ENV RBENV_ROOT /usr/local/src/rbenv
+ENV NODENV_ROOT /usr/local/src/nodenv
+ENV CONFIGURE_OPTS --disable-install-doc
+ENV BUNDLE_PATH /bundles
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
+
+WORKDIR /usr/src/app
+
+# trim spaces and line return from .ruby-version file
+COPY .ruby-version .ruby-version.raw
+RUN cat .ruby-version.raw | tr -d '\r\t ' > .ruby-version
+
+# Install Rbenv & Ruby
+RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
+    git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
+    RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install $(cat .ruby-version) && \
+    rbenv global $(cat .ruby-version)
+
+# Install Postgres
+RUN sh -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main' >> /etc/apt/sources.list.d/pgdg.list" && \
+    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null && \
+    apt-get update && \
+    apt-get install -yqq --no-install-recommends postgresql-client-10 libpq-dev
+
+
+# trim spaces and line return from .node-version file
+COPY .node-version .node-version.raw
+RUN cat .node-version.raw | tr -d '\r\t ' > .node-version
+
+# Install Node and Yarn with Nodenv
+RUN git clone --depth 1 https://github.com/nodenv/nodenv.git ${NODENV_ROOT} && \
+    git clone --depth 1 https://github.com/nodenv/node-build.git ${NODENV_ROOT}/plugins/node-build && \
+    git clone --depth 1 https://github.com/pine/nodenv-yarn-install.git ${NODENV_ROOT}/plugins/nodenv-yarn-install && \
+    git clone --depth 1 https://github.com/nodenv/nodenv-package-rehash.git ${NODENV_ROOT}/plugins/nodenv-package-rehash && \
+    echo 'eval "$(nodenv init -)"' >> /etc/profile.d/nodenv.sh && \
+    nodenv install $(cat .node-version) && \
+    nodenv global $(cat .node-version)
+
+# Install Chrome
+RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c "echo 'deb [arch=amd64]  http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" && \
+    apt-get update && \
+    apt-get install -fy google-chrome-stable
+
+# Install Chromedriver
+RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip && \
+    unzip chromedriver_linux64.zip -d /usr/bin && \
+    chmod u+x /usr/bin/chromedriver
+
+# Copy code and install app dependencies
+COPY . /usr/src/app/
+
+# Install Bundler
+RUN ./script/install-bundler
+
+# Install front-end dependencies
+RUN yarn install
+
+# Run bundler install in parallel with the amount of available CPUs
+RUN bundle install --jobs="$(nproc)"

GETTING_STARTED.md

@@ -6,28 +6,9 @@ This is a general guide to setting up an Open Food Network **development environ
 
 Head to our wiki on [Learning Rails](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Learning-Rails) to find some good starting points.
 
-### Requirements
-
-The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](docker/README.md).
-Otherwise, for a local setup you will need:
-* Ruby and bundler (check current Ruby version in [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file)
-    - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/)
-* Node and yarn (check current Node version in [.node-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.node-version) file)
-    - [nodevn](https://github.com/nodenv/nodenv) is recommended.
-* PostgreSQL database
-* Redis (for background jobs)
-* Chrome (for testing)
-
-The following guides will provide OS-specific step-by-step instructions to get these requirements installed:
-- [Ubuntu Setup Guide][ubuntu]
-- [Debian Setup Guide][debian]
-- [OSX Setup Guide][osx]
-
-For those new to Rails, the following tutorial will help get you up to speed with configuring a [Rails environment](http://guides.rubyonrails.org/getting_started.html).
-
 ### Get it
 
-So you have set up your local environment according to the requirements listed above. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine:
+If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine:
 
     git clone git@github.com:YOUR_GITHUB_USERNAME_HERE/openfoodnetwork.git
 
@@ -43,6 +24,27 @@ Fetch the latest version of `master` from `upstream` (ie. the main repo):
 
     git fetch upstream master
 
+### Installation
+
+This project needs specific ruby/bundler versions as well as node/yarn specific versions. For a local setup you will need:
+
+* Install or change your Ruby version according to the one specified at [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file.
+    - To manage versions, it's recommended to use [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
+* Install [nodenv](https://github.com/nodenv/nodenv) to ensure the correct [.node-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.node-version) is used.
+    - [nodenv](https://github.com/nodenv/nodenv) is recommended as a node version manager.
+* PostgreSQL database
+* Redis (for background jobs)
+* Chrome (for testing)
+
+The following guides will provide OS-specific step-by-step instructions to get these requirements installed:
+- [Ubuntu Setup Guide][ubuntu]
+- [Debian Setup Guide][debian]
+- [OSX Setup Guide][osx]
+
+For those new to Rails, the following tutorial will help get you up to speed with configuring a [Rails environment](http://guides.rubyonrails.org/getting_started.html).
+
+Another way to make it work locally would be using Docker. See the [Docker setup guide](docker/README.md). 
+
 ### Get it running
 
 First, you need to create the database user the app will use by manually typing the following in your terminal:
@@ -53,7 +55,8 @@ sudo --login --user=postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PA
 
 This will create the "ofn" user as superuser and allowing it to create databases. If this command fails, check the [troubleshooting section](#creating-the-database) for an alternative.
 
-Next, it is _strongly recommended_ to run the setup script.
+Next, it is _strongly recommended_ to run the setup script:
+
 ```sh
 ./script/setup
 ```

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'
 
@@ -16,10 +16,8 @@ gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
-gem 'awesome_nested_set'
-gem 'ransack', '~> 2.6.0'
+gem 'ransack', '~> 4.1.0'
 gem 'responders'
-gem 'rexml'
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -67,14 +65,14 @@ gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
 gem 'datafoodconsortium-connector'
 gem 'jsonapi-serializer'
-gem 'pagy', '~> 5.1'
+gem 'pagy', '~> 9'
 
 gem 'rswag-api'
 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'
@@ -88,24 +86,26 @@ gem "active_model_serializers", "0.8.4"
 gem 'activerecord-session_store'
 gem 'acts-as-taggable-on'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
-gem 'bigdecimal', '3.0.2'
+gem 'bigdecimal'
 gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 12.1'
+gem 'paper_trail'
 gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
 
-gem 'hiredis'
 gem 'puma'
-gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'redis'
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
-gem "cable_ready", "5.0.1"
-gem "stimulus_reflex", "3.5.0.rc3"
+gem "cable_ready"
+gem "stimulus_reflex"
+
+gem "turbo_power"
+gem "turbo-rails"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -143,6 +143,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,9 +162,10 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry', require: false
-  gem 'rswag-specs'
+  gem 'rspec-sql'
+  gem 'rswag'
   gem 'shoulda-matchers'
-  gem 'stimulus_reflex_testing'
+  gem 'stimulus_reflex_testing', github: "podia/stimulus_reflex_testing", branch: :main
   gem 'timecop'
 end
 
@@ -179,14 +182,17 @@ end
 group :development do
   gem 'debugger-linecache'
   gem 'foreman'
+  gem 'i18n-tasks'
   gem 'listen'
   gem 'pry', '~> 0.13.0'
   gem 'query_count'
   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

@@ -17,6 +17,14 @@ GIT
       sass-rails
       thor (>= 0.14)
 
+GIT
+  remote: https://github.com/podia/stimulus_reflex_testing.git
+  revision: abac2ee34de347c589795b4d1a8e83e0baafb201
+  branch: main
+  specs:
+    stimulus_reflex_testing (0.3.1)
+      stimulus_reflex (>= 3.3.0)
+
 PATH
   remote: engines/catalog
   specs:
@@ -90,7 +98,7 @@ GEM
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (1.1.1)
+    active_storage_validations (1.1.4)
       activejob (>= 5.2.0)
       activemodel (>= 5.2.0)
       activestorage (>= 5.2.0)
@@ -98,17 +106,18 @@ 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)
       activemodel (= 7.0.8)
       activesupport (= 7.0.8)
-    activerecord-import (1.5.0)
+    activerecord-import (1.6.0)
       activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -135,7 +144,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)
@@ -144,57 +153,57 @@ GEM
       sprockets (>= 3.0, < 5)
       sprockets-rails
       tilt
-    angular_rails_csrf (5.0.0)
+    angular_rails_csrf (6.0.0)
       railties (>= 3, < 8)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.8.0)
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     ast (2.4.2)
-    attr_required (1.0.1)
-    awesome_nested_set (3.6.0)
-      activerecord (>= 4.0.0, < 7.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.828.0)
-    aws-sdk-core (3.183.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    attr_required (1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.929.0)
+    aws-sdk-core (3.196.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.81.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
-    bigdecimal (3.0.2)
-    bindata (2.4.15)
+    base64 (0.2.0)
+    bcp47_spec (0.2.1)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.8)
+    bindata (2.5.0)
     bindex (0.8.1)
-    bootsnap (1.17.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bugsnag (6.26.0)
+    bugsnag (6.26.4)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
-    bullet (7.1.2)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    cable_ready (5.0.1)
+    cable_ready (5.0.6)
       actionpack (>= 5.2)
       actionview (>= 5.2)
       activesupport (>= 5.2)
+      observer (~> 0.1)
       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)
@@ -205,6 +214,7 @@ GEM
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     cgi (0.3.6)
+    childprocess (5.0.0)
     choice (0.2.0)
     chronic (0.10.2)
     coderay (1.1.3)
@@ -215,33 +225,35 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    combine_pdf (1.0.24)
+    combine_pdf (1.0.26)
       matrix
       ruby-rc4 (>= 0.1.5)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.1)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.17.1)
       addressable
-    cuprite (0.14.3)
+    csv (3.3.0)
+    cuprite (0.15)
       capybara (~> 3.0)
-      ferrum (~> 0.13.0)
+      ferrum (~> 0.14.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datafoodconsortium-connector (1.0.0.pre.alpha.8)
+    datafoodconsortium-connector (1.1.0)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
-    date (3.3.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     debugger-linecache (1.2.0)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -249,17 +261,16 @@ GEM
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-i18n (1.12.0)
+    devise-i18n (1.12.1)
       devise (>= 4.9.0)
     devise-token_authenticatable (1.1.0)
       devise (>= 4.0.0, < 5.0.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     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.2)
+    email_validator (2.2.4)
+      activemodel
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -270,30 +281,30 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
-    ferrum (0.13)
+    faraday-net_http (3.1.0)
+      net-http
+    ferrum (0.14)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.23.0)
-    ffi (1.15.5)
-    flipper (0.26.2)
+    ffi (1.16.3)
+    flipper (1.3.0)
       concurrent-ruby (< 2)
-    flipper-active_record (0.26.2)
+    flipper-active_record (1.3.0)
       activerecord (>= 4.2, < 8)
-      flipper (~> 0.26.2)
-    flipper-ui (0.26.2)
+      flipper (~> 1.3.0)
+    flipper-ui (1.3.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 0.26.2)
-      rack (>= 1.4, < 3)
-      rack-protection (>= 1.5.3, <= 4.0.0)
+      flipper (~> 1.3.0)
+      rack (>= 1.4, < 4)
+      rack-protection (>= 1.5.3, < 5.0.0)
+      rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 7)
     fog-aws (2.0.1)
       fog-core (~> 1.38)
@@ -310,7 +321,7 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foreman (0.87.2)
+    foreman (0.88.1)
     formatador (0.2.5)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
@@ -318,36 +329,50 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     gmaps4rails (2.1.2)
     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.5)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
+    i18n-tasks (1.0.14)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 3.2.2.1)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    io-console (0.6.0)
+    invisible_captcha (2.3.0)
+      rails (>= 5.2)
+    io-console (0.7.2)
     ipaddress (0.8.3)
-    irb (1.6.4)
-      reline (>= 0.3.0)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -355,41 +380,45 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (2.6.3)
-    json-canonicalization (0.3.2)
-    json-jwt (1.16.3)
+    json (2.7.2)
+    json-canonicalization (1.0.0)
+    json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
+      base64
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json-ld (3.2.5)
+    json-ld (3.3.2)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)
-      rdf (~> 3.2, >= 3.2.10)
-    json-schema (3.0.0)
+      rdf (~> 3.3)
+      rexml (~> 3.2)
+    json-schema (4.1.1)
       addressable (>= 2.8)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.1)
-    knapsack_pro (5.7.0)
+    jwt (2.8.1)
+      base64
+    knapsack_pro (8.1.2)
       rake
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
+    launchy (3.0.0)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     link_header (0.0.8)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -397,78 +426,83 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    method_source (1.0.0)
-    mime-types (3.5.1)
+    method_source (1.1.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1205)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
-    monetize (1.12.0)
+    mini_portile2 (2.8.6)
+    minitest (5.23.1)
+    monetize (1.13.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.4.2)
+    net-http (0.4.1)
+      uri
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
-    newrelic_rpm (9.6.0)
-      base64
-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    newrelic_rpm (9.9.0)
+    nio4r (2.7.1)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri-html5-inference (0.3.0)
+      nokogiri (~> 1.14)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    omniauth (2.1.1)
+    observer (0.1.2)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth_openid_connect (0.6.1)
+    omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.1)
-    openid_connect (1.4.2)
+      openid_connect (~> 2.2)
+    openid_connect (2.3.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
-      net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
+      email_validator
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
+      mail
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
-      validate_email
       validate_url
-      webfinger (~> 1.2)
+      webfinger (~> 2.0)
     orm_adapter (0.5.0)
-    pagy (5.10.1)
-      activesupport
-    paper_trail (12.3.0)
-      activerecord (>= 5.2)
-      request_store (~> 1.1)
-    parallel (1.23.0)
+    pagy (9.3.4)
+    paper_trail (15.1.0)
+      activerecord (>= 6.1)
+      request_store (~> 1.4)
+    parallel (1.24.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
-    parser (3.2.2.4)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     paypal-sdk-core (0.3.4)
@@ -476,7 +510,7 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pdf-reader (2.11.0)
+    pdf-reader (2.12.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -487,31 +521,37 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
-    puma (6.4.0)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.5)
+    puma (6.5.0)
       nio4r (~> 2.0)
     query_count (1.1.1)
       activerecord (>= 4.2)
       railties (>= 4.2)
     raabro (1.4.0)
-    racc (1.7.1)
-    rack (2.2.8)
+    racc (1.8.0)
+    rack (2.2.11)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
-    rack-oauth2 (1.21.3)
+    rack-oauth2 (2.2.1)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.6)
       rack
     rack-rewrite (1.5.1)
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rack-timeout (0.6.3)
+    rack-timeout (0.7.0)
     rails (7.0.8)
       actioncable (= 7.0.8)
       actionmailbox (= 7.0.8)
@@ -542,7 +582,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
@@ -554,102 +594,127 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
-    ransack (2.6.0)
-      activerecord (>= 6.0.4)
-      activesupport (>= 6.0.4)
+    rake (13.2.1)
+    ransack (4.1.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.2.11)
+    rdf (3.3.2)
+      bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
     redcarpet (3.6.0)
-    redis (4.8.1)
-    redis-client (0.18.0)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.1)
       connection_pool
-    regexp_parser (2.8.2)
-    reline (0.3.3)
+    regexp_parser (2.9.2)
+    reline (0.5.0)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
-    roadie (5.2.0)
+    rexml (3.2.9)
+      strscan
+    roadie (5.2.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.15)
-    roadie-rails (3.1.0)
+    roadie-rails (3.2.0)
       railties (>= 5.1, < 8.0)
       roadie (~> 5.0)
     rodf (1.2.0)
       builder (>= 3.0)
       rubyzip (>= 1.0)
-    roo (2.10.0)
+    roo (2.10.1)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.1)
-    rswag-api (2.11.0)
-      railties (>= 3.1, < 7.2)
-    rswag-specs (2.11.0)
+    rspec-sql (0.0.3)
+      activesupport
+      rspec
+    rspec-support (3.13.1)
+    rswag (2.13.0)
+      rswag-api (= 2.13.0)
+      rswag-specs (= 2.13.0)
+      rswag-ui (= 2.13.0)
+    rswag-api (2.13.0)
       activesupport (>= 3.1, < 7.2)
-      json-schema (>= 2.2, < 4.0)
+      railties (>= 3.1, < 7.2)
+    rswag-specs (2.13.0)
+      activesupport (>= 3.1, < 7.2)
+      json-schema (>= 2.2, < 5.0)
       railties (>= 3.1, < 7.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.11.0)
+    rswag-ui (2.13.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
-    rubocop (1.57.2)
+    rubocop (1.64.1)
       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.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 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-rails (2.22.1)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rails (2.28.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.29.2)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.0.2)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.4.25)
@@ -661,13 +726,13 @@ GEM
       tilt (>= 1.1, < 3)
     sd_notify (0.1.1)
     semantic_range (3.0.0)
-    shoulda-matchers (5.3.0)
+    shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.2.0)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.14.0)
+      redis-client (>= 0.19.0)
     sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
@@ -681,9 +746,11 @@ GEM
     spreadsheet_architect (5.0.0)
       caxlsx (>= 3.3.0, < 4)
       rodf (>= 1.0.0, < 2)
-    spring (4.1.1)
+    spring (4.2.1)
     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)
@@ -698,48 +765,56 @@ GEM
     state_machines-activerecord (0.9.0)
       activerecord (>= 6.0)
       state_machines-activemodel (>= 0.9.0)
-    stimulus_reflex (3.5.0.rc3)
-      actioncable (>= 5.2, < 8)
-      actionpack (>= 5.2, < 8)
-      actionview (>= 5.2, < 8)
-      activesupport (>= 5.2, < 8)
+    stimulus_reflex (3.5.3)
+      actioncable (>= 5.2)
+      actionpack (>= 5.2)
+      actionview (>= 5.2)
+      activesupport (>= 5.2)
       cable_ready (~> 5.0)
       nokogiri (~> 1.0)
+      nokogiri-html5-inference (~> 0.3)
       rack (>= 2, < 4)
-      railties (>= 5.2, < 8)
+      railties (>= 5.2)
       redis (>= 4.0, < 6.0)
-    stimulus_reflex_testing (0.3.0)
-      stimulus_reflex (>= 3.3.0)
     stringex (2.8.6)
-    stripe (10.0.0)
-    swd (1.3.0)
+    stringio (3.1.0)
+    stripe (11.1.0)
+    strscan (3.1.2)
+    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)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.3.1)
     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)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
+    turbo_power (0.6.2)
+      turbo-rails (>= 1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    valid_email2 (5.1.1)
+    uri (0.13.0)
+    valid_email2 (5.2.3)
       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.7.0)
+    view_component (3.12.1)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -747,7 +822,7 @@ GEM
       rails (>= 5.2, < 8.0)
       stimulus_reflex (>= 3.5.0.pre2)
       view_component (>= 2.28.0)
-    virtual_assembly-semantizer (1.0.5)
+    virtual_assembly-semantizer (1.1.1)
       json-ld (~> 3.2, >= 3.2.3)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -756,10 +831,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.18.1)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -768,19 +844,19 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
       chronic (>= 0.6.3)
-    wicked_pdf (2.6.3)
+    wicked_pdf (2.8.1)
       activesupport
-    wkhtmltopdf-binary (0.12.6.6)
+    wkhtmltopdf-binary (0.12.6.7)
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -800,13 +876,12 @@ DEPENDENCIES
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.8.0)
   arel-helpers (~> 2.12)
-  awesome_nested_set
   aws-sdk-s3
-  bigdecimal (= 3.0.2)
+  bigdecimal
   bootsnap
   bugsnag
   bullet
-  cable_ready (= 5.0.1)
+  cable_ready
   cancancan (~> 1.15.0)
   capybara
   catalog!
@@ -824,7 +899,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   digest
-  dotenv-rails
+  dotenv
   factory_bot_rails (= 6.2.0)
   faraday
   ffaker
@@ -839,11 +914,12 @@ DEPENDENCIES
   good_migrations
   haml
   highline (= 2.0.3)
-  hiredis
   i18n
   i18n-js (~> 3.9.0)
+  i18n-tasks
   image_processing
   immigrant
+  invisible_captcha
   jquery-rails (= 4.4.0)
   jquery-ui-rails (~> 4.2)
   json
@@ -861,10 +937,10 @@ DEPENDENCIES
   oauth2 (~> 1.4.7)
   omniauth-rails_csrf_protection
   omniauth_openid_connect
-  openid_connect (~> 1.3)
+  openid_connect
   order_management!
-  pagy (~> 5.1)
-  paper_trail (~> 12.1)
+  pagy (~> 9)
+  paper_trail
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
   pdf-reader
@@ -881,20 +957,21 @@ DEPENDENCIES
   rails-erd
   rails-i18n
   rails_safe_tasks (~> 1.0)
-  ransack (~> 2.6.0)
+  ransack (~> 4.1.0)
   redcarpet
-  redis (>= 4.0)
+  redis
   responders
-  rexml
   roadie-rails
   roo
   rspec-rails (>= 3.5.2)
   rspec-retry
+  rspec-sql
+  rswag
   rswag-api
-  rswag-specs
   rswag-ui
   rubocop
   rubocop-rails
+  rubocop-rspec
   sd_notify
   select2-rails!
   shoulda-matchers
@@ -904,12 +981,15 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
+  spring-commands-rubocop
   state_machines-activerecord
-  stimulus_reflex (= 3.5.0.rc3)
-  stimulus_reflex_testing
+  stimulus_reflex
+  stimulus_reflex_testing!
   stringex (~> 2.8.5)
   stripe
   timecop
+  turbo-rails
+  turbo_power
   valid_email2
   validates_lengths_from_database
   vcr

Procfile.docker

@@ -0,0 +1,5 @@
+# Foreman Procfile for Docker env. Start all dev server processes with: `bundle exec foreman start -f Procfile.docker`
+
+webpack:    WEBPACKER_DEV_SERVER_HOST=0.0.0.0 ./bin/webpack-dev-server
+sidekiq:    DEV_CACHING=true bundle exec sidekiq -q mailers -q default
+rails:      WEBPACKER_DEV_SERVER_HOST=0.0.0.0 DEV_CACHING=true bundle exec rails s -p 3000 -b 0.0.0.0

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!
 
@@ -44,7 +44,7 @@ We use [KnapsackPro](https://knapsackpro.com/) for optimal parallelisation of ou
 
 ## Licence
 
-Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
@@ -53,4 +53,3 @@ Copyright (c) 2012 - 2022 Open Food Foundation, released under the AGPL licence.
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
 [welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [welcome-qa]: https://github.com/orgs/openfoodfoundation/projects/6
-[zenhub]: https://www.zenhub.com/extension

app/assets/javascripts/admin/all.js

@@ -10,11 +10,11 @@
 //= require jquery.ui.all
 //= require jquery.powertip
 //= require jquery.cookie
-//= require jquery.jstree/jquery.jstree
 //= require jquery.vAlign
 //= require angular
 //= require angular-resource
 //= require angular-animate
+//= require angular-sanitize
 //= require angularjs-file-upload
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ../shared/ng-tags-input.min.js
@@ -61,19 +61,11 @@
 //= require ./variant_overrides/variant_overrides
 
 // text, dates and translations
-//= require textAngular-rangy.min.js
-// This replaces angular-sanitize. We should include only one.
-// https://github.com/textAngular/textAngular#where-to-get-it
-//= require textAngular-sanitize.min.js
-//= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 
-// LocalStorage
-//= require ../shared/angular-local-storage.js
-
 // requires the rest of the JS code in this folder
 //= require_tree .

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

@@ -47,8 +47,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     removeClearedValues()
     params = {
       'q[name_cont]': $scope.q.query,
-      'q[supplier_id_eq]': $scope.q.producerFilter,
-      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
+      'q[variants_supplier_id_eq]': $scope.q.producerFilter,
+      'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter,
       'q[s]': $scope.sorting,
       import_date: $scope.q.importDateFilter,
       page: $scope.page,
@@ -126,8 +126,11 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     DisplayProperties.setShowVariants 0, showVariants
 
   $scope.addVariant = (product) ->
+    # Set new variant category to same as last product variant category to keep compactibility with deleted variant callback to set new variant category
+    newVariantId = $scope.nextVariantId();
+    newVariantCategoryId = product.variants[product.variants.length - 1]?.category_id
     product.variants.push
-      id: $scope.nextVariantId()
+      id: newVariantId
       unit_value: null
       unit_description: null
       on_demand: false
@@ -136,7 +139,9 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       on_hand: null
       price: null
       tax_category_id: null
+      category_id: newVariantCategoryId
     DisplayProperties.setShowVariants product.id, true
+    DirtyProducts.addVariantProperty(product.id, newVariantId, 'category_id', newVariantCategoryId)
 
 
   $scope.nextVariantId = ->
@@ -182,9 +187,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     product.variants.length > 0
 
 
-  $scope.hasUnit = (product) ->
-    product.variant_unit_with_scale?
-
+  $scope.hasUnit = (variant) ->
+    variant.variant_unit_with_scale?
 
   $scope.variantSaved = (variant) ->
     variant.hasOwnProperty('id') && variant.id > 0
@@ -216,8 +220,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         products: productsToSubmit
         filters:
           'q[name_cont]': $scope.q.query
-          'q[supplier_id_eq]': $scope.q.producerFilter
-          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
+          'q[variants_supplier_id_eq]': $scope.q.producerFilter
+          'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter
           'q[s]': $scope.sorting
           import_date: $scope.q.importDateFilter
         page: $scope.page
@@ -237,32 +241,28 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $window.location = destination
 
   $scope.packProduct = (product) ->
-    if product.variant_unit_with_scale
-      match = product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
-      if match
-        product.variant_unit = match[1]
-        product.variant_unit_scale = parseFloat(match[2])
-      else
-        product.variant_unit = product.variant_unit_with_scale
-        product.variant_unit_scale = null
-    else
-      product.variant_unit = product.variant_unit_scale = null
-
-
     if product.variants
       for id, variant of product.variants
-        $scope.packVariant product, variant
+        $scope.packVariant variant
 
 
-  $scope.packVariant = (product, variant) ->
+  $scope.packVariant = (variant) ->
+    if variant.variant_unit_with_scale
+      match = variant.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
+      if match
+        variant.variant_unit = match[1]
+        variant.variant_unit_scale = parseFloat(match[2])
+      else
+        variant.variant_unit = variant.variant_unit_with_scale
+        variant.variant_unit_scale = null
+
     if variant.hasOwnProperty("unit_value_with_description")
       match = variant.unit_value_with_description.match(/^([\d\.\,]+(?= |$)|)( |)(.*)$/)
       if match
-        product = BulkProducts.find product.id
         variant.unit_value  = parseFloat(match[1].replace(",", "."))
         variant.unit_value  = null if isNaN(variant.unit_value)
-        if variant.unit_value && product.variant_unit_scale
-          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, product.variant_unit_scale, 2))
+        if variant.unit_value && variant.variant_unit_scale
+          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, variant.variant_unit_scale, 2))
         variant.unit_description = match[3]
 
   $scope.incrementLimit = ->
@@ -307,34 +307,18 @@ filterSubmitProducts = (productsToFilter) ->
             variantHasUpdatableProperty = result.hasUpdatableProperty
             filteredVariants.push filteredVariant  if variantHasUpdatableProperty
 
-        if product.hasOwnProperty("sku")
-          filteredProduct.sku = product.sku
-          hasUpdatableProperty = true
         if product.hasOwnProperty("name")
           filteredProduct.name = product.name
           hasUpdatableProperty = true
-        if product.hasOwnProperty("producer_id")
-          filteredProduct.supplier_id = product.producer_id
-          hasUpdatableProperty = true
         if product.hasOwnProperty("price")
           filteredProduct.price = product.price
           hasUpdatableProperty = true
-        if product.hasOwnProperty("variant_unit_with_scale")
-          filteredProduct.variant_unit       = product.variant_unit
-          filteredProduct.variant_unit_scale = product.variant_unit_scale
-          hasUpdatableProperty = true
-        if product.hasOwnProperty("variant_unit_name")
-          filteredProduct.variant_unit_name = product.variant_unit_name
-          hasUpdatableProperty = true
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
         if product.hasOwnProperty("on_demand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_demand = product.on_demand
           hasUpdatableProperty = true
-        if product.hasOwnProperty("category_id")
-          filteredProduct.primary_taxon_id = product.category_id
-          hasUpdatableProperty = true
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
@@ -375,9 +359,23 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("tax_category_id")
       filteredVariant.tax_category_id = variant.tax_category_id
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("category_id")
+      filteredVariant.primary_taxon_id = variant.category_id
+      hasUpdatableProperty = true
     if variant.hasOwnProperty("display_as")
       filteredVariant.display_as = variant.display_as
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("producer_id")
+      filteredVariant.supplier_id = variant.producer_id
+      hasUpdatableProperty = true
+    if variant.hasOwnProperty("variant_unit_with_scale")
+      filteredVariant.variant_unit       = variant.variant_unit
+      filteredVariant.variant_unit_scale = variant.variant_unit_scale
+      hasUpdatableProperty = true
+    if variant.hasOwnProperty("variant_unit_name")
+      filteredVariant.variant_unit_name = variant.variant_unit_name
+      hasUpdatableProperty = true
+
   {filteredVariant: filteredVariant, hasUpdatableProperty: hasUpdatableProperty}
 
 

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

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

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

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

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

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

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

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

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

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

app/assets/javascripts/admin/index_utils/filters/attr_filter.js.coffee

@@ -1,12 +1,16 @@
 # Used like a regular angular filter where an object is passed
 # Adds the additional special case that a value of 0 for the filter
 # acts as a bypass for that particular attribute
+
+# NOTE the name doesn't reflect what the filter does, it only fiters on the variant.producer_id
 angular.module("admin.indexUtils").filter "attrFilter", ($filter) ->
   return (objects, filters) ->
-    Object.keys(filters).reduce (filtered, attr) ->
-      filter = filters[attr]
-      return filtered if !filter? || filter == 0
-      return $filter('filter')(filtered, (object) ->
-        object[attr] == filter
-      )
-    , objects
+    filter = filters["producer_id"]
+
+    return objects if !filter? || filter == 0
+
+    return $filter('filter')(objects, (product) ->
+      for variant in product.variants
+        return true if variant["producer_id"] == filter
+      false
+    , true)

app/assets/javascripts/admin/index_utils/services/columns.js.coffee

@@ -31,7 +31,7 @@ angular.module("admin.indexUtils").factory 'Columns', ($rootScope, $http, $injec
     savePreferences: (action_name) =>
       $http
         method: "PUT"
-        url: "/admin/column_preferences/bulk_update"
+        url: "/admin/column_preferences/bulk_update.json"
         data:
           action_name: action_name
           column_preferences: (preference for column_name, preference of @columns)

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

@@ -24,7 +24,10 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     "order_bill_address_firstname",
     "order_bill_address_lastname",
     "order_bill_address_full_name",
-    "variant_product_supplier_name",
+    "order_bill_address_full_name_reversed",
+    "order_bill_address_full_name_with_comma",
+    "order_bill_address_full_name_with_comma_reversed",
+    "variant_supplier_name",
     "order_email",
     "order_number",
     "product_name"].join("_or_") + "_cont"
@@ -78,7 +81,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       "q[order_shipment_state_not_eq]": "shipped",
       "q[order_completed_at_not_null]": "true",
       "q[order_distributor_id_eq]": $scope.distributorFilter,
-      "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
+      "q[variant_supplier_id_eq]": $scope.supplierFilter,
       "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
       "q[order_completed_at_gteq]": if formattedStartDate then formattedStartDate else undefined,
       "q[order_completed_at_lt]": if formattedEndDate then formattedEndDate else undefined,
@@ -102,7 +105,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       Dereferencer.dereferenceAttr $scope.line_items, "supplier", Enterprises.byID
       $scope.loadOrders()
       RequestMonitor.load $q.all([$scope.orders.$promise]).then ->
-        Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID  
+        Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID
         Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
         Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
         $scope.bulk_order_form.$setPristine()
@@ -130,7 +133,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     return $http(
       method: 'GET'
       url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}&restock_items=#{restock_items}")
-  
+
   $scope.deleteLineItem = (lineItem) ->
     if lineItem.order.item_count == 1
       ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) ->
@@ -164,7 +167,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
               $scope.cancelOrder(order, sendEmailCancellation, restock_items).then(-> $scope.refreshData())
             else
               Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
-      , "js.admin.deleting_item_will_cancel_order")   
+      , "js.admin.deleting_item_will_cancel_order")
     else
       ofnDeleteLineItemsAlert(() ->
         Promise.all(LineItems.delete(item) for item in lineItemsToDelete).then(-> $scope.refreshData())
@@ -196,14 +199,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.refreshData()
 
   $scope.getLineItemScale = (lineItem) ->
-    if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume") 
-      lineItem.units_product.variant_unit_scale
+    if lineItem.units_variant && lineItem.units_variant.variant_unit_scale && (lineItem.units_variant.variant_unit == "weight" || lineItem.units_variant.variant_unit == "volume")
+      lineItem.units_variant.variant_unit_scale
     else
       1
 
   $scope.sumUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
+      if lineItem.units_variant.variant_unit == "items"
         sum + lineItem.quantity
       else
         sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
@@ -211,7 +214,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.sumMaxUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-      if lineItem.units_product.variant_unit == "items"
+      if lineItem.units_variant.variant_unit == "items"
         sum + lineItem.max_quantity
       else
         sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
@@ -225,39 +228,41 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
     true
 
-  $scope.getScale = (unitsProduct, unitsVariant) ->
-    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume")
-      unitsProduct.variant_unit_scale
-    else if unitsProduct.hasOwnProperty("variant_unit") && unitsProduct.variant_unit == "items"
+  $scope.getScale = (unitsVariant) ->
+    if unitsVariant.hasOwnProperty("variant_unit") && (unitsVariant.variant_unit == "weight" || unitsVariant.variant_unit == "volume")
+      unitsVariant.variant_unit_scale
+    else if unitsVariant.hasOwnProperty("variant_unit") && unitsVariant.variant_unit == "items"
       1
     else
       null
 
-  $scope.getFormattedValueWithUnitName = (value, unitsProduct, unitsVariant, scale) ->
-    unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+  $scope.getFormattedValueWithUnitName = (value, unitsVariant, scale) ->
+    unit_name = VariantUnitManager.getUnitName(scale, unitsVariant.variant_unit)
     $scope.roundToThreeDecimals(value) + " " + unit_name
 
-  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
-    scale = $scope.getScale(unitsProduct, unitsVariant)
+  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsVariant) ->
+    scale = $scope.getScale(unitsVariant)
     if scale && value
       value = value / scale if scale != 28.35 && scale != 1 && scale != 453.6 # divide by scale if not smallest unit
-      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+      $scope.getFormattedValueWithUnitName(value, unitsVariant, scale)
     else
       ''
 
-  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
-    scale = $scope.getScale(unitsProduct, unitsVariant)
+  $scope.formattedValueWithUnitName = (value, unitsVariant) ->
+    scale = $scope.getScale(unitsVariant)
     if scale
-      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
-    else 
+      $scope.getFormattedValueWithUnitName(value, unitsVariant, scale)
+    else
       ''
 
   $scope.fulfilled = (sumOfUnitValues) ->
     # A Units Variant is an API object which holds unit properies of a variant
-    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size")&& $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
-      $scope.selectedUnitsProduct.hasOwnProperty("variant_unit")
-        if $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume"
-          scale = $scope.selectedUnitsProduct.variant_unit_scale
+    if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
+      $scope.selectedUnitsVariant.hasOwnProperty("variant_unit")
+
+        if $scope.selectedUnitsVariant.variant_unit == "weight" || $scope.selectedUnitsVariant.variant_unit == "volume"
+
+          scale = $scope.selectedUnitsVariant.variant_unit_scale
           sumOfUnitValues = sumOfUnitValues * scale unless scale == 28.35 || scale == 453.6
         $scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size)
     else

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

@@ -3,6 +3,7 @@ angular.module('admin.orderCycles')
     $controller('AdminOrderCycleBasicCtrl', {$scope: $scope, ocInstance: ocInstance})
 
     order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
+    $scope.order_cycle_id = order_cycle_id
     $scope.order_cycle = OrderCycle.load(order_cycle_id)
     $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
     $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
@@ -18,6 +19,8 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
+      $scope.order_cycle?.trigger_action = $($event.target).data('trigger-action');
+      $scope.order_cycle?.confirm = $($event.target).data('confirm');
       StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
 
@@ -25,4 +28,4 @@ angular.module('admin.orderCycles')
       if $scope.order_cycle_form?.$dirty
         t('admin.unsaved_confirm_leave')
 
-    NavigationCheck.register(warnAboutUnsavedChanges)
+    NavigationCheck.register(warnAboutUnsavedChanges)

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

@@ -1,8 +1,9 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $rootScope, $controller, $location, Enterprise, OrderCycle, ExchangeProduct, ocInstance) ->
+angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $rootScope, $controller, $location, Enterprise, EnterpriseFee, OrderCycle, ExchangeProduct, ocInstance) ->
   $controller('AdminOrderCycleExchangesCtrl', {$scope: $scope, ocInstance: ocInstance, $location: $location})
 
   $scope.view = 'incoming'
-
+  # NB: weirdly at this next line $scope.order_cycle.id comes out undefined so we use $scope.order_cycle_id instead
+  $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.order_cycle_id, per_item: true)
   $scope.exchangeTotalVariants = (exchange) ->
     return unless $scope.enterprises? && $scope.enterprises[exchange.enterprise_id]?
 

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

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

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

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

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

@@ -6,6 +6,8 @@ angular.module('admin.orderCycles').factory('EnterpriseFee', ($resource) ->
       params:
         order_cycle_id: '@order_cycle_id'
         coordinator_id: '@coordinator_id'
+        per_item: '@per_item'
+        per_order: '@per_order'
   })
 
   {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,29 +0,0 @@
-angular.module("admin.indexUtils").factory 'KeyValueMapStore', (localStorageService)->
-  new class KeyValueMapStore
-    localStorageKey: ''
-    storableKeys: []
-
-    constructor: ->
-      localStorageService.setStorageType("sessionStorage")
-
-    getStoredKeyValueMap: ->
-      localStorageService.get(@localStorageKey) || {}
-
-    setStoredValues: (source) ->
-      keyValueMap = {}
-      for key in @storableKeys
-        keyValueMap[key] = source[key]
-      localStorageService.set(@localStorageKey, keyValueMap)
-
-    restoreValues: (target) ->
-      storedKeyValueMap = @getStoredKeyValueMap()
-      
-      return false if _.isEmpty(storedKeyValueMap)  
-      
-      for k,v of storedKeyValueMap
-       target[k] = v
-
-      return true
-
-    clearKeyValueMap: () ->
-      localStorageService.remove(@localStorageKey)

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

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

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

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

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

@@ -50,11 +50,11 @@ $(document).ready(function() {
       if (quantity > maxQuantity) {
         quantity = maxQuantity;
         save.parents('tr').find('input.line_item_quantity').val(maxQuantity);
-        ofnAlert(t("js.admin.orders.quantity_adjusted"));
+        ofnAlert(t("js.admin.orders.quantity_unavailable"));
+      } else {
+        adjustItems(shipment_number, variant_id, quantity, true);
       }
-      toggleItemEdit();
 
-      adjustItems(shipment_number, variant_id, quantity, true);
       return false;
     }
     $('a.save-item').click(handle_save_click);
@@ -187,18 +187,17 @@ addVariantFromStockLocation = function() {
   $('#stock_details').hide();
 
   var variant_id = $('input.variant_autocomplete').val();
-  var stock_location_id = $(this).data('stock-location-id');
-  var quantity = $("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
+  var quantity = $("input.quantity").val();
 
   var shipment = _.find(shipments, function(shipment){
-    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
+    return shipment.state == 'ready' || shipment.state == 'pending';
   });
 
   if(shipment==undefined){
     $.ajax({
       type: "POST",
       url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
-      data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
+      data: { variant_id: variant_id, quantity: quantity }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/javascripts/admin/variant_overrides/directives/track_inheritance.js.coffee

@@ -2,10 +2,10 @@ angular.module("admin.variantOverrides").directive "trackInheritance", (VariantO
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     # This is a bit hacky, but it allows us to load the inherit property on the VO, but then not submit it
-    scope.inherit = angular.equals scope.variantOverrides[scope.hub_id][scope.variant.id], VariantOverrides.newFor scope.hub_id, scope.variant.id
+    scope.inherit = angular.equals scope.variantOverrides[scope.hub_id][scope.variant.id], VariantOverrides.newFor scope.hub_id, scope.variant
 
     ngModel.$parsers.push (viewValue) ->
       if ngModel.$dirty && viewValue
-        DirtyVariantOverrides.inherit scope.hub_id, scope.variant.id, scope.variantOverrides[scope.hub_id][scope.variant.id].id
+        DirtyVariantOverrides.inherit scope.hub_id, scope.variant, scope.variantOverrides[scope.hub_id][scope.variant.id].id
         scope.displayDirty()
       viewValue

app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee

@@ -2,4 +2,8 @@ angular.module("admin.variantOverrides").filter "hubPermissions", ($filter) ->
   return (products, hubPermissions, hub_id) ->
     return [] if !hub_id
     return [] if !hubPermissions[hub_id]
-    return $filter('filter')(products, ((product) -> hubPermissions[hub_id].indexOf(product.producer_id) > -1), true)
+
+    return $filter('filter')(products, ((product) ->
+      for variant in product.variants
+        return hubPermissions[hub_id].indexOf(variant.producer_id) > -1
+     ), true)

app/assets/javascripts/admin/variant_overrides/services/dirty_variant_overrides.js.coffee

@@ -12,11 +12,11 @@ angular.module("admin.variantOverrides").factory "DirtyVariantOverrides", ($http
         @add(hub_id, variant_id, vo_id)
         @dirtyVariantOverrides[hub_id][variant_id][attr] = value
 
-    inherit: (hub_id, variant_id, vo_id) ->
-      @add(hub_id, variant_id, vo_id)
-      blankVo = angular.copy(VariantOverrides.inherit(hub_id, variant_id))
+    inherit: (hub_id, variant, vo_id) ->
+      @add(hub_id, variant.id, vo_id)
+      blankVo = angular.copy(VariantOverrides.inherit(hub_id, variant))
       delete blankVo[attr] for attr, value of blankVo when attr not in @requiredAttrs()
-      @dirtyVariantOverrides[hub_id][variant_id] = blankVo
+      @dirtyVariantOverrides[hub_id][variant.id] = blankVo
 
     count: ->
       count = 0

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

@@ -13,17 +13,18 @@ angular.module("admin.variantOverrides").factory "VariantOverrides", (variantOve
         @variantOverrides[hub.id] ||= {}
         for product in products
           for variant in product.variants
-            @inherit(hub.id, variant.id) unless @variantOverrides[hub.id][variant.id]
+            @inherit(hub.id, variant) unless @variantOverrides[hub.id][variant.id]
 
-    inherit: (hub_id, variant_id) ->
+    inherit: (hub_id, variant) ->
       # This method is called from the trackInheritance directive, to reinstate inheritance
-      @variantOverrides[hub_id][variant_id] ||= {}
-      angular.extend @variantOverrides[hub_id][variant_id], @newFor hub_id, variant_id
+      @variantOverrides[hub_id][variant.id] ||= {}
+      angular.extend @variantOverrides[hub_id][variant.id], @newFor(hub_id, variant)
 
-    newFor: (hub_id, variant_id) ->
+    newFor: (hub_id, variant) ->
       # These properties need to match those checked in VariantOverrideSet.deletable?
       hub_id: hub_id
-      variant_id: variant_id
+      variant_id: variant.id
+      producer_id: variant.producer_id
       sku: null
       price: null
       count_on_hand: null

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

@@ -17,7 +17,6 @@
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 #= require ../shared/ng-infinite-scroll.min.js
-#= require ../shared/angular-local-storage.js
 #= require ../shared/angular-slideables.js
 #= require ../shared/shared
 #= require_tree ../shared/directives

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

@@ -4,15 +4,18 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
   $scope.query = ""
   $scope.taxonSelectors = FilterSelectorsService.createSelectors()
   $scope.propertySelectors = FilterSelectorsService.createSelectors()
+  $scope.producerPropertySelectors = FilterSelectorsService.createSelectors()
   $scope.filtersActive = true
   $scope.page = 1
   $scope.per_page = 10
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.supplied_taxons = null
   $scope.supplied_properties = null
+  $scope.supplied_producer_properties = null
   $scope.showFilterSidebar = false
   $scope.activeTaxons = []
   $scope.activeProperties = []
+  $scope.activeProducerProperties = []
 
   # Update filters after initial load of shop tab
   $timeout =>
@@ -45,6 +48,12 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
         $scope.supplied_properties[property.id] = Properties.properties_by_id[property.id]
       )
 
+    OrderCycleResource.producerProperties params, (data)=>
+      $scope.supplied_producer_properties = {}
+      data.map( (property) ->
+        $scope.supplied_producer_properties[property.id] = Properties.properties_by_id[property.id]
+      )
+
   $scope.loadMore = ->
     if ($scope.page * $scope.per_page) <= Products.products.length
       $scope.loadMoreProducts()
@@ -52,6 +61,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
   $scope.$watch 'query', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
   $scope.$watchCollection 'activeTaxons', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
   $scope.$watchCollection 'activeProperties', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
+  $scope.$watchCollection 'activeProducerProperties', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
 
   $scope.loadProducts = ->
     $scope.page = 1
@@ -66,9 +76,10 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       id: $scope.order_cycle.order_cycle_id,
       page: page || $scope.page,
       per_page: $scope.per_page,
-      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_variants_supplier_name_cont]': $scope.query,
       'q[with_properties][]': $scope.activeProperties,
-      'q[primary_taxon_id_in_any][]': $scope.activeTaxons
+      'q[with_variants_supplier_properties][]': $scope.activeProducerProperties,
+      'q[variants_primary_taxon_id_in_any][]': $scope.activeTaxons
     }
 
   $scope.searchKeypress = (e)->
@@ -86,6 +97,12 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       Properties.properties_by_id[property_id].name
     ).join($scope.filtersJoinWord()) if $scope.activeProperties?
 
+  $scope.appliedProducerPropertiesList = ->
+    $scope.activeProducerProperties.map( (property_id) ->
+      Properties.properties_by_id[property_id].name
+    ).join($scope.filtersJoinWord()) if $scope.activeProducerProperties?
+
+
   $scope.filtersJoinWord = ->
     $sce.trustAsHtml(" <span class='join-word'>#{t('products_or')}</span> ")
 
@@ -99,6 +116,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
   $scope.clearFilters = ->
     $scope.taxonSelectors.clearAll()
     $scope.propertySelectors.clearAll()
+    $scope.producerPropertySelectors.clearAll()
 
   $scope.refreshStaleData = ->
     # If the products template has already been loaded but the controller is being initialized
@@ -109,7 +127,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       $scope.loadProducts()
 
   $scope.filtersCount = () ->
-    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive()
+    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive() + $scope.producerPropertySelectors.totalActive()
 
   $scope.toggleFilterSidebar = ->
     $scope.showFilterSidebar = !$scope.showFilterSidebar

app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee

@@ -42,8 +42,17 @@ angular.module('Darkswarm').controller "RegistrationCtrl", ($scope, Registration
   $scope.toggleAddressConfirmed = ->
     $scope.addressConfirmed = !$scope.addressConfirmed
     if $scope.addressConfirmed
+      $scope.setLatLongIfUsingOpenStreetMap()
       $scope.enterprise.address.latitude = $scope.latLong.latitude
       $scope.enterprise.address.longitude = $scope.latLong.longitude
     else
       $scope.enterprise.address.latitude = null
       $scope.enterprise.address.longitude = null
+
+  # When OpenStreetMaps is enabled the latitude and longitude are calculated via a Stimulus
+  # controller, so they need to be read from data properties to be accessible here.
+  $scope.setLatLongIfUsingOpenStreetMap = ->
+    openStreetMap = document.getElementById("open-street-map")
+    if !$scope.latLong && openStreetMap && openStreetMap.dataset.latitude && openStreetMap.dataset.longitude
+      $scope.latLong = { latitude: openStreetMap.dataset.latitude, longitude: openStreetMap.dataset.longitude }
+

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

@@ -1,7 +1,6 @@
 angular.module("Darkswarm", [
   'ngResource',
   'mm.foundation',
-  'LocalStorageModule',
   'infinite-scroll',
   'angular-flash.service',
   'templates',

app/assets/javascripts/darkswarm/directives/disable_scroll.js.coffee

@@ -1,10 +0,0 @@
-angular.module('Darkswarm').directive "ofnDisableScroll", ()->
-  # Stops scrolling from incrementing or decrementing input value
-  # Useful for number inputs
-  restrict: 'A'
-  link: (scope, element, attrs)->
-    element.bind 'focus', ->
-      element.bind 'mousewheel', (e)->
-        e.preventDefault()
-    element.bind 'blur', ->
-      element.unbind 'mousewheel'

app/assets/javascripts/darkswarm/directives/integer.js.coffee

@@ -1,5 +0,0 @@
-angular.module('Darkswarm').directive "integer", ->
-  restrict: 'A'
-  link: (scope, elem, attr) ->
-    elem.bind 'input', ->
-      elem.val Math.round(elem.val())

app/assets/javascripts/darkswarm/directives/map_search.js.coffee

@@ -20,10 +20,13 @@ angular.module('Darkswarm').directive 'mapSearch', ($timeout, Search) ->
     $timeout =>
       map = ctrl.getMap()
 
-      searchBox = scope.createSearchBox map
-      scope.bindSearchResponse map, searchBox
-      scope.biasResults map, searchBox
-      scope.performUrlSearch map
+      if !map
+        alert(t('gmap_load_failure'))
+      else
+        searchBox = scope.createSearchBox map
+        scope.bindSearchResponse map, searchBox
+        scope.biasResults map, searchBox
+        scope.performUrlSearch map
 
     scope.createSearchBox = (map) ->
       map.controls[google.maps.ControlPosition.TOP_LEFT].push scope.input

app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee

@@ -13,6 +13,8 @@ angular.module('Darkswarm').directive 'ofnOpenStreetMap', ($window, MapCentreCal
 
     buildMarker = (enterprise, latlng, title) ->
       icon = L.icon
+        iconAnchor: [14, 33]
+        iconSize: [28, 33]
         iconUrl: enterprise.icon
       marker = L.marker latlng,
         draggable:   true,

app/assets/javascripts/darkswarm/directives/render_svg.js.coffee

@@ -1,14 +0,0 @@
-angular.module('Darkswarm').directive "renderSvg", ()->
-  # Magical directive that'll render SVGs from URLs
-  # If only there were a neater way of doing this
-  restrict: 'E'
-  priority: 99
-  template: "<svg-wrapper></svg-wrapper>"
-
-  # Fetch SVG via ajax, inject into page using DOM
-  link: (scope, elem, attr)->
-    if /.svg/.test attr.path # Only do this if we've got an svg
-      $.ajax
-        url: attr.path
-        success: (html)->
-          elem.html($(html).find("svg"))

app/assets/javascripts/darkswarm/directives/scrollto.js.coffee

@@ -1,9 +0,0 @@
-angular.module('Darkswarm').directive "ofnScrollTo", ($location, $anchorScroll)->
-  # Onclick sets $location.hash to attrs.ofnScrollTo
-  # Then triggers anchorScroll
-  restrict: 'A'
-  link: (scope, element, attrs)->
-    element.bind 'click', (ev)->
-      ev.stopPropagation()
-      $location.hash attrs.ofnScrollTo 
-      $anchorScroll()

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

@@ -1,4 +1,4 @@
-angular.module('Darkswarm').factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, Messages) ->
+angular.module('Darkswarm').factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, Messages) ->
   # Handles syncing of current cart/order state to server
   new class Cart
     dirty: false
@@ -113,7 +113,6 @@ angular.module('Darkswarm').factory 'Cart', (CurrentOrder, Variants, $timeout, $
 
     clear: ->
       @line_items = []
-      localStorageService.clearAll() # One day this will have to be moar GRANULAR
 
     isOnlyItemInOrder: (id) =>
       deletedItem = @line_items_finalised.find((item) -> item.id == id)

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

@@ -18,4 +18,11 @@ angular.module('Darkswarm').factory 'OrderCycleResource', ($resource) ->
       url: '/api/v0/order_cycles/:id/properties.json'
       params:
         id: '@id'
+    'producerProperties':
+      method: 'GET'
+      isArray: true
+      url: '/api/v0/order_cycles/:id/producer_properties.json'
+      params:
+        id: '@id'
+
   })

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

@@ -39,7 +39,7 @@ angular.module('Darkswarm').factory 'Products', (OrderCycleResource, OrderCycle,
 
     dereference: ->
       for product in @fetched_products
-        product.supplier = Shopfront.producers_by_id[product.supplier.id]
+        product.supplier = Shopfront.producers_by_id[product.variants[0].supplier.id]
         Dereferencer.dereference product.taxons, Taxons.taxons_by_id
 
         product.properties = angular.copy(product.properties_with_values)

app/assets/javascripts/shared/angular-local-storage.js

@@ -1,546 +0,0 @@
-/**
- * An Angular module that gives you access to the browsers local storage
- * @version v0.5.0 - 2016-08-29
- * @link https://github.com/grevory/angular-local-storage
- * @author grevory <greg@gregpike.ca>
- * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-(function (window, angular) {
-var isDefined = angular.isDefined,
-  isUndefined = angular.isUndefined,
-  isNumber = angular.isNumber,
-  isObject = angular.isObject,
-  isArray = angular.isArray,
-  extend = angular.extend,
-  toJson = angular.toJson;
-
-angular
-  .module('LocalStorageModule', [])
-  .provider('localStorageService', function() {
-    // You should set a prefix to avoid overwriting any local storage variables from the rest of your app
-    // e.g. localStorageServiceProvider.setPrefix('yourAppName');
-    // With provider you can use config as this:
-    // myApp.config(function (localStorageServiceProvider) {
-    //    localStorageServiceProvider.prefix = 'yourAppName';
-    // });
-    this.prefix = 'ls';
-
-    // You could change web storage type localstorage or sessionStorage
-    this.storageType = 'localStorage';
-
-    // Cookie options (usually in case of fallback)
-    // expiry = Number of days before cookies expire // 0 = Does not expire
-    // path = The web path the cookie represents
-    // secure = Wether the cookies should be secure (i.e only sent on HTTPS requests)
-    this.cookie = {
-      expiry: 30,
-      path: '/',
-      secure: false
-    };
-
-    // Decides wether we should default to cookies if localstorage is not supported.
-    this.defaultToCookie = true;
-
-    // Send signals for each of the following actions?
-    this.notify = {
-      setItem: true,
-      removeItem: false
-    };
-
-    // Setter for the prefix
-    this.setPrefix = function(prefix) {
-      this.prefix = prefix;
-      return this;
-    };
-
-    // Setter for the storageType
-    this.setStorageType = function(storageType) {
-      this.storageType = storageType;
-      return this;
-    };
-    // Setter for defaultToCookie value, default is true.
-    this.setDefaultToCookie = function (shouldDefault) {
-      this.defaultToCookie = !!shouldDefault; // Double-not to make sure it's a bool value.
-      return this;
-    };
-    // Setter for cookie config
-    this.setStorageCookie = function(exp, path, secure) {
-      this.cookie.expiry = exp;
-      this.cookie.path = path;
-      this.cookie.secure = secure;
-      return this;
-    };
-
-    // Setter for cookie domain
-    this.setStorageCookieDomain = function(domain) {
-      this.cookie.domain = domain;
-      return this;
-    };
-
-    // Setter for notification config
-    // itemSet & itemRemove should be booleans
-    this.setNotify = function(itemSet, itemRemove) {
-      this.notify = {
-        setItem: itemSet,
-        removeItem: itemRemove
-      };
-      return this;
-    };
-
-    this.$get = ['$rootScope', '$window', '$document', '$parse','$timeout', function($rootScope, $window, $document, $parse, $timeout) {
-      var self = this;
-      var prefix = self.prefix;
-      var cookie = self.cookie;
-      var notify = self.notify;
-      var storageType = self.storageType;
-      var webStorage;
-
-      // When Angular's $document is not available
-      if (!$document) {
-        $document = document;
-      } else if ($document[0]) {
-        $document = $document[0];
-      }
-
-      // If there is a prefix set in the config lets use that with an appended period for readability
-      if (prefix.substr(-1) !== '.') {
-        prefix = !!prefix ? prefix + '.' : '';
-      }
-      var deriveQualifiedKey = function(key) {
-        return prefix + key;
-      };
-
-      // Removes prefix from the key.
-      var underiveQualifiedKey = function (key) {
-        return key.replace(new RegExp('^' + prefix, 'g'), '');
-      };
-
-      // Check if the key is within our prefix namespace.
-      var isKeyPrefixOurs = function (key) {
-        return key.indexOf(prefix) === 0;
-      };
-
-      // Checks the browser to see if local storage is supported
-      var checkSupport = function () {
-        try {
-          var supported = (storageType in $window && $window[storageType] !== null);
-
-          // When Safari (OS X or iOS) is in private browsing mode, it appears as though localStorage
-          // is available, but trying to call .setItem throws an exception.
-          //
-          // "QUOTA_EXCEEDED_ERR: DOM Exception 22: An attempt was made to add something to storage
-          // that exceeded the quota."
-          var key = deriveQualifiedKey('__' + Math.round(Math.random() * 1e7));
-          if (supported) {
-            webStorage = $window[storageType];
-            webStorage.setItem(key, '');
-            webStorage.removeItem(key);
-          }
-
-          return supported;
-        } catch (e) {
-          // Only change storageType to cookies if defaulting is enabled.
-          if (self.defaultToCookie)
-            storageType = 'cookie';
-          $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-          return false;
-        }
-      };
-      var browserSupportsLocalStorage = checkSupport();
-
-      // Directly adds a value to local storage
-      // If local storage is not available in the browser use cookies
-      // Example use: localStorageService.add('library','angular');
-      var addToLocalStorage = function (key, value, type) {
-        setStorageType(type);
-
-        // Let's convert undefined values to null to get the value consistent
-        if (isUndefined(value)) {
-          value = null;
-        } else {
-          value = toJson(value);
-        }
-
-        // If this browser does not support local storage use cookies
-        if (!browserSupportsLocalStorage && self.defaultToCookie || self.storageType === 'cookie') {
-          if (!browserSupportsLocalStorage) {
-            $rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
-          }
-
-          if (notify.setItem) {
-            $rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: 'cookie'});
-          }
-          return addToCookies(key, value);
-        }
-
-        try {
-          if (webStorage) {
-            webStorage.setItem(deriveQualifiedKey(key), value);
-          }
-          if (notify.setItem) {
-            $rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: self.storageType});
-          }
-        } catch (e) {
-          $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-          return addToCookies(key, value);
-        }
-        return true;
-      };
-
-      // Directly get a value from local storage
-      // Example use: localStorageService.get('library'); // returns 'angular'
-      var getFromLocalStorage = function (key, type) {
-        setStorageType(type);
-
-        if (!browserSupportsLocalStorage && self.defaultToCookie  || self.storageType === 'cookie') {
-          if (!browserSupportsLocalStorage) {
-            $rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
-          }
-
-          return getFromCookies(key);
-        }
-
-        var item = webStorage ? webStorage.getItem(deriveQualifiedKey(key)) : null;
-        // angular.toJson will convert null to 'null', so a proper conversion is needed
-        // FIXME not a perfect solution, since a valid 'null' string can't be stored
-        if (!item || item === 'null') {
-          return null;
-        }
-
-        try {
-          return JSON.parse(item);
-        } catch (e) {
-          return item;
-        }
-      };
-
-      // Remove an item from local storage
-      // Example use: localStorageService.remove('library'); // removes the key/value pair of library='angular'
-      //
-      // This is var-arg removal, check the last argument to see if it is a storageType
-      // and set type accordingly before removing.
-      //
-      var removeFromLocalStorage = function () {
-        // can't pop on arguments, so we do this
-        var consumed = 0;
-        if (arguments.length >= 1 &&
-            (arguments[arguments.length - 1] === 'localStorage' ||
-             arguments[arguments.length - 1] === 'sessionStorage')) {
-          consumed = 1;
-          setStorageType(arguments[arguments.length - 1]);
-        }
-
-        var i, key;
-        for (i = 0; i < arguments.length - consumed; i++) {
-          key = arguments[i];
-          if (!browserSupportsLocalStorage && self.defaultToCookie || self.storageType === 'cookie') {
-            if (!browserSupportsLocalStorage) {
-              $rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
-            }
-
-            if (notify.removeItem) {
-              $rootScope.$broadcast('LocalStorageModule.notification.removeitem', {key: key, storageType: 'cookie'});
-            }
-            removeFromCookies(key);
-          }
-          else {
-            try {
-              webStorage.removeItem(deriveQualifiedKey(key));
-              if (notify.removeItem) {
-                $rootScope.$broadcast('LocalStorageModule.notification.removeitem', {
-                  key: key,
-                  storageType: self.storageType
-                });
-              }
-            } catch (e) {
-              $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-              removeFromCookies(key);
-            }
-          }
-        }
-      };
-
-      // Return array of keys for local storage
-      // Example use: var keys = localStorageService.keys()
-      var getKeysForLocalStorage = function (type) {
-        setStorageType(type);
-
-        if (!browserSupportsLocalStorage) {
-          $rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
-          return [];
-        }
-
-        var prefixLength = prefix.length;
-        var keys = [];
-        for (var key in webStorage) {
-          // Only return keys that are for this app
-          if (key.substr(0, prefixLength) === prefix) {
-            try {
-              keys.push(key.substr(prefixLength));
-            } catch (e) {
-              $rootScope.$broadcast('LocalStorageModule.notification.error', e.Description);
-              return [];
-            }
-          }
-        }
-        return keys;
-      };
-
-      // Remove all data for this app from local storage
-      // Also optionally takes a regular expression string and removes the matching key-value pairs
-      // Example use: localStorageService.clearAll();
-      // Should be used mostly for development purposes
-      var clearAllFromLocalStorage = function (regularExpression, type) {
-        setStorageType(type);
-
-        // Setting both regular expressions independently
-        // Empty strings result in catchall RegExp
-        var prefixRegex = !!prefix ? new RegExp('^' + prefix) : new RegExp();
-        var testRegex = !!regularExpression ? new RegExp(regularExpression) : new RegExp();
-
-        if (!browserSupportsLocalStorage && self.defaultToCookie  || self.storageType === 'cookie') {
-          if (!browserSupportsLocalStorage) {
-            $rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
-          }
-          return clearAllFromCookies();
-        }
-        if (!browserSupportsLocalStorage && !self.defaultToCookie)
-          return false;
-        var prefixLength = prefix.length;
-
-        for (var key in webStorage) {
-          // Only remove items that are for this app and match the regular expression
-          if (prefixRegex.test(key) && testRegex.test(key.substr(prefixLength))) {
-            try {
-              removeFromLocalStorage(key.substr(prefixLength));
-            } catch (e) {
-              $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-              return clearAllFromCookies();
-            }
-          }
-        }
-        return true;
-      };
-
-      // Checks the browser to see if cookies are supported
-      var browserSupportsCookies = (function() {
-        try {
-          return $window.navigator.cookieEnabled ||
-          ("cookie" in $document && ($document.cookie.length > 0 ||
-            ($document.cookie = "test").indexOf.call($document.cookie, "test") > -1));
-          } catch (e) {
-            $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-            return false;
-          }
-        }());
-
-        // Directly adds a value to cookies
-        // Typically used as a fallback if local storage is not available in the browser
-        // Example use: localStorageService.cookie.add('library','angular');
-        var addToCookies = function (key, value, daysToExpiry, secure) {
-
-          if (isUndefined(value)) {
-            return false;
-          } else if(isArray(value) || isObject(value)) {
-            value = toJson(value);
-          }
-
-          if (!browserSupportsCookies) {
-            $rootScope.$broadcast('LocalStorageModule.notification.error', 'COOKIES_NOT_SUPPORTED');
-            return false;
-          }
-
-          try {
-            var expiry = '',
-            expiryDate = new Date(),
-            cookieDomain = '';
-
-            if (value === null) {
-              // Mark that the cookie has expired one day ago
-              expiryDate.setTime(expiryDate.getTime() + (-1 * 24 * 60 * 60 * 1000));
-              expiry = "; expires=" + expiryDate.toGMTString();
-              value = '';
-            } else if (isNumber(daysToExpiry) && daysToExpiry !== 0) {
-              expiryDate.setTime(expiryDate.getTime() + (daysToExpiry * 24 * 60 * 60 * 1000));
-              expiry = "; expires=" + expiryDate.toGMTString();
-            } else if (cookie.expiry !== 0) {
-              expiryDate.setTime(expiryDate.getTime() + (cookie.expiry * 24 * 60 * 60 * 1000));
-              expiry = "; expires=" + expiryDate.toGMTString();
-            }
-            if (!!key) {
-              var cookiePath = "; path=" + cookie.path;
-              if (cookie.domain) {
-                cookieDomain = "; domain=" + cookie.domain;
-              }
-              /* Providing the secure parameter always takes precedence over config
-               * (allows developer to mix and match secure + non-secure) */
-              if (typeof secure === 'boolean') {
-                  if (secure === true) {
-                      /* We've explicitly specified secure,
-                       * add the secure attribute to the cookie (after domain) */
-                      cookieDomain += "; secure";
-                  }
-                  // else - secure has been supplied but isn't true - so don't set secure flag, regardless of what config says
-              }
-              else if (cookie.secure === true) {
-                  // secure parameter wasn't specified, get default from config
-                  cookieDomain += "; secure";
-              }
-              $document.cookie = deriveQualifiedKey(key) + "=" + encodeURIComponent(value) + expiry + cookiePath + cookieDomain;
-            }
-          } catch (e) {
-            $rootScope.$broadcast('LocalStorageModule.notification.error', e.message);
-            return false;
-          }
-          return true;
-        };
-
-        // Directly get a value from a cookie
-        // Example use: localStorageService.cookie.get('library'); // returns 'angular'
-        var getFromCookies = function (key) {
-          if (!browserSupportsCookies) {
-            $rootScope.$broadcast('LocalStorageModule.notification.error', 'COOKIES_NOT_SUPPORTED');
-            return false;
-          }
-
-          var cookies = $document.cookie && $document.cookie.split(';') || [];
-          for(var i=0; i < cookies.length; i++) {
-            var thisCookie = cookies[i];
-            while (thisCookie.charAt(0) === ' ') {
-              thisCookie = thisCookie.substring(1,thisCookie.length);
-            }
-            if (thisCookie.indexOf(deriveQualifiedKey(key) + '=') === 0) {
-              var storedValues = decodeURIComponent(thisCookie.substring(prefix.length + key.length + 1, thisCookie.length));
-              try {
-                return JSON.parse(storedValues);
-              } catch(e) {
-                return storedValues;
-              }
-            }
-          }
-          return null;
-        };
-
-        var removeFromCookies = function (key) {
-          addToCookies(key,null);
-        };
-
-        var clearAllFromCookies = function () {
-          var thisCookie = null;
-          var prefixLength = prefix.length;
-          var cookies = $document.cookie.split(';');
-          for(var i = 0; i < cookies.length; i++) {
-            thisCookie = cookies[i];
-
-            while (thisCookie.charAt(0) === ' ') {
-              thisCookie = thisCookie.substring(1, thisCookie.length);
-            }
-
-            var key = thisCookie.substring(prefixLength, thisCookie.indexOf('='));
-            removeFromCookies(key);
-          }
-        };
-
-        var getStorageType = function() {
-          return storageType;
-        };
-
-        var setStorageType = function(type) {
-          if (type && storageType !== type) {
-            storageType = type;
-            browserSupportsLocalStorage = checkSupport();
-          }
-          return browserSupportsLocalStorage;
-        };
-
-        // Add a listener on scope variable to save its changes to local storage
-        // Return a function which when called cancels binding
-        var bindToScope = function(scope, key, def, lsKey, type) {
-          lsKey = lsKey || key;
-          var value = getFromLocalStorage(lsKey, type);
-
-          if (value === null && isDefined(def)) {
-            value = def;
-          } else if (isObject(value) && isObject(def)) {
-            value = extend(value, def);
-          }
-
-          $parse(key).assign(scope, value);
-
-          return scope.$watch(key, function(newVal) {
-            addToLocalStorage(lsKey, newVal, type);
-          }, isObject(scope[key]));
-        };
-
-        // Add listener to local storage, for update callbacks.
-        if (browserSupportsLocalStorage) {
-            if ($window.addEventListener) {
-                $window.addEventListener("storage", handleStorageChangeCallback, false);
-                $rootScope.$on('$destroy', function() {
-                    $window.removeEventListener("storage", handleStorageChangeCallback);
-                });
-            } else if($window.attachEvent){
-                // attachEvent and detachEvent are proprietary to IE v6-10
-                $window.attachEvent("onstorage", handleStorageChangeCallback);
-                $rootScope.$on('$destroy', function() {
-                    $window.detachEvent("onstorage", handleStorageChangeCallback);
-                });
-            }
-        }
-
-        // Callback handler for storage changed.
-        function handleStorageChangeCallback(e) {
-            if (!e) { e = $window.event; }
-            if (notify.setItem) {
-                if (isKeyPrefixOurs(e.key)) {
-                    var key = underiveQualifiedKey(e.key);
-                    // Use timeout, to avoid using $rootScope.$apply.
-                    $timeout(function () {
-                        $rootScope.$broadcast('LocalStorageModule.notification.changed', { key: key, newvalue: e.newValue, storageType: self.storageType });
-                    });
-                }
-            }
-        }
-
-        // Return localStorageService.length
-        // ignore keys that not owned
-        var lengthOfLocalStorage = function(type) {
-          setStorageType(type);
-
-          var count = 0;
-          var storage = $window[storageType];
-          for(var i = 0; i < storage.length; i++) {
-            if(storage.key(i).indexOf(prefix) === 0 ) {
-              count++;
-            }
-          }
-          return count;
-        };
-
-        return {
-          isSupported: browserSupportsLocalStorage,
-          getStorageType: getStorageType,
-          setStorageType: setStorageType,
-          set: addToLocalStorage,
-          add: addToLocalStorage, //DEPRECATED
-          get: getFromLocalStorage,
-          keys: getKeysForLocalStorage,
-          remove: removeFromLocalStorage,
-          clearAll: clearAllFromLocalStorage,
-          bind: bindToScope,
-          deriveKey: deriveQualifiedKey,
-          underiveKey: underiveQualifiedKey,
-          length: lengthOfLocalStorage,
-          defaultToCookie: this.defaultToCookie,
-          cookie: {
-            isSupported: browserSupportsCookies,
-            set: addToCookies,
-            add: addToCookies, //DEPRECATED
-            get: getFromCookies,
-            remove: removeFromCookies,
-            clearAll: clearAllFromCookies
-          }
-        };
-      }];
-  });
-})(window, window.angular);

app/assets/javascripts/shared/shared.js.coffee

@@ -1,5 +1,4 @@
 window.OFNShared = angular.module("OFNShared", [
   "mm.foundation",
-  "LocalStorageModule"
 ]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

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

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

app/assets/javascripts/templates/admin/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,14 @@
-.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{ 'ng-show' => "expanded" }
     .menu_items
-      .menu_item{ ng: { repeat: "column in columns", click: "toggle(column);" } }
-        %input.redesigned-input{ type: "checkbox", ng: { checked: "column.visible" } }
-        {{ column.name }}
+      .menu_item{ "ng-repeat": "column in columns", "ng-click": "toggle(column);" }
+        %input{ type: "checkbox", "ng-checked": "column.visible" }
+        %span
+          {{ 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)"} }
+      .menu_item.text-center
+        %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" } }
-  %div.image-preview
-    %img.spinner{ src: image_path("/spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
-    %img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
+%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, "ng-controller": "ProductImageCtrl" }
+  .image-preview
+    %img.spinner{ src: image_path("/spinning-circles.svg"), "ng-hide": "!imageUploader.isUploading" }
+    %img.preview{ "ng-src": "{{imagePreview}}", "ng-class": "{'faded': imageUploader.isUploading}" }
 
   %label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}
   %input#image-upload{hidden: true, type: 'file', 'nv-file-select' => true, uploader: "imageUploader"}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@
       .exchange-product{'ng-repeat' => 'product in enterprises[exchange.enterprise_id].supplied_products | filter:visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges' }
         .exchange-product-details
           %label
-            %img{'ng-src' => '{{ product.image_url }}'}
+            %img{'ng-src' => '{{ product.image_url }}'} 
             .name {{ product.name }}
           .supplier {{ product.supplier_name }}
 

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', data: { 'order-cycle-form-target': 'statusMessage' }, "ng-attr-data-type": "{{StatusMessage.statusMessage.type}}", "ng-attr-data-action-name": "{{StatusMessage.statusMessage.actionName}}" }
         {{ StatusMessage.statusMessage.text || " " }}
-      %h5#status-message{ 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()" }
       ✖