Update translations

Bump rails from 6.1.6 to 6.1.6.1

.browserslistrc

@@ -0,0 +1 @@
+defaults

.env

@@ -0,0 +1,63 @@
+# Default ENV vars (primarily for the development environment).
+# Create `.env.development.local` or `.env.test.local` to add any local overrides.
+
+# Time zone must match the operating system time zone in order to pass all tests.
+# This string is the key for the MAPPING hash constant in ActiveSupport::TimeZone.
+# Documentation including the hash="https://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html
+TIMEZONE="Melbourne"
+
+# Default country for dropdowns etc. See for codes="http://en.wikipedia.org/wiki/ISO_3166-1
+DEFAULT_COUNTRY_CODE="AU"
+
+# Locale for translation.
+LOCALE="en"
+
+# For multilingual - ENV doesn't have array so pass it as string with commas
+AVAILABLE_LOCALES="en,es"
+
+# Spree zone.
+CHECKOUT_ZONE="Australia"
+
+# Find currency codes at http://en.wikipedia.org/wiki/ISO_4217.
+CURRENCY="AUD"
+
+# The whenever gem can set the `MAILTO` variable for our cron jobs.
+# You can define an email address to notify if any job outputs something.
+# But you need a working mail server setup so that the message is delivered.
+# See: config/schedule.rb
+# SCHEDULE_NOTIFICATIONS="admin@example.com"
+
+# Mail settings
+MAIL_HOST="example.com"
+MAIL_DOMAIN="example.com"
+MAIL_PORT="25"
+SMTP_USERNAME="ofn"
+SMTP_PASSWORD="f00d"
+
+# Optional mail settings
+# MAIL_SECURE_CONNECTION="TLS' # 'None' (default), 'SSL' or 'TLS'
+# MAILS_FROM="hello@example.com"
+# MAIL_BCC="manager@example.com"
+
+# 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"
+
+# Stripe details for instance account
+# Find these under 'Developers' -> 'API keys' in your Stripe account dashboard.
+# Under 'Connect', the Redirect URI should be set to https://YOUR_SERVER_URL/stripe/callbacks (e.g. https://openfoodnetwork.org.uk/stripe/callbacks)
+# Under 'Webhooks', you should set up a Connect endpoint pointing to https://YOUR_SERVER_URL/stripe/webhooks e.g. (https://openfoodnetwork.org.uk/stripe/webhooks)
+# STRIPE_INSTANCE_SECRET_KEY="sk_test_xxxxxx" # This can be a test key or a live key
+# 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"

.env.development

@@ -0,0 +1,9 @@
+# ENV vars for the development environment
+# Override locally with `.env.development.local`
+
+SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+OFN_REDIS_URL="redis://localhost:6379/1"
+OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
+
+SITE_URL="0.0.0.0:3000"

.env.test

@@ -0,0 +1,6 @@
+# ENV vars for the test environment
+# Override locally with `.env.test.local`
+
+SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+SITE_URL="test.host"

.foreman

@@ -0,0 +1 @@
+env: ""

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: ofnusa
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/release.md

@@ -7,17 +7,54 @@ assignees: ''
 
 ---
 
-Steps: 
+## Preparation on Thursday
 
+- [ ] Merge pull requests in the [Ready To Go] column
 - [ ] Include translations: `tx pull --force`
-- [ ] [Draft new release]
-- [ ] Notify #instance-managers of user-facing changes.
-- [ ] Test: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master <!-- replace the URL -->
-- [ ] Update translations if necessary
-- [ ] Publish and notify #global-community
-- [ ] Deploy and notify #instance-managers
+- [ ] [Draft new release]. Look at previous [releases] for inspiration.
+- [ ] Notify [#instance-managers] of user-facing changes.
+
+## Testing
+
+- [ ] [Find build] of the release commit and copy it below.
+- [ ] Move this issue to Test Ready and notify testers.
+- [ ] Test: :warning: link to the build of the release commit https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master
+
+## Finish on Tuesday
+
+- [ ] Update translations unless content has been removed from config/locales/en.yml between this release draft and current master.
+  <details><summary>Command line instructions</summary>
+  <pre>
+  git checkout master # same version as the release draft
+  git fetch upstream
+  git diff upstream/master -- config/locales/en.yml
+  tx pull --force # if no changes or only additions in the locale
+  git checkout --detach # if we need to commit new translations
+  git commit -a -m "Update translations"
+  git tag vx.y.z # put the release number in here
+  git push upstream vx.y.z
+  </pre>
+  </details>
+- [ ] Publish and notify [#global-community]:
+  > The next release is ready: https://github.com/openfoodfoundation/openfoodnetwork/releases/latest
+- [ ] Deploy the new release to all managed instances.
+  <details><summary>Command line instructions</summary>
+  <pre>
+  cd ofn-install
+  git pull
+  ansible-playbook --limit all-prod --extra-vars "git_version=vx.y.z" playbooks/deploy.yml
+  </pre>
+  </details>
+- [ ] Notify [#instance-managers]:
+  > @instance_managers The new release has been deployed.
 - [ ] Nudge next release manager
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
 
+[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?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
+[Find build]: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master
+[#global-community]: https://app.slack.com/client/T02G54U79/C59ADD8F2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +1,39 @@
 #### What? Why?
 
-Closes #[the issue number this PR is related to]
+Closes # <!-- Insert issue number here. -->
 
 <!-- Explain why this change is needed and the solution you propose.
-Provide context for others to understand it. -->
+     Provide context for others to understand it. -->
 
 
 
 #### What should we test?
-<!-- List which features should be tested and how. -->
-
+<!-- List which features should be tested and how.
+     This can be similar to the Steps to Reproduce in the issue.
+     Also think of other parts of the app which could be affected
+     by your change. -->
 
+- Visit ... page.
+- 
 
 #### Release notes
-<!-- Write a one liner description of the change to be included in the release notes.
-Every PR is worth mentioning, because you did it for a reason. -->
 
 <!-- Please select one for your PR and delete the other. -->
+
 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. -->
+
+The title of the pull request will be included in the release notes.
 
 
 #### Dependencies
 <!-- Does this PR depend on another one?
-Add the link or remove this section. -->
+     Add the link or remove this section. -->
 
 
 
 #### Documentation updates
 <!-- Are there any wiki pages that need updating after merging this PR?
-List them here or remove this section. -->
+     List them here or remove this section. -->

.github/codecov.yml

@@ -1,5 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        informational: true

.github/dependabot.yml

@@ -6,8 +6,10 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
+    versioning-strategy: lockfile-only
 
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "daily"
+    versioning-strategy: lockfile-only

.github/workflows/brakeman-analysis.yml

@@ -10,8 +10,14 @@ on:
   pull_request:
     branches: [ "master" ]
 
+permissions:
+  contents: read
+
 jobs:
   brakeman-scan:
+    permissions:
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
     name: Brakeman Scan
     runs-on: ubuntu-latest
     steps:

.github/workflows/build.yml

@@ -9,9 +9,14 @@ env:
   DISABLE_KNAPSACK: true
   TIMEZONE: UTC
   COVERAGE: true
+  RSPEC_RETRY_RETRY_COUNT: 3
+  RAILS_ENV: test
+
+permissions:
+  contents: read
 
 jobs:
-  test-controllers-and-serializers:
+  rspec:
     runs-on: ubuntu-18.04
     services:
       postgres:
@@ -26,6 +31,20 @@ jobs:
           POSTGRES_DB: open_food_network_test
           POSTGRES_USER: ofn
           POSTGRES_PASSWORD: f00d
+    strategy:
+      matrix:
+        specs:
+          - "spec/controllers"
+          - "spec/models"
+          - "spec/features/admin/[a-o0-9]*_spec.rb"
+          - "spec/lib"
+          - "spec/migrations"
+          - "spec/serializers"
+          - "spec/system/admin/[a-o0-9]*_spec.rb"
+          - "spec/system/admin/[p-z]*_spec.rb"
+          - "spec/system/consumer"
+          - "engines/*/spec"
+      fail-fast: false
     steps:
       - uses: actions/checkout@v2
 
@@ -41,244 +60,22 @@ jobs:
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
       - name: Set up database
         run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
-
-      - name: Run controller tests
-        run: bundle exec rspec --profile -- spec/controllers spec/serializers
-
-      - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
-
-  test-models:
-    runs-on: ubuntu-18.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
-    steps:
-      - uses: actions/checkout@v2
-
-      - 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@v2
-        with:
-          node-version: '14.15.5'
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
       - name: Run tests
-        run: bundle exec rspec --profile -- spec/models
+        run: bundle exec rspec --profile -- ${{ matrix.specs }}
 
-      - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
-
-  test-admin-features-1:
-    runs-on: ubuntu-18.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
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      - name: Archive failed tests screenshots
+        if: failure()
+        uses: actions/upload-artifact@v2
         with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14.15.5'
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
-
-      - name: Run admin feature tests
-        run: bundle exec rspec --profile -- spec/features/admin/[a-o0-9]*_spec.rb
-
-      - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
-
-  test-admin-features-2:
-    runs-on: ubuntu-18.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
-    steps:
-      - uses: actions/checkout@v2
-
-      - 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@v2
-        with:
-          node-version: '14.15.5'
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
-
-      - name: Run admin feature tests
-        run: bundle exec rspec --profile -- spec/features/admin/[p-z]*_spec.rb
-
-      - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
-
-  test-consumer-features:
-    runs-on: ubuntu-18.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
-    steps:
-      - uses: actions/checkout@v2
-
-      - 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@v2
-        with:
-          node-version: '14.15.5'
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
-
-      - name: Run consumer feature tests
-        run: bundle exec rspec --profile -- spec/features/consumer
-
-      - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
-
-  test-engines-etc:
-    runs-on: ubuntu-18.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
-    steps:
-      - uses: actions/checkout@v2
-
-      - 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@v2
-        with:
-          node-version: '14.15.5'
-
-      - name: Install JS dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
-      - name: Set up database
-        run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
-
-      - name: Run JS tests
-        run: RAILS_ENV=test bundle exec rake karma:run
-
-      # Migration tests need to be run in a separate task.
-      # See: https://github.com/openfoodfoundation/openfoodnetwork/pull/6924#issuecomment-813056525
-      - name: Run migration tests
-        run: bundle exec rspec --pattern "spec/{migrations}/**/*_spec.rb"
-
-      - name: Run all other tests
-        run: bundle exec rake ofn:specs:run:excluding_folders["models,controllers,serializers,features,lib,migrations"]
+          name: failed-tests-screenshots
+          path: tmp/capybara/screenshots/*.png
+          retention-days: 7
+          if-no-files-found: ignore
 
   test-the-rest:
     runs-on: ubuntu-18.04
@@ -310,16 +107,16 @@ jobs:
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
       - name: Set up database
         run: |
-          bundle exec rake db:create RAILS_ENV=test
-          bundle exec rake db:schema:load RAILS_ENV=test
+          bundle exec rake db:create
+          bundle exec rake db:schema:load
 
-      - name: Run admin feature folders, engines, lib
-        run: bundle exec rspec --profile --pattern "engines/*/spec/{,/*/**}/*_spec.rb,spec/features/admin/*/*_spec.rb,spec/lib/{,/*/**}/*_spec.rb"
+      - name: Run JS tests
+        run: bundle exec rake karma:run
 
-      - name: Codecov
-        uses: codecov/codecov-action@v1.5.0
+      - name: Run jest tests
+        run: yarn jest
+
+      - name: Run all other tests
+        run: bundle exec rake ofn:specs:run:excluding_folders["models,controllers,serializers,features,lib,migrations,system"]

.github/workflows/linters.yml

@@ -0,0 +1,18 @@
+name: Linters
+on: [push, pull_request]
+jobs:
+  rubocop:
+    name: runner / rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v1
+      - uses: ruby/setup-ruby@v1
+      - name: rubocop
+        uses: reviewdog/action-rubocop@v2
+        with:
+          rubocop_version: gemfile
+          rubocop_extensions: rubocop-rails:gemfile
+          reporter: github-pr-check
+          level: error
+          fail_on_error: true

.github/workflows/mapi.yml

@@ -0,0 +1,46 @@
+name: 'Mayhem for API'
+on: workflow_dispatch
+jobs:
+  test:
+    if: ${{ github.repository_owner == 'openfoodfoundation' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+    - uses: actions/checkout@v2
+    - run: docker/build
+    - 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'"
+    # 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 Mayhem for API
+    - name: Run Mayhem for API
+      uses: ForAllSecure/mapi-action@v1
+      continue-on-error: true
+      with:
+        mapi-token: ${{ secrets.MAPI_TOKEN }}
+        api-url: http://localhost:3000
+        api-spec: swagger/v1/swagger.yaml
+        target: openfoodfoundation/openfoodnetwork
+        duration: 1min
+        sarif-report: mapi.sarif
+        html-report: mapi.html
+        run-args: |
+          --header-auth
+          X-Api-Token: testing
+
+    # Archive HTML report
+    - name: Archive Mayhem for API report
+      uses: actions/upload-artifact@v2
+      with:
+        name: mapi-report
+        path: mapi.html
+
+    # Upload SARIF file (only available on public repos or github enterprise)
+    - name: Upload SARIF file
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: mapi.sarif

.gitignore

@@ -2,7 +2,11 @@
 .rbenv-version
 .python-version
 .byebug_history
+.env.local
+.env.development.local
+.env.test.local
 .swp
+.vscode
 *.swo
 *.swp
 .sass-cache
@@ -11,6 +15,7 @@ db/*.csv
 log/*.log
 log/*.log.lck
 log/*.log.*
+/storage
 tmp/
 .idea/*
 \#*
@@ -39,12 +44,16 @@ config/initializers/feature_toggle.rb
 NERD_tree*
 coverage
 libpeerconnection.log
-/config/application.yml
 /config/newrelic.yml
 node_modules
 vendor/bundle/
 coverage
 /reports/
 !/reports/README.md
-bin/
 /spec/components/stories/**/*.stories.json
+
+/public/packs
+/public/packs-test
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.rubocop.yml

@@ -10,12 +10,12 @@ inherit_from:
   # The automatically generated todo list to ignore all current violations.
   - .rubocop_todo.yml
 
+  # The relaxed style rules as a common starting point which we can refine.
+  - .rubocop_relaxed_styleguide.yml
+
   # Our Open Food Network style guide. If you want to see all violations,
   # then use only that configuration:
   #
   #     bundle exec rubocop -c .rubocop_styleguide.yml
   #
   - .rubocop_styleguide.yml
-
-  # A manually compiled todo list to ignore metrics violations on a file-by-file basis.
-  - .rubocop_manual_todo.yml

.rubocop_manual_todo.yml

@@ -1,875 +0,0 @@
-# A manually compiled todo list to ignore metrics violations on a file-by-file basis.
-#
-# The file .rubocop_todo.yml is generated automatically and contains a
-# configuration to make all files pass. For a lot of cops it just lists
-# the offending files. But for metrics cops it sets a different metric.
-#
-# Since we don't want these lax metrics, we override them in our config
-# file .rubocop.yml which results in a lot of offences again. This file
-# lists all offending files for each cop to make rubocop pass. We can
-# improve the code over time and remove items from the list.
-#
-# This file was manually created by using the following tools:
-#
-#     rubocop > rubo.log
-#     # inspect log file to see which cops are failing
-#     # copy cop configurations and add Exclude parameter
-#     grep ExampleCop rubo.log | cut -d ":" -f 1 | sort -u | while read f; do echo "  - $f"; done >> .rubocop.yml
-#
-# This process probably doesn't need repeating. Otherwise there is plenty
-# of room for improvements and automation.
-Layout/LineLength:
-  Max: 100
-  Exclude:
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/paypal_controller.rb
-  - engines/order_management/spec/services/order_management/order/stripe_sca_payment_authorize_spec.rb
-  - engines/order_management/spec/services/order_management/order/updater_spec.rb
-  - engines/order_management/spec/services/order_management/reports/bulk_coop/bulk_coop_report_spec.rb
-  - lib/open_food_network/reports/line_items.rb
-  - spec/controllers/spree/admin/orders/invoices_spec.rb
-  - spec/controllers/spree/admin/tax_rates_controller_spec.rb
-  - spec/controllers/user_passwords_controller_spec.rb
-  - spec/features/admin/configuration/general_settings_spec.rb
-  - spec/features/consumer/shopping/unit_price_spec.rb
-  - spec/helpers/admin/orders_helper_spec.rb
-  - spec/lib/open_food_network/order_cycle_management_report_spec.rb
-  - spec/lib/stripe/authorize_response_patcher_spec.rb
-  - spec/services/bulk_invoice_service_spec.rb
-  - spec/services/content_sanitizer_spec.rb
-  - spec/services/process_payment_intent_spec.rb
-  - spec/support/features/datepicker_helper.rb
-  - app/controllers/admin/bulk_line_items_controller.rb
-  - app/controllers/admin/contents_controller.rb
-  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprise_relationships_controller.rb
-  - app/controllers/admin/enterprise_roles_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/admin/inventory_items_controller.rb
-  - app/controllers/admin/manager_invitations_controller.rb
-  - app/controllers/admin/product_import_controller.rb
-  - app/controllers/admin/schedules_controller.rb
-  - app/controllers/admin/subscriptions_controller.rb
-  - app/controllers/api/enterprise_attachment_controller.rb
-  - app/controllers/api/product_images_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
-  - app/controllers/stripe/callbacks_controller.rb
-  - app/helpers/angular_form_builder.rb
-  - app/helpers/angular_form_helper.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/enterprises_helper.rb
-  - app/helpers/markdown_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/orders_helper.rb
-  - app/jobs/subscription_confirm_job.rb
-  - app/mailers/subscription_mailer.rb
-  - app/models/column_preference.rb
-  - app/models/concerns/order_shipment.rb
-  - app/models/concerns/product_stock.rb
-  - app/models/concerns/variant_stock.rb
-  - app/models/content_configuration.rb
-  - app/models/customer.rb
-  - app/models/enterprise_group.rb
-  - app/models/enterprise_role.rb
-  - app/models/inventory_item.rb
-  - app/models/product_import/entry_processor.rb
-  - app/models/product_import/spreadsheet_entry.rb
-  - app/models/product_import/unit_converter.rb
-  - app/models/proxy_order.rb
-  - app/models/schedule.rb
-  - app/models/spree/app_configuration.rb
-  - app/models/spree/gateway/stripe_connect.rb
-  - app/models/spree/image.rb
-  - app/models/spree/order.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/product.rb
-  - app/models/spree/user.rb
-  - app/models/spree/variant.rb
-  - app/models/subscription.rb
-  - app/models/variant_override.rb
-  - app/serializers/api/admin/subscription_line_item_serializer.rb
-  - app/services/cart_service.rb
-  - app/services/checkout/post_checkout_actions.rb
-  - app/services/default_stock_location.rb
-  - app/services/embedded_page_service.rb
-  - app/services/order_cycle_form.rb
-  - app/services/order_factory.rb
-  - app/services/variant_units/variant_and_line_item_naming.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/subscriptions/validator.rb
-  - engines/web/app/helpers/web/cookies_policy_helper.rb
-  - engines/web/config/routes.rb
-  - engines/web/spec/features/consumer/cookies_spec.rb
-  - Gemfile
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/available_payment_method_filter.rb
-  - lib/open_food_network/bulk_coop_report.rb
-  - lib/open_food_network/customers_report.rb
-  - lib/open_food_network/enterprise_fee_applicator.rb
-  - lib/open_food_network/enterprise_fee_calculator.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/open_food_network/group_buy_report.rb
-  - lib/open_food_network/lettuce_share_report.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_management_report.rb
-  - lib/open_food_network/payments_report.rb
-  - lib/open_food_network/sales_tax_report.rb
-  - lib/open_food_network/scope_variants_for_search.rb
-  - lib/open_food_network/xero_invoices_report.rb
-  - lib/spree/localized_number.rb
-  - lib/stripe/credit_card_clone_finder.rb
-  - lib/tasks/data.rake
-  - lib/tasks/enterprises.rake
-  - spec/controllers/admin/bulk_line_items_controller_spec.rb
-  - spec/controllers/admin/column_preferences_controller_spec.rb
-  - spec/controllers/admin/customers_controller_spec.rb
-  - spec/controllers/admin/enterprises_controller_spec.rb
-  - spec/controllers/admin/inventory_items_controller_spec.rb
-  - spec/controllers/admin/manager_invitations_controller_spec.rb
-  - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/admin/proxy_orders_controller_spec.rb
-  - spec/controllers/admin/schedules_controller_spec.rb
-  - spec/controllers/admin/stripe_accounts_controller_spec.rb
-  - spec/controllers/admin/stripe_connect_settings_controller_spec.rb
-  - spec/controllers/admin/subscription_line_items_controller_spec.rb
-  - spec/controllers/admin/subscriptions_controller_spec.rb
-  - spec/controllers/admin/variant_overrides_controller_spec.rb
-  - spec/controllers/api/base_controller_spec.rb
-  - spec/controllers/api/exchange_products_controller_spec.rb
-  - spec/controllers/api/logos_controller_spec.rb
-  - spec/controllers/api/order_cycles_controller_spec.rb
-  - spec/controllers/api/orders_controller_spec.rb
-  - spec/controllers/api/product_images_controller_spec.rb
-  - spec/controllers/api/products_controller_spec.rb
-  - spec/controllers/api/promo_images_controller_spec.rb
-  - spec/controllers/api/states_controller_spec.rb
-  - spec/controllers/api/terms_and_conditions_controller_spec.rb
-  - spec/controllers/api/variants_controller_spec.rb
-  - spec/controllers/cart_controller_spec.rb
-  - spec/controllers/checkout_controller_spec.rb
-  - spec/controllers/enterprises_controller_spec.rb
-  - spec/controllers/line_items_controller_spec.rb
-  - spec/controllers/shop_controller_spec.rb
-  - spec/controllers/shops_controller_spec.rb
-  - spec/controllers/spree/admin/adjustments_controller_spec.rb
-  - spec/controllers/spree/admin/base_controller_spec.rb
-  - spec/controllers/spree/admin/orders_controller_spec.rb
-  - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
-  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
-  - spec/controllers/spree/admin/products_controller_spec.rb
-  - spec/controllers/spree/admin/reports_controller_spec.rb
-  - spec/controllers/spree/admin/variants_controller_spec.rb
-  - spec/controllers/spree/credit_cards_controller_spec.rb
-  - spec/controllers/spree/orders_controller_spec.rb
-  - spec/controllers/spree/users_controller_spec.rb
-  - spec/controllers/spree/user_sessions_controller_spec.rb
-  - spec/controllers/stripe/callbacks_controller_spec.rb
-  - spec/controllers/stripe/webhooks_controller_spec.rb
-  - spec/controllers/user_confirmations_controller_spec.rb
-  - spec/factories/line_item_factory.rb
-  - spec/factories/order_factory.rb
-  - spec/factories/shipment_factory.rb
-  - spec/factories/stock_location_factory.rb
-  - spec/factories/user_factory.rb
-  - spec/features/admin/adjustments_spec.rb
-  - spec/features/admin/bulk_order_management_spec.rb
-  - spec/features/admin/bulk_product_update_spec.rb
-  - spec/features/admin/configuration/content_spec.rb
-  - spec/features/admin/customers_spec.rb
-  - spec/features/admin/enterprise_fees_spec.rb
-  - spec/features/admin/enterprise_relationships_spec.rb
-  - spec/features/admin/enterprise_roles_spec.rb
-  - spec/features/admin/enterprises/images_spec.rb
-  - spec/features/admin/enterprises/index_spec.rb
-  - spec/features/admin/enterprises_spec.rb
-  - spec/features/admin/enterprise_user_spec.rb
-  - spec/features/admin/multilingual_spec.rb
-  - spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
-  - spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
-  - spec/features/admin/order_cycles/complex_editing_spec.rb
-  - spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
-  - spec/features/admin/order_cycles/list_spec.rb
-  - spec/features/admin/order_cycles/simple_spec.rb
-  - spec/features/admin/order_spec.rb
-  - spec/features/admin/overview_spec.rb
-  - spec/features/admin/payment_method_spec.rb
-  - spec/features/admin/product_import_spec.rb
-  - spec/features/admin/products_spec.rb
-  - spec/features/admin/reports_spec.rb
-  - spec/features/admin/schedules_spec.rb
-  - spec/features/admin/shipping_methods_spec.rb
-  - spec/features/admin/subscriptions_spec.rb
-  - spec/features/admin/tag_rules_spec.rb
-  - spec/features/admin/users_spec.rb
-  - spec/features/admin/variant_overrides_spec.rb
-  - spec/features/consumer/account/cards_spec.rb
-  - spec/features/consumer/account/settings_spec.rb
-  - spec/features/consumer/account_spec.rb
-  - spec/features/consumer/authentication_spec.rb
-  - spec/features/consumer/caching/darkswarm_caching_spec.rb
-  - spec/features/consumer/caching/shops_caching_spec.rb
-  - spec/features/consumer/groups_spec.rb
-  - spec/features/consumer/multilingual_spec.rb
-  - spec/features/consumer/producers_spec.rb
-  - spec/features/consumer/registration_spec.rb
-  - spec/features/consumer/shopping/cart_spec.rb
-  - spec/features/consumer/shopping/checkout_auth_spec.rb
-  - spec/features/consumer/shopping/checkout_spec.rb
-  - spec/features/consumer/shopping/checkout_stripe_spec.rb
-  - spec/features/consumer/shopping/embedded_groups_spec.rb
-  - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
-  - spec/features/consumer/shopping/orders_spec.rb
-  - spec/features/consumer/shopping/products_spec.rb
-  - spec/features/consumer/shopping/shopping_spec.rb
-  - spec/features/consumer/shopping/variant_overrides_spec.rb
-  - spec/features/consumer/shops_spec.rb
-  - spec/helpers/admin/subscriptions_helper_spec.rb
-  - spec/helpers/checkout_helper_spec.rb
-  - spec/helpers/enterprises_helper_spec.rb
-  - spec/helpers/groups_helper_spec.rb
-  - spec/helpers/injection_helper_spec.rb
-  - spec/helpers/order_cycles_helper_spec.rb
-  - spec/helpers/spree/admin/base_helper_spec.rb
-  - spec/jobs/confirm_order_job_spec.rb
-  - spec/jobs/subscription_confirm_job_spec.rb
-  - spec/jobs/subscription_placement_job_spec.rb
-  - spec/lib/open_food_network/address_finder_spec.rb
-  - spec/lib/open_food_network/customers_report_spec.rb
-  - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
-  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
-  - spec/lib/open_food_network/group_buy_report_spec.rb
-  - spec/lib/open_food_network/lettuce_share_report_spec.rb
-  - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
-  - spec/lib/open_food_network/order_cycle_permissions_spec.rb
-  - spec/lib/open_food_network/order_grouper_spec.rb
-  - spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
-  - spec/lib/open_food_network/permissions_spec.rb
-  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
-  - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
-  - spec/lib/open_food_network/tag_rule_applicator_spec.rb
-  - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
-  - spec/lib/open_food_network/xero_invoices_report_spec.rb
-  - spec/lib/spree/core/calculated_adjustments_spec.rb
-  - spec/lib/stripe/account_connector_spec.rb
-  - spec/lib/stripe/webhook_handler_spec.rb
-  - spec/mailers/order_mailer_spec.rb
-  - spec/mailers/producer_mailer_spec.rb
-  - spec/mailers/subscription_mailer_spec.rb
-  - spec/models/calculator/flexi_rate_spec.rb
-  - spec/models/calculator/price_sack_spec.rb
-  - spec/models/calculator/weight_spec.rb
-  - spec/models/column_preference_spec.rb
-  - spec/models/concerns/order_shipment_spec.rb
-  - spec/models/concerns/product_stock_spec.rb
-  - spec/models/customer_spec.rb
-  - spec/models/enterprise_caching_spec.rb
-  - spec/models/enterprise_fee_spec.rb
-  - spec/models/enterprise_group_spec.rb
-  - spec/models/enterprise_relationship_spec.rb
-  - spec/models/enterprise_spec.rb
-  - spec/models/exchange_spec.rb
-  - spec/models/order_cycle_spec.rb
-  - spec/models/product_importer_spec.rb
-  - spec/models/product_import/reset_absent_spec.rb
-  - spec/models/proxy_order_spec.rb
-  - spec/models/spree/ability_spec.rb
-  - spec/models/spree/address_spec.rb
-  - spec/models/spree/adjustment_spec.rb
-  - spec/models/spree/classification_spec.rb
-  - spec/models/spree/gateway/stripe_connect_spec.rb
-  - spec/models/spree/inventory_unit_spec.rb
-  - spec/models/spree/line_item_spec.rb
-  - spec/models/spree/order/checkout_spec.rb
-  - spec/models/spree/order_inventory_spec.rb
-  - spec/models/spree/order_spec.rb
-  - spec/models/spree/order/state_machine_spec.rb
-  - spec/models/spree/payment_method_spec.rb
-  - spec/models/spree/payment_spec.rb
-  - spec/models/spree/product_set_spec.rb
-  - spec/models/spree/product_spec.rb
-  - spec/models/spree/return_authorization_spec.rb
-  - spec/models/spree/shipping_method_spec.rb
-  - spec/models/spree/stock_item_spec.rb
-  - spec/models/spree/taxon_spec.rb
-  - spec/models/spree/tax_rate_spec.rb
-  - spec/models/spree/user_spec.rb
-  - spec/models/spree/variant_spec.rb
-  - spec/models/stripe_account_spec.rb
-  - spec/models/tag_rule/discount_order_spec.rb
-  - spec/models/tag_rule/filter_order_cycles_spec.rb
-  - spec/models/tag_rule/filter_payment_methods_spec.rb
-  - spec/models/tag_rule/filter_products_spec.rb
-  - spec/models/tag_rule/filter_shipping_methods_spec.rb
-  - spec/models/variant_override_spec.rb
-  - spec/performance/orders_controller_spec.rb
-  - spec/performance/shop_controller_spec.rb
-  - spec/requests/api/orders_spec.rb
-  - spec/requests/checkout/failed_checkout_spec.rb
-  - spec/requests/embedded_shopfronts_headers_spec.rb
-  - spec/serializers/api/admin/customer_serializer_spec.rb
-  - spec/serializers/api/admin/exchange_serializer_spec.rb
-  - spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb
-  - spec/serializers/api/admin/order_cycle_serializer_spec.rb
-  - spec/serializers/api/admin/subscription_customer_serializer_spec.rb
-  - spec/serializers/api/admin/variant_override_serializer_spec.rb
-  - spec/serializers/api/current_order_serializer_spec.rb
-  - spec/serializers/api/enterprise_shopfront_serializer_spec.rb
-  - spec/serializers/api/order_serializer_spec.rb
-  - spec/services/cart_service_spec.rb
-  - spec/services/checkout/form_data_adapter_spec.rb
-  - spec/services/checkout/post_checkout_actions_spec.rb
-  - spec/services/embedded_page_service_spec.rb
-  - spec/services/exchange_products_renderer_spec.rb
-  - spec/services/order_cycle_distributed_products_spec.rb
-  - spec/services/order_cycle_distributed_variants_spec.rb
-  - spec/services/order_cycle_form_spec.rb
-  - spec/services/order_factory_spec.rb
-  - spec/services/order_syncer_spec.rb
-  - spec/services/permissions/order_spec.rb
-  - spec/services/permitted_attributes/order_cycle_spec.rb
-  - spec/services/products_renderer_spec.rb
-  - spec/services/product_tag_rules_filterer_spec.rb
-  - spec/services/variant_units/option_value_namer_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/cancan_helper.rb
-  - spec/support/delayed_job_helper.rb
-  - spec/support/matchers/delegate_matchers.rb
-  - spec/support/matchers/select2_matchers.rb
-  - spec/support/matchers/table_matchers.rb
-  - spec/support/request/shop_workflow.rb
-  - spec/support/request/web_helper.rb
-  - spec/support/seeds.rb
-  - spec/swagger_helper.rb
-  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
-
-Metrics/AbcSize:
-  Max: 15
-  Exclude:
-  - app/controllers/admin/schedules_controller.rb
-  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/general_settings_controller.rb
-  - app/controllers/spree/admin/images_controller.rb
-  - app/controllers/spree/admin/mail_methods_controller.rb
-  - app/controllers/spree/admin/shipping_methods_controller.rb
-  - app/controllers/spree/paypal_controller.rb
-  - app/helpers/spree/base_helper.rb
-  - app/jobs/subscription_placement_job.rb
-  - app/models/order_cycle.rb
-  - app/models/product_import/unit_converter.rb
-  - app/models/spree/gateway/pay_pal_express.rb
-  - app/serializers/api/admin/enterprise_serializer.rb
-  - app/services/order_factory.rb
-  - app/services/variants_stock_levels.rb
-  - engines/order_management/app/services/order_management/subscriptions/form.rb
-  - lib/open_food_network/enterprise_fee_calculator.rb
-  - lib/open_food_network/order_grouper.rb
-  - lib/spree/core/controller_helpers/auth.rb
-  - lib/spree/core/controller_helpers/common.rb
-  - lib/spree/core/product_duplicator.rb
-  - lib/stripe/authorize_response_patcher.rb
-  - lib/stripe/profile_storer.rb
-  - app/controllers/admin/bulk_line_items_controller.rb
-  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/admin/order_cycles_controller.rb
-  - app/controllers/admin/product_import_controller.rb
-  - app/controllers/admin/resource_controller.rb
-  - app/controllers/admin/stripe_accounts_controller.rb
-  - app/controllers/admin/subscription_line_items_controller.rb
-  - app/controllers/admin/subscriptions_controller.rb
-  - app/controllers/api/enterprises_controller.rb
-  - app/controllers/api/product_images_controller.rb
-  - app/controllers/api/products_controller.rb
-  - app/controllers/api/shipments_controller.rb
-  - app/controllers/api/taxons_controller.rb
-  - app/controllers/api/variants_controller.rb
-  - app/controllers/application_controller.rb
-  - app/controllers/cart_controller.rb
-  - app/controllers/discourse_sso_controller.rb
-  - app/controllers/enterprises_controller.rb
-  - app/controllers/spree/admin/orders_controller.rb
-  - app/controllers/spree/admin/orders/customer_details_controller.rb
-  - app/controllers/spree/admin/overview_controller.rb
-  - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/search_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/admin/users_controller.rb
-  - app/controllers/spree/admin/variants_controller.rb
-  - app/controllers/spree/credit_cards_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
-  - app/controllers/spree/user_passwords_controller.rb
-  - app/controllers/spree/user_registrations_controller.rb
-  - app/controllers/spree/users_controller.rb
-  - app/controllers/spree/user_sessions_controller.rb
-  - app/controllers/stripe/callbacks_controller.rb
-  - app/controllers/user_confirmations_controller.rb
-  - app/controllers/user_passwords_controller.rb
-  - app/controllers/user_registrations_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/helpers/spree/admin/zones_helper.rb
-  - app/helpers/spree/orders_helper.rb
-  - app/models/calculator/flat_percent_per_item.rb
-  - app/models/column_preference.rb
-  - app/models/enterprise_group.rb
-  - app/models/enterprise.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/product_import/entry_processor.rb
-  - app/models/product_import/entry_validator.rb
-  - app/models/product_import/product_importer.rb
-  - app/models/proxy_order.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/line_item.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/order_contents.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/order.rb
-  - app/models/spree/payment/processing.rb
-  - app/models/spree/payment.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/product.rb
-  - app/models/spree/return_authorization.rb
-  - app/models/spree/shipment.rb
-  - app/models/spree/taxon.rb
-  - app/models/spree/tax_rate.rb
-  - app/models/spree/variant.rb
-  - app/models/spree/zone.rb
-  - app/serializers/api/product_serializer.rb
-  - app/serializers/api/variant_serializer.rb
-  - app/services/cart_service.rb
-  - app/services/create_order_cycle.rb
-  - app/services/sets/model_set.rb
-  - app/services/order_cycle_form.rb
-  - app/services/order_syncer.rb
-  - app/services/variant_units/option_value_namer.rb
-  - app/services/variant_units/variant_and_line_item_naming.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - engines/order_management/app/services/order_management/stock/package.rb
-  - engines/order_management/app/services/order_management/stock/packer.rb
-  - engines/order_management/app/services/order_management/subscriptions/validator.rb
-  - lib/active_merchant/billing/gateways/stripe_decorator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/customers_report.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/open_food_network/group_buy_report.rb
-  - lib/open_food_network/lettuce_share_report.rb
-  - lib/open_food_network/order_and_distributor_report.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_management_report.rb
-  - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb
-  - lib/open_food_network/packing_report.rb
-  - lib/open_food_network/payments_report.rb
-  - lib/open_food_network/permissions.rb
-  - lib/open_food_network/products_and_inventory_report.rb
-  - lib/open_food_network/reports/line_items.rb
-  - lib/open_food_network/sales_tax_report.rb
-  - lib/open_food_network/users_and_enterprises_report.rb
-  - lib/open_food_network/xero_invoices_report.rb
-  - lib/spree/api/controller_setup.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/core/delegate_belongs_to.rb
-  - lib/spree/core/permalinks.rb
-  - lib/spree/core/s3_support.rb
-  - lib/spree/localized_number.rb
-  - lib/spree/money.rb
-  - lib/stripe/account_connector.rb
-  - lib/tasks/enterprises.rake
-  - lib/tasks/sample_data/order_factory.rb
-  - lib/tasks/sample_data/product_factory.rb
-  - spec/features/admin/product_import_spec.rb
-  - spec/features/admin/reports_spec.rb
-  - spec/features/admin/subscriptions_spec.rb
-  - spec/features/consumer/shopping/shopping_spec.rb
-  - spec/features/consumer/shopping/variant_overrides_spec.rb
-  - spec/models/enterprise_spec.rb
-  - spec/models/product_importer_spec.rb
-  - spec/services/order_checkout_restart_spec.rb
-  - spec/support/i18n_translations_checker.rb
-  - spec/support/performance_helper.rb
-  - spec/support/request/web_helper.rb
-
-Metrics/BlockLength:
-  Max: 25
-  IgnoredMethods: [
-    "class_eval",
-    "collection",
-    "context",
-    "describe",
-    "feature",
-    "it",
-    "member",
-    "namespace",
-    "resource",
-    "resources",
-    "scenario"
-  ]
-  Exclude:
-  - spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
-  - spec/features/admin/tag_rules_spec.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
-  - app/models/spree/shipment.rb
-  - lib/spree/core/controller_helpers/common.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/tasks/data.rake
-  - spec/controllers/spree/admin/invoices_controller_spec.rb
-  - spec/factories/address_factory.rb
-  - spec/factories/enterprise_factory.rb
-  - spec/factories/order_cycle_factory.rb
-  - spec/factories/order_factory.rb
-  - spec/factories/payment_method_factory.rb
-  - spec/factories/product_factory.rb
-  - spec/factories.rb
-  - spec/factories/shipment_factory.rb
-  - spec/factories/shipping_method_factory.rb
-  - spec/factories/subscription_factory.rb
-  - spec/factories/user_factory.rb
-  - spec/factories/variant_factory.rb
-  - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
-  - spec/lib/open_food_network/group_buy_report_spec.rb
-  - spec/models/tag_rule/discount_order_spec.rb
-  - spec/requests/api/orders_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/delayed_job_helper.rb
-  - spec/support/matchers/select2_matchers.rb
-  - spec/support/matchers/table_matchers.rb
-  - spec/swagger_helper.rb
-
-Metrics/CyclomaticComplexity:
-  Max: 6
-  Exclude:
-  - app/controllers/admin/resource_controller.rb
-  - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/users_controller.rb
-  - app/models/product_import/entry_validator.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/order.rb
-  - app/models/spree/shipment.rb
-  - app/models/spree/tax_rate.rb
-  - app/models/spree/variant.rb
-  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/parameters.rb
-  - lib/active_merchant/billing/gateways/stripe_decorator.rb
-  - lib/open_food_network/group_buy_report.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/payments_report.rb
-  - lib/spree/core/controller_helpers/common.rb
-  - lib/stripe/authorize_response_patcher.rb
-  - lib/stripe/credit_card_clone_destroyer.rb
-  - spec/support/i18n_translations_checker.rb
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/enterprise.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/product.rb
-  - app/models/spree/return_authorization.rb
-  - app/models/spree/zone.rb
-  - app/services/cart_service.rb
-  - app/services/sets/variant_override_set.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/localized_number.rb
-  - spec/models/product_importer_spec.rb
-
-Metrics/PerceivedComplexity:
-  Max: 7
-  Exclude:
-  - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller.rb
-  - app/controllers/spree/admin/users_controller.rb
-  - app/models/product_import/entry_validator.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/shipment.rb
-  - app/models/spree/variant.rb
-  - lib/active_merchant/billing/gateways/stripe_decorator.rb
-  - lib/open_food_network/group_buy_report.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/payments_report.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/api/variants_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/order.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/product.rb
-  - app/models/spree/return_authorization.rb
-  - app/models/spree/zone.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/localized_number.rb
-  - spec/models/product_importer_spec.rb
-
-Metrics/MethodLength:
-  Max: 10
-  Exclude:
-  - app/controllers/admin/contents_controller.rb
-  - app/controllers/admin/customers_controller.rb
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/admin/manager_invitations_controller.rb
-  - app/controllers/admin/order_cycles_controller.rb
-  - app/controllers/admin/resource_controller.rb
-  - app/controllers/admin/stripe_accounts_controller.rb
-  - app/controllers/admin/subscriptions_controller.rb
-  - app/controllers/api/products_controller.rb
-  - app/controllers/api/shipments_controller.rb
-  - app/controllers/api/taxons_controller.rb
-  - app/controllers/api/variants_controller.rb
-  - app/controllers/cart_controller.rb
-  - app/controllers/shop_controller.rb
-  - app/controllers/spree/admin/orders_controller.rb
-  - app/controllers/spree/admin/orders/customer_details_controller.rb
-  - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/tax_categories_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/admin/users_controller.rb
-  - app/controllers/spree/admin/variants_controller.rb
-  - app/controllers/spree/credit_cards_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
-  - app/controllers/spree/user_sessions_controller.rb
-  - app/controllers/stripe/callbacks_controller.rb
-  - app/controllers/user_confirmations_controller.rb
-  - app/controllers/user_passwords_controller.rb
-  - app/controllers/user_registrations_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/mailers/producer_mailer.rb
-  - app/models/column_preference.rb
-  - app/models/enterprise.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/preference_sections/footer_and_external_links_section.rb
-  - app/models/preference_sections/main_links_section.rb
-  - app/models/product_import/entry_processor.rb
-  - app/models/product_import/entry_validator.rb
-  - app/models/product_import/product_importer.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/credit_card.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/order_contents.rb
-  - app/models/spree/order_inventory.rb
-  - app/models/spree/order.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment/processing.rb
-  - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/preferences/store.rb
-  - app/models/spree/product.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/return_authorization.rb
-  - app/models/spree/shipment.rb
-  - app/models/spree/taxon.rb
-  - app/models/spree/tax_rate.rb
-  - app/models/spree/variant.rb
-  - app/models/spree/zone.rb
-  - app/serializers/api/admin/order_cycle_serializer.rb
-  - app/serializers/api/cached_enterprise_serializer.rb
-  - app/services/order_cycle_form.rb
-  - app/services/permitted_attributes/checkout.rb
-  - app/services/variant_units/option_value_namer.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
-  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - engines/order_management/app/services/order_management/stock/package.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/column_preference_defaults.rb
-  - lib/open_food_network/customers_report.rb
-  - lib/open_food_network/enterprise_fee_calculator.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/open_food_network/group_buy_report.rb
-  - lib/open_food_network/lettuce_share_report.rb
-  - lib/open_food_network/order_and_distributor_report.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_management_report.rb
-  - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/order_grouper.rb
-  - lib/open_food_network/packing_report.rb
-  - lib/open_food_network/payments_report.rb
-  - lib/open_food_network/permissions.rb
-  - lib/open_food_network/products_and_inventory_report.rb
-  - lib/open_food_network/rack_request_blocker.rb
-  - lib/open_food_network/reports/line_items.rb
-  - lib/open_food_network/sales_tax_report.rb
-  - lib/open_food_network/users_and_enterprises_report.rb
-  - lib/open_food_network/xero_invoices_report.rb
-  - lib/spree/api/controller_setup.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/delegate_belongs_to.rb
-  - lib/spree/core/permalinks.rb
-  - lib/spree/core/s3_support.rb
-  - lib/spree/localized_number.rb
-  - lib/spree/responder.rb
-  - lib/stripe/credit_card_clone_finder.rb
-  - lib/stripe/profile_storer.rb
-  - lib/tasks/sample_data/group_factory.rb
-  - lib/tasks/sample_data/order_factory.rb
-  - lib/tasks/sample_data/product_factory.rb
-  - spec/features/consumer/shopping/variant_overrides_spec.rb
-  - spec/models/product_importer_spec.rb
-  - spec/support/i18n_translations_checker.rb
-  - app/controllers/admin/bulk_line_items_controller.rb
-  - app/controllers/spree/paypal_controller.rb
-  - app/jobs/subscription_placement_job.rb
-  - app/models/spree/gateway/pay_pal_express.rb
-
-Metrics/ClassLength:
-  Max: 100
-  Exclude:
-  - app/controllers/admin/customers_controller.rb
-  - app/controllers/spree/admin/payments_controller.rb
-  - app/controllers/spree/paypal_controller.rb
-  - engines/order_management/app/services/order_management/order/updater.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/admin/order_cycles_controller.rb
-  - app/controllers/admin/resource_controller.rb
-  - app/controllers/admin/schedules_controller.rb
-  - app/controllers/admin/subscriptions_controller.rb
-  - app/controllers/api/products_controller.rb
-  - app/controllers/application_controller.rb
-  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/orders_controller.rb
-  - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/users_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/models/enterprise.rb
-  - app/models/order_cycle.rb
-  - app/models/product_import/entry_processor.rb
-  - app/models/product_import/entry_validator.rb
-  - app/models/product_import/product_importer.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/credit_card.rb
-  - app/models/spree/gateway/stripe_sca.rb
-  - app/models/spree/line_item.rb
-  - app/models/spree/order.rb
-  - app/models/spree/payment.rb
-  - app/models/spree/product.rb
-  - app/models/spree/shipment.rb
-  - app/models/spree/user.rb
-  - app/models/spree/variant.rb
-  - app/models/spree/zone.rb
-  - app/serializers/api/cached_enterprise_serializer.rb
-  - app/serializers/api/enterprise_shopfront_serializer.rb
-  - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/open_food_network/enterprise_fee_calculator.rb
-  - lib/open_food_network/order_cycle_form_applicator.rb
-  - lib/open_food_network/order_cycle_management_report.rb
-  - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/packing_report.rb
-  - lib/open_food_network/payments_report.rb
-  - lib/open_food_network/permissions.rb
-  - lib/open_food_network/users_and_enterprises_report.rb
-  - lib/open_food_network/xero_invoices_report.rb
-
-Metrics/ModuleLength:
-  Max: 100
-  Exclude:
-  - app/helpers/admin/injection_helper.rb
-  - app/helpers/injection_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
-  - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/summary_spec.rb
-  - lib/open_food_network/column_preference_defaults.rb
-  - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/api/orders_controller_spec.rb
-  - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
-  - spec/lib/open_food_network/order_cycle_permissions_spec.rb
-  - spec/models/spree/adjustment_spec.rb
-  - spec/models/spree/credit_card_spec.rb
-  - spec/models/spree/line_item_spec.rb
-  - spec/models/spree/product_spec.rb
-  - spec/models/spree/variant_spec.rb
-
-Metrics/ParameterLists:
-  Max: 5
-  Exclude:
-  - app/helpers/angular_form_builder.rb
-  - app/models/product_import/entry_processor.rb
-  - lib/open_food_network/xero_invoices_report.rb
-  - spec/features/admin/reports_spec.rb
-
-Lint/UselessAssignment:
-  Exclude:
-  - 'spec/**/*'
-  - 'app/models/spree/taxon.rb'
-  - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_relaxed_styleguide.yml

@@ -0,0 +1,153 @@
+# Relaxed.Ruby.Style
+## Version 2.5
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylealias
+
+Style/AsciiComments:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleasciicomments
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylecommentannotation
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styledocumentation
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#layoutdotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylenegatedwhile
+
+Style/NumericPredicate:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylenumericpredicate
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylesinglelinemethods
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#layoutspacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#layoutspaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylestringliterals
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styletrailingcommainarguments
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styletrailingcommainarrayliteral
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#styletrailingcommainhashliteral
+
+Style/SymbolArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesymbolarray
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#stylewordarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: https://relaxed.ruby.style/#lintassignmentincondition
+
+Layout/LineLength:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+

.rubocop_specs.yml

@@ -1,7 +0,0 @@
-inherit_from:
-  - .rubocop.yml
-
-# This rubocop config file is only used for specs
-# Here we allow specs to be 300 lines long
-Metrics/ModuleLength:
-  Max: 300

.rubocop_styleguide.yml

@@ -19,6 +19,39 @@ AllCops:
 #
 # Cop settings that have been agreed upon by the OFN community
 
+Metrics:
+  Enabled: true
+
+Metrics/BlockLength:
+  IgnoredMethods: [
+    "class_eval",
+    "collection",
+    "context",
+    "delete",
+    "describe",
+    "feature",
+    "get",
+    "it",
+    "member",
+    "namespace",
+    "path",
+    "post",
+    "put",
+    "resource",
+    "resources",
+    "scenario",
+    "shared_examples",
+  ]
+
+Rails/SkipsModelValidations:
+  AllowedMethods:
+    - "touch"
+    - "touch_all"
+    - "update_all"
+    - "update_attribute"
+    - "update_column"
+    - "update_columns"
+
 Style/Documentation:
   Enabled: false
 
@@ -37,6 +70,7 @@ Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
 Layout/LineLength:
+  Enabled: true
   Max: 100
 
 Lint/RaiseException:
@@ -45,6 +79,11 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
+Naming/VariableNumber:
+  AllowedIdentifiers:
+    - street_address_1
+    - street_address_2
+
 Bundler/DuplicatedGem:
   Enabled: false
 
@@ -66,156 +105,20 @@ Lint/UselessAssignment:
   Exclude:
   - spec/**/*
 
-## Relaxed.Ruby.Style SETTINGS
-#
-# These styles are a starting point for the conversation around conventions
-# They should be removed or tweaked and moved above as decisions are made
-# NOTE: Cops which did not fail at the time of writing were removed
-
-Layout/DotPosition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledotposition
-
-Layout/SpaceBeforeBlockBraces:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
-
-Layout/SpaceInsideParens:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
-
-Style/Alias:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylealias
-
-Style/BlockDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
-
-Style/CommentAnnotation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
-
-Style/DoubleNegation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
-
-Style/FormatString:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleformatstring
-
-Style/HashEachMethods:
-  Enabled: false
-
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
-
-Style/Lambda:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylelambda
-
-Style/MultilineBlockChain:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
-
-Style/NegatedIf:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
-
-Style/NegatedWhile:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
-
-Style/ParallelAssignment:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
-
-Style/Semicolon:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
-
-Style/SingleLineMethods:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
-
-Style/TrailingCommaInArguments:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
-
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
-
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
-
-Style/WordArray:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylewordarray
-
-Style/SymbolArray:
-  Enabled: false
-  StyleGuide: https://rubocop.readthedocs.io/en/latest/cops_style/#stylesymbolarray
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
-
-Lint/AssignmentInCondition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+Lint/MissingSuper:
+  Exclude:
+    - 'app/components/**/*'
 
 Metrics/AbcSize:
-  Max: 15
-
-Metrics/BlockLength:
-  Max: 25
-  IgnoredMethods: [
-    "class_eval",
-    "collection",
-    "context",
-    "describe",
-    "feature",
-    "it",
-    "member",
-    "namespace",
-    "resource",
-    "resources",
-    "scenario"
-  ]
-
-Metrics/BlockNesting:
-  Max: 3
-
-Metrics/ClassLength:
-  Max: 100
-
-Metrics/ModuleLength:
-  Max: 100
-
-Metrics/CyclomaticComplexity:
-  Max: 6
+  Max: 30 # default 17
 
 Metrics/MethodLength:
-  Max: 10
-
-Metrics/ParameterLists:
-  Max: 5
+  Enabled: true
+  Max: 25 # default 10
 
 Metrics/PerceivedComplexity:
-  Max: 7
+  Enabled: true
+  Max: 14 # default 8
 
 Naming/PredicateName:
   Enabled: false

.ruby-version

@@ -1 +1 @@
-2.5.8
+3.0.3

.simplecov

@@ -15,6 +15,3 @@ SimpleCov.start 'rails' do
   add_filter '/db'
   add_filter '/lib/tasks/sample_data/'
 end
-
-require 'codecov'
-SimpleCov.formatter = SimpleCov::Formatter::Codecov

CONTRIBUTING.md

@@ -69,5 +69,5 @@ From here, your pull request will progress through the [Review, Test, Merge & De
 [semaphore]: https://semaphoreci.com/
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
 [ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
-[i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/i18n
-[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27
+[i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Internationalisation-%28i18n%29
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2

Dockerfile

@@ -7,37 +7,53 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
 
 # Install all the requirements
-RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip
+RUN apt-get update && apt-get install -y \
+  curl \
+  git \
+  build-essential \
+  software-properties-common \
+  wget \
+  zlib1g-dev \
+  libreadline-dev \
+  libyaml-dev \
+  libffi-dev \
+  libxml2-dev \
+  libxslt1-dev \
+  wait-for-it \
+  imagemagick \
+  unzip \
+  libjemalloc-dev \
+  libssl-dev \
+  ca-certificates \
+  gnupg
 
 # Setup ENV variables
 ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
 ENV RBENV_ROOT /usr/local/src/rbenv
 ENV CONFIGURE_OPTS --disable-install-doc
 ENV BUNDLE_PATH /bundles
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
 
 WORKDIR /usr/src/app
 COPY .ruby-version .
 
 # Install Rbenv & Ruby
-RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
-    git clone --depth 1 --branch v20200520 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    ${RBENV_ROOT}/plugins/ruby-build/install.sh && \
+RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
+    git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
     echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
-    rbenv install $(cat .ruby-version) && \
-    rbenv global $(cat .ruby-version) && \
-    gem install bundler --version=1.17.3
+    RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install $(cat .ruby-version) && \
+    rbenv global $(cat .ruby-version)
 
 # Install Postgres
-RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
-    wget --quiet -O - https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
+RUN sh -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main' >> /etc/apt/sources.list.d/pgdg.list" && \
+    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null && \
     apt-get update && \
-    apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
+    apt-get install -yqq --no-install-recommends postgresql-client-10 libpq-dev
 
-# Install node & yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-    apt-get install -y nodejs yarn
+# Install NodeJs and yarn
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install --no-install-recommends -y nodejs \
+    && npm install -g yarn
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -53,6 +69,9 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
 # Copy code and install app dependencies
 COPY . /usr/src/app/
 
+# Install Bundler
+RUN ./script/install-bundler
+
 # Install front-end dependencies
 RUN yarn install
 

GETTING_STARTED.md

@@ -2,12 +2,17 @@
 
 This is a general guide to setting up an Open Food Network **development environment on your local machine**. If you want to setup OFN on a server, please have a look at the [ofn-install deployment guide](https://github.com/openfoodfoundation/ofn-install/wiki).
 
+#### Still learning Ruby on Rails?
+
+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)
 * 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:
@@ -47,11 +52,15 @@ $ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f0
 
 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.
 
-Once done, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
+Next, it is _strongly recommended_ to run the setup script.
+```sh
+$ script/setup
+```
+If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
 Now, your dreams of spinning up a development server can be realised:
 
-    bundle exec rails server
+    foreman start
 
 Go to [http://localhost:3000](http://localhost:3000) to play around!
 
@@ -76,7 +85,7 @@ The tests of all custom engines can be run with:
 
 Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop.
 
-Note: The time zone on your machine should match the one defined in `config/application.yml`.
+Note: The time zone on your machine should match the one defined in the `.env[.*]` file.
 
 Once [npm dependencies are installed][karma], AngularJS tests can be run with:
 

Gemfile

@@ -1,64 +1,75 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "2.5.8"
+ruby "3.0.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'rails', '~> 5.2'
+gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+
+gem 'rails', '>= 6.1.4'
+
+# Active Storage
+gem "active_storage_validations"
+gem "aws-sdk-s3", require: false
+gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
+gem 'rexml'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '2.4.1'
+gem 'ransack', '2.4.2'
 gem 'responders'
-gem 'sass', '<= 4.7.1'
-gem 'sass-rails', '< 6.0.0'
+gem 'webpacker', '~> 5'
 
 gem 'i18n'
-gem 'i18n-js', '~> 3.8.3'
+gem 'i18n-js', '~> 3.9.0'
 gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5"
-gem "fog-aws", ">= 0.6.0"
+gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6"
+gem "fog-aws", "~> 2.0" # db2fog does not support v3
+gem "mime-types" # required by fog
+
+gem "valid_email2"
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
 gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
-gem 'activerecord-postgresql-adapter'
-gem 'pg', '~> 1.2.3'
+gem "activerecord-postgresql-adapter"
+gem "arel-helpers", "~> 2.12"
+gem "pg", "~> 1.2.3"
 
 gem 'acts_as_list', '1.0.4'
 gem 'cancancan', '~> 1.15.0'
+gem 'digest'
 gem 'ffaker'
 gem 'highline', '2.0.3' # Necessary for the install generator
 gem 'json'
 gem 'monetize', '~> 1.11'
 gem 'paranoia', '~> 2.4'
 gem 'state_machines-activerecord'
-gem 'stringex', '~> 2.8.5'
+gem 'stringex', '~> 2.8.5', require: false
 
 gem 'paypal-sdk-merchant', '1.117.2'
 gem 'stripe'
 
 gem 'devise'
 gem 'devise-encryptable'
+gem 'devise-i18n'
 gem 'devise-token_authenticatable'
-gem 'jwt', '~> 2.2'
+gem 'jwt', '~> 2.3'
 gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
-gem 'daemons'
-gem 'delayed_job_active_record'
-gem 'delayed_job_web'
+gem 'jsonapi-serializer'
+gem 'pagy', '~> 5.1'
 
-gem 'kaminari', '~> 1.2.1'
+gem 'rswag-api'
+gem 'rswag-ui'
 
-gem 'andand'
-gem 'angularjs-rails', '1.5.5'
-gem 'aws-sdk', '1.67.0'
+gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
 gem 'haml'
 gem 'redcarpet'
@@ -68,50 +79,49 @@ gem 'actionpack-action_caching'
 #   AMS is deprecated, we will introduce an alternative at some point
 gem "active_model_serializers", "0.8.4"
 gem 'activerecord-session_store'
-gem 'acts-as-taggable-on', '~> 7.0'
+gem 'acts-as-taggable-on', '~> 8.1'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
-gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
-gem 'dalli'
-gem 'figaro'
+gem 'bigdecimal', '3.0.2'
+gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 10.3.1'
-gem 'paperclip', '~> 3.4.1'
+gem 'paper_trail', '~> 12.1.0'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
-gem 'roadie-rails', '~> 2.2.0'
+gem 'roadie-rails'
 
-gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'hiredis'
+gem 'puma'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'sidekiq'
+gem 'sidekiq-scheduler'
+
+gem "cable_ready", "5.0.0.pre3"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
 gem 'immigrant'
-gem 'roo', '~> 2.8.3'
+gem 'roo'
+gem 'spreadsheet_architect'
 
 gem 'whenever', require: false
 
-gem 'test-unit', '~> 3.4'
+gem 'test-unit', '~> 3.5'
 
 gem 'coffee-rails', '~> 5.0.0'
-gem 'compass-rails'
 
 gem 'mini_racer', '0.4.0'
 
 gem 'uglifier', '>= 1.0.3'
 
 gem 'angular_rails_csrf'
-gem 'foundation-icons-sass-rails'
 
-gem 'foundation-rails', '= 5.5.2.1'
-
-gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-gem 'select2-rails', '~> 3.4.7'
+gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
@@ -125,7 +135,8 @@ gem "view_component", require: "view_component/engine"
 
 group :production, :staging do
   gem 'ddtrace'
-  gem 'unicorn-worker-killer'
+  gem 'rack-timeout'
+  gem 'sd_notify' # For better Systemd process management. Used by Puma.
 end
 
 group :test, :development do
@@ -133,6 +144,7 @@ group :test, :development do
   gem 'awesome_print'
   gem 'bullet'
   gem 'capybara'
+  gem 'cuprite'
   gem 'database_cleaner', require: false
   gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
@@ -141,40 +153,37 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry'
-  gem 'rswag'
+  gem 'rswag-specs'
   gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'timecop'
-  gem 'unicorn-rails'
   gem 'webdrivers'
 end
 
 group :test do
-  gem 'codecov', require: false
+  gem 'byebug'
+  gem 'pdf-reader'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
   gem 'test-prof'
   gem 'webmock'
-  gem 'rails-controller-testing'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
 end
 
 group :development do
-  gem 'byebug'
   gem 'debugger-linecache'
-  gem 'pry'
-  gem 'pry-byebug'
+  gem 'foreman'
+  gem 'listen'
+  gem 'pry', '~> 0.13.0'
+  gem 'pry-byebug', '~> 3.9.0'
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring'
   gem 'spring-commands-rspec'
+  gem 'web-console'
 
   gem "view_component_storybook", require: "view_component/storybook/engine"
 
-  # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
-  # While we don't require this gem directly, no dependents forced the upgrade to a version
-  # greater than 1.0.9, so we just required the latest available version here.
-  gem 'eventmachine', '>= 1.2.3'
-
   gem 'rack-mini-profiler', '< 3.0.0'
 end

Procfile

@@ -0,0 +1,5 @@
+# Foreman Procfile. Start all dev server processes with: `foreman start`
+
+rails:      bundle exec rails s -p 3000
+webpack:    ./bin/webpack-dev-server
+sidekiq:    bundle exec sidekiq -q mailers -q default

README.md

@@ -1,5 +1,4 @@
 [![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/openfoodfoundation/openfoodnetwork/branch/master/graph/badge.svg?token=FBSOod4qiu)](https://codecov.io/gh/openfoodfoundation/openfoodnetwork)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
@@ -34,18 +33,18 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board](https://github.com/openfoodfoundation/openfoodnetwork/projects/31) 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](https://github.com/orgs/openfoodfoundation/projects/1) 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! 
 
 ## Licence
 
-Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2021 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
 [ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
-[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
 [zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -8,6 +8,6 @@ require_relative 'config/application'
 
 Openfoodnetwork::Application.load_tasks
 
-unless ENV['DISABLE_KNAPSACK']
-  Knapsack.load_tasks if defined?(Knapsack)
+if !ENV['DISABLE_KNAPSACK'] && defined?(Knapsack)
+  Knapsack.load_tasks
 end

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

@@ -8,6 +8,9 @@ angular.module("ofn.admin", [
   "admin.dropdown",
   "admin.products",
   "admin.taxons",
-  "infinite-scroll"
-]).config ($httpProvider) ->
+  "infinite-scroll",
+  "admin.orders"
+]).config ($httpProvider, $locationProvider, $qProvider) ->
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
+  $locationProvider.hashPrefix('')
+  $qProvider.errorOnUnhandledRejections(false)

app/assets/javascripts/admin/all.js

@@ -6,8 +6,7 @@
 //
 
 // jquery and angular
-//= require jquery
-//= require jquery-migrate-min
+//= require jquery2
 //= require jquery_ujs
 //= require jquery.ui.all
 //= require jquery.powertip
@@ -48,7 +47,6 @@
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
-//= require admin/spree_paypal_express
 //= require admin/spree/handlebar_extensions
 
 // OFN specific
@@ -110,5 +108,8 @@
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 
+// LocalStorage
+//= require ../shared/angular-local-storage.js
+
 // requires the rest of the JS code in this folder
 //= require_tree .

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

@@ -144,11 +144,11 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.variantIdCounter
 
   $scope.deleteProduct = (product) ->
-    if confirm("Are you sure?")
+    if confirm(t('are_you_sure'))
       $http(
         method: "DELETE"
         url: "/api/v0/products/" + product.id
-      ).success (data) ->
+      ).then (response) ->
         $scope.products.splice $scope.products.indexOf(product), 1
         DirtyProducts.deleteProduct product.id
         $scope.displayDirtyProducts()
@@ -163,7 +163,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
           $http(
             method: "DELETE"
             url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
-          ).success (data) ->
+          ).then (response) ->
             $scope.removeVariant(product, variant)
     else
       alert(t("delete_product_variant"))
@@ -221,16 +221,16 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
           import_date: $scope.q.importDateFilter
         page: $scope.page
         per_page: $scope.per_page
-    ).success((data) ->
+    ).then((response) ->
       DirtyProducts.clear()
-      BulkProducts.updateVariantLists(data.products || [])
+      BulkProducts.updateVariantLists(response.data.products || [])
       $timeout -> $scope.displaySuccess()
-    ).error (data, status) ->
-      if status == 400 && data.errors?
-        errorsString = ErrorsParser.toString(data.errors, status)
+    ).catch (response) ->
+      if response.status == 400 && response.data.errors?
+        errorsString = ErrorsParser.toString(response.data.errors, response.status)
         $scope.displayFailure t("products_update_error") + "\n" + errorsString
       else
-        $scope.displayFailure t("products_update_error_data") + status
+        $scope.displayFailure t("products_update_error_data") + response.status
 
   $scope.cancel = (destination) ->
     $window.location = destination

app/assets/javascripts/admin/customers/directives/edit_address_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").directive 'editAddressDialog', ($compile, $templateCache, DialogDefaults, Customers, StatusMessage, CountryStates) ->
+angular.module("admin.customers").directive 'editAddressDialog', ($rootScope, $compile, $templateCache, DialogDefaults, Customers, StatusMessage, CountryStates) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -18,6 +18,7 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
           scope.customer = data
           scope.errors = []
           template.dialog('close')
+          $rootScope.$evalAsync()
           StatusMessage.display('success', t('admin.customers.index.update_address_success'))
       else
         scope.errors.push(t('admin.customers.index.update_address_error'))
@@ -33,4 +34,4 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
       template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
       template.dialog(DialogDefaults)
       template.dialog('open')
-      scope.$apply()
+      $rootScope.$evalAsync()

app/assets/javascripts/admin/customers/directives/new_customer_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $templateCache, DialogDefaults, CurrentShop, Customers) ->
+angular.module("admin.customers").directive 'newCustomerDialog', ($rootScope, $compile, $templateCache, DialogDefaults, CurrentShop, Customers) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -20,6 +20,7 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
             scope.email = ""
             scope.submitted = false
             template.dialog('close')
+            $rootScope.$evalAsync()
         , (response) ->
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors
@@ -37,5 +38,6 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
     element.bind 'click', (e) ->
       if CurrentShop.shop.id
         template.dialog('open')
+        $rootScope.$evalAsync()
       else
         alert(t('js.customers.select_shop'))

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

@@ -1,6 +0,0 @@
-angular.module("ofn.admin").directive "select2NoSearch", ($timeout) ->
-  restrict: 'CA'
-  link: (scope, element, attrs) ->
-    $timeout ->
-      element.select2
-        minimumResultsForSearch: Infinity

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

@@ -0,0 +1,8 @@
+angular.module("ofn.admin").directive "select2WatchNgModel", () ->
+  restrict: 'E'
+  scope: true
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    ngModel.$render = () ->
+      newValue = ngModel.$viewValue;
+      element.children(".select2").select2("val", newValue)

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

@@ -10,6 +10,7 @@
           scope.$emit "offClick"
 
     element.click (event) ->
+      return if event.target.closest(".ofn-drop-down").classList.contains "disabled" || event.target.classList.contains "disabled" 
       if !scope.expanded
         event.stopPropagation()
         scope.deregistrationCallback = scope.$on "offClick", ->

app/assets/javascripts/admin/enterprise_fees/controllers/enterprise_fees_controller.js.coffee

@@ -10,5 +10,5 @@ angular.module('admin.enterpriseFees').controller 'enterpriseFeesCtrl', ($scope,
       url += '&' + match[0]
     url
 
-  $http.get($scope.enterpriseFeesUrl()).success (data) ->
-    $scope.enterprise_fees = data
+  $http.get($scope.enterpriseFeesUrl()).then (response) ->
+    $scope.enterprise_fees = response.data

app/assets/javascripts/admin/enterprise_fees/directives/ensure_calculator_preferences_match_type.js.coffee

@@ -9,9 +9,9 @@ angular.module("admin.enterpriseFees").directive 'spreeEnsureCalculatorPreferenc
       settings = element.parent().parent().find('div.calculator-settings')
       if value == orig_calculator_type
         settings.show()
-        settings.find('input').prop 'disabled', false
+        settings.find('input, select').prop 'disabled', false
       else
         settings.hide()
-        settings.find('input').prop 'disabled', true
+        settings.find('input, select').prop 'disabled', true
       return
     return

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

@@ -1,5 +1,6 @@
 # Used in enterprise new and edit forms to reset the state when the country is changed
-angular.module("admin.enterprises").controller 'countryCtrl', ($scope, availableCountries) ->
+angular.module("admin.enterprises").controller 'countryCtrl', ($scope, $timeout, availableCountries) ->
+  $scope.address_type = "address"
   $scope.countries = availableCountries
 
   $scope.countriesById = $scope.countries.reduce (obj, country) ->
@@ -7,12 +8,13 @@ angular.module("admin.enterprises").controller 'countryCtrl', ($scope, available
     obj
   , {}
 
-  $scope.$watch 'Enterprise.address.country_id', (newID, oldID) ->
-    $scope.clearState() unless $scope.addressStateMatchesCountry()
+  $timeout ->
+    $scope.$watch 'Enterprise.' + $scope.address_type + '.country_id', (newID, oldID) ->
+      $scope.clearState() unless $scope.addressStateMatchesCountry()
 
   $scope.clearState = ->
-    $scope.Enterprise.address.state_id = null
+    $scope.Enterprise[$scope.address_type].state_id = null
 
   $scope.addressStateMatchesCountry = ->
-    $scope.countriesById[$scope.Enterprise.address.country_id].states.some (state) ->
-      state.id == $scope.Enterprise.address.state_id
+    $scope.countriesById[$scope.Enterprise[$scope.address_type].country_id].states.some (state) ->
+      state.id == $scope.Enterprise[$scope.address_type].state_id

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

@@ -1,12 +1,14 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
+  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage, RequestMonitor) ->
     $scope.Enterprise = enterprise
+    $scope.Enterprises = Enterprises
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear
     $scope.menu = SideMenu
     $scope.newManager = { id: null, email: (t('add_manager')) }
     $scope.StatusMessage = StatusMessage
+    $scope.RequestMonitor = RequestMonitor
 
     $scope.$watch 'enterprise_form.$dirty', (newValue) ->
       StatusMessage.display 'notice', t('admin.unsaved_changes') if newValue
@@ -59,11 +61,11 @@ angular.module("admin.enterprises")
       $scope.invite_errors = $scope.invite_success = null
       email = $scope.newUser
 
-      $http.post("/admin/manager_invitations", {email: email, enterprise_id: $scope.Enterprise.id}).success (data)->
-          $scope.addManager({id: data.user, email: email})
+      $http.post("/admin/manager_invitations", {email: email, enterprise_id: $scope.Enterprise.id}).then (response)->
+          $scope.addManager({id: response.data.user, email: email})
           $scope.invite_success = t('user_invited', email: email)
-        .error (data) ->
-          $scope.invite_errors = data.errors
+        .catch (response) ->
+          $scope.invite_errors = response.data.errors
 
     $scope.resetModal = ->
       $scope.newUser = $scope.invite_errors = $scope.invite_success = null
@@ -90,3 +92,6 @@ angular.module("admin.enterprises")
 
     $scope.translation = (key) ->
       t('js.admin.enterprises.form.images.' + key)
+
+    $scope.loadSuppliers = ->
+      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")

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

@@ -9,6 +9,10 @@ angular.module("admin.enterprises")
     $scope.checking = false
 
     $scope.$watch "Enterprise.permalink", (newValue, oldValue) ->
+      if newValue == initialPermalink
+        $scope.availability = ""
+        return
+
       $scope.checking = true
       pendingRequest = PermalinkChecker.check(newValue)
 

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

@@ -16,6 +16,7 @@ angular.module("admin.enterprises")
       { name: 'shipping_methods', label: t('shipping_methods'), icon_class: "icon-truck", show: "showShippingMethods()" }
       { name: 'payment_methods', label: t('payment_methods'), icon_class: "icon-money", show: "showPaymentMethods()" }
       { name: 'enterprise_fees', label: t('enterprise_fees'), icon_class: "icon-tasks", show: "showEnterpriseFees()" }
+      { name: 'enterprise_permissions', label: t('enterprise_permissions'), icon_class: "icon-plug" }
       { name: 'inventory_settings', label: t('inventory_settings'), icon_class: "icon-list-ol", show: "enterpriseIsShop()" }
       { name: 'tag_rules', label: t('tag_rules'), icon_class: "icon-random", show: "enterpriseIsShop()" }
       { name: 'shop_preferences', label: t('shop_preferences'), icon_class: "icon-shopping-cart", show: "enterpriseIsShop()" }
@@ -44,3 +45,5 @@ angular.module("admin.enterprises")
 
     $scope.enterpriseIsShop = ->
       $scope.Enterprise.sells != "none"
+
+    $scope.menu.redirect_function('enterprise_permissions', '/admin/enterprise_relationships')

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

@@ -0,0 +1,18 @@
+angular.module("admin.enterprises").directive "ofnProducerAutocomplete", (Enterprises, AutocompleteSelect2) ->
+  scope: true
+  link: (scope,element,attrs) ->
+    scope.loadSuppliers() if !scope.suppliers
+    multiple = scope.$eval attrs.multipleSelection
+    placeholder = attrs.placeholder
+    initialSelection = scope.$eval attrs.ngModel
+
+    setTimeout ->
+      scope.suppliers.$promise.then (data) ->
+        AutocompleteSelect2.autocomplete(
+          multiple,
+          placeholder,
+          element,
+          (-> Enterprises.findByID(initialSelection)),
+          (-> Enterprises.findByIDs(initialSelection)),
+          ((term) -> Enterprises.findByTerm(scope.suppliers, term))
+        )

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

@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($compile, $templateCache, DialogDefaults, $timeout) ->
+angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($rootScope, $compile, $templateCache, DialogDefaults, $timeout) ->
   restrict: 'A'
   scope: true
 
@@ -10,13 +10,14 @@ angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($com
       if scope.template.dialog
         scope.template.dialog(DialogDefaults)
         scope.template.dialog('open')
-      scope.$apply()
+      $rootScope.$evalAsync()
 
     element.bind 'click', scope.hold_file_input_and_show_warning_modal
 
     # When the user presses continue in the warning modal, we open the browser file input dialog
     scope.continue = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
 
       # unbind warning modal handler and click file input again to open the browser file input dialog
       element.unbind('click').trigger('click')
@@ -27,4 +28,5 @@ angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($com
 
     scope.close = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
       return

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

@@ -15,26 +15,26 @@ angular.module("admin.enterprises").factory 'PermalinkChecker', ($q, $http) ->
           Accept: 'application/javascript'
         timeout: deferredAbort.promise
       )
-      .success( (data) =>
-        if data.length > @MAX_PERMALINK_LENGTH || !data.match(/^[\w-]+$/)
+      .then( (response) =>
+        if response.data.length > @MAX_PERMALINK_LENGTH || !response.data.match(/^[\w-]+$/)
           deferredRequest.resolve
             permalink: permalink
             available: t('js.error')
         else
           deferredRequest.resolve
-            permalink: data
+            permalink: response.data
             available: t('available')
-      ).error (data,status) =>
-        if status == 409
+      ).catch (response) =>
+        if response.status == 409
           deferredRequest.resolve
-            permalink: data
+            permalink: response.data
             available: t('js.unavailable')
         else
           # Something went wrong or request was aborted
           deferredRequest.reject()
 
       deferredRequest.promise.finally ->
-        request = deferredRequest.promise = null;
+        request = deferredRequest.promise = null
 
       deferredRequest.promise
 

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

@@ -35,7 +35,7 @@ angular.module("admin.indexUtils").factory 'Columns', ($rootScope, $http, $injec
         data:
           action_name: action_name
           column_preferences: (preference for column_name, preference of @columns)
-      .success (data) =>
-        for column in data
+      .then (response) =>
+        for column in response.data
           angular.extend(@columns[column.column_name], column)
           angular.extend(@savedColumns[column.column_name], column)

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

@@ -1,9 +1,9 @@
 angular.module("admin.indexUtils").factory "dataFetcher", ($http, $q, RequestMonitor) ->
   return (dataLocation) ->
     deferred = $q.defer()
-    RequestMonitor.load $http.get(dataLocation).success((data) ->
-      deferred.resolve data
-    ).error ->
+    RequestMonitor.load $http.get(dataLocation).then((response) ->
+      deferred.resolve response.data
+    ).catch ->
       deferred.reject()
 
     deferred.promise

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

@@ -31,6 +31,8 @@ angular.module("admin.indexUtils").factory "pendingChanges", ($q, resources, Sta
           form.$setPristine() if form?
         else
           StatusMessage.display('failure', t('js.oh_no'))
+      .catch ->
+        StatusMessage.display('failure', t('js.oh_no'))
       all
 
     submit: (change) ->

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

@@ -52,6 +52,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.loadOrders = ->
     RequestMonitor.load $scope.orders = Orders.index(
       "q[state_not_eq]": "canceled",
+      "q[shipment_state_not_eq]": "shipped",
       "q[completed_at_not_null]": "true",
       "q[distributor_id_eq]": $scope.distributorFilter,
       "q[order_cycle_id_eq]": $scope.orderCycleFilter,
@@ -62,6 +63,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.loadLineItems = ->
     RequestMonitor.load LineItems.index(
       "q[order_state_not_eq]": "canceled",
+      "q[order_shipment_state_not_eq]": "shipped",
       "q[order_completed_at_not_null]": "true",
       "q[order_distributor_id_eq]": $scope.distributorFilter,
       "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
@@ -102,15 +104,45 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     else
       StatusMessage.display 'failure', t "unsaved_changes_error"
 
+  $scope.cancelOrder = (order, sendEmailCancellation) ->
+    return $http(
+      method: 'GET'
+      url: "/admin/orders/#{order.number}/fire?e=cancel&send_cancellation_email=#{sendEmailCancellation}")
+  
   $scope.deleteLineItem = (lineItem) ->
-    if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
-      LineItems.delete lineItem
+    if lineItem.order.item_count == 1
+      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
+        if confirm
+          $scope.cancelOrder(lineItem.order, sendEmailCancellation).then(->
+            $scope.refreshData()
+          )
+        else
+          $scope.refreshData()
+      , "js.admin.deleting_item_will_cancel_order")
+    else if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
+      LineItems.delete(lineItem, () -> $scope.refreshData())
 
-  $scope.deleteLineItems = (lineItemsToDelete) ->
-    existingState = $scope.confirmDelete
-    $scope.confirmDelete = false
-    $scope.deleteLineItem lineItem for lineItem in lineItemsToDelete when lineItem.checked
-    $scope.confirmDelete = existingState
+  $scope.deleteLineItems = (lineItems) ->
+    lineItemsToDelete = lineItems.filter (item) -> item.checked
+    willCancelOrders = false
+    itemsPerOrder = new Map()
+    for item in lineItemsToDelete
+      { order } = item
+      if itemsPerOrder.has(order)
+        itemsPerOrder.get(order).push(item)
+      else
+        itemsPerOrder.set(order, [item])
+      willCancelOrders = true if (order.item_count == itemsPerOrder.get(order).length)
+
+    if willCancelOrders
+      ofnCancelOrderAlert((confirm, sendEmailCancellation) ->
+        if confirm
+          itemsPerOrder.forEach (items, order) =>
+            if order.item_count == items.length
+              $scope.cancelOrder(order, sendEmailCancellation).then(-> $scope.refreshData())
+            else
+              Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
+      , "js.admin.deleting_item_will_cancel_order")   
 
   $scope.allBoxesChecked = ->
     checkedCount = $scope.filteredLineItems.reduce (count,lineItem) ->
@@ -126,37 +158,71 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.selectedUnitsProduct = unitsProduct
     $scope.selectedUnitsVariant = unitsVariant
 
+  $scope.getLineItemScale = (lineItem) ->
+    if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume") 
+      lineItem.units_product.variant_unit_scale
+    else
+      1
+
   $scope.sumUnitValues = ->
-    sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-      sum + lineItem.final_weight_volume
+    sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
+      if lineItem.units_product.variant_unit == "items"
+        sum + lineItem.quantity
+      else
+        sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
     , 0
 
   $scope.sumMaxUnitValues = ->
-    sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum + lineItem.max_quantity * lineItem.units_variant.unit_value
+    sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
+      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))
     , 0
 
+  $scope.roundToThreeDecimals = (value) ->
+    Math.round(value * 1000) / 1000
+
   $scope.allFinalWeightVolumesPresent = ->
     for i,lineItem of $scope.filteredLineItems
       return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
     true
 
-  # How is this different to OptionValueNamer#name?
-  # Should it be extracted to that class or VariantUnitManager?
-  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
-    # A Units Variant is an API object which holds unit properies of a variant
-    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume") && value > 0
-      scale = VariantUnitManager.getScale(value, unitsProduct.variant_unit)
-      Math.round(value/scale * 1000)/1000 + " " + VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+  $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, unitsProduct, unitsVariant, scale) ->
+    unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+    $scope.roundToThreeDecimals(value) + " " + unit_name
+
+  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, unitsVariant)
+    if scale
+      value = value / scale if scale != 28.35 && scale != 1 && scale != 453.6 # divide by scale if not smallest unit
+      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+    else
+      ''
+
+  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, unitsVariant)
+    if scale
+      $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.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
-      ( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
-        Math.round( sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size * 1000)/1000
+    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/incoming_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($scope, $controller, $location, Enterprise, 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'
@@ -28,4 +28,4 @@ angular.module('admin.orderCycles').controller 'AdminOrderCycleIncomingCtrl', ($
   $scope.selectAllVariants = (exchange, selected) ->
     $scope.loadAllExchangeProducts(exchange).then ->
       $scope.setExchangeVariants(exchange, $scope.suppliedVariants(exchange.enterprise_id), selected)
-      $scope.$apply()
+      $rootScope.$evalAsync()

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

@@ -18,7 +18,7 @@ angular.module('admin.orderCycles')
       OrderCycle.exchangeDirection(exchange)
 
     $scope.enterprisesWithFees = ->
-      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
+      $scope.enterprises[id] for id in [OrderCycle.participatingEnterpriseIds()..., [OrderCycle.order_cycle.coordinator_id]...] when $scope.enterpriseFeesForEnterprise(id).length > 0
 
     $scope.removeExchange = ($event, exchange) ->
       $event.preventDefault()

app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compile, $injector, $templateCache, DialogDefaults, OrderCycles, Schedules) ->
+angular.module("admin.orderCycles").directive 'scheduleDialog', ($rootScope, $window, $compile, $injector, $templateCache, DialogDefaults, OrderCycles, Schedules) ->
   restrict: 'A'
   scope:
     scheduleId: '@'
@@ -22,9 +22,11 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi
       scope.template.dialog(angular.extend(settings,{width: $window.innerWidth * 0.6}))
       scope.template.dialog(close: -> scope.template.remove())
       scope.template.dialog('open')
+      $rootScope.$evalAsync()
 
     scope.close = ->
       scope.template.dialog('close')
+      $rootScope.$evalAsync()
       return
 
     scope.delete = ->
@@ -55,6 +57,7 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi
           if data.id
             scope.submitted = false
             scope.template.dialog('close')
+            $rootScope.$evalAsync()
         , (response) ->
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors

app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee

@@ -1,3 +1,7 @@
 angular.module("admin.orderCycles").filter "visibleVariants", ->
   return (variants, exchange, rules) ->
-    return (variant for variant in variants when variant.id in rules[exchange.enterprise_id])
+    enterprise_rules = rules[exchange.enterprise_id]
+    if enterprise_rules
+      (variant for variant in variants when variant.id in enterprise_rules)
+    else
+      []

app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee

@@ -3,12 +3,18 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.e
     require: "ngModel"
     link: (scope, element, attrs, ngModel) ->
       $timeout ->
-        flatpickr(element,  Object.assign({},
+        fp = flatpickr(element,  Object.assign({},
                             window.FLATPICKR_DATETIME_DEFAULT, {
                             onOpen: (selectedDates, dateStr, instance) ->
                               instance.setDate(ngModel.$modelValue)
                               instance.input.dispatchEvent(new Event('focus', { bubbles: true }));
                             }));
+        fp.minuteElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setMinutes(e.target.value), true)
+        fp.hourElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setHours(e.target.value), true)            
 
   .directive 'ofnOnChange', ->
     (scope, element, attrs) ->

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

@@ -1,4 +1,4 @@
-angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $timeout, StatusMessage, Panels) ->
+angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $timeout, StatusMessage, Panels, Enterprise) ->
   OrderCycleResource = $resource '/admin/order_cycles/:action_name/:order_cycle_id.json', {}, {
     'index':  { method: 'GET', isArray: true}
     'new'   : { method: 'GET', params: { action_name: "new" } }
@@ -50,7 +50,14 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, $
         (callback || angular.noop)()
 
     addDistributor: (new_distributor_id, callback) ->
-      this.order_cycle.outgoing_exchanges.push({ enterprise_id: new_distributor_id, incoming: false, active: true, variants: {}, enterprise_fees: [] })
+      exchange = { enterprise_id: new_distributor_id, incoming: false, active: true, variants: {}, enterprise_fees: [] }
+      if (Enterprise.hub_enterprises.length == 1)
+        editable = this.order_cycle["editable_variants_for_outgoing_exchanges"][new_distributor_id] || []
+        variants = this.incomingExchangesVariants()
+        for variant in variants when variant in editable
+          exchange.variants[variant] = true
+
+      this.order_cycle.outgoing_exchanges.push(exchange)
       $timeout ->
         (callback || angular.noop)()
 

app/assets/javascripts/admin/orders/controllers/bulk_invoice_controller.js.coffee

@@ -8,19 +8,19 @@ angular.module("admin.orders").controller "bulkInvoiceCtrl", ($scope, $http, $ti
     $scope.poll_wait = 5 # 5 Seconds between each check
     $scope.poll_retries = 80 # Maximum checks before stopping
 
-    $http.post('/admin/orders/invoices', {order_ids: $scope.selected_orders}).success (data) ->
-      $scope.invoice_id = data
+    $http.post('/admin/orders/invoices', {order_ids: $scope.selected_orders}).then (response) ->
+      $scope.invoice_id = response.data
       $scope.pollBulkInvoice()
 
   $scope.pollBulkInvoice = ->
     $timeout($scope.nextPoll, $scope.poll_wait * 1000)
 
   $scope.nextPoll = ->
-    $http.get('/admin/orders/invoices/'+$scope.invoice_id+'/poll').success (data) ->
+    $http.get('/admin/orders/invoices/'+$scope.invoice_id+'/poll').then (response) ->
       $scope.loading = false
       $scope.message = t('js.admin.orders.index.bulk_invoice_created')
 
-    .error (data) ->
+    .catch (response) ->
       $scope.poll++
 
       if $scope.poll > $scope.poll_retries

app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee

@@ -20,7 +20,7 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl
     $scope.distributor_id && $scope.order_cycle_id
 
   for oc in $scope.orderCycles
-    oc.name_and_status = "#{oc.name} (#{oc.status})"
+    oc.name_and_status = "#{oc.name} (#{t("admin.order_cycles.status.#{oc.status}")})"
 
   for shop in $scope.shops
     shop.disabled = !$scope.distributorHasOrderCycles(shop)

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter) ->
+angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter, $location, KeyValueMapStore) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.pagination = Orders.pagination
   $scope.orders = Orders.all
@@ -15,39 +15,54 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
   $scope.poll = 0
   $scope.rowStatus = {}
 
+  KeyValueMapStore.localStorageKey = 'ordersFilters'
+  KeyValueMapStore.storableKeys = ["q", "sorting", "page", "per_page"]
+
   $scope.initialise = ->
+    unless KeyValueMapStore.restoreValues($scope)
+      $scope.setDefaults()
+
+    $scope.fetchResults()
+
+  $scope.setDefaults = ->
     $scope.per_page = 15
     $scope.q = {
       completed_at_not_null: true
     }
+
+  $scope.clearFilters = () ->
+    KeyValueMapStore.clearKeyValueMap()
+    $scope.setDefaults()
     $scope.fetchResults()
 
   $scope.fetchResults = (page=1) ->
-    startDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_gteq'], ' 00:00:00')
-    endDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_lteq'], ' 23:59:59')
+    startDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_gteq, ' 00:00:00')
+    endDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_lteq, ' 23:59:59')
 
     $scope.resetSelected()
     params = {
       'q[completed_at_gteq]': startDateWithTime,
       'q[completed_at_lteq]': endDateWithTime,
-      'q[state_eq]': $scope['q']['state_eq'],
-      'q[number_cont]': $scope['q']['number_cont'],
-      'q[email_cont]': $scope['q']['email_cont'],
-      'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'],
-      'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
+      'q[state_eq]': $scope.q?.state_eq,
+      'q[number_cont]': $scope.q?.number_cont,
+      'q[email_cont]': $scope.q?.email_cont,
+      'q[bill_address_firstname_start]': $scope.q?.bill_address_firstname_start,
+      'q[bill_address_lastname_start]': $scope.q?.bill_address_lastname_start,
       # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
-      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
-      'q[distributor_id_in][]': $scope['q']['distributor_id_in'],
-      'q[order_cycle_id_in][]': $scope['q']['order_cycle_id_in'],
+      'q[completed_at_not_null]': $scope.q?.completed_at_not_null || null,
+      'q[distributor_id_in][]': $scope.q?.distributor_id_in,
+      'q[order_cycle_id_in][]': $scope.q?.order_cycle_id_in,
       'q[s]': $scope.sorting || 'completed_at desc',
-      shipping_method_id: $scope.shipping_method_id,
+      shipping_method_id: $scope.q?.shipping_method_id,
       per_page: $scope.per_page,
       page: page
     }
+    KeyValueMapStore.setStoredValues($scope)
     RequestMonitor.load(Orders.index(params).$promise)
 
   $scope.appendStringIfNotEmpty = (baseString, stringToAppend) ->
     return baseString unless baseString
+    return baseString if baseString.endsWith(stringToAppend)
 
     baseString + stringToAppend
 

app/assets/javascripts/admin/orders/directives/customer_search_override.js.coffee

@@ -1,62 +0,0 @@
-angular.module("admin.orders").directive 'customerSearchOverride', ->
-  restrict: 'C'
-  scope:
-    distributorId: '@'
-  link: (scope, element, attr) ->
-    if $('#customer_autocomplete_template').length > 0
-      customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text())
-
-    formatCustomerResult = (customer) ->
-      customerTemplate
-        customer: customer
-        bill_address: customer.bill_address
-        ship_address: customer.ship_address
-
-    element.select2
-      placeholder: Spree.translations.choose_a_customer
-      minimumInputLength: 3
-      ajax:
-        url: '/admin/search/customers.json'
-        datatype: 'json'
-        data: (term, page) ->
-          {
-            q: term
-            distributor_id: scope.distributorId  # modified
-          }
-        results: (data, page) ->
-          { results: data }
-      dropdownCssClass: 'customer_search'
-      formatResult: formatCustomerResult
-      formatSelection: (customer) ->
-        _.each [
-          'bill_address'
-          'ship_address'
-        ], (address) ->
-          data = customer[address]
-          address_parts = [
-            'firstname'
-            'lastname'
-            'company'
-            'address1'
-            'address2'
-            'city'
-            'zipcode'
-            'phone'
-          ]
-          attribute_wrapper = '#order_' + address + '_attributes_'
-          if data  # modified
-            _.each address_parts, (part) ->
-              $(attribute_wrapper + part).val data[part]
-              return
-            $(attribute_wrapper + 'state_id').select2 'val', data['state_id']
-            $(attribute_wrapper + 'country_id').select2 'val', data['country_id']
-          else
-            _.each address_parts, (part) ->
-              $(attribute_wrapper + part).val ''
-              return
-            $(attribute_wrapper + 'state_id').select2 'val', ''
-            $(attribute_wrapper + 'country_id').select2 'val', ''
-          return
-        $('#order_email').val customer.email
-        $('#user_id').val customer.user_id  # modified
-        customer.email

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

@@ -1 +1 @@
-angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation'])
+angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation', "OFNShared"])

app/assets/javascripts/admin/payment_methods/controllers/providers_controller.js.coffee

@@ -2,6 +2,6 @@ angular.module("admin.paymentMethods").controller "ProvidersCtrl", ($scope, paym
   if paymentMethod.type
     $scope.include_html = "/admin/payment_methods/show_provider_preferences?" +
       "provider_type=#{paymentMethod.type};" +
-      "pm_id=#{paymentMethod.id};"
+      "pm_id=#{paymentMethod.id || ''};"
   else
     $scope.include_html = ""

app/assets/javascripts/admin/payment_methods/controllers/stripe_controller.js.coffee

@@ -5,9 +5,9 @@ angular.module("admin.paymentMethods").controller "StripeController", ($scope, $
   $scope.$watch "paymentMethod.preferred_enterprise_id", (newID, oldID) ->
     return unless newID?
     $scope.stripe_account = {}
-    $http.get("/admin/stripe_accounts/status.json?enterprise_id=#{newID}").success (data) ->
-      angular.extend($scope.stripe_account, data)
-    .error (response) ->
+    $http.get("/admin/stripe_accounts/status.json?enterprise_id=#{newID}").then (response) ->
+      angular.extend($scope.stripe_account, response.data)
+    .catch (response) ->
       $scope.stripe_account.status = "request_failed"
 
   $scope.current_enterprise_stripe_path = ->

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

@@ -8,3 +8,6 @@ angular.module("admin.payments").controller "PaymentCtrl", ($scope, Payment, Sta
     $scope.submitted = true
     StatusMessage.display 'progress', t("spree.admin.payments.source_forms.stripe.submitting_payment")
     Payment.purchase()
+
+  $scope.isSelected = (payment_method_id) ->
+    return parseInt($scope.form_data.payment_method) == payment_method_id

app/assets/javascripts/admin/payments/directives/stripe_elements.js.coffee

@@ -1,10 +1,12 @@
 angular.module('admin.payments').directive "stripeElements", ($injector, AdminStripeElements) ->
   restrict: 'E'
-  template: "<label for='card-element'>\
-             <div id='card-element'></div>\
-             <div id='card-errors' class='error'></div>\
-             </label>"
-
+  template: "<div >\
+             <div class='card-element'></div>\
+             <div class='error card-errors'></div>\
+             </div>"
+  scope:
+    selected: "="
+  
   link: (scope, elem, attr)->
     if $injector.has('stripeObject')
       stripe = $injector.get('stripeObject')
@@ -18,13 +20,13 @@ angular.module('admin.payments').directive "stripeElements", ($injector, AdminSt
             color: '#5c5c5c'
             '::placeholder':
               color: '#6c6c6c'
-      card.mount('#card-element')
+      card.mount(elem.find('.card-element').get(0))
 
       # Elements validates user input as it is typed. To help your customers
       # catch mistakes, you should listen to change events on the card Element
       # and display any errors:
       card.addEventListener 'change', (event) ->
-        displayError = document.getElementById('card-errors')
+        displayError = elem.find('.card-errors').get(0)
         if event.error
           displayError.textContent = event.error.message
         else
@@ -32,5 +34,7 @@ angular.module('admin.payments').directive "stripeElements", ($injector, AdminSt
 
         return
 
-      AdminStripeElements.stripe = stripe
-      AdminStripeElements.card = card
+      scope.$watch "selected", (value) ->
+        if (value)
+          AdminStripeElements.stripe = stripe
+          AdminStripeElements.card = card 

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

@@ -1,4 +1,4 @@
-angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, StatusMessage) ->
+angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, StatusMessage, $timeout) ->
   new class AdminStripeElements
 
     # These are both set from the AdminStripeElements directive
@@ -13,11 +13,11 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
 
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
-          StatusMessage.display 'error', response.error.message
+          $timeout -> StatusMessage.display 'error', response.error.message
           console.error(JSON.stringify(response.error))
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
+          secrets.cc_type = response.token.card.brand
           secrets.card = response.token.card
           submit()
 
@@ -29,32 +29,14 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
 
       @stripe.createPaymentMethod({ type: 'card', card: @card }, @card, cardData).then (response) =>
         if(response.error)
-          StatusMessage.display 'error', response.error.message
+          $timeout -> StatusMessage.display 'error', response.error.message
           console.error(JSON.stringify(response.error))
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
+          secrets.cc_type = response.paymentMethod.card.brand
           secrets.card = response.paymentMethod.card
           submit()
 
-    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
-    mapTokenApiCardBrand: (cardBrand) ->
-      switch cardBrand
-        when 'MasterCard' then return 'master'
-        when 'Visa' then return 'visa'
-        when 'American Express' then return 'american_express'
-        when 'Discover' then return 'discover'
-        when 'JCB' then return 'jcb'
-        when 'Diners Club' then return 'diners_club'
-
-    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
-    mapPaymentMethodsApiCardBrand: (cardBrand) ->
-      switch cardBrand
-        when 'mastercard' then return 'master'
-        when 'amex' then return 'american_express'
-        when 'diners' then return 'diners_club'
-        else return cardBrand # a few brands are equal, for example, visa
-
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee

@@ -84,14 +84,14 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
         'end': end
         'filepath': ams_data.filepath
         'settings': ams_data.importSettings
-    ).success((data, status) ->
-      angular.merge($scope.entries, angular.fromJson(data['entries']))
-      $scope.sortUpdates(data['reset_counts'])
+    ).then((response) ->
+      angular.merge($scope.entries, angular.fromJson(response.data['entries']))
+      $scope.sortUpdates(response.data['reset_counts'])
 
       $scope.updateProgress()
-    ).error((data, status) ->
-      $scope.exception = data
-      console.error(data)
+    ).catch((response) ->
+      $scope.exception = response.data
+      console.error(response.data)
     )
 
   $scope.sortUpdates = (data) ->
@@ -110,19 +110,19 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
         'end': end
         'filepath': ams_data.filepath
         'settings': ams_data.importSettings
-    ).success((data, status) ->
-      $scope.sortResults(data['results'])
+    ).then((response) ->
+      $scope.sortResults(response.data['results'])
 
-      angular.forEach data['updated_ids'], (id) ->
+      angular.forEach response.data['updated_ids'], (id) ->
         $scope.updated_ids.push(id)
 
-      angular.forEach data['errors'], (error) ->
+      angular.forEach response.data['errors'], (error) ->
         $scope.update_errors.push(error)
 
       $scope.updateProgress()
-    ).error((data, status) ->
-      $scope.exception = data
-      console.error(data)
+    ).catch((response) ->
+      $scope.exception = response.data
+      console.error(response.data)
     )
 
   $scope.sortResults = (results) ->
@@ -151,10 +151,10 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
           'reset_absent': true,
           'updated_ids': $scope.updated_ids,
           'enterprises_to_reset': enterprises_to_reset
-      ).success((data, status) ->
-        $scope.updates.products_reset = data
-      ).error((data, status) ->
-        console.error(data)
+      ).then((response) ->
+        $scope.updates.products_reset = response.data
+      ).catch((response) ->
+        console.error(response.data)
       )
 
   $scope.updateProgress = () ->

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

@@ -1,5 +1,5 @@
 angular.module("admin.products")
-  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices) ->
+  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
     $scope.product = { master: {} }
     $scope.product.master.product = $scope.product
     $scope.placeholder_text = ""
@@ -8,7 +8,7 @@ angular.module("admin.products")
       $scope.processVariantUnitWithScale()
       $scope.processUnitValueWithDescription()
       $scope.processUnitPrice()
-      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name()
+      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name() if $scope.product.variant_unit_scale
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
@@ -21,17 +21,23 @@ angular.module("admin.products")
         else
           $scope.product.variant_unit = $scope.product.variant_unit_with_scale
           $scope.product.variant_unit_scale = null
+      else if $scope.product.variant_unit && $scope.product.variant_unit_scale
+        $scope.product.variant_unit_with_scale = VariantUnitManager.getUnitWithScale($scope.product.variant_unit, parseFloat($scope.product.variant_unit_scale))
       else
         $scope.product.variant_unit = $scope.product.variant_unit_scale = null
 
     $scope.processUnitValueWithDescription = ->
       if $scope.product.master.hasOwnProperty("unit_value_with_description")
-        match = $scope.product.master.unit_value_with_description.match(/^([\d\.]+(?= *|$)|)( *)(.*)$/)
+        match = $scope.product.master.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
         if match
-          $scope.product.master.unit_value  = parseFloat(match[1])
+          $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 *= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
           $scope.product.master.unit_description = match[3]
+      else
+        value = $scope.product.master.unit_value
+        value /= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
+        $scope.product.master.unit_value_with_description = value + " " + $scope.product.master.unit_description
 
     $scope.processUnitPrice = ->
       price = $scope.product.price

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

@@ -1,4 +1,4 @@
-angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices) ->
+angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices, PriceParser) ->
 
   $scope.unitName = (scale, type) ->
     VariantUnitManager.getUnitName(scale, type)
@@ -23,7 +23,7 @@ angular.module("admin.products").controller "variantUnitsCtrl", ($scope, Variant
 
   $scope.updateValue = ->
     unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = unit_value_human * $scope.scale
+    $scope.unit_value = PriceParser.parse(unit_value_human) * $scope.scale
 
   variant_unit_value = angular.element('#variant_unit_value').val()
   $scope.unit_value_human = variant_unit_value / $scope.scale

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

@@ -48,7 +48,7 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
     option_value_value_unit_scaled: ->
       [unit_scale, unit_name] = @scale_for_unit_value()
 
-      value = @variant.unit_value / unit_scale
+      value = Math.round((@variant.unit_value / unit_scale) * 100) / 100
 
       [value, unit_name]
 

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

@@ -13,3 +13,9 @@ angular.module("ofn.admin").factory "ProductImageService", (FileUploader, SpreeA
       @imageUploader.onSuccessItem = (image, response) =>
         product.thumb_url = response.thumb_url
         product.image_url = response.image_url
+      @imageUploader.onErrorItem = (image, response) =>
+        if Array.isArray(response.errors)
+          message = response.errors.join("\n")
+        else
+          message = response.error.toString()
+        alert(message)

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

@@ -1,6 +1,7 @@
-angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter) ->
+angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter, PriceParser) ->
   class UnitPrices
     @displayableUnitPrice: (price, scale, unit_type, unit_value, variant_unit_name) ->
+      price = PriceParser.parse(price)
       if price && !isNaN(price) && unit_type && unit_value
         value = localizeCurrencyFilter(UnitPrices.price(price, scale, unit_type, unit_value, variant_unit_name))
         unit = UnitPrices.unit(scale, unit_type, variant_unit_name)
@@ -29,4 +30,4 @@ angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, loca
       else if unit_type == "weight"
         "kg"
       else if unit_type == "volume"
-        "L"
+        "L"

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

@@ -27,26 +27,21 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
         1000.0:
           name: 'kL'
           system: 'metric'
+      'items':
+        1:
+          name: 'items'
 
     @variantUnitOptions: ->
       available = availableUnits.split(",")
       options = for unit_type, _ of @units
         for scale in @unitScales(unit_type, available)
           name = @getUnitName(scale, unit_type)
-          ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
+          ["#{I18n.t(unit_type)} (#{name})", @getUnitWithScale(unit_type, scale)]
       options.push [[I18n.t('items'), 'items']]
       options = [].concat options...
 
-    @getScale: (value, unitType) ->
-      scaledValue = null
-      validScales = []
-      unitScales = VariantUnitManager.unitScales(unitType)
-
-      validScales.unshift scale for scale in unitScales when value/scale >= 1
-      if validScales.length > 0
-        validScales[0]
-      else
-        unitScales[0]
+    @getUnitWithScale: (unit_type, scale) ->
+      "#{unit_type}_#{scale}"
 
     @getUnitName: (scale, unitType) ->
       if @units[unitType][scale]

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

@@ -1,4 +1,4 @@
-angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource) ->
+angular.module("admin.resources").factory 'Enterprises', ($q, $filter, EnterpriseResource) ->
   new class Enterprises
     byID: {}
     pristineByID: {}
@@ -50,6 +50,17 @@ angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource
         ))
         deferred.promise
 
+    findByID: (id) ->
+      @byID[id]
+
+    # For finding multiple Enterprises represented by comma delimited string
+    findByIDs: (ids) ->
+      @byID[id] for id in ids.split(",") when @byID[id]
+
+    findByTerm: (enterprises, term) ->
+      $filter('filter')(enterprises, term)
+
+
     removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
     removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)
     removeTermsAndConditions: performActionOnEnterpriseResource(EnterpriseResource.removeTermsAndConditions)

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

@@ -43,7 +43,7 @@ angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCy
             angular.extend(@byID[orderCycle.id], orderCycle)
             angular.extend(@pristineByID[orderCycle.id], orderCycle)
           form.$setPristine() if form?
-          StatusMessage.display('success', "Order cycles have been updated.")
+          StatusMessage.display('success', t('order_cycles_bulk_update_notice'))
         , (response) =>
           if response.data.errors?
             StatusMessage.display('failure', response.data.errors[0])

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

@@ -10,8 +10,8 @@ angular.module("ofn.admin").factory "BulkProducts", (ProductResource, dataFetche
         angular.extend(@pagination, data.pagination)
 
     cloneProduct: (product) ->
-      $http.post("/api/v0/products/" + product.id + "/clone").success (data) =>
-        dataFetcher("/api/v0/products/" + data.id + "?template=bulk_show").then (newProduct) =>
+      $http.post("/api/v0/products/" + product.id + "/clone").then (response) =>
+        dataFetcher("/api/v0/products/" + response.data.id + "?template=bulk_show").then (newProduct) =>
           @unpackProduct newProduct
           @insertProductAfter(product, newProduct)
 

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

@@ -1,24 +0,0 @@
-angular.module("ofn.admin").factory "ofnConfirmHandler", (pendingChanges, $compile, $q) ->
-  return (scope, callback) ->
-    template = "<div id='dialog-div' style='padding: 10px'><h6>" + t('js.services.unsaved_changes_message') + "</h6></div>"
-    dialogDiv = $compile(template)(scope)
-    return ->
-      if pendingChanges.changeCount(pendingChanges.pendingChanges) > 0
-        dialogDiv.dialog
-          dialogClass: "no-close"
-          resizable: false
-          height: 140
-          modal: true
-          buttons:
-            "SAVE": ->
-              dialogDiv = $(this)
-              $q.all(pendingChanges.submitAll()).then ->
-                callback()
-                dialogDiv.dialog "close"
-            "IGNORE": ->
-              callback()
-              $(this).dialog "close"
-              scope.$apply()
-        dialogDiv.dialog "open"
-      else
-        callback()

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

@@ -13,15 +13,15 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
 
     create: (parent_id, child_id, permissions) ->
       permissions = (name for name, enabled of permissions when enabled)
-      $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: parent_id, child_id: child_id, permissions_list: permissions}}).success (data, status) =>
-        @enterprise_relationships.unshift(data)
+      $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: parent_id, child_id: child_id, permissions_list: permissions}}).then (response) =>
+        @enterprise_relationships.unshift(response.data)
         @create_errors = ""
 
-      .error (response, status) =>
-        @create_errors = response.errors
+      .catch (response) =>
+        @create_errors = response.data.errors
 
     delete: (er) ->
-      $http.delete('/admin/enterprise_relationships/' + er.id).success (data) =>
+      $http.delete('/admin/enterprise_relationships/' + er.id).then (response) =>
         @enterprise_relationships.splice @enterprise_relationships.indexOf(er), 1
 
     permission_presentation: (permission) ->

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

@@ -6,13 +6,13 @@ angular.module("ofn.admin").factory 'EnterpriseRoles', ($http, enterpriseRoles)
       @enterprise_roles = enterpriseRoles
 
     create: (user_id, enterprise_id) ->
-      $http.post('/admin/enterprise_roles', {enterprise_role: {user_id: user_id, enterprise_id: enterprise_id}}).success (data, status) =>
-        @enterprise_roles.unshift(data)
+      $http.post('/admin/enterprise_roles', {enterprise_role: {user_id: user_id, enterprise_id: enterprise_id}}).then (response) =>
+        @enterprise_roles.unshift(response.data)
         @create_errors = ""
 
-      .error (response, status) =>
-        @create_errors = response.errors
+      .catch (response) =>
+        @create_errors = response.data.errors
 
     delete: (er) ->
-      $http.delete('/admin/enterprise_roles/' + er.id).success (data) =>
+      $http.delete('/admin/enterprise_roles/' + er.id).then (response) =>
         @enterprise_roles.splice @enterprise_roles.indexOf(er), 1

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

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

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

@@ -30,3 +30,14 @@ angular.module("admin.side_menu")
         for item in @items when item.name is name
           return item
         null
+
+      redirect_function: (elementID , href) =>
+        window.addEventListener 'load', ->
+          element = document.getElementById(elementID)
+          if !element
+            return
+          element.addEventListener 'click', ->
+            window.location.replace(href)
+            return
+          return
+

app/assets/javascripts/admin/spree/calculator.js

@@ -1,16 +1,17 @@
 $(function() {
-  var calculator_select = $('select#calc_type')
-  var original_calc_type = calculator_select.attr('value');
+  var calculator_select = $('select#calc_type');
+  var original_calc_type = calculator_select.val();
   $('.calculator-settings-warning').hide();
-  calculator_select.change(function() {
-    if (calculator_select.attr('value') == original_calc_type) {
+
+  calculator_select.on("change", function() {
+    if (calculator_select.val() === original_calc_type) {
       $('div.calculator-settings').show();
       $('.calculator-settings-warning').hide();
-      $('.calculator-settings').find('input,textarea').prop("disabled", false);
+      $('.calculator-settings').find('input,textarea,select').prop("disabled", false);
     } else {
       $('div.calculator-settings').hide();
       $('.calculator-settings-warning').show();
-      $('.calculator-settings').find('input,texttarea').prop("disabled", true);
+      $('.calculator-settings').find('input,textarea,select').prop("disabled", true);
     }
   });
 })

app/assets/javascripts/admin/spree/orders/address_states.js

@@ -1,17 +0,0 @@
-var update_state = function(region) {
-  var country        = $('span#' + region + 'country .select2').select2('val');
-  var state_select   = $('span#' + region + 'state select.select2');
-
-  $.get(Spree.routes.states_search + "?country_id=" + country, function(states) {
-    state_select.html('');
-    var states_with_blank = [{name: '', id: ''}].concat(states);
-    $.each(states_with_blank, function(pos,state) {
-      var opt = $(document.createElement('option'))
-                .attr('value', state.id)
-                .html(state.name);
-      state_select.append(opt);
-    });
-    state_select.prop("disabled", false).show();
-    state_select.select2();
-  })
-};

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

@@ -25,13 +25,12 @@ $(document).ready(function() {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var selected_shipping_rate_id = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipment_number + "']").val();
-    var unlock = link.parents('tbody').find("input[name='open_adjustment'][data-shipment-number='" + shipment_number + "']:checked").val();
     var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");
 
     $.ajax({
       type: "PUT",
       url: url,
-      data: { shipment: { selected_shipping_rate_id: selected_shipping_rate_id, unlock: unlock  } }
+      data: { shipment: { selected_shipping_rate_id: selected_shipping_rate_id  } }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {
@@ -40,25 +39,94 @@ $(document).ready(function() {
   }
   $('[data-hook=admin_order_edit_form] a.save-method').click(handle_shipping_method_save);
 
-  //handle tracking edit click
+  //handle tracking info edit/delete
+
+  // Show the input field to edit the tracking info
+  // And hide the input field when cancel is clicked
   $('a.edit-tracking').click(toggleTrackingEdit);
   $('a.cancel-tracking').click(toggleTrackingEdit);
 
-  handle_tracking_save = function(){
-    var link = $(this);
-    var shipment_number = link.data('shipment-number');
-    var tracking = link.parents('tbody').find('input#tracking').val();
-    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");
+  saveTrackingInfo = function(){
+    let shipmentNumber = $(this).data('shipment-number');
+    let tracking = document.getElementById('tracking').value
 
+    makeApiCall(trackingUrl(shipmentNumber), { shipment: { tracking: tracking } } )
+  }
+
+  deleteTrackingInfo = function(){
+    let shipmentNumber = $(this).data('shipment-number');
+    let tracking = ''
+
+    confirmDelete(trackingUrl(shipmentNumber), { shipment: { tracking: tracking } })
+  }
+
+  trackingUrl = function(shipmentNumber){
+    return Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipmentNumber + ".json");
+  }
+
+  $('[data-hook=admin_order_edit_form] a.save-tracking').click(saveTrackingInfo);
+  $('[data-hook=admin_order_edit_form] a.delete-tracking').click(deleteTrackingInfo);
+
+  // handle note edit/delete
+
+  // Show the input field to edit the note
+  // And hide the input field when cancel is clicked
+  $('a.edit-note.icon-edit').click(toggleNoteEdit);
+  $('a.cancel-note').click(toggleNoteEdit);
+
+  saveNote = function(){
+    let note = document.getElementById('note').value
+    makeApiCall(getNoteUrl(), { note: note })
+  }
+
+  deleteNote = function(){
+    let note = ''
+    confirmDelete(getNoteUrl(), { note: note })
+  }
+
+  getNoteUrl = function(){
+    return Spree.url( Spree.routes.orders_api + "/" + order_number);
+  }
+
+  confirmDelete = function(url, params){
+    displayDeleteAlert(function(confirmation) {
+      if (confirmation) {
+        makeApiCall(url, params)
+      }
+    }); 
+  }
+
+  $('[data-hook=admin_order_edit_form] a.save-note').click(saveNote);
+  $('[data-hook=admin_order_edit_form] a.delete-note').click(deleteNote);
+
+  // Makes API call for notes/tracking info
+  makeApiCall = function(url, params) {
     $.ajax({
       type: "PUT",
       url: url,
-      data: { shipment: { tracking: tracking } }
+      data: params
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {
       console.log(msg);
     });
   }
-  $('[data-hook=admin_order_edit_form] a.save-tracking').click(handle_tracking_save);
+
+  displayDeleteAlert = function(callback) {
+    i18nKey = "are_you_sure";
+    $('#custom-confirm .message').html(
+      ` ${t(i18nKey)}
+              <div class="form">
+              </div>`);
+    $('#custom-confirm button.confirm').unbind( "click" ).click(() => {
+      $('#custom-confirm').hide();
+      callback(true);
+    });
+    $('#custom-confirm button.cancel').click(() => {
+      $('#custom-confirm').hide();
+      callback(false)
+    });
+    $('#custom-confirm').show();
+  }
+
 });

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

@@ -2,6 +2,10 @@
 
 $(document).ready(function() {
 
+  initAlert()
+  initConfirm()
+  initCancelOrder()
+
   if ($('#variant_autocomplete_template').length > 0) {
     window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
     window.variantStockTemplate = Handlebars.compile($('#variant_autocomplete_stock_template').text());
@@ -45,61 +49,118 @@ $(document).ready(function() {
       if (quantity > maxQuantity) {
         quantity = maxQuantity;
         save.parents('tr').find('input.line_item_quantity').val(maxQuantity);
-        alert(t("js.admin.orders.quantity_adjusted"));
+        ofnAlert(t("js.admin.orders.quantity_adjusted"));
       }
       toggleItemEdit();
 
-      adjustItems(shipment_number, variant_id, quantity);
+      adjustItems(shipment_number, variant_id, quantity, true);
       return false;
     }
     $('a.save-item').click(handle_save_click);
 
-    handle_delete_click = function(){
-      var del = $(this);
+    handle_delete_click = function(elementSelector, restock_item){
+      var del = $(elementSelector);
+      del.hide()
       var shipment_number = del.data('shipment-number');
       var variant_id = del.data('variant-id');
 
       toggleItemEdit();
 
-      adjustItems(shipment_number, variant_id, 0);
+      adjustItems(shipment_number, variant_id, 0, restock_item);
     }
-    $('a.delete-item').click(handle_delete_click);
+
+    $('a.delete-item').click((event) => {
+     try {
+         var del = $('a.delete-item');
+         var shipment_number = del.data('shipment-number');
+         var variant_id = del.data('variant-id');
+         var shipment = _.findWhere(shipments, {number: shipment_number + ''});
+         var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
+         if (inventory_units.length !== shipment.inventory_units.length) {
+             ofnConfirm((reStockItem) => {
+                 handle_delete_click('#custom-confirm', reStockItem);
+             });
+         } else {
+             adjustItems(shipment_number, variant_id, 0);
+         }
+     } catch (e) {
+     }
+    });
   }
 });
 
-adjustItems = function(shipment_number, variant_id, quantity){
-    var shipment = _.findWhere(shipments, {number: shipment_number + ''});
-    var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
+adjustItems = function(shipment_number, variant_id, quantity, restock_item){
+  var shipment = _.findWhere(shipments, {number: shipment_number + ''});
+  var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
 
-    var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
+  if (quantity === 0 && inventory_units.length === shipment.inventory_units.length) {
+    ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_item) => {
+      if (confirm) {
+        doAdjustItems(shipment_number, variant_id, quantity, inventory_units, restock_item, () => {
+          var redirectTo = new URL(Spree.routes.cancel_order.toString());
+          redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+          window.location.href = redirectTo.toString();
+        });
+      }
+    });
+    return;
+  }
+  doAdjustItems(shipment_number, variant_id, quantity, inventory_units, restock_item, () => {
+    window.location.reload();
+  });
+}
 
-    var new_quantity = 0;
-    if(inventory_units.length<quantity){
-      url += "/add"
-      new_quantity = (quantity - inventory_units.length);
-    }else if(inventory_units.length>quantity){
-      url += "/remove"
-      new_quantity = (inventory_units.length - quantity);
-    }
-    url += '.json';
+doAdjustItems = function(shipment_number, variant_id, quantity, inventory_units, restock_item, callback) {
+  var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
 
-    if (new_quantity == 0) {
-      alert(t("js.admin.orders.quantity_unchanged"));
-    } else {
-      $.ajax({
-        type: "PUT",
-        url: Spree.url(url),
-        data: { variant_id: variant_id, quantity: new_quantity }
-      }).done(function( msg ) {
-        window.location.reload();
-      });
-    }
+  var new_quantity = 0;
+  var data = { variant_id: variant_id };
+  if (inventory_units.length < quantity) {
+    url += "/add";
+    new_quantity = (quantity - inventory_units.length);
+  } else if (inventory_units.length > quantity) {
+    url += "/remove"
+    new_quantity = (inventory_units.length - quantity);
+    data.restock_item = restock_item;
+  }
+  url += '.json';
+  data.quantity = new_quantity;
+
+  if (new_quantity == 0) {
+    ofnAlert(t("js.admin.orders.quantity_unchanged"));
+  } else {
+    $.ajax({
+      type: "PUT",
+      url: Spree.url(url),
+      data: data
+    }).done(function( msg ) {
+      callback();
+    });
+  }
 }
 
 toggleTrackingEdit = function(){
   var link = $(this);
-  link.parents('tbody').find('tr.edit-tracking').toggle();
-  link.parents('tbody').find('tr.show-tracking').toggle();
+  var parent_node = link.parents('tbody')
+  let input = parent_node.find('#tracking')[0]
+  parent_node.find('tr.edit-tracking').toggle();
+  // Set focus on input and
+  // put cursor at it's end
+  input.focus()
+  input.setSelectionRange(-1, -1)
+  parent_node.find('tr.show-tracking').toggle();
+}
+
+toggleNoteEdit = function(){
+  var link = $(this);
+  var parent_node = link.parents('tbody')
+  let input = parent_node.find('#note')[0]
+  parent_node.find('tr.edit-note').toggle();
+  // Set focus on input and
+  // put cursor at it's end
+  input.focus()
+  input.setSelectionRange(-1, -1)
+  parent_node.find('tr.show-note').toggle();
 }
 
 toggleMethodEdit = function(){
@@ -143,7 +204,77 @@ addVariantFromStockLocation = function() {
     });
   }else{
     //add to existing shipment
-    adjustItems(shipment.number, variant_id, quantity);
+    adjustItems(shipment.number, variant_id, quantity, true);
   }
   return 1
 }
+
+initAlert = function() {
+  $('#custom-alert .confirm').click(function(e) {
+    $('#custom-alert').hide();
+  })
+}
+
+initConfirm = function() {
+  $('#custom-confirm button.cancel').click(function(e) {
+    $('#custom-confirm').hide();
+  });
+}
+
+
+ofnAlert = function(message) {
+  $('#custom-alert .message').text(message);
+  $('#custom-alert').show();
+}
+
+ofnCancelOrderAlert = function(callback, i18nKey) {
+  if (i18nKey == undefined) {
+    i18nKey = "js.admin.orders.cancel_the_order_html";
+  }
+  $('#custom-confirm .message').html(
+    ` ${t(i18nKey)}
+      <div class="form">
+        <input type="checkbox" name="send_cancellation_email" value="1" id="send_cancellation_email" checked="true" />
+        <label for="send_cancellation_email">${t("js.admin.orders.cancel_the_order_send_cancelation_email")}</label><br />
+        <input type="checkbox" name="restock_items"  id="restock_items" checked="checked"/>
+        <label for="restock_items">${t("js.admin.orders.restock_items")}</label>
+      </div>`);
+  $('#custom-confirm button.confirm').unbind( "click" ).click(() => {
+    $('#custom-confirm').hide();
+    callback(true, $('#send_cancellation_email').is(':checked'), $('#restock_items').is(':checked'));
+  });
+  $('#custom-confirm button.cancel').click(() => {
+    $('#custom-confirm').hide();
+    callback(false)
+  });
+  $('#custom-confirm').show();
+}
+
+ofnConfirm = function(callback) {
+  $('#custom-confirm .message').html(
+      ` ${t("are_you_sure")}
+    <div class="form">
+      <input type="checkbox" name="restock_items"  id="restock_items" checked="checked"/>
+      <label for="restock_items">${t("js.admin.orders.restock_item")}</label>
+    </div>`);
+  $('#custom-confirm').data($(event.target).data());
+  $('#custom-confirm button.confirm').click(() => {
+      callback($('#restock_items').is(':checked'));
+  });
+  $('#custom-confirm').show();
+}
+
+initCancelOrder = function() {
+    $('#cancel_order_form').submit(function(e){
+        ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => {
+            if (confirm) {
+                var redirectTo = new URL(Spree.routes.cancel_order.toString());
+                redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+                redirectTo.searchParams.append("restock_items", restock_items);
+                window.location.href = redirectTo.toString();
+            }
+        });
+        e.preventDefault();
+        return false;
+    });
+}

app/assets/javascripts/admin/spree/progress.coffee

@@ -1,7 +1,11 @@
 $(document).ready ->
+  progressTimer = null
   $(document).ajaxStart ->
-    $("#progress").fadeIn()
+    progressTimer = setTimeout ->
+      $("#progress").fadeIn()
+    , 500
 
   $(document).ajaxStop ->
-    $("#progress").fadeOut()
+    clearTimeout(progressTimer) if progressTimer?
+    $("#progress").stop().hide()
 

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

@@ -1,13 +1,10 @@
-#= require jsuri
-
 class window.Spree
   # Helper function to take a URL and add query parameters to it
-  @url: (uri, query) ->
-    if uri.path == undefined
-      uri = new Uri(uri)
-    if query
-      $.each query, (key, value) ->
-        uri.addQueryParam(key, value)
+  @url: (uri) ->
+    if uri.pathname == undefined
+      uri = new URL(uri.toString())
     if Spree.api_key
-      uri.addQueryParam('token', Spree.api_key)
+      params = new URLSearchParams(uri.search)
+      params.append('token', Spree.api_key)
+
     return uri

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

@@ -2,10 +2,9 @@ root = exports ? this
 
 root.taxon_tree_menu = (obj, context) ->
 
-  base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
-  admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons_path)
-  edit_url = admin_base_url.clone()
-  edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
+  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,

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

@@ -8,13 +8,18 @@ handle_move = (e, data) ->
   node = data.rslt.o
   new_parent = data.rslt.np
 
-  url = Spree.url(base_url).clone()
-  url.setPath url.path() + '/' + node.attr("id")
+  url = new URL(base_url)
+  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: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: data,
     error: handle_ajax_error
 
   true
@@ -26,11 +31,16 @@ handle_create = (e, data) ->
   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: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    data: data,
     error: handle_ajax_error,
     success: (data,result) ->
       node.attr('id', data.id)
@@ -39,9 +49,11 @@ 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 = Spree.url(base_url).clone()
-  url.setPath(url.path() + '/' + node.attr("id"))
+  url = new URL(base_url)
+  url.pathname = url.pathname + '/' + node.attr("id")
 
   $.ajax
     type: "POST",
@@ -53,8 +65,8 @@ handle_rename = (e, data) ->
 handle_delete = (e, data) ->
   last_rollback = data.rlbk
   node = data.rslt.obj
-  delete_url = base_url.clone()
-  delete_url.setPath delete_url.path() + '/' + node.attr("id")
+  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",
@@ -70,10 +82,10 @@ 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_path)
+    root.base_url = Spree.url(Spree.routes.taxonomy_taxons)
 
     $.ajax
-      url: base_url.path().replace("/taxons", "/jstree"),
+      url: base_url.pathname.replace("/taxons", "/jstree"),
       success: (taxonomy) ->
         last_rollback = null
 
@@ -82,7 +94,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                base_url.path() + '/' + e.attr('id') + '/jstree'
+                base_url.pathname + '/' + e.attr('id') + '/jstree'
           themes:
             theme: "apple",
             url: "/assets/jquery.jstree/themes/apple/style.css"

app/assets/javascripts/admin/spree_paypal_express.js

@@ -1,17 +0,0 @@
-//= require admin/spree_backend
-
-SpreePaypalExpress = {
-  hideSettings: function(paymentMethod) {
-    if (SpreePaypalExpress.paymentMethodID && paymentMethod.val() == SpreePaypalExpress.paymentMethodID) {
-      $('.payment-method-settings').children().hide();
-      $('#payment_amount').prop('disabled', 'disabled');
-      $('button[type="submit"]').prop('disabled', 'disabled');
-      $('#paypal-warning').show();
-    } else if (SpreePaypalExpress.paymentMethodID) {
-      $('.payment-method-settings').children().show();
-      $('button[type=submit]').prop('disabled', '');
-      $('#payment_amount').prop('disabled', '');
-      $('#paypal-warning').hide();
-    }
-  }
-}

app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee

@@ -16,7 +16,7 @@ angular.module("admin.subscriptions").controller "DetailsController", ($scope, $
     return if !newValue?
     paymentMethod = ($scope.paymentMethods.filter (pm) -> pm.id == newValue)[0]
     return unless paymentMethod?
-    $scope.cardRequired = (paymentMethod.type == "Spree::Gateway::StripeConnect" || paymentMethod.type == "Spree::Gateway::StripeSCA")
+    $scope.cardRequired = paymentMethod.type == "Spree::Gateway::StripeSCA"
     $scope.loadCustomer() if $scope.cardRequired && !$scope.customer
 
   $scope.loadCustomer = ->

app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($compile, $window, $templateCache, DialogDefaults, shops) ->
+angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($rootScope, $compile, $window, $templateCache, DialogDefaults, shops) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -26,3 +26,4 @@ angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($compi
         scope.newSubscription()
       else
         template.dialog('open')
+        $rootScope.$evalAsync()

app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -52,7 +52,7 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         $http
           method: "DELETE"
           url: "/admin/enterprises/#{enterprise.id}/tag_rules/#{tagRule.id}.json"
-        .success ->
+        .then ->
           tagGroup.rules.splice(index, 1)
           $scope.updateRuleCounts()
           $scope.enterprise_form.$setDirty()

app/assets/javascripts/admin/tag_rules/directives/new_rule_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templateCache, DialogDefaults) ->
+angular.module("admin.tagRules").directive 'newTagRuleDialog', ($rootScope, $compile, $templateCache, DialogDefaults) ->
   restrict: 'A'
   scope:
     tagGroup: '='
@@ -22,8 +22,10 @@ angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templ
     # Link opening of dialog to click event on element
     element.bind 'click', (e) ->
       template.dialog('open')
+      $rootScope.$evalAsync()
 
     scope.addRule = (tagGroup, ruleType) ->
       scope.addNewRuleTo(tagGroup, ruleType)
       template.dialog('close')
+      $rootScope.$evalAsync()
       return

app/assets/javascripts/admin/taxons/directives/taxon_autocomplete.js.coffee

@@ -1,30 +1,17 @@
-angular.module("admin.taxons").directive "ofnTaxonAutocomplete", (Taxons, $sanitize) ->
+angular.module("admin.taxons").directive "ofnTaxonAutocomplete", (Taxons, AutocompleteSelect2) ->
   # Adapted from Spree's existing taxon autocompletion
   scope: true
   link: (scope,element,attrs) ->
     multiple = scope.$eval attrs.multipleSelection
     placeholder = attrs.placeholder
-    initalSelection = scope.$eval attrs.ngModel
+    initialSelection = scope.$eval attrs.ngModel
 
     setTimeout ->
-      element.select2
-        placeholder: placeholder
-        multiple: multiple
-        initSelection: (element, callback) ->
-          if multiple
-            callback Taxons.findByIDs(initalSelection)
-          else
-            callback Taxons.findByID(initalSelection)
-        query: (query) ->
-          query.callback { results: Taxons.findByTerm(query.term) }
-        formatResult: (taxon) ->
-          $sanitize(taxon.name)
-        formatSelection: (taxon) ->
-          taxon.name
-
-      #Allows drag and drop
-      if multiple
-        element.select2("container").find("ul.select2-choices").sortable
-          containment: 'parent'
-          start: -> element.select2("onSortStart")
-          update: -> element.select2("onSortEnd")
+      AutocompleteSelect2.autocomplete(
+        multiple,
+        placeholder,
+        element,
+        (-> Taxons.findByID(initialSelection)),
+        (-> Taxons.findByIDs(initialSelection)),
+        ((term) -> Taxons.findByTerm(term))
+      )

app/assets/javascripts/admin/users/directives/resend_user_email_confirmation.js.coffee

@@ -9,9 +9,9 @@ angular.module("admin.users").directive "resendUserEmailConfirmation", ($http) -
     element.bind "click", ->
       return if sent
       scope.status = "sending"
-      $http.post("/user/spree_user/confirmation", {spree_user: {email: scope.email}}).success (data) ->
+      $http.post("/user/spree_user/confirmation", {spree_user: {email: scope.email}}).then (response) ->
         sent = true
         element.addClass "action--disabled"
         scope.status = "done"
-      .error (data) ->
+      .catch (response) ->
         scope.status = "failed"

app/assets/javascripts/admin/util.js.erb

@@ -1,23 +1,37 @@
 $(document).ready(function() {
   var onClickButtons = function(index, fp) {
     var date;
+    // Memorize index used for the 'Close' button
+    // (currently it has index of 1)  
+    var closeButtonIndex = 1; 
     switch (index) {
       case 0:
         date = new Date();
         break;
+      case closeButtonIndex:
+        fp.close();
+        break;
+    }
+    // Set the date unless clicked button was the 'Close' one
+    if (index != closeButtonIndex) {
+      fp.setDate(date, true);
     }
-    fp.setDate(date, true);
   }
   window.FLATPICKR_DATE_DEFAULT = {
     altInput: true,
     altFormat: Spree.translations.flatpickr_date_format,
     dateFormat: "Y-m-d",
-    locale: I18n.locale,
+    locale: I18n.base_locale,
     plugins: [
         ShortcutButtonsPlugin({
-          button: [{
-            label: Spree.translations.today
-          }],
+          button: [
+            {
+              label: Spree.translations.today
+            },
+            {
+              label: Spree.translations.close
+            }
+          ],
           label: "or",
           onClick: onClickButtons
         }),
@@ -35,9 +49,14 @@ $(document).ready(function() {
       time_24hr: true,
       plugins: [
         ShortcutButtonsPlugin({
-          button: [{
-            label: Spree.translations.now
-          }],
+          button: [
+            {
+              label: Spree.translations.now
+            },
+            {
+              label: Spree.translations.close
+            }
+          ],
           label: "or",
           onClick: onClickButtons
         }),