Update all locales with the latest Transifex translations

Transifex

.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

@@ -33,7 +33,6 @@ Layout/LineLength:
   - app/controllers/admin/inventory_items_controller.rb
   - app/controllers/admin/manager_invitations_controller.rb
   - app/controllers/admin/product_import_controller.rb
-  - app/controllers/admin/proxy_orders_controller.rb
   - app/controllers/admin/schedules_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
   - app/controllers/admin/variant_overrides_controller.rb
@@ -89,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
@@ -98,7 +96,6 @@ Layout/LineLength:
   - app/services/embedded_page_service.rb
   - app/services/order_cycle_form.rb
   - app/services/order_factory.rb
-  - app/services/subscriptions_count.rb
   - app/services/variants_stock_levels.rb
   - engines/web/app/helpers/web/cookies_policy_helper.rb
   - lib/discourse/single_sign_on.rb
@@ -158,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
@@ -183,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
@@ -231,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
@@ -239,10 +233,7 @@ Layout/LineLength:
   - spec/lib/open_food_network/packing_report_spec.rb
   - spec/lib/open_food_network/permissions_spec.rb
   - spec/lib/open_food_network/products_and_inventory_report_spec.rb
-  - spec/lib/open_food_network/proxy_order_syncer_spec.rb
   - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
-  - spec/lib/open_food_network/subscription_payment_updater_spec.rb
-  - spec/lib/open_food_network/subscription_summarizer_spec.rb
   - spec/lib/open_food_network/tag_rule_applicator_spec.rb
   - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
   - spec/lib/open_food_network/xero_invoices_report_spec.rb
@@ -317,10 +308,6 @@ Layout/LineLength:
   - spec/services/permissions/order_spec.rb
   - spec/services/product_tag_rules_filterer_spec.rb
   - spec/services/products_renderer_spec.rb
-  - spec/services/subscription_estimator_spec.rb
-  - spec/services/subscription_form_spec.rb
-  - spec/services/subscription_validator_spec.rb
-  - spec/services/subscription_variants_service_spec.rb
   - spec/spec_helper.rb
   - spec/support/cancan_helper.rb
   - spec/support/delayed_job_helper.rb
@@ -386,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
@@ -411,7 +397,7 @@ Metrics/AbcSize:
   - app/services/cart_service.rb
   - app/services/create_order_cycle.rb
   - app/services/order_syncer.rb
-  - app/services/subscription_validator.rb
+  - engines/order_management/app/services/order_management/subscriptions/validator.rb
   - lib/active_merchant/billing/gateways/stripe_decorator.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/discourse/single_sign_on.rb
@@ -477,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
@@ -583,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
@@ -686,6 +670,12 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/helpers/spree/admin/base_helper.rb
+  - 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/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
   - lib/open_food_network/column_preference_defaults.rb
   - spec/controllers/admin/enterprises_controller_spec.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
@@ -701,9 +691,7 @@ Metrics/ModuleLength:
   - spec/lib/open_food_network/order_grouper_spec.rb
   - spec/lib/open_food_network/permissions_spec.rb
   - spec/lib/open_food_network/products_and_inventory_report_spec.rb
-  - spec/lib/open_food_network/proxy_order_syncer_spec.rb
   - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
-  - spec/lib/open_food_network/subscription_payment_updater_spec.rb
   - spec/lib/open_food_network/tag_rule_applicator_spec.rb
   - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
   - spec/models/spree/ability_spec.rb

.rubocop_todo.yml

@@ -71,7 +71,6 @@ Lint/DuplicateHashKey:
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/subscription_summary.rb'
 
 # Offense count: 10
 Lint/IneffectiveAccessModifier:
@@ -159,7 +158,7 @@ Naming/MethodParameterName:
   Exclude:
     - 'app/helpers/spree/admin/base_helper_decorator.rb'
     - 'app/helpers/spree/base_helper_decorator.rb'
-    - 'app/services/subscription_validator.rb'
+    - 'engines/order_management/app/services/order_management/subscriptions/validator.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
@@ -174,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'
@@ -631,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'
@@ -849,11 +846,6 @@ Style/FrozenStringLiteralComment:
     - 'app/services/reset_order_service.rb'
     - 'app/services/restart_checkout.rb'
     - 'app/services/search_orders.rb'
-    - 'app/services/subscription_estimator.rb'
-    - 'app/services/subscription_form.rb'
-    - 'app/services/subscription_validator.rb'
-    - 'app/services/subscription_variants_service.rb'
-    - 'app/services/subscriptions_count.rb'
     - 'app/services/tax_rate_finder.rb'
     - 'app/services/upload_sanitizer.rb'
     - 'app/services/variant_deleter.rb'
@@ -861,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'
@@ -892,6 +883,7 @@ Style/FrozenStringLiteralComment:
     - 'engines/order_management/lib/order_management/engine.rb'
     - 'engines/order_management/lib/order_management/version.rb'
     - 'engines/order_management/order_management.gemspec'
+    - 'engines/order_management/spec/performance/order_management/subscriptions/proxy_order_syncer_spec.rb'
     - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/authorizer_spec.rb'
     - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/parameters_spec.rb'
     - 'engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/permissions_spec.rb'
@@ -949,7 +941,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/products_and_inventory_report.rb'
     - 'lib/open_food_network/products_and_inventory_report_base.rb'
     - 'lib/open_food_network/property_merge.rb'
-    - 'lib/open_food_network/proxy_order_syncer.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/referer_parser.rb'
     - 'lib/open_food_network/reports/bulk_coop_allocation_report.rb'
@@ -966,8 +957,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/scope_variants_for_search.rb'
     - 'lib/open_food_network/spree_api_key_loader.rb'
     - 'lib/open_food_network/subscription_payment_updater.rb'
-    - 'lib/open_food_network/subscription_summarizer.rb'
-    - 'lib/open_food_network/subscription_summary.rb'
     - 'lib/open_food_network/tag_rule_applicator.rb'
     - 'lib/open_food_network/user_balance_calculator.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
@@ -1209,7 +1198,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/permissions_spec.rb'
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/property_merge_spec.rb'
-    - 'spec/lib/open_food_network/proxy_order_syncer_spec.rb'
     - 'spec/lib/open_food_network/referer_parser_spec.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
     - 'spec/lib/open_food_network/reports/row_spec.rb'
@@ -1218,8 +1206,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
     - 'spec/lib/open_food_network/subscription_payment_updater_spec.rb'
-    - 'spec/lib/open_food_network/subscription_summarizer_spec.rb'
-    - 'spec/lib/open_food_network/subscription_summary_spec.rb'
     - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
     - 'spec/lib/open_food_network/user_balance_calculator_spec.rb'
     - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb'
@@ -1304,7 +1290,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/variant_override_spec.rb'
     - 'spec/performance/injection_helper_spec.rb'
     - 'spec/performance/orders_controller_spec.rb'
-    - 'spec/performance/proxy_order_syncer_spec.rb'
     - 'spec/performance/shop_controller_spec.rb'
     - 'spec/requests/checkout/failed_checkout_spec.rb'
     - 'spec/requests/checkout/paypal_spec.rb'
@@ -1355,11 +1340,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/services/reset_order_service_spec.rb'
     - 'spec/services/restart_checkout_spec.rb'
     - 'spec/services/search_orders_spec.rb'
-    - 'spec/services/subscription_estimator_spec.rb'
-    - 'spec/services/subscription_form_spec.rb'
-    - 'spec/services/subscription_validator_spec.rb'
-    - 'spec/services/subscription_variants_service_spec.rb'
-    - 'spec/services/subscriptions_count_spec.rb'
     - 'spec/services/tax_rate_finder_spec.rb'
     - 'spec/services/upload_sanitizer_spec.rb'
     - 'spec/services/variants_stock_levels_spec.rb'
@@ -1557,7 +1537,6 @@ Style/Send:
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/sales_tax_report_spec.rb'
     - 'spec/lib/open_food_network/subscription_payment_updater_spec.rb'
-    - 'spec/lib/open_food_network/subscription_summarizer_spec.rb'
     - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
     - 'spec/lib/open_food_network/xero_invoices_report_spec.rb'
     - 'spec/lib/stripe/webhook_handler_spec.rb'

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Contributing
-We love pull requests from everyone. Any contribution is valuable, but there are two issue streams that we especially love people to work on:
+We love pull requests from everyone. Any contribution is valuable!
 
-1) Our delivery backlog, is managed via a ZenHub board (ZenHub extensions are available for most major browsers). We use a Kanban-style approach, whereby devs pick issues from the top of the backlog which has been organised according to current priorities. If you have some time and are interested in working on some issues from the backlog, please make yourself known on the [#dev][slack-dev] channel on Slack and we can direct you to the most appropriate issue to pick up.
+If you have some time and are interested in working on some issues please make yourself known on the [#dev][slack-dev] channel on Slack.
 
-2) Our list of bugs and other self-contained issues that we consider to be a good starting point for new contributors, or devs who aren’t able to commit to seeing a whole feature through. These issues are marked with the `# good first issue` label.
+We have curated all issues we consider to be a good starting point for new members of the community within the [Welcome New Developers project board][welcome-dev]. Have a look and pick the one you would prefer working on!
 
 ## Set up
 
@@ -19,10 +19,6 @@ If you want to run the whole test suite, we recommend using a free CI service to
 
     bundle exec rspec spec
 
-## Which issue to pick first?
-
-We have curated all issues interesting for new members of the community within the [Welcome New Developers project board][welcome-dev]. Have a look and pick the one you would prefer working on!
-
 ## Internationalisation (i18n)
 
 The locale `en` is maintained in the source code, but other locales are managed at [Transifex][ofn-transifex]. Read more about [internationalisation][i18n] in the developer wiki.

DOCKER.md

@@ -35,13 +35,22 @@ Download the Docker images and build the containers:
 $ docker-compose build
 ```
 
-Run the app with all the required containers:
+Setup the database and seed it with sample data:
+```sh
+$ docker-compose run web bundle exec rake db:reset
+$ docker-compose run web bundle exec rake db:test:prepare
+$ docker-compose run web bundle exec rake ofn:sample_data
+```
+
+Finally, run the app with all the required containers:
 
 ```sh
 $ docker-compose up
 ```
 
-This command will setup the database and seed it with sample data. The default admin user is 'ofn@example.com' with 'ofn123' password.
+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

@@ -12,7 +12,7 @@ ENV BUNDLE_PATH /bundles
 WORKDIR /usr/src/app
 COPY .ruby-version .
 
-# Rbenv & Ruby part
+# Install Rbenv & Ruby
 RUN git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
     git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
     ${RBENV_ROOT}/plugins/ruby-build/install.sh && \
@@ -21,12 +21,15 @@ RUN git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
     rbenv global $(cat .ruby-version) && \
     gem install bundler --version=1.17.2
 
-# Postgres
+# Install Postgres
 RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
     wget --quiet -O - https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
     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" && \
@@ -38,4 +41,6 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
     unzip chromedriver_linux64.zip -d /usr/bin && \
     chmod u+x /usr/bin/chromedriver
 
+# Copy code and install app dependencies
 COPY . /usr/src/app/
+RUN bundle install

GETTING_STARTED.md

@@ -2,19 +2,17 @@
 
 This is a general guide to setting up an Open Food Network development environment on your local machine.
 
-The following guides are located in the wiki and provide more OS-specific step-by-step instructions:
+### Requirements
 
-- [Ubuntu Setup Guide][ubuntu]
-- [macOS Sierra Setup Guide][sierra]
-- [OSX El Capitan Setup Guide][el-capitan]
-
-### Dependencies
-
-* Rails 3.2.x
-* Ruby 2.1.9
+The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](DOCKER.md).
+Otherwise, for a local setup you will need:
+* Ruby 2.3.7 and bundler
 * PostgreSQL database
-* PhantomJS (for testing)
-* See Gemfile for a list of gems required
+* Chrome (for testing)
+
+The following guides will provide OS-specific step-by-step instructions to get these requirements installed:
+- [Ubuntu Setup Guide][ubuntu]
+- [OSX Setup Guide][osx]
 
 If you are likely to need to manage multiple version of ruby on your local machine, we recommend version managers such as [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
 
@@ -50,18 +48,16 @@ This will create the "ofn" user as superuser and allowing it to create databases
 
 Once done, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
-If you run into any other issues getting your local environment up and running please consult [the wiki][wiki].
-
-If still you get stuck do not hesitate to open an issue reporting the full output of the script.
-
 Now, your dreams of spinning up a development server can be realised:
 
     bundle exec rails server
 
-To login as Spree default user, use:
+Go to [http://localhost:3000](http://localhost:3000) to play around!
 
-    email: spree@example.com
-    password: spree123
+To login as the default user, use:
+
+    email: ofn@example.com
+    password: ofn123
 
 ### Testing
 
@@ -77,7 +73,7 @@ The tests of all custom engines can be run with:
 
     bundle exec rake ofn:specs:engines:rspec
 
-Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop. Get in touch with the [#dev][slack-dev] channel on Slack to troubleshoot issues and determine if they will preclude you from contributing to OFN.
+Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop.
 
 Note: The time zone on your machine should match the one defined in `config/application.yml`.
 
@@ -118,8 +114,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
-[el-capitan]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X-(El-Capitan)
+[osx]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
 [zeus]: https://github.com/burke/zeus

Gemfile

@@ -3,16 +3,15 @@ ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.6.0'
+gem 'i18n-js', '~> 3.7.0'
 gem 'rails', '~> 3.2.22'
 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'
 
@@ -45,10 +44,6 @@ gem 'daemons'
 gem 'delayed_job_active_record'
 gem 'delayed_job_web'
 
-# Fix bug in simple_form preventing collection_check_boxes usage within form_for block
-# When merged, revert to upstream gem
-gem 'simple_form', github: 'RohanM/simple_form'
-
 # Spree's default pagination gem (locked to the current version used by Spree)
 # We use it's methods in OFN code as well, so this is a direct dependency
 gem 'kaminari', '~> 0.14.1'
@@ -59,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'
@@ -74,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'
@@ -102,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'
 
@@ -112,24 +105,24 @@ gem 'momentjs-rails'
 gem 'turbo-sprockets-rails3'
 
 gem "foundation-rails"
-gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
 
 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'
 
 group :production, :staging do
   gem 'ddtrace'
+  gem 'unicorn-worker-killer'
 end
 
 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'
@@ -153,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

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/RohanM/simple_form.git
-  revision: 45f08a213b40f3d4bda5f5398db841137587160a
-  specs:
-    simple_form (2.0.2)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-
 GIT
   remote: https://github.com/jeremydurham/custom-err-msg.git
   revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
@@ -31,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)
@@ -40,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)
@@ -65,21 +56,18 @@ GIT
       rails-i18n
       spree_core (>= 1.1)
 
-GIT
-  remote: https://github.com/willrjmarshall/foundation_rails_helper.git
-  revision: 4d5d53fdc4b1fb71e66524d298c5c635de82cfbb
-  branch: rails3
-  specs:
-    foundation_rails_helper (0.4)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      railties (>= 3.0)
-
 PATH
   remote: engines/catalog
   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:
@@ -122,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
@@ -159,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
@@ -173,7 +161,7 @@ GEM
       xpath (>= 2.0, < 4.0)
     childprocess (3.0.0)
     chronic (0.10.2)
-    chunky_png (1.3.10)
+    chunky_png (1.3.11)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -185,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)
@@ -200,11 +187,11 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (3.1.0)
+    compass-rails (4.0.0)
       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)
@@ -216,14 +203,9 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.33.1)
+    ddtrace (0.36.0)
       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)
@@ -256,8 +238,8 @@ GEM
       railties (>= 3.0.0)
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.22.1)
-    ffi (1.11.3)
+    ffaker (1.32.1)
+    ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
     fission (0.5.0)
@@ -421,6 +403,8 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
+    get_process_mem (0.2.5)
+      ffi (~> 1.0)
     gmaps4rails (1.5.6)
     haml (4.0.7)
       tilt
@@ -430,7 +414,7 @@ GEM
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.6.0)
+    i18n-js (3.7.0)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -441,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)
@@ -465,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)
@@ -477,15 +461,15 @@ 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)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.5)
+    oj (3.10.6)
     orm_adapter (0.5.0)
     paper_trail (5.2.3)
       activerecord (>= 3.0, < 6.0)
@@ -499,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)
@@ -514,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
@@ -559,8 +541,8 @@ GEM
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rbvmomi (1.13.0)
       builder (~> 3.0)
       json (>= 1.8)
@@ -604,15 +586,15 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.9.2)
-    rubocop (0.80.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.5.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-rails (2.5.2)
       activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
@@ -668,16 +650,19 @@ 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.6.1)
-    unicorn (5.5.4)
+    unicode-display_width (1.7.0)
+    unicorn (5.5.5)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
       rack
       unicorn
+    unicorn-worker-killer (0.4.4)
+      get_process_mem (~> 0)
+      unicorn (>= 4, < 6)
     uuidtools (2.1.5)
     warden (1.2.7)
       rack (>= 1.0)
@@ -715,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)
@@ -728,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
@@ -740,26 +725,24 @@ DEPENDENCIES
   foreigner
   foundation-icons-sass-rails
   foundation-rails
-  foundation_rails_helper!
   fuubar (~> 2.5.0)
   geocoder
   gmaps4rails
   haml
   i18n (~> 0.6.11)
-  i18n-js (~> 3.6.0)
+  i18n-js (~> 3.7.0)
   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
@@ -767,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
@@ -787,7 +770,6 @@ DEPENDENCIES
   select2-rails (~> 3.4.7)
   selenium-webdriver
   shoulda-matchers
-  simple_form!
   simplecov
   spinjs-rails
   spree_core!
@@ -803,6 +785,7 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
   unicorn
   unicorn-rails
+  unicorn-worker-killer
   web!
   webdrivers
   webmock
@@ -814,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/index_utils/services/paged_fetcher.js.coffee

@@ -2,19 +2,24 @@ angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) ->
   new class PagedFetcher
     # Given a URL like http://example.com/foo?page=::page::&per_page=20
     # And the response includes an attribute pages with the number of pages to fetch
-    # Fetch each page async, and call the processData callback with the resulting data
-    fetch: (url, processData, onLastPageComplete) ->
-      dataFetcher(@urlForPage(url, 1)).then (data) =>
-        processData data
+    # Fetch each page async, and call the pageCallback callback with the resulting data
+    # Developer note: this class should not be re-used!
+    page: 1
+    last_page: 1
 
-        if data.pages > 1
-          for page in [2..data.pages]
-            lastPromise = dataFetcher(@urlForPage(url, page)).then (data) ->
-              processData data
-          onLastPageComplete && lastPromise.then onLastPageComplete
-          return
-        else
-          onLastPageComplete && onLastPageComplete()
+    fetch: (url, pageCallback) ->
+      @fetchPages(url, @page, pageCallback)
 
     urlForPage: (url, page) ->
       url.replace("::page::", page)
+
+    fetchPages: (url, page, pageCallback) ->
+      dataFetcher(@urlForPage(url, page)).then (data) =>
+        @page++
+        @last_page = data.pages
+
+        pageCallback(data) if pageCallback
+
+        if @page <= @last_page
+          @fetchPages(url, @page, pageCallback)
+

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -1,7 +1,7 @@
 angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, SortOptions, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
   $scope.initialized = false
   $scope.RequestMonitor = RequestMonitor
-  $scope.filteredLineItems = []
+  $scope.line_items = LineItems.all
   $scope.confirmDelete = true
   $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
   $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
@@ -15,50 +15,77 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.confirmRefresh = ->
     LineItems.allSaved() || confirm(t("unsaved_changes_warning"))
 
+  $scope.resetFilters = ->
+    $scope.distributorFilter = ''
+    $scope.supplierFilter = ''
+    $scope.orderCycleFilter = ''
+    $scope.quickSearch = ''
+
   $scope.resetSelectFilters = ->
-    $scope.distributorFilter = 0
-    $scope.supplierFilter = 0
-    $scope.orderCycleFilter = 0
-    $scope.quickSearch = ""
+    $scope.resetFilters()
+    $scope.refreshData()
 
   $scope.refreshData = ->
-    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
-      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
-      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
+      $scope.setOrderCycleDateRange()
 
-    formatted_start_date = moment($scope.startDate).format()
-    formatted_end_date = moment($scope.endDate).add(1,'day').format()
+    $scope.formattedStartDate = moment($scope.startDate).format()
+    $scope.formattedEndDate = moment($scope.endDate).add(1,'day').format()
 
+    return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()
+
+    $scope.loadOrders()
+    $scope.loadLineItems()
+
+    unless $scope.initialized
+      $scope.loadAssociatedData()
+
+    $scope.dereferenceLoadedData()
+
+  $scope.setOrderCycleDateRange = ->
+    start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
+    end_date = OrderCycles.byID[$scope.orderCycleFilter].orders_close_at
+    format = "YYYY-MM-DD HH:mm:ss Z"
+    $scope.startDate = moment(start_date, format).format('YYYY-MM-DD')
+    $scope.endDate = moment(end_date, format).startOf('day').format('YYYY-MM-DD')
+
+  $scope.loadOrders = ->
     RequestMonitor.load $scope.orders = Orders.index(
       "q[state_not_eq]": "canceled",
       "q[completed_at_not_null]": "true",
-      "q[completed_at_gteq]": formatted_start_date,
-      "q[completed_at_lt]": formatted_end_date
+      "q[distributor_id_eq]": $scope.distributorFilter,
+      "q[order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[completed_at_gteq]": $scope.formattedStartDate,
+      "q[completed_at_lt]": $scope.formattedEndDate
     )
 
-    RequestMonitor.load $scope.lineItems = LineItems.index(
-      "q[order][state_not_eq]": "canceled",
-      "q[order][completed_at_not_null]": "true",
-      "q[order][completed_at_gteq]": formatted_start_date,
-      "q[order][completed_at_lt]": formatted_end_date
+  $scope.loadLineItems = ->
+    RequestMonitor.load LineItems.index(
+      "q[order_state_not_eq]": "canceled",
+      "q[order_completed_at_not_null]": "true",
+      "q[order_distributor_id_eq]": $scope.distributorFilter,
+      "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
+      "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[order_completed_at_gteq]": $scope.formattedStartDate,
+      "q[order_completed_at_lt]": $scope.formattedEndDate
     )
 
-    unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+  $scope.loadAssociatedData = ->
+    RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+    RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
+    RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
 
-    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
+  $scope.dereferenceLoadedData = ->
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.line_items.$promise]).then ->
       Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
       Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "supplier", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID
       $scope.bulk_order_form.$setPristine()
       StatusMessage.clear()
+
       unless $scope.initialized
         $scope.initialized = true
-        $timeout ->
-          $scope.resetSelectFilters()
 
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
@@ -77,13 +104,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.deleteLineItem = (lineItem) ->
     if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
-      LineItems.delete lineItem, =>
-        $scope.lineItems.splice $scope.lineItems.indexOf(lineItem), 1
+      LineItems.delete lineItem
 
-  $scope.deleteLineItems = (lineItems) ->
+  $scope.deleteLineItems = (lineItemsToDelete) ->
     existingState = $scope.confirmDelete
     $scope.confirmDelete = false
-    $scope.deleteLineItem lineItem for lineItem in lineItems when lineItem.checked
+    $scope.deleteLineItem lineItem for lineItem in lineItemsToDelete when lineItem.checked
     $scope.confirmDelete = existingState
 
   $scope.allBoxesChecked = ->
@@ -154,4 +180,5 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
       $scope.weightAdjustedPrice(lineItem)
 
+  $scope.resetFilters()
   $scope.refreshData()

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

@@ -14,9 +14,10 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
           StatusMessage.display 'error', response.error.message
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapCC(response.token.card.brand)
+          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
 
@@ -29,15 +30,16 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
       @stripe.createPaymentMethod({ type: 'card', card: @card }, @card, cardData).then (response) =>
         if(response.error)
           StatusMessage.display 'error', response.error.message
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = response.paymentMethod.card.brand
+          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
 
-    # Maps the brand returned by Stripe to that required by activemerchant
-    mapCC: (ccType) ->
-      switch ccType
+    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
+    mapTokenApiCardBrand: (cardBrand) ->
+      switch cardBrand
         when 'MasterCard' then return 'master'
         when 'Visa' then return 'visa'
         when 'American Express' then return 'american_express'
@@ -45,6 +47,14 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
         when 'JCB' then return 'jcb'
         when 'Diners Club' then return 'diners_club'
 
+    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
+    mapPaymentMethodsApiCardBrand: (cardBrand) ->
+      switch cardBrand
+        when 'mastercard' then return 'master'
+        when 'amex' then return 'american_express'
+        when 'diners' then return 'diners_club'
+        else return cardBrand # a few brands are equal, for example, visa
+
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

app/assets/javascripts/admin/resources/resources/line_item_resource.js.coffee

@@ -2,7 +2,6 @@ angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
   $resource('/admin/bulk_line_items/:id.json', {}, {
     'index':
       method: 'GET'
-      isArray: true
     'update':
       method: 'PUT'
       transformRequest: (data, headersGetter) =>

app/assets/javascripts/admin/resources/services/line_items.js.coffee

@@ -1,20 +1,27 @@
 angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
   new class LineItems
+    all: []
     byID: {}
     pristineByID: {}
+    pagination: {}
 
     index: (params={}, callback=null) ->
-    	LineItemResource.index params, (data) =>
+    	request = LineItemResource.index params, (data) =>
         @load(data)
         (callback || angular.noop)(data)
+      @all.$promise = request.$promise
+      @all
 
     resetData: ->
+      @all.length = 0
       @byID = {}
       @pristineByID = {}
 
-    load: (lineItems) ->
+    load: (data) ->
+      angular.extend(@pagination, data.pagination)
       @resetData()
-      for lineItem in lineItems
+      for lineItem in data.line_items
+        @all.push lineItem
         @byID[lineItem.id] = lineItem
         @pristineByID[lineItem.id] = angular.copy(lineItem)
 
@@ -25,8 +32,9 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     save: (lineItem) ->
       deferred = $q.defer()
+      lineItemResource = new LineItemResource(lineItem)
       lineItem.errors = {}
-      lineItem.$update({id: lineItem.id})
+      lineItemResource.$update({id: lineItem.id})
       .then( (data) =>
         @pristineByID[lineItem.id] = angular.copy(lineItem)
         deferred.resolve(data)
@@ -54,8 +62,10 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     delete: (lineItem, callback=null) ->
       deferred = $q.defer()
-      lineItem.$delete({id: lineItem.id})
+      lineItemResource = new LineItemResource(lineItem)
+      lineItemResource.$delete({id: lineItem.id})
       .then( (data) =>
+        @all.splice(@all.indexOf(lineItem),1)
         delete @byID[lineItem.id]
         delete @pristineByID[lineItem.id]
         (callback || angular.noop)(data)

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/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee

@@ -43,12 +43,11 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
 
   $scope.fetchProducts = ->
     url = "/api/products/overridable?page=::page::;per_page=100"
-    PagedFetcher.fetch url, (data) => $scope.addProducts data.products
+    PagedFetcher.fetch url, $scope.addProducts
 
-
-  $scope.addProducts = (products) ->
-    $scope.products = $scope.products.concat products
-    VariantOverrides.ensureDataFor hubs, products
+  $scope.addProducts = (data) ->
+    $scope.products = $scope.products.concat data.products
+    VariantOverrides.ensureDataFor hubs, data.products
 
   $scope.displayDirty = ->
     if DirtyVariantOverrides.count() > 0

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

@@ -8,7 +8,12 @@
 #= require angular-sanitize
 #= require angular-animate
 #= require angular-resource
+#= require autocomplete.min.js
+#= require leaflet-1.6.0.js
+#= require leaflet-providers.js
 #= require lodash.underscore.js
+# bluebird.js is a dependency of angular-google-maps.js 2.0.0
+#= require bluebird.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

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

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

@@ -9,8 +9,13 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
   $scope.show_closed = false
   $scope.filtersActive = false
   $scope.distanceMatchesShown = false
+  $scope.closed_shops_loading = false
+  $scope.closed_shops_loaded = false
 
   $scope.$watch "query", (query)->
+    $scope.resetSearch(query)
+
+  $scope.resetSearch = (query) ->
     Enterprises.flagMatching query
     Search.search query
     $rootScope.$broadcast 'enterprisesChanged'
@@ -19,6 +24,7 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
     $timeout ->
       Enterprises.calculateDistance query, $scope.firstNameMatch()
       $rootScope.$broadcast 'enterprisesChanged'
+      $scope.closed_shops_loading = false
 
   $timeout ->
     if $location.search()['show_closed']?
@@ -73,6 +79,12 @@ Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location
       undefined
 
   $scope.showClosedShops = ->
+    unless $scope.closed_shops_loaded
+      $scope.closed_shops_loading = true
+      $scope.closed_shops_loaded = true
+      Enterprises.loadClosedEnterprises().then ->
+        $scope.resetSearch($scope.query)
+
     $scope.show_closed = true
     $location.search('show_closed', '1')
 

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

@@ -24,7 +24,7 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http,
     $scope.shopfront_loading = true
     $scope.toggle_tab(event)
 
-    $http.get("/api/enterprises/" + $scope.hub.id + "/shopfront")
+    $http.get("/api/shops/" + $scope.hub.id)
       .success (data) ->
         $scope.shopfront_loading = false
         $scope.hub = data

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

@@ -24,7 +24,7 @@ Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll,
     $scope.shopfront_loading = true
     $scope.toggle_tab(event)
 
-    $http.get("/api/enterprises/" + $scope.producer.id + "/shopfront")
+    $http.get("/api/shops/" + $scope.producer.id)
       .success (data) ->
         $scope.shopfront_loading = false
         $scope.producer = data

app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee

@@ -2,6 +2,5 @@ Darkswarm.controller "ProductNodeCtrl", ($scope, $modal, FilterSelectorsService)
   $scope.enterprise = $scope.product.supplier # For the modal, so it's consistent
 
   $scope.triggerProductModal = ->
-    $scope.productTaxonSelectors = FilterSelectorsService.createSelectors()
     $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
     $modal.open(templateUrl: "product_modal.html", scope: $scope)

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

@@ -7,7 +7,7 @@ window.Darkswarm = angular.module("Darkswarm", [
   'templates',
   'ngSanitize',
   'ngAnimate',
-  'google-maps',
+  'uiGmapgoogle-maps',
   'duScroll',
   'angularFileUpload',
   'angularSlideables'

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

@@ -1,6 +1,6 @@
 Darkswarm.directive 'mapOsmTiles', ($timeout) ->
   restrict: 'E'
-  require: '^googleMap'
+  require: '^uiGmapGoogleMap'
   scope: {}
   link: (scope, elem, attrs, ctrl) ->
     $timeout =>

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

@@ -1,7 +1,7 @@
 Darkswarm.directive 'mapSearch', ($timeout, Search) ->
   # Install a basic search field in a map
   restrict: 'E'
-  require: ['^googleMap', 'ngModel']
+  require: ['^uiGmapGoogleMap', 'ngModel']
   replace: true
   template: '<input id="pac-input" ng-model="query" placeholder="' + t('location_placeholder') + '"></input>'
   scope: {}

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

@@ -0,0 +1,100 @@
+Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
+  restrict: 'E'
+  replace: true
+  scope: true
+  template: "<div></div>"
+
+  link: (scope, element, attrs, ctrl, transclude)->
+    map = null
+    markers = []
+    enterpriseNames = []
+    openStreetMapProviderName = openStreetMapConfig.open_street_map_provider_name
+    openStreetMapProviderOptions = JSON.parse(openStreetMapConfig.open_street_map_provider_options)
+
+    average = (values) ->
+      total = values.reduce (sum, value) ->
+        sum = sum + value
+      , 0
+      total / values.length
+
+    averageAngle = (angleName) ->
+      positiveAngles = []
+      negativeAngles = []
+      for enterprise in Enterprises.enterprises
+        if enterprise.latitude? && enterprise.longitude?
+          if enterprise[angleName] > 0
+            positiveAngles.push(enterprise[angleName])
+          else
+            negativeAngles.push(enterprise[angleName])
+
+      averageNegativeAngle = average(negativeAngles)
+      averagePositiveAngle = average(positiveAngles)
+
+      if negativeAngles.length == 0
+        averagePositiveAngle
+      else if positiveAngles.length == 0
+        averageNegativeAngle
+      else if averagePositiveAngle > averageNegativeAngle
+        averagePositiveAngle - averageNegativeAngle
+      else
+        averageNegativeAngle - averagePositiveAngle
+
+    buildMarker = (enterprise, latlng, title) ->
+      icon = L.icon
+        iconUrl: enterprise.icon
+      marker = L.marker latlng,
+        draggable:   true,
+        icon:        icon,
+        riseOnHover: true,
+        title:       title
+      marker.on "click", ->
+        EnterpriseModal.open enterprise
+      marker
+
+    enterpriseName = (enterprise) ->
+      return enterprise.name + " (" + enterprise.address.address1 + ", " + enterprise.address.city + ", " + enterprise.address.state_name + ")";
+
+    goToEnterprise = (selectedEnterpriseName) ->
+      enterprise = Enterprises.enterprises.find (enterprise) ->
+        enterpriseName(enterprise) == selectedEnterpriseName
+      map.setView([enterprise.latitude, enterprise.longitude], 12)
+
+    displayMap = ->
+      setMapDimensions()
+      averageLatitude = averageAngle("latitude")
+      averageLongitude = averageAngle("longitude")
+      zoomLevel = 6
+      map = L.map('open-street-map')
+      L.tileLayer.provider(openStreetMapProviderName, openStreetMapProviderOptions).addTo(map)
+      map.setView([averageLatitude, averageLongitude], zoomLevel)
+
+    displayEnterprises = ->
+      for enterprise in Enterprises.enterprises
+        if enterprise.latitude? && enterprise.longitude?
+          marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
+          enterpriseNames.push(enterpriseName(enterprise))
+          markers.push(marker)
+
+    displaySearchField = () ->
+      new Autocomplete('#open-street-map--search',
+        onSubmit: goToEnterprise
+        search: searchEnterprises
+      )
+      overwriteInlinePositionRelativeToPositionSearchField = ->
+        $('#open-street-map--search').css("position", "absolute")
+      overwriteInlinePositionRelativeToPositionSearchField()
+
+    searchEnterprises = (input) ->
+      if input.length < 1
+        return []
+      enterpriseNames.filter (country) ->
+        country.toLowerCase().includes input.toLowerCase()
+
+    setMapDimensions = ->
+      height = $window.innerHeight - element.offset().top
+      element.css "width", "100%"
+      element.css "height", (height + "px")
+
+    displayMap()
+    displayEnterprises()
+    displaySearchField()

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,30 @@ 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
+          try
+            @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
+          finally
+            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/enterprise_modal.js.coffee

@@ -5,7 +5,7 @@ Darkswarm.factory "EnterpriseModal", ($modal, $rootScope, $http)->
       scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise
       scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1
 
-      $http.get("/api/enterprises/" + enterprise.id + "/shopfront").success (data) ->
+      $http.get("/api/shops/" + enterprise.id).success (data) ->
         scope.enterprise = data
         $modal.open(templateUrl: "enterprise_modal.html", scope: scope)
       .error (data) ->

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

@@ -1,27 +1,30 @@
-Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer, Matcher, Geo, $rootScope) ->
+Darkswarm.factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons, Dereferencer, Matcher, Geo, $rootScope) ->
   new class Enterprises
+    enterprises: []
     enterprises_by_id: {}
 
     constructor: ->
       # Populate Enterprises.enterprises from json in page.
-      @enterprises = enterprises
+      @initEnterprises(enterprises)
 
+    initEnterprises: (enterprises) ->
       # Map enterprises to id/object pairs for lookup.
       for enterprise in enterprises
+        @enterprises.push enterprise
         @enterprises_by_id[enterprise.id] = enterprise
 
       # Replace enterprise and taxons ids with actual objects.
-      @dereferenceEnterprises()
+      @dereferenceEnterprises(enterprises)
 
       @producers = @enterprises.filter (enterprise)->
         enterprise.category in ["producer_hub", "producer_shop", "producer"]
       @hubs = @enterprises.filter (enterprise)->
         enterprise.category in ["hub", "hub_profile", "producer_hub", "producer_shop"]
 
-    dereferenceEnterprises: ->
+    dereferenceEnterprises: (enteprises) ->
       if CurrentHub.hub?.id
         CurrentHub.hub = @enterprises_by_id[CurrentHub.hub.id]
-      for enterprise in @enterprises
+      for enterprise in enterprises
         @dereferenceEnterprise enterprise
 
     dereferenceEnterprise: (enterprise) ->
@@ -42,6 +45,12 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer,
       for enterprise in new_enterprises
         @enterprises_by_id[enterprise.id] = enterprise
 
+    loadClosedEnterprises: ->
+      request = ShopsResource.closed_shops {}, (data) =>
+        @initEnterprises(data)
+
+      request.$promise
+
     flagMatching: (query) ->
       for enterprise in @enterprises
         enterprise.matches_name_query = if query? && query.length > 0
@@ -50,7 +59,7 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer,
           false
 
     calculateDistance: (query, firstMatching) ->
-      if query?.length > 0
+      if query?.length > 0 and Geo.OK
         if firstMatching?
           @setDistanceFrom firstMatching
         else

app/assets/javascripts/darkswarm/services/geo.js.erb.coffee

@@ -1,6 +1,6 @@
 Darkswarm.service "Geo", ->
   new class Geo
-    OK: google.maps.GeocoderStatus.OK
+    OK: google?.maps?.GeocoderStatus?.OK
 
     # Usage:
     # Geo.geocode address, (results, status) ->

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

@@ -0,0 +1,7 @@
+Darkswarm.factory 'ShopsResource', ($resource) ->
+  $resource('/api/shops/:id.json', {}, {
+    'closed_shops':
+      method: 'GET'
+      isArray: true
+      url: '/api/shops/closed_shops.json'
+  })

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

@@ -15,9 +15,11 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         if(response.error)
           Loading.clear()
           RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
+          @triggerAngularDigest()
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapCC(response.token.card.brand)
+          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
 
@@ -32,15 +34,21 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         if(response.error)
           Loading.clear()
           RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
+          @triggerAngularDigest()
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = response.paymentMethod.card.brand
+          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
 
-    # Maps the brand returned by Stripe to that required by activemerchant
-    mapCC: (ccType) ->
-      switch ccType
+    triggerAngularDigest: ->
+      # $evalAsync is improved way of triggering a digest without calling $apply
+      $rootScope.$evalAsync()
+
+    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
+    mapTokenApiCardBrand: (cardBrand) ->
+      switch cardBrand
         when 'MasterCard' then return 'master'
         when 'Visa' then return 'visa'
         when 'American Express' then return 'american_express'
@@ -48,6 +56,14 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         when 'JCB' then return 'jcb'
         when 'Diners Club' then return 'diners_club'
 
+    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
+    mapPaymentMethodsApiCardBrand: (cardBrand) ->
+      switch cardBrand
+        when 'mastercard' then return 'master'
+        when 'amex' then return 'american_express'
+        when 'diners' then return 'diners_club'
+        else return cardBrand # a few brands are equal, for example, visa
+
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

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/product_modal.html.haml

@@ -1,6 +1,5 @@
 .row
-
-  .columns.small-12.large-6.product-header
+  .columns.small-12.medium-6.large-6.product-header
     %h3{"ng-bind" => "::product.name"}
     %span
       %em {{'products_from' | t}}
@@ -8,19 +7,14 @@
 
     %br
 
-    .filter-shopfront.taxon-selectors.inline-block
-      %filter-selector{ 'selector-set' => "productTaxonSelectors", objects: "[product] | taxonsOf" }
-
     .filter-shopfront.property-selectors.inline-block
       %filter-selector{ 'selector-set' => "productPropertySelectors", objects: "[product] | propertiesWithValuesOf" }
 
-    %div{"ng-if" => "product.description_html"}
-      %hr
+    .product-description{"ng-if" => "product.description_html"}
       %p.text-small{"ng-bind-html" => "::product.description_html"}
-      %hr
 
-  .columns.small-12.large-6
-    %img.product-img{"ng-src" => "{{::product.largeImage}}", "ng-if" => "::product.largeImage"}
-    %img.product-img.placeholder{ src: "/assets/noimage/large.png", "ng-if" => "::!product.largeImage"}
+  .columns.small-12.medium-6.large-6.product-img
+    %img{"ng-src" => "{{::product.largeImage}}", "ng-if" => "::product.largeImage"}
+    %img.placeholder{ src: "/assets/noimage/large.png", "ng-if" => "::!product.largeImage"}
 
 %ng-include{src: "'partials/close.html'"}

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;
@@ -26,13 +27,11 @@
 
     a, a.button {
       display: block;
-      padding-top: 0.5rem;
 
       @include border-radius(0.5em);
 
       border: 1px solid $border-clr;
       padding: 0.5em 0.625em;
-      font-size: 0.875em;
       color: $base-clr;
       font-size: 0.75em;
       background: white;
@@ -107,26 +106,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 +176,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 +187,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-modals.css.scss

@@ -1,9 +1,30 @@
 .product-header {
+  padding-left: 1.5rem;
+
   h1, h2, h3, h4, h5, h6 {
-    margin: 0;
+    margin: 0.2rem 1.5rem 0 0;
   }
 
-  hr {
-    margin: 0.5em 0;
+  span {
+    color: $grey-500;
+  }
+
+  .product-description {
+    margin: 1rem 0.25rem 0.25rem 0;
+  }
+
+  .property-selectors li {
+    margin: 0 0.25rem 0.25rem 0;
+    padding: 0.4rem 0 0;
+
+    a {
+      border: 1px solid $grey-300;
+      font-weight: normal;
+      padding: 0.15rem 0.5rem;
+    }
+
+    span {
+      color: $grey-600;
+    }
   }
 }

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/all.scss

@@ -3,6 +3,9 @@
    * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
    * the top of the compiled file, but it's generally better to create a new file per style scope.
 
+   *= require autocomplete
+   *= require leaflet
+
    *= require_self
 */
 @import 'variables';

app/assets/stylesheets/darkswarm/animations.scss

@@ -143,8 +143,8 @@
 }
 
 .reveal-modal-bg.in {
-  filter: alpha(opacity = 50);
-  opacity: 0.5;
+  filter: alpha(opacity = 75);
+  opacity: 0.75;
 }
 
 .animate-repeat {

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;
@@ -109,9 +109,4 @@ checkout {
       }
     }
   }
-
-  .error {
-    color: #c82020;
-  }
 }
-

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

@@ -1,3 +1,4 @@
+@import "mixins";
 @import 'typography';
 
 section {
@@ -10,7 +11,7 @@ section {
   display: block;
   background: $white;
   position: relative;
-  z-index: 2;
+  z-index: 20;
 
   .details {
     box-sizing: border-box;
@@ -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/hubs.css.scss

@@ -14,5 +14,10 @@
 
   .more-controls {
     text-align: center;
+
+    .spinner {
+      height: 2.25em;
+      margin-right: 0.5em;
+    }
   }
 }

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

@@ -3,18 +3,22 @@
 @import "branding";
 
 .product-img {
-  padding: 5px;
-  margin-bottom: 10px;
-  outline: 1px solid #ccc;
+  text-align: center;
 
-  @include box-shadow(0 1px 2px 1px rgba(0, 0, 0, 0.15));
+  img {
+    padding: 0.3rem;
 
-  // placeholder for when no product images
-  &.placeholder {
-    opacity: 0.35;
+    // placeholder for when no product images
+    &.placeholder {
+      opacity: 0.35;
 
-    @media all and (max-width: 1024px) {
-      display: none;
+      @include breakpoint(desktop) {
+        display: none;
+      }
+    }
+
+    @media only screen and (max-width: 1024px) {
+      margin: 0 0 0.5rem;
     }
   }
 }
@@ -31,7 +35,7 @@
   max-height: 260px;
   overflow: hidden;
 
-  @media all and (max-width: 640px) {
+  @include breakpoint(phablet) {
     min-height: 68px;
   }
 }
@@ -49,10 +53,3 @@
 .producer-logo {
   max-width: 220px;
 }
-
-@media only screen and (max-width: 1024px) {
-  .product-img {
-    margin-top: 2em;
-    margin-bottom: 1em;
-  }
-}

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

@@ -1,10 +1,12 @@
 // 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 {
   width: 100%;
+  position: relative;
 
   map, .angular-google-map-container, google-map, .angular-google-map {
     display: block;
@@ -29,7 +31,7 @@
     margin-top: 1.2rem;
     margin-left: 1rem;
 
-    @media all and (max-width: 768px) {
+    @include breakpoint(tablet) {
       width: 80%;
     }
 
@@ -37,6 +39,30 @@
       background: rgba(255, 255, 255, 1);
     }
   }
+
+  #open-street-map {
+    z-index: 1;
+  }
+
+  #open-street-map--search {
+    top: 16px;
+    left: 54px;
+    width: 50%;
+    z-index: 1000;
+
+    .autocomplete-input,
+    .autocomplete-result-list {
+      border: 2px solid $grey-500;
+
+      &:hover, &:active, &:focus {
+        border-color: $clr-brick;
+      }
+    }
+
+    .autocomplete-result-list {
+      border-top: 1px dotted $grey-500;
+    }
+  }
 }
 
 .map-footer {
@@ -62,3 +88,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/modals.css.scss

@@ -5,8 +5,6 @@ dialog
 , .reveal-modal {
   border: none;
   outline: none;
-  padding: 30px 20px 0 20px;
-  border-bottom: 30px solid white;
   overflow-y: scroll;
   overflow-x: hidden;
   min-height: 260px;
@@ -18,23 +16,26 @@ dialog
   // Reveal.js break point:
   // @media only screen and (max-width: 40.063em)
 
-  // Small - when modal IS full screen
+  // Small - smaller outside area
   @media only screen and (max-width: 640px) {
-    left: 0;
-    max-height: 100%;
-    position: absolute !important;
-    top: 0;
+    left: 4%;
+    max-height: 92%;
+    max-width: 92%;
+    padding: 15px 0 0;
+    top: 4%;
   }
 
-  // Medium and up - when modal IS NOT full screen
+  // Medium and up - larger outside area
   @media only screen and (min-width: 641px) {
+    border-bottom: 30px solid $white;
     max-height: 90%;
+    padding: 30px 20px 0 20px;
     top: 5%;
   }
 }
 
 .reveal-modal-bg {
-  background-color: rgba(0, 0, 0, 0.85);
+  background-color: $black;
   position: fixed;
 }
 
@@ -58,6 +59,10 @@ dialog
 dialog .close-reveal-modal
 , .reveal-modal .close-reveal-modal {
   @include close-button(0.25rem);
+
+  background-color: $grey-500;
+  color: $white;
+  font-size: 1.5rem;
   right: 0.25rem;
 }
 

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/pages/login_modal.css.scss

@@ -23,6 +23,12 @@
       text-decoration: underline;
     }
   }
+
+  @media only screen and (max-width: 640px) {
+    .tabbable {
+      margin: 0 15px;
+    }
+  }
 }
 
 @media only screen and (min-width: 1025px) {

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/registration.css.scss

@@ -2,6 +2,10 @@
 @import "mixins";
 
 #registration-modal {
+  @media only screen and (max-width: 640px) {
+    margin: 0 15px;
+  }
+
   header {
     text-align: center;
 

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,18 @@
   .tab-buttons {
     color: $dark-grey;
     box-shadow: $distributor-header-shadow;
+    position: relative;
+    z-index: 10;
 
     .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 +56,7 @@
         background: none;
       }
 
-      @media all and (max-width: 640px) {
+      @include breakpoint(phablet) {
         padding: 0.35em 0 0.65em 0;
       }
     }
@@ -67,7 +69,7 @@
       }
     }
 
-    @media all and (max-width: 1024px) {
+    @include breakpoint(desktop) {
       display: table-cell;
       width: auto;
     }
@@ -76,9 +78,9 @@
   // content revealed in accordion
 
   .page-view {
-    margin-bottom: 5em;
     background: none;
     border: none;
+    padding-bottom: 5em;
 
     .content {
       padding: 1.25em 0;
@@ -104,7 +106,7 @@
       p {
         max-width: 100%;
 
-        @media all and (max-width: 768px) {
+        @include breakpoint(tablet) {
           height: auto !important;
         }
       }
@@ -121,5 +123,13 @@
         margin-bottom: 2px;
       }
     }
+
+    &.with-darker-background {
+      background-color: $very-light-grey-transparency;
+
+      a {
+        color: $teal-500;
+      }
+    }
   }
 }