Re-apply updated translations to release v3.4.2

.github/dependabot.yml

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

.github/workflows/brakeman-analysis.yml

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

.github/workflows/build.yml

@@ -1,273 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-  push:
-
-env:
-  DISABLE_KNAPSACK: true
-
-jobs:
-  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 spec/models
-
-  test-admin-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 admin feature tests
-        run: bundle exec rspec --profile -- spec/features/admin/*_spec.rb
-
-  test-admin-features-folders:
-    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 --pattern "spec/features/admin/*/*_spec.rb"
-
-  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
-
-  test-controllers:
-    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 spec/controllers
-
-  test-other:
-    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
-
-      - name: Run all other tests
-        run: |
-          bundle exec rspec \
-            spec/helpers/ \
-            spec/initializers/ \
-            spec/jobs/ \
-            spec/lib/ \
-            spec/mailers/ \
-            spec/queries/ \
-            spec/requests/ \
-            spec/serializers/ \
-            spec/services/ \
-            spec/validators/ \
-            spec/views
-
-      - name: Run engines tests
-        run: bundle exec rake ofn:specs:engines:rspec

.haml-lint.yml

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

.hound.yml

@@ -2,5 +2,3 @@ rubocop:
   config_file: .rubocop_styleguide.yml
 scss:
   config_file: .scss-lint.yml
-haml:
-  config_file: .haml-lint.yml

.rspec

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

.rubocop_manual_todo.yml

@@ -33,6 +33,7 @@ Layout/LineLength:
   - app/controllers/admin/product_import_controller.rb
   - app/controllers/admin/schedules_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
+  - app/controllers/admin/variant_overrides_controller.rb
   - app/controllers/api/enterprise_attachment_controller.rb
   - app/controllers/api/product_images_controller.rb
   - app/controllers/spree/paypal_controller_decorator.rb
@@ -65,11 +66,11 @@ Layout/LineLength:
   - app/models/spree/image.rb
   - app/models/spree/order.rb
   - app/models/spree/payment_method.rb
-  - app/models/spree/product.rb
+  - app/models/spree/product_decorator.rb
   - app/models/spree/user.rb
-  - app/models/spree/variant.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
+  - app/models/variant_override_set.rb
   - app/serializers/api/admin/subscription_line_item_serializer.rb
   - app/services/cart_service.rb
   - app/services/checkout/post_checkout_actions.rb
@@ -100,7 +101,6 @@ Layout/LineLength:
   - lib/open_food_network/scope_variants_for_search.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/localized_number.rb
-  - lib/stripe/credit_card_clone_finder.rb
   - lib/tasks/data.rake
   - lib/tasks/enterprises.rake
   - spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -252,6 +252,7 @@ Layout/LineLength:
   - spec/models/enterprise_relationship_spec.rb
   - spec/models/enterprise_spec.rb
   - spec/models/exchange_spec.rb
+  - spec/models/model_set_spec.rb
   - spec/models/order_cycle_spec.rb
   - spec/models/product_importer_spec.rb
   - spec/models/product_import/reset_absent_spec.rb
@@ -335,7 +336,6 @@ Metrics/AbcSize:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/admin/order_cycles_controller.rb
   - app/controllers/admin/product_import_controller.rb
-  - app/controllers/admin/resource_controller.rb
   - app/controllers/admin/stripe_accounts_controller.rb
   - app/controllers/admin/subscription_line_items_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
@@ -356,13 +356,13 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
+  - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/search_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/admin/variants_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
   - app/controllers/spree/user_passwords_controller.rb
   - app/controllers/spree/user_registrations_controller.rb
   - app/controllers/spree/users_controller.rb
@@ -382,6 +382,7 @@ Metrics/AbcSize:
   - app/models/enterprise_group.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
+  - app/models/model_set.rb
   - app/models/product_import/entry_processor.rb
   - app/models/product_import/entry_validator.rb
   - app/models/product_import/product_importer.rb
@@ -398,18 +399,16 @@ Metrics/AbcSize:
   - app/models/spree/preference.rb
   - app/models/spree/preferences/preferable_class_methods.rb
   - app/models/spree/preferences/preferable.rb
-  - app/models/spree/product.rb
+  - app/models/spree/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/product_serializer.rb
   - app/serializers/api/variant_serializer.rb
   - app/services/cart_service.rb
   - app/services/create_order_cycle.rb
-  - app/services/sets/model_set.rb
   - app/services/order_cycle_form.rb
   - app/services/order_syncer.rb
   - app/services/variant_units/option_value_namer.rb
@@ -431,7 +430,6 @@ 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/orders_and_fulfillments_report/supplier_totals_report.rb
   - lib/open_food_network/packing_report.rb
   - lib/open_food_network/payments_report.rb
   - lib/open_food_network/permissions.rb
@@ -532,11 +530,11 @@ Metrics/CyclomaticComplexity:
   - app/models/spree/preference.rb
   - app/models/spree/preferences/preferable.rb
   - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/product.rb
+  - app/models/spree/product_decorator.rb
   - app/models/spree/return_authorization.rb
   - app/models/spree/zone.rb
+  - app/models/variant_override_set.rb
   - app/services/cart_service.rb
-  - app/services/sets/variant_override_set.rb
   - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
@@ -552,6 +550,39 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 7
   Exclude:
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/spree/admin/taxons_controller.rb
+  - app/controllers/spree/orders_controller.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/base_helper.rb
+  - app/helpers/spree/admin/navigation_helper.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/payment.rb
+  - app/models/spree/preferences/preferable.rb
+  - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/return_authorization.rb
+  - app/models/spree/zone.rb
+  - app/models/variant_override_set.rb
+  - app/services/cart_service.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/stock/estimator.rb
+  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/controller_helpers/order.rb
+  - lib/spree/core/controller_helpers/respond_with.rb
+  - lib/spree/core/controller_helpers/ssl.rb
+  - lib/spree/localized_number.rb
+  - spec/models/product_importer_spec.rb
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/api/variants_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
@@ -564,10 +595,7 @@ Metrics/PerceivedComplexity:
   - app/models/spree/address.rb
   - app/models/spree/order/checkout.rb
   - app/models/spree/order.rb
-  - app/models/spree/preferences/preferable_class_methods.rb
-  - app/models/spree/preferences/preferable.rb
-  - app/models/spree/product.rb
-  - app/models/spree/return_authorization.rb
+  - app/models/spree/product_decorator.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
@@ -590,7 +618,6 @@ Metrics/MethodLength:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/admin/manager_invitations_controller.rb
   - app/controllers/admin/order_cycles_controller.rb
-  - app/controllers/admin/resource_controller.rb
   - app/controllers/admin/stripe_accounts_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
   - app/controllers/api/products_controller.rb
@@ -605,13 +632,13 @@ Metrics/MethodLength:
   - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
+  - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/tax_categories_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/admin/variants_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
-  - app/controllers/spree/paypal_controller_decorator.rb
   - app/controllers/spree/user_sessions_controller.rb
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
@@ -643,13 +670,11 @@ Metrics/MethodLength:
   - 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
@@ -694,7 +719,6 @@ Metrics/MethodLength:
   - lib/spree/core/s3_support.rb
   - lib/spree/localized_number.rb
   - lib/spree/responder.rb
-  - lib/stripe/credit_card_clone_finder.rb
   - lib/stripe/profile_storer.rb
   - lib/tasks/sample_data/group_factory.rb
   - lib/tasks/sample_data/order_factory.rb
@@ -708,7 +732,6 @@ Metrics/ClassLength:
   Exclude:
   - 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
@@ -718,6 +741,7 @@ Metrics/ClassLength:
   - app/controllers/spree/admin/payment_methods_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
+  - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/models/enterprise.rb
@@ -728,14 +752,11 @@ Metrics/ClassLength:
   - app/models/spree/ability.rb
   - app/models/spree/address.rb
   - app/models/spree/credit_card.rb
-  - app/models/spree/gateway/stripe_sca.rb
   - app/models/spree/line_item.rb
   - app/models/spree/order.rb
   - app/models/spree/payment.rb
-  - app/models/spree/product.rb
   - app/models/spree/shipment.rb
   - app/models/spree/user.rb
-  - app/models/spree/variant.rb
   - app/models/spree/zone.rb
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/serializers/api/enterprise_shopfront_serializer.rb

.rubocop_styleguide.yml

@@ -46,9 +46,6 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
-Bundler/DuplicatedGem:
-  Enabled: false
-
 ## TEMPORARY/CONTESTED SETTINGS
 #
 # These are still to be decided upon, but recommended for inclusion by

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-12-23 22:07:55 +0000 using RuboCop version 0.81.0.
+# on 2020-10-30 17:18:53 +0000 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,19 +11,28 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/discourse/single_sign_on.rb'
 
-# Offense count: 5
+# Offense count: 8
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/spree/user.rb'
     - 'app/services/mail_configuration.rb'
+    - 'lib/open_food_network/feature_toggle.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/services/mail_configuration.rb'
+    - 'lib/open_food_network/feature_toggle.rb'
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/spree/taxon.rb'
+    - 'lib/spree/core/controller_helpers/common.rb'
 
 # Offense count: 10
 Naming/AccessorMethodName:
@@ -51,7 +60,7 @@ Naming/MemoizedInstanceVariableName:
     - 'app/mailers/producer_mailer.rb'
     - 'lib/open_food_network/address_finder.rb'
 
-# Offense count: 25
+# Offense count: 24
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -63,7 +72,6 @@ Naming/PredicateName:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/spree/ability.rb'
     - 'app/models/spree/adjustment.rb'
     - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/line_item.rb'
@@ -86,13 +94,12 @@ Naming/VariableNumber:
   Exclude:
     - 'spec/factories/stock_location_factory.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Cop supports --auto-correct.
 Rails/ActiveRecordAliases:
   Exclude:
     - 'spec/controllers/line_items_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
-    - 'spec/features/admin/subscriptions_spec.rb'
     - 'spec/features/consumer/shopping/orders_spec.rb'
     - 'spec/requests/api/orders_spec.rb'
 
@@ -118,7 +125,7 @@ Rails/Delegate:
     - 'app/models/spree/line_item.rb'
     - 'engines/order_management/app/services/order_management/reports/bulk_coop/renderers/html_renderer.rb'
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -132,6 +139,7 @@ Rails/FilePath:
     - 'spec/factories/product_factory.rb'
     - 'spec/features/admin/enterprises/images_spec.rb'
     - 'spec/models/content_configuration_spec.rb'
+    - 'spec/models/spree/variant_spec.rb'
     - 'spec/serializers/api/admin/enterprise_serializer_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
@@ -155,7 +163,7 @@ Rails/FindEach:
   Exclude:
     - 'app/models/spree/shipment.rb'
 
-# Offense count: 11
+# Offense count: 9
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
@@ -164,14 +172,12 @@ Rails/HasAndBelongsToMany:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/option_value.rb'
     - 'app/models/spree/role.rb'
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/user.rb'
-    - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
 
-# Offense count: 41
+# Offense count: 38
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -191,7 +197,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/taxonomy.rb'
     - 'app/models/spree/user.rb'
-    - 'app/models/spree/variant.rb'
+    - 'app/models/spree/variant_decorator.rb'
     - 'app/models/subscription.rb'
 
 # Offense count: 84
@@ -266,16 +272,15 @@ Rails/ReflectionClassName:
     - 'app/models/spree/order.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 252
+# Offense count: 247
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
   Exclude:
-    - 'app/controllers/admin/resource_controller.rb'
     - 'app/controllers/spree/admin/payment_methods_controller.rb'
+    - 'app/controllers/spree/admin/resource_controller.rb'
     - 'app/controllers/spree/admin/shipping_methods_controller.rb'
     - 'app/controllers/spree/admin/taxons_controller.rb'
-    - 'app/controllers/spree/credit_cards_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/jobs/subscription_confirm_job.rb'
     - 'app/jobs/subscription_placement_job.rb'
@@ -289,12 +294,10 @@ Rails/SkipsModelValidations:
     - 'app/models/spree/inventory_unit.rb'
     - 'app/models/spree/order.rb'
     - 'app/models/spree/payment.rb'
-    - 'app/models/spree/product.rb'
     - 'app/models/spree/shipment.rb'
     - 'app/models/spree/shipping_method.rb'
     - 'app/models/spree/tax_category.rb'
     - 'app/models/spree/taxonomy.rb'
-    - 'app/models/spree/variant.rb'
     - 'app/models/spree/zone.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
@@ -396,6 +399,9 @@ Style/CaseEquality:
 Style/ClassAndModuleChildren:
   Exclude:
     - 'app/models/calculator/flat_percent_per_item.rb'
+    - 'app/models/spree/gateway/migs.rb'
+    - 'app/models/spree/gateway/pin.rb'
+    - 'app/models/spree/product_set.rb'
     - 'app/models/tag_rule/discount_order.rb'
     - 'app/models/tag_rule/filter_order_cycles.rb'
     - 'app/models/tag_rule/filter_payment_methods.rb'
@@ -434,12 +440,14 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 365
+# Offense count: 765
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
     - 'app/controllers/admin/bulk_line_items_controller.rb'
     - 'app/controllers/admin/column_preferences_controller.rb'
     - 'app/controllers/admin/contents_controller.rb'
@@ -480,6 +488,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/api/taxonomies_controller.rb'
     - 'app/controllers/api/taxons_controller.rb'
     - 'app/controllers/api/variants_controller.rb'
+    - 'app/controllers/application_controller.rb'
     - 'app/controllers/base_controller.rb'
     - 'app/controllers/cart_controller.rb'
     - 'app/controllers/discourse_sso_controller.rb'
@@ -509,6 +518,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/products_controller.rb'
     - 'app/controllers/spree/admin/properties_controller.rb'
     - 'app/controllers/spree/admin/reports_controller.rb'
+    - 'app/controllers/spree/admin/resource_controller.rb'
     - 'app/controllers/spree/admin/return_authorizations_controller.rb'
     - 'app/controllers/spree/admin/search_controller.rb'
     - 'app/controllers/spree/admin/shipping_categories_controller.rb'
@@ -543,6 +553,7 @@ Style/FrozenStringLiteralComment:
     - 'app/helpers/enterprises_helper.rb'
     - 'app/helpers/footer_links_helper.rb'
     - 'app/helpers/groups_helper.rb'
+    - 'app/helpers/html_helper.rb'
     - 'app/helpers/i18n_helper.rb'
     - 'app/helpers/injection_helper.rb'
     - 'app/helpers/map_helper.rb'
@@ -561,10 +572,14 @@ Style/FrozenStringLiteralComment:
     - 'app/helpers/spree/orders_helper.rb'
     - 'app/helpers/spree/reports_helper.rb'
     - 'app/helpers/spree_currency_helper.rb'
+    - 'app/jobs/confirm_order_job.rb'
+    - 'app/jobs/confirm_signup_job.rb'
     - 'app/jobs/heartbeat_job.rb'
     - 'app/jobs/manager_invitation_job.rb'
+    - 'app/jobs/order_cycle_notification_job.rb'
     - 'app/jobs/subscription_confirm_job.rb'
     - 'app/jobs/subscription_placement_job.rb'
+    - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
     - 'app/mailers/spree/user_mailer.rb'
     - 'app/mailers/subscription_mailer.rb'
@@ -572,6 +587,7 @@ Style/FrozenStringLiteralComment:
     - 'app/models/calculator/flat_percent_per_item.rb'
     - 'app/models/calculator/weight.rb'
     - 'app/models/column_preference.rb'
+    - 'app/models/column_preference_set.rb'
     - 'app/models/concerns/address_display.rb'
     - 'app/models/concerns/adjustment_scopes.rb'
     - 'app/models/concerns/line_item_based_adjustment_handling.rb'
@@ -584,13 +600,18 @@ Style/FrozenStringLiteralComment:
     - 'app/models/customer.rb'
     - 'app/models/distributor_shipping_method.rb'
     - 'app/models/enterprise_fee.rb'
+    - 'app/models/enterprise_fee_set.rb'
+    - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship_permission.rb'
     - 'app/models/enterprise_role.rb'
+    - 'app/models/enterprise_set.rb'
     - 'app/models/exchange.rb'
     - 'app/models/exchange_fee.rb'
     - 'app/models/exchange_variant.rb'
     - 'app/models/inventory_item.rb'
+    - 'app/models/model_set.rb'
     - 'app/models/order_cycle.rb'
+    - 'app/models/order_cycle_set.rb'
     - 'app/models/preference_sections/footer_and_external_links_section.rb'
     - 'app/models/preference_sections/group_signup_page_section.rb'
     - 'app/models/preference_sections/header_section.rb'
@@ -611,10 +632,19 @@ Style/FrozenStringLiteralComment:
     - 'app/models/product_import/unit_converter.rb'
     - 'app/models/proxy_order.rb'
     - 'app/models/schedule.rb'
+    - 'app/models/spree/gateway/migs.rb'
+    - 'app/models/spree/gateway/pin.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
+    - 'app/models/spree/option_type_decorator.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
+    - 'app/models/spree/price_decorator.rb'
+    - 'app/models/spree/product_decorator.rb'
+    - 'app/models/spree/product_option_type_decorator.rb'
+    - 'app/models/spree/product_property_decorator.rb'
+    - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
     - 'app/models/spree/user.rb'
+    - 'app/models/spree/variant_decorator.rb'
     - 'app/models/stripe_account.rb'
     - 'app/models/subscription.rb'
     - 'app/models/subscription_line_item.rb'
@@ -625,6 +655,7 @@ Style/FrozenStringLiteralComment:
     - 'app/models/tag_rule/filter_products.rb'
     - 'app/models/tag_rule/filter_shipping_methods.rb'
     - 'app/models/variant_override.rb'
+    - 'app/models/variant_override_set.rb'
     - 'app/serializers/api/address_serializer.rb'
     - 'app/serializers/api/adjustment_serializer.rb'
     - 'app/serializers/api/cached_enterprise_serializer.rb'
@@ -694,6 +725,7 @@ Style/FrozenStringLiteralComment:
     - 'app/validators/date_time_string_validator.rb'
     - 'app/validators/distributors_validator.rb'
     - 'app/validators/integer_array_validator.rb'
+    - 'config.ru'
     - 'engines/order_management/app/controllers/order_management/application_controller.rb'
     - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/authorizer.rb'
     - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/data_representations/coordinator_fee.rb'
@@ -718,11 +750,29 @@ Style/FrozenStringLiteralComment:
     - 'engines/order_management/app/services/reports/permissions.rb'
     - 'engines/order_management/app/services/reports/renderers/base.rb'
     - 'engines/order_management/app/services/reports/report_data/base.rb'
+    - 'engines/order_management/config/routes.rb'
+    - 'engines/order_management/lib/order_management.rb'
+    - 'engines/order_management/lib/order_management/engine.rb'
+    - 'engines/order_management/lib/order_management/version.rb'
+    - 'engines/order_management/order_management.gemspec'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/authorizer_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/parameters_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/permissions_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/renderers/csv_renderer_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/renderers/html_renderer_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb'
+    - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb'
     - 'engines/web/app/controllers/web/angular_templates_controller.rb'
     - 'engines/web/app/controllers/web/api/cookies_consent_controller.rb'
     - 'engines/web/app/controllers/web/application_controller.rb'
     - 'engines/web/app/helpers/web/cookies_policy_helper.rb'
+    - 'engines/web/config/routes.rb'
+    - 'engines/web/lib/web.rb'
     - 'engines/web/lib/web/cookies_consent.rb'
+    - 'engines/web/lib/web/engine.rb'
+    - 'engines/web/lib/web/version.rb'
+    - 'engines/web/spec/helpers/cookies_policy_helper_spec.rb'
+    - 'engines/web/web.gemspec'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/address_finder.rb'
     - 'lib/open_food_network/available_payment_method_filter.rb'
@@ -737,6 +787,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/group_buy_report.rb'
     - 'lib/open_food_network/i18n_config.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
+    - 'lib/open_food_network/locking.rb'
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/order_cycle_management_report.rb'
@@ -751,6 +802,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/open_food_network/paperclippable.rb'
     - 'lib/open_food_network/payments_report.rb'
+    - 'lib/open_food_network/permalink_generator.rb'
     - 'lib/open_food_network/permissions.rb'
     - 'lib/open_food_network/products_and_inventory_report.rb'
     - 'lib/open_food_network/products_and_inventory_report_base.rb'
@@ -770,6 +822,7 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/api/controller_setup.rb'
     - 'lib/spree/authentication_helpers.rb'
+    - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
     - 'lib/stripe/account_connector.rb'
     - 'lib/stripe/profile_storer.rb'
@@ -796,8 +849,370 @@ Style/FrozenStringLiteralComment:
     - 'lib/tasks/sample_data/user_factory.rb'
     - 'lib/tasks/specs.rake'
     - 'lib/tasks/users.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/tag_rules_controller_spec.rb'
+    - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
+    - 'spec/controllers/api/base_controller_spec.rb'
+    - 'spec/controllers/api/customers_controller_spec.rb'
+    - 'spec/controllers/api/enterprise_fees_controller_spec.rb'
+    - 'spec/controllers/api/enterprises_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/shipments_controller_spec.rb'
+    - 'spec/controllers/api/statuses_controller_spec.rb'
+    - 'spec/controllers/api/taxonomies_controller_spec.rb'
+    - 'spec/controllers/api/taxons_controller_spec.rb'
+    - 'spec/controllers/api/terms_and_conditions_controller_spec.rb'
+    - 'spec/controllers/api/variants_controller_spec.rb'
+    - 'spec/controllers/base_controller_spec.rb'
+    - 'spec/controllers/cart_controller_spec.rb'
+    - 'spec/controllers/checkout_controller_spec.rb'
+    - 'spec/controllers/enterprises_controller_spec.rb'
+    - 'spec/controllers/groups_controller_spec.rb'
+    - 'spec/controllers/line_items_controller_spec.rb'
+    - 'spec/controllers/registration_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/general_settings_controller_spec.rb'
+    - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
+    - 'spec/controllers/spree/admin/mail_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
+    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
+    - 'spec/controllers/spree/admin/overview_controller_spec.rb'
+    - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/products_controller_spec.rb'
+    - 'spec/controllers/spree/admin/reports_controller_spec.rb'
+    - 'spec/controllers/spree/admin/search_controller_spec.rb'
+    - 'spec/controllers/spree/admin/shipping_methods_controller_spec.rb'
+    - 'spec/controllers/spree/admin/users_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/user_sessions_controller_spec.rb'
+    - 'spec/controllers/spree/users_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/controllers/user_passwords_controller_spec.rb'
+    - 'spec/controllers/user_registrations_controller_spec.rb'
+    - 'spec/factories.rb'
+    - 'spec/factories/address_factory.rb'
+    - 'spec/factories/calculated_adjustment_factory.rb'
+    - 'spec/factories/calculator_factory.rb'
+    - 'spec/factories/enterprise_factory.rb'
+    - 'spec/factories/order_cycle_factory.rb'
+    - 'spec/factories/order_factory.rb'
+    - 'spec/factories/product_factory.rb'
+    - 'spec/factories/return_authorization_factory.rb'
+    - 'spec/factories/shipment_factory.rb'
+    - 'spec/factories/shipping_method_factory.rb'
+    - 'spec/factories/state_factory.rb'
+    - 'spec/factories/stock_movement_factory.rb'
+    - 'spec/factories/subscription_factory.rb'
+    - 'spec/factories/tag_rule_factory.rb'
+    - 'spec/factories/user_factory.rb'
+    - 'spec/factories/variant_factory.rb'
+    - 'spec/features/admin/adjustments_spec.rb'
+    - 'spec/features/admin/authentication_spec.rb'
+    - 'spec/features/admin/bulk_order_management_spec.rb'
+    - 'spec/features/admin/bulk_product_update_spec.rb'
+    - 'spec/features/admin/configuration/content_spec.rb'
+    - 'spec/features/admin/configuration/general_settings_spec.rb'
+    - 'spec/features/admin/configuration/mail_methods_spec.rb'
+    - 'spec/features/admin/configuration/states_spec.rb'
+    - 'spec/features/admin/configuration/tax_categories_spec.rb'
+    - 'spec/features/admin/configuration/tax_rates_spec.rb'
+    - 'spec/features/admin/configuration/taxonomies_spec.rb'
+    - 'spec/features/admin/configuration/zones_spec.rb'
+    - 'spec/features/admin/customers_spec.rb'
+    - 'spec/features/admin/enterprise_fees_spec.rb'
+    - 'spec/features/admin/enterprise_groups_spec.rb'
+    - 'spec/features/admin/enterprise_relationships_spec.rb'
+    - 'spec/features/admin/enterprise_roles_spec.rb'
+    - 'spec/features/admin/enterprise_user_spec.rb'
+    - 'spec/features/admin/enterprises/index_spec.rb'
+    - 'spec/features/admin/enterprises_spec.rb'
+    - 'spec/features/admin/external_services_spec.rb'
+    - 'spec/features/admin/multilingual_spec.rb'
+    - 'spec/features/admin/overview_spec.rb'
+    - 'spec/features/admin/payment_method_spec.rb'
+    - 'spec/features/admin/payments_spec.rb'
+    - 'spec/features/admin/product_import_spec.rb'
+    - 'spec/features/admin/products_spec.rb'
+    - 'spec/features/admin/reports/packing_report_spec.rb'
+    - 'spec/features/admin/reports_spec.rb'
+    - 'spec/features/admin/schedules_spec.rb'
+    - 'spec/features/admin/shipping_methods_spec.rb'
+    - 'spec/features/admin/subscriptions_spec.rb'
+    - 'spec/features/admin/tag_rules_spec.rb'
+    - 'spec/features/admin/tax_settings_spec.rb'
+    - 'spec/features/admin/users_spec.rb'
+    - 'spec/features/admin/variant_overrides_spec.rb'
+    - 'spec/features/admin/variants_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/confirm_invitation_spec.rb'
+    - 'spec/features/consumer/footer_links_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_paypal_spec.rb'
+    - 'spec/features/consumer/shopping/checkout_spec.rb'
+    - 'spec/features/consumer/shopping/embedded_groups_spec.rb'
+    - 'spec/features/consumer/shopping/embedded_shopfronts_spec.rb'
+    - 'spec/features/consumer/shopping/orders_spec.rb'
+    - 'spec/features/consumer/shopping/products_spec.rb'
+    - 'spec/features/consumer/shopping/shopping_spec.rb'
+    - 'spec/features/consumer/shopping/variant_overrides_spec.rb'
+    - 'spec/features/consumer/shops_spec.rb'
+    - 'spec/features/consumer/sitemap_spec.rb'
+    - 'spec/helpers/admin/orders_helper_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/html_helper_spec.rb'
+    - 'spec/helpers/i18n_helper_spec.rb'
+    - 'spec/helpers/injection_helper_spec.rb'
+    - 'spec/helpers/navigation_helper_spec.rb'
+    - 'spec/helpers/order_cycles_helper_spec.rb'
+    - 'spec/helpers/serializer_helper_spec.rb'
+    - 'spec/helpers/shared_helper_spec.rb'
+    - 'spec/helpers/shop_helper_spec.rb'
+    - 'spec/helpers/spree/admin/base_helper_spec.rb'
+    - 'spec/helpers/spree/admin/orders_helper_spec.rb'
+    - 'spec/helpers/spree/orders_helper_spec.rb'
+    - 'spec/jobs/confirm_order_job_spec.rb'
+    - 'spec/jobs/confirm_signup_job_spec.rb'
+    - 'spec/jobs/heartbeat_job_spec.rb'
+    - 'spec/jobs/order_cycle_notification_job_spec.rb'
+    - 'spec/jobs/subscription_confirm_job_spec.rb'
+    - 'spec/jobs/subscription_placement_job_spec.rb'
+    - 'spec/jobs/welcome_enterprise_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/enterprise_issue_validator_spec.rb'
+    - 'spec/lib/open_food_network/error_logger_spec.rb'
+    - 'spec/lib/open_food_network/feature_toggle_spec.rb'
+    - 'spec/lib/open_food_network/group_buy_report_spec.rb'
+    - 'spec/lib/open_food_network/i18n_config_spec.rb'
+    - 'spec/lib/open_food_network/lettuce_share_report_spec.rb'
+    - 'spec/lib/open_food_network/order_and_distributor_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/customer_totals_report_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report/distributor_totals_by_supplier_report_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_by_distributor_report_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb'
+    - 'spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb'
+    - 'spec/lib/open_food_network/packing_report_spec.rb'
+    - 'spec/lib/open_food_network/permissions_spec.rb'
+    - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
+    - 'spec/lib/open_food_network/property_merge_spec.rb'
+    - 'spec/lib/open_food_network/referer_parser_spec.rb'
+    - 'spec/lib/open_food_network/sales_tax_report_spec.rb'
+    - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
+    - 'spec/lib/open_food_network/scope_variants_to_search_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/localized_number_spec.rb'
+    - 'spec/lib/stripe/account_connector_spec.rb'
+    - 'spec/lib/stripe/webhook_handler_spec.rb'
+    - 'spec/lib/tasks/enterprises_rake_spec.rb'
+    - 'spec/lib/tasks/users_rake_spec.rb'
+    - 'spec/mailers/enterprise_mailer_spec.rb'
+    - 'spec/mailers/producer_mailer_spec.rb'
+    - 'spec/mailers/subscription_mailer_spec.rb'
+    - 'spec/mailers/user_mailer_spec.rb'
+    - 'spec/models/adjustment_metadata_spec.rb'
+    - 'spec/models/calculator/flat_percent_item_total_spec.rb'
+    - 'spec/models/calculator/flat_percent_per_item_spec.rb'
+    - 'spec/models/calculator/flat_rate_spec.rb'
+    - 'spec/models/calculator/flexi_rate_spec.rb'
+    - 'spec/models/calculator/per_item_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/concerns/variant_stock_spec.rb'
+    - 'spec/models/content_configuration_spec.rb'
+    - 'spec/models/customer_spec.rb'
+    - 'spec/models/enterprise_caching_spec.rb'
+    - 'spec/models/enterprise_fee_spec.rb'
+    - 'spec/models/enterprise_group_spec.rb'
+    - 'spec/models/enterprise_relationship_spec.rb'
+    - 'spec/models/enterprise_spec.rb'
+    - 'spec/models/exchange_spec.rb'
+    - 'spec/models/model_set_spec.rb'
+    - 'spec/models/order_cycle_spec.rb'
+    - 'spec/models/product_import/entry_processor_spec.rb'
+    - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
+    - 'spec/models/product_import/reset_absent_spec.rb'
+    - 'spec/models/product_import/settings_spec.rb'
+    - 'spec/models/product_importer_spec.rb'
+    - 'spec/models/proxy_order_spec.rb'
+    - 'spec/models/spree/ability_spec.rb'
+    - 'spec/models/spree/addresses_spec.rb'
+    - 'spec/models/spree/adjustment_spec.rb'
+    - 'spec/models/spree/calculator_spec.rb'
+    - 'spec/models/spree/classification_spec.rb'
+    - 'spec/models/spree/credit_card_spec.rb'
+    - 'spec/models/spree/gateway/stripe_connect_spec.rb'
+    - 'spec/models/spree/line_item_spec.rb'
+    - 'spec/models/spree/order/checkout_spec.rb'
+    - 'spec/models/spree/order_spec.rb'
+    - 'spec/models/spree/payment_method_spec.rb'
+    - 'spec/models/spree/payment_spec.rb'
+    - 'spec/models/spree/preferences/file_configuration_spec.rb'
+    - 'spec/models/spree/price_spec.rb'
+    - 'spec/models/spree/product_set_spec.rb'
+    - 'spec/models/spree/product_spec.rb'
+    - 'spec/models/spree/shipping_method_spec.rb'
+    - 'spec/models/spree/stock/availability_validator_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/subscription_line_item_spec.rb'
+    - 'spec/models/subscription_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/tag_rule_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
+    - 'spec/performance/injection_helper_spec.rb'
+    - 'spec/performance/orders_controller_spec.rb'
+    - 'spec/performance/shop_controller_spec.rb'
+    - 'spec/requests/checkout/failed_checkout_spec.rb'
+    - 'spec/requests/checkout/paypal_spec.rb'
+    - 'spec/requests/checkout/stripe_connect_spec.rb'
+    - 'spec/requests/embedded_shopfronts_headers_spec.rb'
+    - 'spec/requests/large_request_spec.rb'
+    - 'spec/serializers/api/admin/customer_serializer_spec.rb'
+    - 'spec/serializers/api/admin/enterprise_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/index_enterprise_serializer_spec.rb'
+    - 'spec/serializers/api/admin/order_cycle_serializer_spec.rb'
+    - 'spec/serializers/api/admin/product_serializer_spec.rb'
+    - 'spec/serializers/api/admin/subscription_customer_serializer_spec.rb'
+    - 'spec/serializers/api/admin/subscription_line_item_serializer_spec.rb'
+    - 'spec/serializers/api/admin/variant_override_serializer_spec.rb'
+    - 'spec/serializers/api/admin/variant_serializer_spec.rb'
+    - 'spec/serializers/api/cached_enterprise_serializer_spec.rb'
+    - 'spec/serializers/api/credit_card_serializer_spec.rb'
+    - 'spec/serializers/api/current_order_serializer_spec.rb'
+    - 'spec/serializers/api/enterprise_serializer_spec.rb'
+    - 'spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb'
+    - 'spec/serializers/api/enterprise_shopfront_serializer_spec.rb'
+    - 'spec/serializers/api/group_list_serializer_spec.rb'
+    - 'spec/serializers/api/order_cycle_serializer_spec.rb'
+    - 'spec/serializers/api/order_serializer_spec.rb'
+    - 'spec/serializers/api/product_serializer_spec.rb'
+    - 'spec/serializers/api/shipping_method_serializer_spec.rb'
+    - 'spec/serializers/api/variant_serializer_spec.rb'
+    - 'spec/services/bulk_invoice_service_spec.rb'
+    - 'spec/services/cart_service_spec.rb'
+    - 'spec/services/default_shipping_category_spec.rb'
+    - 'spec/services/default_stock_location_spec.rb'
+    - 'spec/services/embedded_page_service_spec.rb'
+    - 'spec/services/exchange_products_renderer_spec.rb'
+    - 'spec/services/exchange_variant_bulk_updater_spec.rb'
+    - 'spec/services/invoice_renderer_spec.rb'
+    - 'spec/services/mail_configuration_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_cycle_warning_spec.rb'
+    - 'spec/services/order_factory_spec.rb'
+    - 'spec/services/order_syncer_spec.rb'
+    - 'spec/services/order_workflow_spec.rb'
+    - 'spec/services/permissions/order_spec.rb'
+    - 'spec/services/product_tag_rules_filterer_spec.rb'
+    - 'spec/services/products_renderer_spec.rb'
+    - 'spec/services/search_orders_spec.rb'
+    - 'spec/services/tax_rate_finder_spec.rb'
+    - 'spec/services/upload_sanitizer_spec.rb'
+    - 'spec/services/variant_units/option_value_namer_spec.rb'
+    - 'spec/services/variants_stock_levels_spec.rb'
+    - 'spec/spec_helper.rb'
+    - 'spec/support/ability_helper.rb'
+    - 'spec/support/api_helper.rb'
+    - 'spec/support/cancan_helper.rb'
+    - 'spec/support/controller_helper.rb'
+    - 'spec/support/delayed_job_helper.rb'
+    - 'spec/support/downloads_helper.rb'
+    - 'spec/support/email_helper.rb'
+    - 'spec/support/embedded_pages_helper.rb'
+    - 'spec/support/enterprise_groups_helper.rb'
+    - 'spec/support/feature_toggle_helper.rb'
+    - 'spec/support/features/datepicker_helper.rb'
+    - 'spec/support/filters_helper.rb'
+    - 'spec/support/html_helper.rb'
+    - 'spec/support/i18n_error_raising.rb'
+    - 'spec/support/localized_number_helper.rb'
+    - 'spec/support/matchers/date_time_validator_matchers.rb'
+    - 'spec/support/matchers/delegate_matchers.rb'
+    - 'spec/support/matchers/email_confirmation_matchers.rb'
+    - 'spec/support/matchers/flash_message_matchers.rb'
+    - 'spec/support/matchers/integer_array_validator_matchers.rb'
+    - 'spec/support/matchers/select2_matchers.rb'
+    - 'spec/support/matchers/table_matchers.rb'
+    - 'spec/support/performance_helper.rb'
+    - 'spec/support/products_helper.rb'
+    - 'spec/support/request/admin_helper.rb'
+    - 'spec/support/request/authentication_helper.rb'
+    - 'spec/support/request/cookie_helper.rb'
+    - 'spec/support/request/distribution_helper.rb'
+    - 'spec/support/request/menu_helper.rb'
+    - 'spec/support/request/shop_workflow.rb'
+    - 'spec/support/request/ui_component_helper.rb'
+    - 'spec/support/request/web_helper.rb'
+    - 'spec/support/seeds.rb'
+    - 'spec/support/spree/checkout_helpers.rb'
+    - 'spec/support/spree/money_helper.rb'
+    - 'spec/support/spree/url_helpers.rb'
+    - 'spec/support/timecop.rb'
+    - 'spec/validators/date_time_string_validator_spec.rb'
+    - 'spec/validators/integer_array_validator_spec.rb'
+    - 'spec/views/spree/admin/orders/edit.html.haml_spec.rb'
+    - 'spec/views/spree/admin/orders/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/payment_methods/index.html.haml_spec.rb'
+    - 'spec/views/spree/admin/shared/_order_links.html.haml_spec.rb'
 
-# Offense count: 39
+# Offense count: 44
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -806,6 +1221,7 @@ Style/GuardClause:
     - 'app/controllers/admin/product_import_controller.rb'
     - 'app/controllers/api/shipments_controller.rb'
     - 'app/controllers/application_controller.rb'
+    - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/home_controller.rb'
     - 'app/controllers/spree/orders_controller.rb'
     - 'app/controllers/spree/paypal_controller_decorator.rb'
@@ -813,12 +1229,13 @@ Style/GuardClause:
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
     - 'app/models/spree/preferences/preferable_class_methods.rb'
+    - 'app/models/spree/price_decorator.rb'
+    - 'app/models/spree/product_decorator.rb'
     - 'app/services/order_syncer.rb'
     - 'app/services/variant_units/variant_and_line_item_naming.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
-    - 'lib/spree/core/controller_helpers/respond_with.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
@@ -836,7 +1253,7 @@ Style/MixinUsage:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 42
+# Offense count: 43
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -867,7 +1284,7 @@ Style/NumericPredicate:
     - 'lib/spree/money_decorator.rb'
     - 'lib/tasks/sample_data.rake'
 
-# Offense count: 243
+# Offense count: 241
 Style/Send:
   Exclude:
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'

.ruby-version

@@ -1 +1 @@
-2.4.4
+2.3.7

CONTRIBUTING.md

@@ -15,14 +15,6 @@ 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

Gemfile

@@ -1,27 +1,14 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
-ruby "2.4.4"
+ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'rails', '~> 5.0.0'
-
-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 'i18n'
-gem 'i18n-js', '~> 3.8.1'
-gem 'rails-i18n'
+gem 'i18n', '~> 0.6.11'
+gem 'i18n-js', '~> 3.8.0'
+gem 'rails', '~> 4.0.13'
+gem 'rails-i18n', '~> 4.0'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5"
-gem "fog-aws", ">= 0.6.0"
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
@@ -31,22 +18,35 @@ gem 'web', path: './engines/web'
 gem 'activerecord-postgresql-adapter'
 gem 'pg', '~> 0.21.0'
 
-gem 'acts_as_list', '0.9.19'
-gem 'cancancan', '~> 1.7.0'
-gem 'ffaker'
+gem 'acts_as_list', '= 0.3.0'
+gem 'awesome_nested_set', '~> 3.2.1'
+gem 'cancan', '~> 1.6.10'
+gem 'ffaker', '~> 1.16'
 gem 'highline', '2.0.3' # Necessary for the install generator
-gem 'json'
-gem 'monetize', '~> 1.10'
-gem 'paranoia', '~> 2.4'
-gem 'state_machines-activerecord'
-gem 'stringex', '~> 2.8.5'
+gem 'json', '>= 1.7.7'
+gem 'money', '5.1.1'
+gem 'paranoia', '~> 2.0'
+gem 'ransack', '~> 1.8.10'
+gem 'state_machine', '1.2.0'
+gem 'stringex', '~> 1.5.1'
+
+gem 'spree_i18n', github: 'openfoodfoundation/spree_i18n', branch: '1-3-stable'
+
+# Our branch contains the following changes:
+# - Pass customer email and phone number to PayPal (merged to upstream master)
+# - Change type of password from string to password to hide it in the form
+# - Skip CA cert file and use the ones provided by the OS
+gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable'
 
-gem 'paypal-sdk-merchant', '1.117.2'
 gem 'stripe'
 
-gem 'devise'
+# We need at least this version to have Digicert's root certificate
+# which is needed for Pin Payments (and possibly others).
+gem 'activemerchant', '~> 1.78.0'
+
+gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
 gem 'devise-encryptable'
-gem 'devise-token_authenticatable'
+gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
 
@@ -54,14 +54,19 @@ gem 'daemons'
 gem 'delayed_job_active_record'
 gem 'delayed_job_web'
 
-gem 'kaminari', '~> 1.2.1'
+gem 'kaminari', '~> 0.17.0'
 
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
 gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
+gem 'db2fog'
 gem 'haml'
 gem 'redcarpet'
+gem 'sass'
+gem 'sass-rails'
+gem 'truncate_html', '0.9.2'
+gem 'unicorn'
 
 gem 'actionpack-action_caching'
 # AMS 0.9.x and 0.10.x are very different from 0.8.4 and the upgrade is not straight forward
@@ -75,7 +80,8 @@ gem 'dalli'
 gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
-gem 'paper_trail', '~> 10.3.1'
+gem 'oj'
+gem 'paper_trail', '~> 7.1.3'
 gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
@@ -83,36 +89,35 @@ gem 'roadie-rails', '~> 1.3.0'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
-gem 'wkhtmltopdf-binary', '0.12.5' # We need to upgrade our CI before we can bump this :/
+gem 'wkhtmltopdf-binary'
 
+gem 'foreigner'
 gem 'immigrant'
 gem 'roo', '~> 2.8.3'
 
 gem 'whenever', require: false
 
-gem 'test-unit', '~> 3.4'
+gem 'test-unit', '~> 3.3'
 
 gem 'coffee-rails', '~> 4.2.2'
 gem 'compass-rails'
 
-gem 'mini_racer', '0.3.1'
+gem 'mini_racer', '0.2.15'
 
 gem 'uglifier', '>= 1.0.3'
 
-gem 'angular_rails_csrf'
+gem 'angular-rails-templates', '~> 0.3.0'
 gem 'foundation-icons-sass-rails'
 
 gem 'foundation-rails', '= 5.5.2.1'
 
 gem 'jquery-migrate-rails'
-gem 'jquery-rails', '4.4.0'
+gem 'jquery-rails', '3.1.5'
 gem 'jquery-ui-rails', '~> 4.2'
 gem 'select2-rails', '~> 3.4.7'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
-gem 'good_migrations'
-
 group :production, :staging do
   gem 'ddtrace'
   gem 'unicorn-worker-killer'
@@ -122,11 +127,10 @@ group :test, :development do
   # Pretty printed test output
   gem 'atomic'
   gem 'awesome_print'
-  gem 'bullet'
-  gem 'capybara'
+  gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
   gem 'database_cleaner', require: false
-  gem "factory_bot_rails", '5.2.0', require: false
-  gem 'fuubar', '~> 2.5.1'
+  gem "factory_bot_rails", '4.10.0', require: false
+  gem 'fuubar', '~> 2.5.0'
   gem 'json_spec', '~> 1.1.4'
   gem 'knapsack'
   gem 'letter_opener', '>= 1.4.1'
@@ -144,16 +148,16 @@ group :test do
   gem 'simplecov', require: false
   gem 'test-prof'
   gem 'webmock'
-  gem 'rails-controller-testing'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
 end
 
 group :development do
-  gem 'byebug'
+  gem 'byebug', '~> 11.0.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
-  gem 'pry'
-  gem 'pry-byebug'
+  gem "newrelic_rpm", "~> 3.0"
+  gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
+  gem 'pry-byebug', '~> 3.7.0' # 3.8 requires ruby 2.4
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring'

README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://semaphoreci.com/api/v1/openfoodfoundation/openfoodnetwork-2/branches/master/badge.svg)](https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
-[![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
 
 # Open Food Network
 
@@ -34,9 +33,7 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline.
-
-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! 
+We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
 
 ## Licence
 
@@ -48,4 +45,3 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 [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
-[zenhub]: https://www.zenhub.com/extension

Rakefile

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

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

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

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

app/assets/javascripts/admin/all.js

@@ -10,10 +10,13 @@
 //= 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
 //= require jquery.vAlign
+//= require jquery.horizontalNav
+//= require jquery.adaptivemenu
 //= require angular
 //= require angular-resource
 //= require angular-animate
@@ -23,24 +26,6 @@
 //= 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

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

@@ -21,7 +21,6 @@ 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
@@ -49,7 +48,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,
+      'q[s]': $scope.q.sorting,
       import_date: $scope.q.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
@@ -105,7 +104,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.$watch 'sortOptions', (sort) ->
     return unless sort && sort.predicate != ""
 
-    $scope.sorting = sort.getSortingExpr(defaultDirection: "asc")
+    $scope.q.sorting = sort.getSortingExpr()
     $scope.fetchProducts()
   , true
 
@@ -217,7 +216,6 @@ 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

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

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

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

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

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

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

@@ -3,11 +3,9 @@ angular.module("admin.indexUtils").factory 'SortOptions', ->
     predicate: ""
     reverse: true
 
-    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
+    getSortingExpr: () ->
+      sortingExpr = this.predicate + ' desc' if this.reverse
+      sortingExpr = this.predicate + ' asc' if !this.reverse
       sortingExpr
 
     toggle: (predicate) ->

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

@@ -1,14 +1,27 @@
 angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.enterprises'])
+
+  .config ($httpProvider) ->
+    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
+
   .directive 'datetimepicker', ($timeout, $parse) ->
     require: "ngModel"
     link: (scope, element, attrs, ngModel) ->
       $timeout ->
-        flatpickr(element,  Object.assign({},
-                            window.FLATPICKR_DATETIME_DEFAULT, {
-                            onOpen: (selectedDates, dateStr, instance) ->
-                              instance.setDate(ngModel.$modelValue)
-                              instance.input.dispatchEvent(new Event('focus', { bubbles: true }));
-                            }));
+        # 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)
+                )
+            }
+          )
+        )
 
   .directive 'ofnOnChange', ->
     (scope, element, attrs) ->

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

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

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

@@ -8,10 +8,27 @@ Hopefully, this will evolve into a propper class.
 **/
 
 jQuery(function($) {
+  // Make main menu use full width
+  mainMenu = $('.fullwidth-menu')
+  if (typeof mainMenu.horizontalNav === 'function' )
+    mainMenu.horizontalNav({
+      tableDisplay: false,
+      responsiveDelay: 0
+    });
+
   // Vertical align of checkbox fields
   if (typeof $('.field.checkbox label').vAlign === 'function' )
     $('.field.checkbox label').vAlign()
 
+  // We activate AdaptiveMenu only if not on webdriver
+  // Re-adjusting the admin menu during tests causes tests to fail.
+  if (!navigator.webdriver && typeof Spree !== 'undefined') {
+    $('.main-menu-wrapper ul').AdaptiveMenu({
+      text: "<a href='#'><i class='icon-chevron-down'></i> " + Spree.translations.more + "</a>",
+      klass: "dropdown"
+    });
+  }
+
   // Add some tips
   if (typeof $('.with-tip').powerTip === 'function' ) {
     $('.with-tip').powerTip({
@@ -98,6 +115,31 @@ $.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"
+      });
+
+      // Correctly display range dates
+      $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
+        $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );
+      });
+      $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function(selectedDate) {
+        $(".date-range-filter .datepicker-from" ).datepicker( "option", "maxDate", selectedDate );
+      });
+    }
+
+    handle_date_picker_fields();
+  }
+
   $(".observe_field").on('change', function() {
     target = $(this).attr("data-update");
     ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';

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

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

app/assets/javascripts/admin/spree_paypal_express.js

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

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

@@ -1,51 +1,30 @@
-$(document).ready(function() {
-  var onClickButtons = function(index, fp) {
-    var date;
-    switch (index) {
-      case 0:
-        date = new Date();
-        break;
-    }
-    fp.setDate(date, true);
+$(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
   }
-  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_DATETIME_PICKER_DEFAULTS = Object.assign(
     {},
-    window.FLATPICKR_DATE_DEFAULT,
+    window.JQUERY_UI_DATE_PICKER_DEFAULTS,
     {
-      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({})
-      ]
+      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
     }
   );
-  flatpickr(".datetimepicker", window.FLATPICKR_DATETIME_DEFAULT);
+  $('.datetimepicker').datetimepicker(window.JQUERY_UI_DATETIME_PICKER_DEFAULTS);
   $('a.close').click(function(event){
     event.preventDefault();
     $(this).parent().slideUp(250);

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

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

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

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

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

@@ -1,7 +1,7 @@
 Darkswarm.controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards) ->
   angular.extend(this, new FieldsetMixin($scope))
   $scope.savedCreditCards = CreditCards.saved
-  $scope.confirmSetDefault = CreditCards.confirmSetDefault
+  $scope.setDefault = CreditCards.setDefault
   $scope.CreditCard = CreditCard
   $scope.secrets = CreditCard.secrets
   $scope.showForm = CreditCard.show

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

@@ -1,20 +1,12 @@
-Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout, Cart, Messages) ->
+Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, Cart) ->
   $scope.showBought = false
-  $scope.removeEnabled = true
 
   $scope.deleteLineItem = (id) ->
-    if Cart.has_one_line_item()
-      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
+    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/order_cycle_controller.js.coffee

@@ -25,6 +25,3 @@ Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, Orde
     Cart.reloadFinalisedLineItems()
     ChangeableOrdersAlert.reload()
     $rootScope.$broadcast 'orderCycleSelected'
-
-  $scope.closesInLessThan3Months = () ->
-    moment().diff(moment(OrderCycle.orders_close_at(),  "YYYY-MM-DD HH:mm:SS Z"), 'days') > -75

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

@@ -6,62 +6,28 @@ Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
     return if old_value[0] == null && new_value[0] == null
     Cart.adjust($scope.variant.line_item)
 
-  $scope.variant.line_item.quantity ||= 0
-
-  $scope.$watch "variant.line_item.quantity", ->
+  $scope.add = (quantity) ->
     item = $scope.variant.line_item
-    if item.quantity > $scope.available()
-      item.quantity = $scope.available()
-
-  $scope.$watch "variant.line_item.max_quantity", ->
-    item = $scope.variant.line_item
-    if item.max_quantity > $scope.available()
-      item.max_quantity = $scope.available()
-
-  if $scope.variant.product.group_buy
-    $scope.$watch "variant.line_item.quantity", ->
-      item = $scope.variant.line_item
+    item.quantity += quantity
+    if $scope.variant.product.group_buy
       if item.quantity < 1 || item.max_quantity < item.quantity
         item.max_quantity = item.quantity
 
-    $scope.$watch "variant.line_item.max_quantity", ->
-      item = $scope.variant.line_item
-      if item.max_quantity < item.quantity
-        item.quantity = item.max_quantity
-
-  $scope.quantity = ->
-    $scope.variant.line_item.quantity || 0
-
-  $scope.maxQuantity = ->
-    $scope.variant.line_item.max_quantity || $scope.sanitizedQuantity()
-
-  $scope.sanitizedQuantity = ->
-    Math.max(0, Math.min($scope.quantity(), $scope.available()))
-
-  $scope.sanitizedMaxQuantity = ->
-    Math.max($scope.sanitizedQuantity(), Math.min($scope.maxQuantity(), $scope.available()))
-
-  $scope.add = (quantity) ->
-    item = $scope.variant.line_item
-    item.quantity = $scope.sanitizedQuantity() + quantity
-
   $scope.addMax = (quantity) ->
     item = $scope.variant.line_item
-    item.max_quantity = $scope.sanitizedMaxQuantity() + quantity
+    item.max_quantity += quantity
+    if item.max_quantity < item.quantity
+      item.quantity = item.max_quantity
 
   $scope.canAdd = (quantity) ->
-    wantedQuantity = $scope.sanitizedQuantity() + quantity
+    wantedQuantity = $scope.variant.line_item.quantity + quantity
     $scope.quantityValid(wantedQuantity)
 
   $scope.canAddMax = (quantity) ->
     variant = $scope.variant
-    wantedQuantity = $scope.sanitizedMaxQuantity() + quantity
+    wantedQuantity = variant.line_item.max_quantity + quantity
     $scope.quantityValid(wantedQuantity) && variant.line_item.quantity > 0
 
-  $scope.available = ->
-    variant = $scope.variant
-    variant.on_demand && Infinity || variant.on_hand
-
   $scope.quantityValid = (quantity) ->
     variant = $scope.variant
     minimum = 0

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

@@ -12,8 +12,9 @@ window.Darkswarm = angular.module("Darkswarm", [
   'angularFileUpload',
   'angularSlideables'
 ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
+  $httpProvider.defaults.headers['common']['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
   $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/map_osm_tiles.js.coffee

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

@@ -1,17 +0,0 @@
-Darkswarm.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: "="
-  tooltip.templateUrl = "question_mark_with_tooltip_icon.html"
-  tooltip.replace = true
-  tooltip.restrict = 'E'
-  tooltip
-
-# This is automatically referenced via naming convention in $tooltip
-Darkswarm.directive 'questionMarkWithTooltipPopup', ->
-  restrict: 'EA'
-  replace: true
-  templateUrl: 'question_mark_with_tooltip.html'
-  scope: false

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

@@ -1,7 +0,0 @@
-Darkswarm.directive "shopVariantWithUnitPrice", ->
-  restrict: 'E'
-  replace: true
-  templateUrl: 'shop_variant_with_unit_price.html'
-  scope:
-    variant: '='
-  controller: 'ShopVariantCtrl'

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

@@ -1,23 +1,19 @@
-Darkswarm.directive "tabsetCtrl", (Tabsets, $location, $rootScope) ->
+Darkswarm.directive "tabsetCtrl", (Tabsets, $location) ->
   restrict: "C"
   scope:
     id: "@"
     selected: "@"
     navigate: "="
     prefix: "@?"
+    alwaysopen: "="
   controller: ($scope, $element) ->
     if $scope.navigate
       path = $location.path()?.match(/^\/\w+$/)?[0]
       $scope.selected = path[1..] if path
-    
-    # Watch location change success event to operate back/forward buttons
-    $rootScope.$on "$locationChangeSuccess", ->
-      if $scope.navigate
-        path = $location.path()?.match(/^\/\w+$/)?[0]
-        Tabsets.toggle($scope.id, path[1..] if path)
-     
+
     this.toggle = (name) ->
-      Tabsets.toggle($scope.id, name)
+      state = if $scope.alwaysopen then 'open' else null
+      Tabsets.toggle($scope.id, name, state)
 
     this.select = (selection) ->
       $scope.$broadcast("selection:changed", selection)

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

@@ -6,7 +6,7 @@ Darkswarm.filter "localizeCurrency", (currencyConfig)->
     # Set decimal points, 2 or 0 if hide_cents.
     decimals = if currencyConfig.hide_cents == "true" then 0 else 2
     # Set format if the currency symbol should come after the number, otherwise (default) use the locale setting.
-    format = if currencyConfig.symbol_position == "after" then "%n%u" else undefined
+    format = if currencyConfig.symbol_position == "after" then "%n %u" else undefined
     # We need to use parseFloat as the amount should come in as a string.
     amount = parseFloat(amount)
 

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

@@ -50,7 +50,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
         @popQueue() if @update_enqueued
 
       .error (response, status)=>
-        Messages.flash({error: response.error})
+        Messages.flash({error: t('js.cart.add_to_cart_failed')})
         @update_running = false
 
     compareAndNotifyStockLevels: (stockLevels) =>
@@ -115,9 +115,6 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
       @line_items = []
       localStorageService.clearAll() # One day this will have to be moar GRANULAR
 
-    has_one_line_item: =>
-      @line_items_finalised.length == 1
-
     removeFinalisedLineItem: (id) =>
       @line_items_finalised = @line_items_finalised.filter (item) ->
         item.id != id

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages, Customers)->
+Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages)->
   new class CreditCard
     saved: $filter('orderBy')(savedCreditCards,'-is_default')
 
@@ -11,13 +11,5 @@ Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages, Cu
         othercard.is_default = false
       $http.put("/credit_cards/#{card.id}", is_default: true).then (data) ->
         Messages.success(t('js.default_card_updated'))
-        Customers.clearAllAllowCharges()
       , (response) ->
         Messages.flash(response.data.flash)
-
-    confirmSetDefault: (card, event) =>
-      if confirm t("js.default_card_voids_auth")
-        @setDefault(card)
-      else
-        event.preventDefault()
-        return false

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

@@ -1,4 +1,4 @@
-angular.module("Darkswarm").factory 'Customer', ($resource, $injector, Messages) ->
+angular.module("Darkswarm").factory 'Customer', ($resource, Messages) ->
   Customer = $resource('/api/customers/:id/:action.json', {}, {
     'index':
       method: 'GET'
@@ -12,21 +12,8 @@ angular.module("Darkswarm").factory 'Customer', ($resource, $injector, Messages)
   })
 
   Customer.prototype.update = ->
-    if @allow_charges
-      Messages.loading(t('js.authorising'))
     @$update().then (response) =>
-      if response.gateway_recurring_payment_client_secret && $injector.has('stripePublishableKey')
-        Messages.clear()
-        stripe = Stripe($injector.get('stripePublishableKey'), { stripeAccount: response.gateway_shop_id })
-        stripe.confirmCardSetup(response.gateway_recurring_payment_client_secret).then (result) =>
-          if result.error
-            @allow_charges = false
-            @$update(allow_charges: false)
-            Messages.error(result.error.message)
-          else
-            Messages.success(t('js.changes_saved'))
-      else
-        Messages.success(t('js.changes_saved'))
+      Messages.success(t('js.changes_saved'))
     , (response) =>
       Messages.error(response.data.error)
 

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

@@ -12,7 +12,3 @@ angular.module("Darkswarm").factory 'Customers', (Customer) ->
       for customer in customers
         @all.push customer
         @byID[customer.id] = customer
-
-    clearAllAllowCharges: () ->
-      for customer in @index()
-        customer.allow_charges = false

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

@@ -4,10 +4,12 @@ Darkswarm.factory "MapConfiguration", ->
       center:
         latitude: -37.4713077
         longitude: 144.7851531
-      cluster_icon: "/map_icons/map_009-cluster.svg"
+      cluster_icon: "<%= image_path('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/order_cycles/:id', {}, {
     'products':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/products.json'
+      url: '/api/order_cycles/:id/products'
       params:
         id: '@id'
     'taxons':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/taxons.json'
+      url: '/api/order_cycles/:id/taxons'
       params:
         id: '@id'
     'properties':
       method: 'GET'
       isArray: true
-      url: '/api/order_cycles/:id/properties.json'
+      url: '/api/order_cycles/:id/properties'
       params:
         id: '@id'
   })

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

@@ -7,10 +7,12 @@ Darkswarm.factory 'Tabsets', ->
         @tabsets.push { ctrl: ctrl, id: id, selected: selected }
         ctrl.select(selected) if selected?
 
-    toggle: (id, name) ->
+    toggle: (id, name, state=null) ->
       tabset = @findTabsetByObject(id)
-      if tabset.selected != name
-        @select(tabset, name)
+      if tabset.selected == name
+        @select(tabset, null) unless state == "open"
+      else
+        @select(tabset, name) unless state == "closed"
 
     select: (tabset, name) ->
       tabset.selected = name

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

@@ -23,5 +23,5 @@ Darkswarm.factory 'Variants', ->
 
     lineItemFor: (variant) ->
       variant: variant
-      quantity: 0
-      max_quantity: 0
+      quantity: null
+      max_quantity: null

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

@@ -6,7 +6,7 @@
 %p.error{ ng: { show: 'error' } }
   {{error}}
 
-%img.spinner{ src: image_path("spinning-circles.svg"), ng: { show: "loading" } }
+%img.spinner{ src: "/assets/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: image_path("spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
+    %img.spinner{ src: "/assets/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: image_path("spinning-circles.svg")}
+  %img.spinner{ src: "/assets/spinning-circles.svg" }
   %h1
     {{ 'js.admin.panels.exchange_products.loading_variants' | t }}

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

@@ -9,27 +9,27 @@
     {{ variant.line_item.total_price | localizeCurrency }}
 
 .row
-  .columns.small-12.medium-6
+  .columns.small-6
     .variant-bulk-buy-quantity-label
       {{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
     %div
       %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() }}",
-        ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
+      %span.bulk-buy.variant-quantity>
+        {{ variant.line_item.quantity }}
       %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
         -# U+FF0B Fullwidth Plus Sign
         ＋
-  .columns.small-12.medium-6
+  .columns.small-6
     .variant-bulk-buy-quantity-label
       {{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
     %div
       %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() }}",
-        ng: {model: "variant.line_item.max_quantity", max: "Infinity"}}>
+      %span.bulk-buy.variant-quantity>
+        {{ variant.line_item.max_quantity }}
       %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/hub_details.html.haml

@@ -14,9 +14,8 @@
             {{'hubs_delivery' | t}}
     .row
       .columns.small-12
-        %a.cta-hub{"ng-href" => "{{::enterprise.path}}#/shop", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
+        %a.cta-hub{"ng-href" => "{{::enterprise.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
         "ng-class" => "{primary: enterprise.active, secondary: !enterprise.active}",
-        "ng-click" => "$close()",
         "ofn-change-hub" => "enterprise"}
           .hub-name{"ng-bind" => "::enterprise.name"}
           %span{"ng-if" => "::enterprise.active"} ({{'maps_open' | t}})

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

@@ -12,9 +12,8 @@
     .row
       .columns.small-12
         %a.cta-hub{"ng-repeat" => "hub in enterprise.hubs | filter:{id: '!'+enterprise.id} | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}#/shop", "ofn-empties-cart" => "hub",
-        "ng-class" => "::{primary: hub.active, secondary: !hub.active}",
-        "ng-click" => "$close()"}
+        "ng-href" => "{{::hub.path}}", "ofn-empties-cart" => "hub",
+        "ng-class" => "::{primary: hub.active, secondary: !hub.active}"}
           .hub-name{"ng-bind" => "::hub.name"}
           %span{"ng-if" => "::hub.active"} ({{'maps_open' | t}})
           %span{"ng-if" => "::!hub.active"} ({{'maps_closed' | t}})

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

@@ -1,18 +1,14 @@
-.small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::!variant.product.group_buy"}
+.small-5.medium-3.large-3.columns.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  .variant-quantity-inputs{ng: {if: "variant.line_item.quantity == 0"}}
-    %button.add-variant{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-      {{ "js.shopfront.variant.add_to_cart" | t }}
-
-  .variant-quantity-inputs{ng: {if: "variant.line_item.quantity != 0"}}
-    %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"}}>
-    %button.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-      -# U+FF0B Fullwidth Plus Sign
-      ＋
+  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
+    {{ "js.shopfront.variant.add_to_cart" | t }}
+  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(-1)"}}>
+    -# U+FF0D Fullwidth Hyphen-Minus
+    －
+  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
+    -# U+FF0B Fullwidth Plus Sign
+    ＋
+  %br
   .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
     {{ "js.shopfront.variant.quantity_in_cart" | t:{quantity: variant.line_item.quantity || 0} }}
   %input{type: :hidden,

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

@@ -1,4 +1,4 @@
-.small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::variant.product.group_buy"}
+.small-5.medium-3.large-3.columns.text-right{"ng-if" => "::variant.product.group_buy"}
 
   %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "addBulk(1)", disabled: "!canAdd(1)"}}
     {{ "js.shopfront.variant.add_to_cart" | t }}

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

@@ -1,6 +0,0 @@
-.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
-    {{ "js.shopfront.unit_price_tooltip" | t }}
-  %span.joyride-nub.bottom
-  

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

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

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

@@ -1,5 +1,5 @@
 .variants.row
-  .small-4.medium-4.large-5.columns.variant-name
+  .small-4.medium-4.large-6.columns.variant-name
     .inline{"ng-if" => "::variant.display_name"} {{ ::variant.display_name }}
     .variant-unit {{ ::variant.unit_to_display }}
   .small-3.medium-3.large-2.columns.variant-price
@@ -8,7 +8,7 @@
       "price-breakdown-placement" => "bottom",
       "price-breakdown-animation" => true}
     {{ variant.price_with_fees | localizeCurrency }}
-  .medium-2.large-2.columns.total-price
+  .medium-2.large-1.columns.total-price
     %span{"ng-class" => "{filled: variant.line_item.total_price}"}
       {{ variant.line_item.total_price | localizeCurrency }}
 

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

@@ -1,22 +0,0 @@
-.variants.row
-  .small-4.medium-4.large-5.columns.variant-name
-    .inline{"ng-if" => "::variant.display_name"} {{ ::variant.display_name }}
-    .variant-unit {{ ::variant.unit_to_display }}
-  .small-3.medium-3.large-2.columns.variant-price
-    %price-breakdown{"price-breakdown" => "_", variant: "variant",
-      "price-breakdown-append-to-body" => "true",
-      "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}
-      {{ 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'"}

app/assets/stylesheets/admin/all.scss

@@ -5,15 +5,14 @@
  *
 
  *= require normalize
+ *= require skeleton
  *= require responsive-tables
  *= require jquery.powertip
- *= require jquery.ui.dialog
+ *= require jquery.ui.datepicker
+ *= require jquery-ui-timepicker-addon
  *= require shared/textAngular
  *= require shared/ng-tags-input.min
  *= require select2
- *= require flatpickr/dist/flatpickr
- *= require flatpickr/dist/themes/material_blue
- *= require shortcut-buttons-flatpickr/dist/themes/light
 
  *= require_self
 */
@@ -31,8 +30,6 @@
 @import 'shared/forms';
 @import 'shared/layout';
 
-@import 'plugins/flatpickr-customization';
-
 @import 'plugins/powertip';
 @import 'plugins/jstree';
 @import 'plugins/font-awesome';

app/assets/stylesheets/admin/components/date-picker.scss

@@ -2,8 +2,6 @@
 @import 'admin/globals/mixins';
 @import 'admin/plugins/font-awesome';
 
-// scss-lint:disable QualifyingElement
-
 .date-range-filter {
   .range-divider {
     padding: 0;
@@ -13,21 +11,148 @@
   }
 }
 
-input.datetimepicker {
-  min-width: 12.9em;
-}
+#ui-datepicker-div {
+  @include border-radius($border-radius);
+  border-color: $color-3;
+  padding: 0;
+  margin-top: 10px;
 
-.container input[readonly].flatpickr-input,
-.container input[readonly].datepicker,
-.container input[readonly].datetimepicker {
-  background-color: $white;
-  cursor: pointer;
-}
+  &:before {
+    content: '';
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-bottom: 10px solid $color-3;
+    top: 0px;
+    margin-top: -10px;
+    left: 25px;
+    z-index: 1;
+  }
 
-img.ui-datepicker-trigger {
-  margin-left: -1.75em;
-  position: absolute;
-  margin-top: 0.5em;
-}
+  .ui-datepicker-header {
+    padding: 0;
+    background-image: none;
+    background-color: $color-3;
+    border: none;
+    border-bottom: none;
+    border-radius: 0;
+    height: 32px;
 
-// scss-lint:enable QualifyingElement
+    .ui-datepicker-prev, .ui-datepicker-next {
+      border-radius: 0;      
+      top: 0;
+      height: 32px;
+
+      &:hover {
+        border: none;
+        background-image: none;
+        background-color: $color-3;
+        cursor: pointer;
+      }
+
+      .ui-icon {
+        background-image: none;
+        text-indent: 0;
+        color: $color-1;
+        width: 10px;
+        margin-left: -5px;
+        @extend [class^="icon-"]:before;
+
+        &:hover {
+          color: very-light($color-2, 25);
+        }
+      }
+    }
+    .ui-datepicker-prev {
+      left: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-left;        
+      }
+    }
+    .ui-datepicker-next {
+      right: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-right;
+      }
+
+      &:hover {
+        .ui-icon {
+          margin-left: -5px;
+        }        
+      }
+    }
+
+    .ui-datepicker-title {
+      color: $color-1;
+      text-transform: uppercase;
+      font-size: 85% !important;
+      padding: 6px 10px;
+    }
+  }
+
+  table.ui-datepicker-calendar {
+    border: none;
+
+    thead {
+      th { 
+        border-bottom: 1px solid $color-border;
+        border-right: 1px solid $color-border;
+        color: $color-body-text;
+        width: 33px;
+
+        &:last-child {
+          border-right: none;
+        }
+      }
+    }
+    tbody {
+      tr:hover {
+        td {
+          background-color: transparent !important;
+        }
+      }
+      &:last-child tr:last-child td {
+        border-bottom: none;
+      }
+      td {
+        a {
+          border: 1px solid transparent;
+          background-color: $color-1;
+          background-image: none;
+          font-size: 85%;
+          color: $color-body-text;
+
+          &.ui-state-active {
+            background-color: $color-2;
+            color: $color-1;
+          }
+
+          &:hover {
+            background-color: $color-2;
+            color: $color-1;
+            border-color: darken($color-2, 5);
+
+          }
+        }
+
+        &.ui-state-disabled {
+          .ui-state-default {
+            border: none;
+            background-image: none;
+            background-color: transparent;
+          }
+        }
+
+        &.ui-datepicker-today {
+          a {
+            background-color: $color-6;
+            color: $color-1;
+            border: 1px solid darken($color-6, 5);
+          }
+        }
+      }      
+    }
+  }
+}

app/assets/stylesheets/admin/components/messages.scss

@@ -42,15 +42,4 @@
   &.notice  { background-color: rgba($color-notice,  0.8) }
   &.success { background-color: rgba($color-success, 0.8) }
   &.error   { background-color: rgba($color-error,   0.8) }
-}
-
-.notice {
-  padding: 1rem;
-  margin-bottom: 1.5rem;
-  background-color: $spree-light-blue;
-  border-radius: $border-radius;
-
-  a {
-    font-weight: bold;
-  }
-}
+}

app/assets/stylesheets/admin/components/navigation.scss

@@ -65,17 +65,12 @@ nav.menu {
 #admin-menu {
   background-color: $color-3;
 
-  ul {
-    display: flex;
-  }
-
   li {
     min-width: 90px;
-    flex-grow: 1;
 
     a {
       display: block;
-      padding: 25px 5px;
+      padding: 25px 20px;
       color: $color-1 !important;
       text-transform: uppercase;
       position: relative;
@@ -165,11 +160,3 @@ nav.menu {
     }
   }
 }
-
-#header figure {
-  margin: 0.25em 0;
-}
-
-#login-nav {
-  line-height: 1.75em;
-}

app/assets/stylesheets/admin/dashboard_item.scss

@@ -66,6 +66,7 @@ div.dashboard_item {
 
     a {
       border-radius: 0px 4px 0px 0px;
+      margin-left: 8px;
       height: 100%;
       padding: 15px 2px 0px 2px;
     }

app/assets/stylesheets/admin/datepicker.scss

@@ -0,0 +1,9 @@
+input.datetimepicker {
+  min-width: 12.9em;
+}
+
+img.ui-datepicker-trigger {
+  margin-left: -1.75em;
+  position: absolute;
+  margin-top: 0.5em;
+}

app/assets/stylesheets/admin/grid.scss

@@ -1,134 +0,0 @@
-// Grid Calculations
-// Adjust $col-gutter (space between columns, as percentage) to adjust everything else automatically
-
-$col-gutter: 2;
-$total-gutter: $col-gutter * 15;
-$total-colspace: 100 - $total-gutter;
-$gutter-width: $col-gutter / 100;
-$col-width: ($total-colspace / 16) / 100;
-
-$col-1: $col-width;
-$col-2: ($col-width * 2) + $gutter-width;
-$col-3: ($col-width * 3) + ($gutter-width * 2);
-$col-4: ($col-width * 4) + ($gutter-width * 3);
-$col-5: ($col-width * 5) + ($gutter-width * 4);
-$col-6: ($col-width * 6) + ($gutter-width * 5);
-$col-7: ($col-width * 7) + ($gutter-width * 6);
-$col-8: ($col-width * 8) + ($gutter-width * 7);
-$col-9: ($col-width * 9) + ($gutter-width * 8);
-$col-10: ($col-width * 10) + ($gutter-width * 9);
-$col-11: ($col-width * 11) + ($gutter-width * 10);
-$col-12: ($col-width * 12) + ($gutter-width * 11);
-$col-13: ($col-width * 13) + ($gutter-width * 12);
-$col-14: ($col-width * 14) + ($gutter-width * 13);
-$col-15: ($col-width * 15) + ($gutter-width * 14);
-$col-16: 100;
-
-// Grid Classes
-
-.container {
-  position: relative;
-  width: 100%;
-  margin: 0 auto;
-  padding: 0 1.5%;
-  box-sizing: border-box;
-  display: flex;
-  max-width: 1400px;
-
-  &.no-gutter {
-    padding: 0;
-  }
-
-  .row {
-    width: 100%;
-    margin-bottom: 1.5em;
-  }
-}
-
-.container::after,
-.row::after,
-.clearfix::after,
-.clear::after {
-  content: "";
-  display: table;
-  clear: both;
-}
-
-.column,
-.columns {
-  margin-left: percentage($gutter-width);
-  float: left;
-  box-sizing: border-box;
-}
-
-.column.one,
-.columns.one { width: percentage($col-1); }
-
-.columns.two { width: percentage($col-2); }
-
-.columns.three { width: percentage($col-3); }
-
-.columns.four { width: percentage($col-4); }
-
-.columns.five { width: percentage($col-5); }
-
-.columns.six { width: percentage($col-6); }
-
-.columns.seven { width: percentage($col-7); }
-
-.columns.eight { width: percentage($col-8); }
-
-.columns.nine { width: percentage($col-9); }
-
-.columns.ten { width: percentage($col-10); }
-
-.columns.eleven { width: percentage($col-11); }
-
-.columns.twelve { width: percentage($col-12); }
-
-.columns.thirteen { width: percentage($col-13); }
-
-.columns.fourteen { width: percentage($col-14);}
-
-.columns.fifteen { width: percentage($col-15); }
-
-.columns.sixteen { width: 100%; }
-
-.column.offset-by-one,
-.columns.offset-by-one { margin-left: $col-2; }
-
-.columns.offset-by-two { margin-left: $col-3; }
-
-.columns.offset-by-three { margin-left: $col-4; }
-
-.columns.offset-by-four { margin-left: $col-5; }
-
-.columns.offset-by-five { margin-left: $col-6; }
-
-.columns.offset-by-six { margin-left: $col-7; }
-
-.columns.offset-by-seven { margin-left: $col-8; }
-
-.columns.offset-by-eight { margin-left: $col-9; }
-
-.columns.offset-by-nine { margin-left: $col-10; }
-
-.columns.offset-by-ten { margin-left: $col-11; }
-
-.columns.offset-by-eleven { margin-left: $col-12; }
-
-.columns.offset-by-twelve { margin-left: $col-13; }
-
-.columns.offset-by-thirteen { margin-left: $col-14; }
-
-.columns.offset-by-fourteen { margin-left: $col-15; }
-
-.columns.offset-by-fifteen { margin-left: 100%; }
-
-.column.alpha,
-.columns.alpha,
-.columns.sixteen,
-.column:first-child,
-.columns:first-child {
-  margin-left: 0;
-}

app/assets/stylesheets/admin/plugins/flatpickr-customization.scss

@@ -1,62 +0,0 @@
-$background-grey: #eceef1;
-$background-blue: #5498da;
-
-// scss-lint:disable SelectorFormat
-
-.flatpickr-calendar {
-  border-radius: 0;
-
-  // Disable animation
-  &.animate.open {
-    animation: none;
-  }
-
-  &.arrowBottom::after {
-    border-top-color: $background-grey;
-  }
-
-  &.arrowTop::after {
-    border-bottom-color: $background-blue;
-  }
-
-  .flatpickr-months .flatpickr-month {
-    border-radius: 0;
-  }
-
-  .flatpickr-months .flatpickr-month,
-  .flatpickr-current-month .flatpickr-monthDropdown-months {
-    background: $background-blue;
-  }
-
-  .flatpickr-weekdays {
-    background: $background-blue;
-
-    .flatpickr-weekday {
-      background: $background-blue;
-    }
-  }
-
-  .flatpickr-day.selected,
-  .flatpickr-day.startRange,
-  .flatpickr-day.endRange,
-  .flatpickr-day.selected.inRange,
-  .flatpickr-day.startRange.inRange,
-  .flatpickr-day.endRange.inRange,
-  .flatpickr-day.selected:focus,
-  .flatpickr-day.startRange:focus,
-  .flatpickr-day.endRange:focus,
-  .flatpickr-day.selected:hover,
-  .flatpickr-day.startRange:hover,
-  .flatpickr-day.endRange:hover,
-  .flatpickr-day.selected.prevMonthDay,
-  .flatpickr-day.startRange.prevMonthDay,
-  .flatpickr-day.endRange.prevMonthDay,
-  .flatpickr-day.selected.nextMonthDay,
-  .flatpickr-day.startRange.nextMonthDay,
-  .flatpickr-day.endRange.nextMonthDay {
-    background: $background-blue;
-    border-color: $background-blue;
-  }
-}
-
-// scss-lint:enable SelectorFormat

app/assets/stylesheets/admin/shared/forms.scss

@@ -185,7 +185,6 @@ fieldset {
     text-transform: uppercase;
     text-align: center;
     padding: 8px 15px;
-    margin: 0 auto;
 
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;

app/assets/stylesheets/admin/shared/icons.scss

@@ -16,7 +16,6 @@
 }
 
 .icon-email:before    { @extend .icon-envelope:before }
-.icon-resend_authorization_email:before    { @extend .icon-envelope:before }
 .icon-resume:before   { @extend .icon-refresh:before  }
 
 .icon-cancel:before,

app/assets/stylesheets/admin/variables.scss

@@ -16,5 +16,3 @@ $admin-table-border: $pale-blue;
 $modal-close-button-color: #de6060;
 $modal-close-button-hover-color: #bf4545;
 $disabled-button: $light-grey;
-
-$border-radius: 3px;

app/assets/stylesheets/darkswarm/_shop-inputs.scss

@@ -6,25 +6,15 @@
 .darkswarm {
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
-
-  .row .columns.variant-quantity-column {
-    padding-left: 0;
-  }
 }
 
 .reveal-modal.product-bulk-modal {
-  width: 27em;
+  width: 26em;
 }
 
 // Components to add variants to cart and change quantities
 //
 // They are not nested so that they can be used in modals.
-
-.variant-quantity-inputs {
-  height: 2.5rem;
-  white-space: nowrap;
-}
-
 button.add-variant, button.variant-quantity {
   height: 2.5rem;
   border-radius: 0;
@@ -39,12 +29,9 @@ button.add-variant, button.variant-quantity {
   &:hover {
     background-color: $orange-600;
   }
-
   &[disabled] {
-    background-color: $grey-400;
-
     &:hover, &:focus {
-      background-color: $grey-400;
+      background-color: $orange-500;
     }
   }
   &:nth-of-type(1) {
@@ -58,7 +45,7 @@ button.add-variant, button.variant-quantity {
 }
 
 button.add-variant {
-  min-width: 7rem;
+  min-width: 6rem;
   padding: 0 1em;
 
   &[disabled] {
@@ -69,7 +56,7 @@ button.add-variant {
 }
 
 button.variant-quantity {
-  width: 2.25rem;
+  width: 3rem;
 
   &:nth-of-type(1):not(.bulk-buy):not(.bulk-buy-add) {
     border-right: .1em solid $orange-400;
@@ -81,7 +68,7 @@ button.variant-quantity {
   font-size: 0.875em;
   margin-top: 0.25em;
   text-align: center;
-  width: 7rem;
+  width: 6rem;
   visibility: hidden;
 
   &.visible {
@@ -93,28 +80,28 @@ button.bulk-buy.variant-quantity {
   background-color: transparent;
   border: .1em solid $grey-200;
   color: inherit;
-  width: 3.5rem;
 }
 
 button.bulk-buy-add.variant-quantity {
   width: 2.5rem;
+
+  &[disabled] {
+    background-color: $grey-400;
+
+    &:hover, &:focus {
+      background-color: $grey-400;
+    }
+  }
 }
 
-[type="number"].variant-quantity {
+span.bulk-buy.variant-quantity {
   border: .1em solid $grey-200;
   height: 2.5rem;
   display: inline-block;
-  width: 2.5rem;
-  padding: 0;
+  min-width: 3em;
+  padding: .5em;
   text-align: center;
   vertical-align: top;
-  appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
-
-  &.bulk-buy {
-    width: 5rem;
-  }
 }
 
 .variant-bulk-buy-price-summary {

app/assets/stylesheets/darkswarm/_shop-navigation.scss

@@ -41,21 +41,19 @@ ordercycle {
 
   .order-cycle-select {
     border: 1px solid $teal-300;
-    display: flex;
+    display: inline-block;
     font-size: 1em;
     border-radius: $radius-small;
-    margin-right: 10px;
-    margin-left: 10px;
 
     .select-label {
       background-color: rgba($teal-300, 0.5);
-      display: flex;
-      align-items: center;
-      justify-content: center;
+      display: inline-block;
       border-radius: $radius-small 0 0 $radius-small;
+      float: left;
       font-size: 1em;
       line-height: 1.3em;
       padding: 0.5em 0.75em;
+      height: 2.35em;
 
       span {
         width: max-content;
@@ -67,7 +65,6 @@ ordercycle {
       background-image: image-url('white-caret.svg');
       background-size: 30px auto;
       background-position-x: 102%;
-      height: 2.35em;
     }
 
     p {
@@ -85,6 +82,7 @@ ordercycle {
       padding: 0.5em 1.25em 0.5em 0.75em;
       font-size: 1em;
       line-height: 1.3em;
+      height: 2.35em;
       min-width: 13em;
       width: 200px;
 
@@ -156,24 +154,22 @@ shop ordercycle {
     }
   }
 
-  .select-and-closing-container {
-    @include breakpoint(desktop) {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-wrap: wrap;
-    }
-  }
-
   closing {
     color: $white;
     padding: 0 0 12px;
 
     @include breakpoint(desktop) {
-      padding: 0;
+      float: none;
+      display: inline-block;
+      padding: 0.2em 0 0;
       font-size: 1.2em;
       margin-right: 1em;
     }
+
+    @include breakpoint(tablet) {
+      float: none;
+      padding: 0;
+    }
   }
 
   form.custom {

app/assets/stylesheets/darkswarm/_shop-product-rows.scss

@@ -59,20 +59,11 @@
 
         // Variant price
         .variant-price {
-          white-space: nowrap;
           @include breakpoint(phablet) {
             padding-left: 1rem;
           }
         }
 
-        .variant-unit-price {
-          color: $grey-700;
-          font-size: 0.85rem;
-          margin-top: 15px;
-          position: relative;
-          left: -1px;
-        }
-
         // Total price
         .total-price {
           padding-left: 0rem;

app/assets/stylesheets/darkswarm/account.scss

@@ -99,6 +99,7 @@
   .transaction-group {}
 
   table {
+    width: 100%;
     border-radius: $radius-medium $radius-medium 0 0;
 
     tr:nth-of-type(even) {
@@ -142,29 +143,3 @@
     width: 10%;
   }
 }
-
-table {
-  &.full {
-    width: 100%;
-  }
-
-  &.top-rounded {
-    border-radius: $radius-medium $radius-medium 0 0;
-  }
-}
-
-// Note this relies on the <th> using `.show-for-large-up` as well.
-.requiring-authorization tr {
-  position: relative;
-
-  th:last-child {
-    position: absolute;
-    // The following calculation is the equivalent of:
-    //
-    // $table-cell-padding + 2 * browser's default border-spacing + 2 * table border
-    //
-    // Unfortunately we can't use Scss's interpolation
-    // https://sass-lang.com/documentation/interpolation. We're using a too old version perhaps?
-    right: calc(12px + 2*2px + 2*1px);
-  }
-}

app/assets/stylesheets/darkswarm/branding.scss

@@ -42,10 +42,8 @@ $black: #000;
 $white: #fff;
 
 $grey-050: #f7f7f7;
-$grey-075: #f3f8fc;
 $grey-100: #e6e6e6;
 $grey-200: #ddd;
-$grey-250: #cfe1f3;
 $grey-300: #ccc;
 $grey-400: #bbb;
 $grey-500: #999;
@@ -55,9 +53,6 @@ $grey-650: #666;
 $grey-700: #555;
 $grey-800: #333;
 
-$tiny-blue: #80b2e1;
-$dynamic-blue: #3d8dd1;
-
 $teal-300: #80d3df;
 $teal-400: #4cb5c5;
 $teal-500: #0096ad;

app/assets/stylesheets/darkswarm/cart-dropdown.scss

@@ -52,11 +52,6 @@
         font-size: 1.5em;
       }
     }
-
-    .unit-price {
-      justify-content: flex-end;
-    }
-
   }
 
   .go-shopping {
@@ -87,8 +82,7 @@
           padding: 0.5em 0 0.5em 1em;
         }
 
-        span,
-        .total-price {
+        span {
           color: $grey-800;
           font-size: 16px;
           line-height: 1.4em;

app/assets/stylesheets/darkswarm/cart-page.scss

@@ -44,12 +44,6 @@
     }
   }
 
-  .unit-price {
-    color: $grey-500;
-    font-size: $text-xs;
-  }
-
-
   input {
     &.ng-invalid-stock,
     &.ng-invalid-number {

app/assets/stylesheets/darkswarm/map.scss

@@ -64,3 +64,32 @@
     }
   }
 }
+
+.map-footer {
+  position: fixed;
+  z-index: 2;
+  width: 100%;
+  height: 23px;
+  left: 80px;
+  right: 0;
+  bottom: 6px;
+  margin: 0;
+  padding: 6px;
+  font-size: 14px;
+  font-weight: bold;
+  text-shadow: 2px 2px #aaa;
+  color: #fff;
+
+  a, a:hover, a:active, a:focus {
+    color: #fff;
+  }
+
+  @media all and (max-width: 1025px) {
+    left: 0px;
+  }
+}
+
+.tabs-content .map-footer {
+  position: relative;
+  bottom: 30px;
+}

app/assets/stylesheets/darkswarm/question-mark-icon.scss

@@ -1,83 +0,0 @@
-.unit-price {
-  display: flex;
-  align-items: center;
-}
-
-.question-mark-icon {
-  background-image: image-url("question-mark-icon.svg");
-  background-size: cover;
-  background-repeat: no-repeat;
-  border-radius: 50%;
-
-  // Reset button element css attributes
-  padding: 0;
-  margin: 0;
-  width: 20px;
-  min-width: 20px;
-  height: 20px;
-  background-color: transparent;
-
-  &:hover,
-  &:focus {
-    background-color: transparent;
-  }
-
-  &.open {
-    background-image: none;
-    background-color: $teal-500;
-
-    &::before {
-      @include icon-font;
-      content: "";
-      color: $white;
-    }
-  }
-}
-
-.joyride-tip-guide.question-mark-tooltip {
-  width: 16rem;
-  max-width: 65%;
-  // JS needs to be tweaked to adjust for left alignment - this is dynamic can't rewrite in CSS
-  margin-left: -7.4rem;
-  margin-top: -0.1rem;
-  background-color: transparent;
-
-  .background {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-    cursor: pointer;
-  }
-
-  .joyride-content-wrapper {
-    background-color: $dynamic-blue;
-    padding: $padding-small;
-    border-radius: $radius-small;
-    color: $white;
-    width: 100%;
-    font-size: 0.8rem;
-  }
-
-  .joyride-nub.bottom {
-    // Need to rewrite all with !important as it's marked as !important in the original file
-    border-color: $dynamic-blue !important;
-    border-bottom-color: transparent !important;
-    border-left-color: transparent !important;
-    border-right-color: transparent !important;
-    left: 7.4rem;
-    z-index: -1;
-  }
-
-  &.cart-sidebar {
-    // Small size (used in the cart sidebar)
-    width: 13rem;
-    margin-left: -10.4rem;
-
-    .joyride-nub.bottom {
-      left: 10.4rem;
-    }
-  }
-}

app/assets/stylesheets/darkswarm/sidebar.scss

@@ -3,9 +3,9 @@
 // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252
 
 @import "variables";
-@import "foundation/components/global";
-@import "foundation/components/buttons";
-@import "foundation/components/panels";
+@import "components/global";
+@import "components/buttons";
+@import "components/panels";
 
 #sidebar {
   margin-top: 1.875em;

app/assets/stylesheets/darkswarm/tables.scss

@@ -1,11 +1,9 @@
-$table-cell-padding: 12px;
-
 table {
   thead tr, tbody tr {
     th, td {
       box-sizing: border-box;
-      padding-left: $table-cell-padding;
-      padding-right: $table-cell-padding;
+      padding-left: 12px;
+      padding-right: 12px;
       overflow: hidden;
     }
   }

app/assets/stylesheets/darkswarm/tabset.scss

@@ -32,24 +32,22 @@
 
     border-bottom: 4px solid transparent;
 
-    @media (hover: hover) {
-      &:hover {
-        transition: all 0.4s ease-in-out;
-        border-bottom: 4px solid $clr-brick-bright;
-        cursor: pointer;
+    &:hover, &:focus, &:active {
+      transition: all 0.4s ease-in-out;
+      border-bottom: 4px solid $clr-brick-bright;
+      cursor: pointer;
+
+      @include breakpoint(phablet) {
+        transition: none;
+        color: white;
+        background-color: $clr-brick-bright;
+      }
+
+      a {
+        color: $clr-brick-bright;
 
         @include breakpoint(phablet) {
-          transition: none;
-          color: white;
-          background-color: $clr-brick-bright;
-        }
-
-        a {
-          color: $clr-brick-bright;
-
-          @include breakpoint(phablet) {
-            color: #ffffff;
-          }
+          color: #ffffff;
         }
       }
     }

app/assets/stylesheets/darkswarm/ui.scss

@@ -61,13 +61,6 @@
   @include border-radius(0.5em);
 
   outline: none;
-
-  &.x-small {
-    padding: 0.5rem 0.75rem;
-    font-size: $text-xs;
-    font-weight: 600;
-    margin: 0;
-  }
 }
 
 .button.primary, button.primary {

app/assets/stylesheets/darkswarm/variables.scss

@@ -43,7 +43,3 @@ $radius-medium: 0.5em;
 
 $shop-sidebar-overlay: rgba(0, 0, 0, 0.5);
 $transition-sidebar: 250ms ease-in-out 0s;
-
-$padding-small: 0.5rem;
-
-$text-xs: 0.75rem;

app/assets/stylesheets/mail/email.scss

@@ -63,12 +63,6 @@ p.notice {
   margin-top: 20px;
 }
 
-.powered-by-ofn {
-  background-color: #ebebeb;
-  padding: .5em;
-  text-align: center;
-}
-
 table.social {
   background-color: #ebebeb;
 

app/controllers/admin/bulk_line_items_controller.rb

@@ -1,6 +1,5 @@
 module Admin
   class BulkLineItemsController < Spree::Admin::BaseController
-    include PaginationData
     # GET /admin/bulk_line_items.json
     #
     def index
@@ -13,12 +12,9 @@ module Admin
         ransack(params[:q]).result.
         reorder('spree_line_items.order_id ASC, spree_line_items.id ASC')
 
-      @line_items = @line_items.page(page).per(params[:per_page]) if pagination_required?
+      @line_items = @line_items.page(page).per(params[:per_page]) if using_pagination?
 
-      render json: {
-        line_items: serialized_line_items,
-        pagination: pagination_data(@line_items)
-      }
+      render json: { line_items: serialized_line_items, pagination: pagination_data }
     end
 
     # PUT /admin/bulk_line_items/:id.json
@@ -33,9 +29,7 @@ module Admin
       # and https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
       order.with_lock do
         if @line_item.update(line_item_params)
-          order.update_line_item_fees! @line_item
-          order.update_order_fees!
-          order.update!
+          order.update_distribution_charge!
           render nothing: true, status: :no_content # No Content, does not trigger ng resource auto-update
         else
           render json: { errors: @line_item.errors }, status: :precondition_failed
@@ -93,6 +87,21 @@ module Admin
       ::Permissions::Order.new(spree_current_user)
     end
 
+    def using_pagination?
+      params[:per_page]
+    end
+
+    def pagination_data
+      return unless using_pagination?
+
+      {
+        results: @line_items.total_count,
+        pages: @line_items.num_pages,
+        page: page.to_i,
+        per_page: params[:per_page].to_i
+      }
+    end
+
     def page
       params[:page] || 1
     end

app/controllers/admin/column_preferences_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class ColumnPreferencesController < Admin::ResourceController
+  class ColumnPreferencesController < ResourceController
     before_action :load_collection, only: [:bulk_update]
 
     respond_to :json
@@ -29,8 +29,7 @@ module Admin
       collection_hash = Hash[permitted_params[:column_preferences].
         each_with_index.map { |cp, i| [i, cp] }]
       collection_hash.select!{ |_i, cp| cp[:action_name] == permitted_params[:action_name] }
-      @cp_set = Sets::ColumnPreferenceSet.new(@column_preferences,
-                                              collection_attributes: collection_hash)
+      @cp_set = ColumnPreferenceSet.new @column_preferences, collection_attributes: collection_hash
     end
 
     def collection

app/controllers/admin/customers_controller.rb

@@ -1,7 +1,7 @@
 require 'open_food_network/address_finder'
 
 module Admin
-  class CustomersController < Admin::ResourceController
+  class CustomersController < ResourceController
     before_action :load_managed_shops, only: :index, if: :html_request?
     respond_to :json
 
@@ -17,22 +17,13 @@ module Admin
       respond_to do |format|
         format.html
         format.json do
-          render json: @collection,
-                 each_serializer: index_each_serializer,
-                 tag_rule_mapping: tag_rule_mapping,
-                 customer_tags: customer_tags_by_id
+          render_as_json @collection,
+                         tag_rule_mapping: tag_rule_mapping,
+                         customer_tags: customer_tags_by_id
         end
       end
     end
 
-    def index_each_serializer
-      if OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, spree_current_user)
-        ::Api::Admin::CustomerWithBalanceSerializer
-      else
-        ::Api::Admin::CustomerWithCalculatedBalanceSerializer
-      end
-    end
-
     def show
       render_as_json @customer, ams_prefix: params[:ams_prefix]
     end
@@ -51,7 +42,7 @@ module Admin
       end
     end
 
-    # copy of Admin::ResourceController without flash notice
+    # copy of Spree::Admin::ResourceController without flash notice
     def destroy
       invoke_callbacks(:destroy, :before)
       if @object.destroy
@@ -72,20 +63,10 @@ module Admin
     private
 
     def collection
-      if json_request? && params[:enterprise_id].present?
-        customers_relation.
-          includes(:bill_address, :ship_address, user: :credit_cards)
-      else
-        Customer.where('1=0')
-      end
-    end
+      return Customer.where("1=0") unless json_request? && params[:enterprise_id].present?
 
-    def customers_relation
-      if OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, spree_current_user)
-        CustomersWithBalance.new(managed_enterprise_id).query
-      else
-        Customer.of(managed_enterprise_id)
-      end
+      Customer.of(managed_enterprise_id).
+        includes(:bill_address, :ship_address, user: :credit_cards)
     end
 
     def managed_enterprise_id
@@ -114,7 +95,7 @@ module Admin
       )
     end
 
-    # Used in Admin::ResourceController#update
+    # Used in ResourceController#update
     def permitted_resource_params
       customer_params
     end