Merge pull request #7781 from andrewpbrett/decouple-payments

Decouple payments
Merge pull request #7873 from openfoodfoundation/transifex
2026-01-20 19:56:48 +00:00 · 2021-07-01 18:07:01 -07:00 · 2021-07-01 18:57:56 +02:00 · 2021-07-02 02:28:44 +10:00 · 2021-07-02 02:28:42 +10:00 · 2021-07-02 02:25:41 +10:00
750 changed files with 12222 additions and 5019 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -0,0 +1 @@
+defaults
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ env:
  DISABLE_KNAPSACK: true
  TIMEZONE: UTC
  COVERAGE: true
+  RSPEC_RETRY_RETRY_COUNT: 3

 jobs:
  test-controllers-and-serializers:
--- a/.gitignore
+++ b/.gitignore
@@ -46,5 +46,10 @@ vendor/bundle/
 coverage
 /reports/
 !/reports/README.md
-bin/
 /spec/components/stories/**/*.stories.json
+
+/public/packs
+/public/packs-test
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -484,7 +484,6 @@ Metrics/AbcSize:
  - lib/spree/core/calculated_adjustments.rb
  - lib/spree/core/controller_helpers/order.rb
  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
  - lib/spree/core/delegate_belongs_to.rb
  - lib/spree/core/permalinks.rb
  - lib/spree/core/s3_support.rb
@@ -528,7 +527,6 @@ Metrics/BlockLength:
  - app/models/spree/payment/processing.rb
  - app/models/spree/shipment.rb
  - lib/spree/core/controller_helpers/common.rb
-  - lib/spree/core/controller_helpers/ssl.rb
  - lib/tasks/data.rake
  - spec/controllers/spree/admin/invoices_controller_spec.rb
  - spec/factories/address_factory.rb
@@ -607,7 +605,6 @@ Metrics/CyclomaticComplexity:
  - lib/spree/core/calculated_adjustments.rb
  - lib/spree/core/controller_helpers/order.rb
  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
  - lib/spree/localized_number.rb
  - spec/models/product_importer_spec.rb

@@ -651,7 +648,6 @@ Metrics/PerceivedComplexity:
  - lib/spree/core/calculated_adjustments.rb
  - lib/spree/core/controller_helpers/order.rb
  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
  - lib/spree/localized_number.rb
  - spec/models/product_importer_spec.rb

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.9
+2.7.3
--- a/.simplecov
+++ b/.simplecov
--- a/21
+++ b/21
@@ -1,18 +1,18 @@
 # frozen_string_literal: true

 source 'https://rubygems.org'
-ruby "2.5.9"
+ruby "2.7.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

-gem 'rails', '~> 6.0.3.7'
+gem 'rails', '~> 6.1.4'

 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '2.4.1'
+gem 'ransack', '2.4.2'
 gem 'responders'
-gem 'sass', '~> 3.4.0' # this restriction originates from foundation-rails's version
 gem 'sass-rails', '< 5.1.0' # this restriction originates from the compass-rails's version
+gem 'webpacker', '~> 5'

 gem 'i18n'
 gem 'i18n-js', '~> 3.8.3'
@@ -64,8 +64,9 @@ gem 'actionpack-action_caching'
 #   AMS is deprecated, we will introduce an alternative at some point
 gem "active_model_serializers", "0.8.4"
 gem 'activerecord-session_store'
-gem 'acts-as-taggable-on', '~> 7.0'
+gem 'acts-as-taggable-on', '~> 8.1'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
+gem 'bigdecimal', '3.0.2'
 gem 'bootsnap', require: false
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
@@ -73,14 +74,14 @@ gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 10.3.1'
 gem 'paperclip', '~> 3.4.1'
+gem 'paper_trail', '~> 10.3.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'roadie-rails'

-gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'hiredis'
+gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'sidekiq'
 gem 'sidekiq-scheduler'

@@ -151,23 +152,25 @@ end
 group :test do
  gem 'byebug'
  gem 'codecov', require: false
+  gem 'pdf-reader'
+  gem 'rails-controller-testing'
  gem 'simplecov', require: false
  gem 'test-prof'
  gem 'webmock'
-  gem 'rails-controller-testing'
-  gem 'pdf-reader'
  # See spec/spec_helper.rb for instructions
  # gem 'perftools.rb'
 end

 group :development do
  gem 'debugger-linecache'
+  gem 'foreman'
  gem 'pry'
  gem 'pry-byebug'
  gem 'rubocop'
  gem 'rubocop-rails'
  gem 'spring'
  gem 'spring-commands-rspec'
+  gem 'web-console'

  gem "view_component_storybook", require: "view_component/storybook/engine"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,59 +57,61 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.1.0)
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionmailbox (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
      mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.1.4)
+      actionpack (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activesupport (= 6.1.4)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.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.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actiontext (6.1.4)
+      actionpack (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
      nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.1.4)
+      activesupport (= 6.1.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.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
      globalid (>= 0.3.6)
-    activemerchant (1.120.0)
+    activemerchant (1.121.0)
      activesupport (>= 4.2)
      builder (>= 2.1.2, < 4.0.0)
      i18n (>= 0.6.9)
      nokogiri (~> 1.4)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
    activerecord-import (1.1.0)
      activerecord (>= 3.2)
    activerecord-postgresql-adapter (0.0.1)
@@ -120,18 +122,20 @@ GEM
      multi_json (~> 1.11, >= 1.11.2)
      rack (>= 2.0.8, < 3)
      railties (>= 5.2.4.1)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
+    activestorage (6.1.4)
+      actionpack (= 6.1.4)
+      activejob (= 6.1.4)
+      activerecord (= 6.1.4)
+      activesupport (= 6.1.4)
      marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    acts-as-taggable-on (7.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    acts-as-taggable-on (8.1.0)
      activerecord (>= 5.0, < 6.2)
    acts_as_list (1.0.4)
      activerecord (>= 4.2)
@@ -157,9 +161,11 @@ GEM
      json (~> 1.4)
      nokogiri (~> 1)
    bcrypt (3.1.16)
+    bigdecimal (3.0.2)
+    bindex (0.8.1)
    bootsnap (1.7.5)
      msgpack (~> 1.0)
-    bugsnag (6.20.0)
+    bugsnag (6.21.0)
      concurrent-ruby (~> 1.0)
    builder (3.2.4)
    bullet (6.1.4)
@@ -287,6 +293,7 @@ GEM
    fog-xml (0.1.3)
      fog-core
      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)
@@ -306,7 +313,7 @@ GEM
    globalid (0.4.2)
      activesupport (>= 4.2.0)
    gmaps4rails (2.1.2)
-    good_migrations (0.0.2)
+    good_migrations (0.1.0)
      activerecord (>= 3.1)
      railties (>= 3.1)
    haml (5.2.1)
@@ -350,14 +357,14 @@ GEM
      kaminari-core (= 1.2.1)
    kaminari-core (1.2.1)
    kgio (2.11.3)
-    knapsack (1.22.0)
+    knapsack (3.1.0)
      rake
    launchy (2.5.0)
      addressable (~> 2.7)
    letter_opener (1.7.0)
      launchy (~> 2.2)
    libv8-node (15.14.0.1)
-    loofah (2.9.1)
+    loofah (2.10.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@@ -435,25 +442,27 @@ GEM
      rack (>= 1.2.0)
    rack-protection (2.1.0)
      rack
+    rack-proxy (0.7.0)
+      rack
    rack-rewrite (1.5.1)
    rack-ssl (1.4.1)
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
+    rails (6.1.4)
+      actioncable (= 6.1.4)
+      actionmailbox (= 6.1.4)
+      actionmailer (= 6.1.4)
+      actionpack (= 6.1.4)
+      actiontext (= 6.1.4)
+      actionview (= 6.1.4)
+      activejob (= 6.1.4)
+      activemodel (= 6.1.4)
+      activerecord (= 6.1.4)
+      activestorage (= 6.1.4)
+      activesupport (= 6.1.4)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@@ -468,16 +477,16 @@ GEM
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 7)
    rails_safe_tasks (1.0.0)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
    rainbow (3.0.0)
    raindrops (0.19.1)
    rake (13.0.3)
-    ransack (2.4.1)
+    ransack (2.4.2)
      activerecord (>= 5.2.4)
      activesupport (>= 5.2.4)
      i18n
@@ -485,7 +494,7 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    redcarpet (3.5.1)
-    redis (4.2.5)
+    redis (4.3.1)
    regexp_parser (2.1.1)
    request_store (1.5.0)
      rack (>= 1.4)
@@ -538,7 +547,7 @@ GEM
    rswag-ui (2.4.0)
      actionpack (>= 3.1, < 7.0)
      railties (>= 3.1, < 7.0)
-    rubocop (1.16.1)
+    rubocop (1.18.1)
      parallel (~> 1.10)
      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
@@ -549,7 +558,7 @@ GEM
      unicode-display_width (>= 1.4.0, < 3.0)
    rubocop-ast (1.7.0)
      parser (>= 3.0.1.1)
-    rubocop-rails (2.10.1)
+    rubocop-rails (2.11.1)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.7.0, < 2.0)
@@ -569,6 +578,7 @@ GEM
    selenium-webdriver (3.142.7)
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
+    semantic_range (3.0.0)
    shoulda-matchers (4.5.1)
      activesupport (>= 4.2.0)
    sidekiq (6.2.1)
@@ -606,20 +616,19 @@ GEM
      activerecord (>= 5.1)
      state_machines-activemodel (>= 0.8.0)
    stringex (2.8.5)
-    stripe (5.33.0)
+    stripe (5.35.0)
    temple (0.8.2)
-    test-prof (1.0.5)
+    test-prof (1.0.6)
    test-unit (3.4.4)
      power_assert
    thor (1.1.0)
-    thread_safe (0.3.6)
    thwait (0.2.0)
      e2mmap
    tilt (2.0.10)
    timecop (0.9.4)
    ttfunk (1.7.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
    unicode-display_width (2.0.0)
@@ -639,6 +648,11 @@ GEM
      view_component (>= 2.2)
    warden (1.2.9)
      rack (>= 2.0.9)
+    web-console (4.1.0)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
    webdrivers (4.6.0)
      nokogiri (~> 1.6)
      rubyzip (>= 1.3.0)
@@ -647,7 +661,12 @@ GEM
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.4)
+    webpacker (5.4.0)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
+    websocket-driver (0.7.5)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    whenever (1.0.0)
@@ -670,7 +689,7 @@ DEPENDENCIES
  activerecord-import
  activerecord-postgresql-adapter
  activerecord-session_store
-  acts-as-taggable-on (~> 7.0)
+  acts-as-taggable-on (~> 8.1)
  acts_as_list (= 1.0.4)
  andand
  angular-rails-templates (>= 0.3.0)
@@ -680,6 +699,7 @@ DEPENDENCIES
  awesome_nested_set
  awesome_print
  aws-sdk (= 1.67.0)
+  bigdecimal (= 3.0.2)
  bootsnap
  bugsnag
  bullet
@@ -708,6 +728,7 @@ DEPENDENCIES
  flipper-active_record
  flipper-ui
  fog-aws (~> 2.0)
+  foreman
  foundation-icons-sass-rails
  foundation-rails (= 5.5.2.1)
  fuubar (~> 2.5.1)
@@ -746,11 +767,11 @@ DEPENDENCIES
  rack-mini-profiler (< 3.0.0)
  rack-rewrite
  rack-ssl
-  rails (~> 6.0.3.7)
+  rails (~> 6.1.4)
  rails-controller-testing
  rails-i18n
  rails_safe_tasks (~> 1.0)
-  ransack (= 2.4.1)
+  ransack (= 2.4.2)
  redcarpet
  redis (>= 4.0)
  responders
@@ -761,7 +782,6 @@ DEPENDENCIES
  rswag
  rubocop
  rubocop-rails
-  sass (~> 3.4.0)
  sass-rails (< 5.1.0)
  select2-rails!
  selenium-webdriver
@@ -783,14 +803,16 @@ DEPENDENCIES
  view_component
  view_component_storybook
  web!
+  web-console
  webdrivers
  webmock
+  webpacker (~> 5)
  whenever
  wicked_pdf
  wkhtmltopdf-binary

 RUBY VERSION
-   ruby 2.5.9p229
+   ruby 2.7.3p183

 BUNDLED WITH
-   1.17.3
+   2.1.4
--- a/5
+++ b/5
@@ -0,0 +1,5 @@
+# Foreman Procfile. Start all dev server processes with: `foreman start`
+
+rails:      bundle exec rails s -p 3000
+webpack:    ./bin/webpack-dev-server
+sidekiq:    bundle exec sidekiq -q mailers -q default
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration

 ## Testing

-If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board](https://github.com/openfoodfoundation/openfoodnetwork/projects/31) for some good first issues, both on manual and automated testing (RSpec/Capybara).
+If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline. Also, do have a look in our [Welcome New QAs board](https://github.com/orgs/openfoodfoundation/projects/1) for some good first issues, both on manual and automated testing (RSpec/Capybara).

 We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them! 

@@ -47,5 +47,5 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 [ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
-[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
 [zenhub]: https://www.zenhub.com/extension
--- a/4
+++ b/4
@@ -8,6 +8,6 @@ require_relative 'config/application'

 Openfoodnetwork::Application.load_tasks

-unless ENV['DISABLE_KNAPSACK']
-  Knapsack.load_tasks if defined?(Knapsack)
+if !ENV['DISABLE_KNAPSACK'] && defined?(Knapsack)
+  Knapsack.load_tasks
 end
--- a/app/assets/javascripts/admin/admin_ofn.js.coffee
+++ b/app/assets/javascripts/admin/admin_ofn.js.coffee
@@ -8,6 +8,7 @@ angular.module("ofn.admin", [
  "admin.dropdown",
  "admin.products",
  "admin.taxons",
-  "infinite-scroll"
+  "infinite-scroll",
+  "admin.orders"
 ]).config ($httpProvider) ->
  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -110,5 +110,8 @@
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

+// LocalStorage
+//= require ../shared/angular-local-storage.js
+
 // requires the rest of the JS code in this folder
 //= require_tree .
--- a/app/assets/javascripts/admin/directives/select2_watch_model.js.coffee
+++ b/app/assets/javascripts/admin/directives/select2_watch_model.js.coffee
@@ -0,0 +1,8 @@
+angular.module("ofn.admin").directive "select2WatchNgModel", () ->
+  restrict: 'E'
+  scope: true
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    ngModel.$render = () ->
+      newValue = ngModel.$viewValue;
+      element.children(".select2").select2("val", newValue)
--- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
+++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
@@ -52,6 +52,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
  $scope.loadOrders = ->
    RequestMonitor.load $scope.orders = Orders.index(
      "q[state_not_eq]": "canceled",
+      "q[shipment_state_not_eq]": "shipped",
      "q[completed_at_not_null]": "true",
      "q[distributor_id_eq]": $scope.distributorFilter,
      "q[order_cycle_id_eq]": $scope.orderCycleFilter,
@@ -62,6 +63,7 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
  $scope.loadLineItems = ->
    RequestMonitor.load LineItems.index(
      "q[order_state_not_eq]": "canceled",
+      "q[order_shipment_state_not_eq]": "shipped",
      "q[order_completed_at_not_null]": "true",
      "q[order_distributor_id_eq]": $scope.distributorFilter,
      "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
--- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter) ->
+angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter, $location, KeyValueMapStore) ->
  $scope.RequestMonitor = RequestMonitor
  $scope.pagination = Orders.pagination
  $scope.orders = Orders.all
@@ -15,39 +15,54 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
  $scope.poll = 0
  $scope.rowStatus = {}

+  KeyValueMapStore.localStorageKey = 'ordersFilters'
+  KeyValueMapStore.storableKeys = ["q", "sorting", "page", "per_page"]
+
  $scope.initialise = ->
+    unless KeyValueMapStore.restoreValues($scope)
+      $scope.setDefaults()
+
+    $scope.fetchResults()
+
+  $scope.setDefaults = ->
    $scope.per_page = 15
    $scope.q = {
      completed_at_not_null: true
    }
+
+  $scope.clearFilters = () ->
+    KeyValueMapStore.clearKeyValueMap()
+    $scope.setDefaults()
    $scope.fetchResults()

  $scope.fetchResults = (page=1) ->
-    startDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_gteq'], ' 00:00:00')
-    endDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_lteq'], ' 23:59:59')
+    startDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_gteq, ' 00:00:00')
+    endDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_lteq, ' 23:59:59')

    $scope.resetSelected()
    params = {
      'q[completed_at_gteq]': startDateWithTime,
      'q[completed_at_lteq]': endDateWithTime,
-      'q[state_eq]': $scope['q']['state_eq'],
-      'q[number_cont]': $scope['q']['number_cont'],
-      'q[email_cont]': $scope['q']['email_cont'],
-      'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'],
-      'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
+      'q[state_eq]': $scope.q?.state_eq,
+      'q[number_cont]': $scope.q?.number_cont,
+      'q[email_cont]': $scope.q?.email_cont,
+      'q[bill_address_firstname_start]': $scope.q?.bill_address_firstname_start,
+      'q[bill_address_lastname_start]': $scope.q?.bill_address_lastname_start,
      # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
-      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
-      'q[distributor_id_in][]': $scope['q']['distributor_id_in'],
-      'q[order_cycle_id_in][]': $scope['q']['order_cycle_id_in'],
+      'q[completed_at_not_null]': $scope.q?.completed_at_not_null || null,
+      'q[distributor_id_in][]': $scope.q?.distributor_id_in,
+      'q[order_cycle_id_in][]': $scope.q?.order_cycle_id_in,
      'q[s]': $scope.sorting || 'completed_at desc',
-      shipping_method_id: $scope.shipping_method_id,
+      shipping_method_id: $scope.q?.shipping_method_id,
      per_page: $scope.per_page,
      page: page
    }
+    KeyValueMapStore.setStoredValues($scope)
    RequestMonitor.load(Orders.index(params).$promise)

  $scope.appendStringIfNotEmpty = (baseString, stringToAppend) ->
    return baseString unless baseString
+    return baseString if baseString.endsWith(stringToAppend)

    baseString + stringToAppend

--- a/app/assets/javascripts/admin/orders/orders.js.coffee
+++ b/app/assets/javascripts/admin/orders/orders.js.coffee
@@ -1 +1 @@
-angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation'])
+angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation', "OFNShared"])
--- a/app/assets/javascripts/admin/payment_methods/controllers/providers_controller.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/controllers/providers_controller.js.coffee
@@ -2,6 +2,6 @@ angular.module("admin.paymentMethods").controller "ProvidersCtrl", ($scope, paym
  if paymentMethod.type
    $scope.include_html = "/admin/payment_methods/show_provider_preferences?" +
      "provider_type=#{paymentMethod.type};" +
-      "pm_id=#{paymentMethod.id};"
+      "pm_id=#{paymentMethod.id || ''};"
  else
    $scope.include_html = ""
--- a/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/units_controller.js.coffee
@@ -1,5 +1,5 @@
 angular.module("admin.products")
-  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices) ->
+  .controller "unitsCtrl", ($scope, VariantUnitManager, OptionValueNamer, UnitPrices, PriceParser) ->
    $scope.product = { master: {} }
    $scope.product.master.product = $scope.product
    $scope.placeholder_text = ""
@@ -26,9 +26,9 @@ angular.module("admin.products")

    $scope.processUnitValueWithDescription = ->
      if $scope.product.master.hasOwnProperty("unit_value_with_description")
-        match = $scope.product.master.unit_value_with_description.match(/^([\d\.]+(?= *|$)|)( *)(.*)$/)
+        match = $scope.product.master.unit_value_with_description.match(/^([\d\.,]+(?= *|$)|)( *)(.*)$/)
        if match
-          $scope.product.master.unit_value  = parseFloat(match[1])
+          $scope.product.master.unit_value  = PriceParser.parse(match[1])
          $scope.product.master.unit_value  = null if isNaN($scope.product.master.unit_value)
          $scope.product.master.unit_value *= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
          $scope.product.master.unit_description = match[3]
--- a/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices) ->
+angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout, UnitPrices, PriceParser) ->

  $scope.unitName = (scale, type) ->
    VariantUnitManager.getUnitName(scale, type)
@@ -23,7 +23,7 @@ angular.module("admin.products").controller "variantUnitsCtrl", ($scope, Variant

  $scope.updateValue = ->
    unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = unit_value_human * $scope.scale
+    $scope.unit_value = PriceParser.parse(unit_value_human) * $scope.scale

  variant_unit_value = angular.element('#variant_unit_value').val()
  $scope.unit_value_human = variant_unit_value / $scope.scale
--- a/app/assets/javascripts/admin/products/services/unit_prices.js.coffee
+++ b/app/assets/javascripts/admin/products/services/unit_prices.js.coffee
@@ -1,7 +1,7 @@
-angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter, unlocalizeCurrencyFilter) ->
+angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter, PriceParser) ->
  class UnitPrices
    @displayableUnitPrice: (price, scale, unit_type, unit_value, variant_unit_name) ->
-      price = unlocalizeCurrencyFilter(price)
+      price = PriceParser.parse(price)
      if price && !isNaN(price) && unit_type && unit_value
        value = localizeCurrencyFilter(UnitPrices.price(price, scale, unit_type, unit_value, variant_unit_name))
        unit = UnitPrices.unit(scale, unit_type, variant_unit_name)
--- a/app/assets/javascripts/admin/services/key_value_map_store.js.coffee
+++ b/app/assets/javascripts/admin/services/key_value_map_store.js.coffee
@@ -0,0 +1,29 @@
+angular.module("admin.indexUtils").factory 'KeyValueMapStore', (localStorageService)->
+  new class KeyValueMapStore
+    localStorageKey: ''
+    storableKeys: []
+
+    constructor: ->
+      localStorageService.setStorageType("sessionStorage")
+
+    getStoredKeyValueMap: ->
+      localStorageService.get(@localStorageKey) || {}
+
+    setStoredValues: (source) ->
+      keyValueMap = {}
+      for key in @storableKeys
+        keyValueMap[key] = source[key]
+      localStorageService.set(@localStorageKey, keyValueMap)
+
+    restoreValues: (target) ->
+      storedKeyValueMap = @getStoredKeyValueMap()
+      
+      return false if _.isEmpty(storedKeyValueMap)  
+      
+      for k,v of storedKeyValueMap
+       target[k] = v
+
+      return true
+
+    clearKeyValueMap: () ->
+      localStorageService.remove(@localStorageKey)
--- a/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee
@@ -2,10 +2,13 @@ angular.module("admin.utils").directive "datepicker", ($window, $timeout) ->
  require: "ngModel"
  link: (scope, element, attrs, ngModel) ->
    $timeout ->
-      flatpickr(element,  Object.assign(
+      flapickrInstance = flatpickr(element,  Object.assign(
                            {},
                            $window.FLATPICKR_DATE_DEFAULT, {
                            onOpen: (selectedDates, dateStr, instance) ->
                              instance.setDate(ngModel.$modelValue)
                            }
                          ));
+      ngModel.$render = () ->
+        newValue = ngModel.$viewValue;
+        flapickrInstance?.setDate(newValue)
--- a/app/assets/javascripts/admin/utils/filters/unlocalize_currency.js.coffee
+++ b/app/assets/javascripts/admin/utils/filters/unlocalize_currency.js.coffee
@@ -1,15 +0,0 @@
-angular.module("admin.utils").filter "unlocalizeCurrency", ()->
-  # Convert string to number using injected currency configuration.
-  (price) ->
-    # used decimal and thousands separators from currency configuration
-    decimal_separator = I18n.toCurrency(.1, {precision: 1, unit: ''}).substring(1,2)
-    thousands_separator = I18n.toCurrency(1000, {precision: 1, unit: ''}).substring(1,2)
-
-    if (price.length > 4)
-      # remove configured thousands separator if price is greater than 999
-      price = price.replaceAll(thousands_separator, '')
-      
-    if (decimal_separator == ",")
-      price = price.replace(",", ".")
-
-    return parseFloat(price)
--- a/app/assets/javascripts/admin/utils/services/price_parser.js.coffee
+++ b/app/assets/javascripts/admin/utils/services/price_parser.js.coffee
@@ -0,0 +1,31 @@
+angular.module("admin.utils").factory "PriceParser", ->
+  new class PriceParser
+    parse: (price) =>
+      return null unless price
+      # used decimal and thousands separators from currency configuration
+      decimal_separator = I18n.toCurrency(.1, {precision: 1, unit: ''}).substring(1,2)
+      thousands_separator = I18n.toCurrency(1000, {precision: 1, unit: ''}).substring(1,2)
+      
+      # Replace comma used as a decimal separator and remplace by "."
+      price = this.replaceCommaByFinalPoint(price)
+
+      # Remove configured thousands separator if it is actually a thousands separator
+      price = this.removeThousandsSeparator(price, thousands_separator)
+
+      if (decimal_separator == ",")
+        price = price.replace(",", ".")
+
+      price = parseFloat(price)
+
+      return null if isNaN(price)
+
+      return price
+
+    replaceCommaByFinalPoint : (price) =>
+      if price.match(/^[0-9]*(,{1})[0-9]{1,2}$/g) then price.replace(",", ".") else price
+
+    removeThousandsSeparator : (price, thousands_separator) => 
+      if (new RegExp("^([0-9]*(" + thousands_separator + "{1})[0-9]{3}[0-9\.,]*)*$", "g").test(price))
+        price.replaceAll(thousands_separator, '')
+      else
+        price
--- a/app/assets/javascripts/shared/shared.js.coffee
+++ b/app/assets/javascripts/shared/shared.js.coffee
@@ -1,4 +1,5 @@
 window.OFNShared = angular.module("OFNShared", [
-  "mm.foundation"
+  "mm.foundation",
+  "LocalStorageModule"
 ]).config ($httpProvider) ->
  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
--- a/app/assets/stylesheets/admin/components/table-filter.scss
+++ b/app/assets/stylesheets/admin/components/table-filter.scss
@@ -1,5 +1,4 @@
 #table-filter {
-
  .field {
    input[type="text"], input[type="phone"],
    input[type="email"], input[type="number"],
@@ -9,6 +8,9 @@
  }

  .actions {
-    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    column-gap: 20px;
  }
-}
+}
--- a/app/assets/stylesheets/admin/globals/variables.scss
+++ b/app/assets/stylesheets/admin/globals/variables.scss
@@ -84,6 +84,8 @@ $color-ste-sold-bg:              $color-success !default;
 $color-ste-sold-text:            $color-1 !default;
 $color-ste-pending-bg:           $color-notice !default;
 $color-ste-pending-text:         $color-1 !default;
+$color-ste-requires_authorization-bg: $color-notice !default;
+$color-ste-requires_authorization-text: $color-1 !default;
 $color-ste-awaiting_return-bg:   $color-notice !default;
 $color-ste-awaiting_return-text: $color-1 !default;
 $color-ste-returned-bg:          $color-notice !default;
@@ -124,9 +126,9 @@ $color-ste-inactive-bg:          $color-notice !default;
 $color-ste-inactive-text:        $color-1 !default;

 // Available states
-$states:                      completed,                 complete,                 sold,                 pending,                 awaiting_return,                 returned,                 credit_owed,                 paid,                 shipped,                 balance_due,                 backorder,                 checkout,                 cart,                 address,                 delivery,                 payment,                 confirm,                 canceled,                 ready,                 void,                 active,                 inactive  !default;
-$states-bg-colors:            $color-ste-completed-bg,   $color-ste-complete-bg,   $color-ste-sold-bg,   $color-ste-pending-bg,   $color-ste-awaiting_return-bg,   $color-ste-returned-bg,   $color-ste-credit_owed-bg,   $color-ste-paid-bg,   $color-ste-shipped-bg,   $color-ste-balance_due-bg,   $color-ste-backorder-bg,   $color-ste-checkout-bg,   $color-ste-cart-bg,   $color-ste-address-bg,   $color-ste-delivery-bg,   $color-ste-payment-bg,   $color-ste-confirm-bg,   $color-ste-canceled-bg,   $color-ste-ready-bg,   $color-ste-void-bg,   $color-ste-active-bg,   $color-ste-inactive-bg  !default;
-$states-text-colors:          $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text, $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text, $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text, $color-ste-canceled-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text !default;
+$states:                      completed,                 complete,                 sold,                 pending,                 awaiting_return,                 returned,                 credit_owed,                 paid,                 shipped,                 balance_due,                 backorder,                 checkout,                 cart,                 address,                 delivery,                 payment,                 confirm,                 canceled,                 ready,                 void,                 requires_authorization,                 active,                 inactive  !default;
+$states-bg-colors:            $color-ste-completed-bg,   $color-ste-complete-bg,   $color-ste-sold-bg,   $color-ste-pending-bg,   $color-ste-awaiting_return-bg,   $color-ste-returned-bg,   $color-ste-credit_owed-bg,   $color-ste-paid-bg,   $color-ste-shipped-bg,   $color-ste-balance_due-bg,   $color-ste-backorder-bg,   $color-ste-checkout-bg,   $color-ste-cart-bg,   $color-ste-address-bg,   $color-ste-delivery-bg,   $color-ste-payment-bg,   $color-ste-confirm-bg,   $color-ste-canceled-bg,   $color-ste-ready-bg,   $color-ste-void-bg,   $color-ste-requires_authorization-bg,   $color-ste-active-bg,   $color-ste-inactive-bg  !default;
+$states-text-colors:          $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text, $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text, $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text, $color-ste-canceled-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-requires_authorization-text, $color-ste-active-text, $color-ste-inactive-text !default;

 // Available actions
 $actions:                        edit,                   clone,                   remove,                   void,                   capture,                   save,                      cancel,                   mail  !default;
--- a/app/controllers/admin/bulk_line_items_controller.rb
+++ b/app/controllers/admin/bulk_line_items_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class BulkLineItemsController < Spree::Admin::BaseController
    include PaginationData
--- a/app/controllers/admin/column_preferences_controller.rb
+++ b/app/controllers/admin/column_preferences_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ColumnPreferencesController < Admin::ResourceController
    before_action :load_collection, only: [:bulk_update]
--- a/app/controllers/admin/contents_controller.rb
+++ b/app/controllers/admin/contents_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ContentsController < Spree::Admin::BaseController
    def edit
@@ -16,7 +18,8 @@ module Admin
      # Save any uploaded images
      ContentConfig.save

-      flash[:success] = t(:successfully_updated, resource: I18n.t('admin.contents.edit.your_content'))
+      flash[:success] =
+        t(:successfully_updated, resource: I18n.t('admin.contents.edit.your_content'))

      redirect_to main_app.edit_admin_contents_path
    end
--- a/app/controllers/admin/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/address_finder'

 module Admin
@@ -10,7 +12,10 @@ module Admin
        tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: @customer.enterprise))
        render_as_json @customer, tag_rule_mapping: tag_rule_mapping
      },
-      failure: lambda { render json: { errors: @customer.errors.full_messages }, status: :unprocessable_entity }
+      failure: lambda {
+                 render json: { errors: @customer.errors.full_messages },
+                        status: :unprocessable_entity
+               }
    } }

    def index
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class EnterpriseFeesController < Admin::ResourceController
    before_action :load_enterprise_fee_set, only: :index
@@ -16,7 +18,9 @@ module Admin

      respond_to do |format|
        format.html
-        format.json { render_as_json @collection, controller: self, include_calculators: @include_calculators }
+        format.json {
+          render_as_json @collection, controller: self, include_calculators: @include_calculators
+        }
        # format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } }
      end
    end
@@ -56,10 +60,12 @@ module Admin
        order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id]
        coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id]
        order_cycle = OrderCycle.new(coordinator: coordinator) if order_cycle.nil? && coordinator.present?
-        enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, order_cycle).visible_enterprises
+        enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user,
+                                                                 order_cycle).visible_enterprises
        EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')
      else
-        collection = EnterpriseFee.managed_by(spree_current_user).order('enterprise_id', 'fee_type', 'name')
+        collection = EnterpriseFee.managed_by(spree_current_user).order('enterprise_id',
+                                                                        'fee_type', 'name')
        collection = collection.for_enterprise(current_enterprise) if current_enterprise
        collection
      end
--- a/app/controllers/admin/enterprise_groups_controller.rb
+++ b/app/controllers/admin/enterprise_groups_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class EnterpriseGroupsController < Admin::ResourceController
    before_action :load_data, except: :index
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class EnterpriseRelationshipsController < Admin::ResourceController
    def index
@@ -16,7 +18,8 @@ module Admin
      if @enterprise_relationship.save
        render plain: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
      else
-        render status: :bad_request, json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }
+        render status: :bad_request,
+               json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }
      end
    end

--- a/app/controllers/admin/enterprise_roles_controller.rb
+++ b/app/controllers/admin/enterprise_roles_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class EnterpriseRolesController < Admin::ResourceController
    def index
@@ -13,7 +15,8 @@ module Admin
        render plain: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json

      else
-        render status: :bad_request, json: { errors: @enterprise_role.errors.full_messages.join(', ') }
+        render status: :bad_request,
+               json: { errors: @enterprise_role.errors.full_messages.join(', ') }
      end
    end

--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/referer_parser'
 require 'open_food_network/permissions'
 require 'open_food_network/order_cycle_permissions'
@@ -32,7 +34,10 @@ module Admin
    def index
      respond_to do |format|
        format.html
-        format.json { render_as_json @collection, ams_prefix: params[:ams_prefix], spree_current_user: spree_current_user }
+        format.json {
+          render_as_json @collection, ams_prefix: params[:ams_prefix],
+                                      spree_current_user: spree_current_user
+        }
      end
    end

@@ -56,11 +61,15 @@ module Admin
        respond_with(@object) do |format|
          format.html { redirect_to location_after_save }
          format.js   { render layout: false }
-          format.json { render_as_json @object, ams_prefix: 'index', spree_current_user: spree_current_user }
+          format.json {
+            render_as_json @object, ams_prefix: 'index', spree_current_user: spree_current_user
+          }
        end
      else
        respond_with(@object) do |format|
-          format.json { render json: { errors: @object.errors.messages }, status: :unprocessable_entity }
+          format.json {
+            render json: { errors: @object.errors.messages }, status: :unprocessable_entity
+          }
        end
      end
    end
@@ -101,7 +110,8 @@ module Admin
    def for_order_cycle
      respond_to do |format|
        format.json do
-          render json: @collection, each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer, order_cycle: @order_cycle, spree_current_user: spree_current_user
+          render json: @collection,
+                 each_serializer: Api::Admin::ForOrderCycle::EnterpriseSerializer, order_cycle: @order_cycle, spree_current_user: spree_current_user
        end
      end
    end
@@ -109,7 +119,8 @@ module Admin
    def visible
      respond_to do |format|
        format.json do
-          render_as_json @collection, ams_prefix: params[:ams_prefix] || 'basic', spree_current_user: spree_current_user
+          render_as_json @collection, ams_prefix: params[:ams_prefix] || 'basic',
+                                      spree_current_user: spree_current_user
        end
      end
    end
@@ -152,7 +163,7 @@ module Admin
        if enterprises.present?
          enterprises.includes(
            supplied_products:
-              [:supplier, master: [:images], variants: { option_values: :option_type }]
+              [:supplier, { master: [:images], variants: { option_values: :option_type } }]
          )
        end
      when :index
@@ -284,7 +295,8 @@ module Admin
    end

    def strip_new_properties
-      unless spree_current_user.admin? || params.dig(:enterprise, :producer_properties_attributes).nil?
+      unless spree_current_user.admin? || params.dig(:enterprise,
+                                                     :producer_properties_attributes).nil?
        names = Spree::Property.pluck(:name)
        enterprise_params[:producer_properties_attributes].each do |key, property|
          enterprise_params[:producer_properties_attributes].delete key unless names.include? property[:property_name]
--- a/app/controllers/admin/inventory_items_controller.rb
+++ b/app/controllers/admin/inventory_items_controller.rb
@@ -1,15 +1,23 @@
+# frozen_string_literal: true
+
 module Admin
  class InventoryItemsController < Admin::ResourceController
    respond_to :json

    respond_override update: { json: {
      success: lambda { render_as_json @inventory_item },
-      failure: lambda { render json: { errors: @inventory_item.errors.full_messages }, status: :unprocessable_entity }
+      failure: lambda {
+                 render json: { errors: @inventory_item.errors.full_messages },
+                        status: :unprocessable_entity
+               }
    } }

    respond_override create: { json: {
      success: lambda { render_as_json @inventory_item },
-      failure: lambda { render json: { errors: @inventory_item.errors.full_messages }, status: :unprocessable_entity }
+      failure: lambda {
+                 render json: { errors: @inventory_item.errors.full_messages },
+                        status: :unprocessable_entity
+               }
    } }

    private
--- a/app/controllers/admin/invoice_settings_controller.rb
+++ b/app/controllers/admin/invoice_settings_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class InvoiceSettingsController < Spree::Admin::BaseController
    def update
--- a/app/controllers/admin/manager_invitations_controller.rb
+++ b/app/controllers/admin/manager_invitations_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ManagerInvitationsController < Spree::Admin::BaseController
    authorize_resource class: false
@@ -11,7 +13,8 @@ module Admin
      existing_user = Spree::User.find_by(email: @email)

      if existing_user
-        render json: { errors: t('admin.enterprises.invite_manager.user_already_exists') }, status: :unprocessable_entity
+        render json: { errors: t('admin.enterprises.invite_manager.user_already_exists') },
+               status: :unprocessable_entity
        return
      end

@@ -20,7 +23,8 @@ module Admin
      if new_user
        render json: { user: new_user.id }, status: :ok
      else
-        render json: { errors: t('admin.enterprises.invite_manager.error') }, status: :internal_server_error
+        render json: { errors: t('admin.enterprises.invite_manager.error') },
+               status: :internal_server_error
      end
    end

--- a/app/controllers/admin/matomo_settings_controller.rb
+++ b/app/controllers/admin/matomo_settings_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class MatomoSettingsController < Spree::Admin::BaseController
    def update
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class OrderCyclesController < Admin::ResourceController
    include OrderCyclesHelper
@@ -62,7 +64,7 @@ module Admin
      if @order_cycle_form.save
        respond_to do |format|
          flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
-          format.html { redirect_to main_app.edit_admin_order_cycle_path(@order_cycle) }
+          format.html { redirect_back(fallback_location: root_path) }
          format.json { render json: { success: true } }
        end
      else
@@ -156,8 +158,8 @@ module Admin
        orders_close_at_gt = raw_params[:q].andand.delete(:orders_close_at_gt) || 31.days.ago
        raw_params[:q] = {
          g: [raw_params.delete(:q) || {}, { m: 'or',
-                                         orders_close_at_gt: orders_close_at_gt,
-                                         orders_close_at_null: true }]
+                                             orders_close_at_gt: orders_close_at_gt,
+                                             orders_close_at_null: true }]
        }
        @collection = collection
      end
--- a/app/controllers/admin/producer_properties_controller.rb
+++ b/app/controllers/admin/producer_properties_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ProducerPropertiesController < Admin::ResourceController
    before_action :load_enterprise
--- a/app/controllers/admin/product_import_controller.rb
+++ b/app/controllers/admin/product_import_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'roo'

 module Admin
@@ -12,7 +14,8 @@ module Admin

    def import
      @filepath = save_uploaded_file(params[:file])
-      @importer = ProductImport::ProductImporter.new(File.new(@filepath), spree_current_user, params[:settings])
+      @importer = ProductImport::ProductImporter.new(File.new(@filepath), spree_current_user,
+                                                     params[:settings])
      @original_filename = params[:file].try(:original_filename)
      @non_updatable_fields = ProductImport::EntryValidator.non_updatable_fields

@@ -34,7 +37,8 @@ module Admin
    end

    def reset_absent_products
-      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]), spree_current_user, import_into: params[:import_into], enterprises_to_reset: params[:enterprises_to_reset], updated_ids: params[:updated_ids], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]),
+                                                     spree_current_user, import_into: params[:import_into], enterprises_to_reset: params[:enterprises_to_reset], updated_ids: params[:updated_ids], settings: params[:settings])

      if params.key?(:enterprises_to_reset) && params.key?(:updated_ids)
        @importer.reset_absent(params[:updated_ids])
@@ -52,7 +56,8 @@ module Admin
    end

    def process_data(method)
-      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]), spree_current_user, start: params[:start], end: params[:end], settings: params[:settings])
+      @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]),
+                                                     spree_current_user, start: params[:start], end: params[:end], settings: params[:settings])

      begin
        @importer.public_send("#{method}_entries")
@@ -75,7 +80,8 @@ module Admin

    def check_spreadsheet_has_data(importer)
      unless importer.item_count
-        redirect_to '/admin/product_import', notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
+        redirect_to '/admin/product_import',
+                    notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
        true
      end
    end
--- a/app/controllers/admin/proxy_orders_controller.rb
+++ b/app/controllers/admin/proxy_orders_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ProxyOrdersController < Admin::ResourceController
    respond_to :json
--- a/app/controllers/admin/resource_controller.rb
+++ b/app/controllers/admin/resource_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class ResourceController < Spree::Admin::BaseController
    helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
--- a/app/controllers/admin/schedules_controller.rb
+++ b/app/controllers/admin/schedules_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/permissions'
 require 'order_management/subscriptions/proxy_order_syncer'

@@ -15,18 +17,31 @@ module Admin
    respond_to :json

    respond_override create: { json: {
-      success: lambda { render_as_json @schedule, editable_schedule_ids: permissions.editable_schedules.pluck(:id) },
-      failure: lambda { render json: { errors: @schedule.errors.full_messages }, status: :unprocessable_entity }
+      success: lambda {
+                 render_as_json @schedule,
+                                editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+               },
+      failure: lambda {
+                 render json: { errors: @schedule.errors.full_messages },
+                        status: :unprocessable_entity
+               }
    } }
    respond_override update: { json: {
-      success: lambda { render_as_json @schedule, editable_schedule_ids: permissions.editable_schedules.pluck(:id) },
-      failure: lambda { render json: { errors: @schedule.errors.full_messages }, status: :unprocessable_entity }
+      success: lambda {
+                 render_as_json @schedule,
+                                editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+               },
+      failure: lambda {
+                 render json: { errors: @schedule.errors.full_messages },
+                        status: :unprocessable_entity
+               }
    } }

    def index
      respond_to do |format|
        format.json do
-          render_as_json @collection, ams_prefix: params[:ams_prefix], editable_schedule_ids: permissions.editable_schedules.pluck(:id)
+          render_as_json @collection, ams_prefix: params[:ams_prefix],
+                                      editable_schedule_ids: permissions.editable_schedules.pluck(:id)
        end
      end
    end
@@ -111,7 +126,8 @@ module Admin
    def check_dependent_subscriptions
      return if Subscription.where(schedule_id: @schedule).empty?

-      render json: { errors: [t('admin.schedules.destroy.associated_subscriptions_error')] }, status: :conflict
+      render json: { errors: [t('admin.schedules.destroy.associated_subscriptions_error')] },
+             status: :conflict
    end

    def permissions
--- a/app/controllers/admin/stripe_accounts_controller.rb
+++ b/app/controllers/admin/stripe_accounts_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stripe/account_connector'

 module Admin
--- a/app/controllers/admin/stripe_connect_settings_controller.rb
+++ b/app/controllers/admin/stripe_connect_settings_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This controller is used by super admin users to update the settings the app is using

 module Admin
--- a/app/controllers/admin/subscription_line_items_controller.rb
+++ b/app/controllers/admin/subscription_line_items_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/permissions'
 require 'open_food_network/order_cycle_permissions'
 require 'open_food_network/scope_variant_to_hub'
--- a/app/controllers/admin/subscriptions_controller.rb
+++ b/app/controllers/admin/subscriptions_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/permissions'

 module Admin
@@ -85,7 +87,8 @@ module Admin
    def collection
      if request.format.json?
        permissions.editable_subscriptions.ransack(params[:q]).result
-          .preload([:shop, :customer, :schedule, :subscription_line_items, :ship_address, :bill_address, proxy_orders: { order: :order_cycle }])
+          .preload([:shop, :customer, :schedule, :subscription_line_items, :ship_address,
+                    :bill_address, { proxy_orders: { order: :order_cycle } }])
      else
        Subscription.where("1=0")
      end
@@ -116,11 +119,13 @@ module Admin
    end

    def wrap_bill_address_attrs
-      subscription_params[:bill_address_attributes] = raw_params[:bill_address].slice(*Spree::Address.attribute_names)
+      subscription_params[:bill_address_attributes] =
+        raw_params[:bill_address].slice(*Spree::Address.attribute_names)
    end

    def wrap_ship_address_attrs
-      subscription_params[:ship_address_attributes] = raw_params[:ship_address].slice(*Spree::Address.attribute_names)
+      subscription_params[:ship_address_attributes] =
+        raw_params[:ship_address].slice(*Spree::Address.attribute_names)
    end

    def check_for_open_orders
@@ -129,14 +134,16 @@ module Admin
      @open_orders_to_keep = @subscription.proxy_orders.placed_and_open.pluck(:id)
      return if @open_orders_to_keep.empty? || params[:open_orders] == 'keep'

-      render json: { errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') } }, status: :conflict
+      render json: { errors: { open_orders: t('admin.subscriptions.confirm_cancel_open_orders_msg') } },
+             status: :conflict
    end

    def check_for_canceled_orders
      return if params[:canceled_orders] == 'notified'
      return if @subscription.proxy_orders.active.canceled.empty?

-      render json: { errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') } }, status: :conflict
+      render json: { errors: { canceled_orders: t('admin.subscriptions.resume_canceled_orders_msg') } },
+             status: :conflict
    end

    def strip_banned_attrs
--- a/app/controllers/admin/tag_rules_controller.rb
+++ b/app/controllers/admin/tag_rules_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
  class TagRulesController < Admin::ResourceController
    respond_to :json
--- a/app/controllers/admin/variant_overrides_controller.rb
+++ b/app/controllers/admin/variant_overrides_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/spree_api_key_loader'

 module Admin
--- a/app/controllers/api/v0/base_controller.rb
+++ b/app/controllers/api/v0/base_controller.rb
@@ -2,7 +2,6 @@

 # Base controller for OFN's API
 require "spree/api/controller_setup"
-require "spree/core/controller_helpers/ssl"

 module Api
  module V0
@@ -11,7 +10,6 @@ module Api
      include ActionController::StrongParameters
      include ActionController::RespondWith
      include Spree::Api::ControllerSetup
-      include Spree::Core::ControllerHelpers::SSL
      include ::ActionController::Head
      include ::ActionController::ConditionalGet
      include ActionView::Layouts
@@ -27,8 +25,6 @@ module Api
      rescue_from CanCan::AccessDenied, with: :unauthorized
      rescue_from ActiveRecord::RecordNotFound, with: :not_found

-      ssl_allowed
-
      # Include these because we inherit from ActionController::Metal
      #   rather than ActionController::Base and these are required for AMS
      include ActionController::Serialization
--- a/app/controllers/api/v0/taxons_controller.rb
+++ b/app/controllers/api/v0/taxons_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
  module V0
    class TaxonsController < Api::V0::BaseController
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,7 +5,6 @@ require "application_responder"
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/respond_with'
-require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/common'
 require 'open_food_network/referer_parser'

@@ -32,7 +31,6 @@ class ApplicationController < ActionController::Base

  include Spree::Core::ControllerHelpers::Auth
  include Spree::Core::ControllerHelpers::RespondWith
-  include Spree::Core::ControllerHelpers::SSL
  include Spree::Core::ControllerHelpers::Common

  prepend_before_action :restrict_iframes
@@ -52,10 +50,10 @@ class ApplicationController < ActionController::Base

  def redirect_to(options = {}, response_status = {})
    ::Rails.logger.error("Redirected by #{begin
-                                            caller(1).first
-                                          rescue StandardError
-                                            'unknown'
-                                          end}")
+      caller(1).first
+    rescue StandardError
+      'unknown'
+    end}")
    super(options, response_status)
  end

--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,14 +1,12 @@
 # frozen_string_literal: true

 require 'spree/core/controller_helpers/order'
-require 'spree/core/controller_helpers/ssl'
 require 'open_food_network/tag_rule_applicator'

 class BaseController < ApplicationController
  layout 'darkswarm'

  include Spree::Core::ControllerHelpers::Order
-  include Spree::Core::ControllerHelpers::SSL

  include I18nHelper
  include OrderCyclesHelper
--- a/app/controllers/cart_controller.rb
+++ b/app/controllers/cart_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CartController < BaseController
  before_action :check_authorization

--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -10,8 +10,6 @@ class CheckoutController < ::BaseController
  helper 'terms_and_conditions'
  helper 'checkout'

-  ssl_required
-
  # We need pessimistic locking to avoid race conditions.
  # Otherwise we fail on duplicate indexes or end up with negative stock.
  prepend_around_action CurrentOrderLocker, only: [:edit, :update]
@@ -137,11 +135,13 @@ class CheckoutController < ::BaseController

    last_payment = OrderPaymentFinder.new(@order).last_payment
    @order.state == "payment" &&
-      last_payment&.state == "pending" &&
+      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
@@ -154,6 +154,8 @@ class CheckoutController < ::BaseController
    while @order.state != "complete"
      if @order.state == "payment"
        return if redirect_to_payment_gateway
+
+        return action_failed unless @order.process_payments!
      end

      next if OrderWorkflow.new(@order).next({ shipping_method_id: shipping_method_id })
--- a/app/controllers/discourse_sso_controller.rb
+++ b/app/controllers/discourse_sso_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discourse/single_sign_on'

 class DiscourseSsoController < ApplicationController
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/enterprise_injection_data'

 class EnterprisesController < BaseController
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class GroupsController < BaseController
  layout 'darkswarm'

--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HomeController < BaseController
  layout 'darkswarm'

--- a/app/controllers/line_items_controller.rb
+++ b/app/controllers/line_items_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LineItemsController < BaseController
  respond_to :json

--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MapController < BaseController
  layout 'darkswarm'

--- a/app/controllers/metal_decorator.rb
+++ b/app/controllers/metal_decorator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # For the API
 ActionController::Metal.class_eval do
  def spree_current_user
--- a/app/controllers/payments_controller.rb
+++ b/app/controllers/payments_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true

 class PaymentsController < BaseController
-  ssl_required :redirect_to_authorize
-
  respond_to :html

  prepend_before_action :require_logged_in, only: :redirect_to_authorize
--- a/app/controllers/producers_controller.rb
+++ b/app/controllers/producers_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProducersController < BaseController
  layout 'darkswarm'

--- a/app/controllers/registration_controller.rb
+++ b/app/controllers/registration_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/spree_api_key_loader'

 class RegistrationController < BaseController
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ShopController < BaseController
  layout "darkswarm"
  before_action :require_distributor_chosen, :set_order_cycles, except: :changeable_orders_alert
--- a/app/controllers/shops_controller.rb
+++ b/app/controllers/shops_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ShopsController < BaseController
  layout 'darkswarm'

--- a/app/controllers/sitemap_controller.rb
+++ b/app/controllers/sitemap_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SitemapController < ApplicationController
  layout nil

--- a/app/controllers/spree/admin/adjustments_controller.rb
+++ b/app/controllers/spree/admin/adjustments_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class AdjustmentsController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/base_controller.rb
+++ b/app/controllers/spree/admin/base_controller.rb
@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class BaseController < ApplicationController
-      ssl_required
-
      helper 'shared'
      helper 'spree/admin/navigation'
      helper 'spree/admin/orders'
--- a/app/controllers/spree/admin/countries_controller.rb
+++ b/app/controllers/spree/admin/countries_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class CountriesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/general_settings_controller.rb
+++ b/app/controllers/spree/admin/general_settings_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class GeneralSettingsController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class ImagesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/invoices_controller.rb
+++ b/app/controllers/spree/admin/invoices_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class InvoicesController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/mail_methods_controller.rb
+++ b/app/controllers/spree/admin/mail_methods_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class MailMethodsController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/orders/customer_details_controller.rb
+++ b/app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    module Orders
@@ -23,7 +25,7 @@ module Spree
              @order.associate_user!(Spree.user_class.find_by(email: @order.email))
            end

-            OrderWorkflow.new(@order).complete
+            OrderWorkflow.new(@order).advance_to_payment

            @order.shipments.map(&:refresh_rates)
            flash[:success] = Spree.t('customer_details_updated')
--- a/app/controllers/spree/admin/orders_controller.rb
+++ b/app/controllers/spree/admin/orders_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/spree_api_key_loader'

 module Spree
@@ -26,17 +28,18 @@ module Spree
      def edit
        @order.shipments.map(&:refresh_rates)

-        OrderWorkflow.new(@order).complete
-
-        # The payment step shows an error of 'No pending payments'
-        # Clearing the errors from the order object will stop this error
-        # appearing on the edit page where we don't want it to.
+        OrderWorkflow.new(@order).advance_to_payment
        @order.errors.clear
      end

      def update
        @order.recreate_all_fees!

+        unless @order.cart?
+          @order.create_tax_charge!
+          @order.update_order!
+        end
+
        unless order_params.present? && @order.update(order_params) && @order.line_items.present?
          if @order.line_items.empty? && !params[:suppress_error_msg]
            @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
--- a/app/controllers/spree/admin/overview_controller.rb
+++ b/app/controllers/spree/admin/overview_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # this clas was inspired (heavily) from the mephisto admin architecture
 module Spree
  module Admin
--- a/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/app/controllers/spree/admin/payment_methods_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class PaymentMethodsController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -11,7 +11,7 @@ module Spree
      before_action :can_transition_to_payment
      # We ensure that items are in stock before all screens if the order is in the Payment state.
      # This way, we don't allow someone to enter credit card details for an order only to be told
-      # that it can't be processed. 
+      # that it can't be processed.
      before_action :ensure_sufficient_stock_lines

      respond_to :html
@@ -35,15 +35,16 @@ module Spree
            return
          end

-          authorize_stripe_sca_payment
-
          if @order.completed?
-            @payment.process!
+            authorize_stripe_sca_payment
+            @payment.process_offline!
            flash[:success] = flash_message_for(@payment, :successfully_created)

            redirect_to spree.admin_order_payments_path(@order)
          else
            OrderWorkflow.new(@order).complete!
+            authorize_stripe_sca_payment
+            @payment.process_offline!

            flash[:success] = Spree.t(:new_order_completed)
            redirect_to spree.edit_admin_order_url(@order)
@@ -150,7 +151,7 @@ module Spree
        return if !@order.payment? || @order.insufficient_stock_lines.blank?

        flash[:error] = I18n.t("spree.orders.line_item.insufficient_stock",
-          on_hand: "0 #{out_of_stock_item_names}")
+                               on_hand: "0 #{out_of_stock_item_names}")
        redirect_to spree.edit_admin_order_url(@order)
      end

@@ -171,13 +172,15 @@ module Spree
      end

      def authorize_stripe_sca_payment
-        return unless @payment.payment_method.class == Spree::Gateway::StripeSCA
+        return unless @payment.payment_method.instance_of?(Spree::Gateway::StripeSCA)

        @payment.authorize!(full_order_path(@payment.order))

-        raise Spree::Core::GatewayError, I18n.t('authorization_failure') unless @payment.pending?
+        unless @payment.pending? || @payment.requires_authorization?
+          raise Spree::Core::GatewayError, I18n.t('authorization_failure')
+        end

-        return unless @payment.authorization_action_required?
+        return unless @payment.requires_authorization?

        PaymentMailer.authorize_payment(@payment).deliver_later
        raise Spree::Core::GatewayError, I18n.t('action_required')
--- a/app/controllers/spree/admin/product_properties_controller.rb
+++ b/app/controllers/spree/admin/product_properties_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class ProductPropertiesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/spree_api_key_loader'
 require 'open_food_network/referer_parser'
 require 'open_food_network/permissions'
@@ -161,7 +163,9 @@ module Spree
      private

      def product_set_from_params
-        collection_hash = Hash[products_bulk_params[:products].each_with_index.map { |p, i| [i, p] }]
+        collection_hash = Hash[products_bulk_params[:products].each_with_index.map { |p, i|
+                                 [i, p]
+                               } ]
        Sets::ProductSet.new(collection_attributes: collection_hash)
      end

--- a/app/controllers/spree/admin/properties_controller.rb
+++ b/app/controllers/spree/admin/properties_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class PropertiesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/reports_controller.rb
+++ b/app/controllers/spree/admin/reports_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'

 require 'open_food_network/reports/list'
@@ -46,7 +48,8 @@ module Spree
      def customers
        @report_types = report_types[:customers]
        @report_type = params[:report_type]
-        @report = OpenFoodNetwork::CustomersReport.new spree_current_user, raw_params, render_content?
+        @report = OpenFoodNetwork::CustomersReport.new spree_current_user, raw_params,
+                                                       render_content?
        render_report(@report.header, @report.table, params[:csv], "customers_#{timestamp}.csv")
      end

@@ -91,7 +94,8 @@ module Spree
      def sales_tax
        @distributors = my_distributors
        @report_type = params[:report_type]
-        @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, raw_params, render_content?
+        @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, raw_params,
+                                                      render_content?
        render_report(@report.header, @report.table, params[:csv], "sales_tax.csv")
      end

@@ -101,7 +105,8 @@ module Spree
        @report_type = params[:report_type]

        # -- Build Report with Order Grouper
-        @report = OpenFoodNetwork::PaymentsReport.new spree_current_user, raw_params, render_content?
+        @report = OpenFoodNetwork::PaymentsReport.new spree_current_user, raw_params,
+                                                      render_content?
        @table = order_grouper_table
        csv_file_name = "payments_#{timestamp}.csv"

@@ -279,14 +284,14 @@ module Spree
      def describe_report(report)
        name = I18n.t(:name, scope: [:admin, :reports, report])
        description = begin
-                        I18n.t!(:description, scope: [:admin, :reports, report])
-                      rescue I18n::MissingTranslationData
-                        render_to_string(
-                          partial: "#{report}_description",
-                          layout: false,
-                          locals: { report_types: report_types[report] }
-                        ).html_safe
-                      end
+          I18n.t!(:description, scope: [:admin, :reports, report])
+        rescue I18n::MissingTranslationData
+          render_to_string(
+            partial: "#{report}_description",
+            layout: false,
+            locals: { report_types: report_types[report] }
+          ).html_safe
+        end
        { name: name, url: url_for_report(report), description: description }
      end

--- a/app/controllers/spree/admin/return_authorizations_controller.rb
+++ b/app/controllers/spree/admin/return_authorizations_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class ReturnAuthorizationsController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/search_controller.rb
+++ b/app/controllers/spree/admin/search_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class SearchController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/shipping_categories_controller.rb
+++ b/app/controllers/spree/admin/shipping_categories_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class ShippingCategoriesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/shipping_methods_controller.rb
+++ b/app/controllers/spree/admin/shipping_methods_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class ShippingMethodsController < ::Admin::ResourceController
@@ -87,7 +89,7 @@ module Spree
        params.require(:shipping_method).permit(
          :name, :description, :display_on, :require_ship_address, :tag_list, :calculator_type,
          :tax_category_id, distributor_ids: [],
-          calculator_attributes: PermittedAttributes::Calculator.attributes
+                            calculator_attributes: PermittedAttributes::Calculator.attributes
        )
      end
    end
--- a/app/controllers/spree/admin/states_controller.rb
+++ b/app/controllers/spree/admin/states_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class StatesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/tax_categories_controller.rb
+++ b/app/controllers/spree/admin/tax_categories_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class TaxCategoriesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/tax_rates_controller.rb
+++ b/app/controllers/spree/admin/tax_rates_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class TaxRatesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/tax_settings_controller.rb
+++ b/app/controllers/spree/admin/tax_settings_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class TaxSettingsController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/taxonomies_controller.rb
+++ b/app/controllers/spree/admin/taxonomies_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class TaxonomiesController < ::Admin::ResourceController
--- a/app/controllers/spree/admin/taxons_controller.rb
+++ b/app/controllers/spree/admin/taxons_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class TaxonsController < Spree::Admin::BaseController
--- a/app/controllers/spree/admin/users_controller.rb
+++ b/app/controllers/spree/admin/users_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
  module Admin
    class UsersController < ::Admin::ResourceController
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .5.9
 .7.3