Merge pull request #10976 from Matt-Yorkley/payment-localized-number

Require localized_number in Payment class

.env

@@ -10,10 +10,10 @@ TIMEZONE="Melbourne"
 DEFAULT_COUNTRY_CODE="AU"
 
 # Locale for translation.
-LOCALE="en_AU"
+LOCALE="en"
 
 # For multilingual - ENV doesn't have array so pass it as string with commas
-AVAILABLE_LOCALES="en_AU,es"
+AVAILABLE_LOCALES="en,es"
 
 # Spree zone.
 CHECKOUT_ZONE="Australia"
@@ -42,10 +42,16 @@ 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
-# GOOGLE_MAPS_REGION="XX"
 
 # Stripe details for instance account
 # Find these under 'Developers' -> 'API keys' in your Stripe account dashboard.
@@ -55,18 +61,3 @@ SMTP_PASSWORD="f00d"
 # STRIPE_INSTANCE_PUBLISHABLE_KEY="pk_test_xxxx" # This can be a test key or a live key
 # STRIPE_CLIENT_ID="ca_xxxx" # This can be a development ID or a production ID
 # STRIPE_ENDPOINT_SECRET="whsec_xxxx"
-
-# New relic settings
-# see: https://one.eu.newrelic.com/admin-portal/, Administration > API keys to get the license key
-# 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,11 +5,6 @@
 #
 #     cp .env.development .env.local
 
-# Locale for translation. Using a locale other than `en` tests the
-# successful fallback to `en`. You will also see up-to-date text used
-# in production
-LOCALE="en_AU"
-
 VERBOSE_QUERY_LOGS=true
 
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
@@ -24,8 +19,3 @@ SITE_URL="0.0.0.0:3000"
 RACK_TIMEOUT_SERVICE_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_TIMEOUT="0"
 RACK_TIMEOUT_WAIT_OVERTIME="0"
-
-# Database encryption configuration, required for VINE connected app
-ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="dev_primary_key"
-ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="dev_determinnistic_key"
-ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="dev_derivation_salt"

.env.test

@@ -1,24 +1,11 @@
 # ENV vars for the test environment
 # Override locally with `.env.test.local`
 
-# Locale for translation.
-LOCALE="en_TEST"
-
-OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
-
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-STRIPE_INSTANCE_SECRET_KEY="bogus_key"
+STRIPE_SECRET_TEST_API_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"
 
 OPENID_APP_ID="test-provider"
-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"
+OPENID_APP_SECRET="12345"

.github/ISSUE_TEMPLATE/release.md

@@ -7,28 +7,21 @@ assignees: ''
 
 ---
 
-## 1. Drafting on Friday
+## Preparation on Thursday
 
 - [ ] Merge pull requests in the [Ready To Go] column
-- [ ] Include translations: `script/release/update_locales`
-    - You need the [Transifex Client] installed on your local dev environement to run the script.
-- [ ] Increment version number: `git push upstream HEAD:refs/tags/vX.Y.Z`
-    - Major: if server changes are required (eg. provision with ofn-install)
-    - Minor: larger change that is irreversible (eg. migration deleting data)
-    - Patch: all others. Shortcut: `script/release/tag`
+- [ ] Include translations: `tx pull --force`
 - [ ] [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.
-- [ ] Notify [#instance-managers] of user-facing :eyes:, API :warning: and experimental :construction: changes.
+- [ ] Notify [#instance-managers] of user-facing changes.
 
-## 2. Testing
+## Testing
 
+- [ ] [Find build] of the release commit and copy it below.
 - [ ] Move this issue to Test Ready.
 - [ ] Notify `@testers` in [#testing].
-- [ ] Test build: [Deploy to Staging] with release tag.
-- [ ] Notify a deployer to deploy it
+- [ ] Test build: <!-- paste build link here, e.g. https://semaphore...builds/1234 -->
 
-## 3. Deployment at beginning of week
+## Finish on Tuesday
 
 - [ ] Publish and notify [#global-community] (this is automatically posted with a plugin)
 - [ ] Deploy the new release to all managed instances.
@@ -36,23 +29,20 @@ assignees: ''
   <pre>
   cd ofn-install
   git pull
-  ansible-playbook --limit all_prod --extra-vars "git_version=vX.Y.Z" playbooks/deploy.yml
+  ansible-playbook --limit all-prod --extra-vars "git_version=vx.y.z" playbooks/deploy.yml
   </pre>
   </details>
 - [ ] Notify [#instance-managers]:
   > @instance_managers The new release has been deployed.
-- [ ] [Create issue] for next release and confirm with next release drafter in [#delivery-circle].
+- [ ] Nudge next release manager
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
 
-[Ready To Go]: https://github.com/orgs/openfoodfoundation/projects/8?filterQuery=status%3A%22Ready+to+go+%F0%9F%9A%80%22
+[Ready To Go]: #zenhub
 [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?title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%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
+[Find build]: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master
 [#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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

@@ -1,8 +1,3 @@
-# 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:
 
@@ -10,7 +5,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
 
@@ -18,6 +13,5 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-
     # All versions are specified in package.json, so please update them.
     versioning-strategy: increase

.github/release.yml

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

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

@@ -1,14 +0,0 @@
-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:
 
@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 jobs:
-  controllers:
+  knapsack_rspec_controllers:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with:
+        with: 
           redis-version: 6
 
       - name: Set up Ruby
@@ -55,18 +55,17 @@ 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: |
-          bin/rake db:create db:schema:load
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
         env:
@@ -81,21 +80,12 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}"
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/controllers/**/*_spec.rb}" 
         run: |
           git show --no-patch # the commit being tested (which is often a merge due to actions/checkout@v3)
-          bin/rake knapsack_pro:rspec
+          bundle exec rake knapsack_pro:rspec
 
-      - name: Save SimpleCov file
-        uses: actions/upload-artifact@v4
-        with:
-          name: simplecov-chunk-controllers-${{ matrix.ci_node_index }}
-          path: coverage/*.*
-          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
-          if-no-files-found: ignore
-          include-hidden-files: true
-
-  models:
+  knapsack_rspec_models:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -116,16 +106,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: [4]
+        ci_node_total: [7]
         # 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]
+        ci_node_index: [0, 1, 2, 3, 4, 5, 6]
     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
@@ -133,11 +123,20 @@ 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: |
-          bin/rake db:create db:schema:load
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
+
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: 09476e2ce491c12083df62768667c674
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -150,20 +149,12 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}"
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/models/**/*_spec.rb}" 
+        
         run: |
-          bin/rake knapsack_pro:rspec
+          bundle exec 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:
+  knapsack_rspec_system_admin:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -184,16 +175,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: [14]
+        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, 13]
+        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
@@ -204,14 +195,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: |
-          bin/rake db:create db:schema:load
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
 
@@ -227,30 +218,21 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}"
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/admin/**/*_spec.rb}" 
 
         run: |
-          bin/rake knapsack_pro:queue:rspec
-
-      - name: Save SimpleCov file
-        uses: actions/upload-artifact@v4
-        with:
-          name: simplecov-chunk-system-admin-${{ matrix.ci_node_index }}
-          path: coverage/*.*
-          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
-          if-no-files-found: ignore
-          include-hidden-files: true
+          bundle exec rake knapsack_pro:queue:rspec
 
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: failed-admin_${{ matrix.ci_node_index }}-tests-screenshots
+          name: failed-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
 
-  system_consumer:
+  knapsack_rspec_system_consumer:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -271,16 +253,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: [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]
+        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
@@ -291,14 +273,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: |
-          bin/rake db:create db:schema:load
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
 
@@ -314,109 +296,21 @@ jobs:
           # RSpec split test files by test examples feature - it's optional
           # https://knapsackpro.com/faq/question/how-to-split-slow-rspec-test-files-by-test-examples-by-individual-it
           #KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES: true
-          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}"
+          KNAPSACK_PRO_TEST_FILE_PATTERN: "{spec/system/consumer/**/*_spec.rb}" 
 
         run: |
-          bin/rake knapsack_pro:queue:rspec
-
-      - name: Save SimpleCov file
-        uses: actions/upload-artifact@v4
-        with:
-          name: simplecov-chunk-system-consumer-${{ matrix.ci_node_index }}
-          path: coverage/*.*
-          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
-          if-no-files-found: ignore
-          include-hidden-files: true
+          bundle exec rake knapsack_pro:queue:rspec
 
       - name: Archive failed tests screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: failed-consumer_${{ matrix.ci_node_index }}-tests-screenshots
+          name: failed-tests-screenshots
           path: tmp/capybara/screenshots/*.png
           retention-days: 7
           if-no-files-found: ignore
 
-  engines:
-    runs-on: ubuntu-22.04
-    services:
-      postgres:
-        image: postgres:10
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_DB: open_food_network_test
-          POSTGRES_USER: ofn
-          POSTGRES_PASSWORD: f00d
-    strategy:
-      fail-fast: false
-      matrix:
-        # [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: [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]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup redis
-        uses: supercharge/redis-github-action@1.4.0
-        with:
-          redis-version: 6
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        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: |
-          bin/rake db:create db:schema:load
-
-      - name: Run tests
-
-        env:
-          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: d6ea7ceb766404ccd016c19aa2c81b1c
-          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
-          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
-          KNAPSACK_PRO_LOG_LEVEL: info
-          # if you use Knapsack Pro Queue Mode you must set below env variable
-          # to be able to retry CI build and run previously recorded tests
-          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
-          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
-          # 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/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/serializers/**/*_spec.rb,engines/**/*_spec.rb}"
-
-        run: |
-          bin/rake knapsack_pro:rspec
-
-      - name: Save SimpleCov file
-        uses: actions/upload-artifact@v4
-        with:
-          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:
+  knapsack_rspec_engines:
     runs-on: ubuntu-22.04
     services:
       postgres:
@@ -446,7 +340,7 @@ jobs:
 
       - name: Setup redis
         uses: supercharge/redis-github-action@1.4.0
-        with:
+        with: 
           redis-version: 6
 
       - name: Set up Ruby
@@ -454,20 +348,98 @@ 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: |
-          bin/rake db:create db:schema:load
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
+
+        env:
+          KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: d6ea7ceb766404ccd016c19aa2c81b1c
+          KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
+          KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
+          KNAPSACK_PRO_LOG_LEVEL: info
+          # if you use Knapsack Pro Queue Mode you must set below env variable
+          # to be able to retry CI build and run previously recorded tests
+          # https://github.com/KnapsackPro/knapsack_pro-ruby#knapsack_pro_fixed_queue_split-remember-queue-split-on-retry-ci-node
+          # KNAPSACK_PRO_FIXED_QUEUE_SPLIT: false
+          # 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/lib/**/*_spec.rb,spec/migrations/**/*_spec.rb,spec/serializers/**/*_spec.rb,engines/**/*_spec.rb}"
+
+        run: |
+          bundle exec rake knapsack_pro:rspec
+
+      - name: Archive failed tests screenshots
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: failed-tests-screenshots
+          path: tmp/capybara/screenshots/*.png
+          retention-days: 7
+          if-no-files-found: ignore
+
+  knapsack_rspec_test_the_rest:
+    runs-on: ubuntu-22.04
+    services:
+      postgres:
+        image: postgres:10
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          POSTGRES_DB: open_food_network_test
+          POSTGRES_USER: ofn
+          POSTGRES_PASSWORD: f00d
+    strategy:
+      fail-fast: false
+      matrix:
+        # [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]
+        # 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]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup redis
+        uses: supercharge/redis-github-action@1.4.0
+        with: 
+          redis-version: 6
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        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
+
+      - name: Run tests
+
         env:
           KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC: e3b8800198d2d89b70c7edbdd85f8fd8
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
@@ -481,17 +453,10 @@ 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: |
-          bin/rake knapsack_pro:rspec
-
-      - name: Save SimpleCov file
-        uses: actions/upload-artifact@v4
-        with:
-          name: simplecov-chunk-the-rest-${{ matrix.ci_node_index }}
-          path: coverage/*.*
-          retention-days: 2 # doesn't need to be long, because it's the combined results that matter
-          if-no-files-found: ignore
-          include-hidden-files: true
+          bundle exec rake knapsack_pro:rspec
 
   non_knapsack_jest_karma:
     runs-on: ubuntu-22.04
@@ -511,7 +476,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # Rails is required for the Karma rake script
+      - name: Setup redis
+        uses: supercharge/redis-github-action@1.4.0
+        with: 
+          redis-version: 6
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -520,49 +489,16 @@ 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: bin/rake karma:run
+        run: bundle exec 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
-          merge-multiple: true
-
-      - name: collate results from each of the workers
-        run: bundle exec rake 'simplecov:collate_results[tmp/simplecov]'
-
-      - name: Upload collated results
-        uses: actions/upload-artifact@v4
-        with:
-          name: combined-simplecov-report
-          path: coverage/**/*.*
-          retention-days: 7
-          if-no-files-found: ignore
-          include-hidden-files: true

.github/workflows/linters.yml

@@ -7,11 +7,10 @@ jobs:
     name: runner / rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Check out code
+        uses: actions/checkout@v1
 
       - 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)
 
@@ -19,11 +18,9 @@ jobs:
         uses: reviewdog/action-rubocop@v2
         with:
           rubocop_version: gemfile
-          rubocop_extensions: rubocop-rails:gemfile rubocop-rspec:gemfile
+          rubocop_extensions: rubocop-rails:gemfile
           reporter: github-pr-check
           level: error
-          filter_mode: nofilter
-          use_bundler: true
           fail_on_error: true
   prettier:
     name: runner / prettier

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

.github/workflows/stage.yml

@@ -1,66 +0,0 @@
-name: "Deploy to Staging"
-
-on:
-  pull_request_target:
-    types: [labeled]
-  workflow_dispatch:
-    inputs:
-      server:
-        description: "Staging Server"
-        type: choice
-        required: true
-        options:
-          - staging.openfoodnetwork.org.uk
-          - staging.openfoodnetwork.org.au
-          - staging.coopcircuits.fr
-      commit_ref:
-        description: "Commit Reference"
-        type: string
-        required: false
-
-jobs:
-  deploy_pr:
-    if: contains(fromJSON('["pr-staged-uk", "pr-staged-au", "pr-staged-fr"]'), github.event.label.name)
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check user has write access"
-        uses: "lannonbr/repo-permission-check-action@2.0.2"
-        with:
-          permission: "write"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      
-      - name: Configure deployment key
-        if: success()
-        run: |
-          install -m 600 -D /dev/null ~/.ssh/id_rsa
-          echo "${{ secrets.DEPLOYMENT_KEY }}" > ~/.ssh/id_rsa
-          echo "${{ secrets.DEPLOYMENT_HOSTS }}" > ~/.ssh/known_hosts
-
-      - name: Deploy to Staging
-        if: success()
-        run: |
-          ssh ofn-deploy@${{ github.event.label.description }} -o LogLevel=ERROR "pull-request-${{ github.event.pull_request.number }} ."
-
-  deploy_branch:
-    if: ${{ inputs.server }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check user has write access"
-        uses: "lannonbr/repo-permission-check-action@2.0.2"
-        with:
-          permission: "write"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Configure deployment key
-        if: success()
-        run: |
-          install -m 600 -D /dev/null ~/.ssh/id_rsa
-          echo "${{ secrets.DEPLOYMENT_KEY }}" > ~/.ssh/id_rsa
-          echo "${{ secrets.DEPLOYMENT_HOSTS }}" > ~/.ssh/known_hosts
-
-      - name: Deploy to Staging
-        if: success()
-        run: |
-          ssh ofn-deploy@${{ inputs.server }} -o LogLevel=ERROR "$GITHUB_REF_NAME ${{ inputs.commit_ref || github.sha }}"

.husky/pre-commit

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

.prettierignore

@@ -1,32 +1,23 @@
-# Ignore a lot of things, but we should enable where it can be helpful.
+# Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
 
 *.md
 *.yml
 *.yaml
 *.json
 *.html
-**/*.rb
 
-# JS
-# Enabled: app/webpacker/controllers/*.js and app/webpacker/packs/*.js
 babel.config.js
 postcss.config.js
 
-# SCSS
-# Enabled: most of admin
-/app/webpacker/css/admin/globals/mixins.scss
-/app/webpacker/css/admin/globals/variables.scss
-/app/webpacker/css/admin/shared/
-/app/webpacker/css/admin_v3/globals/variables.scss
 /app/webpacker/css/darkswarm/
 /app/webpacker/css/mail/
 /app/webpacker/css/shared/
 
-# More
 /app/assets/
 /config/
 /coverage/
 /engines/
 /public/
+/spec/
 /tmp/
 /vendor/

.rspec

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

.rubocop.yml

@@ -4,13 +4,7 @@
 #
 # The configuration is split into three files. Look into those files for more details.
 #
-require:
-  - rubocop-capybara
-  - rubocop-factory_bot
-  - rubocop-rails
-  - rubocop-rspec
-  - rubocop-rspec_rails
-
+require: rubocop-rails
 inherit_from:
 
   # The automatically generated todo list to ignore all current violations.
@@ -19,10 +13,9 @@ inherit_from:
   # The relaxed style rules as a common starting point which we can refine.
   - .rubocop_relaxed_styleguide.yml
 
-  # Our Open Food Network style guides. If you want to see all violations,
+  # Our Open Food Network style guide. 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

@@ -1,24 +0,0 @@
-# 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,61 +3,28 @@
 # These are the rules we agreed upon and we work towards.
 AllCops:
   NewCops: enable
+  SuggestExtensions: false
   Exclude:
-    - bin/**/*
-    - db/**/*
-    - config/**/*
-    - script/**/*
-    - vendor/**/*
-    - node_modules/**/*
+    - 'bin/**/*'
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
     # Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
-    - engines/web/Gemfile
+    - 'engines/web/Gemfile'
 
-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/**/*
+## OFN SETTINGS
+#
+# Cop settings that have been agreed upon by the OFN community
 
 Metrics:
   Enabled: true
 
-Metrics/AbcSize:
-  Max: 30 # default 17
-
 Metrics/BlockLength:
   AllowedMethods: [
     "class_eval",
     "collection",
-    "configure",
     "context",
     "delete",
     "describe",
@@ -71,78 +38,30 @@ Metrics/BlockLength:
     "put",
     "resource",
     "resources",
-    "response",
     "scenario",
     "shared_examples",
     "shared_examples_for",
     "xdescribe",
   ]
 
-Metrics/MethodLength:
-  Enabled: true
-  Max: 25 # default 10
-
-Metrics/ParameterLists:
-  CountKeywordArgs: false
-
-Metrics/PerceivedComplexity:
-  Enabled: true
-  Max: 14 # default 8
-
-Naming/PredicateName:
-  Enabled: false
-
-Naming/VariableNumber:
-  AllowedIdentifiers:
-    - street_address_1
-    - street_address_2
-  AllowedPatterns:
-    - _v[\d]+
-
 Rails/ApplicationRecord:
   Exclude:
     # Migrations should not contain application code:
-    - db/migrate/*.rb
-
-# Allow many-to-many associations without explicit model.
-# - It avoids the additional code of a model class.
-# - It simplifies the declaration of the association.
-# - Rails may know that there are no callbacks associated.
-Rails/HasAndBelongsToMany:
-  Enabled: false
-
-Rails/OutputSafety:
-  Exclude:
-    - spec/**/*
-
-Rails/RedundantActiveRecordAllMethod:
-  AllowedReceivers:
-    - ActionMailer::Preview
-    - ActiveSupport::TimeZone
+    - "db/migrate/*.rb"
 
 Rails/SkipsModelValidations:
   AllowedMethods:
-    - 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
+    - "touch"
+    - "touch_all"
+    - "update_all"
+    - "update_attribute"
+    - "update_column"
+    - "update_columns"
 
 Style/Documentation:
   Enabled: false
 
-Style/FormatStringToken:
+Style/StringLiterals:
   Enabled: false
 
 Style/HashSyntax:
@@ -152,5 +71,60 @@ Style/HashSyntax:
 Style/Send:
   Enabled: true
 
-Style/StringLiterals:
+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
+
+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:
   Enabled: false

.ruby-version

@@ -1 +1 @@
-3.1.4
+3.0.3

.simplecov

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

GETTING_STARTED.md

@@ -6,9 +6,28 @@ 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
 
-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:
+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:
 
     git clone git@github.com:YOUR_GITHUB_USERNAME_HERE/openfoodnetwork.git
 
@@ -24,27 +43,6 @@ 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:
@@ -55,8 +53,7 @@ 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

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+ruby "3.0.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-ruby File.read('.ruby-version').chomp
-
-gem 'dotenv', require: 'dotenv/load' # Load ENV vars before other gems
+gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
 gem 'rails'
 
@@ -16,8 +15,10 @@ gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
-gem 'ransack', '~> 4.1.0'
+gem 'awesome_nested_set'
+gem 'ransack', '~> 2.6.0'
 gem 'responders'
+gem 'rexml'
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -30,7 +31,6 @@ gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-7"
 gem "fog-aws", "~> 2.0" # db2fog does not support v3
 gem "mime-types" # required by fog
 
-gem "validates_lengths_from_database"
 gem "valid_email2"
 
 gem "catalog", path: "./engines/catalog"
@@ -72,7 +72,7 @@ gem 'rswag-ui'
 
 gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection'
-gem 'openid_connect'
+gem 'openid_connect', '~> 1.3'
 
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
@@ -91,21 +91,19 @@ gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail'
+gem 'paper_trail', '~> 12.1'
 gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
 
+gem 'hiredis'
 gem 'puma'
-gem 'redis'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
-gem "cable_ready"
-gem "stimulus_reflex"
-
-gem "turbo_power"
-gem "turbo-rails"
+gem "cable_ready", "5.0.0.rc2"
+gem "stimulus_reflex", "3.5.0.rc2"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -117,8 +115,12 @@ gem 'spreadsheet_architect' # write spreadsheets
 
 gem 'whenever', require: false
 
+gem 'test-unit', '~> 3.5'
+
 gem 'coffee-rails', '~> 5.0.0'
 
+gem 'mini_racer'
+
 gem 'angular_rails_csrf'
 
 gem 'jquery-rails', '4.4.0'
@@ -134,18 +136,13 @@ gem 'flipper-ui'
 gem "view_component"
 gem 'view_component_reflex', '3.1.14.pre9'
 
-# mini_portile2 is needed when installing with Vargant
-# https://openfoodnetwork.slack.com/archives/CEBMTRCNS/p1668439152992899
 gem 'mini_portile2', '~> 2.8'
 
 gem "faraday"
 gem "private_address_check"
 
-gem 'newrelic_rpm'
-
-gem 'invisible_captcha'
-
 group :production, :staging do
+  gem 'ddtrace'
   gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
 
@@ -162,10 +159,8 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry', require: false
-  gem 'rspec-sql'
-  gem 'rswag'
+  gem 'rswag-specs'
   gem 'shoulda-matchers'
-  gem 'stimulus_reflex_testing', github: "podia/stimulus_reflex_testing", branch: :main
   gem 'timecop'
 end
 
@@ -188,10 +183,8 @@ group :development do
   gem 'rails-erd'
   gem 'rubocop'
   gem 'rubocop-rails'
-  gem 'rubocop-rspec'
   gem 'spring'
   gem 'spring-commands-rspec'
-  gem 'spring-commands-rubocop'
   gem 'web-console'
 
   gem 'rack-mini-profiler', '< 3.0.0'

README.md

@@ -1,4 +1,5 @@
 [![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
+[![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
 
@@ -32,7 +33,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]. 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] 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).
 
 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 +45,7 @@ We use [KnapsackPro](https://knapsackpro.com/) for optimal parallelisation of ou
 
 ## Licence
 
-Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2022 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,3 +54,4 @@ Copyright (c) 2012 - 2024 Open Food Foundation, released under the AGPL licence.
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
 [welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [welcome-qa]: https://github.com/orgs/openfoodfoundation/projects/6
+[zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -7,3 +7,4 @@
 require_relative 'config/application'
 
 Openfoodnetwork::Application.load_tasks
+

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,8 +61,32 @@
 //= 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
+//= require moment/min/moment.min.js
+//= require moment/locale/ar.js
+//= require moment/locale/ca.js
+//= require moment/locale/de.js
+//= require moment/locale/en-gb.js
+//= require moment/locale/es.js
+//= require moment/locale/fil.js
+//= require moment/locale/fr.js
+//= require moment/locale/it.js
+//= require moment/locale/nb.js
+//= require moment/locale/nl-be.js
+//= require moment/locale/pt-br.js
+//= require moment/locale/pt.js
+//= require moment/locale/ru.js
+//= require moment/locale/sv.js
+//= require moment/locale/tr.js
+//= require moment/locale/pl.js
+
+//= require js-big-decimal/dist/web/js-big-decimal.min.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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[variants_supplier_id_eq]': $scope.q.producerFilter,
-      'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter,
+      'q[supplier_id_eq]': $scope.q.producerFilter,
+      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
       'q[s]': $scope.sorting,
       import_date: $scope.q.importDateFilter,
       page: $scope.page,
@@ -113,7 +113,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
 
   editProductUrl = (product, variant) ->
-    "/admin/products/" + product.id + ((if variant then "/variants/" + variant.id else "")) + "/edit"
+    "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
@@ -126,11 +126,8 @@ 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: newVariantId
+      id: $scope.nextVariantId()
       unit_value: null
       unit_description: null
       on_demand: false
@@ -138,10 +135,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       display_name: null
       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 = ->
@@ -168,7 +162,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         if confirm(t("are_you_sure"))
           $http(
             method: "DELETE"
-            url: "/api/v0/products/" + product.id + "/variants/" + variant.id
+            url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
           ).then (response) ->
             $scope.removeVariant(product, variant)
     else
@@ -187,8 +181,9 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     product.variants.length > 0
 
 
-  $scope.hasUnit = (variant) ->
-    variant.variant_unit_with_scale?
+  $scope.hasUnit = (product) ->
+    product.variant_unit_with_scale?
+
 
   $scope.variantSaved = (variant) ->
     variant.hasOwnProperty('id') && variant.id > 0
@@ -220,8 +215,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         products: productsToSubmit
         filters:
           'q[name_cont]': $scope.q.query
-          'q[variants_supplier_id_eq]': $scope.q.producerFilter
-          'q[variants_primary_taxon_id_eq]': $scope.q.categoryFilter
+          'q[supplier_id_eq]': $scope.q.producerFilter
+          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
           'q[s]': $scope.sorting
           import_date: $scope.q.importDateFilter
         page: $scope.page
@@ -241,28 +236,33 @@ 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
+
+    $scope.packVariant product, product.master if product.master
+
     if product.variants
       for id, variant of product.variants
-        $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
-
+  $scope.packVariant = (product, variant) ->
     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 && variant.variant_unit_scale
-          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, variant.variant_unit_scale, 2))
+        if variant.unit_value && product.variant_unit_scale
+          variant.unit_value = parseFloat(window.bigDecimal.multiply(variant.unit_value, product.variant_unit_scale, 2))
         variant.unit_description = match[3]
 
   $scope.incrementLimit = ->
@@ -298,6 +298,7 @@ filterSubmitProducts = (productsToFilter) ->
       if product.hasOwnProperty("id")
         filteredProduct = {id: product.id}
         filteredVariants = []
+        filteredMaster = null
         hasUpdatableProperty = false
 
         if product.hasOwnProperty("variants")
@@ -307,24 +308,56 @@ filterSubmitProducts = (productsToFilter) ->
             variantHasUpdatableProperty = result.hasUpdatableProperty
             filteredVariants.push filteredVariant  if variantHasUpdatableProperty
 
+        if product.master?.hasOwnProperty("unit_value")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.unit_value = product.master.unit_value
+        if product.master?.hasOwnProperty("unit_description")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.unit_description = product.master.unit_description
+        if product.master?.hasOwnProperty("display_as")
+          filteredMaster ?= { id: product.master.id }
+          filteredMaster.display_as = product.master.display_as
+
         if product.hasOwnProperty("sku")
           filteredProduct.sku = product.sku
           hasUpdatableProperty = true
         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("tax_category_id")
+          filteredProduct.tax_category_id = product.tax_category_id
+          hasUpdatableProperty = true
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
+        if product.hasOwnProperty("available_on")
+          filteredProduct.available_on = product.available_on
+          hasUpdatableProperty = true
+        if filteredMaster?
+          filteredProduct.master_attributes = filteredMaster
+          hasUpdatableProperty = true
         if filteredVariants.length > 0 # Note that the name of the property changes to enable mass assignment of variants attributes with rails
           filteredProduct.variants_attributes = filteredVariants
           hasUpdatableProperty = true
@@ -359,26 +392,9 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("display_name")
       filteredVariant.display_name = variant.display_name
       hasUpdatableProperty = true
-    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,30 +4,31 @@ angular.module("ofn.admin").directive "ofnDisplayAs", (OptionValueNamer) ->
     scope.$watchCollection ->
       return [
         scope.$eval(attrs.ofnDisplayAs).unit_value_with_description
-        scope.variant.variant_unit_name
-        scope.variant.variant_unit_with_scale
+        scope.product.variant_unit_name
+        scope.product.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
-        variant_unit_scale: variant_unit_scale
-        variant_unit: variant_unit
-        variant_unit_name: scope.variant.variant_unit_name
+        product:
+          variant_unit_scale: variant_unit_scale
+          variant_unit: variant_unit
+          variant_unit_name: scope.product.variant_unit_name
 
       scope.placeholder_text = new OptionValueNamer(variant_object).name()
 
     productUnitProperties = ->
       # get relevant product properties
-      if scope.variant.variant_unit_with_scale?
-        match = scope.variant.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
+      if scope.product.variant_unit_with_scale?
+        match = scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
         if match
           variant_unit = match[1]
           variant_unit_scale = parseFloat(match[2])
         else
-          variant_unit = scope.variant.variant_unit_with_scale
+          variant_unit = scope.product.variant_unit_with_scale
           variant_unit_scale = null
       else
         variant_unit = variant_unit_scale = null
@@ -44,4 +45,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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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/dropdown/directives/links_dropdown.js.coffee

@@ -0,0 +1,5 @@
+ angular.module("admin.dropdown").directive "linksDropdown", ($window)->
+  restrict: "C"
+  scope:
+    links: "="
+  templateUrl: "admin/links_dropdown.html"

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

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

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

@@ -3,6 +3,7 @@ angular.module("admin.enterprises", [
   "admin.utils",
   "admin.shippingMethods",
   "admin.users",
+  "textAngular",
   "admin.side_menu",
   "admin.taxons",
   'admin.indexUtils',
@@ -10,3 +11,16 @@ 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/directives/obj_for_update.js.coffee

@@ -11,8 +11,14 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
         pendingChanges.remove(scope.object().id, scope.attr)
         scope.clear()
       else
+        change =
+          object: scope.object()
+          type: scope.type
+          attr: scope.attr
+          value: if value? then value else ""
+          scope: scope
         scope.pending()
-        addPendingChange(scope.attr, value ? "")
+        pendingChanges.add(scope.object().id, scope.attr, change)
 
     scope.reset = (value) ->
       scope.savedValue = value
@@ -28,33 +34,3 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
 
     scope.clear = ->
       switchClass( element, "", ["update-pending", "update-error", "update-success"], false )
-
-    # When a list of customer is filtered and we removed the "filtered value" from a customer, we
-    # want to make sure the customer is updated. IE. filtering by tag, and removing said tag.
-    # Deleting the "filtered value" from a customer will remove the customer entry, thus
-    # removing "objForUpdate" directive from the active scope. That means $watch won't pick up
-    # the attribute changed.
-    # To ensure the customer is still updated, we check on the $destroy event to see if
-    # the attribute has changed, if so we queue up the change.
-    scope.$on '$destroy', (value) ->
-      # No update
-      return if scope.object()[scope.attr] is scope.savedValue
-
-      # For some reason the code attribute is removed from the object when cleared, so we add
-      # an emptyvalue so it gets updated properly
-      if scope.attr is "code" and scope.object()[scope.attr] is undefined
-        scope.object()["code"] = ""
-
-      # Queuing up change
-      addPendingChange(scope.attr, scope.object()[scope.attr])
-
-    # private
-
-    addPendingChange = (attr, value) ->
-      change =
-        object: scope.object()
-        type: scope.type
-        attr: attr
-        value: value
-        scope: scope
-      pendingChanges.add(scope.object().id, attr, change)

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

@@ -1,16 +1,12 @@
 # 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) ->
-    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)
+    Object.keys(filters).reduce (filtered, attr) ->
+      filter = filters[attr]
+      return filtered if !filter? || filter == 0
+      return $filter('filter')(filtered, (object) ->
+        object[attr] == filter
+      )
+    , objects

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.json"
+        url: "/admin/column_preferences/bulk_update"
         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,10 +24,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     "order_bill_address_firstname",
     "order_bill_address_lastname",
     "order_bill_address_full_name",
-    "order_bill_address_full_name_reversed",
-    "order_bill_address_full_name_with_comma",
-    "order_bill_address_full_name_with_comma_reversed",
-    "variant_supplier_name",
+    "variant_product_supplier_name",
     "order_email",
     "order_number",
     "product_name"].join("_or_") + "_cont"
@@ -65,8 +62,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.dereferenceLoadedData()
 
   $scope.loadOrders = ->
-    return $scope.orders = [] unless $scope.line_items.length
-
     RequestMonitor.load $scope.orders = Orders.index(
       "q[id_in][]": $scope.line_items.map((line_item) -> line_item.order.id)
     )
@@ -81,7 +76,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_supplier_id_eq]": $scope.supplierFilter,
+      "q[variant_product_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,
@@ -105,7 +100,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()
@@ -133,7 +128,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) ->
@@ -167,7 +162,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())
@@ -199,14 +194,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.refreshData()
 
   $scope.getLineItemScale = (lineItem) ->
-    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
+    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
     else
       1
 
   $scope.sumUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
-      if lineItem.units_variant.variant_unit == "items"
+      if lineItem.units_product.variant_unit == "items"
         sum + lineItem.quantity
       else
         sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
@@ -214,7 +209,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.sumMaxUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-      if lineItem.units_variant.variant_unit == "items"
+      if lineItem.units_product.variant_unit == "items"
         sum + lineItem.max_quantity
       else
         sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
@@ -228,41 +223,39 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
     true
 
-  $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"
+  $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"
       1
     else
       null
 
-  $scope.getFormattedValueWithUnitName = (value, unitsVariant, scale) ->
-    unit_name = VariantUnitManager.getUnitName(scale, unitsVariant.variant_unit)
+  $scope.getFormattedValueWithUnitName = (value, unitsProduct, unitsVariant, scale) ->
+    unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
     $scope.roundToThreeDecimals(value) + " " + unit_name
 
-  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsVariant) ->
-    scale = $scope.getScale(unitsVariant)
+  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, 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, unitsVariant, scale)
+      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
     else
       ''
 
-  $scope.formattedValueWithUnitName = (value, unitsVariant) ->
-    scale = $scope.getScale(unitsVariant)
+  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, unitsVariant)
     if scale
-      $scope.getFormattedValueWithUnitName(value, unitsVariant, scale)
-    else
+      $scope.getFormattedValueWithUnitName(value, unitsProduct, 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.selectedUnitsVariant.hasOwnProperty("variant_unit")
-
-        if $scope.selectedUnitsVariant.variant_unit == "weight" || $scope.selectedUnitsVariant.variant_unit == "volume"
-
-          scale = $scope.selectedUnitsVariant.variant_unit_scale
+    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
           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,7 +3,6 @@ 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)
@@ -19,8 +18,6 @@ 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)
 
@@ -28,4 +25,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,9 +1,8 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $rootScope, $controller, $location, Enterprise, EnterpriseFee, OrderCycle, ExchangeProduct, ocInstance) ->
+angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $rootScope, $controller, $location, Enterprise, 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,11 +1,7 @@
 angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, Columns, StatusMessage, RequestMonitor, OrderCycles, Enterprises, Schedules, Dereferencer) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.columns = Columns.columns
-  $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.saveAll = -> OrderCycles.saveChanges($scope.order_cycles_form)
   $scope.ordersCloseAtLimit = -31 # days
 
   $scope.resetSelectFilters = ->

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

@@ -22,8 +22,6 @@ 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.js.coffee

@@ -33,4 +33,6 @@ angular.module('admin.orderCycles').factory('Enterprise', ($resource) ->
     variantsOf: (product) ->
       if product.variants.length > 0
         variant.id for variant in product.variants
+      else
+        [product.master_id]
   })

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

@@ -6,8 +6,6 @@ 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,11 +161,7 @@ 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(),
-          confirm: this.order_cycle.confirm,
-          trigger_action: this.order_cycle.trigger_action
-        })
+      oc = new OrderCycleResource({order_cycle: this.dataForSubmit()})
       oc.$update {order_cycle_id: this.order_cycle.id, reloading: (if destination? then 1 else 0)}, (data) =>
         form.$setPristine() if form
         if destination?
@@ -175,8 +171,6 @@ 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,10 +42,8 @@ angular.module('admin.payments').factory 'Payment', (AdminStripeElements, curren
 
     submit: =>
       munged = @preprocess()
-      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")
+      PaymentResource.create({order_id: munged.order_id}, munged, (response, headers, status)=>
+        $window.location.pathname = "/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

@@ -0,0 +1,24 @@
+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,26 +1,24 @@
-# Controller for "New Products" form (spree/admin/products/new)
 angular.module("admin.products")
   .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
-    $scope.product = {}
+    $scope.product = { master: {} }
+    $scope.product.master.product = $scope.product
     $scope.placeholder_text = ""
 
-    $scope.$watchCollection '[product.variant_unit_with_scale, product.unit_value_with_description, product.price, product.variant_unit_name]', ->
+    $scope.$watchCollection '[product.variant_unit_with_scale, product.master.unit_value_with_description, product.price, product.variant_unit_name]', ->
       $scope.processVariantUnitWithScale()
       $scope.processUnitValueWithDescription()
       $scope.processUnitPrice()
-      $scope.placeholder_text = new OptionValueNamer($scope.product).name() if $scope.product.variant_unit_scale
+      $scope.placeholder_text = new OptionValueNamer($scope.product.master).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\.]+)$/) # matches string like "weight_1000"
+        match = $scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
         if match
           $scope.product.variant_unit = match[1]
           $scope.product.variant_unit_scale = parseFloat(match[2])
-        else # "items"
+        else
           $scope.product.variant_unit = $scope.product.variant_unit_with_scale
           $scope.product.variant_unit_scale = null
       else if $scope.product.variant_unit
@@ -34,27 +32,24 @@ 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.hasOwnProperty("unit_value_with_description")
-        match = $scope.product.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
+      if $scope.product.master.hasOwnProperty("unit_value_with_description")
+        match = $scope.product.master.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
         if match
-          $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]
+          $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]
       else
-        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
+        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
 
-    # 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.unit_value
+      unit_value = $scope.product.master.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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,19 @@
+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", ["ngSanitize", "admin.utils", "OFNShared"])
+angular.module("admin.products", ["textAngular", "admin.utils", "OFNShared"])

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

@@ -1,5 +1,4 @@
 angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager) ->
-  # Javascript clone of VariantUnits::OptionValueNamer, for bulk product editing.
   class OptionValueNamer
     constructor: (@variant) ->
 
@@ -13,16 +12,16 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       name_fields.join ' '
 
     value_scaled: ->
-      @variant.variant_unit_scale?
+      @variant.product.variant_unit_scale?
 
     option_value_value_unit: ->
       if @variant.unit_value?
-        if @variant.variant_unit in ["weight", "volume"]
+        if @variant.product.variant_unit in ["weight", "volume"]
           [value, unit_name] = @option_value_value_unit_scaled()
 
         else
           value = @variant.unit_value
-          unit_name = @pluralize(@variant.variant_unit_name, value)
+          unit_name = @pluralize(@variant.product.variant_unit_name, value)
 
         value = parseInt(value, 10) if value == parseInt(value, 10)
 
@@ -58,13 +57,14 @@ 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.
-      scales = VariantUnitManager.compatibleUnitScales(@variant.variant_unit_scale, @variant.variant_unit)
+      product = @variant.product
+      scales = VariantUnitManager.compatibleUnitScales(product.variant_unit_scale, product.variant_unit)
       variantUnitValue = @variant.unit_value
 
       # sets largestScale = last element in filtered scales array
       [_, ..., largestScale] = (scales.filter (s) -> variantUnitValue / s >= 1)
 
       if (largestScale)
-        [largestScale, VariantUnitManager.getUnitName(largestScale, @variant.variant_unit)]
+        [largestScale, VariantUnitManager.getUnitName(largestScale, product.variant_unit)]
       else
-        [scales[0], VariantUnitManager.getUnitName(scales[0], @variant.variant_unit)]
+        [scales[0], VariantUnitManager.getUnitName(scales[0], product.variant_unit)]

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

@@ -2,9 +2,6 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
   class VariantUnitManager
     @units:
       'weight':
-        0.001:
-          name: 'mg'
-          system: 'metric'
         1.0:
           name: 'g'
           system: 'metric'
@@ -24,21 +21,12 @@ 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'
@@ -72,13 +60,8 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
 
     @compatibleUnitScales: (scale, unitType) ->
       scaleSystem = @units[unitType][scale]['system']
-      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
+      (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, params = {}) ->
+    saveChanges: (form) ->
       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 }, confirm: params['confirm'], trigger_action: params['trigger_action'] }, (data) =>
+        OrderCycleResource.bulkUpdate { order_cycle_set: { collection_attributes: changed } }, (data) =>
           for orderCycle in data
             delete orderCycle.coordinator
             delete orderCycle.producers
@@ -47,10 +47,8 @@ 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', t('js.order_cycles.bulk_save_error'))
+            StatusMessage.display('failure', "Oh no! I was unable to save your changes.")
 
     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.variants
+        @loadVariantUnitValues product
 
     find: (id) ->
       @findProductInList id, @products
@@ -38,32 +38,34 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
       @products.splice(index + 1, 0, newProduct)
 
     unpackProduct: (product) ->
+      #$scope.matchProducer product
       @loadVariantUnit product
 
     loadVariantUnit: (product) ->
-      @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
+      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
         else
           null
 
-      unit_value = @variantUnitValue variant
+      @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 = if unit_value? then unit_value else ''
       variant.unit_value_with_description = "#{unit_value} #{variant.unit_description || ''}".trim()
 
-    variantUnitValue: (variant) ->
+    variantUnitValue: (product, variant) ->
       if variant.unit_value?
-        if variant.variant_unit_scale
-          variant_unit_value = @divideAsInteger variant.unit_value, variant.variant_unit_scale
+        if product.variant_unit_scale
+          variant_unit_value = @divideAsInteger variant.unit_value, product.variant_unit_scale
           parseFloat(window.bigDecimal.round(variant_unit_value, 2))
         else
           variant.unit_value

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

@@ -32,6 +32,9 @@ 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/images/index.js.coffee

@@ -0,0 +1,15 @@
+$ ->
+  ($ '#new_image_link').click (event) ->
+    event.preventDefault()
+
+    ($ '.no-objects-found').hide()
+
+    ($ this).hide()
+    $.ajax
+      type: 'GET'
+      url: @href
+      data: (
+        authenticity_token: AUTH_TOKEN
+      )
+      success: (r) ->
+        ($ '#images').html r

app/assets/javascripts/admin/spree/images/new.js.coffee

@@ -0,0 +1,7 @@
+($ '#cancel_link').click (event) ->
+  event.preventDefault()
+
+  ($ '.no-objects-found').show()
+
+  ($ '#new_image_link').show()
+  ($ '#images').html('')

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

@@ -1,6 +1,22 @@
 // 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_unavailable"));
-      } else {
-        adjustItems(shipment_number, variant_id, quantity, true);
+        ofnAlert(t("js.admin.orders.quantity_adjusted"));
       }
+      toggleItemEdit();
 
+      adjustItems(shipment_number, variant_id, quantity, true);
       return false;
     }
     $('a.save-item').click(handle_save_click);

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,139 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,11 @@
+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/directives/variant_autocomplete.js.coffee

@@ -10,12 +10,6 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
         element.select2
           placeholder: t('admin.orders.select_variant')
           minimumInputLength: 3
-          formatInputTooShort: ->
-            t('admin.select2.minimal_search_length', count: 3)
-          formatSearching: ->
-            t('admin.select2.searching')
-          formatNoMatches: ->
-            t('admin.select2.no_matches')
           ajax:
             url: Spree.routes.variants_search
             datatype: "json"

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

@@ -9,7 +9,6 @@ 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,9 +10,7 @@ angular.module("admin.utils").factory "StatusMessage", ->
 
     statusMessage:
       text: ""
-      style: {},
-      type: null,
-      actionName: null
+      style: {}
 
     invalidMessage: ""
 
@@ -25,15 +23,11 @@ angular.module("admin.utils").factory "StatusMessage", ->
     active: ->
       @statusMessage.text != ''
 
-    display: (type, text, actionName = null) ->
+    display: (type, text) ->
       @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
+    scope.inherit = angular.equals scope.variantOverrides[scope.hub_id][scope.variant.id], VariantOverrides.newFor scope.hub_id, scope.variant.id
 
     ngModel.$parsers.push (viewValue) ->
       if ngModel.$dirty && viewValue
-        DirtyVariantOverrides.inherit scope.hub_id, scope.variant, scope.variantOverrides[scope.hub_id][scope.variant.id].id
+        DirtyVariantOverrides.inherit scope.hub_id, scope.variant.id, 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,8 +2,4 @@ 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) ->
-      for variant in product.variants
-        return hubPermissions[hub_id].indexOf(variant.producer_id) > -1
-     ), true)
+    return $filter('filter')(products, ((product) -> hubPermissions[hub_id].indexOf(product.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, vo_id) ->
-      @add(hub_id, variant.id, vo_id)
-      blankVo = angular.copy(VariantOverrides.inherit(hub_id, variant))
+    inherit: (hub_id, variant_id, vo_id) ->
+      @add(hub_id, variant_id, vo_id)
+      blankVo = angular.copy(VariantOverrides.inherit(hub_id, variant_id))
       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,18 +13,17 @@ angular.module("admin.variantOverrides").factory "VariantOverrides", (variantOve
         @variantOverrides[hub.id] ||= {}
         for product in products
           for variant in product.variants
-            @inherit(hub.id, variant) unless @variantOverrides[hub.id][variant.id]
+            @inherit(hub.id, variant.id) unless @variantOverrides[hub.id][variant.id]
 
-    inherit: (hub_id, variant) ->
+    inherit: (hub_id, variant_id) ->
       # 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)
+      @variantOverrides[hub_id][variant_id] ||= {}
+      angular.extend @variantOverrides[hub_id][variant_id], @newFor hub_id, variant_id
 
-    newFor: (hub_id, variant) ->
+    newFor: (hub_id, variant_id) ->
       # These properties need to match those checked in VariantOverrideSet.deletable?
       hub_id: hub_id
-      variant_id: variant.id
-      producer_id: variant.producer_id
+      variant_id: variant_id
       sku: null
       price: null
       count_on_hand: null

app/assets/javascripts/admin_minimal.js

@@ -11,5 +11,24 @@
 
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
+//= require moment/min/moment.min.js
+//= require moment/locale/ar.js
+//= require moment/locale/ca.js
+//= require moment/locale/de.js
+//= require moment/locale/en-gb.js
+//= require moment/locale/es.js
+//= require moment/locale/fil.js
+//= require moment/locale/fr.js
+//= require moment/locale/it.js
+//= require moment/locale/nb.js
+//= require moment/locale/nl-be.js
+//= require moment/locale/pt-br.js
+//= require moment/locale/pt.js
+//= require moment/locale/ru.js
+//= require moment/locale/sv.js
+//= require moment/locale/tr.js
+//= require moment/locale/pl.js
 
-window.angular = { module: function(noop){ return { value: function(){} } } }
+//= require js-big-decimal/dist/web/js-big-decimal.min.js
+
+window.angular = { module: function(noop){ return { value: function(){} } } }

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

@@ -29,6 +29,24 @@
 #
 #= require angular-flash.min.js
 #
+#= require moment/min/moment.min.js
+#= require moment/locale/ar.js
+#= require moment/locale/ca.js
+#= require moment/locale/de.js
+#= require moment/locale/en-gb.js
+#= require moment/locale/es.js
+#= require moment/locale/fil.js
+#= require moment/locale/fr.js
+#= require moment/locale/it.js
+#= require moment/locale/nb.js
+#= require moment/locale/nl-be.js
+#= require moment/locale/pt-br.js
+#= require moment/locale/pt.js
+#= require moment/locale/ru.js
+#= require moment/locale/sv.js
+#= require moment/locale/tr.js
+#= require moment/locale/pl.js
+#
 #= require modernizr
 #
 #= require foundation-sites/js/foundation.js

app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee

@@ -0,0 +1,22 @@
+angular.module('Darkswarm').controller "AccordionCtrl", ($scope, localStorageService, $timeout, $document, CurrentHub) ->
+  $scope.accordionSections = ["details", "billing", "shipping", "payment"]
+  $scope.accordion = { details: true, billing: true, shipping: true, payment: true }
+
+  $scope.show = (section) ->
+    $scope.accordion[section] = true
+
+  $scope.scrollTo = (section) ->
+    # Scrolling is confused by our position:fixed top bar - add an offset to scroll
+    # to the correct location, plus 5px buffer
+    offset_height = $("nav.top-bar").height() + 5
+    $document.scrollTo($("##{section}"), offset_height, 400)
+
+  $scope.$on 'purchaseFormInvalid', (event, form) ->
+    # Scroll to first invalid section
+    for section in $scope.accordionSections
+      if not form[section].$valid
+        $scope.show section
+        $timeout ->
+          $scope.scrollTo(section)
+        , 50
+        break

app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee

@@ -0,0 +1,12 @@
+angular.module('Darkswarm').controller "BillingCtrl", ($scope, $timeout, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
+  $scope.name = "billing"
+  $scope.nextPanel = "shipping"
+
+  $scope.summary = ->
+    [$scope.order.bill_address.address1,
+    $scope.order.bill_address.city,
+    $scope.order.bill_address.zipcode]
+
+  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee

@@ -0,0 +1,43 @@
+angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, $http) ->
+  $scope.Checkout = Checkout
+  $scope.submitted = false
+
+  # Bind to local storage
+  $scope.fieldsToBind = ["bill_address", "email", "payment_method_id", "shipping_method_id", "ship_address"]
+  prefix = "order_#{Checkout.order.id}#{CurrentUser.id or ""}#{CurrentHub.hub.id}"
+
+  for field in $scope.fieldsToBind
+    localStorageService.bind $scope, "Checkout.order.#{field}", Checkout.order[field], "#{prefix}_#{field}"
+
+  localStorageService.bind $scope, "Checkout.ship_address_same_as_billing", true, "#{prefix}_sameasbilling"
+  localStorageService.bind $scope, "Checkout.default_bill_address", false, "#{prefix}_defaultasbilladdress"
+  localStorageService.bind $scope, "Checkout.default_ship_address", false, "#{prefix}_defaultasshipaddress"
+
+  $scope.order = Checkout.order # Ordering is important
+  $scope.secrets = Checkout.secrets
+
+  $scope.enabled = !!CurrentUser.id?
+
+  $scope.purchase = (event, form) ->
+    event.preventDefault()
+    $scope.formdata = form
+    $scope.submitted = true
+
+    if CurrentUser.id
+      $scope.validateForm(form)
+    else
+      $scope.ensureUserIsGuest()
+
+  $scope.validateForm = ->
+    if $scope.formdata.$valid
+      $scope.Checkout.purchase()
+    else
+      $scope.$broadcast 'purchaseFormInvalid', $scope.formdata
+
+  $scope.ensureUserIsGuest = (callback = null) ->
+    $http.post("/user/registered_email", {email: $scope.order.email})
+      .then (response)->
+        window.CableReady.perform(response.data)
+      .catch ->
+        $scope.validateForm() if $scope.submitted
+        callback() if callback

app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee

@@ -0,0 +1,8 @@
+angular.module('Darkswarm').controller "CountryCtrl", ($scope, availableCountries) ->
+
+  $scope.countries = availableCountries
+
+  $scope.countriesById = $scope.countries.reduce (obj, country) ->
+    obj[country.id] = country
+    obj
+  , {}

app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee

@@ -0,0 +1,24 @@
+angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, SpreeUser, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
+  $scope.name = "details"
+  $scope.nextPanel = "billing"
+
+  $scope.login_or_next = (event) ->
+    event.preventDefault()
+    unless CurrentUser.id
+      $scope.ensureUserIsGuest($scope.next)
+      return
+
+    $scope.next()
+
+  $scope.summary = ->
+    [$scope.fullName(),
+    $scope.order.email,
+    $scope.order.bill_address.phone]
+
+  $scope.fullName = ->
+    [$scope.order.bill_address.firstname ? null,
+    $scope.order.bill_address.lastname ? null].join(" ").trim()
+
+  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee

@@ -0,0 +1,19 @@
+angular.module('Darkswarm').controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
+  $scope.savedCreditCards = savedCreditCards
+  $scope.name = "payment"
+  $scope.months = Dates.months
+  $scope.years = Dates.years
+
+  $scope.secrets.card_month = "1"
+  $scope.secrets.card_year = moment().year()
+
+  for card in savedCreditCards when card.is_default
+    $scope.secrets.selected_card = card.id
+    break
+
+  $scope.summary = ->
+    [$scope.Checkout.paymentMethod()?.name]
+
+  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee

@@ -0,0 +1,11 @@
+angular.module('Darkswarm').controller "ShippingCtrl", ($scope, $timeout, ShippingMethods, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
+  $scope.ShippingMethods = ShippingMethods
+  $scope.name = "shipping"
+  $scope.nextPanel = "payment"
+
+  $scope.summary = ->
+    [$scope.Checkout.shippingMethod()?.name]
+  
+  $timeout $scope.onTimeout 

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

@@ -4,18 +4,15 @@ 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 =>
@@ -48,12 +45,6 @@ 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()
@@ -61,7 +52,6 @@ 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
@@ -76,10 +66,9 @@ 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_variants_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
       'q[with_properties][]': $scope.activeProperties,
-      'q[with_variants_supplier_properties][]': $scope.activeProducerProperties,
-      'q[variants_primary_taxon_id_in_any][]': $scope.activeTaxons
+      'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }
 
   $scope.searchKeypress = (e)->
@@ -97,12 +86,6 @@ 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> ")
 
@@ -116,7 +99,6 @@ 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
@@ -127,7 +109,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       $scope.loadProducts()
 
   $scope.filtersCount = () ->
-    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive() + $scope.producerPropertySelectors.totalActive()
+    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive()
 
   $scope.toggleFilterSidebar = ->
     $scope.showFilterSidebar = !$scope.showFilterSidebar

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

@@ -42,17 +42,8 @@ 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/controllers/registration/registration_form_controller.js.coffee

@@ -9,9 +9,10 @@ angular.module('Darkswarm').controller "RegistrationFormCtrl", ($scope, Registra
   $scope.create = (form) ->
     if ($scope.valid(form)) 
       $scope.disableButton()
-      EnterpriseRegistrationService.create($scope.enableButton).then(() ->
+      EnterpriseRegistrationService.create().then(() ->
         $scope.enableButton()
       )
+    end
 
   $scope.update = (nextStep, form) ->
     EnterpriseRegistrationService.update(nextStep) if $scope.valid(form)

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

@@ -18,11 +18,4 @@ 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

@@ -33,13 +33,13 @@ angular.module('Darkswarm').factory 'Products', (OrderCycleResource, OrderCycle,
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
-        product.primaryImage = product.image?.small_url if product.image
+        product.primaryImage = product.images[0]?.small_url if product.images
         product.primaryImageOrMissing = product.primaryImage || "/noimage/small.png"
-        product.largeImage = product.image?.large_url if product.image
+        product.largeImage = product.images[0]?.large_url if product.images
 
     dereference: ->
       for product in @fetched_products
-        product.supplier = Shopfront.producers_by_id[product.variants[0].supplier.id]
+        product.supplier = Shopfront.producers_by_id[product.supplier.id]
         Dereferencer.dereference product.taxons, Taxons.taxons_by_id
 
         product.properties = angular.copy(product.properties_with_values)

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

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

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

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()", "ng-bind": "::cancelText" }
-    %button.confirm.red{ "ng-click": "confirm()", "ng-bind": "::confirmText" }
+    %button.cancel{ ng: { click: "close()", bind: "::cancelText" } }
+    %button.confirm.red{ ng: { click: "confirm()", 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", "ng-bind": "error" }
+    .error{ ng: { repeat: "error in errors", bind: "error" } }
 
     %table.no-borders
       %tr
@@ -14,55 +14,61 @@
           {{ '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/links_dropdown.html.haml

@@ -0,0 +1,19 @@
+.ofn-drop-down
+  %span
+    %i.icon-check
+    {{ 'admin.actions' | t }}
+    %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
+  %div.menu{ 'ng-show' => "expanded" }
+    %div{ 'ng-repeat' => "link in links" }
+      %a.menu_item{ 'ng-if': "link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method }}", "ujs-navigate": "false", confirm: "{{link.confirm}}" } }
+        %span
+          %i{ ng: { class: "link.icon" } }
+        %span {{ link.name }}
+      %a.menu_item{ 'ng-if': "link.confirm && !link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}", "data-confirm": "{{link.confirm}}" }
+        %span
+          %i{ ng: { class: "link.icon" } }
+        %span {{ link.name }}
+      %a.menu_item{ 'ng-if': "!link.confirm && !link.method", href: '{{link.url}}', target: "{{link.target || '_self'}}" }
+        %span
+          %i{ ng: { class: "link.icon" } }
+        %span {{ link.name }}

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()', "ng-href": '/admin/orders/invoices/{{invoice_id}}', "ng-show": "!loading && !error" }
+%a.button{ target: '_blank', ng: { click: 'showBulkInvoice()', href: '/admin/orders/invoices/{{invoice_id}}', show: "!loading && !error" } }
   = t('js.admin.orders.index.view_file')
 

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

@@ -1,10 +1,10 @@
 %a.close-reveal-modal{"ng-click" => "$close()"}
   %i.fa.fa-times-circle{'aria-hidden' => "true"}
 
-%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, "ng-controller": "ProductImageCtrl" }
+%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
   %div.image-preview
-    %img.spinner{ src: image_path("/spinning-circles.svg"), "ng-hide": "!imageUploader.isUploading" }
-    %img.preview{ "ng-src": "{{imagePreview}}", "ng-class": "{'faded': imageUploader.isUploading}" }
+    %img.spinner{ src: image_path("/spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
+    %img.preview{ng: {src: "{{imagePreview}}", 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", "ng-bind": "error" }
+        .error{ ng: { repeat: "error in errors", 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', data: "ruleTypes", "min-search": "5", "ng-model": "ruleType" }
+    %input.ofn-select2.fullwidth{ :id => 'rule_type_selector', ng: { model: "ruleType" }, data: "ruleTypes", 'min-search' => "5" }
 
   .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', "ng-click": 'selections.available = orderCycle', "ng-dblclick": 'add(orderCycle)', "ng-class": '{selected: selections.available == orderCycle}' }
+        .order-cycle{ ng: { repeat: 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', click: 'selections.available = orderCycle', dblclick: 'add(orderCycle)', 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', "ng-click": 'selections.selected = orderCycle', "ng-dblclick": 'remove(orderCycle)', "ng-class": '{selected: selections.selected == orderCycle}' }
+        .order-cycle{ ng: { repeat: 'orderCycle in selectedOrderCycles', click: 'selections.selected = orderCycle', dblclick: 'remove(orderCycle)', class: '{selected: selections.selected == orderCycle}' } }
           {{ orderCycle.name }}
-.error{ "ng-repeat": "error in errors", "ng-bind": "error" }
+.error{ ng: { repeat: "error in errors", 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", "ng-switch": "enterprise.sells" }
-      .info{ "ng-switch-when": "none" }
+    %div{ ng: { if: "!enterprise.is_primary_producer", 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", "ng-switch": "enterprise.sells" }
-      .info{ "ng-switch-when": "none" }
+    %div{ ng: { if: "enterprise.is_primary_producer", 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')", "ng-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')", 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')", "ng-class": "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
+      %a.button.selector.hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", 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')", "ng-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')", 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')", "ng-class": "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" }
+      %a.button.selector.producer-shop{ ng: { click: "enterprise.owned && (enterprise.sells='own')", 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')", "ng-class": "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
+      %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", 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", "ng-class": "{disabled: saved() && !saving, saving: saving}", "ng-click": "save()" }
-      %span{ "ng-hide": "saved() || saving" }
+    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", 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()', "ng-class": "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" }
+    %a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', 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()', "ng-class": "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" }
+    %a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', 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", "ng-class": "{disabled: saved() && !saving, saving: saving}", "ng-click": "save()" }
-      %span{ "ng-hide": "saved() || saving" }
+    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", 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