Merge pull request #5494 from Matt-Yorkley/group-maps-fix

Fix group maps

.gitignore

@@ -31,6 +31,7 @@ public/system
 public/stylesheets
 public/images
 public/spree
+public/assets
 config/abr.yml
 config/initializers/feature_toggle.rb
 NERD_tree*

.rubocop_manual_todo.yml

@@ -88,7 +88,6 @@ Layout/LineLength:
   - app/models/spree/tax_rate_decorator.rb
   - app/models/spree/taxon_decorator.rb
   - app/models/spree/user.rb
-  - app/models/spree/variant_decorator.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
   - app/models/variant_override_set.rb
@@ -156,7 +155,6 @@ Layout/LineLength:
   - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
   - spec/controllers/spree/admin/orders_controller_spec.rb
   - spec/controllers/spree/admin/payment_methods_controller_spec.rb
-  - spec/controllers/spree/admin/payments_controller_spec.rb
   - spec/controllers/spree/admin/products_controller_spec.rb
   - spec/controllers/spree/admin/reports_controller_spec.rb
   - spec/controllers/spree/admin/variants_controller_spec.rb
@@ -181,7 +179,6 @@ Layout/LineLength:
   - spec/features/admin/image_settings_spec.rb
   - spec/features/admin/multilingual_spec.rb
   - spec/features/admin/order_cycles_spec.rb
-  - spec/features/admin/orders_spec.rb
   - spec/features/admin/overview_spec.rb
   - spec/features/admin/payment_method_spec.rb
   - spec/features/admin/product_import_spec.rb
@@ -229,7 +226,6 @@ Layout/LineLength:
   - spec/lib/open_food_network/group_buy_report_spec.rb
   - spec/lib/open_food_network/lettuce_share_report_spec.rb
   - spec/lib/open_food_network/option_value_namer_spec.rb
-  - spec/lib/open_food_network/order_and_distributor_report_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
   - spec/lib/open_food_network/order_cycle_permissions_spec.rb
   - spec/lib/open_food_network/order_grouper_spec.rb
@@ -377,7 +373,6 @@ Metrics/AbcSize:
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/zones_helper.rb
   - app/helpers/spree/orders_helper.rb
-  - app/mailers/producer_mailer.rb
   - app/models/calculator/flat_percent_per_item.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
@@ -468,7 +463,6 @@ Metrics/BlockLength:
   - spec/factories/shipping_method_factory.rb
   - spec/factories/subscription_factory.rb
   - spec/factories/variant_factory.rb
-  - spec/features/admin/orders_spec.rb
   - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
   - spec/lib/open_food_network/group_buy_report_spec.rb
   - spec/models/tag_rule/discount_order_spec.rb
@@ -574,7 +568,6 @@ Metrics/MethodLength:
   - app/helpers/spree/admin/navigation_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/jobs/subscription_placement_job.rb
-  - app/mailers/producer_mailer.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
@@ -680,7 +673,6 @@ Metrics/ModuleLength:
   - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/payment_setup_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb

.rubocop_todo.yml

@@ -173,7 +173,6 @@ Naming/MethodParameterName:
 Naming/PredicateName:
   Exclude:
     - 'spec/**/*'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/models/order_cycle.rb'
@@ -630,7 +629,6 @@ Style/FrozenStringLiteralComment:
     - 'app/jobs/subscription_placement_job.rb'
     - 'app/jobs/welcome_enterprise_job.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/mailers/spree/base_mailer_decorator.rb'
     - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer.rb'
@@ -855,7 +853,6 @@ Style/FrozenStringLiteralComment:
     - 'app/validators/date_time_string_validator.rb'
     - 'app/validators/distributors_validator.rb'
     - 'app/validators/integer_array_validator.rb'
-    - 'app/views/spree/admin/taxons/search.rabl'
     - 'config.ru'
     - 'engines/order_management/app/controllers/order_management/application_controller.rb'
     - 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/authorizer.rb'

DOCKER.md

@@ -52,3 +52,5 @@ The default admin user is 'ofn@example.com' with 'ofn123' password.
 Check the app in the browser at `http://localhost:3000`.
 
 You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
+
+You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).

Dockerfile

@@ -27,6 +27,9 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
+# Install node
+RUN apt-get install -y nodejs
+
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
     sh -c "echo 'deb [arch=amd64]  http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" && \

GETTING_STARTED.md

@@ -2,6 +2,8 @@
 
 This is a general guide to setting up an Open Food Network development environment on your local machine.
 
+The fastest way to make it work locally is to use Docker, see the [Docker setup guide](DOCKER.md).
+
 The following guides are located in the wiki and provide more OS-specific step-by-step instructions:
 
 - [Ubuntu Setup Guide][ubuntu]
@@ -11,7 +13,7 @@ The following guides are located in the wiki and provide more OS-specific step-b
 ### Dependencies
 
 * Rails 3.2.x
-* Ruby 2.1.9
+* Ruby 2.3.7
 * PostgreSQL database
 * PhantomJS (for testing)
 * See Gemfile for a list of gems required
@@ -58,10 +60,10 @@ Now, your dreams of spinning up a development server can be realised:
 
     bundle exec rails server
 
-To login as Spree default user, use:
+To login as the default user, use:
 
-    email: spree@example.com
-    password: spree123
+    email: ofn@example.com
+    password: ofn123
 
 ### Testing
 
@@ -118,7 +120,7 @@ $ createdb open_food_network_test --owner=ofn
 If these commands succeed, you should be able to [continue the setup process](#get-it-running).
 
 [developer-wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
-[sierra]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup%3A-macOS-%28Sierra%2C-HighSierra-and-Mojave%29
+[sierra]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup%3A-macOS-%28Sierra%2C-HighSierra%2C-Mojave-and-Catalina%29
 [el-capitan]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X-(El-Capitan)
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki

Gemfile

@@ -9,10 +9,9 @@ gem 'rails-i18n', '~> 3.0.0'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-# Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
-gem 'nokogiri', '>= 1.6.7.1'
 
 gem "catalog", path: "./engines/catalog"
+gem 'dfc_provider', path: './engines/dfc_provider'
 gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
@@ -55,7 +54,6 @@ gem 'aws-sdk'
 gem 'bugsnag'
 gem 'db2fog'
 gem 'haml'
-gem 'rabl'
 gem 'redcarpet'
 gem 'sass', "~> 3.3"
 gem 'sass-rails', '~> 3.2.3'
@@ -70,7 +68,6 @@ gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'blockenspiel'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'deface', '1.0.2'
 gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
@@ -98,7 +95,7 @@ gem 'test-unit', '~> 3.3'
 gem 'coffee-rails', '~> 3.2.1'
 gem 'compass-rails'
 
-gem 'mini_racer', '0.2.9'
+gem 'mini_racer', '0.2.14'
 
 gem 'uglifier', '>= 1.0.3'
 
@@ -111,7 +108,7 @@ gem "foundation-rails"
 
 gem 'jquery-migrate-rails'
 gem 'jquery-rails', '3.1.5'
-gem 'jquery-ui-rails', '~> 4.0.0'
+gem 'jquery-ui-rails', '~> 4.2'
 gem 'select2-rails', '~> 3.4.7'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
@@ -125,7 +122,7 @@ group :test, :development do
   # Pretty printed test output
   gem 'atomic'
   gem 'awesome_print'
-  gem 'capybara', '>= 2.18.0' # 3.0 requires nokogiri 1.8
+  gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
   gem 'database_cleaner', '0.7.1', require: false
   gem "factory_bot_rails", require: false
   gem 'fuubar', '~> 2.5.0'
@@ -149,10 +146,11 @@ group :test do
 end
 
 group :development do
-  gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
+  gem 'byebug', '~> 11.0.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
   gem "newrelic_rpm", "~> 3.0"
-  gem 'pry-byebug', '>= 3.4.3'
+  gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
+  gem 'pry-byebug', '~> 3.7.0' # 3.8 requires ruby 2.4
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring', '1.7.2'

Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 8a8585a43cd04d1a50dc65227f337a91b18d66d5
+  revision: e10ca1f689b1658040b081939b7523f6fb68895a
   branch: 2-0-4-stable
   specs:
     spree_core (2.0.4)
@@ -32,14 +32,13 @@ GIT
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (~> 1.6.10)
-      deface (>= 0.9.1)
       ffaker (~> 1.16)
       highline (= 1.6.18)
       httparty (~> 0.11)
       json (>= 1.7.7)
       kaminari (~> 0.14.1)
       money (= 5.1.1)
-      paperclip (~> 3.0)
+      paperclip (~> 3.4.1)
       paranoia (~> 1.3)
       rails (~> 3.2.14)
       ransack (= 0.7.2)
@@ -62,6 +61,13 @@ PATH
   specs:
     catalog (0.0.1)
 
+PATH
+  remote: engines/dfc_provider
+  specs:
+    dfc_provider (0.0.1)
+      jwt (~> 2.2)
+      rspec (~> 3.9)
+
 PATH
   remote: engines/order_management
   specs:
@@ -104,7 +110,7 @@ GEM
       activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-import (1.0.4)
+    activerecord-import (1.0.5)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -141,10 +147,10 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.5.0)
-    bugsnag (6.13.0)
+    bugsnag (6.13.1)
       concurrent-ruby (~> 1.0)
     builder (3.0.4)
-    byebug (9.0.6)
+    byebug (11.0.1)
     cancan (1.6.10)
     capybara (2.18.0)
       addressable
@@ -167,7 +173,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.8.1)
     combine_pdf (1.0.16)
       ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
@@ -186,7 +191,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     css_parser (1.7.0)
@@ -198,14 +203,9 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.34.1)
+    ddtrace (0.35.2)
       msgpack
     debugger-linecache (1.2.0)
-    deface (1.0.2)
-      colorize (>= 0.5.8)
-      nokogiri (~> 1.6.0)
-      polyglot
-      rails (>= 3.1)
     delayed_job (4.1.8)
       activesupport (>= 3.0, < 6.1)
     delayed_job_active_record (4.1.4)
@@ -238,7 +238,7 @@ GEM
       railties (>= 3.0.0)
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.22.1)
+    ffaker (1.32.1)
     ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -425,8 +425,8 @@ GEM
     jquery-rails (3.1.5)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.5)
-      railties (>= 3.1.0)
+    jquery-ui-rails (4.2.1)
+      railties (>= 3.2.16)
     json (1.8.6)
     json_spec (1.1.5)
       multi_json (~> 1.0)
@@ -449,9 +449,9 @@ GEM
     method_source (0.9.2)
     mime-types (1.25.1)
     mini_mime (1.0.1)
-    mini_portile2 (2.1.0)
-    mini_racer (0.2.9)
-      libv8 (>= 6.9.411)
+    mini_portile2 (2.4.0)
+    mini_racer (0.2.14)
+      libv8 (> 7.3)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.1)
@@ -461,8 +461,8 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     newrelic_rpm (3.18.1.330)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -483,7 +483,7 @@ GEM
     parallel (1.19.1)
     paranoia (1.3.4)
       activerecord (~> 3.1)
-    parser (2.7.0.5)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
@@ -498,16 +498,14 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.4.3)
-      byebug (>= 9.0, < 9.1)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.3)
-    rabl (0.8.4)
-      activesupport (>= 2.3.14)
     rack (1.4.7)
     rack-cache (1.11.0)
       rack (>= 0.4)
-    rack-mini-profiler (2.0.1)
+    rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
     rack-protection (1.5.5)
       rack
@@ -596,7 +594,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.5.1)
+    rubocop-rails (2.5.2)
       activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
@@ -652,11 +650,11 @@ GEM
     turbo-sprockets-rails3 (0.3.14)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.2.0)
-    tzinfo (0.3.56)
+    tzinfo (0.3.57)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.5.4)
+    unicorn (5.5.5)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -702,7 +700,7 @@ DEPENDENCIES
   aws-sdk
   blockenspiel
   bugsnag
-  byebug (~> 9.0.0)
+  byebug (~> 11.0.0)
   capybara (>= 2.18.0)
   catalog!
   coffee-rails (~> 3.2.1)
@@ -715,11 +713,11 @@ DEPENDENCIES
   db2fog
   ddtrace
   debugger-linecache
-  deface (= 1.0.2)
   delayed_job_active_record
   delayed_job_web
   devise (~> 2.2.5)
   devise-encryptable (= 0.2.0)
+  dfc_provider!
   diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails
@@ -736,16 +734,15 @@ DEPENDENCIES
   immigrant
   jquery-migrate-rails
   jquery-rails (= 3.1.5)
-  jquery-ui-rails (~> 4.0.0)
+  jquery-ui-rails (~> 4.2)
   json_spec (~> 1.1.4)
   jwt (~> 2.2)
   kaminari (~> 0.14.1)
   knapsack
   letter_opener (>= 1.4.1)
-  mini_racer (= 0.2.9)
+  mini_racer (= 0.2.14)
   momentjs-rails
   newrelic_rpm (~> 3.0)
-  nokogiri (>= 1.6.7.1)
   oauth2 (~> 1.4.4)
   ofn-qz!
   oj
@@ -753,8 +750,8 @@ DEPENDENCIES
   paper_trail (~> 5.2.3)
   paperclip (~> 3.4.1)
   pg (~> 0.21.0)
-  pry-byebug (>= 3.4.3)
-  rabl
+  pry (~> 0.12.0)
+  pry-byebug (~> 3.7.0)
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
@@ -800,4 +797,4 @@ RUBY VERSION
    ruby 2.3.7p456
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

app/assets/images/map_009-cluster.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="33px" enable-background="new 0 0 28 33" version="1.1" viewBox="0 0 28 33" xmlns="http://www.w3.org/2000/svg"><path d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643   C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643   C24.988,26.679,20.059,25,14,25z" fill="#282828" opacity=".25"/><path d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32    c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z" fill="#fff"/><g><g fill="#0b8c61"><path d="m14 0c-7.72 0-14 6.717-14 13.333 0 9.941 13.132 18.169 13.691 18.571 0.089 0.064 0.2 0.096 0.309 0.096 0.107 0 0.217-0.031 0.305-0.094 0.559-0.395 13.695-8.456 13.695-18.573 0-6.616-6.28-13.333-14-13.333zm9.5 12.057c0 0.863-0.567 1.661-1.325 1.942l-1.025 5.889c-0.015 0.976-0.889 1.831-1.94 1.831h-10.466c-1.052 0-1.925-0.855-1.947-1.906l-1.024-5.828c-0.737-0.294-1.273-1.075-1.273-1.928v-0.827c0-1.074 0.874-1.948 1.948-1.948h2.302l1.396-2.247c0.4-0.698 1.417-0.978 2.145-0.555 0.755 0.435 1.015 1.403 0.58 2.159l-0.41 0.642h2.662l-0.39-0.61c-0.227-0.391-0.284-0.823-0.174-1.235 0.109-0.406 0.37-0.745 0.734-0.955 0.716-0.417 1.739-0.148 2.159 0.579l1.381 2.223h2.718c1.074 0 1.948 0.874 1.948 1.948v0.826z"/><rect x="3.6006" y="6.9915" width="20.415" height="15.521"/><rect x="8.9841" y="5.6631" width="10.487" height="3.6356"/></g><text x="5.0698848" y="20.243376" fill="#000000" font-family="sans-serif" font-size="16px" style="line-height:1.25" xml:space="preserve"><tspan x="5.0698848" y="20.243376" fill="#ffffff" font-family="Arial" font-size="16px" font-weight="bold">1+</tspan></text></g></svg>

app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

@@ -29,7 +29,7 @@ angular.module("admin.enterprises")
     # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
     # and on all new uses of this contoller, and we might not want that.
     enterpriseNavCallback = ->
-      if $scope.enterprise_form != undefined && $scope.enterprise_form.$dirty
+      if $scope.enterprise_form?.$dirty
         t('admin.unsaved_confirm_leave')
 
     # Register the NavigationCheck callback

app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee

@@ -1,5 +1,5 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $controller, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $controller, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, NavigationCheck, ocInstance) ->
     $controller('AdminOrderCycleBasicCtrl', {$scope: $scope, ocInstance: ocInstance})
 
     order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
@@ -18,5 +18,12 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
+      NavigationCheck.clear()
       StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
+
+    warnAboutUnsavedChanges = ->
+      if $scope.order_cycle_form?.$dirty
+        t('admin.unsaved_confirm_leave')
+
+    NavigationCheck.register(warnAboutUnsavedChanges)

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

@@ -34,9 +34,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
       'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
       # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
       'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
-      'q[distributor_id_in]': $scope['q']['distributor_id_in'],
-      'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
-      'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
+      'q[distributor_id_in][]': $scope['q']['distributor_id_in'],
+      'q[order_cycle_id_in][]': $scope['q']['order_cycle_id_in'],
       'q[s]': $scope.sorting || 'completed_at desc',
       per_page: $scope.per_page,
       page: page
@@ -67,7 +66,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
     return unless sort && sort.predicate != ""
 
     $scope.sorting = sort.getSortingExpr()
-    $scope.fetchProducts()
+    $scope.fetchResults()
   , true
 
   $scope.capturePayment = (order) ->

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

@@ -4,7 +4,6 @@ angular.module("admin.side_menu")
       items: []
       selected: null
 
-
       # Checks for path and uses it to set the view
       # If no path, loads first view
       init: =>
@@ -31,11 +30,3 @@ angular.module("admin.side_menu")
         for item in @items when item.name is name
           return item
         null
-
-      hide_item_by_name: (name) =>
-        item = @find_by_name(name)
-        item.visible = false if item
-
-      show_item_by_name: (name) =>
-        item = @find_by_name(name)
-        item.visible = true if item

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

@@ -0,0 +1,2 @@
+Darkswarm.controller "CartFormCtrl", ($scope) ->
+

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

@@ -1,6 +1,3 @@
-Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises, MapConfiguration, OfnMap) ->
+Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises) ->
   $scope.Enterprises = Enterprises
-
-  $scope.map = angular.copy MapConfiguration.options
-  $scope.mapMarkers = OfnMap.enterprise_markers enterprises
   $scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1

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

@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
+Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
   $scope.Products = Products
   $scope.Cart = Cart
   $scope.query = ""
@@ -10,6 +10,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.supplied_taxons = null
   $scope.supplied_properties = null
+  $scope.showFilterSidebar = false
 
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
@@ -75,15 +76,24 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
   $scope.appliedTaxonsList = ->
     $scope.activeTaxons.map( (taxon_id) ->
       Taxons.taxons_by_id[taxon_id].name
-    ).join(" #{t('products_or')} ") if $scope.activeTaxons?
+    ).join($scope.filtersJoinWord()) if $scope.activeTaxons?
 
   $scope.appliedPropertiesList = ->
     $scope.activeProperties.map( (property_id) ->
       Properties.properties_by_id[property_id].name
-    ).join(" #{t('products_or')} ") if $scope.activeProperties?
+    ).join($scope.filtersJoinWord()) if $scope.activeProperties?
+
+  $scope.filtersJoinWord = ->
+    $sce.trustAsHtml(" <span class='join-word'>#{t('products_or')}</span> ")
 
   $scope.clearAll = ->
+    $scope.clearQuery()
+    $scope.clearFilters()
+
+  $scope.clearQuery = ->
     $scope.query = ""
+
+  $scope.clearFilters = ->
     $scope.taxonSelectors.clearAll()
     $scope.propertySelectors.clearAll()
 
@@ -94,3 +104,9 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
       $scope.Products.products = []
       $scope.update_filters()
       $scope.loadProducts()
+
+  $scope.filtersCount = () ->
+    $scope.taxonSelectors.totalActive() + $scope.propertySelectors.totalActive()
+
+  $scope.toggleFilterSidebar = ->
+    $scope.showFilterSidebar = !$scope.showFilterSidebar

app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee

@@ -1,2 +1,2 @@
-Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront, EnterpriseModal) ->
+Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront) ->
   $scope.shopfront = Shopfront.shopfront

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

@@ -0,0 +1,11 @@
+Darkswarm.directive "darkerBackground", ->
+  restrict: "A"
+  link: (scope, elm, attr)->
+    toggleClass = (value) ->
+      elm.closest('.page-view').toggleClass("with-darker-background", value)
+
+    toggleClass(true)
+
+    # if an OrderCycle is selected, disable darker background
+    scope.$watch 'order_cycle.order_cycle_id', (newvalue, oldvalue) ->
+      toggleClass(false) if newvalue

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

@@ -0,0 +1,12 @@
+# Allows disabling of link buttons via disabled attribute.
+# This is normally ignored, ie the link appears disabled but is still clickable.
+
+Darkswarm.directive "disableDynamically", ->
+  restrict: 'A'
+
+  link: (scope, element, attrs) ->
+    element.on 'click', (e) ->
+      if attrs.disabled
+        e.preventDefault()
+      return
+

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

@@ -7,4 +7,4 @@ Darkswarm.directive "enterpriseModal", (EnterpriseModal) ->
     elem.on "click", (event) =>
       event.stopPropagation()
 
-      scope.modalInstance = EnterpriseModal.open scope.enterprise
+      scope.modalInstance = EnterpriseModal.open scope.enterprise

app/assets/javascripts/darkswarm/directives/focus_search.coffee

@@ -0,0 +1,6 @@
+Darkswarm.directive "focusSearch", ->
+  restrict: 'A'
+  link: (scope, element, attr)->
+    element.bind 'click', (event) ->
+      # Focus seach field, ready for typing
+      $(element).siblings('#search').focus()

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

@@ -1,6 +1,7 @@
-Darkswarm.directive "ofnOnHand", ->
+Darkswarm.directive "ofnOnHand", (StockQuantity) ->
   restrict: 'A'
   require: "ngModel"
+  scope: true
 
   link: (scope, elem, attr, ngModel) ->
     # In cases where this field gets its value from the HTML element rather than the model,
@@ -23,6 +24,4 @@ Darkswarm.directive "ofnOnHand", ->
       viewValue
 
     scope.available_quantity = ->
-      on_hand = parseInt(attr.ofnOnHand)
-      finalized_quantity = parseInt(attr.finalizedquantity) || 0 # finalizedquantity is optional
-      on_hand + finalized_quantity
+      StockQuantity.available_quantity(attr.ofnOnHand, attr.finalizedquantity)

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

@@ -5,5 +5,9 @@ Darkswarm.directive "shopVariant", ->
   scope:
     variant: '='
   controller: ($scope, Cart) ->
-    $scope.$watchGroup ['variant.line_item.quantity', 'variant.line_item.max_quantity'], ->
+    $scope.$watchGroup [
+      'variant.line_item.quantity',
+      'variant.line_item.max_quantity'
+    ], (new_value, old_value) ->
+      return if old_value[0] == null && new_value[0] == null
       Cart.adjust($scope.variant.line_item)

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

@@ -0,0 +1,16 @@
+Darkswarm.directive "validateStockQuantity", (StockQuantity) ->
+  restrict: 'A'
+  require: "ngModel"
+  scope: true
+
+  link: (scope, element, attr, ngModel) ->
+    ngModel.$parsers.push (selectedQuantity) ->
+      valid_number = parseInt(selectedQuantity) != NaN
+      valid_quantity = parseInt(selectedQuantity) <= scope.available_quantity()
+
+      ngModel.$setValidity('stock', (valid_number && valid_quantity) );
+
+      selectedQuantity
+
+    scope.available_quantity = ->
+      StockQuantity.available_quantity(attr.ofnOnHand, attr.finalizedquantity)

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService) ->
+Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, RailsFlashLoader) ->
   # Handles syncing of current cart/order state to server
   new class Cart
     dirty: false
@@ -50,7 +50,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
         @popQueue() if @update_enqueued
 
       .error (response, status)=>
-        @scheduleRetry(status)
+        RailsFlashLoader.loadFlash({error: t('js.cart.add_to_cart_failed')})
         @update_running = false
 
     compareAndNotifyStockLevels: (stockLevels) =>
@@ -87,13 +87,6 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
           max_quantity: li.max_quantity
       {variants: variants}
 
-    scheduleRetry: (status) =>
-      console.log "Error updating cart: #{status}. Retrying in 3 seconds..."
-      $timeout =>
-        console.log "Retrying cart update"
-        @orderChanged()
-      , 3000
-
     saved: =>
       @dirty = false
       $(window).unbind "beforeunload"

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

@@ -14,15 +14,28 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
 
     submit: =>
       Loading.message = t 'submitting_order'
-      $http.put('/checkout.json', {order: @preprocess()}).success (data, status)=>
-        Navigation.go data.path
-      .error (response, status)=>
-        if response.path
-          Navigation.go response.path
-        else
-          Loading.clear()
-          @errors = response.errors
-          RailsFlashLoader.loadFlash(response.flash)
+      $http.put('/checkout.json', {order: @preprocess()})
+      .then (response) =>
+        Navigation.go response.data.path
+      .catch (response) =>
+        try
+          @handle_checkout_error_response(response)
+        catch error
+          @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
+          throw error # generate a BugsnagJS alert
+
+    handle_checkout_error_response: (response) =>
+      if response.data.path
+        Navigation.go response.data.path
+      else
+        throw response unless response.data.flash
+
+        @errors = response.data.errors
+        @loadFlash(response.data.flash)
+
+    loadFlash: (flash) =>
+      Loading.clear()
+      RailsFlashLoader.loadFlash(flash)
 
     # Rails wants our Spree::Address data to be provided with _attributes
     preprocess: ->

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

@@ -0,0 +1,10 @@
+Darkswarm.factory "EnterpriseListModal", ($modal, $rootScope, $http, EnterpriseModal)->
+  new class EnterpriseListModal
+    open: (enterprises)->
+      scope = $rootScope.$new(true)
+      scope.enterprises = enterprises
+      scope.openModal = EnterpriseModal.open
+      if Object.keys(enterprises).length > 1
+        $modal.open(templateUrl: "enterprise_list_modal.html", scope: scope)
+      else
+        EnterpriseModal.open enterprises[Object.keys(enterprises)[0]]

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

@@ -1,21 +1,39 @@
-Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal) ->
+Darkswarm.factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration) ->
   new class OfnMap
     constructor: ->
-      @enterprises = @enterprise_markers(Enterprises.enterprises)
-      @enterprises = @enterprises.filter (enterprise) ->
-        enterprise.latitude != null || enterprise.longitude != null # Remove enterprises w/o lat or long
+      @coordinates = {}
+      @enterprises = Enterprises.enterprises.filter (enterprise) ->
+        # Remove enterprises w/o lat or long
+        enterprise.latitude != null || enterprise.longitude != null
+      @enterprises = @enterprise_markers(@enterprises)
 
     enterprise_markers: (enterprises) ->
       @extend(enterprise) for enterprise in enterprises
 
+    enterprise_hash: (hash, enterprise) ->
+      hash[enterprise.id] = { id: enterprise.id, name: enterprise.name, icon: enterprise.icon_font }
+      hash
+
+    extend_marker: (marker, enterprise) ->
+      marker.latitude = enterprise.latitude
+      marker.longitude = enterprise.longitude
+      marker.icon = enterprise.icon
+      marker.id = [enterprise.id]
+      marker.enterprises = @enterprise_hash({}, enterprise)
+
     # Adding methods to each enterprise
     extend: (enterprise) ->
-      new class MapMarker
-        # We cherry-pick attributes because GMaps tries to crawl
-        # our data, and our data is cyclic, so it breaks
-        latitude: enterprise.latitude
-        longitude: enterprise.longitude
-        icon: enterprise.icon
-        id: enterprise.id
-        reveal: =>
-          EnterpriseModal.open enterprise
+      marker = @coordinates[[enterprise.latitude, enterprise.longitude]]
+      if marker
+        marker.icon = MapConfiguration.options.cluster_icon
+        @enterprise_hash(marker.enterprises, enterprise)
+        marker.id.push(enterprise.id)
+      else
+        marker = new class MapMarker
+          # We cherry-pick attributes because GMaps tries to crawl
+          # our data, and our data is cyclic, so it breaks
+          reveal: =>
+            EnterpriseListModal.open this.enterprises
+        @extend_marker(marker, enterprise)
+        @coordinates[[enterprise.latitude, enterprise.longitude]] = marker
+      marker

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

@@ -4,6 +4,7 @@ Darkswarm.factory "MapConfiguration", ->
       center:
         latitude: -37.4713077
         longitude: 144.7851531
+      cluster_icon: 'assets/map_009-cluster.svg'
       zoom: 12
       additional_options:
         # mapTypeId: 'satellite'

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

@@ -1,6 +1,6 @@
 Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
   class OrderCycle
-    @order_cycle = orderCycleData # Object or {} due to RABL 
+    @order_cycle = orderCycleData # Object or {}
     @push_order_cycle: (callback) ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at

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

@@ -0,0 +1,7 @@
+Darkswarm.factory "StockQuantity", ->
+  new class StockQuantity
+    available_quantity: (on_hand, finalized_quantity) ->
+      on_hand = parseInt(on_hand)
+      finalized_quantity = parseInt(finalized_quantity) || 0 # finalized_quantity is optional
+
+      on_hand + finalized_quantity

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

@@ -8,4 +8,4 @@
     %hr
     %div.menu_item.text-center
       %input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
-      %input.fullwidth.red{ type: "button", value: 'Save As Default', ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }
+      %input.fullwidth.red{ type: "button", :value => t('admin.column_save_as_default').html_safe, ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }

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

@@ -0,0 +1,2 @@
+%ng-include{src: "'partials/enterprise_listing.html'"}
+%ng-include{src: "'partials/close.html'"}

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

@@ -1,4 +1,3 @@
 %ul
   %active-selector{ ng: { repeat: "selector in allSelectors", show: "ifDefined(selector.fits, true)" } }
-    %render-svg{path: "{{selector.object.icon}}", ng: { if: "selector.object.icon"} }
     %span{"ng-bind" => "::selector.object.name"}

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

@@ -20,6 +20,7 @@
           type: "email",
           id: "email",
           tabindex: 1,
+          inputmode: "email",
           "ng-model" => "spree_user.email"}
     .row
       .large-12.columns
@@ -27,3 +28,4 @@
           tabindex: "3",
           type: "submit",
           value: "{{'reset_password' | t}}"}
+

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

@@ -15,6 +15,7 @@
           type: "email",
           id: "email",
           tabindex: 1,
+          inputmode: "email",
           "ng-model" => "spree_user.email"}
     .row
       .large-12.columns
@@ -24,6 +25,7 @@
           id: "password",
           autocomplete: "off",
           tabindex: 2,
+          inputmode: "password",
           "ng-model" => "spree_user.password"}
     .row
       .large-12.columns
@@ -39,3 +41,4 @@
           tabindex: "3",
           type: "submit",
           value: "{{'label_login' | t}}"}
+

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

@@ -0,0 +1,10 @@
+.modal-list
+  .row{"ng-repeat" => "(id, enterprise) in ::enterprises"}
+    .highlight
+      .highlight-top.row.enterprise
+        .small-12.medium-12.large-12.columns
+          %h4
+            %a.heading{"ng-click" => "::openModal(enterprise)"}
+              %i{"ng-class" => "enterprise.icon"}
+              %span{"ng-bind" => "enterprise.name"}
+      %img.hero-img{"ng-src" => "{{::enterprise.promo_image}}"}

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

@@ -6,6 +6,8 @@
   min: 0,
   placeholder: "0",
   "ofn-disable-scroll" => true,
+  "ng-debounce" => "500",
+  onwheel: "this.blur()",
   "ng-model" => "variant.line_item.quantity",
   "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
   "ng-disabled" => "!variant.on_demand && variant.on_hand == 0",

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

@@ -9,6 +9,8 @@
       "ng-model" => "variant.line_item.quantity",
       placeholder: "{{::'shop_variant_quantity_min' | t}}",
       "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
       "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
       name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
     %span.bulk-input
@@ -19,6 +21,8 @@
       "ng-model" => "variant.line_item.max_quantity",
       placeholder: "{{::'shop_variant_quantity_max' | t}}",
       "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
       min: "{{variant.line_item.quantity}}",
       name: "variant_attributes[{{::variant.id}}][max_quantity]",
       id: "variants_{{::variant.id}}_max"}

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

@@ -1,2 +1,2 @@
-%button.graph-button{"ng-class" => "{open: tt_isOpen}"}
+%button.graph-button{"ng-class" => "{open: tt_isOpen}", type: 'button'}
   / %i.ofn-i_058-graph

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

@@ -14,6 +14,7 @@
           type: "email",
           id: "email",
           tabindex: 1,
+          inputmode: "email",
           "ng-model" => "spree_user.email"}
         %span.error{"ng-show" => "errors.email != null"}
           {{ errors.email.join(' ') }}
@@ -25,6 +26,7 @@
           id: "password",
           autocomplete: "off",
           tabindex: 2,
+          inputmode: "password",
           "ng-model" => "spree_user.password"}
         %span.error{"ng-show" => "errors.password != null"}
           {{ errors.password.join(' ') }}
@@ -36,6 +38,7 @@
           id: "password_confirmation",
           autocomplete: "off",
           tabindex: 2,
+          inputmode: "password",
           "ng-model" => "spree_user.password_confirmation"}
     .row
       .large-12.columns
@@ -43,3 +46,4 @@
           tabindex: "3",
           type: "submit",
           value: "{{'action_signup' | t}}"}
+

app/assets/stylesheets/admin/order_cycles.scss

@@ -1,5 +1,9 @@
 @import "variables";
 
+form.order_cycle {
+  margin-bottom: 5em;
+}
+
 #schedule-dialog {
   table {
     border: none;

app/assets/stylesheets/darkswarm/_shop-filters.css.scss

@@ -2,6 +2,7 @@
 @import "branding";
 @import "big-input";
 @import "animations";
+@import "variables";
 
 @mixin filter-selector($base-clr, $border-clr, $hover-clr) {
   &.inline-block, ul.inline-block {
@@ -14,7 +15,7 @@
     @include border-radius(0);
 
     padding: 0;
-    margin: 0 0 0.25rem 0.25rem;
+    margin: 0 0.5rem 0.5rem 0;
 
     &:hover, &:focus {
       background: transparent;
@@ -107,26 +108,63 @@
 // Alert when search, taxon, filter is triggered
 
 .alert-box.search-alert {
-  background-color: $clr-yellow-light;
-  border-color: $clr-yellow-light;
+  background-color: $white;
   color: #777;
-  font-size: 0.75rem;
-  padding: 0.5rem 0.75rem;
+  font-size: 1em;
+  padding: 0.35em 0 0;
+  border: 0;
+  margin: 0;
 
-  span.applied-properties {
-    color: #333;
+  .clear-all {
+    color: $grey-500;
+    margin-left: 1.5em;
+
+    &:hover {
+      color: $grey-600;
+    }
   }
 
-  span.applied-taxons {
-    color: $clr-blue;
+  .no-results-bar {
+    @include breakpoint(desktop) {
+      text-align: center;
+    }
   }
 
-  span.applied-search {
-    color: $clr-brick;
+  .no-results {
+    color: $grey-800;
+    font-style: italic;
+    font-size: 1.25em;
   }
 
-  span.filter-label {
-    opacity: 0.75;
+  .clear-search {
+    background-color: transparent;
+    padding: 0;
+    margin: 0;
+    color: $orange-500;
+    font-size: 1.25em;
+
+    &:hover {
+      color: $orange-400;
+    }
+  }
+
+  span {
+    color: $grey-800;
+    font-style: italic;
+
+    &.applied-taxons, &.applied-properties {
+      color: $clr-blue;
+      font-weight: bold;
+
+      .join-word {
+        font-weight: normal;
+      }
+    }
+
+    &.applied-search {
+      font-weight: bold;
+      color: $teal-500;
+    }
   }
 }
 
@@ -140,25 +178,6 @@
 .filter-shopfront {
   &.taxon-selectors, &.property-selectors {
     background: transparent;
-
-    single-line-selectors {
-      overflow-x: hidden;
-      white-space: nowrap;
-
-      .f-dropdown {
-        overflow-x: auto;
-        white-space: normal;
-      }
-    }
-
-    ul {
-      margin: 0;
-      display: inline-block;
-    }
-
-    ul, ul li {
-      list-style: none;
-    }
   }
 
   // Shopfront taxons
@@ -170,4 +189,8 @@
   &.property-selectors {
     @include filter-selector(#666, #ccc, #777);
   }
+
+  ul {
+    margin: 0;
+  }
 }

app/assets/stylesheets/darkswarm/_shop-inputs.css.scss

@@ -7,10 +7,6 @@
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
 
-  input#search {
-    @include medium-input(rgba(0, 0, 0, 0.3), #777, $clr-brick);
-  }
-
   // ordering
   product {
     input {
@@ -27,22 +23,22 @@
       border-color: #b3b3b3;
       text-align: right;
 
-      @media all and (max-width: 1024px) {
+      @include breakpoint(desktop) {
         width: 8rem;
       }
 
-      @media all and (max-width: 768px) {
+      @include breakpoint(tablet) {
         width: 7rem;
       }
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         float: left !important;
         font-size: 0.75rem;
         padding-left: 0.25rem;
         padding-right: 0.25rem;
       }
 
-      @media all and (max-width: 480px) {
+      @include breakpoint(mobile) {
         width: 5.8rem;
       }
 
@@ -66,15 +62,15 @@
     input.bulk {
       width: 5rem;
 
-      @media all and (max-width: 1024px) {
+      @include breakpoint(desktop) {
         width: 4rem;
       }
 
-      @media all and (max-width: 768px) {
+      @include breakpoint(tablet) {
         width: 3.5rem;
       }
 
-      @media all and (max-width: 480px) {
+      @include breakpoint(mobile) {
         width: 2.8rem;
       }
     }
@@ -90,7 +86,7 @@
     .bulk-input-container {
       float: right;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         float: left !important;
       }
 

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

@@ -1,11 +1,13 @@
+@import "mixins";
 @import "typography";
+@import "variables";
 
 ordercycle {
   float: right;
   background: $grey-050;
   color: $grey-800;
   width: 100%;
-  border-radius: 0.5em 0.5em 0 0;
+  border-radius: $radius-medium $radius-medium 0 0;
   margin-top: 1em;
   padding: 1em 1.25em 0;
 
@@ -17,7 +19,7 @@ ordercycle {
     margin-right: 0.3rem;
   }
 
-  @media all and (max-width: 1024px) {
+  @include breakpoint(desktop) {
     float: none;
     padding: 0.5em 1em;
     width: 100%;
@@ -33,7 +35,7 @@ ordercycle {
     }
   }
 
-  @media all and (max-width: 480px) {
+  @include breakpoint(mobile) {
     padding: 0.5em 1em 0.75em;
   }
 
@@ -41,15 +43,15 @@ ordercycle {
     border: 1px solid $teal-300;
     display: inline-block;
     font-size: 1em;
-    border-radius: 0.25em;
+    border-radius: $radius-small;
 
     .select-label {
       background-color: rgba($teal-300, 0.5);
       display: inline-block;
-      border-radius: 0.25em 0 0 0.25em;
+      border-radius: $radius-small 0 0 $radius-small;
       float: left;
       font-size: 1em;
-      line-height: 1.5em;
+      line-height: 1.3em;
       padding: 0.5em 0.75em;
       height: 2.35em;
 
@@ -60,6 +62,15 @@ ordercycle {
     }
 
     select {
+      background-image: url('/assets/white-caret.svg');
+    }
+
+    p {
+      text-align: left;
+    }
+
+    select,
+    p {
       width: inherit;
       display: inline-block;
       color: $white;
@@ -67,29 +78,34 @@ ordercycle {
       border: 0;
       margin-bottom: 0;
       font-size: 1em;
-      line-height: 1.5em;
+      line-height: 1.3em;
       padding: 0.5em 1.25em 0.5em 0.75em;
       height: 2.35em;
-      background-image: url('/assets/white-caret.svg');
       background-size: 30px auto;
-      border-radius: 0 0.25em 0.25em 0;
+      border-radius: 0 $radius-small $radius-small 0;
       min-width: 13em;
 
-      @media all and (max-width: 480px) {
+      @include breakpoint(mobile) {
         width: 100%;
+        min-width: 0;
       }
     }
 
-    @media all and (max-width: 1024px) {
+    option {
+      color: $grey-700;
+    }
+
+    @include breakpoint(desktop) {
       float: none;
       margin-right: 1em;
     }
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       float: none;
+      margin-right: 0;
     }
 
-    @media all and (max-width: 480px) {
+    @include breakpoint(mobile) {
       display: flex;
     }
   }
@@ -102,7 +118,7 @@ ordercycle {
     padding: 0.5em 0;
 
     span {
-      @media all and (max-width: 768px) {
+      @include breakpoint(tablet) {
         font-size: 0.875em;
       }
     }
@@ -136,7 +152,7 @@ shop ordercycle {
     color: $white;
     padding: 0 0 12px;
 
-    @media all and (max-width: 1024px) {
+    @include breakpoint(desktop) {
       float: none;
       display: inline-block;
       padding: 0.2em 0 0;
@@ -144,7 +160,7 @@ shop ordercycle {
       margin-right: 1em;
     }
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       float: none;
       padding: 0 0 10px;
     }

app/assets/stylesheets/darkswarm/_shop-popovers.css.scss

@@ -114,7 +114,7 @@ button.graph-button {
     }
   }
 
-  @media all and (max-width: 768px) {
+  @include breakpoint(tablet) {
     // Hide for small
     display: none;
   }

app/assets/stylesheets/darkswarm/_shop-product-rows.css.scss

@@ -1,3 +1,4 @@
+@import "mixins";
 @import "branding";
 @import "animations";
 
@@ -14,11 +15,11 @@
 
           // outline: 1px solid red
 
-          @media all and (max-width: 768px) {
+          @include breakpoint(tablet) {
             font-size: 0.875rem;
           }
 
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             font-size: 0.75rem;
           }
         }
@@ -56,13 +57,13 @@
         .variant-name {
           padding-left: 7.9375rem;
 
-          @media all and (max-width: 768px) {
+          @include breakpoint(tablet) {
             padding-left: 4.9375rem;
           }
         }
 
         .variant-name {
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             background: #333;
             color: white;
             padding-left: 0.9375rem;
@@ -82,7 +83,7 @@
           font-size: 0.875rem;
           overflow: hidden;
 
-          @media all and (max-width: 768px) {
+          @include breakpoint(tablet) {
             font-size: 0.75rem;
           }
         }
@@ -92,7 +93,7 @@
           padding-left: 0.25rem;
           padding-right: 0.25rem;
 
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             text-align: right;
           }
         }
@@ -106,7 +107,7 @@
             color: $med-drk-grey;
           }
 
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             background: #777;
             color: $disabled-med;
 
@@ -132,7 +133,7 @@
           padding-bottom: 1em;
           line-height: 1;
 
-          @media all and (max-width: 768px) {
+          @include breakpoint(tablet) {
             padding-top: 0.65rem;
             padding-bottom: 0.65rem;
           }
@@ -141,11 +142,11 @@
         .summary-header {
           padding-left: 7.9375rem;
 
-          @media all and (max-width: 768px) {
+          @include breakpoint(tablet) {
             padding-left: 4.9375rem;
           }
 
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             padding-left: 0.9375rem;
           }
 

app/assets/stylesheets/darkswarm/_shop-product-thumb.css.scss

@@ -1,3 +1,4 @@
+@import "mixins";
 @import "branding";
 @import "animations";
 
@@ -56,7 +57,7 @@
           }
         }
 
-        @media all and (max-width: 768px) {
+        @include breakpoint(tablet) {
           top: 2px;
           width: 4rem;
           height: 4rem;
@@ -70,7 +71,7 @@
           }
         }
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           display: none;
           width: 0rem;
           height: 0rem;

app/assets/stylesheets/darkswarm/_shop-taxon-flag.css.scss

@@ -1,3 +1,5 @@
+@import "mixins";
+
 .darkswarm {
   products {
     product {
@@ -10,7 +12,7 @@
         padding-top: 0.25rem;
         z-index: 999999;
 
-        @media all and (max-width: 480px) {
+        @include breakpoint(mobile) {
           background-size: 28px 32px;
           min-height: 32px;
           width: 28px;
@@ -27,11 +29,11 @@
           }
         }
 
-        @media all and (max-width: 768px) {
+        @include breakpoint(tablet) {
           margin-top: -0.85rem;
         }
 
-        @media all and (max-width: 480px) {
+        @include breakpoint(mobile) {
           render-svg {
             svg {
               width: 18px;

app/assets/stylesheets/darkswarm/account.css.scss

@@ -1,5 +1,6 @@
 @import "branding";
 @import "mixins";
+@import "variables";
 
 .account-summary {
   color: #4a4a4a;
@@ -99,7 +100,7 @@
 
   table {
     width: 100%;
-    border-radius: 0.5em 0.5em 0 0;
+    border-radius: $radius-medium $radius-medium 0 0;
 
     tr:nth-of-type(even) {
       background: transparent;

app/assets/stylesheets/darkswarm/active_table.css.scss

@@ -26,7 +26,7 @@
   display: block;
   border: 0;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     margin-bottom: 1rem;
   }
 
@@ -45,7 +45,7 @@
   }
 
   // Generic text resize
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     &, & * {
       font-size: 0.875rem;
     }
@@ -114,7 +114,7 @@
     .fat > div {
       border-top: 1px solid #aaa;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         margin-top: 1em;
       }
 

app/assets/stylesheets/darkswarm/active_table_search.css.scss

@@ -16,7 +16,7 @@
 
   margin-top: 2px;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     margin-bottom: 1em;
   }
 }
@@ -158,7 +158,7 @@ products .filter-box {
 
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
 
-  input[type="text"] {
+  input[type="text"], input[type="search"] {
     @include big-input(rgba(0, 0, 0, 0.3), #777, $clr-brick);
   }
 }

app/assets/stylesheets/darkswarm/big-input.scss

@@ -23,7 +23,7 @@
   box-shadow: none;
   color: $inputactv;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     font-size: 1.25rem;
   }
 

app/assets/stylesheets/darkswarm/branding.css.scss

@@ -38,14 +38,18 @@ $med-drk-grey: #444;
 $dark-grey: #333;
 $light-grey: #ddd;
 $light-grey-transparency: rgba(0, 0, 0, .1);
+$very-light-grey-transparency: rgba(0, 0, 0, .05);
 $black: #000;
 $white: #fff;
 
 $grey-050: #f7f7f7;
-
+$grey-100: #e6e6e6;
+$grey-200: #ddd;
+$grey-300: #ccc;
 $grey-400: #bbb;
 $grey-500: #999;
 $grey-600: #777;
+$grey-650: #666;
 $grey-700: #555;
 $grey-800: #333;
 
@@ -54,6 +58,7 @@ $teal-400: #4cb5c5;
 $teal-500: #0096ad;
 
 $orange-400: #ff9466;
+$orange-450: #f4704c;
 $orange-500: #f27052;
 $orange-600: #d7583a;
 

app/assets/stylesheets/darkswarm/checkout.css.scss

@@ -13,7 +13,7 @@
 checkout {
   display: block;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     &.row .row {
       margin-left: 0;
       margin-right: 0;
@@ -24,7 +24,7 @@ checkout {
     .button, table {
       width: 100%;
     }
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       form.edit_order {
         border: 1px solid $disabled-bright;
         margin-bottom: 2rem;

app/assets/stylesheets/darkswarm/distributor_header.css.scss

@@ -1,3 +1,4 @@
+@import "mixins";
 @import 'typography';
 
 section {
@@ -34,7 +35,7 @@ section {
       @include headingFont;
     }
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       location, location + small {
         display: block;
       }
@@ -44,7 +45,7 @@ section {
       margin-top: 0;
       padding-top: 0.45em;
 
-      @media all and (max-width: 768px) {
+      @include breakpoint(tablet) {
         margin-bottom: 8px;
       }
     }

app/assets/stylesheets/darkswarm/embedded_shopfront.css.scss

@@ -1,3 +1,4 @@
+@import "mixins";
 @import "typography";
 
 $large-menu-height: 4.6875rem;
@@ -97,7 +98,7 @@ body.embedded {
     display: none;
   }
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     nav.top-bar {
       height: 3.4rem;
       padding: 0.2rem $gutter-width;
@@ -141,7 +142,7 @@ body.embedded {
     }
   }
 
-  @media all and (max-width: 480px) {
+  @include breakpoint(mobile) {
     ul.left li.powered-by span {
       display: none;
     }

app/assets/stylesheets/darkswarm/home_panes.css.scss

@@ -66,7 +66,7 @@
       font-weight: 300;
     }
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       h2 {
         font-size: 52px;
       }
@@ -87,7 +87,7 @@
     padding-bottom: 0;
   }
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     .row .row {
       padding: 0;
     }
@@ -139,7 +139,7 @@
     font-weight: 300;
     color: $brand-colour;
 
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       font-size: 45px;
     }
   }

app/assets/stylesheets/darkswarm/hub_node.css.scss

@@ -45,7 +45,7 @@
     }
 
     //Hub Link
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       a.hub {
         display: block;
       }
@@ -67,7 +67,7 @@
       .active_table_row {
         border: 1px solid transparent;
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           border-color: $clr-brick-light;
         }
 
@@ -85,7 +85,7 @@
     }
 
     &.open, &.closed {
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         .active_table_row:first-child .skinny-head {
           background-color: $clr-brick-light;
 
@@ -164,7 +164,7 @@
           }
         }
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           .active_table_row:first-child .skinny-head {
             background-color: rgba(255, 255, 255, 0.85);
           }
@@ -218,7 +218,7 @@
           }
 
           // Small devices
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             .active_table_row:first-child .skinny-head {
               background-color: $disabled-bright;
             }
@@ -226,7 +226,7 @@
         }
 
         // Small devices
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           .active_table_row, .active_table_row:first-child, .active_table_row:last-child {
             border-color: $disabled-bright;
             background-color: transparent;
@@ -253,7 +253,7 @@
             cursor: auto;
           }
 
-          @media all and (max-width: 640px) {
+          @include breakpoint(phablet) {
             border-color: transparent;
           }
         }

app/assets/stylesheets/darkswarm/images.css.scss

@@ -13,7 +13,7 @@
   &.placeholder {
     opacity: 0.35;
 
-    @media all and (max-width: 1024px) {
+    @include breakpoint(desktop) {
       display: none;
     }
   }
@@ -31,7 +31,7 @@
   max-height: 260px;
   overflow: hidden;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     min-height: 68px;
   }
 }

app/assets/stylesheets/darkswarm/map.css.scss

@@ -1,6 +1,7 @@
 // Place all the styles related to the map controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+@import "mixins";
 @import "big-input";
 
 .map-container {
@@ -29,7 +30,7 @@
     margin-top: 1.2rem;
     margin-left: 1rem;
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       width: 80%;
     }
 
@@ -62,3 +63,8 @@
     left: 0px;
   }
 }
+
+.tabs-content .map-footer {
+  position: relative;
+  bottom: 30px;
+}

app/assets/stylesheets/darkswarm/menu.css.scss

@@ -171,7 +171,7 @@ nav.top-bar {
 .tab-bar {
   background-color: white;
   border-bottom: 1px solid $light-grey-transparency;
-  height: 2.8em;
+  height: $mobile-nav-height;
   position: fixed;
   width: 100%;
   z-index: 1;
@@ -210,6 +210,10 @@ nav.top-bar {
   }
 }
 
+.off-canvas-wrap {
+  overflow: inherit;
+}
+
 .off-canvas-list li.language-switcher ul li {
   list-style-type: none;
   padding-left: 0.5em;

app/assets/stylesheets/darkswarm/mixins.scss

@@ -16,7 +16,7 @@
   padding-top: 100px;
   padding-bottom: 100px;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     padding-top: 25px;
   }
 }
@@ -255,3 +255,18 @@
   background-repeat: no-repeat;
   background-size: 922px 922px;
 }
+
+@mixin breakpoint($point) {
+  @if $point == desktop {
+    @media all and (max-width: 1024px) { @content; }
+  }
+  @else if $point == tablet {
+    @media all and (max-width: 768px) { @content; }
+  }
+  @else if $point == phablet {
+    @media all and (max-width: 640px)  { @content; }
+  }
+  @else if $point == mobile {
+    @media all and (max-width: 480px)  { @content; }
+  }
+}

app/assets/stylesheets/darkswarm/modal-enterprises.css.scss

@@ -1,5 +1,6 @@
-@import "branding";
-@import "mixins";
+@import 'branding';
+@import 'mixins';
+@import 'admin/globals/variables';
 
 // Generic styles for use
 
@@ -22,6 +23,24 @@
   margin-bottom: 0.5rem;
 }
 
+.modal-list {
+  text-align: center;
+  font-size: 1rem;
+  font-weight: 400;
+  border-bottom: 1px solid $light-grey;
+  margin-top: 0.75rem;
+  margin-bottom: 0.5rem;
+
+  a.heading {
+    color: $color-link;
+
+    &:hover {
+      color: $color-link-hover;
+      text-decoration: underline;
+    }
+  }
+}
+
 // Enterprise promo image and text
 
 .highlight {
@@ -54,10 +73,16 @@
     color: $clr-brick;
   }
 
+  &.enterprise {
+    margin: auto;
+    text-align: center;
+    width: 100%;
+  }
+
   p {
     line-height: 2.4;
 
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       line-height: 1.4;
     }
   }
@@ -193,7 +218,7 @@
       display: inline-block;
       border-bottom: 1px solid transparent;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         display: none;
       }
     }

app/assets/stylesheets/darkswarm/page_alert.css.scss

@@ -1,3 +1,4 @@
+@import "mixins";
 @import "branding";
 @import "animations";
 @import "compass/css3/transition";
@@ -19,7 +20,7 @@ $page-alert-height: 55px;
     margin: 0;
 
     h6 {
-      @media all and (max-width: 480px) {
+      @include breakpoint(mobile) {
         font-size: 10px;
         line-height: 24px;
       }

app/assets/stylesheets/darkswarm/producer_node.css.scss

@@ -4,7 +4,7 @@
 .producers {
   .active_table .active_table_node {
     // Header row
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       .skinny-head {
         background-color: $clr-turquoise-light;
 
@@ -137,7 +137,7 @@
       .active_table_row.closed {
         border: 1px solid transparent;
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           border-color: $clr-turquoise-light;
         }
 

app/assets/stylesheets/darkswarm/shop.css.scss

@@ -11,18 +11,98 @@
 @import "shop-taxon-flag";
 @import "shop-popovers";
 
+$sidebar-small-width: 75%;
+$sidebar-medium-width: 65%;
+$sidebar-large-width: 45%;
+$sidebar-footer-height: 5em;
+
 .darkswarm {
+  .shop-filters-sidebar {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    .background {
+      position: fixed;
+      top: 0;
+      right: 0;
+      z-index: 200;
+      height: 100%;
+      width: 100%;
+      background-color: $shop-sidebar-overlay;
+      opacity: 0;
+      transition: opacity $transition-sidebar;
+    }
+
+    &.shown {
+      .background {
+        opacity: 1;
+      }
+
+      .sidebar, .sidebar-footer {
+        margin-right: 0;
+      }
+    }
+
+    .sidebar {
+      position: fixed;
+      top: 0;
+      right: 0;
+      z-index: 210;
+      height: 100%;
+      width: $sidebar-large-width;
+      margin-right: -$sidebar-large-width;
+      background-color: rgba($white, 0.95);
+      padding: 1em;
+      transition: margin $transition-sidebar;
+      overflow-y: scroll;
+
+      .property-selectors {
+        margin-bottom: $sidebar-footer-height + 2em;
+      }
+    }
+
+    .sidebar-footer {
+      background-color: $grey-800;
+      width: $sidebar-large-width;
+      margin-right: -$sidebar-large-width;
+      height: $sidebar-footer-height;
+      position: fixed;
+      bottom: 0;
+      right: 0;
+      transition: margin $transition-sidebar;
+      padding: 1em;
+
+      button {
+        width: 48%;
+      }
+    }
+
+    @include breakpoint(tablet) {
+      .sidebar, .sidebar-footer {
+        width: $sidebar-medium-width;
+        margin-right: -$sidebar-medium-width;
+      }
+    }
+
+    @include breakpoint(mobile) {
+      .sidebar, .sidebar-footer {
+        width: $sidebar-small-width;
+        margin-right: -$sidebar-small-width;
+      }
+    }
+  }
+
   products {
     display: block;
-    padding-top: 20px;
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       input.button.right {
         float: left;
       }
     }
 
-    @media all and (max-width: 480px) {
+    @include breakpoint(mobile) {
       .add_to_cart {
         margin-top: 2rem;
       }
@@ -69,7 +149,7 @@
       .bulk-buy {
         font-size: 0.875rem;
 
-        @media all and (max-width: 768px) {
+        @include breakpoint(tablet) {
           font-size: 0.75rem;
         }
       }
@@ -92,7 +172,7 @@
         font-size: 0.75em;
         padding-right: 0.9375rem;
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           padding-right: 0.25rem;
         }
       }
@@ -114,7 +194,16 @@
     margin-bottom: 0px;
   }
 
-  .shopfront-message {
+  .select-oc-message {
+    margin-top: 1rem;
+
+    .highlighted {
+      color: $red-700;
+      font-weight: bold;
+    }
+  }
+
+  .open-shop-message {
     a {
       color: #0096ad;
 
@@ -125,21 +214,44 @@
     }
   }
 
-  .shopfront_closed_message, .shopfront_hidden_message {
-    padding: 15px;
-    border-radius: 5px;
+  .closed-shop-header {
+    background-color: $grey-650;
+    color: $white;
+
+    h4 {
+      color: $white;
+    }
+
+    p {
+      margin: 1rem 0 0.4rem;
+    }
+
+    .message {
+      display: inline-block;
+    }
   }
 
-  .shopfront_closed_message {
-    border: 2px solid #eb4c46;
-  }
+  .warning-sign {
+    margin: 0 10px 0 5px;
+    display: inline-block;
 
-  .shopfront_closed_message {
-    margin: 2em 0em;
-  }
+    strong {
+      color: $grey-650;
+      display: block;
+      position: relative;
+      text-align: center;
+      width: 23px;
+    }
 
-  .shopfront_hidden_message {
-    border: 2px solid #db4;
-    margin: 2em 0em;
+    .rectangle {
+      background-color: $white;
+      border-radius: 4px;
+      color: $grey-650;
+      height: 23px;
+      position: absolute;
+      top: 27px;
+      transform: rotate(-315deg);
+      width: 23px;
+    }
   }
 }

app/assets/stylesheets/darkswarm/shop_search.css.scss

@@ -0,0 +1,75 @@
+@import "mixins";
+@import "branding";
+@import "variables";
+
+.shop-searchbar {
+  background-color: $grey-100;
+  height: 5em;
+  padding: 1em 0;
+  margin-bottom: 1em;
+  position: relative;
+  z-index: 5;
+
+  .search-wrap {
+    position: relative;
+    width: 100%;
+    display: inline-flex;
+
+    .clear {
+      height: 1em;
+      width: 1em;
+      margin-top: 1em;
+      position: absolute;
+      right: 1em;
+    }
+  }
+
+  input#search {
+    height: 3em;
+    border-radius: $radius-small;
+    border: solid 1px $grey-300;
+    margin: 0;
+    padding: 0 2.25em 0 2.75em;
+    width: 100%;
+    min-width: 0;
+    background: $white url("/assets/icn-search-grey.png") 1em center no-repeat;
+    font-size: 1rem; // avoid zoom on iphone, see issue #4535
+
+    &::placeholder {
+      font-style: italic;
+    }
+
+    // Remove conflicting "clear search" buttons added by Chrome
+    &::-webkit-search-decoration,
+    &::-webkit-search-cancel-button,
+    &::-webkit-search-results-button,
+    &::-webkit-search-results-decoration {
+      display: none;
+    }
+  }
+
+  button {
+    background-color: $grey-600;
+    margin-left: 1em;
+    height: 3em;
+    width: 7em;
+    padding: 0;
+    font-size: 1em;
+    border-radius: $radius-small;
+    transition: none;
+
+    &:hover {
+      background-color: $grey-700;
+    }
+
+    @include breakpoint(mobile) {
+      margin-left: 0.75em;
+    }
+  }
+
+  @include breakpoint(desktop) {
+    position: -webkit-sticky;
+    position: sticky;
+    top: $mobile-nav-height;
+  }
+}

app/assets/stylesheets/darkswarm/shop_tabs.css.scss

@@ -8,16 +8,17 @@
   .tab-buttons {
     color: $dark-grey;
     box-shadow: $distributor-header-shadow;
+    position: relative;
 
     .columns {
       display: flex;
 
-      @media all and (max-width: 1024px) {
+      @include breakpoint(desktop) {
         display: table;
         width: 100%;
       }
 
-      @media all and (max-width: 480px) {
+      @include breakpoint(mobile) {
         padding: 0;
       }
     }
@@ -54,7 +55,7 @@
         background: none;
       }
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         padding: 0.35em 0 0.65em 0;
       }
     }
@@ -67,7 +68,7 @@
       }
     }
 
-    @media all and (max-width: 1024px) {
+    @include breakpoint(desktop) {
       display: table-cell;
       width: auto;
     }
@@ -76,9 +77,9 @@
   // content revealed in accordion
 
   .page-view {
-    margin-bottom: 5em;
     background: none;
     border: none;
+    padding-bottom: 5em;
 
     .content {
       padding: 1.25em 0;
@@ -104,7 +105,7 @@
       p {
         max-width: 100%;
 
-        @media all and (max-width: 768px) {
+        @include breakpoint(tablet) {
           height: auto !important;
         }
       }
@@ -121,5 +122,13 @@
         margin-bottom: 2px;
       }
     }
+
+    &.with-darker-background {
+      background-color: $very-light-grey-transparency;
+
+      a {
+        color: $teal-500;
+      }
+    }
   }
 }

app/assets/stylesheets/darkswarm/shopping-cart.css.scss

@@ -72,6 +72,12 @@
 }
 
 // Shopping cart
+#update-cart {
+  #errorExplanation {
+    display: none;
+  }
+}
+
 #cart-detail {
   .cart-item-delete, .bought-item-delete {
     a {
@@ -102,6 +108,12 @@
       float: right;
     }
   }
+
+  input {
+    &.ng-invalid-stock, &.ng-invalid-number {
+      border: 1px solid $clr-brick;
+    }
+  }
 }
 
 .item-thumb-image {
@@ -115,3 +127,14 @@
     height: 36px;
   }
 }
+
+.links {
+  .button {
+    padding: 1.125rem 0 1.1875rem;
+    width: 210px;
+
+    @media all and (max-width: 480px) {
+      width: 100%;
+    }
+  }
+}

app/assets/stylesheets/darkswarm/tabset.css.scss

@@ -10,7 +10,7 @@
   .tab {
     text-align: center;
 
-    @media all and (max-width: 640px) {
+    @include breakpoint(phablet) {
       text-align: left;
     }
 
@@ -24,7 +24,7 @@
       padding: 1em;
       border: none;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         padding: 0.35em 0 0.65em 0;
         text-shadow: none;
       }
@@ -37,7 +37,7 @@
       border-bottom: 4px solid $clr-brick-bright;
       cursor: pointer;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         transition: none;
         color: white;
         background-color: $clr-brick-bright;
@@ -46,7 +46,7 @@
       a {
         color: $clr-brick-bright;
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           color: #ffffff;
         }
       }
@@ -55,14 +55,14 @@
     &.selected {
       border-bottom: 4px solid $clr-brick;
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         background-color: $clr-brick;
       }
 
       a {
         color: $clr-brick;
 
-        @media all and (max-width: 640px) {
+        @include breakpoint(phablet) {
           color: #ffffff;
         }
       }

app/assets/stylesheets/darkswarm/taxons.css.scss

@@ -57,7 +57,7 @@
     }
   }
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     render-svg {
       svg {
         width: 24px;

app/assets/stylesheets/darkswarm/ui.css.scss

@@ -2,6 +2,7 @@
 @import "branding";
 @import "mixins";
 @import "typography";
+@import "variables";
 
 // Button class extensions
 
@@ -64,13 +65,13 @@
 
 .button.primary, button.primary {
   font-family: $body-font;
-  background: $clr-brick;
+  background: $orange-450;
   color: white;
 }
 
 .button.primary:hover, .button.primary:active, .button.primary:focus, button.primary:hover, button.primary:active, button.primary:focus {
-  background: $clr-brick-bright;
-  text-shadow: 0 1px 0 $clr-brick;
+  background: $orange-400;
+  text-shadow: 0 1px 0 $orange-450;
 }
 
 button.success, .button.success {
@@ -123,9 +124,37 @@ button.success, .button.success {
   }
 }
 
+button.large {
+  height: 3em;
+  font-size: 1em;
+  color: $white;
+  border-radius: $radius-medium;
+  margin: 0;
+  padding: 0;
+
+  &.dark {
+    background-color: $grey-800;
+    border: 1px solid $grey-600;
+  }
+
+  &.bright {
+    background-color: $orange-500;
+    border: none;
+  }
+}
+
 // Responsive
 @media screen and (min-width: 768px) {
   [role="main"] {
     padding: 0;
   }
 }
+
+.flex {
+  display: flex;
+}
+
+.no-gutter {
+  padding-right: 0;
+  padding-left: 0;
+}

app/assets/stylesheets/darkswarm/variables.css.scss

@@ -30,3 +30,11 @@ $topbar-dropdown-link-color: $black;
 $topbar-dropdown-bg: $white;
 $topbar-dropdown-link-bg: $white;
 $topbar-dropdown-link-bg-hover: $white;
+
+$mobile-nav-height: 2.8em;
+
+$radius-small: 0.25em;
+$radius-medium: 0.5em;
+
+$shop-sidebar-overlay: rgba(0, 0, 0, 0.5);
+$transition-sidebar: 250ms ease-in-out 0s;

app/assets/stylesheets/mail/email.css.scss

@@ -68,6 +68,10 @@ table.social {
     background-color: white !important;
     border: 1px solid #ebebeb;
   }
+
+  &.fullwidth {
+    width: 100%;
+  }
 }
 
 table.order-summary {
@@ -138,6 +142,10 @@ a {
   &.ms {
     background-color: #000 !important;
   }
+
+  &.ig {
+    background-color: #fb3958 !important;
+  }
 }
 
 .sidebar .soc-btn {

app/controllers/admin/customers_controller.rb

@@ -17,8 +17,9 @@ module Admin
       respond_to do |format|
         format.html
         format.json do
-          tag_rule_mapping = TagRule.mapping_for(Enterprise.where(id: params[:enterprise_id]))
-          render_as_json @collection, tag_rule_mapping: tag_rule_mapping
+          render_as_json @collection,
+                         tag_rule_mapping: tag_rule_mapping,
+                         customer_tags: customer_tags_by_id
         end
       end
     end
@@ -64,8 +65,13 @@ module Admin
     def collection
       return Customer.where("1=0") unless json_request? && params[:enterprise_id].present?
 
-      enterprise = Enterprise.managed_by(spree_current_user).find_by_id(params[:enterprise_id])
-      Customer.of(enterprise)
+      Customer.of(managed_enterprise_id).
+        includes(:bill_address, :ship_address, user: :credit_cards)
+    end
+
+    def managed_enterprise_id
+      @managed_enterprise_id ||= Enterprise.managed_by(spree_current_user).
+        select('enterprises.id').find_by_id(params[:enterprise_id])
     end
 
     def load_managed_shops
@@ -80,5 +86,28 @@ module Admin
     def ams_prefix_whitelist
       [:subscription]
     end
+
+    def tag_rule_mapping
+      TagRule.mapping_for(Enterprise.where(id: managed_enterprise_id))
+    end
+
+    # Fetches tags for all customers of the enterprise and returns a hash indexed by customer_id
+    def customer_tags_by_id
+      customer_tags = ::ActsAsTaggableOn::Tag.
+        joins(:taggings).
+        includes(:taggings).
+        where(taggings:
+                { taggable_type: 'Customer',
+                  taggable_id: Customer.of(managed_enterprise_id),
+                  context: 'tags' })
+
+      customer_tags.each_with_object({}) do |tag, indexed_hash|
+        tag.taggings.each do |tagging|
+          customer_id = tagging.taggable_id
+          indexed_hash[customer_id] ||= []
+          indexed_hash[customer_id] << tag.name
+        end
+      end
+    end
   end
 end

app/controllers/admin/enterprise_relationships_controller.rb

@@ -1,9 +1,13 @@
 module Admin
   class EnterpriseRelationshipsController < ResourceController
     def index
-      @my_enterprises = Enterprise.managed_by(spree_current_user).by_name
-      @all_enterprises = Enterprise.by_name
-      @enterprise_relationships = EnterpriseRelationship.by_name.involving_enterprises @my_enterprises
+      @my_enterprises = Enterprise.
+        includes(:shipping_methods, :payment_methods).
+        managed_by(spree_current_user).by_name
+      @all_enterprises = Enterprise.includes(:shipping_methods, :payment_methods).by_name
+      @enterprise_relationships = EnterpriseRelationship.
+        includes(:parent, :child).
+        by_name.involving_enterprises @my_enterprises
     end
 
     def create

app/controllers/admin/order_cycles_controller.rb

@@ -145,7 +145,7 @@ module Admin
         preload(:schedules).
         ransack(params[:q]).
         result.
-        accessible_by(spree_current_user)
+        visible_by(spree_current_user)
     end
 
     def load_data_for_index

app/controllers/api/order_cycles_controller.rb

@@ -1,11 +1,18 @@
 module Api
   class OrderCyclesController < Api::BaseController
     include EnterprisesHelper
-    respond_to :json
+    include ApiActionCaching
 
     skip_authorization_check
+    skip_before_filter :authenticate_user, :ensure_api_key, only: [:taxons, :properties]
+
+    caches_action :taxons, :properties,
+                  expires_in: CacheService::FILTERS_EXPIRY,
+                  cache_path: proc { |controller| controller.request.url }
 
     def products
+      return render_no_products unless order_cycle.open?
+
       products = ProductsRenderer.new(
         distributor,
         order_cycle,
@@ -15,7 +22,7 @@ module Api
 
       render json: products
     rescue ProductsRenderer::NoProducts
-      render status: :not_found, json: ''
+      render_no_products
     end
 
     def taxons
@@ -35,6 +42,10 @@ module Api
 
     private
 
+    def render_no_products
+      render status: :not_found, json: ''
+    end
+
     def product_properties
       Spree::Property.
         joins(:products).
@@ -70,11 +81,11 @@ module Api
     end
 
     def distributor
-      Enterprise.find_by_id(params[:distributor])
+      @distributor ||= Enterprise.find_by_id(params[:distributor])
     end
 
     def order_cycle
-      OrderCycle.find_by_id(params[:id])
+      @order_cycle ||= OrderCycle.find_by_id(params[:id])
     end
 
     def customer

app/controllers/base_controller.rb

@@ -14,10 +14,6 @@ class BaseController < ApplicationController
 
   helper 'spree/base'
 
-  # Spree::Core::ControllerHelpers declares helper_method get_taxonomies, so we need to
-  # include Spree::ProductsHelper so that method is available on the controller
-  include Spree::ProductsHelper
-
   before_filter :set_locale
   before_filter :check_order_cycle_expiry
 

app/controllers/cart_controller.rb

@@ -4,24 +4,24 @@ class CartController < BaseController
   before_filter :check_authorization
 
   def populate
+    order = current_order(true)
+
     # Without intervention, the Spree::Adjustment#update_adjustable callback is called many times
     # during cart population, for both taxation and enterprise fees. This operation triggers a
     # costly Spree::Order#update!, which only needs to be run once. We avoid this by disabling
     # callbacks on Spree::Adjustment and then manually invoke Spree::Order#update! on success.
     Spree::Adjustment.without_callbacks do
-      cart_service = CartService.new(current_order(true))
+      cart_service = CartService.new(order)
 
       if cart_service.populate(params.slice(:products, :variants, :quantity), true)
-        fire_event('spree.cart.add')
-        fire_event('spree.order.contents_changed')
-
-        current_order.cap_quantity_at_stock!
-        current_order.update!
+        order.update_distribution_charge!
+        order.cap_quantity_at_stock!
+        order.update!
 
         variant_ids = variant_ids_in(cart_service.variants_h)
 
         render json: { error: false,
-                       stock_levels: VariantsStockLevels.new.call(current_order, variant_ids) },
+                       stock_levels: VariantsStockLevels.new.call(order, variant_ids) },
                status: :ok
       else
         render json: { error: true }, status: :precondition_failed

app/controllers/checkout_controller.rb

@@ -40,7 +40,7 @@ class CheckoutController < Spree::StoreController
     # This is only required because of spree_paypal_express. If we implement
     # a version of paypal that uses this controller, and more specifically
     # the #update_failed method, then we can remove this call
-    RestartCheckout.new(@order).call
+    OrderCheckoutRestart.new(@order).call
   end
 
   def update
@@ -133,13 +133,6 @@ class CheckoutController < Spree::StoreController
     @order.ship_address = finder.ship_address
   end
 
-  def before_delivery
-    return if params[:order].present?
-
-    packages = @order.shipments.map(&:to_package)
-    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-  end
-
   def before_payment
     current_order.payments.destroy_all if request.put?
   end
@@ -153,10 +146,12 @@ class CheckoutController < Spree::StoreController
   end
 
   def valid_payment_intent_provided?
-    params["payment_intent"]&.starts_with?("pi_") &&
-      @order.state == "payment" &&
-      @order.payments.last.state == "pending" &&
-      @order.payments.last.response_code == params["payment_intent"]
+    return false unless params["payment_intent"]&.starts_with?("pi_")
+
+    last_payment = OrderPaymentFinder.new(@order).last_payment
+    @order.state == "payment" &&
+      last_payment&.state == "pending" &&
+      last_payment&.response_code == params["payment_intent"]
   end
 
   def handle_redirect_from_stripe

app/controllers/enterprises_controller.rb

@@ -65,49 +65,15 @@ class EnterprisesController < BaseController
   def reset_order
     order = current_order(true)
 
-    reset_distributor(order, distributor)
-
-    reset_user_and_customer(order) if try_spree_current_user
-
-    reset_order_cycle(order, distributor)
-
-    order.save!
+    # reset_distributor must be called before any call to current_customer or current_distributor
+    order_cart_reset = OrderCartReset.new(order, params[:id])
+    order_cart_reset.reset_distributor
+    order_cart_reset.reset_other!(try_spree_current_user, current_customer)
   rescue ActiveRecord::RecordNotFound
     flash[:error] = I18n.t(:enterprise_shop_show_error)
     redirect_to shops_path
   end
 
-  def distributor
-    @distributor ||= Enterprise.is_distributor.find_by_permalink(params[:id]) ||
-                     Enterprise.is_distributor.find(params[:id])
-  end
-
-  def reset_distributor(order, distributor)
-    if order.distributor && order.distributor != distributor
-      order.empty!
-      order.set_order_cycle! nil
-    end
-    order.distributor = distributor
-  end
-
-  def reset_user_and_customer(order)
-    order.associate_user!(spree_current_user) if order.user.blank? || order.email.blank?
-    order.__send__(:associate_customer) if order.customer.nil? # Only associates existing customers
-  end
-
-  def reset_order_cycle(order, distributor)
-    order_cycles = Shop::OrderCyclesList.new(distributor, current_customer).call
-    order.order_cycle = order_cycles.first if order_cycles.size == 1
-  end
-
-  def shop_order_cycles
-    if current_order_cycle
-      [current_order_cycle]
-    else
-      OrderCycle.not_closed.with_distributor(current_distributor)
-    end
-  end
-
   def set_noindex_meta_tag
     @noindex_meta_tag = true unless current_distributor.visible?
   end

app/controllers/home_controller.rb

@@ -18,9 +18,9 @@ class HomeController < BaseController
 
   private
 
-  # Cache the value of the query count for 24 hours
-  def cached_count(key, query)
-    Rails.cache.fetch("home_stats_count_#{key}", expires_in: 1.day, race_condition_ttl: 10) do
+  # Cache the value of the query count
+  def cached_count(statistic, query)
+    CacheService.home_stats(statistic) do
       query.count
     end
   end

app/controllers/spree/admin/mail_methods_controller.rb

@@ -4,10 +4,6 @@ module Spree
       after_filter :initialize_mail_settings
 
       def update
-        if params[:smtp_password].blank?
-          params.delete(:smtp_password)
-        end
-
         params.each do |name, value|
           next unless Spree::Config.has_preference? name
 

app/controllers/spree/admin/payments_controller.rb

@@ -29,6 +29,8 @@ module Spree
             return
           end
 
+          authorize_stripe_sca_payment
+
           if @order.completed?
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
@@ -93,7 +95,7 @@ module Spree
           available(:back_end).
           select{ |pm| pm.has_distributor? @order.distributor }
 
-        @payment_method = if @payment && @payment.payment_method
+        @payment_method = if @payment&.payment_method
                             @payment.payment_method
                           else
                             @payment_methods.first
@@ -124,6 +126,13 @@ module Spree
       def load_payment
         @payment = Payment.find(params[:id])
       end
+
+      def authorize_stripe_sca_payment
+        return unless @payment.payment_method.class == Spree::Gateway::StripeSCA
+
+        @payment.authorize!
+        raise Spree::Core::GatewayError, I18n.t('authorization_failure') unless @payment.pending?
+      end
     end
   end
 end

app/controllers/spree/admin/reports/enterprise_fee_summaries_controller.rb

@@ -1,66 +0,0 @@
-module Spree
-  module Admin
-    module Reports
-      class EnterpriseFeeSummariesController < BaseController
-        before_filter :load_report_parameters
-        before_filter :load_permissions
-
-        def new; end
-
-        def create
-          return respond_to_invalid_parameters unless @report_parameters.valid?
-
-          @report_parameters.authorize!(@permissions)
-
-          @report = report_klass::ReportService.new(@permissions, @report_parameters)
-          renderer.render(self)
-        rescue ::Reports::Authorizer::ParameterNotAllowedError => e
-          flash[:error] = e.message
-          render_report_form
-        end
-
-        private
-
-        def respond_to_invalid_parameters
-          flash[:error] = I18n.t("invalid_filter_parameters", scope: i18n_scope)
-          render_report_form
-        end
-
-        def i18n_scope
-          "order_management.reports.enterprise_fee_summary"
-        end
-
-        def render_report_form
-          render action: :new
-        end
-
-        def report_klass
-          OrderManagement::Reports::EnterpriseFeeSummary
-        end
-
-        def load_report_parameters
-          @report_parameters = report_klass::Parameters.new(params[:report] || {})
-        end
-
-        def load_permissions
-          @permissions = report_klass::Permissions.new(spree_current_user)
-        end
-
-        def report_renderer_klass
-          case params[:report_format]
-          when "csv"
-            report_klass::Renderers::CsvRenderer
-          when nil, "", "html"
-            report_klass::Renderers::HtmlRenderer
-          else
-            raise Reports::UnsupportedReportFormatException
-          end
-        end
-
-        def renderer
-          @renderer ||= report_renderer_klass.new(@report)
-        end
-      end
-    end
-  end
-end

app/controllers/spree/admin/reports_controller.rb

@@ -255,7 +255,7 @@ module Spree
       def my_order_cycles
         OrderCycle.
           active_or_complete.
-          accessible_by(spree_current_user).
+          visible_by(spree_current_user).
           order('orders_close_at DESC')
       end
 
@@ -298,11 +298,20 @@ module Spree
       end
 
       def url_for_report(report)
-        public_send("#{report}_admin_reports_url".to_sym)
+        if report_in_order_management_engine?(report)
+          main_app.public_send("new_order_management_reports_#{report}_url".to_sym)
+        else
+          public_send("#{report}_admin_reports_url".to_sym)
+        end
       rescue NoMethodError
         url_for([:new, :admin, :reports, report.to_s.singularize])
       end
 
+      # List of reports that have been moved to the Order Management engine
+      def report_in_order_management_engine?(report)
+        report == :enterprise_fee_summary
+      end
+
       def timestamp
         Time.zone.now.strftime("%Y%m%d")
       end

app/controllers/spree/admin/taxons_controller.rb

@@ -3,14 +3,6 @@ module Spree
     class TaxonsController < Spree::Admin::BaseController
       respond_to :html, :json, :js
 
-      def search
-        @taxons = if params[:ids]
-                    Spree::Taxon.where(id: params[:ids].split(','))
-                  else
-                    Spree::Taxon.limit(20).search(name_cont: params[:q]).result
-                  end
-      end
-
       def create
         @taxonomy = Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.build(params[:taxon])

app/controllers/spree/paypal_controller_decorator.rb

@@ -22,7 +22,7 @@ Spree::PaypalController.class_eval do
     if current_order.complete?
       flash[:notice] = t(:order_processed_successfully)
 
-      ResetOrderService.new(self, current_order).call
+      OrderCompletionReset.new(self, current_order).call
       session[:access_token] = current_order.token
     end
   end

app/helpers/enterprises_helper.rb

@@ -14,7 +14,7 @@ module EnterprisesHelper
   def available_shipping_methods
     return [] if current_distributor.blank?
 
-    shipping_methods = current_distributor.shipping_methods
+    shipping_methods = current_distributor.shipping_methods.display_on_checkout.to_a
 
     applicator = OpenFoodNetwork::TagRuleApplicator.new(current_distributor, "FilterShippingMethods", current_customer.andand.tag_list)
     applicator.filter!(shipping_methods)

app/helpers/injection_helper.rb

@@ -47,7 +47,7 @@ module InjectionHelper
     enterprises_and_relatives = current_distributor.
       relatives_including_self.
       activated.
-      includes(address: [:state, :country]).
+      includes(:properties, address: [:state, :country], supplied_products: :properties).
       all
 
     inject_json_ams "enterprises",

app/helpers/order_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module OrderHelper
+  def last_payment_method(order)
+    OrderPaymentFinder.new(order).last_payment&.payment_method
+  end
+end

app/helpers/shop_helper.rb

@@ -13,7 +13,7 @@ module ShopHelper
   end
 
   def require_customer?
-    current_distributor.require_login? && !user_is_related_to_distributor?
+    @require_customer ||= current_distributor.require_login? && !user_is_related_to_distributor?
   end
 
   def user_is_related_to_distributor?
@@ -48,6 +48,6 @@ module ShopHelper
   end
 
   def no_open_order_cycles?
-    @order_cycles && @order_cycles.empty?
+    @no_open_order_cycles ||= @order_cycles&.empty?
   end
 end

app/helpers/spree/products_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  module ProductsHelper
+    def product_has_variant_unit_option_type?(product)
+      product.option_types.any? { |option_type| variant_unit_option_type? option_type }
+    end
+
+    def variant_unit_option_type?(option_type)
+      Spree::Product.all_variant_unit_option_types.include? option_type
+    end
+  end
+end

app/helpers/spree/products_helper_decorator.rb

@@ -1,23 +0,0 @@
-module Spree
-  ProductsHelper.class_eval do
-    # Return the price of the variant, overriding sprees price diff capability.
-    # This will allways return the variant price as if the show_variant_full_price is set.
-    def variant_price_diff(variant)
-      "(#{Spree::Money.new(variant.price)})"
-    end
-
-    def product_has_variant_unit_option_type?(product)
-      product.option_types.any? { |option_type| variant_unit_option_type? option_type }
-    end
-
-    def variant_unit_option_type?(option_type)
-      Spree::Product.all_variant_unit_option_types.include? option_type
-    end
-
-    def product_variant_unit_options
-      [[I18n.t(:weight), 'weight'],
-       [I18n.t(:volume), 'volume'],
-       [I18n.t(:items), 'items']]
-    end
-  end
-end

app/jobs/job_logger.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: false
+
+module JobLogger
+  class Formatter < ::Logger::Formatter
+    def call(_severity, timestamp, _progname, msg)
+      time = timestamp.strftime('%FT%T%z')
+      "#{time}: #{msg.is_a?(String) ? msg : msg.inspect}\n"
+    end
+  end
+
+  def self.logger
+    @logger ||= begin
+                  logger = Delayed::Worker.logger.clone
+                  logger.formatter = Formatter.new
+                  logger
+                end
+  end
+end

app/jobs/subscription_confirm_job.rb

@@ -24,7 +24,7 @@ class SubscriptionConfirmJob
 
     # Confirm these proxy orders
     ProxyOrder.where(id: unconfirmed_proxy_orders_ids).each do |proxy_order|
-      Rails.logger.info "Confirming Order for Proxy Order #{proxy_order.id}"
+      JobLogger.logger.info "Confirming Order for Proxy Order #{proxy_order.id}"
       confirm_order!(proxy_order.order)
     end
 
@@ -57,16 +57,28 @@ class SubscriptionConfirmJob
     return true unless order.payment_required?
 
     setup_payment!(order)
-    return false if order.errors.present?
+    return false if order.errors.any?
+
+    authorize_payment!(order)
+    return false if order.errors.any?
 
     order.process_payments!
-    return false if order.errors.present?
+    return false if order.errors.any?
 
     true
   end
 
   def setup_payment!(order)
     OrderManagement::Subscriptions::PaymentSetup.new(order).call!
+    return if order.errors.any?
+
+    OrderManagement::Subscriptions::StripePaymentSetup.new(order).call!
+  end
+
+  def authorize_payment!(order)
+    return if order.subscription.payment_method.class != Spree::Gateway::StripeSCA
+
+    OrderManagement::Subscriptions::StripeScaPaymentAuthorize.new(order).call!
   end
 
   def send_confirmation_email(order)