Update translations

Use :harmony option with Uglifier when minimizing javascript

.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:

.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/codecov.yml

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

.github/workflows/build.yml

@@ -0,0 +1,326 @@
+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 all other tests
+        run: bundle exec rake ofn:specs:run:excluding_folders["models,controllers,serializers,features,lib,migrations"]
+
+  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

@@ -2,6 +2,9 @@
 .rbenv-version
 .python-version
 .byebug_history
+.env.local
+.env.development.local
+.env.test.local
 .swp
 *.swo
 *.swp
@@ -31,6 +34,7 @@ app/public
 public/system
 public/stylesheets
 public/images
+public/files
 public/spree
 public/assets
 config/abr.yml
@@ -45,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

.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,30 +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/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/markdown_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/orders_helper.rb
   - app/jobs/subscription_confirm_job.rb
@@ -50,110 +42,91 @@ 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/app_configuration.rb
-  - app/models/spree/gateway/stripe_connect.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/product.rb
-  - app/models/spree/user.rb
-  - app/models/spree/variant.rb
+  - app/models/spree/preferences/store.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
   - app/serializers/api/admin/subscription_line_item_serializer.rb
+  - app/serializers/api/admin/subscription_serializer.rb
   - app/services/cart_service.rb
   - app/services/checkout/post_checkout_actions.rb
-  - app/services/default_stock_location.rb
   - app/services/embedded_page_service.rb
   - app/services/order_cycle_form.rb
-  - app/services/order_factory.rb
+  - app/services/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/line_items.rb
   - lib/open_food_network/sales_tax_report.rb
   - lib/open_food_network/scope_variants_for_search.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/calculated_adjustments.rb
   - lib/spree/localized_number.rb
-  - lib/stripe/credit_card_clone_finder.rb
   - lib/tasks/data.rake
   - lib/tasks/enterprises.rake
   - spec/controllers/admin/bulk_line_items_controller_spec.rb
   - spec/controllers/admin/column_preferences_controller_spec.rb
-  - spec/controllers/admin/customers_controller_spec.rb
   - spec/controllers/admin/enterprises_controller_spec.rb
-  - spec/controllers/admin/inventory_items_controller_spec.rb
   - spec/controllers/admin/manager_invitations_controller_spec.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/admin/proxy_orders_controller_spec.rb
   - spec/controllers/admin/schedules_controller_spec.rb
   - spec/controllers/admin/stripe_accounts_controller_spec.rb
   - spec/controllers/admin/stripe_connect_settings_controller_spec.rb
   - spec/controllers/admin/subscription_line_items_controller_spec.rb
   - spec/controllers/admin/subscriptions_controller_spec.rb
   - spec/controllers/admin/variant_overrides_controller_spec.rb
-  - spec/controllers/api/base_controller_spec.rb
-  - spec/controllers/api/exchange_products_controller_spec.rb
-  - spec/controllers/api/logos_controller_spec.rb
-  - spec/controllers/api/order_cycles_controller_spec.rb
-  - spec/controllers/api/orders_controller_spec.rb
-  - spec/controllers/api/product_images_controller_spec.rb
-  - spec/controllers/api/products_controller_spec.rb
-  - spec/controllers/api/promo_images_controller_spec.rb
-  - spec/controllers/api/states_controller_spec.rb
-  - spec/controllers/api/terms_and_conditions_controller_spec.rb
-  - spec/controllers/api/variants_controller_spec.rb
+  - spec/controllers/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/line_item_factory.rb
-  - spec/factories/order_factory.rb
-  - spec/factories/shipment_factory.rb
   - spec/factories/stock_location_factory.rb
-  - spec/factories/user_factory.rb
   - spec/features/admin/adjustments_spec.rb
   - spec/features/admin/bulk_order_management_spec.rb
   - spec/features/admin/bulk_product_update_spec.rb
@@ -161,13 +134,10 @@ Layout/LineLength:
   - spec/features/admin/customers_spec.rb
   - spec/features/admin/enterprise_fees_spec.rb
   - spec/features/admin/enterprise_relationships_spec.rb
-  - spec/features/admin/enterprise_roles_spec.rb
   - spec/features/admin/enterprises/images_spec.rb
   - spec/features/admin/enterprises/index_spec.rb
   - spec/features/admin/enterprises_spec.rb
-  - spec/features/admin/enterprise_user_spec.rb
   - spec/features/admin/multilingual_spec.rb
-  - spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
   - spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
   - spec/features/admin/order_cycles/complex_editing_spec.rb
   - spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
@@ -176,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
@@ -185,77 +156,49 @@ 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/darkswarm_caching_spec.rb
   - spec/features/consumer/caching/shops_caching_spec.rb
-  - spec/features/consumer/groups_spec.rb
   - spec/features/consumer/multilingual_spec.rb
-  - spec/features/consumer/producers_spec.rb
-  - spec/features/consumer/registration_spec.rb
   - spec/features/consumer/shopping/cart_spec.rb
   - spec/features/consumer/shopping/checkout_auth_spec.rb
   - spec/features/consumer/shopping/checkout_spec.rb
   - spec/features/consumer/shopping/checkout_stripe_spec.rb
-  - spec/features/consumer/shopping/embedded_groups_spec.rb
   - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
-  - spec/features/consumer/shopping/orders_spec.rb
   - spec/features/consumer/shopping/products_spec.rb
   - spec/features/consumer/shopping/shopping_spec.rb
+  - spec/features/consumer/shopping/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/customers_report_spec.rb
-  - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
   - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
   - spec/lib/open_food_network/group_buy_report_spec.rb
-  - spec/lib/open_food_network/lettuce_share_report_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+  - spec/lib/open_food_network/order_cycle_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/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/spree/core/calculated_adjustments_spec.rb
-  - spec/lib/stripe/account_connector_spec.rb
-  - spec/lib/stripe/webhook_handler_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/flexi_rate_spec.rb
-  - spec/models/calculator/price_sack_spec.rb
-  - spec/models/calculator/weight_spec.rb
-  - spec/models/column_preference_spec.rb
   - spec/models/concerns/order_shipment_spec.rb
   - spec/models/concerns/product_stock_spec.rb
-  - spec/models/customer_spec.rb
-  - spec/models/enterprise_caching_spec.rb
-  - spec/models/enterprise_fee_spec.rb
   - spec/models/enterprise_group_spec.rb
   - spec/models/enterprise_relationship_spec.rb
   - spec/models/enterprise_spec.rb
   - spec/models/exchange_spec.rb
   - spec/models/order_cycle_spec.rb
   - spec/models/product_importer_spec.rb
-  - spec/models/product_import/reset_absent_spec.rb
-  - spec/models/proxy_order_spec.rb
   - spec/models/spree/ability_spec.rb
   - spec/models/spree/address_spec.rb
   - spec/models/spree/adjustment_spec.rb
@@ -266,63 +209,44 @@ Layout/LineLength:
   - spec/models/spree/order/checkout_spec.rb
   - spec/models/spree/order_inventory_spec.rb
   - spec/models/spree/order_spec.rb
-  - spec/models/spree/order/state_machine_spec.rb
   - spec/models/spree/payment_method_spec.rb
   - spec/models/spree/payment_spec.rb
-  - spec/models/spree/product_set_spec.rb
   - spec/models/spree/product_spec.rb
-  - spec/models/spree/return_authorization_spec.rb
   - spec/models/spree/shipping_method_spec.rb
-  - spec/models/spree/stock_item_spec.rb
-  - spec/models/spree/taxon_spec.rb
   - spec/models/spree/tax_rate_spec.rb
   - spec/models/spree/user_spec.rb
   - spec/models/spree/variant_spec.rb
-  - spec/models/stripe_account_spec.rb
-  - spec/models/tag_rule/discount_order_spec.rb
   - spec/models/tag_rule/filter_order_cycles_spec.rb
   - spec/models/tag_rule/filter_payment_methods_spec.rb
   - spec/models/tag_rule/filter_products_spec.rb
   - spec/models/tag_rule/filter_shipping_methods_spec.rb
+  - spec/models/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/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/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/services/variant_units/option_value_namer_spec.rb
-  - spec/spec_helper.rb
   - spec/support/cancan_helper.rb
-  - spec/support/delayed_job_helper.rb
-  - spec/support/matchers/delegate_matchers.rb
+  - spec/support/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
 
@@ -336,19 +260,23 @@ Metrics/AbcSize:
   - 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/application_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/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
@@ -357,14 +285,14 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/search_controller.rb
+  - app/controllers/spree/admin/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_decorator.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
@@ -376,21 +304,26 @@ Metrics/AbcSize:
   - 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/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.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_contents.rb
   - app/models/spree/order_inventory.rb
   - app/models/spree/order.rb
   - app/models/spree/payment/processing.rb
@@ -405,13 +338,18 @@ Metrics/AbcSize:
   - app/models/spree/tax_rate.rb
   - app/models/spree/variant.rb
   - app/models/spree/zone.rb
-  - app/serializers/api/product_serializer.rb
+  - app/serializers/api/admin/enterprise_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/sets/model_set.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
@@ -419,11 +357,12 @@ Metrics/AbcSize:
   - 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/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
@@ -431,6 +370,7 @@ Metrics/AbcSize:
   - 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
@@ -442,15 +382,18 @@ Metrics/AbcSize:
   - 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/spree/money.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
@@ -468,7 +411,7 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Max: 25
-  ExcludedMethods: [
+  IgnoredMethods: [
     "class_eval",
     "collection",
     "context",
@@ -484,13 +427,13 @@ Metrics/BlockLength:
   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
@@ -501,12 +444,13 @@ Metrics/BlockLength:
   - 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
@@ -516,7 +460,12 @@ Metrics/CyclomaticComplexity:
   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/order_cycles_helper.rb
@@ -524,66 +473,88 @@ Metrics/CyclomaticComplexity:
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.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/payment_method.rb
+  - app/models/spree/order_inventory.rb
   - app/models/spree/payment.rb
   - app/models/spree/preference.rb
-  - app/models/spree/preferences/preferable.rb
   - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/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
-  - app/services/sets/variant_override_set.rb
   - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/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/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/order_cycles_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/enterprise_relationship.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.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/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
@@ -593,11 +564,11 @@ Metrics/MethodLength:
   - 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/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -611,7 +582,7 @@ Metrics/MethodLength:
   - app/controllers/spree/admin/variants_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
+  - app/controllers/spree/paypal_controller.rb
   - app/controllers/spree/user_sessions_controller.rb
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
@@ -622,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
@@ -633,28 +605,30 @@ Metrics/MethodLength:
   - 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_method.rb
   - app/models/spree/payment/processing.rb
   - app/models/spree/preference.rb
   - app/models/spree/preferences/preferable_class_methods.rb
   - app/models/spree/preferences/preferable.rb
   - app/models/spree/preferences/store.rb
   - app/models/spree/product.rb
-  - app/models/spree/product_decorator.rb
   - app/models/spree/return_authorization.rb
   - app/models/spree/shipment.rb
   - app/models/spree/taxon.rb
   - app/models/spree/tax_rate.rb
-  - app/models/spree/variant.rb
   - app/models/spree/zone.rb
   - app/serializers/api/admin/order_cycle_serializer.rb
   - app/serializers/api/cached_enterprise_serializer.rb
+  - app/services/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
@@ -680,7 +654,6 @@ 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/line_items.rb
   - lib/open_food_network/sales_tax_report.rb
   - lib/open_food_network/users_and_enterprises_report.rb
@@ -706,20 +679,23 @@ Metrics/MethodLength:
 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/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
@@ -734,12 +710,15 @@ Metrics/ClassLength:
   - 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
@@ -760,19 +739,19 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.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/validator_spec.rb
   - lib/open_food_network/column_preference_defaults.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
-  - spec/controllers/api/orders_controller_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
   - spec/lib/open_food_network/order_cycle_permissions_spec.rb
   - spec/models/spree/adjustment_spec.rb
-  - spec/models/spree/credit_card_spec.rb
   - spec/models/spree/line_item_spec.rb
   - spec/models/spree/product_spec.rb
+  - spec/models/spree/tax_rate_spec.rb
   - spec/models/spree/variant_spec.rb
 
 Metrics/ParameterLists:
@@ -782,9 +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/taxon.rb'
-  - 'lib/spree/core/controller_helpers/common.rb'
+  - 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_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/**/*'
@@ -183,7 +182,7 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Max: 25
-  ExcludedMethods: [
+  IgnoredMethods: [
     "class_eval",
     "collection",
     "context",
@@ -217,3 +216,6 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Max: 7
+
+Naming/PredicateName:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.4.4
+2.7.3

.simplecov

@@ -1,8 +1,5 @@
-# frozen_string_literal: true
+#!/bin/env ruby
 
-require 'simplecov'
-
-SimpleCov.minimum_coverage 54
 SimpleCov.start 'rails' do
   add_filter '/bin/'
   add_filter '/config/'
@@ -16,4 +13,10 @@ SimpleCov.start 'rails' do
   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`,
+  },
+};

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

Dockerfile

@@ -7,23 +7,39 @@ 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.3
 

GETTING_STARTED.md

@@ -6,12 +6,14 @@ This is a general guide to setting up an Open Food Network **development environ
 
 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,52 +1,31 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "2.4.4"
+ruby "2.7.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-plugin 'bootboot', '~> 0.1.1' unless Bundler.settings[:frozen]
-Plugin.__send__(:load_plugin, 'bootboot') if Plugin.installed?('bootboot')
+gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
-if ENV['DEPENDENCIES_NEXT']
-  enable_dual_booting if Plugin.installed?('bootboot')
+gem 'rails', '~> 6.1.4'
 
-  # This will only be loaded when running
-  # bundler command prefixed with `DEPENDENCIES_NEXT=1
-  gem 'rails', '> 5.0', '< 5.1'
-
-  gem 'activemerchant', '>= 1.78.0'
-  gem 'angular-rails-templates', '>= 0.3.0'
-  gem 'awesome_nested_set'
-  gem 'ransack', '2.3.0'
-  gem 'responders'
-  gem 'sass', '<= 4.7.1'
-  gem 'sass-rails', '< 6.0.0'
-  gem 'libv8', '< 8'
-else
-  gem 'rails', '~> 4.2'
-
-  gem 'activemerchant', '~> 1.78.0'
-  gem 'angular-rails-templates', '~> 0.3.0'
-  gem 'awesome_nested_set', '~> 3.3.1'
-  gem 'ransack', '~> 1.8.10'
-  gem 'responders', '~> 2.0'
-  gem 'sass'
-  gem 'sass-rails'
-
-  gem 'db2fog'
-  gem 'unicorn'
-
-  group :test do
-    gem 'test_after_commit' # needed to test Devise callbacks
-  end
-end
+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.8.0'
+gem 'i18n-js', '~> 3.8.3'
 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'
@@ -54,14 +33,14 @@ 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'
 
-gem 'acts_as_list', '0.9.19'
-gem 'cancancan', '~> 1.7.0'
+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.10'
+gem 'monetize', '~> 1.11'
 gem 'paranoia', '~> 2.4'
 gem 'state_machines-activerecord'
 gem 'stringex', '~> 2.8.5'
@@ -73,13 +52,9 @@ gem 'devise'
 gem 'devise-encryptable'
 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'
-
-gem 'kaminari', '~> 1.2.1'
+gem 'pagy', '~> 4.8'
 
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
@@ -93,18 +68,25 @@ gem 'actionpack-action_caching'
 #   AMS is deprecated, we will introduce an alternative at some point
 gem "active_model_serializers", "0.8.4"
 gem 'activerecord-session_store'
-gem 'acts-as-taggable-on', '~> 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 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
-gem 'paper_trail', '~> 10.3.1'
+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 'hiredis'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'sidekiq'
+gem 'sidekiq-scheduler'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -117,10 +99,10 @@ gem 'whenever', require: false
 
 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'
 
@@ -132,10 +114,18 @@ gem 'foundation-rails', '= 5.5.2.1'
 gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-gem 'select2-rails', '~> 3.4.7'
+gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
+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'
@@ -143,11 +133,11 @@ end
 
 group :test, :development do
   # Pretty printed test output
-  gem 'atomic'
   gem 'awesome_print'
+  gem 'bullet'
   gem 'capybara'
   gem 'database_cleaner', require: false
-  gem "factory_bot_rails", '5.2.0', require: false
+  gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
   gem 'knapsack'
@@ -163,6 +153,10 @@ group :test, :development do
 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'
@@ -171,19 +165,17 @@ group :test do
 end
 
 group :development do
-  gem 'byebug'
   gem 'debugger-linecache'
-  gem 'pry'
-  gem 'pry-byebug'
+  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

Gemfile_next.lock

@@ -1,666 +0,0 @@
-GIT
-  remote: https://github.com/jeremydurham/custom-err-msg.git
-  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
-  specs:
-    custom_error_message (1.1.1)
-
-GIT
-  remote: https://github.com/openfoodfoundation/ofn-qz.git
-  revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b
-  branch: ofn-rails-4
-  specs:
-    ofn-qz (0.1.0)
-
-PATH
-  remote: engines/catalog
-  specs:
-    catalog (0.0.1)
-
-PATH
-  remote: engines/dfc_provider
-  specs:
-    dfc_provider (0.0.1)
-      active_model_serializers (~> 0.8.4)
-      jwt (~> 2.2)
-      rspec (~> 3.9)
-
-PATH
-  remote: engines/order_management
-  specs:
-    order_management (0.0.1)
-
-PATH
-  remote: engines/web
-  specs:
-    web (0.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionpack-action_caching (1.2.1)
-      actionpack (>= 4.0.0)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.8.4)
-      activemodel (>= 3.0)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      globalid (>= 0.3.6)
-    activemerchant (1.107.4)
-      activesupport (>= 4.2)
-      builder (>= 2.1.2, < 4.0.0)
-      i18n (>= 0.6.9)
-      nokogiri (~> 1.4)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activerecord-import (1.0.7)
-      activerecord (>= 3.2)
-    activerecord-postgresql-adapter (0.0.1)
-      pg
-    activerecord-session_store (1.1.3)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
-      multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0)
-    activesupport (5.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    acts-as-taggable-on (4.0.0)
-      activerecord (>= 4.0)
-    acts_as_list (0.9.19)
-      activerecord (>= 3.0)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    andand (1.3.3)
-    angular-rails-templates (1.1.0)
-      railties (>= 4.2, < 7)
-      sprockets (>= 3.0, < 5)
-      tilt
-    angular_rails_csrf (4.2.0)
-      railties (>= 3, < 7)
-    angularjs-file-upload-rails (2.4.1)
-    angularjs-rails (1.5.5)
-    arel (7.1.4)
-    ast (2.4.1)
-    atomic (1.1.101)
-    awesome_nested_set (3.2.1)
-      activerecord (>= 4.0.0, < 7.0)
-    awesome_print (1.8.0)
-    aws-sdk (1.67.0)
-      aws-sdk-v1 (= 1.67.0)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
-    bcrypt (3.1.16)
-    bugsnag (6.18.0)
-      concurrent-ruby (~> 1.0)
-    builder (3.2.4)
-    byebug (11.0.1)
-    cancancan (1.7.1)
-    capybara (3.15.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
-      xpath (~> 3.2)
-    childprocess (3.0.0)
-    chronic (0.10.2)
-    chunky_png (1.3.14)
-    climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.3)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    combine_pdf (1.0.19)
-      ruby-rc4 (>= 0.1.5)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    compass-rails (2.0.1)
-      compass (~> 1.0.0)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    crass (1.0.6)
-    css_parser (1.7.1)
-      addressable
-    daemons (1.3.1)
-    dalli (2.7.11)
-    database_cleaner (1.8.5)
-    ddtrace (0.43.0)
-      msgpack
-    debugger-linecache (1.2.0)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_active_record (4.1.4)
-      activerecord (>= 3.0, < 6.1)
-      delayed_job (>= 3.0, < 5)
-    delayed_job_web (1.4.3)
-      activerecord (> 3.0.0)
-      delayed_job (> 2.0.3)
-      rack-protection (>= 1.5.5)
-      sinatra (>= 1.4.4)
-    devise (4.7.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-    devise-encryptable (0.2.0)
-      devise (>= 2.1.0)
-    devise-token_authenticatable (1.1.0)
-      devise (>= 4.0.0, < 5.0.0)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    erubis (2.7.0)
-    eventmachine (1.2.7)
-    execjs (2.7.0)
-    factory_bot (5.2.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.2.0)
-      factory_bot (~> 5.2.0)
-      railties (>= 4.2.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    ffaker (2.11.0)
-    ffi (1.13.1)
-    figaro (1.2.0)
-      thor (>= 0.14.0, < 2)
-    foundation-icons-sass-rails (3.0.0)
-      railties (>= 3.1.1)
-      sass-rails (>= 3.1.1)
-    foundation-rails (5.5.2.1)
-      railties (>= 3.1.0)
-      sass (>= 3.3.0, < 3.5)
-    fuubar (2.5.1)
-      rspec-core (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    geocoder (1.6.4)
-    get_process_mem (0.2.7)
-      ffi (~> 1.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    gmaps4rails (2.1.2)
-    haml (5.2.0)
-      temple (>= 0.8.0)
-      tilt
-    hashdiff (1.0.1)
-    highline (2.0.3)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    i18n-js (3.8.0)
-      i18n (>= 0.6.6)
-    immigrant (0.3.6)
-      activerecord (>= 3.0)
-    jaro_winkler (1.5.4)
-    jquery-migrate-rails (1.2.1)
-    jquery-rails (4.4.0)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.1)
-      railties (>= 3.2.16)
-    json (1.8.6)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    json_spec (1.1.5)
-      multi_json (~> 1.0)
-      rspec (>= 2.0, < 4.0)
-    jwt (2.2.2)
-    kaminari (1.2.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
-      actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
-      activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
-    kgio (2.11.3)
-    knapsack (1.20.0)
-      rake
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    libv8 (7.3.492.27.1)
-    loofah (2.7.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    mini_racer (0.2.15)
-      libv8 (> 7.3)
-    minitest (5.14.2)
-    monetize (1.9.4)
-      money (~> 6.12)
-    money (6.13.8)
-      i18n (>= 0.6.4, <= 2)
-    msgpack (1.3.3)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    orm_adapter (0.5.0)
-    paper_trail (10.3.1)
-      activerecord (>= 4.2)
-      request_store (~> 1.1)
-    paperclip (3.4.2)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
-      mime-types
-    parallel (1.19.2)
-    paranoia (2.4.2)
-      activerecord (>= 4.0, < 6.1)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    paypal-sdk-core (0.2.10)
-      multi_json (~> 1.0)
-      xml-simple
-    paypal-sdk-merchant (1.106.1)
-      paypal-sdk-core (~> 0.2.3)
-    pg (0.21.0)
-    polyamorous (2.3.0)
-      activerecord (>= 5.0)
-    power_assert (1.2.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-mini-profiler (2.0.2)
-      rack (>= 1.2.0)
-    rack-protection (2.1.0)
-      rack
-    rack-rewrite (1.5.1)
-    rack-ssl (1.4.1)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    rails-i18n (5.1.3)
-      i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    rails_safe_tasks (1.0.0)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
-    raindrops (0.19.1)
-    rake (13.0.1)
-    ransack (2.3.0)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
-      i18n
-      polyamorous (= 2.3.0)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    redcarpet (3.5.0)
-    regexp_parser (1.8.2)
-    request_store (1.5.0)
-      rack (>= 1.4)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    rexml (3.2.4)
-    roadie (3.5.1)
-      css_parser (~> 1.4)
-      nokogiri (~> 1.8)
-    roadie-rails (1.3.0)
-      railties (>= 3.0, < 5.3)
-      roadie (~> 3.1)
-    roo (2.8.3)
-      nokogiri (~> 1)
-      rubyzip (>= 1.3.0, < 3.0.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (4.0.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
-    rspec-retry (0.6.2)
-      rspec-core (> 3.3)
-    rspec-support (3.10.0)
-    rswag (2.3.1)
-      rswag-api (= 2.3.1)
-      rswag-specs (= 2.3.1)
-      rswag-ui (= 2.3.1)
-    rswag-api (2.3.1)
-      railties (>= 3.1, < 7.0)
-    rswag-specs (2.3.1)
-      activesupport (>= 3.1, < 7.0)
-      json-schema (~> 2.2)
-      railties (>= 3.1, < 7.0)
-    rswag-ui (2.3.1)
-      actionpack (>= 3.1, < 7.0)
-      railties (>= 3.1, < 7.0)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.5.2)
-      activesupport
-      rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    ruby-progressbar (1.10.1)
-    ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.2)
-    rubyzip (1.3.0)
-    sass (3.4.25)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    select2-rails (3.4.9)
-      sass-rails
-      thor (~> 0.14)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    shoulda-matchers (4.0.1)
-      activesupport (>= 4.2.0)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
-      tilt (~> 2.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    state_machines (0.5.0)
-    state_machines-activemodel (0.7.1)
-      activemodel (>= 4.1)
-      state_machines (>= 0.5.0)
-    state_machines-activerecord (0.6.0)
-      activerecord (>= 4.1)
-      state_machines-activemodel (>= 0.5.0)
-    stringex (2.8.5)
-    stripe (5.28.0)
-    temple (0.8.2)
-    test-prof (0.7.5)
-    test-unit (3.3.7)
-      power_assert
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    timecop (0.9.2)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.7.0)
-    unicorn (5.7.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
-    unicorn-rails (2.2.1)
-      rack
-      unicorn
-    unicorn-worker-killer (0.4.4)
-      get_process_mem (~> 0)
-      unicorn (>= 4, < 6)
-    warden (1.2.9)
-      rack (>= 2.0.9)
-    webdrivers (4.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.10.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    whenever (1.0.0)
-      chronic (>= 0.6.3)
-    wicked_pdf (2.1.0)
-      activesupport
-    wkhtmltopdf-binary (0.12.6.5)
-    xml-simple (1.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack-action_caching
-  active_model_serializers (= 0.8.4)
-  activemerchant (>= 1.78.0)
-  activerecord-import
-  activerecord-postgresql-adapter
-  activerecord-session_store
-  acts-as-taggable-on (~> 4.0)
-  acts_as_list (= 0.9.19)
-  andand
-  angular-rails-templates (>= 0.3.0)
-  angular_rails_csrf
-  angularjs-file-upload-rails (~> 2.4.1)
-  angularjs-rails (= 1.5.5)
-  atomic
-  awesome_nested_set
-  awesome_print
-  aws-sdk (= 1.67.0)
-  bugsnag
-  byebug
-  cancancan (~> 1.7.0)
-  capybara
-  catalog!
-  coffee-rails (~> 4.2.2)
-  combine_pdf
-  compass-rails
-  custom_error_message!
-  daemons
-  dalli
-  database_cleaner
-  ddtrace
-  debugger-linecache
-  delayed_job_active_record
-  delayed_job_web
-  devise
-  devise-encryptable
-  devise-token_authenticatable
-  dfc_provider!
-  eventmachine (>= 1.2.3)
-  factory_bot_rails (= 5.2.0)
-  ffaker
-  figaro
-  foundation-icons-sass-rails
-  foundation-rails (= 5.5.2.1)
-  fuubar (~> 2.5.1)
-  geocoder
-  gmaps4rails
-  haml
-  highline (= 2.0.3)
-  i18n
-  i18n-js (~> 3.8.0)
-  immigrant
-  jquery-migrate-rails
-  jquery-rails (= 4.4.0)
-  jquery-ui-rails (~> 4.2)
-  json
-  json_spec (~> 1.1.4)
-  jwt (~> 2.2)
-  kaminari (~> 1.2.1)
-  knapsack
-  letter_opener (>= 1.4.1)
-  libv8 (< 8)
-  mini_racer (= 0.2.15)
-  monetize (~> 1.1)
-  oauth2 (~> 1.4.4)
-  ofn-qz!
-  order_management!
-  paper_trail (~> 10.3.1)
-  paperclip (~> 3.4.1)
-  paranoia (~> 2.4)
-  paypal-sdk-merchant (= 1.106.1)
-  pg (~> 0.21.0)
-  pry
-  pry-byebug
-  rack-mini-profiler (< 3.0.0)
-  rack-rewrite
-  rack-ssl
-  rails (> 5.0, < 5.1)
-  rails-i18n
-  rails_safe_tasks (~> 1.0)
-  ransack (= 2.3.0)
-  redcarpet
-  responders
-  roadie-rails (~> 1.3.0)
-  roo (~> 2.8.3)
-  rspec-rails (>= 3.5.2)
-  rspec-retry
-  rswag
-  rubocop
-  rubocop-rails
-  sass (<= 4.7.1)
-  sass-rails (< 6.0.0)
-  select2-rails (~> 3.4.7)
-  selenium-webdriver
-  shoulda-matchers
-  simplecov
-  spring
-  spring-commands-rspec
-  state_machines-activerecord
-  stringex (~> 2.8.5)
-  stripe
-  test-prof
-  test-unit (~> 3.3)
-  timecop
-  uglifier (>= 1.0.3)
-  unicorn-rails
-  unicorn-worker-killer
-  web!
-  webdrivers
-  webmock
-  whenever
-  wicked_pdf
-  wkhtmltopdf-binary
-
-RUBY VERSION
-   ruby 2.4.4p296
-
-BUNDLED WITH
-   1.17.3

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
@@ -33,7 +34,7 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline.
+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! 
 
@@ -46,5 +47,5 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 [ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
-[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
 [zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -8,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/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,6 +8,7 @@ angular.module("ofn.admin", [
   "admin.dropdown",
   "admin.products",
   "admin.taxons",
-  "infinite-scroll"
+  "infinite-scroll",
+  "admin.orders"
 ]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/all.js

@@ -10,7 +10,6 @@
 //= require jquery-migrate-min
 //= require jquery_ujs
 //= require jquery.ui.all
-//= require jquery-ui-timepicker-addon
 //= require jquery.powertip
 //= require jquery.cookie
 //= require jquery.jstree/jquery.jstree
@@ -24,6 +23,24 @@
 //= 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 admin/spree/spree
 //= require admin/spree/spree-select2
@@ -35,6 +52,9 @@
 //= 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
@@ -90,5 +110,8 @@
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 
+// LocalStorage
+//= require ../shared/angular-local-storage.js
+
 // requires the rest of the JS code in this folder
 //= require_tree .

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

@@ -21,6 +21,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     sorting: ""
   }
 
+  $scope.sorting = "name asc"
   $scope.producers = producers
   $scope.taxons = Taxons.all
   $scope.tax_categories = tax_categories
@@ -48,7 +49,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       'q[name_cont]': $scope.q.query,
       'q[supplier_id_eq]': $scope.q.producerFilter,
       'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
-      'q[s]': $scope.q.sorting,
+      'q[s]': $scope.sorting,
       import_date: $scope.q.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
@@ -104,7 +105,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.$watch 'sortOptions', (sort) ->
     return unless sort && sort.predicate != ""
 
-    $scope.q.sorting = sort.getSortingExpr()
+    $scope.sorting = sort.getSortingExpr(defaultDirection: "asc")
     $scope.fetchProducts()
   , true
 
@@ -146,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
@@ -161,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
@@ -216,6 +217,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
           '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

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_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
@@ -90,3 +92,6 @@ angular.module("admin.enterprises")
 
     $scope.translation = (key) ->
       t('js.admin.enterprises.form.images.' + key)
+
+    $scope.loadSuppliers = ->
+      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")

app/assets/javascripts/admin/enterprises/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/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/order_cycles.js.erb.coffee

@@ -3,21 +3,18 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.e
     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(
-          Object.assign(
-            window.JQUERY_UI_DATETIME_PICKER_DEFAULTS,
-            {
-              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/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/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

@@ -67,3 +67,9 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
       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,12 +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/enterprises/:id/terms_and_conditions.json'
+      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,6 +50,17 @@ angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource
         ))
         deferred.promise
 
+    findByID: (id) ->
+      @byID[id]
+
+    # For finding multiple Enterprises represented by comma delimited string
+    findByIDs: (ids) ->
+      @byID[id] for id in ids.split(",") when @byID[id]
+
+    findByTerm: (enterprises, term) ->
+      $filter('filter')(enterprises, term)
+
+
     removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
     removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)
     removeTermsAndConditions: performActionOnEnterpriseResource(EnterpriseResource.removeTermsAndConditions)

app/assets/javascripts/admin/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/spree/base.js.erb

@@ -98,40 +98,6 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined' &&
-    typeof Spree.translations !== '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"
-      });
-      
-       $.datepicker.regional[I18n.locale] = {
-          prevText: Spree.translations.previous,
-          nextText: Spree.translations.next,
-          monthNames: Spree.translations.month_names,
-          dayNames: Spree.translations.abbr_day_names,
-          dayNamesMin: Spree.translations.abbr_day_names,
-          dateFormat: Spree.translations.date_picker
-      };
-      $.datepicker.setDefaults( $.datepicker.regional[I18n.locale]);
-      // 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/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,30 +1,51 @@
-$(document).ready(function(){
-  window.JQUERY_UI_DATE_PICKER_DEFAULTS = {
-    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,
-    oneLine: true,
-    showOn: 'button',
-    buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
-    buttonImageOnly: true
+$(document).ready(function() {
+  var onClickButtons = function(index, fp) {
+    var date;
+    switch (index) {
+      case 0:
+        date = new Date();
+        break;
+    }
+    fp.setDate(date, true);
   }
-
-  window.JQUERY_UI_DATETIME_PICKER_DEFAULTS = Object.assign(
+  window.FLATPICKR_DATE_DEFAULT = {
+    altInput: true,
+    altFormat: Spree.translations.flatpickr_date_format,
+    dateFormat: "Y-m-d",
+    locale: I18n.locale,
+    plugins: [
+        ShortcutButtonsPlugin({
+          button: [{
+            label: Spree.translations.today
+          }],
+          label: "or",
+          onClick: onClickButtons
+        }),
+        labelPlugin({})
+      ]
+  }
+  window.FLATPICKR_DATETIME_DEFAULT = Object.assign(
     {},
-    window.JQUERY_UI_DATE_PICKER_DEFAULTS,
+    window.FLATPICKR_DATE_DEFAULT,
     {
-      currentText: Spree.translations.datetime_ui_current_text,
-      closeText: Spree.translations.datetime_ui_close_text,
-      timeText: Spree.translations.datetime_ui_time_text,
-      timeFormat: 'HH:mm',
-      controlType: 'select',
-      stepMinute: 15
+      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({})
+      ]
     }
   );
-  $('.datetimepicker').datetimepicker(window.JQUERY_UI_DATETIME_PICKER_DEFAULTS);
+  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/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) ->

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

@@ -11,14 +11,17 @@
 #= require leaflet-1.6.0.js
 #= require leaflet-providers.js
 #= require lodash.underscore.js
-# bluebird.js is a dependency of angular-google-maps.js 2.0.0
+# bluebird.js and angular-simple-logger are dependencies of angular-google-maps.js 2.0.0
 #= require bluebird.js
+#= require angular-simple-logger.min.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 #= require ../shared/ng-infinite-scroll.min.js
 #= require ../shared/angular-local-storage.js
 #= require ../shared/angular-slideables.js
+#= require ../shared/shared
+#= require_tree ../shared/directives
 #= require angularjs-file-upload
 #= require i18n/translations
 
@@ -48,14 +51,8 @@
 #
 #= require modernizr
 #
-#= require foundation
 #= require ./darkswarm
 #= require ./overrides
 #= require_tree ./mixins
 #= require_tree ./directives
 #= require_tree .
-
-$ ->
-  # Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
-  Foundation.set_namespace ""
-  $(document).foundation()

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

@@ -7,13 +7,3 @@ $ ->
 
   ($ 'form#update-cart').submit ->
     ($ 'form#update-cart #update-button').attr('disabled', true)
-
-
-# Temporarily handles the cart showing stuff
-$(document).ready ->
-  $('.cart_adjustment').hide()
-
-  $('td.cart-adjustments a').click ->
-    $('.cart_adjustment').toggle()
-    $(this).html(t('item_handling_fees'))
-    false

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

@@ -1,12 +1,20 @@
-Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, Cart) ->
+Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout, Cart, Messages) ->
   $scope.showBought = false
+  $scope.removeEnabled = true
 
   $scope.deleteLineItem = (id) ->
-    params = {id: id}
-    success = (response) ->
-      $(".line-item-" + id).remove()
-      Cart.removeFinalisedLineItem(id)
-    fail = (error) ->
-      console.log error
+    if Cart.isOnlyItemInOrder(id)
+      Messages.error(t 'orders_cannot_remove_the_final_item')
+      $scope.removeEnabled = false
+      $timeout (->
+        $scope.removeEnabled = true
+      ), 10000
+    else
+      params = {id: id}
+      success = (response) ->
+        $(".line-item-" + id).remove()
+        Cart.removeFinalisedLineItem(id)
+      fail = (error) ->
+        console.log error
 
-    $resource("/line_items/:id").delete(params, success, fail)
+      $resource("/line_items/:id").delete(params, success, fail)

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

@@ -24,7 +24,7 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http,
     $scope.shopfront_loading = true
     $scope.toggle_tab(event)
 
-    $http.get("/api/shops/" + $scope.hub.id)
+    $http.get("/api/v0/shops/" + $scope.hub.id)
       .success (data) ->
         $scope.shopfront_loading = false
         $scope.hub = data

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

@@ -24,7 +24,7 @@ Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll,
     $scope.shopfront_loading = true
     $scope.toggle_tab(event)
 
-    $http.get("/api/shops/" + $scope.producer.id)
+    $http.get("/api/v0/shops/" + $scope.producer.id)
       .success (data) ->
         $scope.shopfront_loading = false
         $scope.producer = data

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

@@ -11,6 +11,8 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $scope.supplied_taxons = null
   $scope.supplied_properties = null
   $scope.showFilterSidebar = false
+  $scope.activeTaxons = []
+  $scope.activeProperties = []
 
   # Update filters after initial load of shop tab
   $timeout =>
@@ -20,6 +22,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
     $scope.clearAll()
+    $scope.page = 1
 
   $scope.update_filters = ->
     order_cycle_id = OrderCycle.order_cycle.order_cycle_id
@@ -35,17 +38,12 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
       data.map( (taxon) ->
         $scope.supplied_taxons[taxon.id] = Taxons.taxons_by_id[taxon.id]
       )
-      # Some taxons may be displayed in a dropdown.
-      # Foundation needs initialising again to add dropdown actions.
-      Foundation.init()
+
     OrderCycleResource.properties params, (data)=>
       $scope.supplied_properties = {}
       data.map( (property) ->
         $scope.supplied_properties[property.id] = Properties.properties_by_id[property.id]
       )
-      # Some properties may be displayed in a dropdown.
-      # Foundation needs initialising again to add dropdown actions.
-      Foundation.init()
 
   $scope.loadMore = ->
     if ($scope.page * $scope.per_page) <= Products.products.length

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

@@ -1,8 +1,10 @@
-Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries) ->
+Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries, GmapsGeo) ->
   $scope.currentStep = RegistrationService.currentStep
   $scope.enterprise = EnterpriseRegistrationService.enterprise
   $scope.select = RegistrationService.select
-
+  $scope.geocodedAddress = ''
+  $scope.latLong = null
+  $scope.addressConfirmed = false
   $scope.steps = ['details', 'contact', 'type', 'about', 'images', 'social']
 
   # Filter countries without states since the form requires a state to be selected.
@@ -22,3 +24,26 @@ Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, Enterpris
 
   $scope.countryHasStates = ->
     $scope.enterprise.country.states.length > 0
+
+  $scope.map = {center: {latitude: 0.000000, longitude: 0.000000 }, zoom: 1}
+  $scope.options = {scrollwheel: false}
+  $scope.locateAddress = () ->
+    { address1, address2, city, state_id, zipcode } = $scope.enterprise.address
+    addressQuery = [address1, address2, city, state_id, zipcode].filter((value) => !!value).join(", ")
+    GmapsGeo.geocode addressQuery, (results, status) =>
+      $scope.geocodedAddress = results && results[0]?.formatted_address
+      location = results[0]?.geometry?.location
+      if location
+        $scope.$apply(() =>
+          $scope.latLong = {latitude: location.lat(), longitude: location.lng()}
+          $scope.map = {center: {latitude: location.lat(), longitude: location.lng()}, zoom: 16 }
+        )
+
+  $scope.toggleAddressConfirmed = ->
+    $scope.addressConfirmed = !$scope.addressConfirmed
+    if $scope.addressConfirmed
+      $scope.enterprise.address.latitude = $scope.latLong.latitude
+      $scope.enterprise.address.longitude = $scope.latLong.longitude
+    else
+      $scope.enterprise.address.latitude = null
+      $scope.enterprise.address.longitude = null

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

@@ -1,9 +1,5 @@
 Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
-  $scope.$watchGroup [
-    'variant.line_item.quantity',
-    'variant.line_item.max_quantity'
-  ], (new_value, old_value) ->
-    return if old_value[0] == null && new_value[0] == null
+  $scope.updateCart = (line_item) ->
     Cart.adjust($scope.variant.line_item)
 
   $scope.variant.line_item.quantity ||= 0
@@ -44,10 +40,12 @@ Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
   $scope.add = (quantity) ->
     item = $scope.variant.line_item
     item.quantity = $scope.sanitizedQuantity() + quantity
+    $scope.updateCart(item)
 
   $scope.addMax = (quantity) ->
     item = $scope.variant.line_item
     item.max_quantity = $scope.sanitizedMaxQuantity() + quantity
+    $scope.updateCart(item)
 
   $scope.canAdd = (quantity) ->
     wantedQuantity = $scope.sanitizedQuantity() + quantity

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

@@ -10,10 +10,11 @@ window.Darkswarm = angular.module("Darkswarm", [
   'uiGmapgoogle-maps',
   'duScroll',
   'angularFileUpload',
-  'angularSlideables'
+  'angularSlideables',
+  'OFNShared'
 ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
   $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
-  $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"
+  $httpProvider.defaults.headers.common['Accept'] = "application/json, text/javascript, */*"
 
   # We manually handle our scrolling
   $anchorScrollProvider.disableAutoScrolling()

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

@@ -3,7 +3,15 @@ Darkswarm.directive "bodyScroll", ($rootScope, BodyScroll) ->
   scope: true
   link: (scope, elem, attrs) ->
     $rootScope.$on "toggleBodyScroll", ->
-      if BodyScroll.disabled
-        elem.addClass "disable-scroll"
+      if BodyScroll.disabled && document.body.scrollHeight > document.body.clientHeight
+        document.body.style.top = "-#{window.scrollY}px"
+        document.body.style.position = 'fixed'
+        document.body.style.overflowY = 'scroll'
+        document.body.style.width = '100%'
       else
-        elem.removeClass "disable-scroll"
+        scrollY = parseInt(document.body.style.top) * -1
+        document.body.style.position = ''
+        document.body.style.top = ''
+        document.body.style.overflowY = ''
+        document.body.style.width = ''
+        window.scrollTo(0, scrollY) if scrollY

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

@@ -1,21 +0,0 @@
-Darkswarm.directive 'mapOsmTiles', ($timeout) ->
-  restrict: 'E'
-  require: '^uiGmapGoogleMap'
-  scope: {}
-  link: (scope, elem, attrs, ctrl) ->
-    $timeout =>
-      map = ctrl.getMap()
-
-      map.mapTypes.set 'OSM', new google.maps.ImageMapType
-        getTileUrl: (coord, zoom) ->
-          # "Wrap" x (logitude) at 180th meridian properly
-          # NB: Don't touch coord.x because coord param is by reference, and changing its x property breaks something in Google's lib
-          tilesPerGlobe = 1 << zoom
-          x = coord.x % tilesPerGlobe
-          if x < 0
-            x = tilesPerGlobe + x
-          # Wrap y (latitude) in a like manner if you want to enable vertical infinite scroll
-          'https://a.tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
-        tileSize: new google.maps.Size(256, 256)
-        name: 'OpenStreetMap'
-        maxZoom: 18

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

@@ -115,6 +115,10 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
       @line_items = []
       localStorageService.clearAll() # One day this will have to be moar GRANULAR
 
+    isOnlyItemInOrder: (id) =>
+      deletedItem = @line_items_finalised.find((item) -> item.id == id)
+      @line_items_finalised.filter((item) -> item.order_id == deletedItem.order_id).length == 1
+
     removeFinalisedLineItem: (id) =>
       @line_items_finalised = @line_items_finalised.filter (item) ->
         item.id != id

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

@@ -1,5 +1,5 @@
 angular.module("Darkswarm").factory 'Customer', ($resource, $injector, Messages) ->
-  Customer = $resource('/api/customers/:id/:action.json', {}, {
+  Customer = $resource('/api/v0/customers/:id/:action.json', {}, {
     'index':
       method: 'GET'
       isArray: true

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

@@ -8,5 +8,5 @@ Darkswarm.factory "EnterpriseImageService", (FileUploader, spreeApiKey) ->
       autoUpload: true
 
     configure: (enterprise) =>
-      @imageUploader.url = "/api/enterprises/#{enterprise.id}/update_image"
+      @imageUploader.url = "/api/v0/enterprises/#{enterprise.id}/update_image"
       @imageUploader.onSuccessItem = (image, response) => @imageSrc = response

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

@@ -5,7 +5,7 @@ Darkswarm.factory "EnterpriseModal", ($modal, $rootScope, $http)->
       scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise
       scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1
 
-      $http.get("/api/shops/" + enterprise.id).success (data) ->
+      $http.get("/api/v0/shops/" + enterprise.id).success (data) ->
         scope.enterprise = data
         $modal.open(templateUrl: "enterprise_modal.html", scope: scope)
       .error (data) ->

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

@@ -18,9 +18,10 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
       Loading.message = t('creating') + " " + @enterprise.name
       $http(
         method: "POST"
-        url: "/api/enterprises"
+        url: "/api/v0/enterprises"
         data:
           enterprise: @prepare()
+          use_geocoder: @useGeocoder()
         params:
           token: spreeApiKey
       ).success((data) =>
@@ -42,9 +43,10 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
       Loading.message = t('updating') + " " + @enterprise.name
       $http(
         method: "PUT"
-        url: "/api/enterprises/#{@enterprise.id}"
+        url: "/api/v0/enterprises/#{@enterprise.id}"
         data:
           enterprise: @prepare()
+          use_geocoder: @useGeocoder()
         params:
           token: spreeApiKey
       ).success((data) ->
@@ -63,3 +65,7 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
       enterprise.address_attributes = @enterprise.address if @enterprise.address?
       enterprise.address_attributes.country_id = @enterprise.country.id if @enterprise.country?
       enterprise
+
+    useGeocoder: =>
+      if @enterprise.address? && !@enterprise.address.latitude? && !@enterprise.address.longitude?
+        return "1"

app/assets/javascripts/darkswarm/services/gmaps_geo.js.erb.coffee

@@ -10,7 +10,7 @@ Darkswarm.service "GmapsGeo", ->
     #     console.log "Error: #{status}"
     geocode: (address, callback) ->
       geocoder = new google.maps.Geocoder()
-      geocoder.geocode {'address': address, 'region': "<%= Spree::Country.find_by(id: Spree::Config[:default_country_id]).iso %>"}, callback
+      geocoder.geocode {'address': address, 'region': "<%= DefaultCountry.code %>"}, callback
 
     distanceBetween: (src, dst) ->
       google.maps.geometry.spherical.computeDistanceBetween @toLatLng(src), @toLatLng(dst)
@@ -20,4 +20,4 @@ Darkswarm.service "GmapsGeo", ->
       if locatable.lat?
         locatable
       else
-        new google.maps.LatLng locatable.latitude, locatable.longitude
+        new google.maps.LatLng locatable.latitude, locatable.longitude

app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee

@@ -4,12 +4,10 @@ Darkswarm.factory "MapConfiguration", ->
       center:
         latitude: -37.4713077
         longitude: 144.7851531
-      cluster_icon: "<%= image_path('map_009-cluster.svg') %>"
+      cluster_icon: "/map_icons/map_009-cluster.svg"
       zoom: 12
       additional_options:
         # mapTypeId: 'satellite'
-        mapTypeId: 'OSM'
         mapTypeControl: false
         streetViewControl: false
       styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]},{"featureType":"road","elementType": "labels.icon","stylers":[{"visibility":"off"}]}]
-

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

@@ -1,21 +1,21 @@
 Darkswarm.factory 'OrderCycleResource', ($resource) ->
-  $resource('/api/order_cycles/:id.json', {}, {
+  $resource('/api/v0/order_cycles/:id.json', {}, {
     'products':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/products.json'
+      url: '/api/v0/order_cycles/:id/products.json'
       params:
         id: '@id'
     'taxons':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/taxons.json'
+      url: '/api/v0/order_cycles/:id/taxons.json'
       params:
         id: '@id'
     'properties':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/properties.json'
+      url: '/api/v0/order_cycles/:id/properties.json'
       params:
         id: '@id'
   })

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

@@ -1,7 +1,7 @@
 Darkswarm.factory 'ShopsResource', ($resource) ->
-  $resource('/api/shops/:id.json', {}, {
+  $resource('/api/v0/shops/:id.json', {}, {
     'closed_shops':
       method: 'GET'
       isArray: true
-      url: '/api/shops/closed_shops.json'
+      url: '/api/v0/shops/closed_shops.json'
   })

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

@@ -0,0 +1,19 @@
+
+OFNShared.directive "questionMarkWithTooltip", ($tooltip)->
+  # We use the $tooltip service from Angular foundation to give us boilerplate
+  # Subsequently we patch the scope, template and restrictions
+  tooltip = $tooltip 'questionMarkWithTooltip', 'questionMarkWithTooltip', 'click'
+  tooltip.scope =
+    context: "="
+    key: "="
+  tooltip.templateUrl = "shared/question_mark_with_tooltip_icon.html"
+  tooltip.replace = true
+  tooltip.restrict = 'E'
+  tooltip
+
+# This is automatically referenced via naming convention in $tooltip
+OFNShared.directive 'questionMarkWithTooltipPopup', ->
+  restrict: 'EA'
+  replace: true
+  templateUrl: 'shared/question_mark_with_tooltip.html'
+  scope: false

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

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

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

@@ -6,7 +6,7 @@
 %p.error{ ng: { show: 'error' } }
   {{error}}
 
-%img.spinner{ src: "/assets/spinning-circles.svg", ng: { show: "loading" } }
+%img.spinner{ src: image_path("spinning-circles.svg"), ng: { show: "loading" } }
 %p{ ng: { show: "loading" } }
   = t('js.admin.orders.index.please_wait')
 

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

@@ -3,7 +3,7 @@
 
 %form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
   %div.image-preview
-    %img.spinner{ src: "/assets/spinning-circles.svg", ng: { hide: "!imageUploader.isUploading" }}
+    %img.spinner{ src: image_path("spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
     %img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
 
   %label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}

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

@@ -6,6 +6,6 @@
 
 .sixteen.columns.alpha#loading{ 'ng-show' => 'productsLoading()' }
   %br
-  %img.spinner{ src: "/assets/spinning-circles.svg" }
+  %img.spinner{ src: image_path("spinning-circles.svg")}
   %h1
     {{ 'js.admin.panels.exchange_products.loading_variants' | t }}

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

@@ -2,12 +2,21 @@
   .columns.small-12
     %h3{"ng-bind" => "::variant.extended_name"}
 
-.row.variant-bulk-buy-price-summary
-  .columns.small-6
-    .variant-unit {{ ::variant.unit_to_display }}
-  .columns.small-6
+.flex.variant-bulk-buy-price-summary{style: "justify-content: space-around;"}
+  .variant-unit
+    {{ ::variant.unit_to_display }}
+  .div
     {{ variant.line_item.total_price | localizeCurrency }}
 
+  .unit-price
+    %question-mark-with-tooltip{"question-mark-with-tooltip": "_",
+    "question-mark-with-tooltip-append-to-body": "true",
+    "question-mark-with-tooltip-placement": "top",
+    "question-mark-with-tooltip-animation": true,
+    style: "margin-right: 5px",
+    key: "'js.shopfront.unit_price_tooltip'"} 
+    {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
+
 .row
   .columns.small-12.medium-6
     .variant-bulk-buy-quantity-label
@@ -16,10 +25,7 @@
       %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
         -# U+FF0D Fullwidth Hyphen-Minus
         －
-      %input.bulk-buy.variant-quantity{
-        type: "number",
-        min: "0",
-        max: "{{ available() }}",
+      %input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
         ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
       %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
         -# U+FF0B Fullwidth Plus Sign
@@ -31,10 +37,7 @@
       %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
         -# U+FF0D Fullwidth Hyphen-Minus
         －
-      %input.bulk-buy.variant-quantity{
-        type: "number",
-        min: "0",
-        max: "{{ available() }}",
+      %input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
         ng: {model: "variant.line_item.max_quantity", max: "Infinity"}}>
       %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
         -# U+FF0B Fullwidth Plus Sign

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

@@ -8,12 +8,8 @@
     %button.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
       -# U+FF0D Fullwidth Hyphen-Minus
       －
-    %input.variant-quantity{
-      type: "number",
-      min: "0",
-      max: "{{ available() }}",
-      ng: {model: "variant.line_item.quantity", max: "Infinity"}
-      }>
+    %input.variant-quantity{ type: "number", min: "0", max: "{{ available() }}",
+      ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
     %button.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
       -# U+FF0B Fullwidth Plus Sign
       ＋

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

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

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

@@ -0,0 +1 @@
+%button.question-mark-icon{"ng-class" => "{open: tt_isOpen}", type: 'button'}

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

@@ -8,9 +8,16 @@
       "price-breakdown-placement" => "bottom",
       "price-breakdown-animation" => true}
     {{ variant.price_with_fees | localizeCurrency }}
+    .unit-price.variant-unit-price
+      %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
+      "question-mark-with-tooltip-append-to-body" => "true",
+      "question-mark-with-tooltip-placement" => "top",
+      "question-mark-with-tooltip-animation" => true,
+      key: "'js.shopfront.unit_price_tooltip'"}
+      {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
+        
   .medium-2.large-2.columns.total-price
     %span{"ng-class" => "{filled: variant.line_item.total_price}"}
       {{ variant.line_item.total_price | localizeCurrency }}
-
   %ng-include{src: "'partials/shop_variant_no_group_buy.html'"}
   %ng-include{src: "'partials/shop_variant_with_group_buy.html'"}