Update all locales with the latest Transifex translations

Avoid opening tabs when navigating away from page

.browserslistrc

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

.codeclimate.yml

@@ -2,9 +2,9 @@ version: "2"
 plugins:
   rubocop:
     enabled: true
-    channel: "rubocop-0-76"
+    channel: "rubocop-1-12"
     config:
-      file: ".rubocop_styleguide.yml"
+      file: ".rubocop.yml"
   scss-lint:
     enabled: true
     checks:
@@ -20,6 +20,9 @@ plugins:
         enabled: false
       DeclarationOrder:
         enabled: false
+      NestingDepth:
+        enabled: false
+
   duplication:
     enabled: true
     exclude_patterns:

.env

@@ -0,0 +1,70 @@
+# 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 Connect details for instance account
+# Find these under 'API keys' and 'Connect' in your Stripe account dashboard -> Account Settings
+# 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"
+
+# Feature toggles
+#
+# Adding user emails separated by commas will enable them the use of certain features. See
+# config/initializers/feature_toggles.rb for details.
+#
+# BETA_TESTERS="ofn@example.com,superadmin@example.com"

.env.development

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

.env.test

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

.github/ISSUE_TEMPLATE/release.md

@@ -9,10 +9,11 @@ assignees: ''
 
 Steps: 
 
-- [ ] Include translations
+- [ ] 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
 - [ ] Nudge next release manager

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,25 +13,11 @@ Provide context for others to understand it. -->
 
 
 #### Release notes
-<!-- Write a line or two to be included in the release notes.
-Everything is worth mentioning, because you did it for a reason. -->
+<!-- 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 assign one category to your PR and delete the others. 
-The categories are based on https://keepachangelog.com/en/1.0.0/. -->
-
-Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
-
-#### How is this related to the Spree upgrade?
-<!-- Any known conflicts with the Spree Upgrade?
-Explain them or remove this section. -->
-
-
-
-#### Discourse thread
-<!-- Is there a discussion about this in Discourse?
-Add the link or remove this section. -->
+<!-- Please select one for your PR and delete the other. -->
+Changelog Category: User facing changes | Technical changes
 
 
 
@@ -42,6 +28,5 @@ Add the link or remove this section. -->
 
 
 #### Documentation updates
-<!-- Are their any wiki pages that need updating after merging this PR?
+<!-- Are there any wiki pages that need updating after merging this PR?
 List them here or remove this section. -->
-

.github/codecov.yml

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

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/brakeman-analysis.yml

@@ -0,0 +1,44 @@
+# This workflow integrates Brakeman with GitHub's Code Scanning feature
+# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
+
+name: Brakeman Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  brakeman-scan:
+    name: Brakeman Scan
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository to the GitHub Actions runner
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    # Customize the ruby version depending on your needs
+    - name: Setup Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: '2.7'
+
+    - name: Setup Brakeman
+      env:
+        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
+      run: |
+        gem install brakeman --version $BRAKEMAN_VERSION
+
+    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+    - name: Scan
+      continue-on-error: true
+      run: |
+        brakeman -f sarif -o output.sarif.json .
+
+    # Upload the SARIF file generated in the previous step
+    - name: Upload SARIF
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: output.sarif.json

.github/workflows/build.yml

@@ -0,0 +1,329 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+env:
+  DISABLE_KNAPSACK: true
+  TIMEZONE: UTC
+  COVERAGE: true
+  RSPEC_RETRY_RETRY_COUNT: 3
+
+jobs:
+  test-controllers-and-serializers:
+    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 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
+
+      - name: Run tests
+        run: bundle exec rspec --profile -- spec/models
+
+      - 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
+        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 system tests
+        run: bundle exec rspec --profile -- spec/system
+
+      - name: Run all other tests
+        run: bundle exec rake ofn:specs:run:excluding_folders["models,controllers,serializers,features,lib,migrations,system"]
+
+  test-the-rest:
+    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 folders, engines, lib
+        run: bundle exec rspec --profile --pattern "engines/*/spec/{,/*/**}/*_spec.rb,spec/features/admin/*/*_spec.rb,spec/lib/{,/*/**}/*_spec.rb"
+
+      - name: Codecov
+        uses: codecov/codecov-action@v1.5.0

.gitignore

@@ -1,6 +1,10 @@
 .bundle
 .rbenv-version
+.python-version
 .byebug_history
+.env.local
+.env.development.local
+.env.test.local
 .swp
 *.swo
 *.swp
@@ -30,6 +34,7 @@ app/public
 public/system
 public/stylesheets
 public/images
+public/files
 public/spree
 public/assets
 config/abr.yml
@@ -44,4 +49,10 @@ 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

.haml-lint.yml

@@ -0,0 +1,70 @@
+# Whether to ignore frontmatter at the beginning of HAML documents for
+# frameworks such as Jekyll/Middleman
+skip_frontmatter: false
+
+linters:
+  AltText:
+    enabled: false
+
+  ClassAttributeWithStaticValue:
+    enabled: true
+
+  ClassesBeforeIds:
+    enabled: true
+
+  ConsecutiveComments:
+    enabled: true
+
+  ConsecutiveSilentScripts:
+    enabled: true
+    max_consecutive: 2
+
+  EmptyScript:
+    enabled: true
+
+  HtmlAttributes:
+    enabled: true
+
+  ImplicitDiv:
+    enabled: true
+
+  LeadingCommentSpace:
+    enabled: true
+
+  LineLength:
+    enabled: true
+    max: 80
+
+  MultilinePipe:
+    enabled: true
+
+  MultilineScript:
+    enabled: true
+
+  ObjectReferenceAttributes:
+    enabled: true
+
+  RuboCop:
+    enabled: false
+
+  RubyComments:
+    enabled: true
+
+  SpaceBeforeScript:
+    enabled: true
+
+  SpaceInsideHashAttributes:
+    enabled: true
+    style: no_space
+
+  TagName:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  UnnecessaryInterpolation:
+    enabled: true
+
+  UnnecessaryStringOutput:
+    enabled: true

.hound.yml

@@ -0,0 +1,6 @@
+rubocop:
+  config_file: .rubocop_styleguide.yml
+scss:
+  config_file: .scss-lint.yml
+haml:
+  config_file: .haml-lint.yml

.node-version

@@ -1 +1 @@
-5.12.0
+14.16.1

.rspec

@@ -1,2 +0,0 @@
---colour
---format Fuubar

.rubocop.yml

@@ -10,8 +10,8 @@ inherit_from:
   # The automatically generated todo list to ignore all current violations.
   - .rubocop_todo.yml
 
-  # Our Open Food Network style guide. It's used by Code Climate. If you want to see all violations,
-  # then use only that configuration (like Code Climate):
+  # 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_manual_todo.yml

@@ -18,32 +18,22 @@
 #
 # This process probably doesn't need repeating. Otherwise there is plenty
 # of room for improvements and automation.
+
 Layout/LineLength:
   Max: 100
   Exclude:
   - 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/admin/variant_overrides_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/controllers/api/v0/order_cycles_controller.rb
+  - app/controllers/spree/paypal_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/injection_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
@@ -52,126 +42,102 @@ Layout/LineLength:
   - 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/ability_decorator.rb
-  - app/models/spree/app_configuration_decorator.rb
-  - app/models/spree/calculator/default_tax_decorator.rb
-  - app/models/spree/classification_decorator.rb
-  - app/models/spree/concerns/payment_method_distributors.rb
-  - app/models/spree/gateway/stripe_connect.rb
-  - app/models/spree/line_item_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/shipping_method_decorator.rb
-  - app/models/spree/taxon_decorator.rb
-  - app/models/spree/tax_rate_decorator.rb
-  - app/models/spree/user.rb
+  - app/models/spree/app_configuration.rb
+  - app/models/spree/image.rb
+  - app/models/spree/line_item.rb
+  - app/models/spree/order.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/preferences/store.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
-  - app/models/variant_override_set.rb
   - app/serializers/api/admin/subscription_line_item_serializer.rb
+  - app/serializers/api/admin/subscription_serializer.rb
   - app/services/cart_service.rb
-  - app/services/default_stock_location.rb
+  - app/services/checkout/post_checkout_actions.rb
   - app/services/embedded_page_service.rb
   - app/services/order_cycle_form.rb
-  - app/services/order_factory.rb
+  - app/services/order_syncer.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/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/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/order_cycle_permissions.rb
   - lib/open_food_network/payments_report.rb
-  - lib/open_food_network/reports/bulk_coop_allocation_report.rb
+  - lib/open_food_network/reports/line_items.rb
   - lib/open_food_network/sales_tax_report.rb
   - lib/open_food_network/scope_variants_for_search.rb
-  - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/calculated_adjustments.rb
   - lib/spree/localized_number.rb
-  - lib/spree/product_filters.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/variants_controller_spec.rb
+  - spec/controllers/api/v0/base_controller_spec.rb
+  - spec/controllers/api/v0/enterprises_controller_spec.rb
+  - spec/controllers/api/v0/exchange_products_controller_spec.rb
+  - spec/controllers/api/v0/logos_controller_spec.rb
+  - spec/controllers/api/v0/order_cycles_controller_spec.rb
+  - spec/controllers/api/v0/orders_controller_spec.rb
+  - spec/controllers/api/v0/product_images_controller_spec.rb
+  - spec/controllers/api/v0/products_controller_spec.rb
+  - spec/controllers/api/v0/promo_images_controller_spec.rb
+  - spec/controllers/api/v0/terms_and_conditions_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/orders/invoices_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/order_factory.rb
-  - spec/factories.rb
+  - spec/factories/stock_location_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/image_settings_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
@@ -180,6 +146,7 @@ Layout/LineLength:
   - spec/features/admin/order_spec.rb
   - spec/features/admin/overview_spec.rb
   - spec/features/admin/payment_method_spec.rb
+  - spec/features/admin/payments_stripe_spec.rb
   - spec/features/admin/product_import_spec.rb
   - spec/features/admin/products_spec.rb
   - spec/features/admin/reports_spec.rb
@@ -189,138 +156,99 @@ Layout/LineLength:
   - 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/darkwarm_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/embedded_groups_spec.rb
+  - spec/features/consumer/shopping/checkout_stripe_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/unit_price_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/bulk_coop_report_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/option_value_namer_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+  - spec/lib/open_food_network/order_cycle_management_report_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/packing_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/user_balance_calculator_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/stripe/account_connector_spec.rb
-  - spec/lib/stripe/webhook_handler_spec.rb
+  - spec/lib/spree/core/calculated_adjustments_spec.rb
+  - spec/lib/stripe/authorize_response_patcher_spec.rb
   - spec/mailers/order_mailer_spec.rb
-  - spec/mailers/producer_mailer_spec.rb
   - spec/mailers/subscription_mailer_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/model_set_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/calculator/flexi_rate_spec.rb
-  - spec/models/spree/calculator/price_sack_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/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/shipping_method_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/terms_of_service_file_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/checkout/stripe_sca_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/address_geocoder_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/content_sanitizer_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/order_tax_adjustments_fetcher_spec.rb
+  - spec/services/paypal_items_builder_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/spec_helper.rb
   - spec/support/cancan_helper.rb
-  - spec/support/delayed_job_helper.rb
-  - spec/support/matchers/delegate_matchers.rb
+  - spec/support/features/datepicker_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
-  - spec/support/request/shop_workflow.rb
+  - spec/support/request/stripe_stubs.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
@@ -331,19 +259,24 @@ Metrics/AbcSize:
   - 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/schedules_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/cart_controller.rb
+  - app/controllers/api/v0/enterprises_controller.rb
+  - app/controllers/api/v0/product_images_controller.rb
+  - app/controllers/api/v0/products_controller.rb
+  - app/controllers/api/v0/shipments_controller.rb
+  - app/controllers/api/v0/taxons_controller.rb
+  - app/controllers/api/v0/variants_controller.rb
+  - app/controllers/checkout_controller.rb
   - app/controllers/discourse_sso_controller.rb
   - app/controllers/enterprises_controller.rb
-  - app/controllers/spree/admin/image_settings_controller.rb
+  - app/controllers/spree/admin/adjustments_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/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/overview_controller.rb
@@ -351,14 +284,15 @@ Metrics/AbcSize:
   - 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/resource_controller.rb
   - app/controllers/spree/admin/search_controller.rb
+  - app/controllers/spree/admin/shipping_methods_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.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
@@ -366,56 +300,78 @@ Metrics/AbcSize:
   - app/controllers/user_passwords_controller.rb
   - app/controllers/user_registrations_controller.rb
   - app/helpers/checkout_helper.rb
-  - app/helpers/i18n_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/base_helper.rb
   - app/helpers/spree/orders_helper.rb
+  - app/mailers/spree/order_mailer.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/model_set.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/product_import/unit_converter.rb
   - app/models/proxy_order.rb
-  - app/models/spree/ability_decorator.rb
-  - app/models/spree/calculator/default_tax_decorator.rb
-  - app/models/spree/calculator/flexi_rate_decorator.rb
-  - app/models/spree/line_item_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/product_decorator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/gateway/pay_pal_express.rb
+  - app/models/spree/item_adjustments.rb
+  - app/models/spree/line_item.rb
+  - app/models/spree/order/checkout.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_decorator.rb
-  - app/models/spree/tax_rate_decorator.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/enterprise_serializer.rb
-  - app/serializers/api/product_serializer.rb
   - app/serializers/api/variant_serializer.rb
+  - app/services/cap_quantity.rb
   - app/services/cart_service.rb
   - app/services/create_order_cycle.rb
   - app/services/order_cycle_form.rb
+  - app/services/order_factory.rb
   - app/services/order_syncer.rb
+  - app/services/place_proxy_order.rb
+  - app/services/process_payment_intent.rb
+  - app/services/sets/model_set.rb
+  - app/services/variants_stock_levels.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/form.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/bulk_coop_report.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/option_value_namer.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/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
@@ -423,31 +379,39 @@ Metrics/AbcSize:
   - 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/variant_and_line_item_naming.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/auth.rb
+  - lib/spree/core/controller_helpers/common.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/product_duplicator.rb
+  - lib/spree/core/s3_support.rb
   - lib/spree/localized_number.rb
   - lib/stripe/account_connector.rb
+  - lib/stripe/authorize_response_patcher.rb
+  - lib/stripe/profile_storer.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/checkout_paypal_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
-  ExcludedMethods: [
+  IgnoredMethods: [
     "class_eval",
     "collection",
     "context",
@@ -461,116 +425,164 @@ Metrics/BlockLength:
     "scenario"
   ]
   Exclude:
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment.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/line_item_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/admin/order_cycles/complex_updating_specific_time_spec.rb
+  - spec/features/consumer/shopping/checkout_spec.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/cancan_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/enterprise_fees_controller.rb
   - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/spree/admin/orders_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/taxons_controller.rb
+  - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
-  - app/helpers/i18n_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_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/variant_override_set.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/order_inventory.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/tax_rate.rb
+  - app/models/spree/variant.rb
+  - app/models/spree/zone.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/parameters.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/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.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/calculated_adjustments.rb
+  - lib/spree/core/controller_helpers/common.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
+  - lib/stripe/authorize_response_patcher.rb
+  - lib/stripe/credit_card_clone_destroyer.rb
   - spec/models/product_importer_spec.rb
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/PerceivedComplexity:
   Max: 7
   Exclude:
   - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/api/variants_controller.rb
+  - app/controllers/api/v0/variants_controller.rb
+  - app/controllers/spree/admin/orders_controller.rb
+  - app/controllers/spree/admin/payment_methods_controller.rb
+  - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
+  - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
-  - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/enterprise_relationship.rb
-  - app/models/spree/ability_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/product_decorator.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/order_inventory.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/tax_rate.rb
+  - app/models/spree/variant.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/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.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/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/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/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/api/v0/product_images_controller.rb
+  - app/controllers/api/v0/products_controller.rb
+  - app/controllers/api/v0/shipments_controller.rb
+  - app/controllers/api/v0/taxons_controller.rb
+  - app/controllers/api/v0/variants_controller.rb
   - app/controllers/shop_controller.rb
-  - app/controllers/spree/admin/image_settings_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/resource_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/user_registrations_controller.rb
+  - app/controllers/spree/paypal_controller.rb
   - app/controllers/spree/user_sessions_controller.rb
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
@@ -581,6 +593,7 @@ Metrics/MethodLength:
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/mailers/producer_mailer.rb
+  - app/models/calculator/default_tax.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
@@ -589,31 +602,49 @@ Metrics/MethodLength:
   - 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_decorator.rb
-  - app/models/spree/calculator/default_tax_decorator.rb
-  - app/models/spree/calculator/flexi_rate_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/gateway/pay_pal_express.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/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/return_authorization.rb
   - app/models/spree/shipment.rb
+  - app/models/spree/taxon.rb
+  - app/models/spree/tax_rate.rb
+  - app/models/spree/zone.rb
   - app/serializers/api/admin/order_cycle_serializer.rb
   - app/serializers/api/cached_enterprise_serializer.rb
+  - app/services/cart_service.rb
+  - app/services/mail_configuration.rb
   - app/services/order_cycle_form.rb
   - app/services/permitted_attributes/checkout.rb
+  - app/services/place_proxy_order.rb
+  - app/services/process_payment_intent.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/bulk_coop_report.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/option_value_namer.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
@@ -623,60 +654,74 @@ Metrics/MethodLength:
   - 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/bulk_coop_allocation_report.rb
-  - lib/open_food_network/reports/bulk_coop_supplier_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/controller_helpers/auth.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/responder.rb
+  - lib/stripe/credit_card_clone_finder.rb
   - lib/stripe/profile_storer.rb
-  - lib/tasks/data/truncate_data.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/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
-  - spec/support/request/authentication_workflow.rb
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/ClassLength:
   Max: 100
   Exclude:
+  - app/controllers/admin/customers_controller.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/api/v0/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/payments_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/orders_controller.rb
+  - app/controllers/spree/paypal_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_decorator.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/tax_rate.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
+  - app/services/order_syncer.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/reports/enterprise_fee_summary/scope.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/open_food_network/bulk_coop_report.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
@@ -694,40 +739,20 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
-  - engines/order_management/spec/services/order_management/stock/package_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
+  - app/helpers/spree/admin/orders_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/summarizer_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
   - lib/open_food_network/column_preference_defaults.rb
-  - spec/controllers/admin/enterprises_controller_spec.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/api/order_cycles_controller_spec.rb
-  - spec/controllers/api/orders_controller_spec.rb
-  - spec/controllers/spree/admin/payment_methods_controller_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_calculator_spec.rb
-  - spec/lib/open_food_network/option_value_namer_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/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/user_balance_calculator_spec.rb
-  - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
-  - spec/models/spree/ability_spec.rb
   - spec/models/spree/adjustment_spec.rb
   - spec/models/spree/line_item_spec.rb
-  - spec/models/spree/payment_spec.rb
   - spec/models/spree/product_spec.rb
+  - spec/models/spree/tax_rate_spec.rb
   - spec/models/spree/variant_spec.rb
-  - spec/services/permissions/order_spec.rb
-  - spec/support/request/web_helper.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -736,3 +761,16 @@ Metrics/ParameterLists:
   - app/models/product_import/entry_processor.rb
   - lib/open_food_network/xero_invoices_report.rb
   - spec/features/admin/reports_spec.rb
+  - spec/support/controller_requests_helper.rb
+
+Lint/UselessAssignment:
+  Exclude:
+  - 'spec/**/*'
+  - app/models/spree/credit_card.rb
+  - app/models/spree/taxon.rb
+  - lib/spree/core/controller_helpers/common.rb
+
+Metrics/BlockNesting:
+  Max: 3
+  Exclude:
+  - app/models/spree/payment/processing.rb

.rubocop_specs.yml

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

@@ -1,11 +1,10 @@
 # Our Open Food Network style guide.
 #
-# These are the rules we agreed upon and we work towards. Code Climate uses
-# these rules to rate our code and detect new violations. But when you run
-# rubocop locally, the default configuration file `.rubocop.yml` loads
-# our "todo lists" to ignore all current violations.
+# These are the rules we agreed upon and we work towards.
 AllCops:
-  TargetRailsVersion: 4.0
+  NewCops: disable
+  SuggestExtensions: false
+  TargetRailsVersion: 5.0
   Exclude:
     - 'bin/**/*'
     - 'db/**/*'
@@ -46,6 +45,9 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
+Bundler/DuplicatedGem:
+  Enabled: false
+
 ## TEMPORARY/CONTESTED SETTINGS
 #
 # These are still to be decided upon, but recommended for inclusion by
@@ -180,7 +182,7 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Max: 25
-  ExcludedMethods: [
+  IgnoredMethods: [
     "class_eval",
     "collection",
     "context",
@@ -214,3 +216,6 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Max: 7
+
+Naming/PredicateName:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.3.7
+2.7.3

.scss-lint.yml

@@ -1,3 +1,19 @@
 scss_files: 'app/assets/stylesheets/**/*.css.scss'
 
 exclude: 'app/assets/stylesheets/shared/**'
+
+linters:
+  ImportantRule:
+    enabled: false
+    VendorPrefix:
+      enabled: false
+    LeadingZero:
+      enabled: false
+    PropertySortOrder:
+      enabled: false
+    StringQuotes:
+      enabled: false
+    DeclarationOrder:
+      enabled: false
+    NestingDepth:
+      enabled: false

.simplecov

@@ -0,0 +1,22 @@
+#!/bin/env ruby
+
+SimpleCov.start 'rails' do
+  add_filter '/bin/'
+  add_filter '/config/'
+  add_filter '/jobs/application_job.rb'
+  add_filter '/schemas/'
+  add_filter '/lib/generators'
+  add_filter '/spec/'
+  add_filter '/vendor/'
+  add_filter '/public'
+  add_filter '/swagger'
+  add_filter '/script'
+  add_filter '/log'
+  add_filter '/db'
+  add_filter '/lib/tasks/sample_data/'
+end
+
+if ENV['CI']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end

.storybook/main.js

@@ -0,0 +1,7 @@
+module.exports = {
+  stories: ['../spec/components/stories/**/*.stories.json'],
+  addons: [
+    '@storybook/addon-docs',
+    '@storybook/addon-controls',
+  ],
+};

.storybook/preview-head.html

@@ -0,0 +1,2 @@
+<link href='https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" media="screen" href="http://localhost:3000/assets/darkswarm/all.css" />

.storybook/preview.js

@@ -0,0 +1,5 @@
+export const parameters = {
+  server: {
+    url: `http://localhost:3000/rails/stories`,
+  },
+};

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct of the Open Food Network
+
+**Welcome!** We are currently working on a Code of Conduct. You are welcome to contribute. We started this work at the Global Gathering 2020 and you find [notes of the initial session](https://community.openfoodnetwork.org/t/global-gathering-2020-day-5-a-code-of-conduct-for-ofn/2071/1) in the community forum. You can edit this file on Github to suggest new content. Alternatively, you can post in our [community forum](https://community.openfoodnetwork.org) or reach us on [Slack](https://openfoodnetwork.org/slack-invite).

CONTRIBUTING.md

@@ -15,6 +15,14 @@ Create a new branch on your local machine to make your changes against (based on
 
     git checkout -b branch-name-here --no-track upstream/master
 
+You might need to update or install missing gems:
+
+    bundle install
+
+Also, there might be missing dependencies, after pulling a particular branch. To update dependencies, run:
+
+    yarn install
+
 If you want to run the whole test suite, we recommend using a free CI service to run your tests in parallel. Running the whole suite locally in series is likely to take > 40 minutes. [TravisCI][travis] and [SemaphoreCI][semaphore] both work great in our experience. Either way, make sure the tests pass on your new branch:
 
     bundle exec rspec spec
@@ -40,7 +48,7 @@ Push your changes to a branch on your fork:
 
 ## Submitting a Pull Request
 
-Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr].
+Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr]. 
 
 TL;DR:
 * Write tests

DOCKER.md

@@ -1,62 +0,0 @@
-### Docker
-
-It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
-The objective is to spare configuration time, in order to help people testing the app and contribute to it.
-It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
-
-### Install Docker
-
-Please check the documentation here, https://docs.docker.com/install/ to install Docker.
-
-For Docker Compose, information are here: https://docs.docker.com/compose/install/.
-
-Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
-
-
-### Use Docker with Open Food Network
-
-Open a terminal with a shell.
-
-Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
-
-```sh
-$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
-```
-
-Otherwise, if you just want to get things running, clone from the OFN main repo:
-
-```sh
-$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
-```
-
-Go at the root of the app:
-
-```sh
-$ cd openfoodnetwork
-```
-
-Download the Docker images and build the containers:
-
-```sh
-$ docker-compose build
-```
-
-Setup the database and seed it with sample data:
-```sh
-$ docker-compose run web bundle exec rake db:reset
-$ docker-compose run web bundle exec rake db:test:prepare
-$ docker-compose run web bundle exec rake ofn:sample_data
-```
-
-Finally, run the app with all the required containers:
-
-```sh
-$ docker-compose up
-```
-
-The default admin user is 'ofn@example.com' with 'ofn123' password.
-Check the app in the browser at `http://localhost:3000`.
-
-You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
-
-You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).

Dockerfile

@@ -1,25 +1,47 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+ENV TZ Europe/London
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
 
 # Install all the requirements
-RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev 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
 
 # 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) && \
+    RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install $(cat .ruby-version) && \
     rbenv global $(cat .ruby-version) && \
-    gem install bundler --version=1.17.2
+    gem install bundler --version=1.17.3
 
 # Install Postgres
 RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
@@ -27,8 +49,11 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
-# Install node
-RUN apt-get install -y nodejs
+# 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 Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -43,5 +68,9 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
 
 # Copy code and install app dependencies
 COPY . /usr/src/app/
+
+# Install front-end dependencies
+RUN yarn install
+
 # Run bundler install in parallel with the amount of available CPUs
 RUN bundle install --jobs="$(nproc)"

GETTING_STARTED.md

@@ -4,14 +4,16 @@ This is a general guide to setting up an Open Food Network **development environ
 
 ### 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.md).
+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 2.3.7 and bundler
+* 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:
 - [Ubuntu Setup Guide][ubuntu]
+- [Debian Setup Guide][debian]
 - [OSX Setup Guide][osx]
 
 If you are likely to need to manage multiple version of ruby on your local machine, we recommend version managers such as [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
@@ -20,7 +22,7 @@ For those new to Rails, the following tutorial will help get you up to speed wit
 
 ### Get it
 
-If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine.
+So you have set up your local environment according to the requirements listed above. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine:
 
     git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
 
@@ -46,7 +48,11 @@ $ 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:
 
@@ -77,8 +83,6 @@ Note: If your OS is not explicitly supported in the setup guides then not all te
 
 Note: The time zone on your machine should match the one defined in `config/application.yml`.
 
-The project is configured to use [Zeus][zeus] to reduce the pre-test startup time while Rails loads. See the [Zeus GitHub page][zeus] for usage instructions.
-
 Once [npm dependencies are installed][karma], AngularJS tests can be run with:
 
     ./script/karma run
@@ -116,8 +120,8 @@ If these commands succeed, you should be able to [continue the setup process](#g
 [developer-wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
 [osx]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
+[debian]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Debian
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
-[zeus]: https://github.com/burke/zeus
 [rubocop]: https://rubocop.readthedocs.io/en/latest/
 [karma]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU

Gemfile

@@ -1,14 +1,31 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
-ruby "2.3.7"
+ruby "2.7.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.7.1'
-gem 'rails', '~> 4.0.13'
-gem 'rails-i18n', '~> 4.0'
+gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+
+gem 'rails', '~> 6.1.4'
+
+gem 'activemerchant', '>= 1.78.0'
+gem 'angular-rails-templates', '>= 0.3.0'
+gem 'awesome_nested_set'
+gem 'ransack', '2.4.2'
+gem 'responders'
+gem 'sass-rails', '< 5.1.0' # this restriction originates from the compass-rails's version
+gem 'webpacker', '~> 5'
+
+gem 'i18n'
+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-6"
+gem "fog-aws", "~> 2.0" # db2fog does not support v3
+
+gem "valid_email2"
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
@@ -16,130 +33,113 @@ gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
 gem 'activerecord-postgresql-adapter'
-gem 'pg', '~> 0.21.0'
+gem 'pg', '~> 1.2.3'
 
-# OFN-maintained and patched version of Spree v2.0.4. See
-# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Tech-Doc:-OFN's-Spree-fork%F0%9F%8D%B4
-# for details.
-gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-1-0-stable'
+gem 'acts_as_list', '1.0.4'
+gem 'cancancan', '~> 1.15.0'
+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'
 
-### Dependencies brought from spree core
-gem 'acts_as_list', '= 0.2.0'
-gem 'awesome_nested_set', '~> 3.0.0.rc.1'
-gem 'cancan', '~> 1.6.10'
-gem 'ffaker', '~> 1.16'
-gem 'highline', '= 1.6.18' # Necessary for the install generator
-gem 'httparty', '~> 0.18' # Used to check alerts in spree_core, this is not used in OFN.
-gem 'json', '>= 1.7.7'
-gem 'money', '5.1.1'
-gem 'paranoia', '~> 2.0'
-gem 'ransack', '~> 1.8.10'
-gem 'state_machine', '1.2.0'
-gem 'stringex', '~> 1.5.1'
-
-gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
-
-# Our branch contains two changes
-# - Pass customer email and phone number to PayPal (merged to upstream master)
-# - Change type of password from string to password to hide it in the form
-gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable'
+gem 'paypal-sdk-merchant', '1.117.2'
 gem 'stripe'
 
-# We need at least this version to have Digicert's root certificate
-# which is needed for Pin Payments (and possibly others).
-gem 'activemerchant', '~> 1.78.0'
-
-gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
+gem 'devise'
 gem 'devise-encryptable'
-gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
+gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.2'
-gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
+gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
-gem 'daemons'
-gem 'delayed_job_active_record'
-gem 'delayed_job_web'
-
-# Spree's default pagination gem (locked to the current version used by Spree)
-# We use it's methods in OFN code as well, so this is a direct dependency
-gem 'kaminari', '~> 0.14.1'
+gem 'pagy', '~> 4.8'
 
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
-gem 'aws-sdk', '1.11.1' # temporarily locked down due to https://github.com/aws/aws-sdk-ruby/issues/273
+gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
-gem 'db2fog'
 gem 'haml'
 gem 'redcarpet'
-gem 'sass'
-gem 'sass-rails'
-gem 'truncate_html', '0.9.2'
-gem 'unicorn'
 
 gem 'actionpack-action_caching'
 # AMS 0.9.x and 0.10.x are very different from 0.8.4 and the upgrade is not straight forward
 #   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', '~> 4.0'
+gem 'acts-as-taggable-on', '~> 8.1'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
+gem 'bigdecimal', '3.0.2'
+gem 'bootsnap', require: false
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'diffy'
-gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
-gem 'oj'
-gem 'paper_trail', '~> 5.2.3'
+gem 'mimemagic', '> 0.3.5'
 gem 'paperclip', '~> 3.4.1'
+gem 'paper_trail', '~> 12.0.0'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
-gem 'roadie-rails', '~> 1.3.0'
+gem 'roadie-rails'
+
+gem 'puma'
+gem 'hiredis'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'sidekiq'
+gem 'sidekiq-scheduler'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
-gem 'foreigner'
 gem 'immigrant'
 gem 'roo', '~> 2.8.3'
 
 gem 'whenever', require: false
 
-gem 'test-unit', '~> 3.3'
+gem 'test-unit', '~> 3.4'
 
-gem 'coffee-rails', '~> 4.2.2'
+gem 'coffee-rails', '~> 5.0.0'
 gem 'compass-rails'
 
-gem 'mini_racer', '0.2.15'
+gem 'mini_racer', '0.4.0'
 
 gem 'uglifier', '>= 1.0.3'
 
-gem 'angular-rails-templates', '~> 0.3.0'
+gem 'angular_rails_csrf'
 gem 'foundation-icons-sass-rails'
-gem 'momentjs-rails'
 
 gem 'foundation-rails', '= 5.5.2.1'
 
-gem 'jquery-migrate-rails'
-gem 'jquery-rails', '3.1.5'
+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'
 
+gem 'good_migrations'
+
+gem 'flipper'
+gem 'flipper-active_record'
+gem 'flipper-ui'
+
+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
   # Pretty printed test output
-  gem 'atomic'
   gem 'awesome_print'
-  gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
+  gem 'bullet'
+  gem 'capybara'
   gem 'database_cleaner', require: false
-  gem "factory_bot_rails", '4.10.0', require: false
-  gem 'fuubar', '~> 2.5.0'
+  gem "factory_bot_rails", '6.2.0', require: false
+  gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
   gem 'knapsack'
   gem 'letter_opener', '>= 1.4.1'
@@ -149,32 +149,34 @@ group :test, :development do
   gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'timecop'
-  gem 'unicorn-rails'
   gem 'webdrivers'
+  gem 'cuprite'
 end
 
 group :test do
+  gem 'byebug'
+  gem 'codecov', require: false
+  gem 'pdf-reader'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
+  gem 'test-prof'
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
 end
 
 group :development do
-  gem 'byebug', '~> 11.0.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
-  gem "newrelic_rpm", "~> 3.0"
-  gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
-  gem 'pry-byebug', '~> 3.7.0' # 3.8 requires ruby 2.4
+  gem 'foreman'
+  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'
 
-  # 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 "view_component_storybook", require: "view_component/storybook/engine"
 
   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,4 +1,5 @@
-[![Build Status](https://semaphoreci.com/api/v1/openfoodfoundation/openfoodnetwork-2/branches/master/badge.svg)](https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2)
+[![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
@@ -9,17 +10,22 @@ Supported by the Open Food Foundation and a network of global affiliates, we are
 
 We're part of global movement - get involved!
 
-* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel.
+* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel and join #dev for all tech-related topics.
 * Head to [https://openfoodnetwork.org](https://openfoodnetwork.org) for more information about the global OFN project.
 * Check out the [User Guide](https://guide.openfoodnetwork.org/) for a list of features and tutorials.
 * Join our [discussion forum](https://community.openfoodnetwork.org).
 
 ## Contributing
 
-If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through our [Contributor Guide][contributor-guide].
+If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through the [OFN Handbook][ofn-handbook].
 
 Our [GETTING_STARTED](GETTING_STARTED.md) and [CONTRIBUTING](CONTRIBUTING.md) guides are the best place to start for developers looking to set up a development environment and make contributions to the codebase.
 
+### Hacktoberfest :tada:
+
+Are you participating in [Hacktoberfest](https://hacktoberfest.digitalocean.com/)? Go check out our [Welcome New Developers project board][welcome-dev]! We have curated all issues we consider to be a good starting point for new members of the community and categorized them by skills and level of complexity. 
+Have a look and pick the one you would prefer working on!
+
 ## Provisioning
 
 If you're interested in provisioning a server, see [ofn-install][ofn-install] for the project's Ansible playbooks.
@@ -28,7 +34,9 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-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!
+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
 
@@ -36,6 +44,8 @@ Copyright (c) 2012 - 2020 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
-[contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
+[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/orgs/openfoodfoundation/projects/2
+[zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
@@ -6,4 +8,6 @@ require_relative 'config/application'
 
 Openfoodnetwork::Application.load_tasks
 
-Knapsack.load_tasks if defined?(Knapsack)
+if !ENV['DISABLE_KNAPSACK'] && defined?(Knapsack)
+  Knapsack.load_tasks
+end

app/assets/images/flag.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="15 13 34 38.4" enable-background="new 15 13 34 38.4" xml:space="preserve">
-<g>
-	<polygon fill="#FFFFFF" points="15.5,13.5 48.5,13.5 48.5,50.7 31.6,45.5 15.5,50.7 	"/>
-	<path fill="#999999" d="M48,14v36l-16.4-5L16,50V14H48 M49,13h-1H16h-1v1v36v1.4l1.3-0.4l15.3-5l16.1,5l1.3,0.4V50V14V13L49,13z"/>
-</g>
-</svg>

app/assets/images/question-mark-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50"><circle cx="24.87" cy="24.87" r="24" fill="#f4f9fd" stroke="#cfe1f3" stroke-miterlimit="10"/><path d="M36.31 18.13c0 7.51-8.11 7.63-8.11 10.4v.71c0 .74-.6 1.34-1.34 1.34h-5.11c-.74 0-1.34-.6-1.34-1.34v-.97c0-4 3.04-5.61 5.33-6.89 1.97-1.1 3.17-1.85 3.17-3.31 0-1.93-2.46-3.21-4.46-3.21-2.6 0-3.8 1.23-5.48 3.36-.45.57-1.28.68-1.87.24l-3.12-2.36a1.35 1.35 0 01-.3-1.83c2.65-3.89 6.02-6.07 11.27-6.07 5.49-.02 11.36 4.27 11.36 9.93zM29 36.86c0 2.59-2.11 4.71-4.71 4.71s-4.71-2.11-4.71-4.71c0-2.59 2.11-4.71 4.71-4.71S29 34.27 29 36.86z" fill="#81b2e1"/></svg>

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

@@ -8,7 +8,7 @@ angular.module("ofn.admin", [
   "admin.dropdown",
   "admin.products",
   "admin.taxons",
-  "infinite-scroll"
+  "infinite-scroll",
+  "admin.orders"
 ]).config ($httpProvider) ->
-  $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/all.js

@@ -6,17 +6,13 @@
 //
 
 // jquery and angular
-//= require jquery
-//= require jquery-migrate-min
+//= require jquery2
 //= require jquery_ujs
 //= require jquery.ui.all
-//= require jquery-ui-timepicker-addon
 //= require jquery.powertip
 //= require jquery.cookie
 //= require jquery.jstree/jquery.jstree
 //= require jquery.vAlign
-//= require jquery.horizontalNav
-//= require jquery.adaptivemenu
 //= require angular
 //= require angular-resource
 //= require angular-animate
@@ -26,17 +22,38 @@
 //= require angular-rails-templates
 //= require lodash.underscore.js
 
+// datetimepicker  (fil, nb)
+//= require flatpickr/dist/flatpickr.min
+//= require flatpickr/dist/l10n/ar
+//= require flatpickr/dist/l10n/cat
+//= require flatpickr/dist/l10n/cy
+//= require flatpickr/dist/l10n/de
+//= require flatpickr/dist/l10n/es
+//= require flatpickr/dist/l10n/fr
+//= require flatpickr/dist/l10n/it
+//= require flatpickr/dist/l10n/nl
+//= require flatpickr/dist/l10n/pl
+//= require flatpickr/dist/l10n/pt
+//= require flatpickr/dist/l10n/ru
+//= require flatpickr/dist/l10n/sv
+//= require flatpickr/dist/l10n/tr
+//= require shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min
+//= require flatpickr/dist/plugins/labelPlugin/labelPlugin
+
 // spree
-//= require spree
+//= require admin/spree/spree
 //= require admin/spree/spree-select2
 //= require modernizr
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express
-//= require admin/handlebar_extensions
+//= require admin/spree/handlebar_extensions
 
 // OFN specific
+//= require ../shared/shared
+//= require_tree ../shared/directives
+//= require_tree ../templates/shared
 //= require_tree ../templates/admin
 //= require ./admin_ofn
 //= require ./customers/customers
@@ -71,23 +88,29 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment
-//= require moment/de.js
-//= require moment/en-gb.js
-//= require moment/es.js
-//= require moment/fr.js
-//= require moment/it.js
-//= require moment/nb.js
-//= require moment/pt-br.js
-//= require moment/pt.js
-//= require moment/ru.js
-//= require moment/sv.js
-//= require moment/ca.js
-//= require moment/ar.js
-//= require moment/tr.js
+//= require moment/min/moment.min.js
+//= require moment/locale/ar.js
+//= require moment/locale/ca.js
+//= require moment/locale/de.js
+//= require moment/locale/en-gb.js
+//= require moment/locale/es.js
+//= require moment/locale/fil.js
+//= require moment/locale/fr.js
+//= require moment/locale/it.js
+//= require moment/locale/nb.js
+//= require moment/locale/nl-be.js
+//= require moment/locale/pt-br.js
+//= require moment/locale/pt.js
+//= require moment/locale/ru.js
+//= require moment/locale/sv.js
+//= require moment/locale/tr.js
+//= require moment/locale/pl.js
 
 // 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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, $location, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser, ProductFiltersUrl) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -13,37 +13,30 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
   ]
 
-  $scope.filterableColumns = [
-    { name: t("label_producers"),       db_column: "producer_name" },
-    { name: t("name"),           db_column: "name" }
-  ]
-
-  $scope.filterTypes = [
-    { name: t("equals"),         predicate: "eq" },
-    { name: t("contains"),       predicate: "cont" }
-  ]
-
-  $scope.optionTabs =
-    filters:        { title: t("filter_products"),   visible: false }
+  $scope.q = {
+    producerFilter: ""
+    categoryFilter: ""
+    importDateFilter: ""
+    query: ""
+    sorting: ""
+  }
 
+  $scope.sorting = "name asc"
   $scope.producers = producers
   $scope.taxons = Taxons.all
   $scope.tax_categories = tax_categories
-  $scope.producerFilter = ""
-  $scope.categoryFilter = ""
-  $scope.importDateFilter = ""
   $scope.page = 1
   $scope.per_page = 15
   $scope.products = BulkProducts.products
-  $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
   $scope.sortOptions = SortOptions
 
   $scope.initialise = ->
+    $scope.q = ProductFiltersUrl.loadFromUrl($location.search())
     $scope.fetchProducts()
 
-  $scope.$watchCollection '[query, producerFilter, categoryFilter, importDateFilter, per_page]', ->
+  $scope.$watchCollection '[q.query, q.producerFilter, q.categoryFilter, q.importDateFilter, per_page]', ->
     $scope.page = 1 # Reset page when changing filters for new search
 
   $scope.changePage = (newPage) ->
@@ -53,25 +46,27 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.fetchProducts = ->
     removeClearedValues()
     params = {
-      'q[name_cont]': $scope.query,
-      'q[supplier_id_eq]': $scope.producerFilter,
-      'q[primary_taxon_id_eq]': $scope.categoryFilter,
+      'q[name_cont]': $scope.q.query,
+      'q[supplier_id_eq]': $scope.q.producerFilter,
+      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
       'q[s]': $scope.sorting,
-      import_date: $scope.importDateFilter,
+      import_date: $scope.q.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
     }
     RequestMonitor.load(BulkProducts.fetch(params).$promise).then ->
+      # update url with the filters used
+      $location.search(ProductFiltersUrl.generate($scope.q))
       $scope.resetProducts()
 
   removeClearedValues = ->
-    delete $scope.producerFilter if $scope.producerFilter == "0"
-    delete $scope.categoryFilter if $scope.categoryFilter == "0"
-    delete $scope.importDateFilter if $scope.importDateFilter == "0"
+    delete $scope.q.producerFilter if $scope.q.producerFilter == "0"
+    delete $scope.q.categoryFilter if $scope.q.categoryFilter == "0"
+    delete $scope.q.importDateFilter if $scope.q.importDateFilter == "0"
 
   $timeout ->
     if $scope.showLatestImport
-      $scope.importDateFilter = $scope.importDates[1].id
+      $scope.q.importDateFilter = $scope.importDates[1].id
 
   $scope.resetProducts = ->
     DirtyProducts.clear()
@@ -101,16 +96,16 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.visibleTab = tab
 
   $scope.resetSelectFilters = ->
-    $scope.query = ""
-    $scope.producerFilter = "0"
-    $scope.categoryFilter = "0"
-    $scope.importDateFilter = "0"
+    $scope.q.query = ""
+    $scope.q.producerFilter = "0"
+    $scope.q.categoryFilter = "0"
+    $scope.q.importDateFilter = "0"
     $scope.fetchProducts()
 
   $scope.$watch 'sortOptions', (sort) ->
     return unless sort && sort.predicate != ""
 
-    $scope.sorting = sort.getSortingExpr()
+    $scope.sorting = sort.getSortingExpr(defaultDirection: "asc")
     $scope.fetchProducts()
   , true
 
@@ -122,8 +117,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
-      window.open(editProductUrl(product, variant), "_blank")
-
+      $window.location.href = ProductFiltersUrl.buildUrl(editProductUrl(product, variant), $scope.q)
 
   $scope.toggleShowAllVariants = ->
     showVariants = !DisplayProperties.showVariants 0
@@ -153,7 +147,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     if confirm("Are you sure?")
       $http(
         method: "DELETE"
-        url: "/api/products/" + product.id
+        url: "/api/v0/products/" + product.id
       ).success (data) ->
         $scope.products.splice $scope.products.indexOf(product), 1
         DirtyProducts.deleteProduct product.id
@@ -168,7 +162,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         if confirm(t("are_you_sure"))
           $http(
             method: "DELETE"
-            url: "/api/products/" + product.permalink_live + "/variants/" + variant.id
+            url: "/api/v0/products/" + product.permalink_live + "/variants/" + variant.id
           ).success (data) ->
             $scope.removeVariant(product, variant)
     else
@@ -220,10 +214,11 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       data:
         products: productsToSubmit
         filters:
-          'q[name_cont]': $scope.query
-          'q[supplier_id_eq]': $scope.producerFilter
-          'q[primary_taxon_id_eq]': $scope.categoryFilter
-          import_date: $scope.importDateFilter
+          'q[name_cont]': $scope.q.query
+          'q[supplier_id_eq]': $scope.q.producerFilter
+          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
+          'q[s]': $scope.sorting
+          import_date: $scope.q.importDateFilter
         page: $scope.page
         per_page: $scope.per_page
     ).success((data) ->

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -47,3 +47,8 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
         tag.text.toLowerCase().indexOf(query.toLowerCase()) != -1
       defer.resolve filtered
     defer.promise
+
+  $scope.displayBalanceStatus = (customer) ->
+    return unless customer.balance_status
+
+    t('admin.customers.index.' + customer.balance_status)

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

@@ -1,9 +0,0 @@
-angular.module("ofn.admin").directive "datepicker", ->
-  require: "ngModel"
-  link: (scope, element, attrs, ngModel) ->
-    element.datepicker
-      dateFormat: "yy-mm-dd"
-      onSelect: (dateText, inst) ->
-        scope.$apply (scope) ->
-          # Fires ngModel.$parsers
-          ngModel.$setViewValue dateText

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

@@ -1,11 +0,0 @@
-angular.module("ofn.admin").directive "datetimepicker", ->
-  require: "ngModel"
-  link: (scope, element, attrs, ngModel) ->
-    element.datetimepicker
-      dateFormat: "yy-mm-dd"
-      timeFormat: "HH:mm:ss"
-      stepMinute: 15
-      onSelect: (dateText, inst) ->
-        scope.$apply (scope) ->
-          # Fires ngModel.$parsers
-          ngModel.$setViewValue dateText

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

@@ -5,5 +5,10 @@ angular.module("ofn.admin").directive "ofnSelect2MinSearch", ->
       minimumResultsForSearch: attrs.ofnSelect2MinSearch
 
     ngModel.$formatters.push (value) ->
-      if (value)
-        element.select2('val', value);
+      # select2 populates options with a value like "number:3" or "string:category" but
+      # select2('val', value) doesn't do the type conversion for us as one would expect
+      if isNaN(value)
+        element.select2('val', "string:#{value}")
+      else
+        element.select2('val', "number:#{value}")
+

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/enterprise_fees/directives/delete_resource.js.coffee

@@ -1,7 +1,7 @@
 angular.module('admin.enterpriseFees').directive 'spreeDeleteResource', ->
   (scope, element, attrs) ->
     if scope.enterprise_fee.id
-      url = '/api/enterprise_fees/' + scope.enterprise_fee.id
+      url = '/api/v0/enterprise_fees/' + scope.enterprise_fee.id
       html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="' + t('are_you_sure') + '" url="' + url + '"></a>'
       #var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
       element.append html

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
@@ -69,25 +71,27 @@ angular.module("admin.enterprises")
       $scope.newUser = $scope.invite_errors = $scope.invite_success = null
 
     $scope.removeLogo = ->
-      return unless confirm(t("admin.enterprises.remove_logo.immediate_removal_warning"))
-
-      Enterprises.removeLogo($scope.Enterprise).then (data) ->
-        $scope.Enterprise = angular.copy(data)
-        $scope.$emit("enterprise:updated", $scope.Enterprise)
-
-        StatusMessage.display("success", t("admin.enterprises.remove_logo.removed_successfully"))
-      , (response) ->
-        if response.data.error?
-          StatusMessage.display("failure", response.data.error)
+      $scope.performEnterpriseAction("removeLogo", "immediate_logo_removal_warning", "removed_logo_successfully")
 
     $scope.removePromoImage = ->
-      return unless confirm(t("admin.enterprises.remove_promo_image.immediate_removal_warning"))
+      $scope.performEnterpriseAction("removePromoImage", "immediate_promo_image_removal_warning", "removed_promo_image_successfully")
 
-      Enterprises.removePromoImage($scope.Enterprise).then (data) ->
+    $scope.removeTermsAndConditions = ->
+      $scope.performEnterpriseAction("removeTermsAndConditions", "immediate_terms_and_conditions_removal_warning", "removed_terms_and_conditions_successfully")
+
+    $scope.performEnterpriseAction = (enterpriseActionName, warning_message_key, success_message_key) ->
+      return unless confirm($scope.translation(warning_message_key))
+
+      Enterprises[enterpriseActionName]($scope.Enterprise).then (data) ->
         $scope.Enterprise = angular.copy(data)
         $scope.$emit("enterprise:updated", $scope.Enterprise)
-
-        StatusMessage.display("success", t("admin.enterprises.remove_promo_image.removed_successfully"))
+        StatusMessage.display("success", $scope.translation(success_message_key))
       , (response) ->
         if response.data.error?
           StatusMessage.display("failure", response.data.error)
+
+    $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/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

@@ -0,0 +1,30 @@
+angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($compile, $templateCache, DialogDefaults, $timeout) ->
+  restrict: 'A'
+  scope: true
+
+  link: (scope, element, attr) ->
+    # This file input click handler will hold the browser file input dialog and show a warning modal
+    scope.hold_file_input_and_show_warning_modal = (event) ->
+      event.preventDefault()
+      scope.template = $compile($templateCache.get('admin/modals/terms_and_conditions_warning.html'))(scope)
+      if scope.template.dialog
+        scope.template.dialog(DialogDefaults)
+        scope.template.dialog('open')
+      scope.$apply()
+
+    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')
+
+      # unbind warning modal handler and click file input again to open the browser file input dialog
+      element.unbind('click').trigger('click')
+      # afterwards, bind warning modal handler again so that the warning is shown the next time
+      $timeout ->
+        element.bind 'click', scope.hold_file_input_and_show_warning_modal
+      return
+
+    scope.close = ->
+      scope.template.dialog('close')
+      return

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

@@ -1,2 +1,2 @@
 angular.module("admin.indexUtils", ['admin.resources', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
-  $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content");
+  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

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

@@ -16,7 +16,7 @@ angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) ->
     fetchPages: (url, page, pageCallback) ->
       dataFetcher(@urlForPage(url, page)).then (data) =>
         @page++
-        @last_page = data.pages
+        @last_page = data.pagination.pages
 
         pageCallback(data) if pageCallback
 

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

@@ -1,5 +1,5 @@
 angular.module("admin.indexUtils").factory "resources", ($resource) ->
-  LineItem = $resource '/api/orders/:order_number/line_items/:line_item_id.json',
+  LineItem = $resource '/api/v0/orders/:order_number/line_items/:line_item_id.json',
     { order_number: '@order_number', line_item_id: '@line_item_id'},
     'update': { method: 'PUT' }
   Customer = $resource '/admin/customers/:customer_id.json',

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

@@ -3,9 +3,11 @@ angular.module("admin.indexUtils").factory 'SortOptions', ->
     predicate: ""
     reverse: true
 
-    getSortingExpr: () ->
-      sortingExpr = this.predicate + ' desc' if this.reverse
-      sortingExpr = this.predicate + ' asc' if !this.reverse
+    getSortingExpr: (options) ->
+      defaultDirection = if (options && options.defaultDirection) then options.defaultDirection else "desc"
+      reverseDirection = if defaultDirection == "desc" then "asc" else "desc"
+      sortingExpr = this.predicate + ' ' + defaultDirection if this.reverse
+      sortingExpr = this.predicate + ' ' + reverseDirection if !this.reverse
       sortingExpr
 
     toggle: (predicate) ->

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,
@@ -127,12 +129,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.selectedUnitsVariant = unitsVariant
 
   $scope.sumUnitValues = ->
-    sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
+    sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
       sum + lineItem.final_weight_volume
     , 0
 
   $scope.sumMaxUnitValues = ->
-    sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
+    sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
         sum + lineItem.max_quantity * lineItem.units_variant.unit_value
     , 0
 

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/order_cycles.js.erb.coffee

@@ -1,30 +1,20 @@
 angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.enterprises'])
-
-  .config ($httpProvider) ->
-    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
-
   .directive 'datetimepicker', ($timeout, $parse) ->
     require: "ngModel"
     link: (scope, element, attrs, ngModel) ->
       $timeout ->
-        # using $parse instead of scope[attrs.datetimepicker] for cases
-        # where attrs.datetimepicker is 'foo.bar.lol'
-        $(element).datetimepicker
-          dateFormat: 'yy-mm-dd'
-          timeFormat: 'HH:mm'
-          showOn: 'button'
-          controlType: 'select'
-          oneLine: true
-          buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
-          buttonImageOnly: true
-          stepMinute: 15
-          onSelect: (dateText, inst) ->
-            scope.$apply(->
-              element.val(dateText)
-              parsed = $parse(attrs.datetimepicker)
-              parsed.assign(scope, dateText)
-            )
-
+        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/exchange_product.js.coffee

@@ -1,5 +1,5 @@
 angular.module('admin.orderCycles').factory('ExchangeProduct', ($resource) ->
-  ExchangeProductResource = $resource('/api/exchanges/:exchange_id/products.json', {}, {
+  ExchangeProductResource = $resource('/api/v0/exchanges/:exchange_id/products.json', {}, {
     'index': { method: 'GET' }
     'variant_count': { method: 'GET', params: { action_name: "variant_count" }}
   })

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/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/product_import/product_import.js.coffee

@@ -1,3 +1,2 @@
 angular.module("admin.productImport", ["ngResource"]).config ($httpProvider) ->
-  $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

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

@@ -9,7 +9,7 @@ angular.module("admin.products").controller "editUnitsCtrl", ($scope, VariantUni
   if $scope.product.variant_unit == 'items'
     $scope.variant_unit_with_scale = 'items'
   else
-    $scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale
+    $scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale.replace(/\.0$/, '');
 
   $scope.setFields = ->
     if $scope.variant_unit_with_scale == 'items'

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

@@ -1,12 +1,13 @@
 angular.module("admin.products")
-  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer) ->
+  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
     $scope.product = { master: {} }
     $scope.product.master.product = $scope.product
     $scope.placeholder_text = ""
 
-    $scope.$watchCollection '[product.variant_unit_with_scale, product.master.unit_value_with_description]', ->
+    $scope.$watchCollection '[product.variant_unit_with_scale, product.master.unit_value_with_description, product.price, product.variant_unit_name]', ->
       $scope.processVariantUnitWithScale()
       $scope.processUnitValueWithDescription()
+      $scope.processUnitPrice()
       $scope.placeholder_text = new OptionValueNamer($scope.product.master).name()
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
@@ -25,13 +26,21 @@ angular.module("admin.products")
 
     $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]
 
+    $scope.processUnitPrice = ->
+      price = $scope.product.price
+      scale = $scope.product.variant_unit_scale
+      unit_type = $scope.product.variant_unit
+      unit_value = $scope.product.master.unit_value
+      variant_unit_name = $scope.product.variant_unit_name
+      $scope.unit_price = UnitPrices.displayableUnitPrice(price, scale, unit_type, unit_value, variant_unit_name)
+
     $scope.hasVariants = (product) ->
       Object.keys(product.variants).length > 0
 

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

@@ -1,14 +1,32 @@
-angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout) ->
+angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices, PriceParser) ->
 
   $scope.unitName = (scale, type) ->
     VariantUnitManager.getUnitName(scale, type)
 
+  $scope.$watchCollection "[unit_value_human, variant.price]", ->
+    $scope.processUnitPrice()
+  
+  $scope.processUnitPrice = ->
+    if ($scope.variant)
+      price = $scope.variant.price
+      scale = $scope.scale
+      unit_type = angular.element("#product_variant_unit").val()
+      if (unit_type != "items")
+        $scope.updateValue()
+        unit_value = $scope.unit_value
+      else 
+        unit_value = 1
+      variant_unit_name = angular.element("#product_variant_unit_name").val()
+      $scope.unit_price = UnitPrices.displayableUnitPrice(price, scale, unit_type, unit_value, variant_unit_name)
+
   $scope.scale = angular.element('#product_variant_unit_scale').val()
 
   $scope.updateValue = ->
     unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = 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
+
+  $timeout -> $scope.processUnitPrice()
   $timeout -> $scope.updateValue()

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

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

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

@@ -53,17 +53,18 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       [value, unit_name]
 
     scale_for_unit_value: ->
-      # Find the largest available unit where unit_value comes to >= 1 when expressed in it.
-      # If there is none available where this is true, use the smallest available unit.
-      unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit] when @variant.unit_value / scale >= 1).reduce (unit, [scale, unit_name]) ->
-        if (unit && scale > unit[0]) || !unit?
-          [scale, unit_name]
-        else
-          unit
-      , null
-      if !unit?
-        unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit]).reduce (unit, [scale, unit_name]) ->
-          if scale < unit[0] then [scale, unit_name] else unit
-        , [Infinity,""]
+      # Find the largest available and compatible unit where unit_value comes
+      # to >= 1 when expressed in it.
+      # If there is none available where this is true, use the smallest
+      # available unit.
+      product = @variant.product
+      scales = VariantUnitManager.compatibleUnitScales(product.variant_unit_scale, product.variant_unit)
+      variantUnitValue = @variant.unit_value
 
-      unit
+      # sets largestScale = last element in filtered scales array
+      [_, ..., largestScale] = (scales.filter (s) -> variantUnitValue / s >= 1)
+
+      if (largestScale)
+        [largestScale, VariantUnitManager.getUnitName(largestScale, product.variant_unit)]
+      else
+        [scales[0], VariantUnitManager.getUnitName(scales[0], product.variant_unit)]

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

@@ -8,7 +8,7 @@ angular.module("ofn.admin").factory "ProductImageService", (FileUploader, SpreeA
       autoUpload: true
 
     configure: (product) =>
-      @imageUploader.url = "/api/product_images/#{product.id}"
+      @imageUploader.url = "/api/v0/product_images/#{product.id}"
       @imagePreview = product.image_url
       @imageUploader.onSuccessItem = (image, response) =>
         product.thumb_url = response.thumb_url

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

@@ -0,0 +1,33 @@
+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)
+        return value + " / " + unit
+      return null
+
+    @price: (price, scale, unit_type, unit_value) ->
+      price / @denominator(scale, unit_type, unit_value)
+
+    @denominator: (scale, unit_type, unit_value) ->
+      unit = @unit(scale, unit_type)
+      if unit == "lb"
+        unit_value / 453.6
+      else if unit == "kg"
+        unit_value / 1000
+      else
+        unit_value
+
+    @unit: (scale, unit_type, variant_unit_name = '') ->
+      if variant_unit_name.length > 0
+        variant_unit_name
+      else if unit_type == "items"
+        "item"
+      else if VariantUnitManager.systemOfMeasurement(scale, unit_type) == "imperial"
+        "lb"
+      else if unit_type == "weight"
+        "kg"
+      else if unit_type == "volume"
+        "L"

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

@@ -1,22 +1,41 @@
-angular.module("admin.products").factory "VariantUnitManager", ->
+angular.module("admin.products").factory "VariantUnitManager", (availableUnits) ->
   class VariantUnitManager
-    @unitNames:
+    @units:
       'weight':
-        1.0: 'g'
-        1000.0: 'kg'
-        1000000.0: 'T'
+        1.0:
+          name: 'g'
+          system: 'metric'
+        1000.0:
+          name: 'kg'
+          system: 'metric'
+        1000000.0:
+          name: 'T'
+          system: 'metric'
+        453.6:
+          name: 'lb'
+          system: 'imperial'
+        28.35:
+          name: 'oz'
+          system: 'imperial'
       'volume':
-        0.001: 'mL'
-        1.0: 'L'
-        1000.0: 'kL'
+        0.001:
+          name: 'mL'
+          system: 'metric'
+        1.0:
+          name: 'L'
+          system: 'metric'
+        1000.0:
+          name: 'kL'
+          system: 'metric'
 
     @variantUnitOptions: ->
-      options = for unit_type, scale_with_name of @unitNames
-        for scale in @unitScales(unit_type)
+      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}"]
       options.push [[I18n.t('items'), 'items']]
-      [].concat options...
+      options = [].concat options...
 
     @getScale: (value, unitType) ->
       scaledValue = null
@@ -30,7 +49,27 @@ angular.module("admin.products").factory "VariantUnitManager", ->
         unitScales[0]
 
     @getUnitName: (scale, unitType) ->
-      @unitNames[unitType][scale]
+      if @units[unitType][scale]
+        @units[unitType][scale]['name']
+      else
+        ''
 
-    @unitScales: (unitType) ->
-      (parseFloat(scale) for scale in Object.keys(@unitNames[unitType])).sort()
+    @unitScales: (unitType, availableUnits = null) ->
+      scales = Object.keys(@units[unitType])
+      if availableUnits
+        scales = scales.filter (scale) ->
+          availableUnits.includes(VariantUnitManager.getUnitName(scale, unitType))
+
+      (parseFloat(scale) for scale in scales).sort (a, b) ->
+         a - b
+
+    @compatibleUnitScales: (scale, unitType) ->
+      scaleSystem = @units[unitType][scale]['system']
+      (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem).sort (a, b) ->
+         a - b
+
+    @systemOfMeasurement: (scale, unitType) ->
+      if @units[unitType][scale]
+        @units[unitType][scale]['system']
+      else
+        'custom'

app/assets/javascripts/admin/resources/resources/enterprise_resource.js.coffee

@@ -9,9 +9,12 @@ angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
     'update':
       method: 'PUT'
     'removeLogo':
-      url: '/api/enterprises/:id/logo.json'
+      url: '/api/v0/enterprises/:id/logo.json'
       method: 'DELETE'
     'removePromoImage':
-      url: '/api/enterprises/:id/promo_image.json'
+      url: '/api/v0/enterprises/:id/promo_image.json'
+      method: 'DELETE'
+    'removeTermsAndConditions':
+      url: '/api/v0/enterprises/:id/terms_and_conditions.json'
       method: 'DELETE'
   })

app/assets/javascripts/admin/resources/resources/order_resource.js.coffee

@@ -1,17 +1,17 @@
 angular.module("admin.resources").factory 'OrderResource', ($resource) ->
   $resource('/admin/orders/:id/:action.json', {}, {
     'index':
-      url: '/api/orders.json'
+      url: '/api/v0/orders.json'
       method: 'GET'
     'update':
       method: 'PUT'
     'capture':
-      url: '/api/orders/:id/capture.json'
+      url: '/api/v0/orders/:id/capture.json'
       method: 'PUT'
       params:
         id: '@id'
     'ship':
-      url: '/api/orders/:id/ship.json'
+      url: '/api/v0/orders/:id/ship.json'
       method: 'PUT'
       params:
         id: '@id'

app/assets/javascripts/admin/resources/resources/product_resource.js.coffee

@@ -1,6 +1,6 @@
 angular.module("admin.resources").factory 'ProductResource', ($resource) ->
   $resource('/admin/product/:id/:action.json', {}, {
     'index':
-      url: '/api/products/bulk_products.json'
+      url: '/api/v0/products/bulk_products.json'
       method: 'GET'
   })

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,5 +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/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/products/" + product.id + "/clone").success (data) =>
-        dataFetcher("/api/products/" + data.id + "?template=bulk_show").then (newProduct) =>
+      $http.post("/api/v0/products/" + product.id + "/clone").success (data) =>
+        dataFetcher("/api/v0/products/" + data.id + "?template=bulk_show").then (newProduct) =>
           @unpackProduct newProduct
           @insertProductAfter(product, newProduct)
 

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/services/product_filters.js.coffee

@@ -0,0 +1,23 @@
+angular.module("ofn.admin").factory "ProductFiltersUrl", ($httpParamSerializer) ->
+  new class ProductFiltersUrl
+    productFilters: ['producerFilter', 'categoryFilter', 'query', 'sorting', 'importDateFilter']
+
+    loadFromUrl: (filters) ->
+      loadedFilters = {}
+      for filter in @productFilters
+        loadedFilters[filter] = if filters[filter] then filters[filter] else ""
+
+      loadedFilters
+
+    generate: (ctrlFilters) ->
+      filters = {}
+      for filter in @productFilters
+        filters[filter] = ctrlFilters[filter] if ctrlFilters[filter]
+
+      filters
+
+    buildUrl: (baseUrl, ctrlFilters) ->
+      filterUrl = $httpParamSerializer(@generate(ctrlFilters))
+      filterUrl = "?#{filterUrl}" if filterUrl isnt ""
+
+      "#{baseUrl}#{filterUrl}"

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

@@ -1,5 +1,4 @@
 //= require_self
-//= require admin/handlebar_extensions
 //= require admin/spree/orders/variant_autocomplete
 
 /**
@@ -9,27 +8,10 @@ Hopefully, this will evolve into a propper class.
 **/
 
 jQuery(function($) {
-  // Make main menu use full width
-  mainMenu = $('.fullwidth-menu')
-  if (typeof mainMenu.horizontalNav === 'function' )
-    mainMenu.horizontalNav({
-      tableDisplay: false,
-      responsiveDelay: 0
-    });
-
   // Vertical align of checkbox fields
   if (typeof $('.field.checkbox label').vAlign === 'function' )
     $('.field.checkbox label').vAlign()
 
-  // We activate AdaptiveMenu only if not on webdriver
-  // Re-adjusting the admin menu during tests causes tests to fail.
-  if (!navigator.webdriver && typeof Spree !== 'undefined') {
-    $('.main-menu-wrapper ul').AdaptiveMenu({
-      text: "<a href='#'><i class='icon-chevron-down'></i> " + Spree.translations.more + "</a>",
-      klass: "dropdown"
-    });
-  }
-
   // Add some tips
   if (typeof $('.with-tip').powerTip === 'function' ) {
     $('.with-tip').powerTip({
@@ -116,30 +98,6 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined') {
-    handle_date_picker_fields = function(){
-      $('.datepicker').datepicker({
-        dateFormat: Spree.translations.date_picker,
-        dayNames: Spree.translations.abbr_day_names,
-        dayNamesMin: Spree.translations.abbr_day_names,
-        monthNames: Spree.translations.month_names,
-        prevText: Spree.translations.previous,
-        nextText: Spree.translations.next,
-        showOn: "focus"
-      });
-
-      // Correctly display range dates
-      $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
-        $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );
-      });
-      $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function(selectedDate) {
-        $(".date-range-filter .datepicker-from" ).datepicker( "option", "maxDate", selectedDate );
-      });
-    }
-
-    handle_date_picker_fields();
-  }
-
   $(".observe_field").on('change', function() {
     target = $(this).attr("data-update");
     ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';

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);
     } else {
       $('div.calculator-settings').hide();
       $('.calculator-settings-warning').show();
-      $('.calculator-settings').find('input,texttarea').prop("disabled", true);
+      $('.calculator-settings').find('input,textarea').prop("disabled", true);
     }
   });
 })

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

@@ -0,0 +1,9 @@
+//= require handlebars
+
+Handlebars.registerHelper("t", function(key) {
+  if (Spree.translations[key]) {
+    return Spree.translations[key]
+  } else {
+    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
+  }
+});

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

@@ -1,59 +0,0 @@
-$(document).ready(function() {
-
-  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0) {
-    $('#s3_settings, #s3_headers').show();
-  }
-
-  // Toggle display of S3 settings based on value of use_s3 checkbox
-  $('input#preferences_use_s3[type="checkbox"]').click(function() {
-    $('#s3_settings, #s3_headers').toggle();
-  });
-
-  $(document).on('click', '.destroy_style', function(e) {
-    e.preventDefault();
-    $(this).parent().remove();
-  });
-
-  $(document).on('click', '.destroy_new_attachment_styles', function(e) {
-    e.preventDefault();
-    $(this).closest('.new_attachment_styles').remove();
-  });
-
-  $(document).on('click', '.destroy_new_s3_headers', function(e) {
-    e.preventDefault();
-    $(this).closest('.new_s3_headers').remove();
-  });
-
-  // Handle adding new styles
-  var styles_hash_index = 1;
-  $(document).on('click', '.add_new_style', function(e) {
-    e.preventDefault();
-    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
-  });
-
-  // Handle adding new headers
-  var headers_hash_index = 1;
-  $(document).on('click', '.add_header', function(e) {
-    e.preventDefault();
-    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
-  });
-
-  // Generates html for new paperclip styles form fields
-  generate_html_for_hash = function(hash_name, index) {
-    var html = '<div class="' + hash_name + ' row"><div class="field">';
-    html += '<div class="five columns">';
-    html += '<label for="' + hash_name + '_' + index + '_name">';
-    html += Spree.translations.name + '</label>';
-    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
-    html += '</div><div class="five columns">'
-    html += '<label for="' + hash_name + '_' + index + '_value">';
-    html += Spree.translations.value + '</label>';
-    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
-    html += '</div><div class="two columns">'
-    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
-    html += '</div></div></div>';
-
-    index += 1;
-    return html;
-  };
-});

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

@@ -1,27 +1,17 @@
 var update_state = function(region) {
   var country        = $('span#' + region + 'country .select2').select2('val');
-
   var state_select   = $('span#' + region + 'state select.select2');
-  var state_input    = $('span#' + region + 'state input.state_name');
 
-  $.get(Spree.routes.states_search + "?country_id=" + country, function(data) {
-    var states = data["states"]
-    if (states.length > 0) {
-      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();
-      state_input.hide().prop("disabled", true);
-
-    } else {
-      state_input.prop("disabled", false).show();
-      state_select.select2('destroy').hide();
-    }
+  $.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/use_billing.js

@@ -0,0 +1,17 @@
+$(document).ready(function() {
+  var order_use_billing_input = $('input#order_use_billing');
+
+  var order_use_billing = function () {
+    if (!order_use_billing_input.is(':checked')) {
+      $('#shipping').show();
+    } else {
+      $('#shipping').hide();
+    }
+  };
+
+  order_use_billing_input.click(function() {
+    order_use_billing();
+  });
+
+  order_use_billing();
+});

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

@@ -40,7 +40,13 @@ $(document).ready(function() {
       var variant_id = save.data('variant-id');
 
       var quantity = parseInt(save.parents('tr').find('input.line_item_quantity').val());
+      var maxQuantity = parseInt(save.parents('tr').find('input.line_item_quantity').attr("max"));
 
+      if (quantity > maxQuantity) {
+        quantity = maxQuantity;
+        save.parents('tr').find('input.line_item_quantity').val(maxQuantity);
+        alert(t("js.admin.orders.quantity_adjusted"));
+      }
       toggleItemEdit();
 
       adjustItems(shipment_number, variant_id, quantity);
@@ -77,7 +83,9 @@ adjustItems = function(shipment_number, variant_id, quantity){
     }
     url += '.json';
 
-    if(new_quantity!=0){
+    if (new_quantity == 0) {
+      alert(t("js.admin.orders.quantity_unchanged"));
+    } else {
       $.ajax({
         type: "PUT",
         url: Spree.url(url),

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

@@ -0,0 +1,13 @@
+#= 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)
+    if Spree.api_key
+      uri.addQueryParam('token', Spree.api_key)
+    return uri

app/assets/javascripts/admin/spree_paypal_express.js

@@ -0,0 +1,17 @@
+//= 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/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -23,8 +23,6 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         preferred_customer_tags: (tag.text for tag in tagGroup.tags).join(",")
         type: "TagRule::#{ruleType}"
     switch ruleType
-      when "DiscountOrder"
-        newRule.calculator = { preferred_flat_percent: 0 }
       when "FilterShippingMethods"
         newRule.peferred_shipping_method_tags = []
         newRule.preferred_matched_shipping_methods_visibility = "visible"

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

@@ -8,7 +8,6 @@ angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templ
     template = $compile($templateCache.get('admin/new_tag_rule_dialog.html'))(scope)
 
     scope.ruleTypes = [
-      # { id: "DiscountOrder", name: 'Apply a discount to orders' }
       { id: "FilterProducts", name: t('js.tag_rules.show_hide_variants') }
       { id: "FilterShippingMethods", name: t('js.tag_rules.show_hide_shipping') }
       { id: "FilterPaymentMethods", name: t('js.tag_rules.show_hide_payment') }

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/util.js.erb

@@ -1,22 +1,51 @@
 $(document).ready(function() {
-  $('.datetimepicker').datetimepicker({
-    dateFormat: 'yy-mm-dd',
-    timeFormat: 'HH:mm',
-    dayNames: Spree.translations.abbr_day_names,
-    dayNamesMin: Spree.translations.abbr_day_names,
-    monthNames: Spree.translations.month_names,
-    prevText: Spree.translations.previous,
-    nextText: Spree.translations.next,
-    showOn: 'button',
-    controlType: 'select',
-    oneLine: true,
-    buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
-    buttonImageOnly: true,
-    stepMinute: 15
-  });
-});
-
-$(document).ready(function(){
+  var onClickButtons = function(index, fp) {
+    var date;
+    switch (index) {
+      case 0:
+        date = new Date();
+        break;
+    }
+    fp.setDate(date, true);
+  }
+  window.FLATPICKR_DATE_DEFAULT = {
+    altInput: true,
+    altFormat: Spree.translations.flatpickr_date_format,
+    dateFormat: "Y-m-d",
+    locale: I18n.base_locale,
+    plugins: [
+        ShortcutButtonsPlugin({
+          button: [{
+            label: Spree.translations.today
+          }],
+          label: "or",
+          onClick: onClickButtons
+        }),
+        labelPlugin({})
+      ]
+  }
+  window.FLATPICKR_DATETIME_DEFAULT = Object.assign(
+    {},
+    window.FLATPICKR_DATE_DEFAULT,
+    {
+      altInput: true,
+      altFormat: Spree.translations.flatpickr_datetime_format,
+      dateFormat: "Y-m-d H:i",
+      enableTime: true,
+      time_24hr: true,
+      plugins: [
+        ShortcutButtonsPlugin({
+          button: [{
+            label: Spree.translations.now
+          }],
+          label: "or",
+          onClick: onClickButtons
+        }),
+        labelPlugin({})
+      ]
+    }
+  );
+  flatpickr(".datetimepicker", window.FLATPICKR_DATETIME_DEFAULT);
   $('a.close').click(function(event){
     event.preventDefault();
     $(this).parent().slideUp(250);

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

@@ -1,9 +1,14 @@
-angular.module("admin.utils").directive "datepicker", ->
+angular.module("admin.utils").directive "datepicker", ($window, $timeout) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
-    element.datepicker
-      dateFormat: "yy-mm-dd"
-      onSelect: (dateText, inst) ->
-        scope.$apply (scope) ->
-          # Fires ngModel.$parsers
-          ngModel.$setViewValue dateText
+    $timeout ->
+      flapickrInstance = flatpickr(element,  Object.assign(
+                            {},
+                            $window.FLATPICKR_DATE_DEFAULT, {
+                            onOpen: (selectedDates, dateStr, instance) ->
+                              instance.setDate(ngModel.$modelValue)
+                            }
+                          ));
+      ngModel.$render = () ->
+        newValue = ngModel.$viewValue;
+        flapickrInstance?.setDate(newValue)

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

@@ -3,6 +3,7 @@ angular.module("admin.utils").directive "ofnWithTip", ($sanitize)->
     element.attr('data-powertip', $sanitize(attrs.ofnWithTip))
     element.powerTip
       smartPlacement: true
+      placement: element.attr('powertip-location')
       fadeInTime: 50
       fadeOutTime: 50
       intentPollInterval: 300

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

@@ -0,0 +1,31 @@
+angular.module("admin.utils").factory 'AutocompleteSelect2', ($sanitize) ->
+  scope: true
+  autocomplete: (
+    multiple,
+    placeholder,
+    element,
+    findByID,
+    findByIDs,
+    findByTerm
+  ) ->
+    element.select2
+      placeholder: placeholder
+      multiple: multiple  
+      initSelection: (element, callback) ->
+        if multiple
+          callback findByIDs()
+        else
+          callback findByID()
+      query: (query) ->
+        query.callback { results: findByTerm(query.term) }
+      formatResult: (item) ->
+        $sanitize(item.name)
+      formatSelection: (item) ->
+        item.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")

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

@@ -0,0 +1,31 @@
+angular.module("admin.utils").factory "PriceParser", ->
+  new class PriceParser
+    parse: (price) =>
+      return null unless price
+      # used decimal and thousands separators from currency configuration
+      decimal_separator = I18n.toCurrency(.1, {precision: 1, unit: ''}).substring(1,2)
+      thousands_separator = I18n.toCurrency(1000, {precision: 1, unit: ''}).substring(1,2)
+      
+      # Replace comma used as a decimal separator and remplace by "."
+      price = this.replaceCommaByFinalPoint(price)
+
+      # Remove configured thousands separator if it is actually a thousands separator
+      price = this.removeThousandsSeparator(price, thousands_separator)
+
+      if (decimal_separator == ",")
+        price = price.replace(",", ".")
+
+      price = parseFloat(price)
+
+      return null if isNaN(price)
+
+      return price
+
+    replaceCommaByFinalPoint : (price) =>
+      if price.match(/^[0-9]*(,{1})[0-9]{1,2}$/g) then price.replace(",", ".") else price
+
+    removeThousandsSeparator : (price, thousands_separator) => 
+      if (new RegExp("^([0-9]*(" + thousands_separator + "{1})[0-9]{3}[0-9\.,]*)*$", "g").test(price))
+        price.replaceAll(thousands_separator, '')
+      else
+        price

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

@@ -1,11 +1,11 @@
-angular.module("admin.utils").factory "StatusMessage", ($timeout) ->
+angular.module("admin.utils").factory "StatusMessage", ->
   new class StatusMessage
     types:
-      progress: {timeout: false, style: {color: '#ff9906'}}
-      alert:    {timeout: 5000,  style: {color: 'grey'}}
-      notice:   {timeout: false, style: {color: 'grey'}}
-      success:  {timeout: 5000,  style: {color: '#9fc820'}}
-      failure:  {timeout: false, style: {color: '#da5354'}}
+      progress: {style: {color: '#ff9906'}}
+      alert:    {style: {color: 'grey'}}
+      notice:   {style: {color: 'grey'}}
+      success:  {style: {color: '#9fc820'}}
+      failure:  {style: {color: '#da5354'}}
 
     statusMessage:
       text: ""
@@ -25,13 +25,7 @@ angular.module("admin.utils").factory "StatusMessage", ($timeout) ->
     display: (type, text) ->
       @statusMessage.text = text
       @statusMessage.style = @types[type].style
-      $timeout.cancel @statusMessage.timeout  if @statusMessage.timeout
-      timeout = @types[type].timeout
-      if timeout
-        @statusMessage.timeout = $timeout =>
-          @clear()
-        , timeout, true
-      null # So we don't return weird timeouts
+      null
 
     clear: ->
       @statusMessage.text = ''

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

@@ -1 +1,2 @@
-angular.module("admin.utils", ["templates", "ngSanitize"]).config ($httpProvider) ->
+angular.module("admin.utils", ["templates", "ngSanitize"]).config ($httpProvider) ->
+ $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee

@@ -42,7 +42,7 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
     $scope.fetchProducts()
 
   $scope.fetchProducts = ->
-    url = "/api/products/overridable?page=::page::;per_page=100"
+    url = "/api/v0/products/overridable?page=::page::;per_page=100"
     PagedFetcher.fetch url, $scope.addProducts
 
   $scope.addProducts = (data) ->