Merge pull request #7781 from andrewpbrett/decouple-payments

Decouple payments

.browserslistrc

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

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

.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

.rubocop_manual_todo.yml

@@ -334,7 +334,6 @@ Layout/LineLength:
   - spec/services/variant_units/option_value_namer_spec.rb
   - spec/spec_helper.rb
   - spec/support/cancan_helper.rb
-  - spec/support/delayed_job_helper.rb
   - spec/support/matchers/delegate_matchers.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
@@ -485,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
@@ -529,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
@@ -549,7 +546,6 @@ Metrics/BlockLength:
   - spec/models/tag_rule/discount_order_spec.rb
   - spec/requests/api/orders_spec.rb
   - spec/spec_helper.rb
-  - spec/support/delayed_job_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
   - spec/swagger_helper.rb
@@ -609,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
 
@@ -653,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
 

.ruby-version

@@ -1 +1 @@
-2.5.8
+2.7.3

Dockerfile

@@ -7,23 +7,39 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
 
 # Install all the requirements
-RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip
+RUN apt-get update && apt-get install -y \
+  curl \
+  git \
+  build-essential \
+  software-properties-common \
+  wget \
+  zlib1g-dev \
+  libreadline-dev \
+  libyaml-dev \
+  libffi-dev \
+  libxml2-dev \
+  libxslt1-dev \
+  wait-for-it \
+  imagemagick \
+  unzip \
+  libjemalloc-dev \
+  libssl-dev
 
 # Setup ENV variables
 ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
 ENV RBENV_ROOT /usr/local/src/rbenv
 ENV CONFIGURE_OPTS --disable-install-doc
 ENV BUNDLE_PATH /bundles
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
 
 WORKDIR /usr/src/app
 COPY .ruby-version .
 
 # Install Rbenv & Ruby
-RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
-    git clone --depth 1 --branch v20200520 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    ${RBENV_ROOT}/plugins/ruby-build/install.sh && \
+RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
+    git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
     echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
-    rbenv install $(cat .ruby-version) && \
+    RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install $(cat .ruby-version) && \
     rbenv global $(cat .ruby-version) && \
     gem install bundler --version=1.17.3
 

GETTING_STARTED.md

@@ -8,6 +8,7 @@ The fastest way to make it work locally is to use Docker, you only need to setup
 Otherwise, for a local setup you will need:
 * Ruby and bundler (check current Ruby version in [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file)
 * PostgreSQL database
+* Redis (for background jobs)
 * Chrome (for testing)
 
 The following guides will provide OS-specific step-by-step instructions to get these requirements installed:
@@ -47,7 +48,11 @@ $ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f0
 
 This will create the "ofn" user as superuser and allowing it to create databases. If this command fails, check the [troubleshooting section](#creating-the-database) for an alternative.
 
-Once done, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
+Next, it is _strongly recommended_ to run the setup script.
+```sh
+$ script/setup
+```
+If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
 Now, your dreams of spinning up a development server can be realised:
 

Gemfile

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "2.5.8"
+ruby "2.7.3"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'rails', '~> 5.2'
+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', '<= 4.7.1'
-gem 'sass-rails', '< 6.0.0'
+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'
@@ -20,8 +20,8 @@ gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5"
-gem "fog-aws", ">= 0.6.0"
+gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6"
+gem "fog-aws", "~> 2.0" # db2fog does not support v3
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
@@ -50,10 +50,6 @@ gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect
 
-gem 'daemons'
-gem 'delayed_job_active_record'
-gem 'delayed_job_web'
-
 gem 'kaminari', '~> 1.2.1'
 
 gem 'andand'
@@ -68,22 +64,26 @@ 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'
 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', '~> 2.2.0'
+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'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -111,7 +111,7 @@ gem 'foundation-rails', '= 5.5.2.1'
 gem 'jquery-migrate-rails'
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-gem 'select2-rails', '~> 3.4.7'
+gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
 
@@ -150,31 +150,29 @@ group :test, :development do
 end
 
 group :test do
+  gem 'byebug'
   gem 'codecov', require: false
+  gem 'pdf-reader'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
   gem 'test-prof'
   gem 'webmock'
-  gem 'rails-controller-testing'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
 end
 
 group :development do
-  gem 'byebug'
   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"
 
-  # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
-  # While we don't require this gem directly, no dependents forced the upgrade to a version
-  # greater than 1.0.9, so we just required the latest available version here.
-  gem 'eventmachine', '>= 1.2.3'
-
   gem 'rack-mini-profiler', '< 3.0.0'
 end

Gemfile.lock

@@ -6,13 +6,13 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/db2fog.git
-  revision: 8ceef362c64e6573d62d26db5ebb0c0f33cd3d61
-  branch: rails-5
+  revision: 5b63343847452f52aa42f7fc169d6ab3af57cda3
+  branch: rails-6
   specs:
-    db2fog (0.9.1)
-      activerecord (>= 3.2.0, < 6.0)
+    db2fog (0.9.2)
+      activerecord (>= 3.2.0, < 7.0)
       fog-core (~> 1.0)
-      rails (>= 3.2.0, < 6.0)
+      rails (>= 3.2.0, < 7.0)
 
 GIT
   remote: https://github.com/openfoodfoundation/ofn-qz.git
@@ -21,6 +21,15 @@ GIT
   specs:
     ofn-qz (0.1.0)
 
+GIT
+  remote: https://github.com/openfoodfoundation/select2-rails.git
+  revision: fc240e85fbdf1878ff3c39d972c0cd9a312f5ed4
+  branch: v349_with_thor_v1
+  specs:
+    select2-rails (3.4.9)
+      sass-rails
+      thor (>= 0.14)
+
 PATH
   remote: engines/catalog
   specs:
@@ -47,47 +56,62 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    Ascii85 (1.1.0)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    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.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 (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      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.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+    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.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    activemerchant (1.119.0)
+    activemerchant (1.121.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
+    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)
@@ -98,21 +122,26 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
+    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 (5.2.6)
+      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)
-    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)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    afm (0.2.2)
     andand (1.3.3)
     angular-rails-templates (1.1.0)
       railties (>= 4.2, < 7)
@@ -122,7 +151,6 @@ GEM
       railties (>= 3, < 7)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.5.5)
-    arel (9.0.0)
     ast (2.4.2)
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
@@ -133,7 +161,11 @@ GEM
       json (~> 1.4)
       nokogiri (~> 1)
     bcrypt (3.1.16)
-    bugsnag (6.20.0)
+    bigdecimal (3.0.2)
+    bindex (0.8.1)
+    bootsnap (1.7.5)
+      msgpack (~> 1.0)
+    bugsnag (6.21.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     bullet (6.1.4)
@@ -183,29 +215,24 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     css_parser (1.9.0)
       addressable
-    daemons (1.4.0)
     dalli (2.7.11)
-    database_cleaner (1.99.0)
-    ddtrace (0.49.0)
+    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.50.0)
       ffi (~> 1.0)
       msgpack
     debugger-linecache (1.2.0)
-    delayed_job (4.1.9)
-      activesupport (>= 3.0, < 6.2)
-    delayed_job_active_record (4.1.6)
-      activerecord (>= 3.0, < 6.2)
-      delayed_job (>= 3.0, < 5)
-    delayed_job_web (1.4.4)
-      activerecord (> 3.0.0)
-      delayed_job (> 2.0.3)
-      rack-protection (>= 1.5.5)
-      sinatra (>= 1.4.4)
     devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -218,22 +245,28 @@ GEM
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
+    e2mmap (0.1.0)
     erubi (1.10.0)
-    eventmachine (1.2.7)
-    excon (0.79.0)
+    et-orbi (1.2.4)
+      tzinfo
+    excon (0.81.0)
     execjs (2.7.0)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.3.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     ffaker (2.18.0)
-    ffi (1.15.0)
+    ffi (1.15.1)
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
     flipper (0.20.4)
@@ -260,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)
@@ -267,6 +301,9 @@ GEM
     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)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -276,13 +313,14 @@ 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)
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
+    hashery (2.1.2)
     highline (2.0.3)
     hiredis (0.6.3)
     i18n (1.8.10)
@@ -319,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.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    libv8-node (15.14.0.0)
-    loofah (2.9.1)
+    libv8-node (15.14.0.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -335,12 +373,12 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_mime (1.1.0)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.5.3)
     mini_racer (0.4.0)
       libv8-node (~> 15.14.0.0)
     minitest (5.14.4)
@@ -352,10 +390,8 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
     nio4r (2.5.7)
-    nokogiri (1.11.4)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
@@ -384,38 +420,49 @@ GEM
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
+    pdf-reader (2.5.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
     pg (1.2.3)
     power_assert (2.0.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     public_suffix (4.0.6)
+    raabro (1.4.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-mini-profiler (2.3.2)
       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 (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
-      bundler (>= 1.3.0)
-      railties (= 5.2.6)
+    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)
@@ -426,28 +473,28 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails-i18n (5.1.3)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
+      railties (>= 6.0.0, < 7)
     rails_safe_tasks (1.0.0)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 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
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     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)
@@ -500,51 +547,57 @@ GEM
     rswag-ui (2.4.0)
       actionpack (>= 3.1, < 7.0)
       railties (>= 3.1, < 7.0)
-    rubocop (1.15.0)
+    rubocop (1.18.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.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)
     ruby-progressbar (1.11.0)
     ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
+    rufus-scheduler (3.7.0)
+      fugit (~> 1.1, >= 1.1.6)
     sass (3.4.25)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.0.8)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    select2-rails (3.4.9)
-      sass-rails
-      thor (~> 0.14)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
+    semantic_range (3.0.0)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
+    sidekiq (6.2.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sidekiq-scheduler (3.1.0)
+      e2mmap
+      redis (>= 3, < 5)
+      rufus-scheduler (~> 3.2)
+      sidekiq (>= 3)
+      thwait
+      tilt (>= 1.4.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
-      tilt (~> 2.0)
+    simplecov_json_formatter (0.1.3)
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -563,17 +616,19 @@ GEM
       activerecord (>= 5.1)
       state_machines-activemodel (>= 0.8.0)
     stringex (2.8.5)
-    stripe (5.30.0)
+    stripe (5.35.0)
     temple (0.8.2)
-    test-prof (1.0.5)
-    test-unit (3.4.1)
+    test-prof (1.0.6)
+    test-unit (3.4.4)
       power_assert
-    thor (0.20.3)
-    thread_safe (0.3.6)
+    thor (1.1.0)
+    thwait (0.2.0)
+      e2mmap
     tilt (2.0.10)
     timecop (0.9.4)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    ttfunk (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.0.0)
@@ -586,13 +641,18 @@ GEM
     unicorn-worker-killer (0.4.5)
       get_process_mem (~> 0)
       unicorn (>= 4, < 7)
-    uniform_notifier (1.14.1)
-    view_component (2.31.1)
+    uniform_notifier (1.14.2)
+    view_component (2.34.0)
       activesupport (>= 5.0.0, < 7.0)
     view_component_storybook (0.8.0)
       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)
@@ -601,7 +661,12 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.3)
+    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)
@@ -612,6 +677,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -623,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)
@@ -633,6 +699,8 @@ DEPENDENCIES
   awesome_nested_set
   awesome_print
   aws-sdk (= 1.67.0)
+  bigdecimal (= 3.0.2)
+  bootsnap
   bugsnag
   bullet
   byebug
@@ -644,26 +712,23 @@ DEPENDENCIES
   combine_pdf
   compass-rails
   custom_error_message!
-  daemons
   dalli
   database_cleaner
   db2fog!
   ddtrace
   debugger-linecache
-  delayed_job_active_record
-  delayed_job_web
   devise
   devise-encryptable
   devise-token_authenticatable
   dfc_provider!
-  eventmachine (>= 1.2.3)
   factory_bot_rails (= 6.2.0)
   ffaker
   figaro
   flipper
   flipper-active_record
   flipper-ui
-  fog-aws (>= 0.6.0)
+  fog-aws (~> 2.0)
+  foreman
   foundation-icons-sass-rails
   foundation-rails (= 5.5.2.1)
   fuubar (~> 2.5.1)
@@ -695,32 +760,34 @@ DEPENDENCIES
   paperclip (~> 3.4.1)
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
+  pdf-reader
   pg (~> 1.2.3)
   pry
   pry-byebug
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
-  rails (~> 5.2)
+  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
-  roadie-rails (~> 2.2.0)
+  roadie-rails
   roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
   rspec-retry
   rswag
   rubocop
   rubocop-rails
-  sass (<= 4.7.1)
-  sass-rails (< 6.0.0)
-  select2-rails (~> 3.4.7)
+  sass-rails (< 5.1.0)
+  select2-rails!
   selenium-webdriver
   shoulda-matchers
+  sidekiq
+  sidekiq-scheduler
   simplecov
   spring
   spring-commands-rspec
@@ -736,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.8p224
+   ruby 2.7.3p183
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

Procfile

@@ -0,0 +1,5 @@
+# Foreman Procfile. Start all dev server processes with: `foreman start`
+
+rails:      bundle exec rails s -p 3000
+webpack:    ./bin/webpack-dev-server
+sidekiq:    bundle exec sidekiq -q mailers -q default

README.md

@@ -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

Rakefile

@@ -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

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

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

app/assets/javascripts/admin/all.js

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

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

@@ -0,0 +1,8 @@
+angular.module("ofn.admin").directive "select2WatchNgModel", () ->
+  restrict: 'E'
+  scope: true
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    ngModel.$render = () ->
+      newValue = ngModel.$viewValue;
+      element.children(".select2").select2("val", newValue)

app/assets/javascripts/admin/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,

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

@@ -3,12 +3,18 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.e
     require: "ngModel"
     link: (scope, element, attrs, ngModel) ->
       $timeout ->
-        flatpickr(element,  Object.assign({},
+        fp = flatpickr(element,  Object.assign({},
                             window.FLATPICKR_DATETIME_DEFAULT, {
                             onOpen: (selectedDates, dateStr, instance) ->
                               instance.setDate(ngModel.$modelValue)
                               instance.input.dispatchEvent(new Event('focus', { bubbles: true }));
                             }));
+        fp.minuteElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setMinutes(e.target.value), true)
+        fp.hourElement.addEventListener "keyup", (e) ->
+          if !isNaN(event.target.value)
+            fp.setDate(fp.selectedDates[0].setHours(e.target.value), true)            
 
   .directive 'ofnOnChange', ->
     (scope, element, attrs) ->

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter) ->
+angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, RequestMonitor, Orders, SortOptions, $window, $filter, $location, KeyValueMapStore) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.pagination = Orders.pagination
   $scope.orders = Orders.all
@@ -15,39 +15,54 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
   $scope.poll = 0
   $scope.rowStatus = {}
 
+  KeyValueMapStore.localStorageKey = 'ordersFilters'
+  KeyValueMapStore.storableKeys = ["q", "sorting", "page", "per_page"]
+
   $scope.initialise = ->
+    unless KeyValueMapStore.restoreValues($scope)
+      $scope.setDefaults()
+
+    $scope.fetchResults()
+
+  $scope.setDefaults = ->
     $scope.per_page = 15
     $scope.q = {
       completed_at_not_null: true
     }
+
+  $scope.clearFilters = () ->
+    KeyValueMapStore.clearKeyValueMap()
+    $scope.setDefaults()
     $scope.fetchResults()
 
   $scope.fetchResults = (page=1) ->
-    startDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_gteq'], ' 00:00:00')
-    endDateWithTime = $scope.appendStringIfNotEmpty($scope['q']['completed_at_lteq'], ' 23:59:59')
+    startDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_gteq, ' 00:00:00')
+    endDateWithTime = $scope.appendStringIfNotEmpty($scope.q?.completed_at_lteq, ' 23:59:59')
 
     $scope.resetSelected()
     params = {
       'q[completed_at_gteq]': startDateWithTime,
       'q[completed_at_lteq]': endDateWithTime,
-      'q[state_eq]': $scope['q']['state_eq'],
-      'q[number_cont]': $scope['q']['number_cont'],
-      'q[email_cont]': $scope['q']['email_cont'],
-      'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'],
-      'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
+      'q[state_eq]': $scope.q?.state_eq,
+      'q[number_cont]': $scope.q?.number_cont,
+      'q[email_cont]': $scope.q?.email_cont,
+      'q[bill_address_firstname_start]': $scope.q?.bill_address_firstname_start,
+      'q[bill_address_lastname_start]': $scope.q?.bill_address_lastname_start,
       # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
-      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
-      'q[distributor_id_in][]': $scope['q']['distributor_id_in'],
-      'q[order_cycle_id_in][]': $scope['q']['order_cycle_id_in'],
+      'q[completed_at_not_null]': $scope.q?.completed_at_not_null || null,
+      'q[distributor_id_in][]': $scope.q?.distributor_id_in,
+      'q[order_cycle_id_in][]': $scope.q?.order_cycle_id_in,
       'q[s]': $scope.sorting || 'completed_at desc',
-      shipping_method_id: $scope.shipping_method_id,
+      shipping_method_id: $scope.q?.shipping_method_id,
       per_page: $scope.per_page,
       page: page
     }
+    KeyValueMapStore.setStoredValues($scope)
     RequestMonitor.load(Orders.index(params).$promise)
 
   $scope.appendStringIfNotEmpty = (baseString, stringToAppend) ->
     return baseString unless baseString
+    return baseString if baseString.endsWith(stringToAppend)
 
     baseString + stringToAppend
 

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

@@ -1 +1 @@
-angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation'])
+angular.module("admin.orders", ['admin.indexUtils', 'ngResource', 'mm.foundation', "OFNShared"])

app/assets/javascripts/admin/payment_methods/controllers/providers_controller.js.coffee

@@ -2,6 +2,6 @@ angular.module("admin.paymentMethods").controller "ProvidersCtrl", ($scope, paym
   if paymentMethod.type
     $scope.include_html = "/admin/payment_methods/show_provider_preferences?" +
       "provider_type=#{paymentMethod.type};" +
-      "pm_id=#{paymentMethod.id};"
+      "pm_id=#{paymentMethod.id || ''};"
   else
     $scope.include_html = ""

app/assets/javascripts/admin/products/controllers/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]

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

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

@@ -1,6 +1,7 @@
-angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter) ->
+angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, localizeCurrencyFilter, PriceParser) ->
   class UnitPrices
     @displayableUnitPrice: (price, scale, unit_type, unit_value, variant_unit_name) ->
+      price = PriceParser.parse(price)
       if price && !isNaN(price) && unit_type && unit_value
         value = localizeCurrencyFilter(UnitPrices.price(price, scale, unit_type, unit_value, variant_unit_name))
         unit = UnitPrices.unit(scale, unit_type, variant_unit_name)
@@ -29,4 +30,4 @@ angular.module("admin.products").factory "UnitPrices", (VariantUnitManager, loca
       else if unit_type == "weight"
         "kg"
       else if unit_type == "volume"
-        "L"
+        "L"

app/assets/javascripts/admin/services/key_value_map_store.js.coffee

@@ -0,0 +1,29 @@
+angular.module("admin.indexUtils").factory 'KeyValueMapStore', (localStorageService)->
+  new class KeyValueMapStore
+    localStorageKey: ''
+    storableKeys: []
+
+    constructor: ->
+      localStorageService.setStorageType("sessionStorage")
+
+    getStoredKeyValueMap: ->
+      localStorageService.get(@localStorageKey) || {}
+
+    setStoredValues: (source) ->
+      keyValueMap = {}
+      for key in @storableKeys
+        keyValueMap[key] = source[key]
+      localStorageService.set(@localStorageKey, keyValueMap)
+
+    restoreValues: (target) ->
+      storedKeyValueMap = @getStoredKeyValueMap()
+      
+      return false if _.isEmpty(storedKeyValueMap)  
+      
+      for k,v of storedKeyValueMap
+       target[k] = v
+
+      return true
+
+    clearKeyValueMap: () ->
+      localStorageService.remove(@localStorageKey)

app/assets/javascripts/admin/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)

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

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

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

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

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

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

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, */*"

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

@@ -8,7 +8,7 @@
   .div
     {{ variant.line_item.total_price | localizeCurrency }}
 
-  .unit-price{"ng-if": "show_unit_price"}
+  .unit-price
     %question-mark-with-tooltip{"question-mark-with-tooltip": "_",
     "question-mark-with-tooltip-append-to-body": "true",
     "question-mark-with-tooltip-placement": "top",

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

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

app/assets/javascripts/templates/shop_variant_with_unit_price.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/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;
   }
-}
+}

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;

app/assets/stylesheets/admin/terms_of_service_files.scss

@@ -0,0 +1,6 @@
+.admin-current-terms-of-service {
+  border: .1em solid $spree-blue;
+  border-radius: .5em;
+  margin: 1em 0;
+  padding: 1em;
+}

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
@@ -32,10 +34,7 @@ module Admin
       # See https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/locking/pessimistic.rb#L69
       # and https://www.postgresql.org/docs/current/static/sql-select.html#SQL-FOR-UPDATE-SHARE
       order.with_lock do
-        if @line_item.update(line_item_params)
-          order.update_line_item_fees! @line_item
-          order.update_order_fees!
-          order.update_order!
+        if order.contents.update_item(@line_item, line_item_params)
           render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
         else
           render json: { errors: @line_item.errors }, status: :precondition_failed
@@ -49,7 +48,7 @@ module Admin
       load_line_item
       authorize! :update, order
 
-      @line_item.destroy
+      order.contents.remove(@line_item.variant)
       render body: nil, status: :no_content # No Content, does not trigger ng resource auto-update
     end
 
@@ -63,16 +62,9 @@ module Admin
       Spree::LineItem
     end
 
-    # Returns the appropriate serializer for this controller
-    #
-    # @return [Api::Admin::LineItemSerializer]
-    def serializer(_ams_prefix)
-      Api::Admin::LineItemSerializer
-    end
-
     def serialized_line_items
       ActiveModel::ArraySerializer.new(
-        @line_items, each_serializer: serializer(nil)
+        @line_items, each_serializer: Api::Admin::LineItemSerializer
       )
     end
 

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]

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

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

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

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

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
 

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
 

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]

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

app/controllers/admin/invoice_settings_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class InvoiceSettingsController < Spree::Admin::BaseController
     def update

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
 

app/controllers/admin/matomo_settings_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class MatomoSettingsController < Spree::Admin::BaseController
     def update

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

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

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

app/controllers/admin/proxy_orders_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class ProxyOrdersController < Admin::ResourceController
     respond_to :json

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

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

app/controllers/admin/stripe_accounts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stripe/account_connector'
 
 module Admin

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

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'

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

app/controllers/admin/tag_rules_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class TagRulesController < Admin::ResourceController
     respond_to :json

app/controllers/admin/terms_of_service_files_controller.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Admin
+  class TermsOfServiceFilesController < Spree::Admin::BaseController
+    def show
+      @current_file = TermsOfServiceFile.current
+      @new_file = TermsOfServiceFile.new
+    end
+
+    def new
+      show
+      render :show
+    end
+
+    def create
+      TermsOfServiceFile.create!(file_params)
+      redirect_to main_app.admin_terms_of_service_files_path
+    rescue ActionController::ParameterMissing
+      flash[:error] = t(".select_file")
+      redirect_to main_app.admin_terms_of_service_files_path
+    end
+
+    def destroy
+      TermsOfServiceFile.current.destroy!
+      redirect_to main_app.admin_terms_of_service_files_path
+    end
+
+    private
+
+    # Needed by Spree::Admin::BaseController#authorize_admin or it
+    # tries to find a Spree model.
+    def model_class
+      TermsOfServiceFile
+    end
+
+    def file_params
+      params.require(:terms_of_service_file).permit(:attachment)
+    end
+  end
+end

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

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

app/controllers/api/v0/enterprises_controller.rb

@@ -44,9 +44,9 @@ module Api
         authorize! :update, @enterprise
 
         if params[:logo] && @enterprise.update( logo: params[:logo] )
-          render plain: @enterprise.logo.url(:medium), status: :ok
+          render html: @enterprise.logo.url(:medium), status: :ok
         elsif params[:promo] && @enterprise.update( promo_image: params[:promo] )
-          render plain: @enterprise.promo_image.url(:medium), status: :ok
+          render html: @enterprise.promo_image.url(:medium), status: :ok
         else
           invalid_resource!(@enterprise)
         end

app/controllers/api/v0/shipments_controller.rb

@@ -81,7 +81,6 @@ module Api
         quantity = params[:quantity].to_i
 
         @order.contents.remove(variant, quantity, @shipment)
-        @order.recreate_all_fees!
         @shipment.reload if @shipment.persisted?
 
         render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok

app/controllers/api/v0/taxons_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V0
     class TaxonsController < Api::V0::BaseController

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'
 
@@ -26,12 +25,12 @@ class ApplicationController < ActionController::Base
   helper 'footer_links'
   helper 'discourse'
   helper 'checkout'
+  helper 'terms_and_conditions'
 
   protect_from_forgery
 
   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
@@ -51,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
 
@@ -153,7 +152,7 @@ class ApplicationController < ActionController::Base
       current_order.empty!
       current_order.set_order_cycle! nil
       flash[:info] = I18n.t('order_cycle_closed')
-      redirect_to main_app.root_url
+      redirect_to main_app.shop_path
     end
   end
 

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

app/controllers/cart_controller.rb

@@ -1,35 +1,32 @@
+# frozen_string_literal: true
+
 class CartController < BaseController
   before_action :check_authorization
 
   def populate
     order = current_order(true)
-
     cart_service = CartService.new(order)
 
-    cart_service.populate(params.slice(:variants, :quantity), true)
-    if cart_service.valid?
+    if cart_service.populate(params.slice(:variants, :quantity))
       order.cap_quantity_at_stock!
       order.recreate_all_fees!
 
-      variant_ids = variant_ids_in(cart_service.variants_h)
-
-      render json: { error: false,
-                     stock_levels: VariantsStockLevels.new.call(order, variant_ids) },
-             status: :ok
+      render json: { error: false, stock_levels: stock_levels(order) }, status: :ok
     else
       render json: { error: cart_service.errors.full_messages.join(",") },
              status: :precondition_failed
     end
-
-    populate_variant_attributes
-  end
-
-  def variant_ids_in(variants_h)
-    variants_h.map { |v| v[:variant_id].to_i }
   end
 
   private
 
+  def stock_levels(order)
+    variants_in_cart = order.line_items.pluck(:variant_id)
+    variants_in_request = raw_params[:variants]&.map(&:first) || []
+
+    VariantsStockLevels.new.call(order, (variants_in_cart + variants_in_request).uniq)
+  end
+
   def check_authorization
     session[:access_token] ||= params[:token]
     order = Spree::Order.find_by(number: params[:id]) || current_order
@@ -40,26 +37,4 @@ class CartController < BaseController
       authorize! :create, Spree::Order
     end
   end
-
-  def populate_variant_attributes
-    order = current_order.reload
-
-    populate_variant_attributes_from_variant(order) if params.key? :variant_attributes
-    populate_variant_attributes_from_product(order) if params.key? :quantity
-  end
-
-  def populate_variant_attributes_from_variant(order)
-    params[:variant_attributes].each do |variant_id, attributes|
-      permitted = attributes.permit(:quantity, :max_quantity).to_h.with_indifferent_access
-      order.set_variant_attributes(Spree::Variant.find(variant_id), permitted)
-    end
-  end
-
-  def populate_variant_attributes_from_product(order)
-    params[:products].each do |_product_id, variant_id|
-      max_quantity = params[:max_quantity].to_i
-      order.set_variant_attributes(Spree::Variant.find(variant_id),
-                                   max_quantity: max_quantity)
-    end
-  end
 end

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 })

app/controllers/discourse_sso_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'discourse/single_sign_on'
 
 class DiscourseSsoController < ApplicationController

app/controllers/enterprises_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/enterprise_injection_data'
 
 class EnterprisesController < BaseController

app/controllers/groups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class GroupsController < BaseController
   layout 'darkswarm'
 

app/controllers/home_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HomeController < BaseController
   layout 'darkswarm'
 

app/controllers/line_items_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LineItemsController < BaseController
   respond_to :json
 
@@ -39,12 +41,8 @@ class LineItemsController < BaseController
   def destroy_with_lock(item)
     order = item.order
     order.with_lock do
-      item.destroy
-      order.update_shipping_fees!
+      order.contents.remove(item.variant)
       order.update_payment_fees!
-      order.update_order_fees!
-      order.update_order!
-      order.create_tax_charge!
     end
   end
 end

app/controllers/map_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MapController < BaseController
   layout 'darkswarm'
 

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

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

app/controllers/producers_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProducersController < BaseController
   layout 'darkswarm'
 

app/controllers/registration_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open_food_network/spree_api_key_loader'
 
 class RegistrationController < BaseController

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

app/controllers/shops_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ShopsController < BaseController
   layout 'darkswarm'
 

app/controllers/sitemap_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SitemapController < ApplicationController
   layout nil
 

app/controllers/spree/admin/adjustments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class AdjustmentsController < ::Admin::ResourceController

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'
@@ -12,7 +12,7 @@ module Spree
       helper 'enterprise_fees'
       helper 'angular_form'
 
-      layout '/spree/layouts/admin'
+      layout 'spree/layouts/admin'
 
       include I18nHelper
 

app/controllers/spree/admin/countries_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class CountriesController < ::Admin::ResourceController

app/controllers/spree/admin/general_settings_controller.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController
       def edit
         @preferences_general = [:site_name, :default_seo_title, :default_meta_keywords,
                                 :default_meta_description, :site_url]
-        @preferences_security = [:allow_ssl_in_production,
-                                 :allow_ssl_in_staging, :allow_ssl_in_development_and_test]
+        @preferences_security = [:allow_ssl_in_production, :allow_ssl_in_staging]
         @preferences_currency = [:display_currency, :hide_cents]
       end
 

app/controllers/spree/admin/images_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ImagesController < ::Admin::ResourceController

app/controllers/spree/admin/invoices_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class InvoicesController < Spree::Admin::BaseController

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

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')

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'))
@@ -81,9 +84,7 @@ module Spree
       end
 
       def invoice
-        pdf = InvoiceRenderer.new.render_to_string(@order)
-
-        Spree::OrderMailer.invoice_email(@order.id, pdf).deliver_later
+        Spree::OrderMailer.invoice_email(@order.id).deliver_later
         flash[:success] = t('admin.orders.invoice_email_sent')
 
         respond_with(@order) { |format|

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

app/controllers/spree/admin/payment_methods_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PaymentMethodsController < ::Admin::ResourceController

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')

app/controllers/spree/admin/product_properties_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ProductPropertiesController < ::Admin::ResourceController

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
 

app/controllers/spree/admin/properties_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PropertiesController < ::Admin::ResourceController

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