Merge pull request #7582 from openfoodfoundation/transifex

Transifex

.gitignore

@@ -47,3 +47,4 @@ coverage
 /reports/
 !/reports/README.md
 bin/
+/spec/components/stories/**/*.stories.json

.rubocop_manual_todo.yml

@@ -249,7 +249,6 @@ Layout/LineLength:
   - spec/lib/open_food_network/products_and_inventory_report_spec.rb
   - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
   - spec/lib/open_food_network/tag_rule_applicator_spec.rb
-  - spec/lib/open_food_network/user_balance_calculator_spec.rb
   - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
   - spec/lib/open_food_network/xero_invoices_report_spec.rb
   - spec/lib/spree/core/calculated_adjustments_spec.rb

.rubocop_todo.yml

@@ -368,84 +368,6 @@ Rails/ApplicationMailer:
   Exclude:
     - 'app/mailers/spree/base_mailer.rb'
 
-# Offense count: 73
-# Cop supports --auto-correct.
-Rails/ApplicationRecord:
-  Exclude:
-    - 'app/models/adjustment_metadata.rb'
-    - 'app/models/column_preference.rb'
-    - 'app/models/coordinator_fee.rb'
-    - 'app/models/customer.rb'
-    - 'app/models/distributor_shipping_method.rb'
-    - 'app/models/enterprise.rb'
-    - 'app/models/enterprise_fee.rb'
-    - 'app/models/enterprise_group.rb'
-    - 'app/models/enterprise_relationship.rb'
-    - 'app/models/enterprise_relationship_permission.rb'
-    - 'app/models/enterprise_role.rb'
-    - 'app/models/exchange.rb'
-    - 'app/models/exchange_fee.rb'
-    - 'app/models/exchange_variant.rb'
-    - 'app/models/inventory_item.rb'
-    - 'app/models/order_cycle.rb'
-    - 'app/models/order_cycle_schedule.rb'
-    - 'app/models/producer_property.rb'
-    - 'app/models/proxy_order.rb'
-    - 'app/models/schedule.rb'
-    - 'app/models/spree/address.rb'
-    - 'app/models/spree/adjustment.rb'
-    - 'app/models/spree/asset.rb'
-    - 'app/models/spree/calculator.rb'
-    - 'app/models/spree/classification.rb'
-    - 'app/models/spree/country.rb'
-    - 'app/models/spree/credit_card.rb'
-    - 'app/models/spree/inventory_unit.rb'
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/log_entry.rb'
-    - 'app/models/spree/option_type.rb'
-    - 'app/models/spree/option_value.rb'
-    - 'app/models/spree/option_values_line_item.rb'
-    - 'app/models/spree/order.rb'
-    - 'app/models/spree/order/checkout.rb'
-    - 'app/models/spree/payment.rb'
-    - 'app/models/spree/payment/processing.rb'
-    - 'app/models/spree/payment_method.rb'
-    - 'app/models/spree/paypal_express_checkout.rb'
-    - 'app/models/spree/preference.rb'
-    - 'app/models/spree/price.rb'
-    - 'app/models/spree/product.rb'
-    - 'app/models/spree/product_option_type.rb'
-    - 'app/models/spree/product_property.rb'
-    - 'app/models/spree/property.rb'
-    - 'app/models/spree/return_authorization.rb'
-    - 'app/models/spree/role.rb'
-    - 'app/models/spree/shipment.rb'
-    - 'app/models/spree/shipping_category.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/shipping_method_category.rb'
-    - 'app/models/spree/shipping_rate.rb'
-    - 'app/models/spree/state.rb'
-    - 'app/models/spree/state_change.rb'
-    - 'app/models/spree/stock_item.rb'
-    - 'app/models/spree/stock_location.rb'
-    - 'app/models/spree/stock_movement.rb'
-    - 'app/models/spree/tax_category.rb'
-    - 'app/models/spree/tax_rate.rb'
-    - 'app/models/spree/taxon.rb'
-    - 'app/models/spree/taxonomy.rb'
-    - 'app/models/spree/tokenized_permission.rb'
-    - 'app/models/spree/user.rb'
-    - 'app/models/spree/variant.rb'
-    - 'app/models/spree/zone.rb'
-    - 'app/models/spree/zone_member.rb'
-    - 'app/models/stripe_account.rb'
-    - 'app/models/subscription.rb'
-    - 'app/models/subscription_line_item.rb'
-    - 'app/models/tag_rule.rb'
-    - 'app/models/variant_override.rb'
-    - 'lib/tasks/data/remove_transient_data.rb'
-    - 'spec/models/spree/preferences/preferable_spec.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
@@ -1009,7 +931,6 @@ Style/FrozenStringLiteralComment:
     - 'app/helpers/spree/admin/base_helper.rb'
     - 'app/helpers/spree/admin/general_settings_helper.rb'
     - 'app/helpers/spree/admin/orders_helper.rb'
-    - 'app/helpers/spree/admin/payments_helper.rb'
     - 'app/helpers/spree/admin/taxons_helper.rb'
     - 'app/helpers/spree/admin/zones_helper.rb'
     - 'app/helpers/spree/orders_helper.rb'
@@ -1213,7 +1134,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/scope_variants_for_search.rb'
     - 'lib/open_food_network/spree_api_key_loader.rb'
     - 'lib/open_food_network/tag_rule_applicator.rb'
-    - 'lib/open_food_network/user_balance_calculator.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/authentication_helpers.rb'

.storybook/main.js

@@ -0,0 +1,7 @@
+module.exports = {
+  stories: ['../spec/components/stories/**/*.stories.json'],
+  addons: [
+    '@storybook/addon-docs',
+    '@storybook/addon-controls',
+  ],
+};

.storybook/preview-head.html

@@ -0,0 +1,2 @@
+<link href='https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" media="screen" href="http://localhost:3000/assets/darkswarm/all.css" />

.storybook/preview.js

@@ -0,0 +1,5 @@
+export const parameters = {
+  server: {
+    url: `http://localhost:3000/rails/stories`,
+  },
+};

Gemfile

@@ -4,12 +4,12 @@ source 'https://rubygems.org'
 ruby "2.5.8"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'rails', '~> 5.0.0'
+gem 'rails', '~> 5.2'
 
 gem 'activemerchant', '>= 1.78.0'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
-gem 'ransack', '2.3.0'
+gem 'ransack', '2.4.1'
 gem 'responders'
 gem 'sass', '<= 4.7.1'
 gem 'sass-rails', '< 6.0.0'
@@ -29,9 +29,9 @@ gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
 gem 'activerecord-postgresql-adapter'
-gem 'pg', '~> 0.21.0'
+gem 'pg', '~> 1.2.3'
 
-gem 'acts_as_list', '1.0.3'
+gem 'acts_as_list', '1.0.4'
 gem 'cancancan', '~> 1.15.0'
 gem 'ffaker'
 gem 'highline', '2.0.3' # Necessary for the install generator
@@ -75,11 +75,12 @@ 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 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
-gem 'roadie-rails', '~> 1.3.0'
+gem 'roadie-rails', '~> 2.2.0'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -92,7 +93,7 @@ gem 'whenever', require: false
 
 gem 'test-unit', '~> 3.4'
 
-gem 'coffee-rails', '~> 4.2.2'
+gem 'coffee-rails', '~> 5.0.0'
 gem 'compass-rails'
 
 gem 'mini_racer', '0.4.0'
@@ -117,6 +118,8 @@ gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'
 
+gem "view_component", require: "view_component/engine"
+
 group :production, :staging do
   gem 'ddtrace'
   gem 'unicorn-worker-killer'
@@ -164,6 +167,8 @@ group :development do
   gem 'spring'
   gem 'spring-commands-rspec'
 
+  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.

Gemfile.lock

@@ -47,65 +47,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-action_caching (1.2.1)
       actionpack (>= 4.0.0)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
     activemerchant (1.119.0)
       activesupport (>= 4.2)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
     activerecord-import (1.0.8)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activerecord-session_store (1.1.3)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
+    activerecord-session_store (2.0.0)
+      actionpack (>= 5.2.4.1)
+      activerecord (>= 5.2.4.1)
       multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0)
-    activesupport (5.0.7.2)
+      rack (>= 2.0.8, < 3)
+      railties (>= 5.2.4.1)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     acts-as-taggable-on (7.0.0)
       activerecord (>= 5.0, < 6.2)
-    acts_as_list (1.0.3)
+    acts_as_list (1.0.4)
       activerecord (>= 4.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
@@ -118,7 +122,7 @@ GEM
       railties (>= 3, < 7)
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.5.5)
-    arel (7.1.4)
+    arel (9.0.0)
     ast (2.4.2)
     atomic (1.1.101)
     awesome_nested_set (3.4.0)
@@ -152,12 +156,12 @@ GEM
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codecov (0.5.1)
+    codecov (0.5.2)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    coffee-rails (4.2.2)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -184,12 +188,13 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.7.1)
+    css_parser (1.9.0)
       addressable
-    daemons (1.3.1)
+    daemons (1.4.0)
     dalli (2.7.11)
     database_cleaner (1.99.0)
-    ddtrace (0.47.0)
+    ddtrace (0.48.0)
+      ffi (~> 1.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.9)
@@ -202,7 +207,7 @@ GEM
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (4.7.3)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -215,7 +220,6 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.5)
     erubi (1.10.0)
-    erubis (2.7.0)
     eventmachine (1.2.7)
     excon (0.79.0)
     execjs (2.7.0)
@@ -267,7 +271,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.6.6)
+    geocoder (1.6.7)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
     globalid (0.4.2)
@@ -315,24 +319,28 @@ GEM
       kaminari-core (= 1.2.1)
     kaminari-core (1.2.1)
     kgio (2.11.3)
-    knapsack (1.20.0)
+    knapsack (1.22.0)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.7.0)
       launchy (~> 2.2)
     libv8-node (15.14.0.0)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (1.0.1)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-    mini_mime (1.0.3)
-    mini_portile2 (2.5.0)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
     mini_racer (0.4.0)
       libv8-node (~> 15.14.0.0)
     minitest (5.14.4)
@@ -346,8 +354,8 @@ GEM
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    nokogiri (1.11.2)
+    nio4r (2.5.7)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
@@ -369,16 +377,14 @@ GEM
     parallel (1.20.1)
     paranoia (2.4.3)
       activerecord (>= 4.0, < 6.2)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     paypal-sdk-core (0.3.4)
       multi_json (~> 1.0)
       xml-simple
     paypal-sdk-merchant (1.117.2)
       paypal-sdk-core (~> 0.3.0)
-    pg (0.21.0)
-    polyamorous (2.3.0)
-      activerecord (>= 5.0)
+    pg (1.2.3)
     power_assert (2.0.0)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -389,26 +395,27 @@ GEM
     public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
-    rack-mini-profiler (2.3.1)
+    rack-mini-profiler (2.3.2)
       rack (>= 1.2.0)
     rack-protection (2.1.0)
       rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    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.0.7.2)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -423,21 +430,19 @@ GEM
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     rails_safe_tasks (1.0.0)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.1)
     rake (13.0.3)
-    ransack (2.3.0)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+    ransack (2.4.1)
+      activerecord (>= 5.2.4)
+      activesupport (>= 5.2.4)
       i18n
-      polyamorous (= 2.3.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -448,13 +453,13 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rexml (3.2.4)
-    roadie (3.5.1)
+    rexml (3.2.5)
+    roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (1.3.0)
-      railties (>= 3.0, < 5.3)
-      roadie (~> 3.1)
+    roadie-rails (2.2.0)
+      railties (>= 5.1, < 6.2)
+      roadie (>= 3.1, < 5.0)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -470,10 +475,10 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.1.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
@@ -494,21 +499,21 @@ GEM
     rswag-ui (2.4.0)
       actionpack (>= 3.1, < 7.0)
       railties (>= 3.1, < 7.0)
-    rubocop (1.12.1)
+    rubocop (1.14.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-rails (2.9.1)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-rails (2.10.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
+      rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.11.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.2)
@@ -550,17 +555,17 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.5.0)
-    state_machines-activemodel (0.7.1)
-      activemodel (>= 4.1)
+    state_machines-activemodel (0.8.0)
+      activemodel (>= 5.1)
       state_machines (>= 0.5.0)
-    state_machines-activerecord (0.6.0)
-      activerecord (>= 4.1)
-      state_machines-activemodel (>= 0.5.0)
+    state_machines-activerecord (0.8.0)
+      activerecord (>= 5.1)
+      state_machines-activemodel (>= 0.8.0)
     stringex (2.8.5)
     stripe (5.30.0)
     temple (0.8.2)
-    test-prof (1.0.2)
-    test-unit (3.4.0)
+    test-prof (1.0.3)
+    test-unit (3.4.1)
       power_assert
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -581,6 +586,10 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 7)
     uniform_notifier (1.14.1)
+    view_component (2.31.1)
+      activesupport (>= 5.0.0, < 7.0)
+    view_component_storybook (0.8.0)
+      view_component (>= 2.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     webdrivers (4.6.0)
@@ -591,7 +600,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
@@ -614,7 +623,7 @@ DEPENDENCIES
   activerecord-postgresql-adapter
   activerecord-session_store
   acts-as-taggable-on (~> 7.0)
-  acts_as_list (= 1.0.3)
+  acts_as_list (= 1.0.4)
   andand
   angular-rails-templates (>= 0.3.0)
   angular_rails_csrf
@@ -631,7 +640,7 @@ DEPENDENCIES
   capybara
   catalog!
   codecov
-  coffee-rails (~> 4.2.2)
+  coffee-rails (~> 5.0.0)
   combine_pdf
   compass-rails
   custom_error_message!
@@ -675,6 +684,7 @@ DEPENDENCIES
   kaminari (~> 1.2.1)
   knapsack
   letter_opener (>= 1.4.1)
+  mimemagic (> 0.3.5)
   mini_racer (= 0.4.0)
   monetize (~> 1.11)
   oauth2 (~> 1.4.7)
@@ -684,20 +694,20 @@ DEPENDENCIES
   paperclip (~> 3.4.1)
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
-  pg (~> 0.21.0)
+  pg (~> 1.2.3)
   pry
   pry-byebug
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
-  rails (~> 5.0.0)
+  rails (~> 5.2)
   rails-controller-testing
   rails-i18n
   rails_safe_tasks (~> 1.0)
-  ransack (= 2.3.0)
+  ransack (= 2.4.1)
   redcarpet
   responders
-  roadie-rails (~> 1.3.0)
+  roadie-rails (~> 2.2.0)
   roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
   rspec-retry
@@ -721,6 +731,8 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
   unicorn-rails
   unicorn-worker-killer
+  view_component
+  view_component_storybook
   web!
   webdrivers
   webmock

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

@@ -11,8 +11,9 @@
 #= require leaflet-1.6.0.js
 #= require leaflet-providers.js
 #= require lodash.underscore.js
-# bluebird.js is a dependency of angular-google-maps.js 2.0.0
+# bluebird.js and angular-simple-logger are dependencies of angular-google-maps.js 2.0.0
 #= require bluebird.js
+#= require angular-simple-logger.min.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -11,6 +11,8 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $scope.supplied_taxons = null
   $scope.supplied_properties = null
   $scope.showFilterSidebar = false
+  $scope.activeTaxons = []
+  $scope.activeProperties = []
 
   # Update filters after initial load of shop tab
   $timeout =>
@@ -20,6 +22,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
     $scope.clearAll()
+    $scope.page = 1
 
   $scope.update_filters = ->
     order_cycle_id = OrderCycle.order_cycle.order_cycle_id

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

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

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

@@ -4,4 +4,5 @@ Darkswarm.directive "shopVariantWithUnitPrice", ->
   templateUrl: 'shop_variant_with_unit_price.html'
   scope:
     variant: '='
+    show_unit_price: '=showunitprice'
   controller: 'ShopVariantCtrl'

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

@@ -21,6 +21,7 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
         url: "/api/v0/enterprises"
         data:
           enterprise: @prepare()
+          use_geocoder: @useGeocoder()
         params:
           token: spreeApiKey
       ).success((data) =>
@@ -45,6 +46,7 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
         url: "/api/v0/enterprises/#{@enterprise.id}"
         data:
           enterprise: @prepare()
+          use_geocoder: @useGeocoder()
         params:
           token: spreeApiKey
       ).success((data) ->
@@ -63,3 +65,7 @@ Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService,
       enterprise.address_attributes = @enterprise.address if @enterprise.address?
       enterprise.address_attributes.country_id = @enterprise.country.id if @enterprise.country?
       enterprise
+
+    useGeocoder: =>
+      if @enterprise.address? && !@enterprise.address.latitude? && !@enterprise.address.longitude?
+        return "1"

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

@@ -2,12 +2,21 @@
   .columns.small-12
     %h3{"ng-bind" => "::variant.extended_name"}
 
-.row.variant-bulk-buy-price-summary
-  .columns.small-6
-    .variant-unit {{ ::variant.unit_to_display }}
-  .columns.small-6
+.flex.variant-bulk-buy-price-summary{style: "justify-content: space-around;"}
+  .variant-unit
+    {{ ::variant.unit_to_display }}
+  .div
     {{ variant.line_item.total_price | localizeCurrency }}
 
+  .unit-price{"ng-if": "show_unit_price"}
+    %question-mark-with-tooltip{"question-mark-with-tooltip": "_",
+    "question-mark-with-tooltip-append-to-body": "true",
+    "question-mark-with-tooltip-placement": "top",
+    "question-mark-with-tooltip-animation": true,
+    style: "margin-right: 5px",
+    key: "'js.shopfront.unit_price_tooltip'"} 
+    {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
+
 .row
   .columns.small-12.medium-6
     .variant-bulk-buy-quantity-label

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

@@ -181,11 +181,10 @@ shop ordercycle {
   }
 }
 
-shop navigation ordercycle {
-  margin-top: 3.4em;
+shop .tab-buttons ordercycle {
   padding: 1em;
-  height: 7.6em;
   position: absolute;
+  bottom: 0;
   right: 1em;
 }
 

app/assets/stylesheets/darkswarm/distributor_header.scss

@@ -1,6 +1,8 @@
 @import "mixins";
 @import 'typography';
 
+$shop-navigation-zindex: 20;
+
 section {
   :not(shop) navigation {
     box-shadow: $distributor-header-shadow;
@@ -11,7 +13,7 @@ section {
   display: block;
   background: $white;
   position: relative;
-  z-index: 20;
+  z-index: $shop-navigation-zindex;
 
   .details {
     box-sizing: border-box;

app/assets/stylesheets/darkswarm/registration.scss

@@ -167,6 +167,26 @@
       height: 166px;
     }
   }
+
+  .map-container--registration {
+    width: 100%;
+    height: 244px;
+    margin-bottom: 1em;
+
+    map, .angular-google-map-container, google-map, .angular-google-map {
+      display: block;
+      height: 220px;
+      width: 100%;
+    }
+  }
+
+  .center {
+    justify-content: center;
+  }
+
+  .button.primary {
+    border-radius: 0;
+  }
 }
 
 #registration-type {

app/assets/stylesheets/darkswarm/shop_tabs.scss

@@ -9,7 +9,7 @@
     color: $dark-grey;
     box-shadow: $distributor-header-shadow;
     position: relative;
-    z-index: 10;
+    z-index: $shop-navigation-zindex + 1;
 
     .columns {
       display: flex;

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

@@ -37,8 +37,6 @@
       content: "";
       color: $white;
       vertical-align: super;
-      position: relative;
-      top: 2px;
     }
   }
 }
@@ -58,6 +56,7 @@
   margin-left: -7.4rem;
   margin-top: -0.1rem;
   background-color: transparent;
+  z-index: $modal-zIndex + 1;
 
   .background {
     position: fixed;

app/assets/stylesheets/shared/variables/variables.scss

@@ -4,6 +4,9 @@ $white: #fff;
 $dynamic-blue: #3d8dd1;
 $teal-500: #0096ad;
 
+/* Defined in foundation-rails components/_reveal.scss */
+$modal-zIndex: 1005;
+
 @font-face {
 	font-family: 'OFN';
 	src: font-url('OFN-v2.eot');
@@ -22,4 +25,4 @@ $teal-500: #0096ad;
   font-style: normal;
   font-variant: normal;
   text-transform: none;
-}
+}

app/components/distributor_title_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class DistributorTitleComponent < ViewComponent::Base
+  def initialize(name:)
+    @name = name
+  end
+end

app/components/distributor_title_component/distributor_title_component.html.haml

@@ -0,0 +1 @@
+%h3= @name

app/components/example_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ExampleComponent < ViewComponent::Base
+  def initialize(title:)
+    @title = title
+  end
+end

app/components/example_component/example_component.html.haml

@@ -0,0 +1 @@
+%h1 #{@title}

app/controllers/admin/customers_controller.rb

@@ -18,21 +18,13 @@ module Admin
         format.html
         format.json do
           render json: @collection,
-                 each_serializer: index_each_serializer,
+                 each_serializer: ::Api::Admin::CustomerWithBalanceSerializer,
                  tag_rule_mapping: tag_rule_mapping,
                  customer_tags: customer_tags_by_id
         end
       end
     end
 
-    def index_each_serializer
-      if OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, spree_current_user)
-        ::Api::Admin::CustomerWithBalanceSerializer
-      else
-        ::Api::Admin::CustomerWithCalculatedBalanceSerializer
-      end
-    end
-
     def show
       render_as_json @customer, ams_prefix: params[:ams_prefix]
     end
@@ -70,7 +62,7 @@ module Admin
 
     def collection
       if json_request? && params[:enterprise_id].present?
-        customers_relation.
+        CustomersWithBalance.new(managed_enterprise_id).query.
           includes(
             :enterprise,
             { bill_address: [:state, :country] },
@@ -82,14 +74,6 @@ module Admin
       end
     end
 
-    def customers_relation
-      if OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, spree_current_user)
-        CustomersWithBalance.new(managed_enterprise_id).query
-      else
-        Customer.of(managed_enterprise_id)
-      end
-    end
-
     def managed_enterprise_id
       @managed_enterprise_id ||= Enterprise.managed_by(spree_current_user).
         select('enterprises.id').find_by(id: params[:enterprise_id])

app/controllers/admin/enterprises_controller.rb

@@ -4,6 +4,8 @@ require 'open_food_network/order_cycle_permissions'
 
 module Admin
   class EnterprisesController < Admin::ResourceController
+    include GeocodeEnterpriseAddress
+
     # These need to run before #load_resource so that @object is initialised with sanitised values
     prepend_before_action :override_owner, only: :create
     prepend_before_action :override_sells, only: :create
@@ -22,6 +24,8 @@ module Admin
     before_action :load_properties, only: [:edit, :update]
     before_action :setup_property, only: [:edit]
 
+    after_action  :geocode_address_if_use_geocoder, only: [:create, :update]
+
     helper 'spree/products'
     include OrderCyclesHelper
 

app/controllers/api/v0/base_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Base controller for OFN's API
-require_dependency 'spree/api/controller_setup'
+require "spree/api/controller_setup"
 require "spree/core/controller_helpers/ssl"
 
 module Api

app/controllers/api/v0/enterprises_controller.rb

@@ -3,6 +3,8 @@
 module Api
   module V0
     class EnterprisesController < Api::V0::BaseController
+      include GeocodeEnterpriseAddress
+
       before_action :override_owner, only: [:create, :update]
       before_action :check_type, only: :update
       before_action :override_sells, only: [:create, :update]
@@ -17,6 +19,7 @@ module Api
         user_ids = enterprise_params.delete(:user_ids)
         @enterprise = Enterprise.new(enterprise_params)
         if @enterprise.save
+          geocode_address_if_use_geocoder
           @enterprise.user_ids = user_ids
           render json: @enterprise.id, status: :created
         else
@@ -29,6 +32,7 @@ module Api
         authorize! :update, @enterprise
 
         if @enterprise.update(enterprise_params)
+          geocode_address_if_use_geocoder
           render json: @enterprise.id, status: :ok
         else
           invalid_resource!(@enterprise)

app/controllers/api/v0/shipments_controller.rb

@@ -16,7 +16,7 @@ module Api
         quantity = params[:quantity].to_i
         @shipment = get_or_create_shipment(params[:stock_location_id])
 
-        @order.contents.add(variant, quantity, nil, @shipment)
+        @order.contents.add(variant, quantity, @shipment)
 
         @shipment.refresh_rates
         @shipment.save!
@@ -68,7 +68,7 @@ module Api
         variant = scoped_variant(params[:variant_id])
         quantity = params[:quantity].to_i
 
-        @order.contents.add(variant, quantity, nil, @shipment)
+        @order.contents.add(variant, quantity, @shipment)
         @order.recreate_all_fees!
 
         render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok

app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency 'spree/authentication_helpers'
+require "spree/authentication_helpers"
 require "application_responder"
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
@@ -13,6 +13,20 @@ class ApplicationController < ActionController::Base
   self.responder = ApplicationResponder
   respond_to :html
 
+  helper 'spree/base'
+  helper 'spree/orders'
+  helper 'spree/payment_methods'
+  helper 'shared'
+  helper 'enterprises'
+  helper 'order_cycles'
+  helper 'order'
+  helper 'shop'
+  helper 'injection'
+  helper 'markdown'
+  helper 'footer_links'
+  helper 'discourse'
+  helper 'checkout'
+
   protect_from_forgery
 
   include Spree::Core::ControllerHelpers::Auth

app/controllers/base_controller.rb

@@ -13,8 +13,6 @@ class BaseController < ApplicationController
   include I18nHelper
   include OrderCyclesHelper
 
-  helper 'spree/base'
-
   before_action :set_locale
   before_action :check_order_cycle_expiry
 

app/controllers/concerns/geocode_enterprise_address.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module GeocodeEnterpriseAddress
+  extend ActiveSupport::Concern
+
+  def geocode_address_if_use_geocoder
+    AddressGeocoder.new(@enterprise.address).geocode if params[:use_geocoder] == "1"
+  end
+end

app/controllers/registration_controller.rb

@@ -2,9 +2,12 @@ require 'open_food_network/spree_api_key_loader'
 
 class RegistrationController < BaseController
   include OpenFoodNetwork::SpreeApiKeyLoader
+
+  layout 'registration'
+  helper 'map'
+
   before_action :load_spree_api_key, only: [:index]
   before_action :check_user, except: :authenticate
-  layout 'registration'
 
   def index
     @enterprise_attributes = { sells: 'none' }

app/controllers/spree/admin/adjustments_controller.rb

@@ -18,7 +18,12 @@ module Spree
       end
 
       def collection
-        parent.all_adjustments.eligible
+        order_adjustments = parent.adjustments.where.not(originator_type: 'EnterpriseFee')
+        admin_adjustments = parent.adjustments.admin
+        payment_fees = parent.all_adjustments.payment_fee.eligible
+        shipping_fees = parent.all_adjustments.shipping
+
+        order_adjustments.or(admin_adjustments) | payment_fees.or(shipping_fees)
       end
 
       def find_resource

app/controllers/spree/admin/base_controller.rb

@@ -3,7 +3,15 @@ module Spree
     class BaseController < ApplicationController
       ssl_required
 
+      helper 'shared'
       helper 'spree/admin/navigation'
+      helper 'spree/admin/orders'
+      helper 'admin/injection'
+      helper 'admin/orders'
+      helper 'admin/enterprises'
+      helper 'enterprise_fees'
+      helper 'angular_form'
+
       layout '/spree/layouts/admin'
 
       include I18nHelper
@@ -21,18 +29,6 @@ module Spree
         flash[:notice] = warning if warning.present?
       end
 
-      # This is in Spree::Core::ControllerHelpers::Auth
-      # But you can't easily reopen modules in Ruby
-      def unauthorized
-        if spree_current_user
-          flash[:error] = t(:authorization_failure)
-          redirect_to '/unauthorized'
-        else
-          store_location
-          redirect_to main_app.root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
-        end
-      end
-
       protected
 
       def model_class

app/controllers/spree/admin/orders_controller.rb

@@ -38,11 +38,12 @@ module Spree
         @order.recreate_all_fees!
 
         unless order_params.present? && @order.update(order_params) && @order.line_items.present?
-          if @order.line_items.empty?
+          if @order.line_items.empty? && !params[:suppress_error_msg]
             @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
           end
-          return redirect_to(spree.edit_admin_order_path(@order),
-                             flash: { error: @order.errors.full_messages.join(', ') })
+
+          flash[:error] = @order.errors.full_messages.join(', ') if @order.errors.present?
+          return redirect_to spree.edit_admin_order_path(@order)
         end
 
         if @order.complete?
@@ -67,14 +68,16 @@ module Spree
       rescue Spree::Core::GatewayError => e
         flash[:error] = e.message.to_s
       ensure
-        redirect_to :back
+        redirect_back fallback_location: spree.admin_dashboard_path
       end
 
       def resend
         Spree::OrderMailer.confirm_email_for_customer(@order.id, true).deliver_later
         flash[:success] = t('admin.orders.order_email_resent')
 
-        respond_with(@order) { |format| format.html { redirect_to :back } }
+        respond_with(@order) do |format|
+          format.html { redirect_back(fallback_location: spree.admin_dashboard_path) }
+        end
       end
 
       def invoice
@@ -89,7 +92,7 @@ module Spree
       end
 
       def print
-        render InvoiceRenderer.new.args(@order)
+        render_with_wicked_pdf InvoiceRenderer.new.args(@order)
       end
 
       def print_ticket

app/controllers/spree/admin/return_authorizations_controller.rb

@@ -8,7 +8,7 @@ module Spree
       def fire
         @return_authorization.public_send("#{params[:e]}!")
         flash[:success] = Spree.t(:return_authorization_updated)
-        redirect_to :back
+        redirect_back fallback_location: spree.admin_dashboard_path
       end
 
       protected

app/controllers/spree/checkout_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# This controller (and respective route in the Spree engine)
-#   is only needed for the spree_paypal_express gem that redirects here explicitly.
-#
-# According to the rails docs it would be possible to redirect
-#   to CheckoutController directly in the routes
-#   with a slash like "to: '/checkout#edit'", but it does not work in this case.
-module Spree
-  class CheckoutController < ::BaseController
-    def edit
-      flash.keep
-      redirect_to main_app.checkout_path
-    end
-  end
-end

app/controllers/spree/orders_controller.rb

@@ -26,8 +26,14 @@ module Spree
 
     def show
       @order = Spree::Order.find_by!(number: params[:id])
-      ProcessPaymentIntent.new(params["payment_intent"], @order).call!
-      @order.reload
+
+      if params.key?("payment_intent")
+        result = ProcessPaymentIntent.new(params["payment_intent"], @order).call!
+        unless result.ok?
+          flash[:error] = "#{I18n.t("payment_could_not_process")}. #{result.error}"
+        end
+        @order.reload
+      end
     end
 
     def empty
@@ -93,7 +99,7 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next_transition.run_callbacks if @order.cart?
-              redirect_to checkout_state_path(@order.checkout_steps.first)
+              redirect_to main_app.checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
               redirect_to order_path(@order)
             else

app/controllers/spree/paypal_controller.rb

@@ -27,11 +27,11 @@ module Spree
           redirect_to provider.express_checkout_url(pp_response, useraction: 'commit')
         else
           flash[:error] = Spree.t('flash.generic_error', scope: 'paypal', reasons: pp_response.errors.map(&:long_message).join(" "))
-          redirect_to spree.checkout_state_path(:payment)
+          redirect_to main_app.checkout_state_path(:payment)
         end
       rescue SocketError
         flash[:error] = Spree.t('flash.connection_failed', scope: 'paypal')
-        redirect_to spree.checkout_state_path(:payment)
+        redirect_to main_app.checkout_state_path(:payment)
       end
     end
 
@@ -57,7 +57,7 @@ module Spree
         session[:order_id] = nil
         redirect_to completion_route(@order)
       else
-        redirect_to checkout_state_path(@order.state)
+        redirect_to main_app.checkout_state_path(@order.state)
       end
     end
 

app/controllers/spree/users_controller.rb

@@ -60,11 +60,7 @@ module Spree
     private
 
     def orders_collection
-      if OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, spree_current_user)
-        CompleteOrdersWithBalance.new(@user).query
-      else
-        @user.orders.where(state: 'complete').order('completed_at desc')
-      end
+      CompleteOrdersWithBalance.new(@user).query
     end
 
     def load_object

app/helpers/map_helper.rb

@@ -1,2 +1,13 @@
 module MapHelper
+  def using_google_maps?
+    ENV["GOOGLE_MAPS_API_KEY"].present? || google_maps_configured_with_geocoder_api_key?
+  end
+
+  private
+
+  def google_maps_configured_with_geocoder_api_key?
+    ENV["GEOCODER_API_KEY"].present? && (
+      ENV["GEOCODER_SERVICE"].to_s == "google" || ENV["GEOCODER_SERVICE"].blank?
+    )
+  end
 end

app/helpers/spree/admin/payments_helper.rb

@@ -1,11 +0,0 @@
-module Spree
-  module Admin
-    module PaymentsHelper
-      def payment_method_name(payment)
-        # hack to allow us to retrieve the name of a "deleted" payment method
-        id = payment.payment_method_id
-        Spree::PaymentMethod.find_with_destroyed(id).name
-      end
-    end
-  end
-end

app/helpers/spree/payment_methods_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PaymentMethodsHelper
+    def payment_method_name(payment)
+      # hack to allow us to retrieve the name of a "deleted" payment method
+      id = payment.payment_method_id
+      Spree::PaymentMethod.find_with_destroyed(id).name
+    end
+  end
+end

app/mailers/spree/order_mailer.rb

@@ -4,7 +4,7 @@ module Spree
   class OrderMailer < BaseMailer
     helper 'checkout'
     helper SpreeCurrencyHelper
-    helper Spree::Admin::PaymentsHelper
+    helper Spree::PaymentMethodsHelper
     helper OrderHelper
     helper MailerHelper
     include I18nHelper

app/mailers/subscription_mailer.rb

@@ -3,7 +3,7 @@ class SubscriptionMailer < Spree::BaseMailer
   helper MailerHelper
   helper ShopMailHelper
   helper OrderHelper
-  helper Spree::Admin::PaymentsHelper
+  helper Spree::PaymentMethodsHelper
   include I18nHelper
 
   def confirmation_email(order)

app/models/adjustment_metadata.rb

@@ -1,4 +1,4 @@
-class AdjustmentMetadata < ActiveRecord::Base
+class AdjustmentMetadata < ApplicationRecord
   belongs_to :adjustment, class_name: 'Spree::Adjustment'
   belongs_to :enterprise
 end

app/models/application_record.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ApplicationRecord < ActiveRecord::Base
+  include DelegateBelongsTo
+  include Spree::Core::Permalinks
+  include Spree::Preferences::Preferable
+
+  self.abstract_class = true
+end

app/models/calculator/default_tax.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'open_food_network/enterprise_fee_calculator'
 
 module Calculator

app/models/calculator/flat_percent_item_total.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator

app/models/calculator/flat_percent_per_item.rb

@@ -1,4 +1,3 @@
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 class Calculator::FlatPercentPerItem < Spree::Calculator

app/models/calculator/flat_rate.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator

app/models/calculator/flexi_rate.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator

app/models/calculator/per_item.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator

app/models/calculator/price_sack.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 # For #to_d method on Ruby 1.8
 require 'bigdecimal/util'
 require 'spree/localized_number'

app/models/column_preference.rb

@@ -1,6 +1,6 @@
 require 'open_food_network/column_preference_defaults'
 
-class ColumnPreference < ActiveRecord::Base
+class ColumnPreference < ApplicationRecord
   extend OpenFoodNetwork::ColumnPreferenceDefaults
 
   # Non-persisted attributes that only have one

app/models/concerns/balance.rb

@@ -9,17 +9,7 @@ module Balance
 
   # Branches by the OrderBalance abstraction
   def outstanding_balance
-    OrderBalance.new(self)
-  end
-
-  # This method is the one we're gradually replacing with `#new_outstanding_balance`. Having them
-  # separate enables us to choose which implementation we want depending on the context using
-  # a feature toggle. This avoids inconsistent behavior during that incremental refactoring.
-  #
-  # It is meant to be removed as soon as we get product approval that the new implementation has
-  # been working correctly in production.
-  def old_outstanding_balance
-    total - payment_total
+    @order_balance ||= OrderBalance.new(self)
   end
 
   # Returns the order balance by considering the total as money owed to the order distributor aka.
@@ -27,7 +17,7 @@ module Balance
   # distributor and customer are even.
   #
   # Note however, this is meant to be used only in the context of a single order object. When
-  # working with a collection of orders, such an index controller action, please consider using
+  # working with a collection of orders, such as an index controller action, please consider using
   # `app/queries/outstanding_balance.rb` instead so we avoid potential N+1s.
   def new_outstanding_balance
     if state.in?(FINALIZED_NON_SUCCESSFUL_STATES)

app/models/coordinator_fee.rb

@@ -1,4 +1,4 @@
-class CoordinatorFee < ActiveRecord::Base
+class CoordinatorFee < ApplicationRecord
   belongs_to :order_cycle
   belongs_to :enterprise_fee
 end

app/models/customer.rb

@@ -1,4 +1,4 @@
-class Customer < ActiveRecord::Base
+class Customer < ApplicationRecord
   acts_as_taggable
 
   belongs_to :enterprise
@@ -46,6 +46,6 @@ class Customer < ActiveRecord::Base
     return true unless orders.any?
 
     errors[:base] << I18n.t('admin.customers.destroy.has_associated_orders')
-    false
+    throw :abort
   end
 end

app/models/distributor_shipping_method.rb

@@ -1,4 +1,4 @@
-class DistributorShippingMethod < ActiveRecord::Base
+class DistributorShippingMethod < ApplicationRecord
   self.table_name = "distributors_shipping_methods"
   belongs_to :shipping_method, class_name: "Spree::ShippingMethod", touch: true
   belongs_to :distributor, class_name: "Enterprise", touch: true

app/models/enterprise.rb

@@ -2,7 +2,7 @@
 
 require 'spree/core/s3_support'
 
-class Enterprise < ActiveRecord::Base
+class Enterprise < ApplicationRecord
   SELLS = %w(unspecified none own any).freeze
   ENTERPRISE_SEARCH_RADIUS = 100
 
@@ -100,7 +100,6 @@ class Enterprise < ActiveRecord::Base
 
   before_validation :initialize_permalink, if: lambda { permalink.nil? }
   before_validation :set_unused_address_fields
-  after_validation :geocode_address
   after_validation :ensure_owner_is_manager, if: lambda { owner_id_changed? && !owner_id.nil? }
 
   after_touch :touch_distributors
@@ -411,10 +410,6 @@ class Enterprise < ActiveRecord::Base
     address.firstname = address.lastname = address.phone = 'unused' if address.present?
   end
 
-  def geocode_address
-    address.geocode if address.andand.changed?
-  end
-
   def ensure_owner_is_manager
     users << owner unless users.include?(owner)
   end

app/models/enterprise_fee.rb

@@ -1,4 +1,4 @@
-class EnterpriseFee < ActiveRecord::Base
+class EnterpriseFee < ApplicationRecord
   include Spree::Core::CalculatedAdjustments
 
   acts_as_paranoid

app/models/enterprise_group.rb

@@ -4,7 +4,7 @@ require 'open_food_network/locking'
 require 'open_food_network/permalink_generator'
 require 'spree/core/s3_support'
 
-class EnterpriseGroup < ActiveRecord::Base
+class EnterpriseGroup < ApplicationRecord
   include PermalinkGenerator
   acts_as_list
 

app/models/enterprise_relationship.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class EnterpriseRelationship < ActiveRecord::Base
+class EnterpriseRelationship < ApplicationRecord
   belongs_to :parent, class_name: 'Enterprise', touch: true
   belongs_to :child, class_name: 'Enterprise', touch: true
   has_many :permissions, class_name: 'EnterpriseRelationshipPermission', dependent: :destroy

app/models/enterprise_relationship_permission.rb

@@ -1,3 +1,3 @@
-class EnterpriseRelationshipPermission < ActiveRecord::Base
+class EnterpriseRelationshipPermission < ApplicationRecord
   default_scope { order('name') }
 end

app/models/enterprise_role.rb

@@ -1,4 +1,4 @@
-class EnterpriseRole < ActiveRecord::Base
+class EnterpriseRole < ApplicationRecord
   belongs_to :user, class_name: Spree.user_class.to_s
   belongs_to :enterprise
 

app/models/exchange.rb

@@ -7,7 +7,7 @@
 # in its shopfront. Any incoming product can be selected to be shown in the
 # shopfront (outgoing products). But the set of shown products can be smaller
 # than all incoming products.
-class Exchange < ActiveRecord::Base
+class Exchange < ApplicationRecord
   acts_as_taggable
 
   belongs_to :order_cycle

app/models/exchange_fee.rb

@@ -1,4 +1,4 @@
-class ExchangeFee < ActiveRecord::Base
+class ExchangeFee < ApplicationRecord
   belongs_to :exchange
   belongs_to :enterprise_fee
 end

app/models/exchange_variant.rb

@@ -1,4 +1,4 @@
-class ExchangeVariant < ActiveRecord::Base
+class ExchangeVariant < ApplicationRecord
   belongs_to :exchange
   belongs_to :variant, class_name: 'Spree::Variant'
 end

app/models/inventory_item.rb

@@ -1,4 +1,4 @@
-class InventoryItem < ActiveRecord::Base
+class InventoryItem < ApplicationRecord
   belongs_to :enterprise
   belongs_to :variant, class_name: "Spree::Variant"
 

app/models/order_balance.rb

@@ -16,11 +16,7 @@ class OrderBalance
   end
 
   def amount
-    if customer_balance_enabled?
-      order.new_outstanding_balance
-    else
-      order.old_outstanding_balance
-    end
+    order.new_outstanding_balance
   end
 
   def +(other)
@@ -30,8 +26,4 @@ class OrderBalance
   private
 
   attr_reader :order
-
-  def customer_balance_enabled?
-    OpenFoodNetwork::FeatureToggle.enabled?(:customer_balance, order.user)
-  end
 end

app/models/order_cycle.rb

@@ -1,6 +1,6 @@
 require 'open_food_network/scope_variant_to_hub'
 
-class OrderCycle < ActiveRecord::Base
+class OrderCycle < ApplicationRecord
   belongs_to :coordinator, class_name: 'Enterprise'
 
   has_many :coordinator_fee_refs, class_name: 'CoordinatorFee'

app/models/order_cycle_schedule.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class OrderCycleSchedule < ActiveRecord::Base
+class OrderCycleSchedule < ApplicationRecord
   belongs_to :schedule
   belongs_to :order_cycle
 end

app/models/producer_property.rb

@@ -1,4 +1,4 @@
-class ProducerProperty < ActiveRecord::Base
+class ProducerProperty < ApplicationRecord
   belongs_to :producer, class_name: 'Enterprise', touch: true
   belongs_to :property, class_name: 'Spree::Property'
 

app/models/proxy_order.rb

@@ -2,7 +2,7 @@
 # Proxy pattern allows for deferral of initialization until absolutely required
 # This reduces the need to keep Orders in sync with their parent Subscriptions
 
-class ProxyOrder < ActiveRecord::Base
+class ProxyOrder < ApplicationRecord
   belongs_to :order, class_name: 'Spree::Order', dependent: :destroy
   belongs_to :subscription
   belongs_to :order_cycle

app/models/schedule.rb

@@ -1,4 +1,4 @@
-class Schedule < ActiveRecord::Base
+class Schedule < ApplicationRecord
   has_paper_trail meta: { custom_data: proc { |schedule| schedule.order_cycle_ids.to_s } }
 
   has_many :order_cycle_schedules, dependent: :destroy

app/models/spree/ability.rb

@@ -290,12 +290,8 @@ module Spree
       can [:destroy], Spree::Adjustment do |adjustment|
         if user.admin?
           true
-        elsif adjustment.adjustable.instance_of? Spree::Order
-          order = adjustment.adjustable
-          user.enterprises.include?(order.distributor) ||
-            order.order_cycle.andand.coordinated_by?(user)
-        elsif adjustment.adjustable.instance_of? Spree::LineItem
-          order = adjustment.adjustable.order
+        else
+          order = adjustment.order
           user.enterprises.include?(order.distributor) ||
             order.order_cycle.andand.coordinated_by?(user)
         end

app/models/spree/address.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Address < ActiveRecord::Base
+  class Address < ApplicationRecord
     include AddressDisplay
 
     belongs_to :country, class_name: "Spree::Country"
@@ -22,8 +22,6 @@ module Spree
     alias_attribute :last_name, :lastname
     delegate :name, to: :state, prefix: true, allow_nil: true
 
-    geocoded_by :geocode_address
-
     def self.default
       country = begin
                   Spree::Country.find(Spree::Config[:default_country_id])
@@ -89,10 +87,6 @@ module Spree
       }
     end
 
-    def geocode_address
-      render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
-    end
-
     def full_address
       render_address([address1, address2, city, zipcode, state.andand.name])
     end

app/models/spree/adjustment.rb

@@ -28,7 +28,7 @@ require 'concerns/adjustment_scopes'
 # total. This allows an adjustment to be preserved if it becomes ineligible so
 # it might be reinstated.
 module Spree
-  class Adjustment < ActiveRecord::Base
+  class Adjustment < ApplicationRecord
     extend Spree::LocalizedNumber
 
     # Deletion of metadata is handled in the database.
@@ -118,6 +118,10 @@ module Spree
       Spree::Money.new(amount, currency: currency)
     end
 
+    def admin?
+      originator_type.nil?
+    end
+
     def immutable?
       state != "open"
     end

app/models/spree/asset.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Asset < ActiveRecord::Base
+  class Asset < ApplicationRecord
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: :viewable
   end

app/models/spree/calculator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Calculator < ActiveRecord::Base
+  class Calculator < ApplicationRecord
     belongs_to :calculable, polymorphic: true
 
     # This method must be overriden in concrete calculator.

app/models/spree/classification.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Classification < ActiveRecord::Base
+  class Classification < ApplicationRecord
     self.table_name = 'spree_products_taxons'
     belongs_to :product, class_name: "Spree::Product", touch: true
     belongs_to :taxon, class_name: "Spree::Taxon", touch: true

app/models/spree/country.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Country < ActiveRecord::Base
+  class Country < ApplicationRecord
     has_many :states, -> { order('name ASC') }
 
     validates :name, :iso_name, presence: true

app/models/spree/credit_card.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class CreditCard < ActiveRecord::Base
+  class CreditCard < ApplicationRecord
     belongs_to :payment_method
     belongs_to :user
 
@@ -147,7 +147,7 @@ module Spree
     end
 
     def default_card_needs_updating?
-      is_default_changed? || gateway_customer_profile_id_changed?
+      saved_change_to_is_default? || saved_change_to_gateway_customer_profile_id?
     end
 
     def ensure_single_default_card

app/models/spree/inventory_unit.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class InventoryUnit < ActiveRecord::Base
+  class InventoryUnit < ApplicationRecord
     belongs_to :variant, -> { with_deleted }, class_name: "Spree::Variant"
     belongs_to :order, class_name: "Spree::Order"
     belongs_to :shipment, class_name: "Spree::Shipment"

app/models/spree/line_item.rb

@@ -4,7 +4,7 @@ require 'open_food_network/scope_variant_to_hub'
 require 'variant_units/variant_and_line_item_naming'
 
 module Spree
-  class LineItem < ActiveRecord::Base
+  class LineItem < ApplicationRecord
     include VariantUnits::VariantAndLineItemNaming
     include LineItemStockChanges
 
@@ -226,7 +226,7 @@ module Spree
     end
 
     def update_order
-      return unless changed? || destroyed?
+      return unless saved_changes.present? || destroyed?
 
       # update the order totals, etc.
       order.create_tax_charge!

app/models/spree/log_entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class LogEntry < ActiveRecord::Base
+  class LogEntry < ApplicationRecord
     belongs_to :source, polymorphic: true
 
     # Fix for Spree #1767

app/models/spree/option_type.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Spree
-  class OptionType < ActiveRecord::Base
-    has_many :products, through: :product_option_types
+  class OptionType < ApplicationRecord
     has_many :option_values, -> { order(:position) }, dependent: :destroy
     has_many :product_option_types, dependent: :destroy
+    has_many :products, through: :product_option_types
 
     validates :name, :presentation, presence: true
     default_scope -> { order("#{table_name}.position") }

app/models/spree/option_value.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class OptionValue < ActiveRecord::Base
+  class OptionValue < ApplicationRecord
     belongs_to :option_type
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants',

app/models/spree/option_values_line_item.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class OptionValuesLineItem < ActiveRecord::Base
+  class OptionValuesLineItem < ApplicationRecord
     belongs_to :line_item, class_name: 'Spree::LineItem'
     belongs_to :option_value, class_name: 'Spree::OptionValue'
   end

app/models/spree/order.rb

@@ -7,7 +7,7 @@ require 'open_food_network/tag_rule_applicator'
 require 'concerns/order_shipment'
 
 module Spree
-  class Order < ActiveRecord::Base
+  class Order < ApplicationRecord
     prepend OrderShipment
 
     include Checkout
@@ -126,38 +126,14 @@ module Spree
         joins('LEFT OUTER JOIN spree_products ON (spree_products.id = spree_variants.product_id)')
     }
 
-    scope :not_state, lambda { |state|
-      where.not(state: state)
-    }
-
     # All the states an order can be in after completing the checkout
     FINALIZED_STATES = %w(complete canceled resumed awaiting_return returned).freeze
 
     scope :finalized, -> { where(state: FINALIZED_STATES) }
-
-    def self.by_number(number)
-      where(number: number)
-    end
-
-    def self.between(start_date, end_date)
-      where(created_at: start_date..end_date)
-    end
-
-    def self.by_customer(customer)
-      joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
-    end
-
-    def self.by_state(state)
-      where(state: state)
-    end
-
-    def self.complete
-      where('completed_at IS NOT NULL')
-    end
-
-    def self.incomplete
-      where(completed_at: nil)
-    end
+    scope :complete, -> { where.not(completed_at: nil) }
+    scope :incomplete, -> { where(completed_at: nil) }
+    scope :by_state, lambda { |state| where(state: state) }
+    scope :not_state, lambda { |state| where.not(state: state) }
 
     # For compatiblity with Calculator::PriceSack
     def amount
@@ -733,7 +709,8 @@ module Spree
     end
 
     def require_customer?
-      return true unless new_record? || state == 'cart'
+      return false if new_record? || state == 'cart'
+      true
     end
 
     def customer_is_valid?
@@ -755,11 +732,17 @@ module Spree
     def ensure_customer
       return if associate_customer
 
-      customer_name = bill_address.andand.full_name
-      self.customer = Customer.create(enterprise: distributor, email: email_for_customer,
-                                      user: user, name: customer_name,
-                                      bill_address: bill_address.andand.clone,
-                                      ship_address: ship_address.andand.clone)
+      self.customer = Customer.new(
+        enterprise: distributor,
+        email: email_for_customer,
+        user: user,
+        name: bill_address.andand.full_name,
+        bill_address: bill_address.andand.clone,
+        ship_address: ship_address.andand.clone
+      )
+      customer.save
+
+      Bugsnag.notify(customer.errors.full_messages.join(", ")) unless customer.persisted?
     end
 
     def update_adjustment!(adjustment)

app/models/spree/order/checkout.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Order < ActiveRecord::Base
+  class Order < ApplicationRecord
     module Checkout
       def self.included(klass)
         klass.class_eval do

app/models/spree/order_contents.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class OrderContents
-    attr_accessor :order, :currency
+    attr_accessor :order
 
     def initialize(order)
       @order = order
@@ -10,9 +10,9 @@ module Spree
 
     # Get current line item for variant if exists
     # Add variant qty to line_item
-    def add(variant, quantity = 1, currency = nil, shipment = nil)
+    def add(variant, quantity = 1, shipment = nil)
       line_item = order.find_line_item_by_variant(variant)
-      add_to_line_item(line_item, variant, quantity, currency, shipment)
+      add_to_line_item(line_item, variant, quantity, shipment)
     end
 
     # Get current line item for variant
@@ -29,20 +29,14 @@ module Spree
 
     private
 
-    def add_to_line_item(line_item, variant, quantity, currency = nil, shipment = nil)
+    def add_to_line_item(line_item, variant, quantity, shipment = nil)
       if line_item
         line_item.target_shipment = shipment
         line_item.quantity += quantity.to_i
-        line_item.currency = currency unless currency.nil?
       else
         line_item = order.line_items.new(quantity: quantity, variant: variant)
         line_item.target_shipment = shipment
-        if currency
-          line_item.currency = currency unless currency.nil?
-          line_item.price    = variant.price_in(currency).amount
-        else
-          line_item.price    = variant.price
-        end
+        line_item.price = variant.price
       end
 
       line_item.save

app/models/spree/payment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Payment < ActiveRecord::Base
+  class Payment < ApplicationRecord
     include Spree::Payment::Processing
     extend Spree::LocalizedNumber
 
@@ -144,6 +144,10 @@ module Spree
       I18n.t('payment_method_fee')
     end
 
+    def mark_as_processed
+      update_attribute(:cvv_response_message, nil)
+    end
+
     private
 
     # Don't charge fees for invalid or failed payments.
@@ -201,7 +205,7 @@ module Spree
     end
 
     def update_order
-      order.reload.update!
+      order.update!
     end
 
     # Necessary because some payment gateways will refuse payments with

app/models/spree/payment/processing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Payment < ActiveRecord::Base
+  class Payment < ApplicationRecord
     module Processing
       def process!
         return unless validate!
@@ -13,7 +13,11 @@ module Spree
         return unless validate!
         return if authorization_action_required?
 
-        charge_offline!
+        if preauthorized?
+          capture!
+        else
+          charge_offline!
+        end
       end
 
       def authorize!(return_url = nil)
@@ -184,6 +188,10 @@ module Spree
 
       private
 
+      def preauthorized?
+        response_code.presence&.match("pi_")
+      end
+
       def validate!
         return false unless payment_method&.source_required?
 

app/models/spree/payment_method.rb

@@ -4,7 +4,7 @@ require 'concerns/payment_method_distributors'
 require 'spree/core/calculated_adjustments'
 
 module Spree
-  class PaymentMethod < ActiveRecord::Base
+  class PaymentMethod < ApplicationRecord
     include Spree::Core::CalculatedAdjustments
     include PaymentMethodDistributors
 

app/models/spree/paypal_express_checkout.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Spree
-  class PaypalExpressCheckout < ActiveRecord::Base
+  class PaypalExpressCheckout < ApplicationRecord
   end
 end

app/models/spree/preference.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class Preference < ActiveRecord::Base
+  class Preference < ApplicationRecord
     serialize :value
 
     validates :key, presence: true

app/models/spree/price.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Spree
-  class Price < ActiveRecord::Base
+  class Price < ApplicationRecord
     acts_as_paranoid without_default_scope: true
 
     belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'

app/models/spree/product.rb

@@ -24,7 +24,7 @@ require 'concerns/product_stock'
 # Sum of on_hand each variant's inventory level determine "on_hand" level for the product.
 #
 module Spree
-  class Product < ActiveRecord::Base
+  class Product < ApplicationRecord
     include PermalinkGenerator
     include ProductStock
 
@@ -266,13 +266,6 @@ module Spree
       duplicator.duplicate
     end
 
-    # use deleted? rather than checking the attribute directly. this
-    # allows extensions to override deleted? if they want to provide
-    # their own definition.
-    def deleted?
-      !!deleted_at
-    end
-
     # split variants list into hash which shows mapping of opt value onto matching variants
     # eg categorise_variants_from_option(color) => {"red" -> [...], "blue" -> [...]}
     def categorise_variants_from_option(opt_type)
@@ -433,7 +426,7 @@ module Spree
     end
 
     def update_units
-      return unless variant_unit_changed?
+      return unless saved_change_to_variant_unit?
 
       option_types.delete self.class.all_variant_unit_option_types
       option_types << variant_unit_option_type if variant_unit.present?
@@ -449,9 +442,9 @@ module Spree
     end
 
     def remove_previous_primary_taxon_from_taxons
-      return unless primary_taxon_id_changed? && primary_taxon_id_was
+      return unless saved_change_to_primary_taxon_id? && primary_taxon_id_before_last_save
 
-      taxons.destroy(primary_taxon_id_was)
+      taxons.destroy(primary_taxon_id_before_last_save)
     end
 
     def ensure_standard_variant
@@ -465,7 +458,7 @@ module Spree
 
     # Spree creates a permalink already but our implementation fixes an edge case.
     def sanitize_permalink
-      return unless permalink.blank? || permalink_changed?
+      return unless permalink.blank? || saved_change_to_permalink? || permalink_changed?
 
       requested = permalink.presence || permalink_was.presence || name.presence || 'product'
       self.permalink = create_unique_permalink(requested.parameterize)