Merge pull request #9014 from openfoodfoundation/transifex

Transifex

.env

@@ -53,8 +53,8 @@ SMTP_PASSWORD="f00d"
 # see="https://developers.google.com/maps/documentation/javascript/get-api-key
 # GOOGLE_MAPS_API_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
-# Stripe Connect details for instance account
-# Find these under 'API keys' and 'Connect' in your Stripe account dashboard -> Account Settings
+# Stripe details for instance account
+# Find these under 'Developers' -> 'API keys' in your Stripe account dashboard.
 # Under 'Connect', the Redirect URI should be set to https://YOUR_SERVER_URL/stripe/callbacks (e.g. https://openfoodnetwork.org.uk/stripe/callbacks)
 # Under 'Webhooks', you should set up a Connect endpoint pointing to https://YOUR_SERVER_URL/stripe/webhooks e.g. (https://openfoodnetwork.org.uk/stripe/webhooks)
 # STRIPE_INSTANCE_SECRET_KEY="sk_test_xxxxxx" # This can be a test key or a live key

.env.development

@@ -5,3 +5,5 @@ SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 OFN_REDIS_URL="redis://localhost:6379/1"
 OFN_REDIS_JOBS_URL="redis://localhost:6379/2"
+
+SITE_URL="0.0.0.0:3000"

.env.test

@@ -2,3 +2,5 @@
 # Override locally with `.env.test.local`
 
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+SITE_URL="test.host"

.foreman

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

.github/ISSUE_TEMPLATE/release.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

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

.github/workflows/build.yml

@@ -34,12 +34,12 @@ jobs:
           - "spec/controllers"
           - "spec/models"
           - "spec/features/admin/[a-o0-9]*_spec.rb"
-          - "spec/features/admin/[p-z]*_spec.rb"
-          - "spec/features/consumer"
           - "spec/lib"
           - "spec/migrations"
           - "spec/serializers"
-          - "spec/system"
+          - "spec/system/admin/[a-o0-9]*_spec.rb"
+          - "spec/system/admin/[p-z]*_spec.rb"
+          - "spec/system/consumer"
           - "engines/*/spec"
       fail-fast: false
     steps:
@@ -57,17 +57,23 @@ jobs:
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
       - name: Set up database
         run: |
           bundle exec rake db:create
           bundle exec rake db:schema:load
 
-      - name: Run controller tests
+      - name: Run tests
         run: bundle exec rspec --profile -- ${{ matrix.specs }}
 
+      - name: Archive failed tests screenshots
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: failed-tests-screenshots
+          path: tmp/capybara/screenshots/*.png
+          retention-days: 7
+          if-no-files-found: ignore
+
   test-the-rest:
     runs-on: ubuntu-18.04
     services:
@@ -98,9 +104,6 @@ jobs:
       - name: Install JS dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Set up application.yml
-        run: cp config/application.yml.example config/application.yml
-
       - name: Set up database
         run: |
           bundle exec rake db:create

.github/workflows/linters.yml

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

.gitignore

@@ -6,6 +6,7 @@
 .env.development.local
 .env.test.local
 .swp
+.vscode
 *.swo
 *.swp
 .sass-cache
@@ -42,7 +43,6 @@ config/initializers/feature_toggle.rb
 NERD_tree*
 coverage
 libpeerconnection.log
-/config/application.yml
 /config/newrelic.yml
 node_modules
 vendor/bundle/

.rubocop.yml

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

.rubocop_manual_todo.yml

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

.rubocop_relaxed_styleguide.yml

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

.rubocop_specs.yml

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

.rubocop_styleguide.yml

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

.ruby-version

@@ -1 +1 @@
-2.7.3
+3.0.3

.simplecov

@@ -15,8 +15,3 @@ SimpleCov.start 'rails' do
   add_filter '/db'
   add_filter '/lib/tasks/sample_data/'
 end
-
-if ENV['CI']
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end

CONTRIBUTING.md

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

Dockerfile

@@ -49,11 +49,10 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
-# Install node & yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-    apt-get install -y nodejs yarn
+# Install NodeJs and yarn
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install --no-install-recommends -y nodejs \
+    && npm install -g yarn
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \

GETTING_STARTED.md

@@ -2,6 +2,10 @@
 
 This is a general guide to setting up an Open Food Network **development environment on your local machine**. If you want to setup OFN on a server, please have a look at the [ofn-install deployment guide](https://github.com/openfoodfoundation/ofn-install/wiki).
 
+#### Still learning Ruby on Rails?
+
+Head to our wiki on [Learning Rails](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Learning-Rails) to find some good starting points.
+
 ### Requirements
 
 The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](docker/README.md).
@@ -56,7 +60,7 @@ If the script succeeds you're ready to start developing. If not, take a look at
 
 Now, your dreams of spinning up a development server can be realised:
 
-    bundle exec rails server
+    foreman start
 
 Go to [http://localhost:3000](http://localhost:3000) to play around!
 
@@ -81,7 +85,7 @@ The tests of all custom engines can be run with:
 
 Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop.
 
-Note: The time zone on your machine should match the one defined in `config/application.yml`.
+Note: The time zone on your machine should match the one defined in the `.env[.*]` file.
 
 Once [npm dependencies are installed][karma], AngularJS tests can be run with:
 

Gemfile

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "2.7.3"
+ruby "3.0.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
 
-gem 'rails', '~> 6.1.4'
+gem 'rails', '>= 6.1.4'
 
 gem 'activemerchant', '>= 1.78.0'
+gem 'rexml'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
 gem 'ransack', '2.4.2'
 gem 'responders'
-gem 'sass-rails', '< 5.1.0' # this restriction originates from the compass-rails's version
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -32,31 +32,36 @@ gem 'dfc_provider', path: './engines/dfc_provider'
 gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
-gem 'activerecord-postgresql-adapter'
-gem 'pg', '~> 1.2.3'
+gem "activerecord-postgresql-adapter"
+gem "arel-helpers", "~> 2.12"
+gem "pg", "~> 1.2.3"
 
 gem 'acts_as_list', '1.0.4'
 gem 'cancancan', '~> 1.15.0'
+gem 'digest'
 gem 'ffaker'
 gem 'highline', '2.0.3' # Necessary for the install generator
 gem 'json'
 gem 'monetize', '~> 1.11'
 gem 'paranoia', '~> 2.4'
 gem 'state_machines-activerecord'
-gem 'stringex', '~> 2.8.5'
+gem 'stringex', '~> 2.8.5', require: false
 
 gem 'paypal-sdk-merchant', '1.117.2'
 gem 'stripe'
 
 gem 'devise'
-gem 'devise-i18n'
 gem 'devise-encryptable'
+gem 'devise-i18n'
 gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.3'
 gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
 gem 'pagy', '~> 5.1'
 
+gem 'rswag-api'
+gem 'rswag-ui'
+
 gem 'angularjs-rails', '1.8.0'
 gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
@@ -72,8 +77,6 @@ gem 'acts-as-taggable-on', '~> 8.1'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'bigdecimal', '3.0.2'
 gem 'bootsnap', require: false
-gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
-gem 'dalli'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
@@ -83,36 +86,33 @@ gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'roadie-rails'
 
-gem 'puma'
 gem 'hiredis'
+gem 'puma'
 gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'
 
-gem "cable_ready", "5.0.0.pre2"
+gem "cable_ready", "5.0.0.pre3"
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
 gem 'immigrant'
-gem 'roo', '~> 2.8.3'
+gem 'roo', github: "roo-rb/roo" # master is currently needed for Ruby 3.x (awaiting new release)
+gem 'spreadsheet_architect'
 
 gem 'whenever', require: false
 
 gem 'test-unit', '~> 3.5'
 
 gem 'coffee-rails', '~> 5.0.0'
-gem 'compass-rails'
 
 gem 'mini_racer', '0.4.0'
 
 gem 'uglifier', '>= 1.0.3'
 
 gem 'angular_rails_csrf'
-gem 'foundation-icons-sass-rails'
-
-gem 'foundation-rails', '= 5.5.2.1'
 
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
@@ -139,6 +139,7 @@ group :test, :development do
   gem 'awesome_print'
   gem 'bullet'
   gem 'capybara'
+  gem 'cuprite'
   gem 'database_cleaner', require: false
   gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
@@ -147,17 +148,15 @@ group :test, :development do
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
   gem 'rspec-retry'
-  gem 'rswag'
+  gem 'rswag-specs'
   gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'timecop'
   gem 'webdrivers'
-  gem 'cuprite'
 end
 
 group :test do
   gem 'byebug'
-  gem 'codecov', require: false
   gem 'pdf-reader'
   gem 'rails-controller-testing'
   gem 'simplecov', require: false
@@ -170,6 +169,7 @@ end
 group :development do
   gem 'debugger-linecache'
   gem 'foreman'
+  gem 'listen'
   gem 'pry', '~> 0.13.0'
   gem 'pry-byebug', '~> 3.9.0'
   gem 'rubocop'

Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: https://github.com/jeremydurham/custom-err-msg.git
-  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
-  specs:
-    custom_error_message (1.1.1)
-
 GIT
   remote: https://github.com/openfoodfoundation/db2fog.git
   revision: 5b63343847452f52aa42f7fc169d6ab3af57cda3
@@ -30,6 +24,14 @@ GIT
       sass-rails
       thor (>= 0.14)
 
+GIT
+  remote: https://github.com/roo-rb/roo.git
+  revision: 709464c77623be2bc09b2103405d90ded7604a75
+  specs:
+    roo (2.8.3)
+      nokogiri (~> 1)
+      rubyzip (>= 1.3.0, < 3.0.0)
+
 PATH
   remote: engines/catalog
   specs:
@@ -57,63 +59,63 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
       globalid (>= 0.3.6)
     activemerchant (1.123.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord-import (1.2.0)
-      activerecord (>= 3.2)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord-import (1.3.0)
+      activerecord (>= 4.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
     activerecord-session_store (2.0.0)
@@ -122,14 +124,14 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -150,6 +152,8 @@ GEM
       railties (>= 3, < 7)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.8.0)
+    arel-helpers (2.12.1)
+      activerecord (>= 3.1.0, < 7)
     ast (2.4.2)
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
@@ -159,39 +163,45 @@ GEM
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
+    axlsx_styler (1.1.0)
+      activesupport (>= 3.1)
+      caxlsx (>= 2.0.2)
     bcrypt (3.1.16)
     bigdecimal (3.0.2)
     bindex (0.8.1)
-    bootsnap (1.9.1)
-      msgpack (~> 1.0)
-    bugsnag (6.24.0)
+    bootsnap (1.10.1)
+      msgpack (~> 1.2)
+    bugsnag (6.24.1)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     bullet (6.1.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    cable_ready (5.0.0.pre2)
+    cable_ready (5.0.0.pre3)
       rails (>= 5.2)
       thread-local (>= 1.1.0)
     cancancan (1.15.0)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    caxlsx (3.1.1)
+      htmlentities (~> 4.3, >= 4.3.4)
+      marcel (~> 1.0)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 1.3.0, < 3)
     childprocess (4.1.0)
     chronic (0.10.2)
-    chunky_png (1.4.0)
     climate_control (0.2.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codecov (0.6.0)
-      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -202,22 +212,6 @@ GEM
     coffee-script-source (1.12.2)
     combine_pdf (1.0.21)
       ruby-rc4 (>= 0.1.5)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    compass-rails (4.0.0)
-      compass (~> 1.0.0)
-      sass-rails (< 5.1)
-      sprockets (< 4.0)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     crack (0.4.5)
@@ -228,16 +222,16 @@ GEM
     cuprite (0.13)
       capybara (>= 2.1, < 4)
       ferrum (~> 0.11.0)
-    dalli (3.0.2)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    ddtrace (0.53.0)
-      ffi (~> 1.0)
+    ddtrace (0.54.1)
+      debase-ruby_core_source (= 0.10.12)
       msgpack
+    debase-ruby_core_source (0.10.12)
     debugger-linecache (1.2.0)
     devise (4.8.0)
       bcrypt (~> 3.0)
@@ -252,11 +246,13 @@ GEM
     devise-token_authenticatable (1.1.0)
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.4.4)
+    digest (3.1.0)
     docile (1.4.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
+    dry-inflector (0.2.1)
     e2mmap (0.1.0)
     erubi (1.10.0)
     et-orbi (1.2.4)
@@ -283,7 +279,7 @@ GEM
       concurrent-ruby (~> 1.1)
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.20.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     flipper (0.20.4)
     flipper-active_record (0.20.4)
       activerecord (>= 5.0, < 7)
@@ -310,12 +306,6 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     foreman (0.87.2)
     formatador (0.2.5)
-    foundation-icons-sass-rails (3.0.0)
-      railties (>= 3.1.1)
-      sass-rails (>= 3.1.1)
-    foundation-rails (5.5.2.1)
-      railties (>= 3.1.0)
-      sass (>= 3.3.0, < 3.5)
     fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
@@ -323,7 +313,7 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.7.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     gmaps4rails (2.1.2)
     good_migrations (0.1.0)
@@ -336,6 +326,7 @@ GEM
     hashery (2.1.2)
     highline (2.0.3)
     hiredis (0.6.3)
+    htmlentities (4.3.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
@@ -363,12 +354,16 @@ GEM
     letter_opener (1.7.0)
       launchy (~> 2.2)
     libv8-node (15.14.0.1)
-    loofah (2.12.0)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
@@ -376,22 +371,22 @@ GEM
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
     mini_racer (0.4.0)
       libv8-node (~> 15.14.0.0)
-    minitest (5.14.4)
-    monetize (1.11.0)
+    minitest (5.15.0)
+    monetize (1.12.0)
       money (~> 6.12)
-    money (6.14.1)
+    money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -400,7 +395,7 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     orm_adapter (0.5.0)
-    pagy (5.1.1)
+    pagy (5.1.2)
     paper_trail (12.1.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
@@ -413,7 +408,7 @@ GEM
     parallel (1.21.0)
     paranoia (2.4.3)
       activerecord (>= 4.0, < 6.2)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
@@ -435,7 +430,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.6.0)
@@ -452,20 +447,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.6.0)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (6.1.4.4)
+      actioncable (= 6.1.4.4)
+      actionmailbox (= 6.1.4.4)
+      actionmailer (= 6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actiontext (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.4.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -476,17 +471,17 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rails-i18n (6.0.0)
+    rails-i18n (7.0.1)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 7)
+      railties (>= 6.0.0, < 8)
     rails_safe_tasks (1.0.0)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
@@ -497,7 +492,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.5.1)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
@@ -510,9 +505,10 @@ GEM
     roadie-rails (2.2.0)
       railties (>= 5.1, < 6.2)
       roadie (>= 3.1, < 5.0)
-    roo (2.8.3)
-      nokogiri (~> 1)
-      rubyzip (>= 1.3.0, < 3.0.0)
+    rodf (1.1.1)
+      builder (>= 3.0)
+      dry-inflector (~> 0.1)
+      rubyzip (>= 1.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -536,10 +532,6 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.10.2)
-    rswag (2.4.0)
-      rswag-api (= 2.4.0)
-      rswag-specs (= 2.4.0)
-      rswag-ui (= 2.4.0)
     rswag-api (2.4.0)
       railties (>= 3.1, < 7.0)
     rswag-specs (2.4.0)
@@ -558,9 +550,9 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-rails (2.12.4)
+    rubocop-rails (2.13.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -585,7 +577,7 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (5.0.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.2.2)
+    sidekiq (6.3.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -602,15 +594,19 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
+    spreadsheet_architect (4.2.0)
+      axlsx_styler (>= 1.0.0, < 2)
+      caxlsx (>= 2.0.2, < 4)
+      rodf (>= 1.0.0, < 2)
     spring (3.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     state_machines (0.5.0)
     state_machines-activemodel (0.8.0)
@@ -620,12 +616,12 @@ GEM
       activerecord (>= 5.1)
       state_machines-activemodel (>= 0.8.0)
     stringex (2.8.5)
-    stripe (5.39.0)
+    stripe (5.42.0)
     temple (0.8.2)
     test-prof (1.0.7)
     test-unit (3.5.0)
       power_assert
-    thor (1.1.0)
+    thor (1.2.1)
     thread-local (1.1.0)
     thwait (0.2.0)
       e2mmap
@@ -677,7 +673,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -695,6 +691,7 @@ DEPENDENCIES
   angular_rails_csrf
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.8.0)
+  arel-helpers (~> 2.12)
   awesome_nested_set
   awesome_print
   aws-sdk (= 1.67.0)
@@ -703,17 +700,13 @@ DEPENDENCIES
   bugsnag
   bullet
   byebug
-  cable_ready (= 5.0.0.pre2)
+  cable_ready (= 5.0.0.pre3)
   cancancan (~> 1.15.0)
   capybara
   catalog!
-  codecov
   coffee-rails (~> 5.0.0)
   combine_pdf
-  compass-rails
   cuprite
-  custom_error_message!
-  dalli
   database_cleaner
   db2fog!
   ddtrace
@@ -723,6 +716,7 @@ DEPENDENCIES
   devise-i18n
   devise-token_authenticatable
   dfc_provider!
+  digest
   dotenv-rails
   factory_bot_rails (= 6.2.0)
   ffaker
@@ -731,8 +725,6 @@ DEPENDENCIES
   flipper-ui
   fog-aws (~> 2.0)
   foreman
-  foundation-icons-sass-rails
-  foundation-rails (= 5.5.2.1)
   fuubar (~> 2.5.1)
   geocoder
   gmaps4rails
@@ -750,6 +742,7 @@ DEPENDENCIES
   jwt (~> 2.3)
   knapsack
   letter_opener (>= 1.4.1)
+  listen
   mimemagic (> 0.3.5)
   mini_racer (= 0.4.0)
   monetize (~> 1.11)
@@ -770,7 +763,7 @@ DEPENDENCIES
   rack-rewrite
   rack-ssl
   rack-timeout
-  rails (~> 6.1.4)
+  rails (>= 6.1.4)
   rails-controller-testing
   rails-i18n
   rails_safe_tasks (~> 1.0)
@@ -778,14 +771,16 @@ DEPENDENCIES
   redcarpet
   redis (>= 4.0)
   responders
+  rexml
   roadie-rails
-  roo (~> 2.8.3)
+  roo!
   rspec-rails (>= 3.5.2)
   rspec-retry
-  rswag
+  rswag-api
+  rswag-specs
+  rswag-ui
   rubocop
   rubocop-rails
-  sass-rails (< 5.1.0)
   sd_notify
   select2-rails!
   selenium-webdriver
@@ -793,6 +788,7 @@ DEPENDENCIES
   sidekiq
   sidekiq-scheduler
   simplecov
+  spreadsheet_architect
   spring
   spring-commands-rspec
   state_machines-activerecord
@@ -815,7 +811,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 2.7.3p183
+   ruby 3.0.3p157
 
 BUNDLED WITH
    2.1.4

README.md

@@ -1,5 +1,4 @@
 [![Build](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml/badge.svg)](https://github.com/openfoodfoundation/openfoodnetwork/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/openfoodfoundation/openfoodnetwork/branch/master/graph/badge.svg?token=FBSOod4qiu)](https://codecov.io/gh/openfoodfoundation/openfoodnetwork)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
@@ -40,7 +39,7 @@ We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. B
 
 ## Licence
 
-Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2021 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A

app/assets/javascripts/admin/all.js

@@ -47,7 +47,6 @@
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
-//= require admin/spree_paypal_express
 //= require admin/spree/handlebar_extensions
 
 // OFN specific

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

@@ -144,7 +144,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.variantIdCounter
 
   $scope.deleteProduct = (product) ->
-    if confirm("Are you sure?")
+    if confirm(t('are_you_sure'))
       $http(
         method: "DELETE"
         url: "/api/v0/products/" + product.id

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

@@ -104,15 +104,38 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     else
       StatusMessage.display 'failure', t "unsaved_changes_error"
 
+  $scope.cancelOrder = (order) ->
+    return $http(
+      method: 'GET'
+      url: "/admin/orders/#{order.number}/fire?e=cancel")
+  
   $scope.deleteLineItem = (lineItem) ->
-    if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
-      LineItems.delete lineItem
+    if lineItem.order.item_count == 1
+      if confirm(t('js.admin.deleting_item_will_cancel_order'))
+        $scope.cancelOrder(lineItem.order).then(-> $scope.refreshData())
+    else if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
+      LineItems.delete(lineItem, () -> $scope.refreshData())
 
-  $scope.deleteLineItems = (lineItemsToDelete) ->
-    existingState = $scope.confirmDelete
-    $scope.confirmDelete = false
-    $scope.deleteLineItem lineItem for lineItem in lineItemsToDelete when lineItem.checked
-    $scope.confirmDelete = existingState
+  $scope.deleteLineItems = (lineItems) ->
+    lineItemsToDelete = lineItems.filter (item) -> item.checked
+    willCancelOrders = false
+    itemsPerOrder = new Map()
+    for item in lineItemsToDelete
+      { order } = item
+      if itemsPerOrder.has(order)
+        itemsPerOrder.get(order).push(item)
+      else
+        itemsPerOrder.set(order, [item])
+      willCancelOrders = true if (order.item_count == itemsPerOrder.get(order).length)
+
+    if willCancelOrders
+      return unless confirm(t("js.admin.deleting_item_will_cancel_order"))
+
+    itemsPerOrder.forEach (items, order) =>
+      if order.item_count == items.length
+        $scope.cancelOrder(order).then(-> $scope.refreshData())
+      else
+        Promise.all(LineItems.delete(item) for item in items).then(-> $scope.refreshData())
 
   $scope.allBoxesChecked = ->
     checkedCount = $scope.filteredLineItems.reduce (count,lineItem) ->
@@ -128,29 +151,53 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     $scope.selectedUnitsProduct = unitsProduct
     $scope.selectedUnitsVariant = unitsVariant
 
+  $scope.getLineItemScale = (lineItem) ->
+    if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume") 
+      lineItem.units_product.variant_unit_scale
+    else
+      1
+
   $scope.sumUnitValues = ->
-    sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-      sum + lineItem.final_weight_volume
+    sum = $scope.filteredLineItems?.reduce (sum, lineItem) ->
+      sum + $scope.roundToThreeDecimals(lineItem.final_weight_volume / $scope.getLineItemScale(lineItem))
     , 0
 
   $scope.sumMaxUnitValues = ->
     sum = $scope.filteredLineItems?.reduce (sum,lineItem) ->
-        sum + lineItem.max_quantity * lineItem.units_variant.unit_value
+      sum + lineItem.max_quantity * $scope.roundToThreeDecimals(lineItem.units_variant.unit_value / $scope.getLineItemScale(lineItem))
     , 0
 
+  $scope.roundToThreeDecimals = (value) ->
+    Math.round(value * 1000) / 1000
+
   $scope.allFinalWeightVolumesPresent = ->
     for i,lineItem of $scope.filteredLineItems
       return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
     true
 
-  # How is this different to OptionValueNamer#name?
-  # Should it be extracted to that class or VariantUnitManager?
-  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
-    # A Units Variant is an API object which holds unit properies of a variant
-    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume") && value > 0
-      scale = VariantUnitManager.getScale(value, unitsProduct.variant_unit)
-      Math.round(value/scale * 1000)/1000 + " " + VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+  $scope.getScale = (unitsProduct, unitsVariant) ->
+    if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume")
+      unitsProduct.variant_unit_scale
     else
+      null
+
+  $scope.getFormattedValueWithUnitName = (value, unitsProduct, unitsVariant, scale) ->
+    unit_name = VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
+    $scope.roundToThreeDecimals(value) + " " + unit_name
+
+  $scope.getGroupBySizeFormattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, unitsVariant)
+    if scale
+      value = value / scale if scale != 28.35 && scale != 1 && scale != 453.6 # divide by scale if not smallest unit
+      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+    else
+      ''
+
+  $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
+    scale = $scope.getScale(unitsProduct, unitsVariant)
+    if scale
+      $scope.getFormattedValueWithUnitName(value, unitsProduct, unitsVariant, scale)
+    else 
       ''
 
   $scope.fulfilled = (sumOfUnitValues) ->
@@ -158,7 +205,9 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
       $scope.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
       ( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
-        Math.round( sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size * 1000)/1000
+        scale = $scope.selectedUnitsProduct.variant_unit_scale
+        sumOfUnitValues = sumOfUnitValues * scale unless scale == 28.35 || scale == 453.6
+        $scope.roundToThreeDecimals(sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size)
     else
       ''
 

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

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

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

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

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

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

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

@@ -37,17 +37,6 @@ angular.module("admin.products").factory "VariantUnitManager", (availableUnits)
       options.push [[I18n.t('items'), 'items']]
       options = [].concat options...
 
-    @getScale: (value, unitType) ->
-      scaledValue = null
-      validScales = []
-      unitScales = VariantUnitManager.unitScales(unitType)
-
-      validScales.unshift scale for scale in unitScales when value/scale >= 1
-      if validScales.length > 0
-        validScales[0]
-      else
-        unitScales[0]
-
     @getUnitName: (scale, unitType) ->
       if @units[unitType][scale]
         @units[unitType][scale]['name']

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

@@ -82,10 +82,23 @@ adjustItems = function(shipment_number, variant_id, quantity){
   var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
 
   if (quantity == 0 && inventory_units.length == shipment.inventory_units.length) {
-    ofnAlert(t("js.admin.orders.cannot_remove_last_item"));
+    ofnCancelOrderAlert((confirm, sendEmailCancellation) => {
+      if (confirm) {
+        doAdjustItems(shipment_number, variant_id, quantity, inventory_units, () => {
+          var redirectTo = new URL(Spree.routes.cancel_order.toString());
+          redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+          window.location.href = redirectTo.toString();
+        });
+      }
+    });
     return;
   }
+  doAdjustItems(shipment_number, variant_id, quantity, inventory_units, () => {
+    window.location.reload();
+  });
+}
 
+doAdjustItems = function(shipment_number, variant_id, quantity, inventory_units, callback) {
   var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
 
   var new_quantity = 0;
@@ -106,7 +119,7 @@ adjustItems = function(shipment_number, variant_id, quantity){
       url: Spree.url(url),
       data: { variant_id: variant_id, quantity: new_quantity }
     }).done(function( msg ) {
-      window.location.reload();
+      callback();
     });
   }
 }
@@ -181,6 +194,24 @@ ofnAlert = function(message) {
   $('#custom-alert').show();
 }
 
+ofnCancelOrderAlert = function(callback) {
+  $('#custom-confirm .message').html(
+    ` ${t("js.admin.orders.cancel_the_order_html")}
+      <div class="form">
+        <input type="checkbox" name="send_cancellation_email" value="1" id="send_cancellation_email" />
+        <label for="send_cancellation_email">${t("js.admin.orders.cancel_the_order_send_cancelation_email")}</label>
+      </div>`);
+  $('#custom-confirm button.confirm').unbind( "click" ).click(() => {
+    $('#custom-confirm').hide();
+    callback(true, $('#send_cancellation_email').is(':checked'));
+  });
+  $('#custom-confirm button.cancel').click(() => {
+    $('#custom-confirm').hide();
+    callback(false)
+  });
+  $('#custom-confirm').show();
+}
+
 ofnConfirm = function(callback) {
   $('#custom-confirm').data($(event.target).data());
   $('#custom-confirm button.confirm').click(callback);

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

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

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

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

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

@@ -2,10 +2,9 @@ root = exports ? this
 
 root.taxon_tree_menu = (obj, context) ->
 
-  base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
-  admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons_path)
-  edit_url = admin_base_url.clone()
-  edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
+  base_url = Spree.url(Spree.routes.taxonomy_taxons)
+  admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons)
+  edit_url = Spree.url(Spree.routes.admin_taxonomy_taxons + '/' + obj.attr("id") + "/edit");
 
   create:
     label: "<i class='icon-plus'></i> " + Spree.translations.add,

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

@@ -9,7 +9,7 @@ handle_move = (e, data) ->
   new_parent = data.rslt.np
 
   url = Spree.url(base_url).clone()
-  url.setPath url.path() + '/' + node.attr("id")
+  url.pathname = url.pathname + '/' + node.attr("id")
   $.ajax
     type: "POST",
     dataType: "json",
@@ -41,7 +41,7 @@ handle_rename = (e, data) ->
   name = data.rslt.new_name
 
   url = Spree.url(base_url).clone()
-  url.setPath(url.path() + '/' + node.attr("id"))
+  url.pathname = url.pathname + '/' + node.attr("id")
 
   $.ajax
     type: "POST",
@@ -70,10 +70,10 @@ root = exports ? this
 root.setup_taxonomy_tree = (taxonomy_id) ->
   if taxonomy_id != undefined
     # this is defined within admin/taxonomies/edit
-    root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
+    root.base_url = Spree.url(Spree.routes.taxonomy_taxons)
 
     $.ajax
-      url: base_url.path().replace("/taxons", "/jstree"),
+      url: base_url.pathname.replace("/taxons", "/jstree"),
       success: (taxonomy) ->
         last_rollback = null
 
@@ -82,7 +82,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                base_url.path() + '/' + e.attr('id') + '/jstree'
+                base_url.pathname + '/' + e.attr('id') + '/jstree'
           themes:
             theme: "apple",
             url: "/assets/jquery.jstree/themes/apple/style.css"

app/assets/javascripts/admin/spree_paypal_express.js

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

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

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

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

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

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

@@ -10,15 +10,16 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
         element.select2
           placeholder: t('admin.orders.select_variant')
           minimumInputLength: 3
-          quietMillis: 300
           ajax:
             url: Spree.routes.variants_search
             datatype: "json"
+            quietMillis: 500 # debounce
             data: (term, page) ->
               q: term
               distributor_id: scope.distributor_id
               order_cycle_id: scope.order_cycle_id
               eligible_for_subscriptions: scope.eligible_for_subscriptions
+              include_out_of_stock: scope.include_out_of_stock
             results: (data, page) ->
               window.variants = data # this is how spree auto complete JS code picks up variants
               results: data
@@ -27,3 +28,5 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
           formatSelection: (variant) ->
             element.parent().children(".options_placeholder").html variant.options_text
             variant.name
+        element.on "select2-opening", ->
+          scope.include_out_of_stock = if $('#include_out_of_stock').is(':checked') then "1" else ""

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

@@ -6,6 +6,7 @@ angular.module("admin.utils").factory "StatusMessage", ->
       notice:   {style: {color: 'grey'}}
       success:  {style: {color: '#9fc820'}}
       failure:  {style: {color: '#da5354'}}
+      error:   {style: {color: '#da5354'}}
 
     statusMessage:
       text: ""

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

@@ -1,5 +1,4 @@
 #= require jquery2
-#= require jquery_ujs
 #= require jquery.ui.all
 #
 #= require angular
@@ -50,13 +49,15 @@
 #
 #= require modernizr
 #
+#= require foundation-sites/js/foundation.js
 #= require ./darkswarm
 #= require_tree ./mixins
 #= require_tree ./directives
 #= require_tree .
 
 document.addEventListener "turbo:load", ->
-  window.injector = angular.bootstrap document.body, ["Darkswarm"]
+  try
+    window.injector = angular.bootstrap document.body, ["Darkswarm"]
   true
 
 document.addEventListener "turbo:before-render", ->

app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee

@@ -1,19 +0,0 @@
-angular.module('Darkswarm').controller "ForgotCtrl", ($scope, $http, $location, AuthenticationService) ->
-  $scope.path = "/forgot"
-  $scope.sent = false
-
-  $scope.submit = ->
-    if $scope.spree_user.email != null
-      $http.post("/user/spree_user/password", {spree_user: $scope.spree_user}).then (response)->
-        $scope.sent = true
-      .catch (response) ->
-        $scope.errors = response.data.error
-        $scope.user_unconfirmed = (response.status == 401)
-    else
-      $scope.errors = t 'email_required'
-
-  $scope.resend_confirmation = ->
-    $http.post("/user/spree_user/confirmation", {spree_user: $scope.spree_user, return_url: $location.absUrl()}).then (response)->
-      $scope.messages = t('devise.confirmations.send_instructions')
-    .catch (response) ->
-      $scope.errors = t('devise.confirmations.failed_to_send')

app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee

@@ -1,34 +0,0 @@
-angular.module('Darkswarm').controller "LoginCtrl", ($scope, $timeout, $location, $http, $window, AuthenticationService, Redirections, Loading) ->
-  $scope.path = "/login"
-
-  $scope.modalMessage = null
-
-  $scope.$watch (->
-    AuthenticationService.modalMessage
-  ), (newValue) ->
-    $scope.errors = newValue
-
-  $scope.submit = ->
-    Loading.message = t 'logging_in'
-    $http.post("/user/spree_user/sign_in", {spree_user: $scope.spree_user}).then (response)->
-      if Redirections.after_login
-        $window.location.href = $window.location.origin + Redirections.after_login
-      else
-        $window.location.href = $window.location.origin + $window.location.pathname  # Strips out hash fragments
-    .catch (response) ->
-      Loading.clear()
-      $scope.errors = response.data.message || response.data.error
-      $scope.user_unconfirmed = (response.data.error == t('devise.failure.unconfirmed'))
-
-  $scope.resend_confirmation = ->
-    $http.post("/user/spree_user/confirmation", {spree_user: $scope.spree_user, return_url: $location.absUrl()}).then (response)->
-      $scope.messages = t('devise.confirmations.send_instructions')
-    .catch (response) ->
-      $scope.errors = t('devise.confirmations.failed_to_send')
-
-  $timeout ->
-    if angular.isDefined($location.search()['validation'])
-      if $location.search()['validation'] == 'confirmed'
-        $scope.messages = t('devise.confirmations.confirmed')
-      if $location.search()['validation'] == 'not_confirmed'
-        $scope.errors = t('devise.confirmations.not_confirmed')

app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee

@@ -1,15 +0,0 @@
-angular.module('Darkswarm').controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
-  $scope.path = "/signup"
-
-  $scope.spree_user.password_confirmation = ''
-
-  $scope.errors =
-    email: null
-    password: null
-
-  $scope.submit = ->
-    $http.post("/user/spree_user", {spree_user: $scope.spree_user, return_url: $location.absUrl()}).then (response)->
-      $scope.errors = {email: null, password: null}
-      $scope.messages = t('devise.user_registrations.spree_user.signed_up_but_unconfirmed')
-    .catch (response) ->
-      $scope.errors = response.data

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

@@ -1,12 +0,0 @@
-angular.module('Darkswarm').controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
-  $scope.open = AuthenticationService.open
-  $scope.toggle = AuthenticationService.toggle
-
-  $scope.spree_user = SpreeUser.spree_user
-  $scope.isActive = AuthenticationService.isActive
-  $scope.select = AuthenticationService.select
-
-  $scope.tabs =
-    login: { active: $scope.isActive('/login') }
-    signup: { active: $scope.isActive('/signup') }
-    forgot: { active: $scope.isActive('/forgot') }

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

@@ -1,4 +1,4 @@
-angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, AuthenticationService, SpreeUser, $http) ->
+angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, $http) ->
   $scope.Checkout = Checkout
   $scope.submitted = false
 
@@ -35,14 +35,9 @@ angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageServ
       $scope.$broadcast 'purchaseFormInvalid', $scope.formdata
 
   $scope.ensureUserIsGuest = (callback = null) ->
-    $http.post("/user/registered_email", {email: $scope.order.email}).then (response)->
-      if response.data.registered == true
-        $scope.promptLogin()
-      else
+    $http.post("/user/registered_email", {email: $scope.order.email})
+      .then (response)->
+        window.CableReady.perform(response.data)
+      .catch ->
         $scope.validateForm() if $scope.submitted
         callback() if callback
-
-  $scope.promptLogin = ->
-    SpreeUser.spree_user.email = $scope.order.email
-    AuthenticationService.pushMessage t('devise.failure.already_registered')
-    AuthenticationService.open '/login'

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

@@ -1,4 +1,4 @@
-angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, AuthenticationService, SpreeUser, $controller) ->
+angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, SpreeUser, $controller) ->
   angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
 
   $scope.name = "details"

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

@@ -1,4 +1,4 @@
-angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards, $controller) ->
+angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, $http, CreditCard, CreditCards, $controller) ->
   angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
 
   $scope.savedCreditCards = CreditCards.saved
@@ -12,3 +12,11 @@ angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, CreditCard, C
 
   $scope.allow_name_change = true
   $scope.disable_fields = false
+
+  $scope.deleteCard = (id) ->
+    $http(
+      method: "DELETE"
+      url: "/credit_cards/#{id}"
+    ).finally ->
+      window.location.reload()
+

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

@@ -1,4 +1,4 @@
-angular.module('Darkswarm').controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location, Enterprises, Search, $document, HashNavigation, FilterSelectorsService, EnterpriseModal, enterpriseMatchesNameQueryFilter, distanceWithinKmFilter) ->
+angular.module('Darkswarm').controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location, Enterprises, Search, $document, HashNavigation, FilterSelectorsService, EnterpriseModal, enterpriseMatchesQueryFilter, distanceWithinKmFilter) ->
   $scope.Enterprises = Enterprises
   $scope.producers_to_filter = Enterprises.producers
   $scope.filterSelectors = FilterSelectorsService.createSelectors()
@@ -55,8 +55,8 @@ angular.module('Darkswarm').controller "EnterprisesCtrl", ($scope, $rootScope, $
 
   $scope.filterEnterprises = ->
     es = Enterprises.hubs
-    $scope.nameMatches = enterpriseMatchesNameQueryFilter(es, true)
-    noNameMatches = enterpriseMatchesNameQueryFilter(es, false)
+    $scope.nameMatches = enterpriseMatchesQueryFilter(es, true)
+    noNameMatches = enterpriseMatchesQueryFilter(es, false)
     $scope.distanceMatches = distanceWithinKmFilter(noNameMatches, 50)
 
 

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

@@ -67,7 +67,7 @@ angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $
       page: page || $scope.page,
       per_page: $scope.per_page,
       'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
-      'q[properties_id_or_supplier_properties_id_in_any][]': $scope.activeProperties,
+      'q[with_properties][]': $scope.activeProperties,
       'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }
 

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

@@ -1,5 +0,0 @@
-angular.module('Darkswarm').directive 'auth', (AuthenticationService) ->
-  restrict: 'A'
-  link: (scope, elem, attrs) ->
-    elem.bind "click", ->
-      AuthenticationService.open '/' + attrs.auth

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

@@ -1,8 +1,6 @@
 angular.module('Darkswarm').directive "shippingTypeSelector", ->
   # Builds selector for shipping types
-  restrict: 'E'
-  replace: true
-  templateUrl: 'shipping_type_selector.html'
+  restrict: 'C'
   link: (scope, elem, attr)->
     scope.shippingTypes =
       pickup: false

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

@@ -1,7 +0,0 @@
-angular.module('Darkswarm').directive "shopVariant", ->
-  restrict: 'E'
-  replace: true
-  templateUrl: 'shop_variant.html'
-  scope:
-    variant: '='
-  controller: 'ShopVariantCtrl'

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

@@ -9,7 +9,7 @@ angular.module('Darkswarm').directive "stripeElements", ($injector, StripeElemen
     if $injector.has('stripeObject')
       stripe = $injector.get('stripeObject')
 
-      card = stripe.elements().create 'card',
+      card = stripe.elements({ locale: I18n.base_locale }).create 'card',
         hidePostalCode: true
         style:
           base:

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

@@ -1,4 +0,0 @@
-angular.module('Darkswarm').filter 'enterpriseMatchesNameQuery', ->
-  (enterprises, matches_name_query) ->
-    enterprises.filter (enterprise) ->
-      enterprise.matches_name_query == matches_name_query

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

@@ -0,0 +1,4 @@
+angular.module('Darkswarm').filter 'enterpriseMatchesQuery', ->
+  (enterprises, matches_query) ->
+    enterprises.filter (enterprise) ->
+      enterprise.matches_query == matches_query

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

@@ -1,54 +0,0 @@
-# This class deals with displaying things in the login modal. It chooses
-# the modal tab templates and deals with switching tabs and passing data
-# between the tabs. It has direct access to the instance of the login modal,
-# and provides that access to other controllers as a service.
-
-angular.module('Darkswarm').factory "AuthenticationService", (Navigation, $modal, $location, Redirections, Loading)->
-
-  new class AuthenticationService
-    selectedPath: "/login"
-    modalMessage: null
-
-    constructor: ->
-      if $location.path() in ["/login", "/signup", "/forgot"] || location.pathname is '/register/auth'
-        @open @initialTab(), @initialTemplate()
-
-    open: (path = false, template = 'authentication.html') =>
-      @modalInstance = $modal.open
-        templateUrl: template
-        windowClass: "login-modal medium"
-      @modalInstance.result.then @close, @close
-      @selectedPath = path || @selectedPath
-      Navigation.navigate @selectedPath
-
-    # Opens the /login tab if returning from email confirmation,
-    # the /signup tab if opened from the enterprise registration page,
-    # otherwise opens whichever tab is selected in the URL params ('/login', '/signup', or '/forgot')
-    initialTab: ->
-      if angular.isDefined($location.search()['validation'])
-        '/login'
-      else if location.pathname is '/register/auth'
-        '/signup'
-      else
-        $location.path()
-
-    # Loads the registration page modal when needed, otherwise the default modal
-    initialTemplate: ->
-      if location.pathname is '/register/auth'
-        'registration_authentication.html'
-      else
-        'authentication.html'
-    pushMessage: (message) ->
-      @modalMessage = String(message)
-
-    select: (path)=>
-      @selectedPath = path
-      Navigation.navigate @selectedPath
-
-    isActive: Navigation.isActive
-
-    close: ->
-      if location.pathname in ["/register", "/register/auth"]
-        Loading.message = t 'going_back_to_home_page'
-        location.hash = ""
-        location.pathname = "/"

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

@@ -61,7 +61,9 @@ angular.module('Darkswarm').factory "EnterpriseRegistrationService", ($http, Reg
       enterprise = {}
       excluded = [ 'address', 'country', 'id' ]
       for key, value of @enterprise when key not in excluded
-        enterprise[key] = value
+        if (key == 'long_description')
+          enterprise[key] = value.replace(/(?:\r\n|\r|\n)/g, '<br>')
+        else enterprise[key] = value
       enterprise.address_attributes = @enterprise.address if @enterprise.address?
       enterprise.address_attributes.country_id = @enterprise.country.id if @enterprise.country?
       enterprise

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

@@ -53,8 +53,8 @@ angular.module('Darkswarm').factory 'Enterprises', (enterprises, ShopsResource,
 
     flagMatching: (query) ->
       for enterprise in @enterprises
-        enterprise.matches_name_query = if query? && query.length > 0
-          Matcher.match([enterprise.name], query)
+        enterprise.matches_query = if query? && query.length > 0
+          Matcher.match([enterprise.name, enterprise.address?.state_name, enterprise.address?.city], query)
         else
           false
 

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

@@ -1,3 +0,0 @@
-angular.module('Darkswarm').factory "Redirections", ($location)->
-  new class Redirections
-    after_login: $location.search().after_login

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

@@ -16,7 +16,7 @@ angular.module('Darkswarm').factory 'StripeElements', ($rootScope, Messages) ->
           @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
+          secrets.cc_type = response.token.card.brand
           secrets.card = response.token.card
           submit()
       .catch (response) =>
@@ -37,7 +37,7 @@ angular.module('Darkswarm').factory 'StripeElements', ($rootScope, Messages) ->
           @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
+          secrets.cc_type = response.paymentMethod.card.brand
           secrets.card = response.paymentMethod.card
           submit()
       .catch (response) =>
@@ -56,24 +56,6 @@ angular.module('Darkswarm').factory 'StripeElements', ($rootScope, Messages) ->
       # $evalAsync is improved way of triggering a digest without calling $apply
       $rootScope.$evalAsync()
 
-    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
-    mapTokenApiCardBrand: (cardBrand) ->
-      switch cardBrand
-        when 'MasterCard' then return 'master'
-        when 'Visa' then return 'visa'
-        when 'American Express' then return 'american_express'
-        when 'Discover' then return 'discover'
-        when 'JCB' then return 'jcb'
-        when 'Diners Club' then return 'diners_club'
-
-    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
-    mapPaymentMethodsApiCardBrand: (cardBrand) ->
-      switch cardBrand
-        when 'mastercard' then return 'master'
-        when 'amex' then return 'american_express'
-        when 'diners' then return 'diners_club'
-        else return cardBrand # a few brands are equal, for example, visa
-
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

app/assets/javascripts/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: image_path("/spinning-circles.svg"), ng: { show: "loading" } }
 %p{ ng: { show: "loading" } }
   = t('js.admin.orders.index.please_wait')
 

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

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

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

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

app/assets/javascripts/templates/admin/schedule_dialog.html.haml

@@ -21,5 +21,4 @@
       %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } }
       %span{ ng: { show: 'schedule.id' } } or
       %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} }
-      or
       %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } }

app/assets/javascripts/templates/admin/show_more.html.haml

@@ -1,4 +1,3 @@
 %div{ ng: { show: "data.length > limit" } }
   %input{ type: 'button', value: t(:show_more), ng: { click: 'limit = limit + increment' } }
-  or
   %input{ type: 'button', value: t(:show_all_with_more, num: '{{ data.length - limit }}'), ng: { click: 'limit = data.length' } }

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

@@ -1,7 +0,0 @@
-%div{"ng-controller" => "AuthenticationCtrl"}
-  %tabset
-    %ng-include{src: "'login.html'"}
-    %ng-include{src: "'signup.html'"}
-    %ng-include{src: "'forgot.html'"}
-%a.close-reveal-modal{"ng-click" => "$close()"}  
-  %i.ofn-i_009-close

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

@@ -1,31 +0,0 @@
-%tab#forgot{ heading: "{{'forgot_password' | t}}", active: "tabs.forgot.active", select: "select(path)"}
-  %form{ ng: { controller: "ForgotCtrl", submit: "submit()" } }
-    .row
-      .large-12.columns
-        .alert-box.success{"ng-show" => "sent"}
-          {{ 'password_reset_sent' | t }}
-
-        .alert-box.success{"ng-show" => "messages != null"}
-          {{ messages }}
-
-        .alert-box.alert{"ng-show" => "errors != null"}
-          {{ errors }}
-          %a{ng: {show: 'user_unconfirmed', click: 'resend_confirmation()'}}
-            = t('devise.confirmations.resend_confirmation_email')
-
-    .row
-      .large-12.columns
-        %label{for: "email"} {{'signup_email' | t}}
-        %input.title.input-text{name: "email",
-          type: "email",
-          id: "email",
-          tabindex: 1,
-          inputmode: "email",
-          "ng-model" => "spree_user.email"}
-    .row
-      .large-12.columns
-        %input.button.primary{name: "commit",
-          tabindex: "3",
-          type: "submit",
-          value: "{{'reset_password' | t}}"}
-

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

@@ -1,44 +0,0 @@
-%tab#login-content{ heading: "{{'label_login' | t}}", active: "tabs.login.active", select: "select(path)"}
-  %form{ ng: { controller: "LoginCtrl", submit: "submit()" } }
-    .row
-      .large-12.columns
-        .alert-box.alert{"ng-show" => "errors != null"}
-          {{ errors }}
-          %a{ng: {show: 'user_unconfirmed', click: 'resend_confirmation()'}}
-            = t('devise.confirmations.resend_confirmation_email')
-        .alert-box.success{ng: {show: 'messages != null'}}
-          {{ messages }}
-    .row
-      .large-12.columns
-        %label{for: "email"} {{'email' | t}}
-        %input.title.input-text{name: "email",
-          type: "email",
-          id: "email",
-          tabindex: 1,
-          inputmode: "email",
-          "ng-model" => "spree_user.email"}
-    .row
-      .large-12.columns
-        %label{for: "password"} {{'password' | t}}
-        %input.title.input-text{name: "password",
-          type: "password",
-          id: "password",
-          autocomplete: "off",
-          tabindex: 2,
-          inputmode: "password",
-          "ng-model" => "spree_user.password"}
-    .row
-      .large-12.columns
-        %input{name: "remember_me",
-        type: "checkbox",
-        id: "remember_me",
-        value: "1",
-        "ng-model" => "spree_user.remember_me"}
-        %label{for: "remember_me"} {{'remember_me' | t}}
-    .row
-      .large-12.columns
-        %input.button.primary{name: "commit",
-          tabindex: "3",
-          type: "submit",
-          value: "{{'label_login' | t}}"}
-

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

@@ -2,7 +2,7 @@
   %p.modal-header {{'follow' | t}}
   .follow-icons
     %span{"ng-if" => "::enterprise.twitter"}
-      %a{"ng-href" => "http://twitter.com/{{::enterprise.twitter}}", target: "_blank"}
+      %a{"ng-href" => "http://www.twitter.com/{{::enterprise.twitter}}", target: "_blank"}
         %i.ofn-i_041-twitter
 
     %span{"ng-if" => "::enterprise.facebook"}
@@ -14,5 +14,5 @@
         %i.ofn-i_042-linkedin
 
     %span{"ng-if" => "::enterprise.instagram"}
-      %a{"ng-href" => "http://instagram.com/{{::enterprise.instagram}}", target: "_blank"}
+      %a{"ng-href" => "http://www.instagram.com/{{::enterprise.instagram}}", target: "_blank"}
         %i.ofn-i_043-instagram

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

@@ -14,7 +14,8 @@
         %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-click" => "$close()",
+        "ofn-change-hub" => "hub"}
           .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/registration_authentication.html.haml

@@ -1,17 +0,0 @@
-.container
-  .row.modal-centered
-    %h2 {{'js.registration.welcome_to_ofn' | t}}
-    %h5 {{'js.registration.signup_or_login' | t}}:
-  %div{"ng-controller" => "AuthenticationCtrl"}
-    %tabset
-      %ng-include{src: "'signup.html'"}
-      %ng-include{src: "'login.html'"}
-      %ng-include{src: "'forgot.html'"}
-    %div{ ng: { show: "active('/signup')"} }
-      %hr
-      {{'js.registration.have_an_account' | t}}
-      %a{ href: "", ng: { click: "select('/login')"}}
-        {{'js.registration.action_login' | t}}
-
-%a.close-reveal-modal{"ng-click" => "$close()"}
-  %i.ofn-i_009-close

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

@@ -1,4 +0,0 @@
-%ul.small-block-grid-2.medium-block-grid-4.large-block-grid-2
-  %active-selector{"ng-repeat" => "(name, selector) in selectors"}
-    %i{"ng-class" => "selector.icon"}
-    {{ selector.translation_key | t | capitalize }}

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

@@ -1,23 +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,
-      key: "'js.shopfront.unit_price_tooltip'"}
-      {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
-        
-  .medium-2.large-2.columns.total-price
-    %span{"ng-class" => "{filled: variant.line_item.total_price}"}
-      {{ variant.line_item.total_price | localizeCurrency }}
-  %ng-include{src: "'partials/shop_variant_no_group_buy.html'"}
-  %ng-include{src: "'partials/shop_variant_with_group_buy.html'"}

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

@@ -1,51 +0,0 @@
-%tab#sign-up-content{ heading: "{{'label_signup' | t}}", active: 'tabs.signup.active', select: "select(path)"}
-  %form{ ng: { controller: "SignupCtrl", submit: "submit()" } }
-    .row
-      .large-12.columns
-        .alert-box.success{ng: {show: 'messages != null'}}
-          {{ messages }}
-      .large-12.columns
-        .alert-box.alert{ng: {show: 'errors.message != null'}}
-          {{ errors.message }}
-    .row
-      .large-12.columns
-        %label{for: "email"} {{'signup_email' | t}}
-        %input.title.input-text{name: "email",
-          type: "email",
-          id: "email",
-          tabindex: 1,
-          inputmode: "email",
-          "ng-model" => "spree_user.email"}
-        %span.error{"ng-show" => "errors.email != null"}
-          {{ errors.email.join(' ') }}
-    .row
-      .large-12.columns
-        %label{for: "password"} {{'choose_password' | t}}
-        %input.title.input-text{name: "password",
-          type: "password",
-          id: "password",
-          autocomplete: "off",
-          tabindex: 2,
-          inputmode: "password",
-          "ng-model" => "spree_user.password"}
-        %span.error{"ng-show" => "errors.password != null"}
-          {{ errors.password.join(' ') }}
-    .row
-      .large-12.columns
-        %label{for: "password_confirmation"} {{'confirm_password' | t}}
-        %input.title.input-text{name: "password_confirmation",
-          type: "password",
-          id: "password_confirmation",
-          autocomplete: "off",
-          tabindex: 2,
-          inputmode: "password",
-          "ng-model" => "spree_user.password_confirmation"}
-        %span.error{"ng-show" => "errors.password_confirmation != null"}
-          {{ errors.password_confirmation.join(' ') }}
-    .row
-      .large-12.columns
-        %input.button.primary{name: "commit",
-          tabindex: "3",
-          type: "submit",
-          value: "{{'action_signup' | t}}"}
-

app/assets/stylesheets/admin/advanced_settings.scss

@@ -1,21 +0,0 @@
-@import "variables";
-
-#advanced_settings {
-  background-color: $spree-light-blue;
-  border: 1px solid $pale-blue;
-  margin-bottom: 20px;
-
-  .row{
-    margin: 0px -4px;
-
-    padding: 20px 0px;
-
-    .column.alpha, .columns.alpha {
-      padding-left: 20px;
-    }
-
-    .column.omega, .columns.omega {
-      padding-right: 20px;
-    }
-  }
-}

app/assets/stylesheets/admin/all.scss

@@ -1,53 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
-
- *= require normalize
- *= require responsive-tables
- *= require jquery.powertip
- *= require jquery.ui.dialog
- *= 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
-*/
-
-//************************************************************************//
-//************************************************************************//
-@import 'globals/functions';
-@import 'globals/variables';
-@import 'variables';
-@import 'globals/mixins';
-
-@import 'shared/typography';
-@import 'shared/tables';
-@import 'shared/icons';
-@import 'shared/forms';
-@import 'shared/layout';
-
-@import 'plugins/flatpickr-customization';
-
-@import 'plugins/powertip';
-@import 'plugins/jstree';
-@import 'plugins/font-awesome';
-@import 'plugins/select2';
-
-@import 'sections/orders';
-@import 'sections/products';
-
-@import 'hacks/mozilla';
-@import 'hacks/opera';
-@import 'hacks/ie';
-
-@import 'components/*';
-@import 'pages/*';
-@import '*';
-
-@import "../shared/question-mark-icon";
-@import "question-mark-tooltip";

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

@@ -1,31 +0,0 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-
-#progress {
-  @include border-radius(10px);
-  position: fixed;
-  top: -10px;
-  left: 50%;
-  z-index: 1000;
-  opacity: 0.8;
-  width: 200px;
-  background-color: $spree-blue;
-  color: $color-1;
-  display: none;
-  font-size: 120%;
-  font-weight: bold;
-  line-height: 40px;
-  margin-left: -100px;
-  padding-top: 15px;
-  text-align: center;
-  text-transform: uppercase;
-
-  .spinner {
-    position: absolute;
-    left: 50%;
-    width: 30px;
-    height: 30px;
-    top: -5px;
-    margin-left: -15px;
-  }
-}

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

@@ -1,26 +0,0 @@
-@import 'admin/plugins/font-awesome';
-
-// Some fixes for fontwesome stylesheets
-[class^="icon-"], [class*=" icon-"] {
-  &:before {
-    padding-right: 5px;
-  }
-
-  &.button, &.icon_link {
-    width: auto;
-
-    &:before {
-      padding-top: 3px;
-    }
-  }
-}
-
-.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,
-.icon-void:before     { @extend .icon-remove:before   }
-
-.icon-capture:before  { @extend .icon-ok:before       }
-.icon-credit:before   { @extend .icon-ok:before       }

app/assets/stylesheets/darkswarm/all.scss

@@ -1,25 +0,0 @@
-/*
-   * This is a manifest file that'll automatically include all the stylesheets available in this directory
-   * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
-   * the top of the compiled file, but it's generally better to create a new file per style scope.
-
-   *= require autocomplete
-   *= require leaflet
-
-   *= require_self
-*/
-@import 'variables';
-@import 'foundation';
-@import 'foundation-icons';
-
-@import 'base/*';
-@import 'layout/*';
-@import '*';
-@import 'pages/*';
-@import 'web/all';
-
-ofn-modal {
-  display: block;
-}
-
-@import "../shared/question-mark-icon";

app/assets/stylesheets/darkswarm/base/colors.scss

@@ -1,13 +0,0 @@
-@import 'darkswarm/branding';
-
-$modal-background-color: #efefef;
-$modal-content-background-color: #fff;
-$modal-alert-link-color: #fff;
-$modal-alert-link-hover-color: rgba(255, 255, 255, .7);
-
-$cookies-banner-background-color: $dark-grey;
-$cookies-banner-button-background-color: $clr-turquoise;
-$cookies-banner-text-color: $white;
-$cookies-policy-modal-background-color: $disabled-light;
-$cookies-policy-modal-border-bottom-color: $disabled-light;
-$cookies-policy-modal-table-tr-even-background-color: $disabled-very-light;

app/assets/stylesheets/mail/all.css

@@ -1,11 +0,0 @@
-/* This file MUST be plain css, as roadie does not seem to be able to handle other file types */
-
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
-
- *= require_self
- *= require_tree .
-*/

app/constraints/split_checkout_constraint.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class SplitCheckoutConstraint
   def matches?(request)
-    Flipper.enabled? :split_checkout, current_user(request)
+    OpenFoodNetwork::FeatureToggle.enabled? :split_checkout, current_user(request)
   end
 
   def current_user(request)
-    @spree_current_user ||= request.env['warden'].user
+    request.env['warden'].user
   end
 end

app/controllers/admin/customers_controller.rb

@@ -99,7 +99,7 @@ module Admin
 
     def customer_params
       params.require(:customer).permit(
-        :enterprise_id, :name, :email, :code, :tag_list,
+        :enterprise_id, :first_name, :last_name, :email, :code, :tag_list,
         ship_address_attributes: PermittedAttributes::Address.attributes,
         bill_address_attributes: PermittedAttributes::Address.attributes,
       )

app/controllers/admin/enterprise_fees_controller.rb

@@ -36,12 +36,12 @@ module Admin
 
     def bulk_update
       @flat_percent_value = enterprise_fee_bulk_params.dig('collection_attributes', '0', 'calculator_attributes', 'preferred_flat_percent')
-      
-      unless @flat_percent_value.nil? || Float(@flat_percent_value, exception: false) 
-        flash[:error] = I18n.t(:calculator_preferred_value_error) 
-        return redirect_to redirect_path      
+
+      unless @flat_percent_value.nil? || Float(@flat_percent_value, exception: false)
+        flash[:error] = I18n.t(:calculator_preferred_value_error)
+        return redirect_to redirect_path
       end
-      
+
       @enterprise_fee_set = Sets::EnterpriseFeeSet.new(enterprise_fee_bulk_params)
 
       if @enterprise_fee_set.save

app/controllers/admin/enterprises_controller.rb

@@ -234,8 +234,10 @@ module Admin
     end
 
     def update_enterprise_notifications
-      if params.key? :receives_notifications
-        @enterprise.update_contact params[:receives_notifications]
+      user_id = params[:receives_notifications].to_i
+
+      if user_id.positive? && @enterprise.user_ids.include?(user_id)
+        @enterprise.update_contact(user_id)
       end
     end
 

app/controllers/admin/order_cycles_controller.rb

@@ -26,7 +26,9 @@ module Admin
 
     def show
       respond_to do |format|
-        format.html
+        format.html do
+          redirect_to edit_admin_order_cycle_path(@order_cycle)
+        end
         format.json do
           render_as_json @order_cycle, current_user: spree_current_user
         end

app/controllers/admin/reports_controller.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Admin
+  class ReportsController < Spree::Admin::BaseController
+    include ReportsActions
+    helper ReportsHelper
+
+    before_action :authorize_report
+
+    def show
+      render_report && return if ransack_params.blank?
+
+      @report = report_class.new(spree_current_user, ransack_params, report_options)
+
+      if export_spreadsheet?
+        export_report
+      else
+        render_report
+      end
+    end
+
+    private
+
+    def export_report
+      render report_format.to_sym => @report.public_send("to_#{report_format}"),
+             :filename => report_filename
+    end
+
+    def render_report
+      assign_view_data
+      load_form_options
+
+      render report_type
+    end
+
+    def assign_view_data
+      @report_type = report_type
+      @report_subtype = report_subtype || report_loader.default_report_subtype
+      @report_subtypes = report_class.report_subtypes.map do |subtype|
+        [t("packing.#{subtype}_report", scope: i18n_scope), subtype]
+      end
+    end
+
+    def load_form_options
+      return unless form_options_required?
+
+      form_options = Reporting::FrontendData.new(spree_current_user)
+
+      @distributors = form_options.distributors.to_a
+      @suppliers = form_options.suppliers.to_a
+      @order_cycles = form_options.order_cycles.to_a
+    end
+  end
+end

app/controllers/admin/subscriptions_controller.rb

@@ -16,15 +16,16 @@ module Admin
       respond_to do |format|
         format.html do
           if view_context.subscriptions_setup_complete?(@shops)
-            @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user)
-            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user)
+            @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user).includes([:distributors, :cached_incoming_exchanges])
+            @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).includes(:taggings)
+            @payment_method_tags = payment_method_tags_by_id
             @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user)
           else
             @shop = @shops.first
             render :setup_explanation
           end
         end
-        format.json { render_as_json @collection, ams_prefix: params[:ams_prefix] }
+        format.json { render_as_json @collection, ams_prefix: params[:ams_prefix], payment_method_tags: payment_method_tags_by_id }
       end
     end
 
@@ -165,5 +166,21 @@ module Admin
       @subscription_params ||= PermittedAttributes::Subscription.new(params).call.
         to_h.with_indifferent_access
     end
+
+    def payment_method_tags_by_id
+      payment_method_tags = ::ActsAsTaggableOn::Tag.
+        joins(:taggings).
+        includes(:taggings).
+        where(taggings: { taggable_type: "Spree::PaymentMethod",
+                          taggable_id: Spree::PaymentMethod.from(Enterprise.managed_by(spree_current_user).
+                          select('enterprises.id').find_by(id: params[:enterprise_id])),
+                          context: 'tags' })
+
+      payment_method_tags.each_with_object({}) do |tag, hash|
+        payment_method_id = tag.taggings.first.taggable_id
+        hash[payment_method_id] ||= []
+        hash[payment_method_id] << tag.name
+      end
+    end
   end
 end

app/controllers/api/v0/base_controller.rb

@@ -52,11 +52,11 @@ module Api
 
         if api_key.blank?
           # An anonymous user
-          @current_api_user = Spree.user_class.new
+          @current_api_user = Spree::User.new
           return
         end
 
-        return if @current_api_user = Spree.user_class.find_by(spree_api_key: api_key.to_s)
+        return if @current_api_user = Spree::User.find_by(spree_api_key: api_key.to_s)
 
         invalid_api_key
       end

app/controllers/api/v0/exchange_products_controller.rb

@@ -75,7 +75,10 @@ module Api
       def render_paginated_products
         results = products
 
-        @pagy, results = pagy(results, items: params[:per_page] || DEFAULT_PER_PAGE) if pagination_required?
+        if pagination_required?
+          @pagy, results = pagy(results,
+                                items: params[:per_page] || DEFAULT_PER_PAGE)
+        end
 
         serialized_products = ActiveModel::ArraySerializer.new(
           results,

app/controllers/api/v0/order_cycles_controller.rb

@@ -81,8 +81,7 @@ module Api
 
       def permitted_ransack_params
         [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
-         :properties_id_or_supplier_properties_id_in_any,
-         :primary_taxon_id_in_any]
+         :with_properties, :primary_taxon_id_in_any]
       end
 
       def distributor

app/controllers/api/v0/orders_controller.rb

@@ -15,7 +15,10 @@ module Api
 
         orders = SearchOrders.new(params, current_api_user).orders
 
-        @pagy, orders = pagy(orders, items: params[:per_page] || default_per_page) if pagination_required?
+        if pagination_required?
+          @pagy, orders = pagy(orders,
+                               items: params[:per_page] || default_per_page)
+        end
 
         render json: {
           orders: serialized_orders(orders),

app/controllers/api/v0/reports_controller.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Api
+  module V0
+    class ReportsController < Api::V0::BaseController
+      include ReportsActions
+
+      rescue_from ::Reporting::Errors::Base, with: :render_error
+
+      before_action :validate_report, :authorize_report, :validate_query
+
+      def show
+        @report = report_class.new(current_api_user, ransack_params, report_options)
+
+        render_report
+      end
+
+      private
+
+      def render_report
+        render json: { data: @report.as_json }
+      end
+
+      def render_error(error)
+        render json: { error: error.message }, status: :unprocessable_entity
+      end
+
+      def validate_report
+        raise ::Reporting::Errors::NoReportType if report_type.blank?
+        raise ::Reporting::Errors::ReportNotFound if report_class.blank?
+      end
+
+      def validate_query
+        raise ::Reporting::Errors::MissingQueryParams if ransack_params.blank?
+      end
+    end
+  end
+end

app/controllers/application_controller.rb

@@ -37,8 +37,8 @@ class ApplicationController < ActionController::Base
   include Spree::Core::ControllerHelpers::RespondWith
   include Spree::Core::ControllerHelpers::Common
 
-  prepend_before_action :restrict_iframes
   before_action :set_cache_headers # prevent cart emptying via cache when using back button #1213
+  before_action :set_after_login_url
 
   include RawParams
   include EnterprisesHelper
@@ -62,15 +62,11 @@ class ApplicationController < ActionController::Base
   end
 
   def set_checkout_redirect
-    referer_path = OpenFoodNetwork::RefererParser.path(request.referer)
-    if referer_path
-      is_checkout_path_the_referer = [main_app.checkout_path].include?(referer_path)
-      session["spree_user_return_to"] = if is_checkout_path_the_referer
-                                          referer_path
-                                        else
-                                          main_app.root_path
-                                        end
-    end
+    referer_path = URI(request.referer.to_s).path
+    return unless referer_path == main_app.checkout_path ||
+                  referer_path == main_app.checkout_step_path(:details)
+
+    session["spree_user_return_to"] = main_app.checkout_path
   end
 
   def shopfront_session
@@ -103,27 +99,20 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def set_after_login_url
+    store_location_for(:spree_user, params[:after_login]) if params[:after_login]
+  end
+
   def shopfront_redirect
     session[:shopfront_redirect]
   end
 
-  def restrict_iframes
-    response.headers['X-Frame-Options'] = 'DENY'
-    response.headers['Content-Security-Policy'] = "frame-ancestors 'none'"
-  end
-
-  def enable_embedded_shopfront
-    embed_service = EmbeddedPageService.new(params, session, request, response)
-    embed_service.embed!
-    @shopfront_layout = 'embedded' if embed_service.use_embedded_layout?
-  end
-
   def action
     params[:action].to_sym
   end
 
   def require_distributor_chosen
-    unless @distributor = current_distributor
+    unless (@distributor = current_distributor)
       redirect_to main_app.root_path
       false
     end
@@ -151,15 +140,6 @@ class ApplicationController < ActionController::Base
       !current_distributor.ready_for_checkout?
   end
 
-  def check_order_cycle_expiry
-    if current_order_cycle&.closed?
-      current_order.empty!
-      current_order.set_order_cycle! nil
-      flash[:info] = I18n.t('order_cycle_closed')
-      redirect_to main_app.shop_path
-    end
-  end
-
   # All render calls within the block will be performed with the specified format
   # Useful for rendering html within a JSON response, particularly if the specified
   # template or partial then goes on to render further partials without specifying

app/controllers/base_controller.rb

@@ -12,7 +12,6 @@ class BaseController < ApplicationController
   include OrderCyclesHelper
 
   before_action :set_locale
-  before_action :check_order_cycle_expiry
 
   private
 

app/controllers/cart_controller.rb

@@ -28,7 +28,7 @@ class CartController < BaseController
   end
 
   def check_authorization
-    session[:access_token] ||= params[:token]
+    session[:access_token] ||= params[:order_token]
     order = Spree::Order.find_by(number: params[:id]) || current_order
 
     if order

app/controllers/checkout_controller.rb

@@ -3,9 +3,10 @@
 require 'open_food_network/address_finder'
 
 class CheckoutController < ::BaseController
-  layout 'darkswarm'
-
   include OrderStockCheck
+  include OrderCompletion
+
+  layout 'darkswarm'
 
   helper 'terms_and_conditions'
   helper 'checkout'
@@ -21,26 +22,14 @@ class CheckoutController < ::BaseController
 
   before_action :load_order
 
-  before_action :ensure_order_not_completed
-  before_action :ensure_checkout_allowed
   before_action :handle_insufficient_stock
 
   before_action :associate_user
   before_action :check_authorization
-  before_action :enable_embedded_shopfront
 
   helper 'spree/orders'
 
-  def edit
-    return handle_redirect_from_stripe if valid_payment_intent_provided?
-
-    # This is only required because of spree_paypal_express. If we implement
-    # a version of paypal that uses this controller, and more specifically
-    # the #action_failed method, then we can remove this call
-    reset_order_to_cart
-  rescue Spree::Core::GatewayError => e
-    rescue_from_spree_gateway_error(e)
-  end
+  def edit; end
 
   def update
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
@@ -48,7 +37,8 @@ class CheckoutController < ::BaseController
 
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
-    rescue_from_spree_gateway_error(e)
+    gateway_error(e)
+    action_failed(e)
   rescue StandardError => e
     flash[:error] = I18n.t("checkout.failed")
     action_failed(e)
@@ -56,52 +46,22 @@ class CheckoutController < ::BaseController
     @order.update_order!
   end
 
-  # Clears the cached order. Required for #current_order to return a new order
-  # to serve as cart. See https://github.com/spree/spree/blob/1-3-stable/core/lib/spree/core/controller_helpers/order.rb#L14
-  # for details.
-  def expire_current_order
-    session[:order_id] = nil
-    @current_order = nil
-  end
-
   private
 
   def check_authorization
     authorize!(:edit, current_order, session[:access_token])
   end
 
-  def ensure_checkout_allowed
-    redirect_to main_app.cart_path unless @order.checkout_allowed?
-  end
-
-  def ensure_order_not_completed
-    redirect_to main_app.cart_path if @order.completed?
-  end
-
   def load_order
-    @order = current_order
+    load_checkout_order
 
-    redirect_to(main_app.shop_path) && return if redirect_to_shop?
-    handle_invalid_stock && return unless valid_order_line_items?
+    return handle_invalid_stock unless valid_order_line_items?
 
     before_address
     setup_for_current_state
   end
 
-  def redirect_to_shop?
-    !@order ||
-      !@order.checkout_allowed? ||
-      @order.completed?
-  end
-
-  def valid_order_line_items?
-    @order.insufficient_stock_lines.empty? &&
-      OrderCycleDistributedVariants.new(@order.order_cycle, @order.distributor).
-        distributes_order_variants?(@order)
-  end
-
   def handle_invalid_stock
-    cancel_incomplete_payments if valid_payment_intent_provided?
     reset_order_to_cart
 
     respond_to do |format|
@@ -115,20 +75,6 @@ class CheckoutController < ::BaseController
     end
   end
 
-  def cancel_incomplete_payments
-    # The checkout could not complete due to stock running out. We void any pending (incomplete)
-    # Stripe payments here as the order will need to be changed and resubmitted (or abandoned).
-    @order.payments.incomplete.each do |payment|
-      payment.void_transaction!
-      payment.adjustment&.update_columns(eligible: false, state: "finalized")
-    end
-    flash[:notice] = I18n.t("checkout.payment_cancelled_due_to_stock")
-  end
-
-  def reset_order_to_cart
-    OrderCheckoutRestart.new(@order).call
-  end
-
   def setup_for_current_state
     method_name = :"before_#{@order.state}"
     __send__(method_name) if respond_to?(method_name, true)
@@ -147,31 +93,13 @@ class CheckoutController < ::BaseController
     current_order.payments.destroy_all if request.put?
   end
 
-  def valid_payment_intent_provided?
-    return false unless params["payment_intent"]&.starts_with?("pi_")
-
-    last_payment = OrderPaymentFinder.new(@order).last_payment
-    @order.state == "payment" &&
-      last_payment&.state == "requires_authorization" &&
-      last_payment&.response_code == params["payment_intent"]
-  end
-
-  def handle_redirect_from_stripe
-    return checkout_failed unless @order.process_payments!
-
-    if OrderWorkflow.new(@order).next && order_complete?
-      checkout_succeeded
-      redirect_to(order_path(@order)) && return
-    else
-      checkout_failed
-    end
-  end
-
   def checkout_workflow(shipping_method_id)
     while @order.state != "complete"
       if @order.state == "payment"
+        update_payment_total
         return if redirect_to_payment_gateway
 
+        return action_failed if @order.errors.any?
         return action_failed unless @order.process_payments!
       end
 
@@ -183,26 +111,28 @@ class CheckoutController < ::BaseController
     update_response
   end
 
-  def redirect_to_payment_gateway
-    redirect_path = Checkout::PaypalRedirect.new(params).path
-    redirect_path = Checkout::StripeRedirect.new(params, @order).path if redirect_path.blank?
-    return if redirect_path.blank?
+  def update_payment_total
+    @order.updater.update_totals
+    @order.updater.update_pending_payment
+  end
 
-    render json: { path: redirect_path }, status: :ok
+  def redirect_to_payment_gateway
+    return unless selected_payment_method.external_gateway?
+    return unless (redirect_url = selected_payment_method.external_payment_url(order: @order))
+
+    render json: { path: redirect_url }, status: :ok
     true
   end
 
-  def order_error
-    if @order.errors.present?
-      @order.errors.full_messages.to_sentence
-    else
-      t(:payment_processing_failed)
-    end
+  def selected_payment_method
+    @selected_payment_method ||= Spree::PaymentMethod.find(
+      params.dig(:order, :payments_attributes, 0, :payment_method_id)
+    )
   end
 
   def update_response
     if order_complete?
-      checkout_succeeded
+      processing_succeeded
       update_succeeded_response
     else
       action_failed(RuntimeError.new("Order not complete after the checkout workflow"))
@@ -213,35 +143,22 @@ class CheckoutController < ::BaseController
     @order.state == "complete" || @order.completed?
   end
 
-  def checkout_succeeded
-    Checkout::PostCheckoutActions.new(@order).success(self, params, spree_current_user)
-
-    session[:access_token] = current_order.token
-    flash[:notice] = t(:order_processed_successfully)
-  end
-
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: order_path(@order))
+        respond_with(@order, location: order_completion_route)
       end
       format.json do
-        render json: { path: order_path(@order) }, status: :ok
+        render json: { path: order_completion_route }, status: :ok
       end
     end
   end
 
-  def action_failed(error = RuntimeError.new(order_error))
-    checkout_failed(error)
+  def action_failed(error = RuntimeError.new(order_processing_error))
+    processing_failed(error)
     action_failed_response
   end
 
-  def checkout_failed(error = RuntimeError.new(order_error))
-    Bugsnag.notify(error)
-    flash[:error] = order_error if flash.blank?
-    Checkout::PostCheckoutActions.new(@order).failure
-  end
-
   def action_failed_response
     respond_to do |format|
       format.html do
@@ -254,11 +171,6 @@ class CheckoutController < ::BaseController
     end
   end
 
-  def rescue_from_spree_gateway_error(error)
-    flash[:error] = t(:spree_gateway_error_flash_for_checkout, error: error.message)
-    action_failed(error)
-  end
-
   def permitted_params
     PermittedAttributes::Checkout.new(params).call
   end