Merge pull request #7647 from andrewpbrett/default-country-codes

Use correct default country code

.github/codecov.yml

@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project:
+      default:
+        informational: true

.github/workflows/build.yml

@@ -322,4 +322,4 @@ jobs:
         run: bundle exec rspec --profile --pattern "engines/*/spec/{,/*/**}/*_spec.rb,spec/features/admin/*/*_spec.rb,spec/lib/{,/*/**}/*_spec.rb"
 
       - name: Codecov
-        uses: codecov/codecov-action@v1.3.1
+        uses: codecov/codecov-action@v1.5.0

.node-version

@@ -1 +1 @@
-5.12.0
+14.16.1

.rubocop_todo.yml

@@ -931,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'

GETTING_STARTED.md

@@ -6,7 +6,7 @@ This is a general guide to setting up an Open Food Network **development environ
 
 The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](docker/README.md).
 Otherwise, for a local setup you will need:
-* Ruby 2.4.4 and bundler (check current Ruby version in [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file)
+* Ruby and bundler (check current Ruby version in [.ruby-version](https://github.com/openfoodfoundation/openfoodnetwork/blob/master/.ruby-version) file)
 * PostgreSQL database
 * Chrome (for testing)
 
@@ -78,8 +78,6 @@ Note: If your OS is not explicitly supported in the setup guides then not all te
 
 Note: The time zone on your machine should match the one defined in `config/application.yml`.
 
-The project is configured to use [Zeus][zeus] to reduce the pre-test startup time while Rails loads. See the [Zeus GitHub page][zeus] for usage instructions.
-
 Once [npm dependencies are installed][karma], AngularJS tests can be run with:
 
     ./script/karma run
@@ -119,7 +117,6 @@ If these commands succeed, you should be able to [continue the setup process](#g
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
 [debian]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Debian
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
-[zeus]: https://github.com/burke/zeus
 [rubocop]: https://rubocop.readthedocs.io/en/latest/
 [karma]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU

Gemfile

@@ -4,18 +4,18 @@ 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'
 
 gem 'i18n'
-gem 'i18n-js', '~> 3.8.2'
+gem 'i18n-js', '~> 3.8.3'
 gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
@@ -29,7 +29,7 @@ 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.4'
 gem 'cancancan', '~> 1.15.0'
@@ -75,11 +75,15 @@ 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 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'hiredis'
 
 gem 'combine_pdf'
 gem 'wicked_pdf'
@@ -92,7 +96,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'
@@ -126,12 +130,11 @@ end
 
 group :test, :development do
   # Pretty printed test output
-  gem 'atomic'
   gem 'awesome_print'
   gem 'bullet'
   gem 'capybara'
   gem 'database_cleaner', require: false
-  gem "factory_bot_rails", '6.1.0', require: false
+  gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
   gem 'knapsack'

Gemfile.lock

@@ -47,58 +47,62 @@ 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-action_caching (1.2.2)
       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)
-    activerecord-import (1.0.8)
+    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.1.0)
       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)
@@ -118,9 +122,8 @@ 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)
       activerecord (>= 4.0.0, < 7.0)
     awesome_print (1.9.2)
@@ -152,12 +155,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 +187,12 @@ 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.48.0)
+    ddtrace (0.49.0)
       ffi (~> 1.0)
       msgpack
     debugger-linecache (1.2.0)
@@ -203,7 +206,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)
@@ -216,14 +219,13 @@ 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)
-    factory_bot (6.1.0)
+    factory_bot (6.2.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.1.0)
-      factory_bot (~> 6.1.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
@@ -282,9 +284,10 @@ GEM
       tilt
     hashdiff (1.0.1)
     highline (2.0.3)
+    hiredis (0.6.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.8.2)
+    i18n-js (3.8.3)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -302,7 +305,7 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.2.2)
+    jwt (2.2.3)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -323,17 +326,21 @@ GEM
     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)
@@ -347,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.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
@@ -370,16 +377,14 @@ GEM
     parallel (1.20.1)
     paranoia (2.4.3)
       activerecord (>= 4.0, < 6.2)
-    parser (3.0.1.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)
@@ -390,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)
@@ -424,25 +430,24 @@ 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)
     redcarpet (3.5.1)
+    redis (4.2.5)
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -450,12 +455,12 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    roadie (3.5.1)
+    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)
@@ -471,10 +476,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)
@@ -495,21 +500,21 @@ GEM
     rswag-ui (2.4.0)
       actionpack (>= 3.1, < 7.0)
       railties (>= 3.1, < 7.0)
-    rubocop (1.13.0)
+    rubocop (1.15.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)
@@ -551,16 +556,16 @@ 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-prof (1.0.5)
     test-unit (3.4.1)
       power_assert
     thor (0.20.3)
@@ -582,7 +587,7 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 7)
     uniform_notifier (1.14.1)
-    view_component (2.28.0)
+    view_component (2.31.1)
       activesupport (>= 5.0.0, < 7.0)
     view_component_storybook (0.8.0)
       view_component (>= 2.2)
@@ -592,11 +597,11 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       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)
@@ -625,7 +630,6 @@ DEPENDENCIES
   angular_rails_csrf
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.5.5)
-  atomic
   awesome_nested_set
   awesome_print
   aws-sdk (= 1.67.0)
@@ -636,7 +640,7 @@ DEPENDENCIES
   capybara
   catalog!
   codecov
-  coffee-rails (~> 4.2.2)
+  coffee-rails (~> 5.0.0)
   combine_pdf
   compass-rails
   custom_error_message!
@@ -653,7 +657,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   eventmachine (>= 1.2.3)
-  factory_bot_rails (= 6.1.0)
+  factory_bot_rails (= 6.2.0)
   ffaker
   figaro
   flipper
@@ -668,8 +672,9 @@ DEPENDENCIES
   good_migrations
   haml
   highline (= 2.0.3)
+  hiredis
   i18n
-  i18n-js (~> 3.8.2)
+  i18n-js (~> 3.8.3)
   immigrant
   jquery-migrate-rails
   jquery-rails (= 4.4.0)
@@ -680,6 +685,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)
@@ -689,20 +695,21 @@ 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
+  redis (>= 4.0)
   responders
-  roadie-rails (~> 1.3.0)
+  roadie-rails (~> 2.2.0)
   roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
   rspec-retry

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/edit_bought_order_controller.js.coffee

@@ -3,7 +3,7 @@ Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout,
   $scope.removeEnabled = true
 
   $scope.deleteLineItem = (id) ->
-    if Cart.has_one_line_item()
+    if Cart.isOnlyItemInOrder(id)
       Messages.error(t 'orders_cannot_remove_the_final_item')
       $scope.removeEnabled = false
       $timeout (->

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/services/cart.js.coffee

@@ -115,8 +115,9 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
       @line_items = []
       localStorageService.clearAll() # One day this will have to be moar GRANULAR
 
-    has_one_line_item: =>
-      @line_items_finalised.length == 1
+    isOnlyItemInOrder: (id) =>
+      deletedItem = @line_items_finalised.find((item) -> item.id == id)
+      @line_items_finalised.filter((item) -> item.order_id == deletedItem.order_id).length == 1
 
     removeFinalisedLineItem: (id) =>
       @line_items_finalised = @line_items_finalised.filter (item) ->

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/darkswarm/services/gmaps_geo.js.erb.coffee

@@ -10,7 +10,7 @@ Darkswarm.service "GmapsGeo", ->
     #     console.log "Error: #{status}"
     geocode: (address, callback) ->
       geocoder = new google.maps.Geocoder()
-      geocoder.geocode {'address': address, 'region': "<%= Spree::Country.find_by(id: Spree::Config[:default_country_id]).iso %>"}, callback
+      geocoder.geocode {'address': address, 'region': "<%= DefaultCountry.code %>"}, callback
 
     distanceBetween: (src, dst) ->
       google.maps.geometry.spherical.computeDistanceBetween @toLatLng(src), @toLatLng(dst)
@@ -20,4 +20,4 @@ Darkswarm.service "GmapsGeo", ->
       if locatable.lat?
         locatable
       else
-        new google.maps.LatLng locatable.latitude, locatable.longitude
+        new google.maps.LatLng locatable.latitude, locatable.longitude

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/controllers/admin/bulk_line_items_controller.rb

@@ -35,7 +35,7 @@ module Admin
         if @line_item.update(line_item_params)
           order.update_line_item_fees! @line_item
           order.update_order_fees!
-          order.update!
+          order.update_order!
           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

app/controllers/admin/enterprise_groups_controller.rb

@@ -28,9 +28,7 @@ module Admin
     def build_resource
       enterprise_group = super
       enterprise_group.address = Spree::Address.new
-      enterprise_group.address.country = Spree::Country.find_by(
-        id: Spree::Config[:default_country_id]
-      )
+      enterprise_group.address.country = DefaultCountry.country
       enterprise_group
     end
 

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
 
@@ -115,7 +119,7 @@ module Admin
     def build_resource
       enterprise = super
       enterprise.address ||= Spree::Address.new
-      enterprise.address.country ||= Spree::Country.find_by(id: Spree::Config[:default_country_id])
+      enterprise.address.country ||= DefaultCountry.country
       enterprise
     end
 

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!
@@ -31,10 +31,12 @@ module Api
         unlock = params[:shipment].delete(:unlock)
 
         if unlock == 'yes'
-          @shipment.fee_adjustment.open
+          @shipment.fee_adjustment.fire_events(:open)
         end
 
-        @shipment.update(shipment_params[:shipment])
+        if @shipment.update(shipment_params)
+          @order.updater.update_totals_and_states
+        end
 
         if unlock == 'yes'
           @shipment.fee_adjustment.close
@@ -68,7 +70,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
@@ -94,7 +96,7 @@ module Api
 
       def find_and_update_shipment
         @shipment = @order.shipments.find_by!(number: params[:id])
-        @shipment.update(shipment_params[:shipment]) if shipment_params[:shipment].present?
+        @shipment.update(shipment_params)
         @shipment.reload
       end
 
@@ -113,10 +115,9 @@ module Api
       end
 
       def shipment_params
-        params.permit(
-          [:id, :order_id, :variant_id, :quantity,
-           { shipment: [:tracking, :selected_shipping_rate_id] }]
-        )
+        return {} unless params.has_key? :shipment
+
+        params.require(:shipment).permit(:tracking, :selected_shipping_rate_id)
       end
     end
   end

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/checkout_controller.rb

@@ -55,7 +55,7 @@ class CheckoutController < ::BaseController
     flash[:error] = I18n.t("checkout.failed")
     action_failed(e)
   ensure
-    @order.update!
+    @order.update_order!
   end
 
   # Clears the cached order. Required for #current_order to return a new order

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/line_items_controller.rb

@@ -43,7 +43,7 @@ class LineItemsController < BaseController
       order.update_shipping_fees!
       order.update_payment_fees!
       order.update_order_fees!
-      order.update!
+      order.update_order!
       order.create_tax_charge!
     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

@@ -14,7 +14,7 @@ module Spree
 
       def update_order
         @order.reload
-        @order.update!
+        @order.update_order!
       end
 
       def collection

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

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

app/controllers/spree/admin/payments_controller.rb

@@ -9,6 +9,10 @@ module Spree
       before_action :load_payment, only: [:fire, :show]
       before_action :load_data
       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. 
+      before_action :ensure_sufficient_stock_lines
 
       respond_to :html
 
@@ -142,6 +146,20 @@ module Spree
         redirect_to spree.edit_admin_order_customer_url(@order)
       end
 
+      def ensure_sufficient_stock_lines
+        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}")
+        redirect_to spree.edit_admin_order_url(@order)
+      end
+
+      def out_of_stock_item_names
+        @order.insufficient_stock_lines.map do |line_item|
+          line_item.variant.name
+        end.join(", ")
+      end
+
       def load_order
         @order = Order.find_by!(number: params[:order_id])
         authorize! action, @order

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/orders_controller.rb

@@ -14,7 +14,7 @@ module Spree
     respond_to :html
     respond_to :json
 
-    before_action :update_distribution, only: :update
+    before_action :set_current_order, only: :update
     before_action :filter_order_params, only: :update
     before_action :enable_embedded_shopfront
 
@@ -26,8 +26,8 @@ module Spree
 
     def show
       @order = Spree::Order.find_by!(number: params[:id])
-      ProcessPaymentIntent.new(params["payment_intent"], @order).call!
-      @order.reload
+
+      handle_stripe_response
     end
 
     def empty
@@ -62,7 +62,7 @@ module Spree
         associate_user
 
         if @order.insufficient_stock_lines.present? || @unavailable_order_variants.present?
-          flash[:error] = t("spree.orders.error_flash_for_unavailable_items")
+          flash.now[:error] = t("spree.orders.error_flash_for_unavailable_items")
         end
       end
     end
@@ -95,7 +95,7 @@ module Spree
               @order.next_transition.run_callbacks if @order.cart?
               redirect_to main_app.checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
-              redirect_to order_path(@order)
+              redirect_to main_app.order_path(@order)
             else
               redirect_to main_app.cart_path
             end
@@ -109,24 +109,8 @@ module Spree
       end
     end
 
-    def update_distribution
+    def set_current_order
       @order = current_order(true)
-
-      if params[:commit] == 'Choose Hub'
-        distributor = Enterprise.is_distributor.find params[:order][:distributor_id]
-        @order.set_distributor! distributor
-
-        flash[:notice] = I18n.t(:order_choosing_hub_notice)
-        redirect_to request.referer
-
-      elsif params[:commit] == 'Choose Order Cycle'
-        @order.empty! # empty cart
-        order_cycle = OrderCycle.active.find params[:order][:order_cycle_id]
-        @order.set_order_cycle! order_cycle
-
-        flash[:notice] = I18n.t(:order_choosing_hub_notice)
-        redirect_to request.referer
-      end
     end
 
     def filter_order_params
@@ -151,11 +135,24 @@ module Spree
       else
         flash[:error] = I18n.t(:orders_could_not_cancel)
       end
-      redirect_to request.referer || order_path(@order)
+      redirect_to request.referer || main_app.order_path(@order)
     end
 
     private
 
+    # Stripe can redirect here after a payment is processed in the backoffice.
+    # We verify if it was successful here and persist the changes.
+    def handle_stripe_response
+      return unless params.key?("payment_intent")
+
+      result = ProcessPaymentIntent.new(params["payment_intent"], @order).call!
+
+      unless result.ok?
+        flash.now[:error] = "#{I18n.t("payment_could_not_process")}. #{result.error}"
+      end
+      @order.reload
+    end
+
     def discard_empty_line_items
       @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
     end
@@ -191,7 +188,7 @@ module Spree
 
       if items.empty?
         flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-        redirect_to order_path(order_to_update)
+        redirect_to main_app.order_path(order_to_update)
       end
     end
 

app/controllers/spree/users_controller.rb

@@ -14,7 +14,7 @@ module Spree
 
     def show
       @payments_requiring_action = PaymentsRequiringAction.new(spree_current_user).query
-      @orders = orders_collection
+      @orders = orders_collection.includes(:line_items)
 
       customers = spree_current_user.customers
       @shops = Enterprise

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/jobs/subscription_confirm_job.rb

@@ -90,13 +90,13 @@ class SubscriptionConfirmJob < ActiveJob::Base
   end
 
   def send_confirmation_email(order)
-    order.update!
+    order.update_order!
     record_success(order)
     SubscriptionMailer.confirmation_email(order).deliver_now
   end
 
   def send_failed_payment_email(order, error_message = nil)
-    order.update!
+    order.update_order!
     record_and_log_error(:failed_payment, order, error_message)
     SubscriptionMailer.failed_payment_email(order).deliver_now
   rescue StandardError => e

app/jobs/subscription_placement_job.rb

@@ -77,7 +77,7 @@ class SubscriptionPlacementJob < ActiveJob::Base
 
   def handle_empty_order(order, changes)
     order.reload.all_adjustments.destroy_all
-    order.update!
+    order.update_order!
     send_empty_email(order, changes)
   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/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/enterprise.rb

@@ -100,13 +100,12 @@ class Enterprise < ApplicationRecord
 
   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
   after_create :set_default_contact
   after_create :relate_to_owners_enterprises
-  after_create :send_welcome_email
+  after_create_commit :send_welcome_email
 
   after_rollback :restore_permalink
 
@@ -411,10 +410,6 @@ class Enterprise < ApplicationRecord
     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/spree/address.rb

@@ -22,11 +22,9 @@ 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])
+                  DefaultCountry.country
                 rescue StandardError
                   Spree::Country.first
                 end
@@ -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

@@ -96,7 +96,7 @@ module Spree
     # more than on line items at once via accepted_nested_attributes the order
     # object on the association would be in a old state and therefore the
     # adjustment calculations would not performed on proper values
-    def update!(calculable = nil, force: false)
+    def update_adjustment!(calculable = nil, force: false)
       return amount if immutable? && !force
 
       if originator.present?
@@ -127,11 +127,7 @@ module Spree
     end
 
     def set_absolute_included_tax!(tax)
-      # This rubocop issue can now fixed by renaming Adjustment#update! to something else,
-      #   then AR's update! can be used instead of update_attributes!
-      # rubocop:disable Rails/ActiveRecordAliases
-      update_attributes! included_tax: tax.round(2)
-      # rubocop:enable Rails/ActiveRecordAliases
+      update! included_tax: tax.round(2)
     end
 
     def display_included_tax

app/models/spree/credit_card.rb

@@ -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/gateway/pay_pal_express.rb

@@ -87,7 +87,7 @@ module Spree
         )
         refund_transaction_response = provider.refund_transaction(refund_transaction)
         if refund_transaction_response.success?
-          payment.source.update_attributes(
+          payment.source.update(
             refunded_at: Time.now,
             refund_transaction_id: refund_transaction_response.RefundTransactionID,
             state: "refunded",

app/models/spree/gateway/stripe_sca.rb

@@ -129,7 +129,19 @@ module Spree
         payment = fetch_payment(creditcard, gateway_options)
         raise Stripe::StripeError, I18n.t(:no_pending_payments) unless payment&.response_code
 
-        Stripe::PaymentIntentValidator.new.call(payment.response_code, stripe_account_id)
+        payment_intent_response = Stripe::PaymentIntentValidator.new.
+          call(payment.response_code, stripe_account_id)
+
+        raise_if_not_in_capture_state(payment_intent_response)
+
+        payment.response_code
+      end
+
+      def raise_if_not_in_capture_state(payment_intent_response)
+        state = payment_intent_response.status
+        return if state == 'requires_capture'
+
+        raise Stripe::StripeError, I18n.t(:invalid_payment_state, state: state)
       end
 
       def fetch_payment(creditcard, gateway_options)

app/models/spree/inventory_unit.rb

@@ -66,7 +66,7 @@ module Spree
     end
 
     def update_order
-      order.update!
+      order.update_order!
     end
   end
 end

app/models/spree/item_adjustments.rb

@@ -17,9 +17,9 @@ module Spree
     end
 
     def update_adjustments
-      adjustment_total = adjustments.additional.map(&:update!).compact.sum
-      included_tax_total = tax_adjustments.inclusive.reload.map(&:update!).compact.sum
-      additional_tax_total = tax_adjustments.additional.reload.map(&:update!).compact.sum
+      adjustment_total = adjustments.additional.map(&:update_adjustment!).compact.sum
+      included_tax_total = tax_adjustments.inclusive.reload.map(&:update_adjustment!).compact.sum
+      additional_tax_total = tax_adjustments.additional.reload.map(&:update_adjustment!).compact.sum
 
       item.update_columns(
         included_tax_total: included_tax_total,

app/models/spree/line_item.rb

@@ -226,11 +226,11 @@ 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!
-      order.update!
+      order.update_order!
     end
 
     def update_inventory_before_destroy

app/models/spree/option_type.rb

@@ -2,9 +2,9 @@
 
 module Spree
   class OptionType < ApplicationRecord
-    has_many :products, through: :product_option_types
     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/order.rb

@@ -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
@@ -236,7 +212,7 @@ module Spree
       @updater ||= OrderManagement::Order::Updater.new(self)
     end
 
-    def update!
+    def update_order!
       updater.update
     end
 
@@ -756,18 +732,24 @@ 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)
       return if adjustment.finalized?
 
-      adjustment.update!(force: true)
-      update!
+      adjustment.update_adjustment!(force: true)
+      update_order!
     end
 
     # object_params sets the payment amount to the order total, but it does this

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

@@ -50,6 +50,7 @@ module Spree
     scope :failed, -> { with_state('failed') }
     scope :valid, -> { where('state NOT IN (?)', %w(failed invalid)) }
     scope :authorization_action_required, -> { where.not(cvv_response_message: nil) }
+    scope :with_payment_intent, ->(code) { where(response_code: code) }
 
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :checkout do
@@ -144,6 +145,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 +206,7 @@ module Spree
     end
 
     def update_order
-      order.update!
+      OrderManagement::Order::Updater.new(order).after_payment_update(self)
     end
 
     # Necessary because some payment gateways will refuse payments with

app/models/spree/payment/processing.rb

@@ -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/product.rb

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

app/models/spree/return_authorization.rb

@@ -66,7 +66,7 @@ module Spree
       order.shipped_shipments.collect{ |s| s.inventory_units.to_a }.flatten
     end
 
-    # Used when Adjustment#update! wants to update the related adjustment
+    # Used when Adjustment#update_adjustment! wants to update the related adjustment
     def compute_amount(*_args)
       -amount.abs
     end
@@ -105,7 +105,7 @@ module Spree
       )
 
       order.return if inventory_units.all?(&:returned?)
-      order.update!
+      order.update_order!
     end
 
     def allow_receive?

app/models/spree/shipment.rb

@@ -331,6 +331,15 @@ module Spree
       fee_adjustment.finalize!
       send_shipped_email
       touch :shipped_at
+      update_order_shipment_state
+    end
+
+    def update_order_shipment_state
+      new_state = order.updater.update_shipment_state
+      order.update_columns(
+        shipment_state: new_state,
+        updated_at: Time.zone.now,
+      )
     end
 
     def send_shipped_email

app/models/spree/tax_rate.rb

@@ -50,7 +50,7 @@ module Spree
       category = TaxCategory.includes(:tax_rates).find_by(is_default: true)
       return 0 unless category
 
-      address ||= Address.new(country_id: Spree::Config[:default_country_id])
+      address ||= Address.new(country_id: DefaultCountry.id)
       rate = category.tax_rates.detect { |tax_rate| tax_rate.zone.include? address }.try(:amount)
 
       rate || 0

app/models/spree/variant.rb

@@ -166,13 +166,6 @@ module Spree
       OpenFoodNetwork::EnterpriseFeeCalculator.new(distributor, order_cycle).fees_by_type_for self
     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
-
     def option_value(opt_name)
       option_values.detect { |o| o.option_type.name == opt_name }.try(:presentation)
     end

app/serializers/api/line_item_serializer.rb

@@ -1,5 +1,5 @@
 class Api::LineItemSerializer < ActiveModel::Serializer
-  attributes :id, :quantity, :max_quantity, :price
+  attributes :id, :quantity, :max_quantity, :price, :order_id
 
   has_one :variant, serializer: Api::VariantSerializer
 end

app/serializers/api/order_serializer.rb

@@ -22,7 +22,7 @@ module Api
     end
 
     def item_count
-      object.line_items.sum(:quantity)
+      object.line_items.sum(&:quantity)
     end
 
     def completed_at

app/services/address_geocoder.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class AddressGeocoder
+  def initialize(address)
+    @address = address
+  end
+
+  def geocode
+    latitude, longitude = Geocoder.coordinates(geocode_address)
+
+    return unless latitude.present? && longitude.present?
+
+    address.update(latitude: latitude, longitude: longitude)
+  end
+
+  private
+
+  attr_reader :address
+
+  def geocode_address
+    address_parts.select(&:present?).join(', ')
+  end
+
+  def address_parts
+    [
+      address.address1,
+      address.address2,
+      address.zipcode,
+      address.city,
+      address.country&.name,
+      address.state&.name
+    ]
+  end
+end

app/services/default_country.rb

@@ -0,0 +1,13 @@
+class DefaultCountry
+  def self.id
+    country.id
+  end
+
+  def self.code
+    country.iso
+  end
+
+  def self.country
+    Spree::Country.find_by(iso: ENV["DEFAULT_COUNTRY_CODE"]) || Spree::Country.first
+  end
+end

app/services/mail_configuration.rb

@@ -2,9 +2,8 @@
 #   by setting entries on the Spree Config
 #   and initializing Spree:MailSettings that uses the Spree::Config.
 class MailConfiguration
-  # @param entries [Hash] Spree Config entries
-  def self.entries=(entries)
-    entries.each do |name, value|
+  def self.apply!
+    configuration.each do |name, value|
       Spree::Config[name] = value
     end
     apply_mail_settings
@@ -12,6 +11,21 @@ class MailConfiguration
 
   private
 
+  def self.configuration
+    {
+      mail_host: ENV.fetch('MAIL_HOST'),
+      mail_domain: ENV.fetch('MAIL_DOMAIN'),
+      mail_port: ENV.fetch('MAIL_PORT'),
+      mail_auth_type: ENV.fetch('MAIL_AUTH_TYPE', 'login'),
+      smtp_username: ENV.fetch('SMTP_USERNAME'),
+      smtp_password: ENV.fetch('SMTP_PASSWORD'),
+      secure_connection_type: ENV.fetch('MAIL_SECURE_CONNECTION', 'None'),
+      mails_from: ENV.fetch('MAILS_FROM', "no-reply@#{ENV.fetch('MAIL_DOMAIN')}"),
+      mail_bcc: ENV.fetch('MAIL_BCC', ''),
+      intercept_email: ''
+    }
+  end
+
   def self.apply_mail_settings
     Spree::Core::MailSettings.init
   end

app/services/order_checkout_restart.rb

@@ -13,7 +13,7 @@ class OrderCheckoutRestart
     clear_shipments
     clear_payments
 
-    order.reload.update!
+    order.reload.update_order!
   end
 
   private

app/services/order_fees_handler.rb

@@ -24,7 +24,7 @@ class OrderFeesHandler
       order.updater.persist_totals
     end
 
-    order.update!
+    order.update_order!
   end
 
   def create_line_item_fees!
@@ -43,13 +43,13 @@ class OrderFeesHandler
 
   def update_line_item_fees!(line_item)
     line_item.adjustments.enterprise_fee.each do |fee|
-      fee.update!(line_item, force: true)
+      fee.update_adjustment!(line_item, force: true)
     end
   end
 
   def update_order_fees!
     order.adjustments.enterprise_fee.where(adjustable_type: 'Spree::Order').each do |fee|
-      fee.update!(order, force: true)
+      fee.update_adjustment!(order, force: true)
     end
   end
 

app/services/permissions/order.rb

@@ -44,7 +44,7 @@ module Permissions
     def filtered_orders(orders)
       return orders unless filter_orders?
 
-      orders.complete.not_state(:canceled).search(search_params).result
+      orders.complete.not_state(:canceled).ransack(search_params).result
     end
 
     def filter_orders?

app/services/permitted_attributes/address.rb

@@ -6,7 +6,8 @@ module PermittedAttributes
       [
         :firstname, :lastname, :address1, :address2,
         :city, :country_id, :state_id, :zipcode,
-        :phone, :state_name, :alternative_phone, :company
+        :phone, :state_name, :alternative_phone, :company,
+        :latitude, :longitude
       ]
     end
   end

app/services/permitted_attributes/order_cycle.rb

@@ -35,23 +35,8 @@ module PermittedAttributes
         :tag_list,
         tags: [:text],
         enterprise_fee_ids: [],
-        variants: permitted_variant_ids
+        variants: {}
       ]
     end
-
-    # In rails 5 we will be able to permit random hash keys simply with :variants => {}
-    # See https://github.com/rails/rails/commit/e86524c0c5a26ceec92895c830d1355ae47a7034
-    #
-    # Until then, we need to create an array of variant IDs in order to permit them
-    def permitted_variant_ids
-      variant_ids(@params[:order_cycle][:incoming_exchanges]) +
-        variant_ids(@params[:order_cycle][:outgoing_exchanges])
-    end
-
-    def variant_ids(exchange_params)
-      return [] unless exchange_params
-
-      exchange_params.map { |exchange| exchange[:variants].map { |key, _value| key } }.flatten
-    end
   end
 end

app/services/process_payment_intent.rb

@@ -3,39 +3,82 @@
 # When directing a customer to Stripe to authorize the payment, we specify a
 # redirect_url that Stripe should return them to. When checking out, it's
 # /checkout; for admin payments and subscription payemnts it's the order url.
+#
 # This class confirms that the payment intent matches what's in our database,
 # marks the payment as complete, and removes the cvv_response_message field,
 # which we use to indicate that authorization is required. It also completes the
 # Order, if appropriate.
 
 class ProcessPaymentIntent
+  class Result
+    attr_reader :error
+
+    def initialize(ok:, error: "")
+      @ok = ok
+      @error = error
+    end
+
+    def ok?
+      @ok
+    end
+  end
+
   def initialize(payment_intent, order)
     @payment_intent = payment_intent
     @order = order
-    @last_payment = OrderPaymentFinder.new(order).last_payment
+    @payment = order.payments.pending.with_payment_intent(payment_intent).first
   end
 
   def call!
-    return unless valid?
+    return Result.new(ok: false) unless payment.present? && ready_for_capture?
+    return Result.new(ok: true) if already_processed?
 
-    last_payment.update_attribute(:cvv_response_message, nil)
-    OrderWorkflow.new(@order).next
-    last_payment.complete! if last_payment.can_complete?
+    process_payment
+
+    if payment.reload.completed?
+      payment.mark_as_processed
+
+      Result.new(ok: true)
+    else
+      Result.new(ok: false, error: I18n.t("payment_could_not_complete"))
+    end
+
+  rescue Stripe::StripeError => e
+    Result.new(ok: false, error: e.message)
   end
 
   private
 
-  attr_reader :order, :payment_intent, :last_payment
+  attr_reader :order, :payment_intent, :payment
 
-  def valid?
-    order.present? && valid_intent_string? && matches_last_payment?
+  def process_payment
+    if order.state == "payment"
+      # Moves the order to completed, which calls #process_payments!
+      OrderWorkflow.new(order).next
+    else
+      order.process_payments!
+    end
   end
 
-  def valid_intent_string?
-    payment_intent&.starts_with?("pi_")
+  def ready_for_capture?
+    payment_intent_status == 'requires_capture'
   end
 
-  def matches_last_payment?
-    last_payment&.state == "pending" && last_payment&.response_code == payment_intent
+  def already_processed?
+    payment_intent_status == 'succeeded'
+  end
+
+  def payment_intent_status
+    @payment_intent_status ||= Stripe::PaymentIntentValidator.new.
+      call(payment_intent, stripe_account_id).
+      status
+  end
+
+  def stripe_account_id
+    StripeAccount.find_by(enterprise_id: preferred_enterprise_id).stripe_user_id
+  end
+
+  def preferred_enterprise_id
+    payment.payment_method.preferred_enterprise_id
   end
 end

app/views/admin/enterprises/_new_form.html.haml

@@ -97,7 +97,24 @@
         %input.ofn-select2.fullwidth#enterprise_address_attributes_state_id{ name: 'enterprise[address_attributes][state_id]', type: 'number', data: 'countriesById[Enterprise.address.country_id].states', placeholder: t('admin.choose'), ng: { model: 'Enterprise.address.state_id' } }
       .five.columns.omega
         %input.ofn-select2.fullwidth#enterprise_address_attributes_country_id{ name: 'enterprise[address_attributes][country_id]', type: 'number', data: 'countries', placeholder: t('admin.choose'), ng: { model: 'Enterprise.address.country_id' } }
-
+  .row
+    .three.columns.alpha
+      = af.label :latitude, t(:latitude)
+      \/
+      = af.label :longitude, t(:longitude)
+      %span.required *
+      %div{'ofn-with-tip' => t('latitude_longitude_tip')}
+        %a= t('admin.whats_this')
+    .four.columns
+      = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
+    .four.columns.omega
+      = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
+  .row
+    .three.columns.alpha
+      = " ".html_safe
+    .five.columns.omega
+      = check_box_tag "use_geocoder"
+      = label_tag "use_geocoder", t('use_geocoder')
 .row
   .twelve.columns.alpha
      

app/views/admin/enterprises/form/_address.html.haml

@@ -35,3 +35,21 @@
     %input.ofn-select2.fullwidth#enterprise_address_attributes_state_id{ name: 'enterprise[address_attributes][state_id]', type: 'number', data: 'countriesById[Enterprise.address.country_id].states', placeholder: t('admin.choose'), ng: { model: 'Enterprise.address.state_id' } }
   .four.columns.omega{ "ng-controller" => "countryCtrl" }
     %input.ofn-select2.fullwidth#enterprise_address_attributes_country_id{ name: 'enterprise[address_attributes][country_id]', type: 'number', data: 'countries', placeholder: t('admin.choose'), ng: { model: 'Enterprise.address.country_id' } }
+.row
+  .three.columns.alpha
+    = af.label :latitude, t(:latitude)
+    \/
+    = af.label :longitude, t(:longitude)
+    %span.required *
+    %div{'ofn-with-tip' => t('latitude_longitude_tip')}
+      %a= t('admin.whats_this')
+  .four.columns
+    = af.text_field :latitude, { placeholder: t(:latitude_placeholder) }
+  .four.columns.omega
+    = af.text_field :longitude, { placeholder: t(:longitude_placeholder) }
+.row
+  .three.columns.alpha
+    = " ".html_safe
+  .five.columns.omega
+    = check_box_tag "use_geocoder"
+    = label_tag "use_geocoder", t('use_geocoder')

app/views/admin/enterprises/new.html.haml

@@ -10,7 +10,7 @@
   = "admin.enterprises"
 
 = admin_inject_available_countries(module: 'admin.enterprises')
-= admin_inject_json "admin.enterprises", "defaultCountryID", Spree::Config[:default_country_id]
+= admin_inject_json "admin.enterprises", "defaultCountryID", DefaultCountry.id
 
 -# Form
 

app/views/checkout/_billing.html.haml

@@ -38,7 +38,7 @@
               = validated_input t(:postcode), "order.bill_address.zipcode"
 
             .small-6.columns.right
-              = validated_select t(:country), "order.bill_address.country_id", {}, {"ng-init" => "order.bill_address.country_id = order.bill_address.country_id || #{Spree::Config[:default_country_id]}", "ng-options" => "c.id as c.name for c in countries"}
+              = validated_select t(:country), "order.bill_address.country_id", {}, {"ng-init" => "order.bill_address.country_id = order.bill_address.country_id || #{DefaultCountry.id}", "ng-options" => "c.id as c.name for c in countries"}
 
       .row
         .small-12.columns.text-right

app/views/checkout/_shipping_ship_address.html.haml

@@ -22,7 +22,7 @@
           .small-6.columns
             = validated_input t(:postcode), "order.ship_address.zipcode"
           .small-6.columns.right
-            = validated_select t(:country), "order.ship_address.country_id", {}, {"ng-init" => "order.ship_address.country_id = order.ship_address.country_id || #{Spree::Config[:default_country_id]}", "ng-options" => "c.id as c.name for c in countries"}
+            = validated_select t(:country), "order.ship_address.country_id", {}, {"ng-init" => "order.ship_address.country_id = order.ship_address.country_id || #{DefaultCountry.id}", "ng-options" => "c.id as c.name for c in countries"}
         .row
           .small-6.columns
             = validated_input t(:phone), "order.ship_address.phone"

app/views/enterprises/shop.html.haml

@@ -20,10 +20,6 @@
   - content_for :order_cycle_form do
     = render partial: "change_order_cycle"
 
-  - content_for :ordercycle_sidebar do
-    .show-for-large-up.large-4.columns
-      = render partial: "shopping_shared/order_cycles"
-
   = render partial: "shopping_shared/header"
   = render partial: "shopping_shared/tabs"
 

app/views/layouts/registration.html.haml

@@ -27,7 +27,7 @@
           #footer
     %loading
 
-    %script{src: "//maps.googleapis.com/maps/api/js?libraries=places"}
+    %script{src: "//maps.googleapis.com/maps/api/js?libraries=places#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''}"}
     = javascript_include_tag "darkswarm/all"
     = yield :scripts
 

app/views/registration/steps/_details.html.haml

@@ -7,7 +7,6 @@
           %h2= t('.headline')
           %h5{ ng: { if: "::enterprise.type != 'own'" } }= t(".enterprise")
           %h5{ ng: { if: "::enterprise.type == 'own'" } }= t(".producer")
-
     %form{ name: 'details', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "selectIfValid('contact',details)" } }
 
       .row
@@ -54,10 +53,12 @@
             .small-12.medium-8.large-8.columns
               .field
                 %label{ for: 'enterprise_country' }= t(".country_field")
-                %select.chunky{ id: 'enterprise_country', name: 'country', required: true, ng: { init: "setDefaultCountry(#{Spree::Config[:default_country_id]})", model: 'enterprise.country', options: 'c as c.name for c in countries' } }
+                %select.chunky{ id: 'enterprise_country', name: 'country', required: true, ng: { init: "setDefaultCountry(#{DefaultCountry.id})", model: 'enterprise.country', options: 'c as c.name for c in countries' } }
                 %span.error{ ng: { show: "details.country.$error.required && submitted" } }
                   = t(".country_field_error")
 
+      = render 'registration/steps/location_map' if using_google_maps?
+
       .row.buttons
         .small-12.columns
           %hr

app/views/registration/steps/_location_map.html.haml

@@ -0,0 +1,18 @@
+%div
+  .center{ ng: {if: "latLong"}}
+    %strong {{'registration.steps.details.drag_pin' | t}}
+  .small-12.medium-9.large-12.columns.end
+    .map-container--registration{id: "registration-map", ng: {if: "!!map"}}
+      %ui-gmap-google-map{ center: "map.center", zoom: "map.zoom"}
+        %ui-gmap-marker{idKey: 1, coords: "latLong", options: '{ draggable: true}'}
+
+  .center
+    %input.button.primary{ type: "button", value: "{{'registration.steps.details.locate_address' | t}}", ng: { click: "locateAddress()" } }
+  .center{ ng: {if: "latLong"}}
+    .field
+      %input{ type: 'checkbox', id: 'confirm_address', name: 'confirm_address', ng: { click: 'toggleAddressConfirmed()' } }
+      %label{ for: 'confirm_address' } {{'registration.steps.details.confirm_address' | t}}
+  .small-12.medium-9.large-12.columns.end{ ng: {if: "latLong"}}
+    .field
+      %strong {{'registration.steps.details.drag_map_marker' | t}}
+

app/views/shared/_stripe_js.html.haml

@@ -1,5 +1,5 @@
 - if Rails.env.test?
   %script{type: "text/javascript"}
-    = render file: "spec/support/fixtures/stripejs-mock.js"
+    = raw render file: "spec/support/fixtures/stripejs-mock.js"
 - else
   %script{src: "https://js.stripe.com/v3/", type: "text/javascript"}

app/views/shop/messages/_select_oc.html.haml

@@ -1,4 +1,4 @@
-.content.footer-pad{ "darker-background" => true, "ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id == null" }
+.content.footer-pad{ "darker-background" => true, "ng-show" => "order_cycle.order_cycle_id == null" }
   .row
     .small-12.columns
       .select-oc-message

app/views/shop/products/_form.html.haml

@@ -1,5 +1,5 @@
 %form{action: main_app.cart_path}
-  %products{"ng-controller" => "ProductsCtrl", "ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true }
+  %products{"ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true }
 
     = render partial: "shop/products/searchbar"
 
@@ -9,7 +9,7 @@
           .medium-12.large-9.columns.full
             = render partial: "shop/products/search_feedback"
 
-            %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading' }
+            %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading', "infinite-scroll-immediate-check": "false" }
               %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
                 = render "shop/products/summary"
                 .shop-variants

app/views/shopping_shared/_tabs.html.haml

@@ -5,10 +5,11 @@
 
   #shop-tabs{ ng: { controller: "PageSelectionCtrl", init: "whitelistPages(#{shop_tab_names.to_json})", cloak: true } }
     .tab-buttons
-      .row
+      .flex.row
         .columns.small-12.large-8
           - shop_tabs.each do |tab|
             .page{ "ng-class" => "{ selected: selectedPage() == '#{tab[:name]}' }" }
               %a{ href: "##{tab[:name]}" }=tab[:title]
-
+        .columns.large-4.show-for-large-up
+          = render partial: "shopping_shared/order_cycles"
     .page-view{ ng: {include: "'shop/' + selectedPage() + '.html'" } }

app/views/shopping_shared/tabs/_shop.html.haml

@@ -2,10 +2,11 @@
   .order-cycle-bar.hide-for-large-up
     = render partial: "shopping_shared/order_cycles"
 
-  - if no_open_order_cycles?
-    = render partial: "shop/messages/closed_shop"
-  - else
-    = render partial: "shop/messages/select_oc"
+  %div{"ng-controller" => "ProductsCtrl"}
+    - if no_open_order_cycles?
+      = render partial: "shop/messages/closed_shop"      
+    - else
+      = render partial: "shop/messages/select_oc"
 
-  -# Rendering the form, even if there are no open OCs, makes display only shops possible
-  = render partial: "shop/products/form"
+    -# Rendering the form, even if there are no open OCs, makes display only shops possible
+    = render partial: "shop/products/form"

app/views/spree/admin/orders/_form.html.haml

@@ -26,4 +26,4 @@
     var shipments = [];
     - @order.shipments.each do |shipment|
       shipments.push(#{shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]).html_safe});
-    = render :partial => 'spree/admin/shared/update_order_state', :handlers => [:erb]
+    = render :partial => 'spree/admin/shared/update_order_state', :handlers => [:erb], :formats => [:js]

app/views/spree/admin/overview/_enterprises.html.haml

@@ -25,8 +25,7 @@
         %span.centered.three.columns
           = t "spree_admin_enterprises_fees"
     %div.sixteen.columns.alpha.list
-      - @enterprises.each do |enterprise|
-        = render 'enterprise_row', { enterprise: enterprise }
+      = render partial: 'enterprise_row', collection: @enterprises, as: :enterprise
 
     %a.sixteen.columns.alpha.button.bottom.blue{ href: "#{main_app.admin_enterprises_path}" }
       = t "spree_admin_overview_enterprises_footer"

app/views/spree/admin/payments/source_forms/_stripe.html.haml

@@ -14,5 +14,5 @@
   .row
     .three.columns
       = label_tag :card_details, t(:card_details)
-    .six.columns
+    .nine.columns
       %stripe-elements

app/views/spree/admin/payments/source_forms/_stripe_sca.html.haml

@@ -13,5 +13,5 @@
   .row
     .three.columns
       = label_tag :card_details, t(:card_details)
-    .six.columns
+    .nine.columns
       %stripe-elements

app/views/spree/admin/shared/_configuration_menu.html.haml

@@ -11,8 +11,8 @@
       = configurations_sidebar_menu_item Spree.t(:tax_settings), edit_admin_tax_settings_path
       = configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path
       = configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path
-      - if Spree::Config[:default_country_id]
-        = configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(Spree::Config[:default_country_id])
+      - if DefaultCountry.id
+        = configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(DefaultCountry.id)
       = configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path
       = configurations_sidebar_menu_item Spree.t(:taxonomies), admin_taxonomies_path
       = configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path