Merge pull request #3769 from amers185/fix_rebase_error

Closes translation bug for enterprise fee settings

.codeclimate.yml

@@ -2,7 +2,9 @@ version: "2"
 plugins:
   rubocop:
     enabled: true
-    channel: "rubocop-0-55"
+    channel: "rubocop-0-57"
+    config:
+      file: ".rubocop_styleguide.yml"
   scss-lint:
     enabled: true
     checks:
@@ -19,23 +21,23 @@ checks:
   argument-count:
     enabled: false
   complex-logic:
-    enabled: true
+    enabled: false
   file-lines:
-    enabled: true
+    enabled: false
   method-complexity:
-    enabled: true
+    enabled: false
   method-count:
     enabled: false
   method-lines:
     enabled: false
   nested-control-flow:
-    enabled: true
+    enabled: false
   return-statements:
-    enabled: true
+    enabled: false
   similar-code:
-    enabled: true
+    enabled: false
   identical-code:
-    enabled: true
+    enabled: false
 exclude_patterns:
 - "spec/**/*"
 - "vendor/**/*"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Description
+<!-- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+
+
+## Expected Behavior
+<!-- Tell us what should happen -->
+
+
+## Actual Behaviour
+<!-- Tell us what happens instead -->
+
+
+## Steps to Reproduce
+<!-- Provide an unambiguous set of steps to reproduce this bug -->
+<!-- Include code to reproduce if relevant -->
+
+1.
+2.
+3.
+4.
+
+## Animated Gif/Screenshot
+<!-- Provide a screenshot or brief animated gif reproducing the bug. Linux users can use
+[Peek](https://github.com/phw/peek#ubuntu) while Mac users can use [Recordit](http://recordit.co/) -->
+
+
+## Context
+<!-- How has this bug affected you? What were you trying to accomplish? -->
+
+
+## Severity
+<!-- Assign a label and explain the impact.
+
+bug-s1: a critical feature is broken: checkout, payments, signup, login
+bug-s2: a non-critical feature is broken, no workaround
+bug-s3: a feature is broken but there is a workaround
+bug-s4: it's annoying, but you can use it
+bug-s5: we can live with it, only a few users impacted
+
+https://github.com/openfoodfoundation/openfoodnetwork/wiki/Bug-severity
+-->
+
+## Your Environment
+<!-- Include relevant details about the environment you experienced the bug in -->
+
+* Version used:
+* Browser name and version:
+* Operating System and version (desktop or mobile):
+* OFN Platform instance where you discovered the bug, and which version of the software they are using. 
+
+## Possible Fix
+<!-- Not obligatory, but suggest a fix or reason for the bug -->

.github/ISSUE_TEMPLATE/feature-template.md

@@ -0,0 +1,35 @@
+---
+name: Feature template
+about: Create feature epics that detail the larger feature or functionality to be
+  delivered.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## What is the problem we are solving 
+<!-- Describe the problem this feature is supposed to solve. Should be described in the icebox item (in Discourse). -->
+
+## Success factors = expected outcome 
+<!-- Describe what is the expected outcome: when the feature is released, what would it look like? What will make you say "the problem is solved"? Can be metrics like "Platform has less than 1% service interruption", or yes/no statements like "People can checkout on mobiles. -->
+
+## Useful information for inception
+<!-- List here any information that can be useful for the inception stage. -->
+
+## Link to the "Product Development - Backlog" item in Discourse
+<!-- Put the link here, and put this epic link in the Discourse item as well for cross-referencing. -->
+ Add a custom footer
+ Pages 70
+Home
+Development environment setup
+
+macOS (Sierra, HighSierra and Mojave)
+OS X (El Capitan)
+OS X (Mavericks)
+Ubuntu
+On Heroku
+Rubocop
+General guidelines
+
+Spree Commerce customisation

.github/ISSUE_TEMPLATE/story-template.md

@@ -0,0 +1,18 @@
+---
+name: Story template
+about: Create stories that are small chunks of work that devs will pick up and deliver
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Description
+<!-- Describe the story in detail:
+**- As a:** (enterprise user, super admin, user...)
+**- On page:** (provide url of the page you want to modify. If not provide where will be created the new url and the name we want to give it)
+**- I want to be able to do:** (specify the desired behavior)
+(Link to others issues or resources to provide context > only if really necessary). -->
+
+## Acceptance Criteria
+<!-- Document the outcomes that need to be achieved before this component can be considered complete. -->

.github/ISSUE_TEMPLATE/tech-debt-template.md

@@ -0,0 +1,21 @@
+---
+name: Tech debt template
+about: File a refactoring task that aids future development
+title: ''
+labels: tech debt
+assignees: ''
+
+---
+
+### What we should change and why (this is tech debt)
+<!-- The use of X changed and part y is now redundant. We can remove it and... -->
+
+
+
+### Context
+<!-- This came up in PR #3451#issuecomment-461616636. -->
+
+
+
+### Impact and timeline
+<!-- Example: This simplifies the upgrade to Spree 3 and should be done after upgrading to Spree 2. -->

.gitignore

@@ -33,10 +33,13 @@ public/images
 public/spree
 config/abr.yml
 config/initializers/feature_toggle.rb
-config/initializers/db2fog.rb
 NERD_tree*
 coverage
 libpeerconnection.log
 /config/application.yml
 node_modules
 vendor/bundle/
+coverage
+/reports/
+!/reports/README.md
+bin/

.rspec_parallel

@@ -1,4 +0,0 @@
---format Fuubar
---format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
---format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
---tag ~performance

.rubocop.yml

@@ -1,201 +1,20 @@
+# This is our main Rubocop configuration for developers. It is used when you run:
+#
+#     bundle exec rubocop
+#
+# The configuration is split into three files. Look into those files for more details.
+#
 inherit_from:
+
+  # The automatically generated todo list to ignore all current violations.
   - .rubocop_todo.yml
 
-AllCops:
-  TargetRubyVersion: 2.1
-  TargetRailsVersion: 3.2
-  Include:
-    - '**/Rakefile'
-    - '**/config.ru'
-  Exclude:
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'script/**/*'
-    - 'vendor/**/*'
-    - 'node_modules/**/*'
-    - !ruby/regexp /old_and_unused\.rb$/
-    # The parser gem fails to parse this file with out current Ruby version.
-    - 'spec/factories.rb'
+  # Our Open Food Network style guide. It's used by Code Climate. If you want to see all violations,
+  # then use only that configuration (like Code Climate):
+  #
+  #     bundle exec rubocop -c .rubocop_styleguide.yml
+  #
+  - .rubocop_styleguide.yml
 
-# OFN SETTINGS
-# Cop settings that have been agreed upon by the OFN community
-
-Rails:
-  Enabled: true
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: true
-  EnforcedStyle: ruby19_no_mixed_keys
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-# TEMPORARY/CONTESTED SETTINGS
-# These are still to be decided upon, but recommended for inclusion by
-# oeoeaio after scrutinising offenses the codebase
-
-# Don't think this is a big issue, mostly picking up RPSEC scope definitions
-# with lamdas and RSpec '.to change{}' blocks
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-# Heaps of offences (> 100) in specs, mostly in situations where two or more
-# instances of a model are required, but only one is referenced. Difficult to
-# fix without making the spec look messy or rewriting it.
-# Should definitely fix at some point.
-Lint/UselessAssignment:
-  Exclude:
-  - spec/**/*
-
-# AFAIK, there is no good alternative to dynamic matchers until we upgrade
-# to Rails 4 and can use #find_by. If there is a better approach, let's do it.
-Rails/DynamicFindBy:
-  Enabled: false
-
-# Same as above, #find_by is not available until Rails 4
-Rails/FindBy:
-  Enabled: false
-
-# Same as above, #update! is not available until Rails 4
-Rails/ActiveRecordAliases:
-  Enabled: false
-
-# This should be the programmer's discretion, perhaps we should review all of
-# the uses of it an make specific exceptions though.
-Rails/SkipsModelValidations:
-  Enabled: false
-
-# Relaxed.Ruby.Style SETTINGS
-# These styles are a starting point for the conversation around conventions
-# They should be removed or tweaked and moved above as decisions are made
-# NOTE: Cops which did not fail at the time of writing were removed
-
-Layout/DotPosition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledotposition
-
-Layout/SpaceBeforeBlockBraces:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
-
-Layout/SpaceInsideParens:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
-
-Style/Alias:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylealias
-
-Style/BlockDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
-
-Style/CommentAnnotation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
-
-Style/DoubleNegation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
-
-Style/FormatString:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleformatstring
-
-Style/IfUnlessModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
-
-Style/Lambda:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylelambda
-
-Style/MultilineBlockChain:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
-
-Style/NegatedIf:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
-
-Style/NegatedWhile:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
-
-Style/ParallelAssignment:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
-
-Style/Semicolon:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
-
-Style/SingleLineMethods:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
-
-Style/TrailingCommaInArguments:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
-
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
-
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
-
-Style/WordArray:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylewordarray
-
-Style/SymbolArray:
-  Enabled: false
-  StyleGuide: https://rubocop.readthedocs.io/en/latest/cops_style/#stylesymbolarray
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
-
-Lint/AssignmentInCondition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
+  # A manually compiled todo list to ignore metrics violations on a file-by-file basis.
+  - .rubocop_manual_todo.yml

.rubocop_manual_todo.yml

@@ -0,0 +1,756 @@
+# A manually compiled todo list to ignore metrics violations on a file-by-file basis.
+#
+# The file .rubocop_todo.yml is generated automatically and contains a
+# configuration to make all files pass. For a lot of cops it just lists
+# the offending files. But for metrics cops it sets a different metric.
+#
+# Since we don't want these lax metrics, we override them in our config
+# file .rubocop.yml which results in a lot of offences again. This file
+# lists all offending files for each cop to make rubocop pass. We can
+# improve the code over time and remove items from the list.
+#
+# This file was manually created by using the following tools:
+#
+#     rubocop > rubo.log
+#     # inspect log file to see which cops are failing
+#     # copy cop configurations and add Exclude parameter
+#     grep ExampleCop rubo.log | cut -d ":" -f 1 | sort -u >> .rubocop.yml
+#     # use vim to add `- ` before each line
+#
+# This process probably doesn't need repeating. Otherwise there is plenty
+# of room for improvements and automation.
+Metrics/LineLength:
+  Max: 100
+  Exclude:
+  - app/controllers/admin/accounts_and_billing_settings_controller.rb
+  - app/controllers/admin/bulk_line_items_controller.rb
+  - app/controllers/admin/business_model_configuration_controller.rb
+  - app/controllers/admin/contents_controller.rb
+  - app/controllers/admin/customers_controller.rb
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprise_groups_controller.rb
+  - app/controllers/admin/enterprise_relationships_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/admin/inventory_items_controller.rb
+  - app/controllers/admin/manager_invitations_controller.rb
+  - app/controllers/admin/order_cycles_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/subscription_line_items_controller.rb
+  - app/controllers/admin/subscriptions_controller.rb
+  - app/controllers/admin/variant_overrides_controller.rb
+  - app/controllers/api/enterprise_attachment_controller.rb
+  - app/controllers/api/product_images_controller.rb
+  - app/controllers/application_controller.rb
+  - app/controllers/base_controller.rb
+  - app/controllers/cart_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/controllers/shop_controller.rb
+  - app/controllers/spree/admin/adjustments_controller_decorator.rb
+  - app/controllers/spree/admin/base_controller_decorator.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
+  - app/controllers/spree/admin/products_controller_decorator.rb
+  - app/controllers/spree/admin/reports_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
+  - app/controllers/spree/api/products_controller_decorator.rb
+  - app/controllers/spree/credit_cards_controller.rb
+  - app/controllers/spree/orders_controller_decorator.rb
+  - app/controllers/spree/paypal_controller_decorator.rb
+  - app/controllers/stripe/callbacks_controller.rb
+  - app/controllers/user_confirmations_controller.rb
+  - app/helpers/admin/account_helper.rb
+  - app/helpers/admin/business_model_configuration_helper.rb
+  - app/helpers/admin/injection_helper.rb
+  - app/helpers/angular_form_builder.rb
+  - app/helpers/angular_form_helper.rb
+  - app/helpers/application_helper.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/enterprises_helper.rb
+  - app/helpers/footer_links_helper.rb
+  - app/helpers/injection_helper.rb
+  - app/helpers/markdown_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/shop_helper.rb
+  - app/helpers/spree/admin/base_helper_decorator.rb
+  - app/helpers/spree/admin/navigation_helper_decorator.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
+  - app/helpers/spree/orders_helper.rb
+  - app/jobs/finalize_account_invoices.rb
+  - app/jobs/products_cache_integrity_checker_job.rb
+  - app/jobs/subscription_confirm_job.rb
+  - app/jobs/subscription_placement_job.rb
+  - app/jobs/update_account_invoices.rb
+  - app/jobs/update_billable_periods.rb
+  - app/mailers/producer_mailer.rb
+  - app/mailers/spree/order_mailer_decorator.rb
+  - app/mailers/subscription_mailer.rb
+  - app/models/billable_period.rb
+  - app/models/column_preference.rb
+  - app/models/content_configuration.rb
+  - app/models/customer.rb
+  - app/models/enterprise_fee.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/enterprise_role.rb
+  - app/models/exchange.rb
+  - app/models/inventory_item.rb
+  - app/models/order_cycle.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/product_import/product_importer.rb
+  - app/models/product_import/spreadsheet_data.rb
+  - app/models/product_import/spreadsheet_entry.rb
+  - app/models/product_import/unit_converter.rb
+  - app/models/proxy_order.rb
+  - app/models/schedule.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
+  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/calculator/flexi_rate_decorator.rb
+  - app/models/spree/classification_decorator.rb
+  - app/models/spree/gateway/stripe_connect.rb
+  - app/models/spree/line_item_decorator.rb
+  - app/models/spree/order_decorator.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/payment_method_decorator.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/shipment_decorator.rb
+  - app/models/spree/shipping_method_decorator.rb
+  - app/models/spree/taxon_decorator.rb
+  - app/models/spree/user_decorator.rb
+  - app/models/spree/variant_decorator.rb
+  - app/models/subscription.rb
+  - app/models/variant_override.rb
+  - app/models/variant_override_set.rb
+  - app/overrides/add_distributor_details_js_to_product.rb
+  - app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
+  - app/overrides/replace_checkout_payment_button.rb
+  - app/overrides/replace_payment_name_with_description.rb
+  - app/serializers/api/admin/basic_enterprise_serializer.rb
+  - app/serializers/api/admin/enterprise_fee_serializer.rb
+  - app/serializers/api/admin/enterprise_serializer.rb
+  - app/serializers/api/admin/exchange_serializer.rb
+  - app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
+  - app/serializers/api/admin/index_enterprise_serializer.rb
+  - app/serializers/api/admin/index_order_cycle_serializer.rb
+  - app/serializers/api/admin/line_item_serializer.rb
+  - app/serializers/api/admin/order_cycle_serializer.rb
+  - app/serializers/api/admin/product_serializer.rb
+  - app/serializers/api/admin/subscription_serializer.rb
+  - app/serializers/api/admin/tag_rule_serializer.rb
+  - app/serializers/api/admin/variant_override_serializer.rb
+  - app/serializers/api/admin/variant_serializer.rb
+  - app/services/cart_service.rb
+  - app/services/embedded_page_service.rb
+  - app/services/line_item_syncer.rb
+  - app/services/order_cycle_form.rb
+  - app/services/order_factory.rb
+  - app/services/order_syncer.rb
+  - app/services/subscriptions_count.rb
+  - app/views/json/_groups.rabl
+  - app/views/json/partials/_enterprise.rabl
+  - app/views/json/_producer.rabl
+  - app/views/spree/api/products/bulk_show.v1.rabl
+  - app/views/spree/api/variants/bulk_show.v1.rabl
+  - engines/web/app/helpers/web/cookies_policy_helper.rb
+  - Gemfile
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/accounts_and_billing_settings_validator.rb
+  - lib/open_food_network/available_payment_method_filter.rb
+  - lib/open_food_network/bill_calculator.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/business_model_configuration_validator.rb
+  - lib/open_food_network/customers_report.rb
+  - lib/open_food_network/distribution_change_validator.rb
+  - lib/open_food_network/enterprise_fee_applicator.rb
+  - lib/open_food_network/enterprise_fee_calculator.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/open_food_network/group_buy_report.rb
+  - lib/open_food_network/lettuce_share_report.rb
+  - lib/open_food_network/locking.rb
+  - lib/open_food_network/order_and_distributor_report.rb
+  - lib/open_food_network/order_cycle_form_applicator.rb
+  - lib/open_food_network/order_cycle_management_report.rb
+  - lib/open_food_network/order_cycle_permissions.rb
+  - lib/open_food_network/order_grouper.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/open_food_network/payments_report.rb
+  - lib/open_food_network/permalink_generator.rb
+  - lib/open_food_network/permissions.rb
+  - lib/open_food_network/products_and_inventory_report_base.rb
+  - lib/open_food_network/products_cache.rb
+  - lib/open_food_network/proxy_order_syncer.rb
+  - lib/open_food_network/reports/bulk_coop_allocation_report.rb
+  - lib/open_food_network/reports/line_items.rb
+  - lib/open_food_network/sales_tax_report.rb
+  - lib/open_food_network/users_and_enterprises_report.rb
+  - lib/open_food_network/variant_and_line_item_naming.rb
+  - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/calculated_adjustments_decorator.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/localized_number.rb
+  - lib/spree/product_filters.rb
+  - lib/stripe/profile_storer.rb
+  - lib/tasks/cache.rake
+  - lib/tasks/data.rake
+  - lib/tasks/dev.rake
+  - lib/tasks/enterprises.rake
+  - spec/archive/features/consumer/checkout_spec.rb
+  - spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb
+  - spec/controllers/admin/bulk_line_items_controller_spec.rb
+  - spec/controllers/admin/column_preferences_controller_spec.rb
+  - spec/controllers/admin/customers_controller_spec.rb
+  - spec/controllers/admin/enterprises_controller_spec.rb
+  - spec/controllers/admin/inventory_items_controller_spec.rb
+  - spec/controllers/admin/manager_invitations_controller_spec.rb
+  - spec/controllers/admin/order_cycles_controller_spec.rb
+  - spec/controllers/admin/proxy_orders_controller_spec.rb
+  - spec/controllers/admin/schedules_controller_spec.rb
+  - spec/controllers/admin/stripe_accounts_controller_spec.rb
+  - spec/controllers/admin/stripe_connect_settings_controller_spec.rb
+  - spec/controllers/admin/subscription_line_items_controller_spec.rb
+  - spec/controllers/admin/subscriptions_controller_spec.rb
+  - spec/controllers/admin/variant_overrides_controller_spec.rb
+  - spec/controllers/api/logos_controller_spec.rb
+  - spec/controllers/api/order_cycles_controller_spec.rb
+  - spec/controllers/api/orders_controller_spec.rb
+  - spec/controllers/api/product_images_controller_spec.rb
+  - spec/controllers/api/promo_images_controller_spec.rb
+  - spec/controllers/cart_controller_spec.rb
+  - spec/controllers/checkout_controller_spec.rb
+  - spec/controllers/enterprises_controller_spec.rb
+  - spec/controllers/line_items_controller_spec.rb
+  - spec/controllers/shop_controller_spec.rb
+  - spec/controllers/shops_controller_spec.rb
+  - spec/controllers/spree/admin/adjustments_controller_spec.rb
+  - spec/controllers/spree/admin/base_controller_spec.rb
+  - spec/controllers/spree/admin/line_items_controller_spec.rb
+  - spec/controllers/spree/admin/orders_controller_spec.rb
+  - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
+  - spec/controllers/spree/admin/payments_controller_spec.rb
+  - spec/controllers/spree/admin/reports_controller_spec.rb
+  - spec/controllers/spree/api/products_controller_spec.rb
+  - spec/controllers/spree/api/variants_controller_spec.rb
+  - spec/controllers/spree/credit_cards_controller_spec.rb
+  - spec/controllers/spree/orders_controller_spec.rb
+  - spec/controllers/spree/users_controller_spec.rb
+  - spec/controllers/spree/user_sessions_controller_spec.rb
+  - spec/controllers/stripe/callbacks_controller_spec.rb
+  - spec/controllers/stripe/webhooks_controller_spec.rb
+  - spec/controllers/user_confirmations_controller_spec.rb
+  - spec/controllers/user_registrations_controller_spec.rb
+  - spec/features/admin/accounts_and_billing_settings_spec.rb
+  - spec/features/admin/adjustments_spec.rb
+  - spec/features/admin/bulk_order_management_spec.rb
+  - spec/features/admin/bulk_product_update_spec.rb
+  - spec/features/admin/customers_spec.rb
+  - spec/features/admin/enterprise_fees_spec.rb
+  - spec/features/admin/enterprise_relationships_spec.rb
+  - spec/features/admin/enterprise_roles_spec.rb
+  - spec/features/admin/enterprises/images_spec.rb
+  - spec/features/admin/enterprises/index_spec.rb
+  - spec/features/admin/enterprises_spec.rb
+  - spec/features/admin/enterprise_user_spec.rb
+  - 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
+  - spec/features/admin/products_spec.rb
+  - spec/features/admin/reports_spec.rb
+  - spec/features/admin/schedules_spec.rb
+  - spec/features/admin/shipping_methods_spec.rb
+  - spec/features/admin/subscriptions_spec.rb
+  - spec/features/admin/tag_rules_spec.rb
+  - spec/features/admin/variant_overrides_spec.rb
+  - spec/features/consumer/account/cards_spec.rb
+  - spec/features/consumer/account/settings_spec.rb
+  - spec/features/consumer/account_spec.rb
+  - spec/features/consumer/authentication_spec.rb
+  - spec/features/consumer/cookies_spec.rb
+  - spec/features/consumer/groups_spec.rb
+  - spec/features/consumer/multilingual_spec.rb
+  - spec/features/consumer/registration_spec.rb
+  - spec/features/consumer/shopping/cart_spec.rb
+  - spec/features/consumer/shopping/checkout_auth_spec.rb
+  - spec/features/consumer/shopping/checkout_spec.rb
+  - spec/features/consumer/shopping/embedded_groups_spec.rb
+  - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
+  - spec/features/consumer/shopping/orders_spec.rb
+  - spec/features/consumer/shopping/products_spec.rb
+  - spec/features/consumer/shopping/shopping_spec.rb
+  - spec/features/consumer/shopping/variant_overrides_spec.rb
+  - spec/features/consumer/shops_spec.rb
+  - spec/helpers/admin/business_model_configuration_helper_spec.rb
+  - spec/helpers/admin/subscriptions_helper_spec.rb
+  - spec/helpers/checkout_helper_spec.rb
+  - spec/helpers/enterprises_helper_spec.rb
+  - spec/helpers/groups_helper_spec.rb
+  - spec/helpers/injection_helper_spec.rb
+  - spec/helpers/order_cycles_helper_spec.rb
+  - spec/helpers/spree/admin/base_helper_spec.rb
+  - spec/jobs/confirm_order_job_spec.rb
+  - spec/jobs/finalize_account_invoices_spec.rb
+  - spec/jobs/refresh_products_cache_job_spec.rb
+  - spec/jobs/subscription_confirm_job_spec.rb
+  - spec/jobs/subscription_placement_job_spec.rb
+  - spec/jobs/update_account_invoices_spec.rb
+  - spec/jobs/update_billable_periods_spec.rb
+  - spec/lib/open_food_network/address_finder_spec.rb
+  - spec/lib/open_food_network/bulk_coop_report_spec.rb
+  - spec/lib/open_food_network/cached_products_renderer_spec.rb
+  - spec/lib/open_food_network/customers_report_spec.rb
+  - spec/lib/open_food_network/distribution_change_validator_spec.rb
+  - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
+  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
+  - spec/lib/open_food_network/enterprise_injection_data_spec.rb
+  - 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
+  - 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/products_cache_spec.rb
+  - spec/lib/open_food_network/products_renderer_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
+  - spec/lib/stripe/account_connector_spec.rb
+  - spec/lib/stripe/webhook_handler_spec.rb
+  - spec/mailers/order_mailer_spec.rb
+  - spec/mailers/producer_mailer_spec.rb
+  - spec/mailers/subscription_mailer_spec.rb
+  - spec/models/billable_period_spec.rb
+  - spec/models/column_preference_spec.rb
+  - spec/models/customer_spec.rb
+  - spec/models/enterprise_caching_spec.rb
+  - spec/models/enterprise_fee_spec.rb
+  - spec/models/enterprise_group_spec.rb
+  - spec/models/enterprise_relationship_spec.rb
+  - spec/models/enterprise_spec.rb
+  - spec/models/exchange_spec.rb
+  - spec/models/model_set_spec.rb
+  - spec/models/order_cycle_spec.rb
+  - spec/models/producer_property_spec.rb
+  - spec/models/product_importer_spec.rb
+  - spec/models/proxy_order_spec.rb
+  - spec/models/spree/ability_spec.rb
+  - spec/models/spree/adjustment_spec.rb
+  - spec/models/spree/calculator/flexi_rate_spec.rb
+  - spec/models/spree/calculator/price_sack_spec.rb
+  - spec/models/spree/classification_spec.rb
+  - spec/models/spree/gateway/stripe_connect_spec.rb
+  - spec/models/spree/image_spec.rb
+  - spec/models/spree/line_item_spec.rb
+  - spec/models/spree/order_spec.rb
+  - spec/models/spree/payment_method_spec.rb
+  - spec/models/spree/payment_spec.rb
+  - spec/models/spree/product_spec.rb
+  - spec/models/spree/property_spec.rb
+  - spec/models/spree/shipping_method_spec.rb
+  - spec/models/spree/taxon_spec.rb
+  - spec/models/spree/tax_rate_spec.rb
+  - spec/models/spree/user_spec.rb
+  - spec/models/spree/variant_spec.rb
+  - spec/models/stripe_account_spec.rb
+  - spec/models/tag_rule/discount_order_spec.rb
+  - spec/models/tag_rule/filter_order_cycles_spec.rb
+  - spec/models/tag_rule/filter_payment_methods_spec.rb
+  - spec/models/tag_rule/filter_products_spec.rb
+  - spec/models/tag_rule/filter_shipping_methods_spec.rb
+  - spec/models/variant_override_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
+  - spec/requests/checkout/stripe_connect_spec.rb
+  - spec/requests/embedded_shopfronts_headers_spec.rb
+  - spec/requests/shop_spec.rb
+  - spec/serializers/admin/customer_serializer_spec.rb
+  - spec/serializers/admin/exchange_serializer_spec.rb
+  - spec/serializers/admin/for_order_cycle/enterprise_serializer_spec.rb
+  - spec/serializers/admin/for_order_cycle/supplied_product_serializer_spec.rb
+  - spec/serializers/admin/subscription_customer_serializer_spec.rb
+  - spec/serializers/admin/variant_override_serializer_spec.rb
+  - spec/serializers/current_order_serializer.rb
+  - spec/serializers/enterprise_serializer_spec.rb
+  - spec/serializers/order_serializer_spec.rb
+  - spec/services/cart_service_spec.rb
+  - spec/services/embedded_page_service_spec.rb
+  - spec/services/order_cycle_form_spec.rb
+  - spec/services/order_factory_spec.rb
+  - spec/services/order_syncer_spec.rb
+  - spec/services/subscription_estimator_spec.rb
+  - spec/services/subscription_form_spec.rb
+  - spec/services/subscription_validator_spec.rb
+  - spec/spec_helper.rb
+  - spec/support/cancan_helper.rb
+  - spec/support/delayed_job_helper.rb
+  - spec/support/matchers/delegate_matchers.rb
+  - spec/support/matchers/select2_matchers.rb
+  - spec/support/matchers/table_matchers.rb
+  - spec/support/request/authentication_workflow.rb
+  - spec/support/request/shop_workflow.rb
+  - spec/support/request/web_helper.rb
+  - spec/support/seeds.rb
+
+Metrics/AbcSize:
+  Max: 15
+  Exclude:
+  - app/controllers/admin/bulk_line_items_controller.rb
+  - app/controllers/admin/customers_controller.rb
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/admin/order_cycles_controller.rb
+  - app/controllers/admin/product_import_controller.rb
+  - app/controllers/admin/schedules_controller.rb
+  - app/controllers/admin/stripe_accounts_controller.rb
+  - app/controllers/admin/subscription_line_items_controller.rb
+  - app/controllers/admin/subscriptions_controller.rb
+  - app/controllers/api/enterprises_controller.rb
+  - app/controllers/api/order_cycles_controller.rb
+  - app/controllers/api/product_images_controller.rb
+  - app/controllers/base_controller.rb
+  - app/controllers/cart_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/controllers/discourse_sso_controller.rb
+  - app/controllers/spree/admin/adjustments_controller_decorator.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/admin/overview_controller_decorator.rb
+  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/products_controller_decorator.rb
+  - app/controllers/spree/admin/reports_controller_decorator.rb
+  - app/controllers/spree/admin/search_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
+  - app/controllers/spree/api/products_controller_decorator.rb
+  - app/controllers/spree/credit_cards_controller.rb
+  - app/controllers/spree/orders_controller_decorator.rb
+  - app/controllers/spree/user_sessions_controller_decorator.rb
+  - app/controllers/stripe/callbacks_controller.rb
+  - app/controllers/user_confirmations_controller.rb
+  - app/controllers/user_passwords_controller.rb
+  - app/controllers/user_registrations_controller.rb
+  - app/helpers/admin/business_model_configuration_helper.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
+  - app/helpers/spree/orders_helper.rb
+  - app/jobs/finalize_account_invoices.rb
+  - app/jobs/subscription_placement_job.rb
+  - app/jobs/update_account_invoices.rb
+  - app/jobs/update_billable_periods.rb
+  - app/mailers/producer_mailer.rb
+  - app/models/billable_period.rb
+  - app/models/calculator/flat_percent_per_item.rb
+  - app/models/column_preference.rb
+  - app/models/enterprise_group.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/model_set.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/proxy_order.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
+  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/calculator/flexi_rate_decorator.rb
+  - app/models/spree/line_item_decorator.rb
+  - app/models/spree/order_decorator.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/product_set.rb
+  - app/models/spree/taxon_decorator.rb
+  - app/serializers/api/admin/enterprise_serializer.rb
+  - app/serializers/api/enterprise_serializer.rb
+  - app/serializers/api/product_serializer.rb
+  - app/serializers/api/variant_serializer.rb
+  - app/services/cart_service.rb
+  - app/services/create_order_cycle.rb
+  - app/services/order_syncer.rb
+  - app/services/subscription_validator.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bill_calculator.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/customers_report.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/open_food_network/group_buy_report.rb
+  - lib/open_food_network/lettuce_share_report.rb
+  - lib/open_food_network/option_value_namer.rb
+  - lib/open_food_network/order_and_distributor_report.rb
+  - lib/open_food_network/order_cycle_form_applicator.rb
+  - lib/open_food_network/order_cycle_management_report.rb
+  - lib/open_food_network/order_cycle_permissions.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/open_food_network/packing_report.rb
+  - lib/open_food_network/payments_report.rb
+  - lib/open_food_network/permissions.rb
+  - lib/open_food_network/products_and_inventory_report.rb
+  - lib/open_food_network/reports/line_items.rb
+  - lib/open_food_network/sales_tax_report.rb
+  - lib/open_food_network/users_and_enterprises_report.rb
+  - lib/open_food_network/variant_and_line_item_naming.rb
+  - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/localized_number.rb
+  - lib/stripe/account_connector.rb
+  - lib/tasks/enterprises.rake
+  - spec/archive/features/consumer/checkout_spec.rb
+  - spec/controllers/spree/admin/orders_controller_spec.rb
+  - spec/features/admin/reports_spec.rb
+  - spec/features/consumer/shopping/checkout_spec.rb
+  - spec/features/consumer/shopping/variant_overrides_spec.rb
+  - spec/models/enterprise_spec.rb
+  - spec/models/product_importer_spec.rb
+  - spec/support/performance_helper.rb
+
+Metrics/CyclomaticComplexity:
+  Max: 6
+  Exclude:
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/orders_controller_decorator.rb
+  - app/helpers/admin/business_model_configuration_helper.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
+  - app/jobs/update_account_invoices.rb
+  - app/jobs/update_billable_periods.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/product_set.rb
+  - app/models/variant_override_set.rb
+  - app/services/cart_service.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bill_calculator.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/spree/core/controller_helpers/order_decorator.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/localized_number.rb
+  - spec/models/product_importer_spec.rb
+
+Metrics/PerceivedComplexity:
+  Max: 7
+  Exclude:
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/orders_controller_decorator.rb
+  - app/helpers/admin/business_model_configuration_helper.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
+  - app/jobs/update_account_invoices.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/line_item_decorator.rb
+  - app/models/spree/order_decorator.rb
+  - app/models/spree/product_decorator.rb
+  - app/models/spree/product_set.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/enterprise_issue_validator.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/spree/core/controller_helpers/order_decorator.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/localized_number.rb
+  - spec/models/product_importer_spec.rb
+
+Metrics/MethodLength:
+  Max: 10
+  Exclude:
+  - app/controllers/admin/customers_controller.rb
+  - app/controllers/admin/enterprise_fees_controller.rb
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/admin/manager_invitations_controller.rb
+  - app/controllers/admin/order_cycles_controller.rb
+  - app/controllers/admin/stripe_accounts_controller.rb
+  - app/controllers/admin/subscriptions_controller.rb
+  - app/controllers/base_controller.rb
+  - app/controllers/cart_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/controllers/shop_controller.rb
+  - app/controllers/spree/admin/line_items_controller_decorator.rb
+  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/admin/payment_methods_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/products_controller_decorator.rb
+  - app/controllers/spree/admin/reports_controller_decorator.rb
+  - app/controllers/spree/admin/search_controller_decorator.rb
+  - app/controllers/spree/admin/shipping_methods_controller_decorator.rb
+  - app/controllers/spree/credit_cards_controller.rb
+  - app/controllers/spree/orders_controller_decorator.rb
+  - app/controllers/spree/user_sessions_controller_decorator.rb
+  - app/controllers/stripe/callbacks_controller.rb
+  - app/controllers/user_confirmations_controller.rb
+  - app/controllers/user_passwords_controller.rb
+  - app/controllers/user_registrations_controller.rb
+  - app/helpers/checkout_helper.rb
+  - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/orders_helper_decorator.rb
+  - app/jobs/finalize_account_invoices.rb
+  - app/jobs/subscription_placement_job.rb
+  - app/jobs/update_account_invoices.rb
+  - app/jobs/update_billable_periods.rb
+  - app/mailers/producer_mailer.rb
+  - app/models/billable_period.rb
+  - app/models/column_preference.rb
+  - app/models/enterprise.rb
+  - app/models/enterprise_relationship.rb
+  - app/models/preference_sections/footer_and_external_links_section.rb
+  - app/models/preference_sections/main_links_section.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/product_import/product_importer.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/adjustment_decorator.rb
+  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/calculator/flexi_rate_decorator.rb
+  - app/models/spree/line_item_decorator.rb
+  - app/models/spree/order_decorator.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/payment_method_decorator.rb
+  - app/models/spree/product_set.rb
+  - app/models/spree/taxon_decorator.rb
+  - app/serializers/api/admin/order_cycle_serializer.rb
+  - app/services/cart_service.rb
+  - app/services/order_cycle_form.rb
+  - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/cached_products_renderer.rb
+  - lib/open_food_network/column_preference_defaults.rb
+  - lib/open_food_network/customers_report.rb
+  - lib/open_food_network/enterprise_fee_calculator.rb
+  - lib/open_food_network/group_buy_report.rb
+  - lib/open_food_network/lettuce_share_report.rb
+  - lib/open_food_network/option_value_namer.rb
+  - lib/open_food_network/order_and_distributor_report.rb
+  - lib/open_food_network/order_cycle_form_applicator.rb
+  - lib/open_food_network/order_cycle_management_report.rb
+  - lib/open_food_network/order_cycle_permissions.rb
+  - lib/open_food_network/order_grouper.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/open_food_network/packing_report.rb
+  - lib/open_food_network/payments_report.rb
+  - lib/open_food_network/permissions.rb
+  - lib/open_food_network/products_and_inventory_report.rb
+  - lib/open_food_network/products_renderer.rb
+  - lib/open_food_network/rack_request_blocker.rb
+  - lib/open_food_network/reports/bulk_coop_allocation_report.rb
+  - lib/open_food_network/reports/bulk_coop_supplier_report.rb
+  - lib/open_food_network/reports/line_items.rb
+  - lib/open_food_network/sales_tax_report.rb
+  - lib/open_food_network/users_and_enterprises_report.rb
+  - lib/open_food_network/xero_invoices_report.rb
+  - lib/spree/core/controller_helpers/respond_with_decorator.rb
+  - lib/spree/localized_number.rb
+  - lib/stripe/profile_storer.rb
+  - spec/archive/features/consumer/checkout_spec.rb
+  - spec/features/consumer/shopping/checkout_spec.rb
+  - spec/features/consumer/shopping/variant_overrides_spec.rb
+  - spec/models/product_importer_spec.rb
+  - spec/support/request/authentication_workflow.rb
+
+Metrics/ClassLength:
+  Max: 100
+  Exclude:
+  - app/controllers/admin/enterprises_controller.rb
+  - app/controllers/admin/order_cycles_controller.rb
+  - app/controllers/admin/subscriptions_controller.rb
+  - app/controllers/checkout_controller.rb
+  - app/models/enterprise.rb
+  - app/models/order_cycle.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - app/models/product_import/product_importer.rb
+  - app/models/spree/ability_decorator.rb
+  - app/serializers/api/enterprise_serializer.rb
+  - app/services/cart_service.rb
+  - lib/open_food_network/bulk_coop_report.rb
+  - lib/open_food_network/enterprise_fee_calculator.rb
+  - lib/open_food_network/order_cycle_form_applicator.rb
+  - lib/open_food_network/order_cycle_management_report.rb
+  - lib/open_food_network/order_cycle_permissions.rb
+  - lib/open_food_network/orders_and_fulfillments_report.rb
+  - lib/open_food_network/packing_report.rb
+  - lib/open_food_network/payments_report.rb
+  - lib/open_food_network/permissions.rb
+  - lib/open_food_network/products_cache.rb
+  - lib/open_food_network/xero_invoices_report.rb
+
+Metrics/ModuleLength:
+  Max: 100
+  Exclude:
+  - lib/open_food_network/column_preference_defaults.rb
+  - spec/controllers/admin/enterprises_controller_spec.rb
+  - spec/controllers/admin/order_cycles_controller_spec.rb
+  - spec/controllers/api/order_cycles_controller_spec.rb
+  - spec/controllers/api/orders_controller_spec.rb
+  - spec/controllers/spree/api/products_controller_spec.rb
+  - spec/lib/open_food_network/address_finder_spec.rb
+  - spec/lib/open_food_network/customers_report_spec.rb
+  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
+  - spec/lib/open_food_network/option_value_namer_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
+  - spec/lib/open_food_network/permissions_spec.rb
+  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
+  - spec/lib/open_food_network/products_cache_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
+  - spec/models/spree/adjustment_spec.rb
+  - spec/models/spree/line_item_spec.rb
+  - spec/models/spree/payment_spec.rb
+  - spec/models/spree/product_spec.rb
+  - spec/models/spree/variant_spec.rb
+  - spec/support/request/web_helper.rb
+
+Metrics/ParameterLists:
+  Max: 5
+  Exclude:
+  - app/helpers/angular_form_builder.rb
+  - app/models/product_import/entry_processor.rb
+  - app/models/product_import/entry_validator.rb
+  - lib/open_food_network/xero_invoices_report.rb
+  - spec/features/admin/reports_spec.rb
+
+Metrics/BlockNesting:
+  Max: 3
+  Exclude:
+  - app/controllers/checkout_controller.rb

.rubocop_styleguide.yml

@@ -0,0 +1,215 @@
+# Our Open Food Network style guide.
+#
+# These are the rules we agreed upon and we work towards. Code Climate uses
+# these rules to rate our code and detect new violations. But when you run
+# rubocop locally, the default configuration file `.rubocop.yml` loads
+# our "todo lists" to ignore all current violations.
+AllCops:
+  TargetRubyVersion: 2.1
+  TargetRailsVersion: 3.2
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
+    # The parser gem fails to parse this file with out current Ruby version.
+    - 'spec/factories.rb'
+    # Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
+    - 'engines/web/Gemfile'
+
+## OFN SETTINGS
+#
+# Cop settings that have been agreed upon by the OFN community
+
+Rails:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Style/Send:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Metrics/LineLength:
+  Max: 100
+
+## TEMPORARY/CONTESTED SETTINGS
+#
+# These are still to be decided upon, but recommended for inclusion by
+# oeoeaio after scrutinising offenses the codebase
+
+# Don't think this is a big issue, mostly picking up RPSEC scope definitions
+# with lamdas and RSpec '.to change{}' blocks
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+# Heaps of offences (> 100) in specs, mostly in situations where two or more
+# instances of a model are required, but only one is referenced. Difficult to
+# fix without making the spec look messy or rewriting it.
+# Should definitely fix at some point.
+Lint/UselessAssignment:
+  Exclude:
+  - spec/**/*
+
+# AFAIK, there is no good alternative to dynamic matchers until we upgrade
+# to Rails 4 and can use #find_by. If there is a better approach, let's do it.
+Rails/DynamicFindBy:
+  Enabled: false
+
+# Same as above, #find_by is not available until Rails 4
+Rails/FindBy:
+  Enabled: false
+
+# Same as above, #update! is not available until Rails 4
+Rails/ActiveRecordAliases:
+  Enabled: false
+
+# This should be the programmer's discretion, perhaps we should review all of
+# the uses of it an make specific exceptions though.
+Rails/SkipsModelValidations:
+  Enabled: false
+
+## Relaxed.Ruby.Style SETTINGS
+#
+# These styles are a starting point for the conversation around conventions
+# They should be removed or tweaked and moved above as decisions are made
+# NOTE: Cops which did not fail at the time of writing were removed
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewordarray
+
+Style/SymbolArray:
+  Enabled: false
+  StyleGuide: https://rubocop.readthedocs.io/en/latest/cops_style/#stylesymbolarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Max: 15
+
+Metrics/BlockLength:
+  ExcludedMethods: ["collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]
+
+Metrics/BlockNesting:
+  Max: 3
+
+Metrics/ClassLength:
+  Max: 100
+  Exclude:
+  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
+
+Metrics/ModuleLength:
+  Max: 100
+
+Metrics/CyclomaticComplexity:
+  Max: 6
+
+Metrics/MethodLength:
+  Max: 10
+  Exclude:
+  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
+
+Metrics/ParameterLists:
+  Max: 5
+
+Metrics/PerceivedComplexity:
+  Max: 7

.travis.yml

@@ -9,9 +9,6 @@ addons:
 
 # Set the timezone for phantomjs with TZ
 # Set the timezone for karma with TIMEZONE
-#
-# The test cases are roughly split according to their test times.
-# It would be better to use https://github.com/ArturT/knapsack.
 env:
   global:
     - TZ="Australia/Melbourne"
@@ -21,7 +18,7 @@ env:
     - CI_NODE_INDEX=0
     - CI_NODE_INDEX=1
     - CI_NODE_INDEX=2
-    - CI_NODE_INDEX=3
+    - CI_NODE_INDEX=3 RSPEC_ENGINES="true"
     - CI_NODE_INDEX=4 KARMA="true" GITHUB_DEPLOY="true"
 
 before_script:
@@ -42,6 +39,7 @@ before_script:
 
 script:
   - 'if [ "$KARMA" = "true" ]; then bundle exec rake karma:run; else echo "Skipping karma run"; fi'
+  - 'if [ "$RSPEC_ENGINES" = "true" ]; then bundle exec rake ofn:specs:engines:rspec; else echo "Skipping RSpec run in engines"; fi'
   - "bundle exec rake 'knapsack:rspec[--format progress --tag ~performance]'"
 
 after_success:

GETTING_STARTED.md

@@ -46,7 +46,7 @@ First, you need to create the database user the app will use by manually typing
 $ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"
 ```
 
-This will create the "ofn" user as superuser and allowing it to create databases.
+This will create the "ofn" user as superuser and allowing it to create databases. If this command fails, check the [troubleshooting section](#creating-the-database) for an alternative.
 
 Once done, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
@@ -69,10 +69,18 @@ Tests, both unit and integration, are based on RSpec. To run the test suite, fir
 
     bundle exec rake db:test:prepare
 
-Then the tests can be run with:
+Then the main application tests can be run with:
 
     bundle exec rspec spec
 
+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: The time zone on your machine should match the one defined in `config/application.yml`.
+
 The project is configured to use [Zeus][zeus] to reduce the pre-test startup time while Rails loads. See the [Zeus GitHub page][zeus] for usage instructions.
 
 Once [npm dependencies are installed][karma], AngularJS tests can be run with:
@@ -93,12 +101,28 @@ You can run rubocop against your changes using:
 
     rubocop
 
+### Troubleshooting
+
+Below are fixes to potential issues that can happen during the installation process. If these don't solve the problem, or it's not listed, feel free to reach out to the [Developer Community][slack-dev] on slack. We usually respond pretty quickly.
+
+#### Creating the database
+
+If the ```$ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"``` command doesn't work, you can run the following commands instead:
+```
+$ createuser --superuser --pwprompt ofn
+Enter password for new role: f00d
+Enter it again: f00d
+$ createdb open_food_network_dev --owner=ofn
+$ 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:-macOS-(Sierra)
+[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)
 [ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
 [wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
 [zeus]: https://github.com/burke/zeus
 [rubocop]: https://rubocop.readthedocs.io/en/latest/
 [karma]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma
+[slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU

Gemfile

@@ -5,13 +5,16 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 gem 'rails', '~> 3.2.22'
 gem 'rails-i18n', '~> 3.0.0'
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.0.0'
+gem 'i18n-js', '~> 3.2.1'
 
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
 
+gem "order_management", path: "./engines/order_management"
+gem 'web', path: './engines/web'
+
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '69db1c090f3711088d84b524f1b94d25e6d21616'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '41906362d931695e0616194341a68d2c4c85aaaf'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
 
@@ -20,16 +23,17 @@ gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch:
 # - Change type of password from string to password to hide it in the form
 gem 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "spree-upgrade-intermediate"
 #gem 'spree_paypal_express', github: "spree-contrib/better_spree_paypal_express", branch: "1-3-stable"
-gem 'stripe', '~> 3.3.2'
+gem 'stripe'
 # We need at least this version to have Digicert's root certificate
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78'
 
-gem 'oauth2', '~> 1.2.0' # Used for Stripe Connect
-gem 'jwt', '~> 1.5'
+gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect
+gem 'jwt', '~> 2.1'
 
 gem 'delayed_job_active_record'
 gem 'daemons'
+gem 'delayed_job_web'
 
 # Fix bug in simple_form preventing collection_check_boxes usage within form_for block
 # When merged, revert to upstream gem
@@ -46,7 +50,6 @@ gem 'aws-sdk'
 gem 'db2fog'
 gem 'andand'
 gem 'truncate_html'
-gem 'representative_view'
 gem 'rabl'
 
 # AMS is pinned to 0.8.4 because 0.9.x is a complete re-write, as is 0.10.x
@@ -62,15 +65,16 @@ gem 'spinjs-rails'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'rack-rewrite'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
-gem 'angularjs-file-upload-rails', '~> 1.1.6'
-gem 'roadie-rails', '~> 1.0.3'
+gem 'angularjs-file-upload-rails', '~> 2.4.1'
+gem 'roadie-rails', '~> 1.1.1'
 gem 'figaro'
 gem 'blockenspiel'
 gem 'acts-as-taggable-on', '~> 3.4'
-gem 'paper_trail', '~> 3.0.8'
+gem 'paper_trail', '~> 5.2.3'
 gem 'diffy'
 gem 'skylight', '< 2.0'
 
+gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
@@ -87,8 +91,7 @@ group :assets do
   gem 'compass-rails'
   gem 'coffee-rails', '~> 3.2.1'
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer'
+  gem 'therubyracer', '=0.12.0'
 
   gem 'uglifier', '>= 1.0.3'
 
@@ -103,7 +106,6 @@ gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper',
 
 gem 'jquery-rails'
 gem 'jquery-migrate-rails'
-gem 'css_splitter'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
 
@@ -118,7 +120,8 @@ group :test, :development do
   gem 'awesome_print'
   gem 'letter_opener', '>= 1.4.1'
   gem 'timecop'
-  gem 'poltergeist', '>= 1.16.0'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
   gem 'rspec-retry'
   gem 'json_spec', '~> 1.1.4'
   gem 'unicorn-rails'
@@ -128,6 +131,7 @@ end
 
 group :test do
   gem 'webmock'
+  gem 'simplecov', require: false
   # See spec/spec_helper.rb for instructions
   #gem 'perftools.rb'
 end
@@ -141,11 +145,14 @@ group :development do
   gem 'guard-livereload'
   gem 'guard-rails'
   gem 'guard-rspec', '~> 4.7.3'
-  gem 'parallel_tests'
   gem 'rubocop', '>= 0.49.1'
+  gem 'spring', '1.7.2'
+  gem 'spring-commands-rspec'
 
   # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
   # While we don't require this gem directly, no dependents forced the upgrade to a version
   # greater than 1.0.9, so we just required the latest available version here.
   gem 'eventmachine', '>= 1.2.3'
+
+  gem 'rack-mini-profiler', '< 1.0.0'
 end

Gemfile.lock

@@ -31,8 +31,8 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 69db1c090f3711088d84b524f1b94d25e6d21616
-  ref: 69db1c090f3711088d84b524f1b94d25e6d21616
+  revision: 41906362d931695e0616194341a68d2c4c85aaaf
+  ref: 41906362d931695e0616194341a68d2c4c85aaaf
   branch: step-6a
   specs:
     spree (1.3.99)
@@ -133,10 +133,20 @@ GIT
       activemodel (>= 3.0)
       railties (>= 3.0)
 
+PATH
+  remote: engines/order_management
+  specs:
+    order_management (0.0.1)
+
+PATH
+  remote: engines/web
+  specs:
+    web (0.0.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
+    CFPropertyList (2.3.6)
     actionmailer (3.2.22.5)
       actionpack (= 3.2.22.5)
       mail (~> 2.5.4)
@@ -181,14 +191,16 @@ GEM
       railties (>= 3.1)
       sprockets (~> 2.0)
       tilt
-    angularjs-file-upload-rails (1.1.6)
+    angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.5.5)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
     arel (3.0.3)
     ast (2.4.0)
     atomic (1.1.101)
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
-    awesome_print (1.0.2)
+    awesome_print (1.8.0)
     aws-sdk (1.11.1)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -196,8 +208,9 @@ GEM
     bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    blockenspiel (0.4.5)
-    bugsnag (4.1.0)
+    blockenspiel (0.5.0)
+    bugsnag (6.11.1)
+      concurrent-ruby (~> 1.0)
     builder (3.0.4)
     byebug (9.0.6)
     cancan (1.6.8)
@@ -208,10 +221,14 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.1.0)
+      archive-zip (~> 0.7.0)
+      nokogiri (~> 1.6)
     chronic (0.10.2)
     chunky_png (1.3.10)
-    climate_control (0.1.0)
-    cliver (0.3.2)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
@@ -223,6 +240,8 @@ GEM
       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)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -239,25 +258,30 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
+    concurrent-ruby (1.1.4)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.3.5)
+    css_parser (1.6.0)
       addressable
-    css_splitter (0.4.5)
-      sprockets (>= 2.0.0)
-    daemons (1.2.6)
-    dalli (2.7.2)
+    daemons (1.3.1)
+    dalli (2.7.10)
     database_cleaner (0.7.1)
-    db2fog (0.8.0)
-      activerecord (~> 3.0)
+    db2fog (0.9.0)
+      activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
-      rails (~> 3.0)
+      rails (>= 3.2.0, < 5.0)
     debugger-linecache (1.2.0)
-    delayed_job (4.1.4)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
+    delayed_job_active_record (4.1.3)
+      activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
+    delayed_job_web (1.4.3)
+      activerecord (> 3.0.0)
+      delayed_job (> 2.0.3)
+      rack-protection (>= 1.5.5)
+      sinatra (>= 1.4.4)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -266,41 +290,49 @@ GEM
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     diff-lcs (1.3)
-    diffy (3.1.0)
+    diffy (3.3.0)
+    docile (1.3.1)
+    dry-inflector (0.1.2)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    excon (0.45.4)
-    execjs (2.6.0)
+    excon (0.62.0)
+    execjs (2.7.0)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
       factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffaker (1.15.0)
-    ffi (1.9.25)
-    figaro (0.7.0)
-      bundler (~> 1.0)
-      rails (>= 3, < 5)
+    ffi (1.10.0)
+    figaro (1.1.1)
+      thor (~> 0.14)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.36.0)
+    fog (1.41.0)
       fog-aliyun (>= 0.1.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
       fog-dynect (~> 0.0.2)
       fog-ecloud (~> 0.1)
       fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
       fog-json
       fog-local
+      fog-openstack
       fog-powerdns (>= 0.1.1)
       fog-profitbricks
+      fog-rackspace
       fog-radosgw (>= 0.0.2)
       fog-riakcs
       fog-sakuracloud (>= 0.0.4)
@@ -310,32 +342,47 @@ GEM
       fog-terremark
       fog-vmfusion
       fog-voxel
+      fog-vsphere (>= 0.4.0)
       fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.3.2)
+      fog-core
+      fog-json
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.7.6)
-      fog-core (~> 1.27)
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.9.0)
-      fog-core (~> 1.22)
+    fog-brightbox (0.16.1)
+      dry-inflector
+      fog-core
       fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.35.0)
+      mime-types
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.45)
+      excon (~> 0.58)
       formatador (~> 0.2)
-    fog-dynect (0.0.2)
+    fog-digitalocean (0.4.0)
+      fog-core
+      fog-json
+      fog-xml
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
       fog-core
       fog-json
       fog-xml
@@ -346,20 +393,35 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
+    fog-internet-archive (0.0.1)
       fog-core
+      fog-json
       fog-xml
-      nokogiri
-    fog-radosgw (0.0.4)
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.2.0)
+      fog-core
+      multi_json (~> 1.10)
+    fog-local (0.6.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.1.25)
+      fog-core (~> 1.40)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.2.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.6)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
       fog-core (>= 1.21.0)
       fog-json
       fog-xml (>= 0.0.1)
@@ -367,13 +429,13 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.4.0)
+    fog-sakuracloud (1.7.5)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.0.2)
+    fog-softlayer (1.1.4)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -388,30 +450,33 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-xenserver (0.2.2)
+    fog-vsphere (2.3.0)
+      fog-core
+      rbvmomi (~> 1.9)
+    fog-xenserver (0.3.0)
       fog-core
       fog-xml
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
       fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
+      nokogiri (>= 1.5.11, < 2.0.0)
     foreigner (1.7.4)
       activerecord (>= 3.0.0)
     formatador (0.2.5)
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foundation-rails (5.5.0.0)
+    foundation-rails (5.5.2.1)
       railties (>= 3.1.0)
-      sass (>= 3.2.0, < 3.4)
+      sass (>= 3.3.0, < 3.5)
     fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
-    guard (2.14.1)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -430,7 +495,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (4.0.4)
+    haml (4.0.7)
       tilt
     hashdiff (0.3.7)
     highline (1.6.15)
@@ -440,12 +505,13 @@ GEM
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.11)
-    i18n-js (3.0.11)
-      i18n (>= 0.6.6, < 2)
+    i18n-js (3.2.1)
+      i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
+    io-like (0.3.0)
+    ipaddress (0.8.3)
+    jaro_winkler (1.5.1)
     journey (1.0.4)
     jquery-migrate-rails (1.2.1)
     jquery-rails (2.2.2)
@@ -455,31 +521,31 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (1.5.4)
+    jwt (2.1.0)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    kgio (2.9.3)
-    knapsack (1.16.0)
+    kgio (2.11.2)
+    knapsack (1.17.1)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.6.0)
+    letter_opener (1.7.0)
       launchy (~> 2.2)
     libv8 (3.16.14.19)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (1.25.1)
     mini_mime (1.0.1)
     mini_portile2 (2.1.0)
-    momentjs-rails (2.5.1)
+    momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.0)
       i18n (~> 0.6.0)
@@ -487,30 +553,30 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (2.1.2)
+    oj (3.7.12)
     orm_adapter (0.5.0)
-    paper_trail (3.0.9)
-      activerecord (>= 3.0, < 5.0)
-      activesupport (>= 3.0, < 5.0)
+    paper_trail (5.2.3)
+      activerecord (>= 3.0, < 6.0)
+      request_store (~> 1.1)
     paperclip (3.5.4)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     parallel (1.11.2)
-    parallel_tests (2.14.1)
-      parallel
     parser (2.5.1.0)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
@@ -519,15 +585,11 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.21.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
-    pry (0.11.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.4.3)
@@ -540,6 +602,10 @@ GEM
     rack (1.4.7)
     rack-cache (1.8.0)
       rack (>= 0.4)
+    rack-mini-profiler (0.10.7)
+      rack (>= 1.2.0)
+    rack-protection (1.5.5)
+      rack
     rack-rewrite (1.5.1)
     rack-ssl (1.3.4)
       rack
@@ -564,8 +630,8 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.13.0)
-    rake (12.3.1)
+    raindrops (0.19.0)
+    rake (12.3.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -573,24 +639,23 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
+    rbvmomi (1.13.0)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.2.3)
+    redcarpet (3.4.0)
     ref (2.0.0)
-    representative (1.0.5)
-      activesupport (>= 2.2.2)
-      builder (>= 2.1.2)
-      i18n (>= 0.4.1)
-      nokogiri (>= 1.4.2)
-    representative_view (1.2.2)
-      actionpack (> 2.3.0, < 4.0.0)
-      representative (~> 1.0.2)
-    roadie (3.0.1)
-      css_parser (~> 1.3.4)
-      nokogiri (~> 1.6.0)
-    roadie-rails (1.0.3)
-      rails (>= 3.0, < 4.2)
-      roadie (~> 3.0)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    roadie (3.4.0)
+      css_parser (~> 1.4)
+      nokogiri (~> 1.5)
+    roadie-rails (1.1.1)
+      railties (>= 3.0, < 5.1)
+      roadie (~> 3.1)
     roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
@@ -598,30 +663,31 @@ GEM
       nokogiri
       roo (>= 2.0.0beta1, < 3)
       spreadsheet (> 0.9.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-retry (0.5.6)
-      rspec-core (> 3.3, < 3.8)
-    rspec-support (3.7.1)
-    rubocop (0.55.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-retry (0.6.1)
+      rspec-core (> 3.3)
+    rspec-support (3.8.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -630,6 +696,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.10.0)
+    ruby-rc4 (0.1.5)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sass (3.3.14)
@@ -639,15 +706,30 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.5.10)
       thor (~> 0.14)
+    selenium-webdriver (3.141.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2, >= 1.2.2)
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    skylight (1.6.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    skylight (1.7.2)
       activesupport (>= 3.0.0)
-    spinjs-rails (1.3)
+    spinjs-rails (1.4)
       rails (>= 3.1)
     spreadsheet (1.1.4)
       ruby-ole (>= 1.0)
+    spring (1.7.2)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -655,31 +737,31 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     state_machine (1.2.0)
     stringex (1.3.3)
-    stripe (3.3.2)
-      faraday (~> 0.9)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
+    stripe (4.11.0)
+      faraday (~> 0.13)
+      net-http-persistent (~> 3.0)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     tilt (1.4.1)
     timecop (0.9.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    trollop (2.9.9)
     truncate_html (0.9.2)
-    turbo-sprockets-rails3 (0.3.6)
+    turbo-sprockets-rails3 (0.3.14)
       railties (> 3.2.8, < 4.0.0)
-      sprockets (>= 2.0.0)
-    tzinfo (0.3.54)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+      sprockets (>= 2.2.0)
+    tzinfo (0.3.55)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.2)
-    unicorn (4.9.0)
+    unicorn (5.5.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    unicorn-rails (1.1.0)
+    unicorn-rails (2.2.1)
       rack
       unicorn
     uuidtools (2.1.5)
@@ -689,18 +771,14 @@ GEM
       railties (>= 3.0)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    whenever (0.9.2)
-      activesupport (>= 2.3.4)
+    whenever (0.11.0)
       chronic (>= 0.6.3)
     wicked_pdf (1.1.0)
-    wkhtmltopdf-binary (0.12.3.1)
+    wkhtmltopdf-binary (0.12.4)
     xml-simple (1.1.5)
     xpath (2.1.0)
       nokogiri (~> 1.3)
@@ -714,7 +792,7 @@ DEPENDENCIES
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.3.0)
-  angularjs-file-upload-rails (~> 1.1.6)
+  angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.5.5)
   atomic
   awesome_print
@@ -723,9 +801,10 @@ DEPENDENCIES
   bugsnag
   byebug (~> 9.0.0)
   capybara (>= 2.15.4)
+  chromedriver-helper
   coffee-rails (~> 3.2.1)
+  combine_pdf
   compass-rails
-  css_splitter
   custom_error_message!
   daemons
   dalli
@@ -734,6 +813,7 @@ DEPENDENCIES
   debugger-linecache
   deface!
   delayed_job_active_record
+  delayed_job_web
   diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails
@@ -751,34 +831,33 @@ DEPENDENCIES
   guard-rspec (~> 4.7.3)
   haml
   i18n (~> 0.6.11)
-  i18n-js (~> 3.0.0)
+  i18n-js (~> 3.2.1)
   immigrant
   jquery-migrate-rails
   jquery-rails
   json_spec (~> 1.1.4)
-  jwt (~> 1.5)
+  jwt (~> 2.1)
   knapsack
   letter_opener (>= 1.4.1)
   listen (= 3.0.8)
   momentjs-rails
   nokogiri (>= 1.6.7.1)
-  oauth2 (~> 1.2.0)
+  oauth2 (~> 1.4.1)
   ofn-qz!
   oj
-  paper_trail (~> 3.0.8)
+  order_management!
+  paper_trail (~> 5.2.3)
   paperclip
-  parallel_tests
   pg
-  poltergeist (>= 1.16.0)
   pry-byebug (>= 3.4.3)
   rabl
+  rack-mini-profiler (< 1.0.0)
   rack-rewrite
   rack-ssl
   rails (~> 3.2.22)
   rails-i18n (~> 3.0.0)
   redcarpet
-  representative_view
-  roadie-rails (~> 1.0.3)
+  roadie-rails (~> 1.1.1)
   roo (~> 2.7.0)
   roo-xls (~> 1.1.0)
   rspec-rails (>= 3.5.2)
@@ -786,22 +865,27 @@ DEPENDENCIES
   rubocop (>= 0.49.1)
   sass (~> 3.3)
   sass-rails (~> 3.2.3)
+  selenium-webdriver
   shoulda-matchers
   simple_form!
+  simplecov
   skylight (< 2.0)
   spinjs-rails
   spree!
   spree_auth_devise!
   spree_i18n!
   spree_paypal_express!
-  stripe (~> 3.3.2)
-  therubyracer
+  spring (= 1.7.2)
+  spring-commands-rspec
+  stripe
+  therubyracer (= 0.12.0)
   timecop
   truncate_html
   turbo-sprockets-rails3
   uglifier (>= 1.0.3)
   unicorn
   unicorn-rails
+  web!
   webmock
   whenever
   wicked_pdf
@@ -811,4 +895,4 @@ RUBY VERSION
    ruby 2.1.5p273
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/openfoodfoundation/openfoodnetwork.svg?branch=master)](https://travis-ci.org/openfoodfoundation/openfoodnetwork)
+[![Build Status](https://semaphoreci.com/api/v1/openfoodfoundation/openfoodnetwork-2/branches/master/badge.svg)](https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 [![View performance data on Skylight](https://badges.skylight.io/status/EiXQ6sSKij8y.svg)](https://oss.skylight.io/app/applications/EiXQ6sSKij8y)
 

app/assets/javascripts/admin/all.js

@@ -9,7 +9,7 @@
 //= require jquery-migrate-min
 //= require jquery_ujs
 //= require jquery-ui
-//= require shared/jquery-ui-timepicker-addon
+//= require jquery-ui-timepicker-addon
 //= require angular
 //= require angular-resource
 //= require angular-animate
@@ -54,14 +54,16 @@
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
 //= require moment
+//= require moment/de.js
 //= require moment/en-gb.js
 //= require moment/es.js
 //= require moment/fr.js
 //= require moment/it.js
 //= require moment/nb.js
 //= require moment/pt-br.js
+//= require moment/pt.js
 //= require moment/sv.js
-//= require ../shared/mm-foundation-tpls-0.8.0.min.js
+//= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 //= require angularjs-file-upload
 
 //= require_tree .

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

@@ -65,13 +65,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       DirtyProducts.clear()
       StatusMessage.clear()
 
-    # $scope.matchProducer = (product) ->
-    #   for producer in $scope.producers
-    #     if angular.equals(producer.id, product.producer)
-    #       product.producer = producer
-    #       break
-
-
     $scope.updateOnHand = (product) ->
       on_demand_variants = []
       if product.variants

app/assets/javascripts/admin/customers/directives/edit_address_dialog.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").directive 'editAddressDialog', ($compile, $templateCache, $filter, DialogDefaults, Customers, StatusMessage) ->
+angular.module("admin.customers").directive 'editAddressDialog', ($compile, $templateCache, DialogDefaults, Customers, StatusMessage, CountryStates) ->
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
@@ -6,9 +6,10 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
     scope.errors = []
 
     scope.$watch 'address.country_id', (newCountryID) ->
-      if newCountryID
-        scope.states = scope.filterStates(newCountryID)
-        scope.clearState() unless scope.addressStateMatchesCountry()
+      return unless newCountryID
+      scope.states = CountryStates.statesFor(scope.availableCountries, newCountryID)
+      unless CountryStates.addressStateMatchesCountryStates(scope.states, scope.address.state_id)
+        scope.address.state_id = ""
 
     scope.updateAddress = ->
       scope.edit_address_form.$setPristine()
@@ -27,19 +28,9 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
       else
         scope.addressType = 'ship_address'
       scope.address = scope.customer[scope.addressType]
-      scope.states = scope.filterStates(scope.address?.country_id)
+      scope.states = CountryStates.statesFor(scope.availableCountries, scope.address?.country_id)
 
       template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
       template.dialog(DialogDefaults)
       template.dialog('open')
       scope.$apply()
-
-    scope.filterStates = (countryID) ->
-      return [] unless countryID
-      $filter('filter')(scope.availableCountries, {id: parseInt(countryID)}, true)[0].states
-
-    scope.clearState = ->
-      scope.address.state_id = ""
-
-    scope.addressStateMatchesCountry = ->
-      scope.states.some (state) -> state.id == scope.address.state_id

app/assets/javascripts/admin/enterprise_fees/controllers/enterprise_fees_controller.js.coffee

@@ -1,6 +1,6 @@
 angular.module('admin.enterpriseFees').controller 'enterpriseFeesCtrl', ($scope, $http, $window, enterprises, tax_categories, calculators) ->
   $scope.enterprises = enterprises
-  $scope.tax_categories =  [{id: -1, name: "Inherit From Product"}].concat tax_categories
+  $scope.tax_categories =  [{id: -1, name: t('js.admin.enterprise_fees.inherit_from_product') }].concat tax_categories
   $scope.calculators = calculators
 
   $scope.enterpriseFeesUrl = ->

app/assets/javascripts/admin/enterprise_fees/directives/delete_resource.js.coffee

@@ -1,7 +1,7 @@
 angular.module('admin.enterpriseFees').directive 'spreeDeleteResource', ->
   (scope, element, attrs) ->
     if scope.enterprise_fee.id
-      url = '/admin/enterprise_fees/' + scope.enterprise_fee.id
+      url = '/api/enterprise_fees/' + scope.enterprise_fee.id
       html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="' + t('are_you_sure') + '" url="' + url + '"></a>'
       #var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
       element.append html

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

@@ -1,5 +1,5 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
+  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, Enterprises, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
     $scope.Enterprise = enterprise
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
@@ -67,3 +67,27 @@ angular.module("admin.enterprises")
 
     $scope.resetModal = ->
       $scope.newUser = $scope.invite_errors = $scope.invite_success = null
+
+    $scope.removeLogo = ->
+      return unless confirm(t("admin.enterprises.remove_logo.immediate_removal_warning"))
+
+      Enterprises.removeLogo($scope.Enterprise).then (data) ->
+        $scope.Enterprise = angular.copy(data)
+        $scope.$emit("enterprise:updated", $scope.Enterprise)
+
+        StatusMessage.display("success", t("admin.enterprises.remove_logo.removed_successfully"))
+      , (response) ->
+        if response.data.error?
+          StatusMessage.display("failure", response.data.error)
+
+    $scope.removePromoImage = ->
+      return unless confirm(t("admin.enterprises.remove_promo_image.immediate_removal_warning"))
+
+      Enterprises.removePromoImage($scope.Enterprise).then (data) ->
+        $scope.Enterprise = angular.copy(data)
+        $scope.$emit("enterprise:updated", $scope.Enterprise)
+
+        StatusMessage.display("success", t("admin.enterprises.remove_promo_image.removed_successfully"))
+      , (response) ->
+        if response.data.error?
+          StatusMessage.display("failure", response.data.error)

app/assets/javascripts/admin/index_utils/services/dereferencer.js.coffee

@@ -9,4 +9,4 @@ angular.module("admin.indexUtils").factory 'Dereferencer', ->
     dereferenceAttr: (array, attr, data)->
       if array
         for object in array
-          object[attr] = data[object[attr].id] unless object[attr] == null
+          object[attr] = data[object[attr].id] if object[attr]

app/assets/javascripts/admin/index_utils/services/request_monitor.js.coffee

@@ -1,11 +1,12 @@
 angular.module("admin.indexUtils").factory 'RequestMonitor', ($q) ->
   new class RequestMonitor
     loadQueue: $q.when([])
-    loadId: 0
+    requestCount: 0
     loading: false
 
     load: (promise) ->
-      loadId = (@loadId += 1)
+      @requestCount += 1
       @loading = true
       @loadQueue = $q.all([@loadQueue, promise]).then =>
-        @loading = false if @loadId == loadId
+        @requestCount -= 1
+        @loading = false if @requestCount == 0

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

@@ -26,19 +26,31 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       $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')
 
-    RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
-    RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
+    formatted_start_date = moment($scope.startDate).format()
+    formatted_end_date = moment($scope.endDate).add(1,'day').format()
+
+    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
+    )
+
+    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
+    )
 
     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")
 
-    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise]).then ->
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
       Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
       Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
-
-    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
       Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
       Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
       $scope.bulk_order_form.$setPristine()
@@ -48,8 +60,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
         $timeout ->
           $scope.resetSelectFilters()
 
-  $scope.refreshData()
-
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
       StatusMessage.display 'notice', t('js.unsaved_changes')
@@ -143,3 +153,5 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     if lineItem.quantity > 0
       lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
       $scope.weightAdjustedPrice(lineItem)
+
+  $scope.refreshData()

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

@@ -3,8 +3,12 @@ angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, C
   $scope.columns = Columns.columns
   $scope.saveAll = -> OrderCycles.saveChanges($scope.order_cycles_form)
   $scope.ordersCloseAtLimit = -31 # days
-  $scope.involvingFilter = 0
-  $scope.scheduleFilter = 0
+
+  $scope.resetSelectFilters = ->
+    $scope.scheduleFilter = 0
+    $scope.involvingFilter = 0
+    $scope.query = ''
+  $scope.resetSelectFilters()
 
   compileData = ->
     for schedule in $scope.schedules

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

@@ -10,17 +10,19 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.e
         # using $parse instead of scope[attrs.datetimepicker] for cases
         # where attrs.datetimepicker is 'foo.bar.lol'
         $(element).datetimepicker
-        	dateFormat: 'yy-mm-dd'
-        	timeFormat: 'HH:mm:ss'
-        	showOn: "button"
-        	buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
-        	buttonImageOnly: true
-        	stepMinute: 15
-        	onSelect: (dateText, inst) ->
-        	  scope.$apply(->
+          dateFormat: 'yy-mm-dd'
+          timeFormat: 'HH:mm'
+          showOn: 'button'
+          controlType: 'select'
+          oneLine: true
+          buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
+          buttonImageOnly: true
+          stepMinute: 15
+          onSelect: (dateText, inst) ->
+            scope.$apply(->
               element.val(dateText)
-        	    parsed = $parse(attrs.datetimepicker)
-        	    parsed.assign(scope, dateText)
+              parsed = $parse(attrs.datetimepicker)
+              parsed.assign(scope, dateText)
             )
 
 

app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee

@@ -156,7 +156,7 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, S
         if response.data.errors?
           StatusMessage.display('failure', response.data.errors[0])
         else
-          StatusMessage.display('failure', 'Failed to create order cycle')
+          StatusMessage.display('failure', t('js.order_cycles.create_failure'))
 
     update: (destination, form) ->
       return unless @confirmNoDistributors()
@@ -171,7 +171,7 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, S
         if response.data.errors?
           StatusMessage.display('failure', response.data.errors[0])
         else
-          StatusMessage.display('failure', 'Failed to create order cycle')
+          StatusMessage.display('failure', t('js.order_cycles.update_failure'))
 
 
     confirmNoDistributors: ->

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

@@ -0,0 +1,32 @@
+angular.module("admin.orders").controller "bulkInvoiceCtrl", ($scope, $http, $timeout) ->
+  $scope.createBulkInvoice = ->
+    $scope.invoice_id = null
+    $scope.poll = 1
+    $scope.loading = true
+    $scope.message = null
+    $scope.error = null
+    $scope.poll_wait = 5 # 5 Seconds between each check
+    $scope.poll_retries = 80 # Maximum checks before stopping
+
+    $http.post('/admin/orders/invoices', {order_ids: $scope.selected_orders}).success (data) ->
+      $scope.invoice_id = data
+      $scope.pollBulkInvoice()
+
+  $scope.pollBulkInvoice = ->
+    $timeout($scope.nextPoll, $scope.poll_wait * 1000)
+
+  $scope.nextPoll = ->
+    $http.get('/admin/orders/invoices/'+$scope.invoice_id+'/poll').success (data) ->
+      $scope.loading = false
+      $scope.message = t('js.admin.orders.index.bulk_invoice_created')
+
+    .error (data) ->
+      $scope.poll++
+
+      if $scope.poll > $scope.poll_retries
+        $scope.loading = false
+        $scope.error = t('js.admin.orders.index.bulk_invoice_failed')
+        return
+
+      $scope.pollBulkInvoice()
+

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

@@ -0,0 +1,26 @@
+angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycles, $compile, $attrs, Orders) ->
+  $scope.$compile = $compile
+  $scope.shops = shops
+  $scope.orderCycles = orderCycles
+
+  $scope.distributor_id = parseInt($attrs.ofnDistributorId)
+  $scope.order_cycle_id = parseInt($attrs.ofnOrderCycleId)
+
+  $scope.validOrderCycle = (oc) ->
+    $scope.orderCycleHasDistributor oc, parseInt($scope.distributor_id)
+
+  $scope.distributorHasOrderCycles = (distributor) ->
+    (oc for oc in $scope.orderCycles when @orderCycleHasDistributor(oc, distributor.id)).length > 0
+
+  $scope.orderCycleHasDistributor = (oc, distributor_id) ->
+    distributor_ids = (d.id for d in oc.distributors)
+    distributor_ids.indexOf(distributor_id) != -1
+
+  $scope.distributionChosen = ->
+    $scope.distributor_id && $scope.order_cycle_id
+
+  for oc in $scope.orderCycles
+    oc.name_and_status = "#{oc.name} (#{oc.status})"
+
+  for shop in $scope.shops
+    shop.disabled = !$scope.distributorHasOrderCycles(shop)

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

@@ -1,26 +1,74 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, $compile, $attrs, shops, orderCycles) ->
-  $scope.$compile = $compile
-  $scope.shops = shops
-  $scope.orderCycles = orderCycles
+angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, Orders, SortOptions, $window, $filter) ->
+  $scope.RequestMonitor = RequestMonitor
+  $scope.pagination = Orders.pagination
+  $scope.orders = Orders.all
+  $scope.sortOptions = SortOptions
+  $scope.per_page_options = [
+    {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
+    {id: 50, name: t('js.admin.orders.index.per_page', results: 50)},
+    {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
+  ]
+  $scope.selected_orders = []
+  $scope.checkboxes = {}
+  $scope.selected = false
+  $scope.select_all = false
+  $scope.poll = 0
 
-  $scope.distributor_id = parseInt($attrs.ofnDistributorId)
-  $scope.order_cycle_id = parseInt($attrs.ofnOrderCycleId)
+  $scope.initialise = ->
+    $scope.per_page = 15
+    $scope.q = {
+      completed_at_not_null: true
+    }
+    $scope.fetchResults()
 
-  $scope.validOrderCycle = (oc) ->
-    $scope.orderCycleHasDistributor oc, parseInt($scope.distributor_id)
+  $scope.fetchResults = (page=1) ->
+    $scope.resetSelected()
+    Orders.index({
+      'q[completed_at_lt]': $scope['q']['completed_at_lt'],
+      'q[completed_at_gt]': $scope['q']['completed_at_gt'],
+      'q[state_eq]': $scope['q']['state_eq'],
+      'q[number_cont]': $scope['q']['number_cont'],
+      'q[email_cont]': $scope['q']['email_cont'],
+      'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'],
+      'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
+      # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
+      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
+      'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_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[s]': $scope.sorting || 'completed_at desc',
+      per_page: $scope.per_page,
+      page: page
+    })
 
-  $scope.distributorHasOrderCycles = (distributor) ->
-    (oc for oc in orderCycles when @orderCycleHasDistributor(oc, distributor.id)).length > 0
+  $scope.resetSelected = ->
+    $scope.selected_orders.length = 0
+    $scope.selected = false
+    $scope.select_all = false
+    $scope.checkboxes = {}
 
-  $scope.orderCycleHasDistributor = (oc, distributor_id) ->
-    distributor_ids = (d.id for d in oc.distributors)
-    distributor_ids.indexOf(distributor_id) != -1
+  $scope.toggleSelection = (id) ->
+    index = $scope.selected_orders.indexOf(id)
 
-  $scope.distributionChosen = ->
-    $scope.distributor_id && $scope.order_cycle_id
+    if index == -1
+      $scope.selected_orders.push(id)
+    else
+      $scope.selected_orders.splice(index, 1)
 
-  for oc in $scope.orderCycles
-    oc.name_and_status = "#{oc.name} (#{oc.status})"
+  $scope.toggleAll = ->
+    $scope.selected_orders.length = 0
+    $scope.orders.forEach (order) ->
+      $scope.checkboxes[order.id] = $scope.select_all
+      $scope.selected_orders.push order.id if $scope.select_all
 
-  for shop in $scope.shops
-    shop.disabled = !$scope.distributorHasOrderCycles(shop)
+  $scope.$watch 'sortOptions', (sort) ->
+    if sort && sort.predicate != ""
+      $scope.sorting = sort.predicate + ' desc' if sort.reverse
+      $scope.sorting = sort.predicate + ' asc' if !sort.reverse
+      $scope.fetchResults()
+  , true
+
+  $scope.changePage = (newPage) ->
+    $scope.page = newPage
+    $scope.fetchResults(newPage)

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

@@ -0,0 +1,5 @@
+angular.module("admin.orders").directive "invoicesModal", ($modal) ->
+  restrict: 'C'
+  link: (scope, elem, attrs, ctrl) ->
+    elem.on "click", (ev) =>
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/bulk_invoice.html', controller: ctrl, scope: scope, windowClass: 'simple-modal')

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

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

app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee

@@ -3,13 +3,14 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
   $scope.entries = {}
   $scope.update_counts = {}
   $scope.reset_counts = {}
-  $scope.supplier_product_counts = ams_data.supplier_product_counts
+  $scope.enterprise_product_counts = ams_data.enterprise_product_counts
 
   $scope.updates = {}
   $scope.updated_total = 0
   $scope.updated_ids = []
   $scope.update_errors = []
 
+  $scope.batchSize = 50
   $scope.step = 'settings'
   $scope.chunks = 0
   $scope.completed = 0
@@ -19,7 +20,7 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
   }
 
   $scope.countResettable = () ->
-    angular.forEach $scope.supplier_product_counts, (value, key) ->
+    angular.forEach $scope.enterprise_product_counts, (value, key) ->
       $scope.reset_counts[key] = value
       if $scope.update_counts[key]
         $scope.reset_counts[key] -= $scope.update_counts[key]
@@ -51,19 +52,28 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
   $scope.start = () ->
     $scope.started = true
     total = ams_data.item_count
-    size = 50
-    $scope.chunks = Math.ceil(total / size)
+    $scope.chunks = Math.ceil(total / $scope.batchSize)
 
-    i = 0
+    # Process only the first batch.
+    $scope.processBatch($scope.step, 0, $scope.chunks)
 
-    while i < $scope.chunks
-      start = (i*size)+1
-      end = (i+1)*size
-      if $scope.step == 'import'
-        $scope.processImport(start, end)
-      if $scope.step == 'save'
-        $scope.processSave(start, end)
-      i++
+  $scope.processBatch = (step, batchIndex, batchCount) ->
+    start = (batchIndex * $scope.batchSize) + 1
+    end = (batchIndex + 1) * $scope.batchSize
+    isLastBatch = batchCount == batchIndex + 1
+
+    promise = if step == 'import'
+      $scope.processImport(start, end)
+    else if step == 'save'
+      $scope.processSave(start, end)
+
+    return if isLastBatch
+
+    processNextBatch = ->
+      $scope.processBatch(step, batchIndex + 1, batchCount)
+
+    # Process next batch whether or not processing of the current batch succeeds.
+    promise.then(processNextBatch, processNextBatch)
 
   $scope.processImport = (start, end) ->
     $http(

app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee

@@ -17,7 +17,7 @@ angular.module("admin.productImport").controller "ImportOptionsFormCtrl", ($scop
     confirmed = confirm t('js.product_import.confirmation') if checked
 
     if confirmed or !checked
-      ProductImportService.updateResetAbsent($scope.supplierId, $scope.reset_counts[$scope.supplierId], checked)
+      ProductImportService.updateResetAbsent($scope.enterpriseId, $scope.reset_counts[$scope.enterpriseId], checked)
     else
       $scope.settings['reset_all_absent'] = false
 

app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee

@@ -18,15 +18,15 @@ angular.module("admin.productImport").filter 'entriesFilterValid', ->
 
     filtered
 
-angular.module("admin.productImport").filter 'entriesFilterSupplier', ->
-  (entries, supplier) ->
-    if supplier == 'all'
+angular.module("admin.productImport").filter 'entriesFilterEnterprise', ->
+  (entries, enterprise) ->
+    if enterprise == 'all'
       return entries
 
     filtered = {}
 
     angular.forEach entries, (entry, line_number) ->
-      if supplier == entry.attributes['supplier']
+      if enterprise == entry.attributes['enterprise']
         filtered[line_number] = entry
 
     filtered

app/assets/javascripts/admin/product_import/services/product_import_service.js.coffee

@@ -1,15 +1,15 @@
 angular.module("admin.productImport").factory "ProductImportService", ($rootScope) ->
   new class ProductImportService
-    suppliers: {}
+    enterprises: {}
     resetTotal: 0
     settings: {}
 
-    updateResetAbsent: (supplierId, resetCount, resetAbsent) ->
+    updateResetAbsent: (enterpriseId, resetCount, resetAbsent) ->
       if resetAbsent
-        @suppliers[supplierId] = resetCount
+        @enterprises[enterpriseId] = resetCount
         @resetTotal += resetCount
       else
-        @suppliers[supplierId] = null
+        @enterprises[enterpriseId] = null
         @resetTotal -= resetCount
 
       $rootScope.resetTotal = @resetTotal

app/assets/javascripts/admin/products/directives/image_modal.js.coffee

@@ -2,5 +2,5 @@ angular.module("ofn.admin").directive "imageModal", ($modal, ProductImageService
   restrict: 'C'
   link: (scope, elem, attrs, ctrl) ->
     elem.on "click", (ev) =>
-      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'product-image-upload')
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'simple-modal')
       ProductImageService.configure(scope.product)

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

@@ -8,4 +8,10 @@ angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
       isArray: true
     'update':
       method: 'PUT'
+    'removeLogo':
+      url: '/api/enterprises/:id/logo.json'
+      method: 'DELETE'
+    'removePromoImage':
+      url: '/api/enterprises/:id/promo_image.json'
+      method: 'DELETE'
   })

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

@@ -1,8 +1,8 @@
 angular.module("admin.resources").factory 'OrderResource', ($resource) ->
   $resource('/admin/orders/:id/:action.json', {}, {
     'index':
+      url: '/api/orders.json'
       method: 'GET'
-      isArray: true
     'update':
       method: 'PUT'
   })

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

@@ -38,3 +38,17 @@ angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource
 
     resetAttribute: (enterprise, attribute) ->
       enterprise[attribute] = @pristineByID[enterprise.id][attribute]
+
+    performActionOnEnterpriseResource = (resourceAction) ->
+      (enterprise) ->
+        deferred = $q.defer()
+        resourceAction({id: enterprise.permalink}, ((data) =>
+          @pristineByID[enterprise.id] = angular.copy(data)
+          deferred.resolve(data)
+        ), ((response) ->
+          deferred.reject(response)
+        ))
+        deferred.promise
+
+    removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
+    removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)

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

@@ -1,18 +1,30 @@
-angular.module("admin.resources").factory 'Orders', ($q, OrderResource) ->
+angular.module("admin.resources").factory 'Orders', ($q, OrderResource, RequestMonitor) ->
   new class Orders
+    all: []
     byID: {}
     pristineByID: {}
+    pagination: {}
 
     index: (params={}, callback=null) ->
-    	OrderResource.index params, (data) =>
+      request = OrderResource.index params, (data) =>
         @load(data)
         (callback || angular.noop)(data)
+      @all.$promise = request.$promise
+      @all
 
-    load: (orders) ->
-      for order in orders
+    load: (data) ->
+      angular.extend(@pagination, data.pagination)
+      @clearData()
+      for order in data.orders
+        @all.push order
         @byID[order.id] = order
         @pristineByID[order.id] = angular.copy(order)
 
+    clearData: ->
+      @all.length = 0
+      @byID = {}
+      @pristineByID = {}
+
     save: (order) ->
       deferred = $q.defer()
       order.$update({id: order.number})

app/assets/javascripts/admin/subscriptions/controllers/address_controller.js.coffee

@@ -1,10 +1,20 @@
-angular.module("admin.subscriptions").controller "AddressController", ($scope, $filter, StatusMessage, availableCountries) ->
+angular.module("admin.subscriptions").controller "AddressController", ($scope, StatusMessage, availableCountries, CountryStates) ->
   $scope.countries = availableCountries
-  $scope.statesFor = (country_id) ->
-    return [] unless country_id
-    $filter('filter')(availableCountries, {id: country_id})[0].states
-  $scope.billStates = $scope.statesFor($scope.subscription.bill_address.country_id)
-  $scope.shipStates = $scope.statesFor($scope.subscription.ship_address.country_id)
+
+  $scope.billStates = CountryStates.statesFor(availableCountries, $scope.subscription.bill_address.country_id)
+  $scope.shipStates = CountryStates.statesFor(availableCountries, $scope.subscription.ship_address.country_id)
+
+  $scope.$watch 'subscription.bill_address.country_id', (newCountryID) ->
+    return unless newCountryID
+    $scope.billStates = CountryStates.statesFor(availableCountries, newCountryID)
+    unless CountryStates.addressStateMatchesCountryStates($scope.billStates, $scope.subscription.bill_address.state_id)
+      $scope.subscription.bill_address.state_id = ""
+
+  $scope.$watch 'subscription.ship_address.country_id', (newCountryID) ->
+    return unless newCountryID
+    $scope.shipStates = CountryStates.statesFor(availableCountries, newCountryID)
+    unless CountryStates.addressStateMatchesCountryStates($scope.shipStates, $scope.subscription.ship_address.state_id)
+      $scope.subscription.ship_address.state_id = ""
 
   $scope.registerNextCallback 'address', ->
     $scope.subscription_form.$submitted = true
@@ -18,9 +28,3 @@ angular.module("admin.subscriptions").controller "AddressController", ($scope, $
   $scope.registerBackCallback 'address', ->
     StatusMessage.clear()
     $scope.setView('details')
-
-  $scope.$watch 'subscription.bill_address.country_id', (newValue, oldValue) ->
-    $scope.billStates = $scope.statesFor(newValue) if newValue?
-
-  $scope.$watch 'subscription.ship_address.country_id', (newValue, oldValue) ->
-    $scope.shipStates = $scope.statesFor(newValue) if newValue?

app/assets/javascripts/admin/subscriptions/controllers/subscription_controller.js.coffee

@@ -6,7 +6,11 @@ angular.module("admin.subscriptions").controller "SubscriptionController", ($sco
   $scope.schedules = Schedules.all
   $scope.paymentMethods = PaymentMethods.all
   $scope.shippingMethods = ShippingMethods.all
-  $scope.distributor_id = $scope.subscription.shop_id # variant selector requires distributor_id
+
+  # Variant selector requires these
+  $scope.distributor_id = $scope.subscription.shop_id
+  $scope.eligible_for_subscriptions = true
+
   $scope.view = if $scope.subscription.id? then 'review' else 'details'
   $scope.nextCallbacks = {}
   $scope.backCallbacks = {}

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

@@ -1 +1 @@
-angular.module("admin.subscriptions", ['ngResource','admin.indexUtils','admin.dropdown'])
+angular.module("admin.subscriptions", ['ngResource','admin.indexUtils','admin.dropdown', 'admin.utils'])

app/assets/javascripts/admin/util.js.erb

@@ -1,12 +1,15 @@
 $(document).ready(function() {
   $('.datetimepicker').datetimepicker({
     dateFormat: 'yy-mm-dd',
+    timeFormat: 'HH:mm',
     dayNames: Spree.translations.abbr_day_names,
     dayNamesMin: Spree.translations.abbr_day_names,
     monthNames: Spree.translations.month_names,
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,
-    showOn: "button",
+    showOn: 'button',
+    controlType: 'select',
+    oneLine: true,
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true,
     stepMinute: 15

app/assets/javascripts/admin/utils/directives/variant_autocomplete.js.coffee

@@ -22,6 +22,7 @@ angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
               q: term
               distributor_id: scope.distributor_id
               order_cycle_id: scope.order_cycle_id
+              eligible_for_subscriptions: scope.eligible_for_subscriptions
             results: (data, page) ->
               results: data
           formatResult: (variant) ->

app/assets/javascripts/admin/utils/filters/localize_currency.js.coffee

@@ -0,0 +1,14 @@
+angular.module("admin.utils").filter "localizeCurrency", (currencyConfig)->
+  # Convert number to string currency using injected currency configuration.
+  (amount) ->
+    # Set country code (eg. "US").
+    currency_code = if currencyConfig.display_currency then " " + currencyConfig.currency else ""
+    # Set decimal points, 2 or 0 if hide_cents.
+    decimals = if currencyConfig.hide_cents == "true" then 0 else 2
+    # Set format if the currency symbol should come after the number, otherwise (default) use the locale setting.
+    format = if currencyConfig.symbol_position == "after" then "%n %u" else undefined
+    # We need to use parseFloat as the amount should come in as a string.
+    amount = parseFloat(amount)
+
+    # Build the final price string.
+    I18n.toCurrency(amount, {precision: decimals, unit: currencyConfig.symbol, format: format}) + currency_code

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

@@ -0,0 +1,11 @@
+angular.module("admin.utils").factory "CountryStates", ($filter) ->
+  new class CountryStates
+
+    statesFor: (countries, country_id) ->
+      return [] unless country_id
+      country = $filter('filter')(countries, {id: parseInt(country_id)}, true)[0]
+      return [] unless country
+      country.states
+
+    addressStateMatchesCountryStates: (countryStates, stateId) ->
+      countryStates.some (state) -> state.id == stateId

app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee

@@ -13,6 +13,11 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
   $scope.RequestMonitor = RequestMonitor
   $scope.selectView = Views.selectView
   $scope.currentView = -> Views.currentView
+  $scope.onDemandOptions = [
+    { description: t('js.variant_overrides.on_demand.use_producer_settings'), value: null },
+    { description: t('js.variant_overrides.on_demand.yes'), value: true },
+    { description: t('js.variant_overrides.on_demand.no'), value: false }
+  ]
 
   $scope.views = Views.setViews
     inventory:    { name: t('js.variant_overrides.inventory_products'), visible: true }
@@ -105,3 +110,35 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
         StatusMessage.display 'success', t('js.variant_overrides.stock_reset')
       .error (data, status) ->
         $timeout -> StatusMessage.display 'failure', $scope.updateError(data, status)
+
+  # Variant override count_on_hand field placeholder logic:
+  #     on_demand true  -- Show "On Demand"
+  #     on_demand false -- Show empty value to be set by the user
+  #     on_demand nil   -- Show producer on_hand value
+  $scope.countOnHandPlaceholder = (variant, hubId) ->
+    variantOverride = $scope.variantOverrides[hubId][variant.id]
+
+    if variantOverride.on_demand
+      t('js.variants.on_demand.yes')
+    else if variantOverride.on_demand == false
+      ''
+    else
+      variant.on_hand
+
+  # This method should only be used when the variant override on_demand is changed.
+  #
+  # Change the count_on_hand value to a suggested value.
+  $scope.updateCountOnHand = (variant, hubId) ->
+    variantOverride = $scope.variantOverrides[hubId][variant.id]
+
+    suggested = $scope.countOnHandSuggestion(variant, hubId)
+    return if suggested == variantOverride.count_on_hand
+    variantOverride.count_on_hand = suggested
+    DirtyVariantOverrides.set hubId, variant.id, variantOverride.id, 'count_on_hand', suggested
+
+  # Suggest producer count_on_hand if variant has limited stock and variant override forces limited
+  # stock. Otherwise, clear whatever value is set.
+  $scope.countOnHandSuggestion = (variant, hubId) ->
+    variantOverride = $scope.variantOverrides[hubId][variant.id]
+    return null unless !variant.on_demand && variantOverride.on_demand == false
+    variant.on_hand

app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee

@@ -1,4 +1,5 @@
 angular.module("admin.variantOverrides").filter "hubPermissions", ($filter) ->
   return (products, hubPermissions, hub_id) ->
     return [] if !hub_id
+    return [] if !hubPermissions[hub_id]
     return $filter('filter')(products, ((product) -> hubPermissions[hub_id].indexOf(product.producer_id) > -1), true)

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

@@ -11,7 +11,7 @@
 #= require lodash.underscore.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
-#= require ../shared/mm-foundation-tpls-0.8.0.min.js
+#= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js
 #= require ../shared/ng-infinite-scroll.min.js
 #= require ../shared/angular-local-storage.js
 #= require ../shared/angular-slideables.js
@@ -25,12 +25,14 @@
 #= require angular-flash.min.js
 #
 #= require moment
+#= require moment/de.js
 #= require moment/en-gb.js
 #= require moment/es.js
 #= require moment/fr.js
 #= require moment/it.js
 #= require moment/nb.js
 #= require moment/pt-br.js
+#= require moment/pt.js
 #= require moment/sv.js
 #
 #= require modernizr

app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee

@@ -1,25 +1,22 @@
 Darkswarm.controller "AccordionCtrl", ($scope, localStorageService, $timeout, $document, CurrentHub) ->
-  key = "accordion_#{$scope.order.id}#{CurrentHub.hub.id}#{$scope.order.user_id}"
-  value = if localStorageService.get(key) then {} else { details: true, billing: false, shipping: false, payment: false }
-  localStorageService.bind $scope, "accordion", value, key
   $scope.accordionSections = ["details", "billing", "shipping", "payment"]
-  # Scrolling is confused by our position:fixed top bar - add an offset to scroll
-  # to the correct location, plus 5px buffer
-  offset_height = $("nav.top-bar").height() + 5
+  $scope.accordion = { details: true, billing: true, shipping: true, payment: true }
 
-  $scope.show = (section)->
+  $scope.show = (section) ->
     $scope.accordion[section] = true
-    # If we call scrollTo() directly after show(), when one of the accordions above the
-    # scroll location is closed by show(), scrollTo() will scroll to the old location of
-    # the element. Putting this in a 50 ms timeout is enough delay for the DOM to
-    # have updated.
-    $timeout ->
-      $document.scrollTo($("##{section}"), offset_height, 500)
-    , 50
+
+  $scope.scrollTo = (section) ->
+    # Scrolling is confused by our position:fixed top bar - add an offset to scroll
+    # to the correct location, plus 5px buffer
+    offset_height = $("nav.top-bar").height() + 5
+    $document.scrollTo($("##{section}"), offset_height, 400)
 
   $scope.$on 'purchaseFormInvalid', (event, form) ->
     # Scroll to first invalid section
     for section in $scope.accordionSections
       if not form[section].$valid
         $scope.show section
+        $timeout ->
+          $scope.scrollTo(section)
+        , 50
         break

app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee

@@ -5,7 +5,7 @@ Darkswarm.controller "BillingCtrl", ($scope, $timeout) ->
 
   $scope.summary = ->
     [$scope.order.bill_address.address1,
-    $scope.order.bill_address.city, 
+    $scope.order.bill_address.city,
     $scope.order.bill_address.zipcode]
 
-  $timeout $scope.onTimeout 
+  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee

@@ -13,11 +13,11 @@ Darkswarm.controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, Authe
 
   $scope.summary = ->
     [$scope.fullName(),
-    $scope.order.email, 
+    $scope.order.email,
     $scope.order.bill_address.phone]
 
   $scope.fullName = ->
-    [$scope.order.bill_address.firstname ? null, 
+    [$scope.order.bill_address.firstname ? null,
     $scope.order.bill_address.lastname ? null].join(" ").trim()
 
-  $timeout $scope.onTimeout 
+  $timeout $scope.onTimeout

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

@@ -0,0 +1,29 @@
+# Extend the "offCanvasWrap" directive in "angular-foundation" to disable hiding of the off-canvas
+# upon window resize.
+#
+# In some browsers for mobile devices, the address bar is automatically hidden when scrolling down
+# the page. This is not workable if the height of the contents of the off-canvas exceeds the height
+# of the screen, because the latter portion of the contents stays hidden to the user.
+#
+# However, for screens over 1024px width for which the off-canvas is not styled to be visible, we
+# can proceed to hide this.
+#
+# https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js
+angular.module('mm.foundation.offcanvas').directive 'offCanvasWrap', ($window) ->
+  {
+    restrict: 'C'
+    priority: 1
+    link: ($scope, element, attrs) ->
+      win = angular.element($window)
+
+      # Get the scope used by the "offCanvasWrap" directive:
+      # https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js#L2
+      isolatedScope = element.isolateScope()
+
+      # Unbind hiding of the off-canvas upon window resize.
+      win.unbind('resize.body', isolatedScope.hide)
+
+      # Bind hiding of the off-canvas that only happens when screen width is over 1024px.
+      win.bind 'resize.body', ->
+        isolatedScope.hide() if $(window).width() > 1024
+  }

app/assets/javascripts/darkswarm/filters/dates.js.coffee

@@ -4,7 +4,7 @@ Darkswarm.filter "date_in_words", ->
 
 Darkswarm.filter "sensible_timeframe", (date_in_wordsFilter)->
   (date) ->
-    if moment().add('days', 2) < moment(date)
+    if moment().add(2, 'days') < moment(date)
       t 'orders_open'
     else
       t('closing') + date_in_wordsFilter(date)

app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee

@@ -2,11 +2,11 @@ window.FieldsetMixin = ($scope)->
   $scope.next = (event = false)->
     event.preventDefault() if event
     return unless $scope.nextPanel
+    $scope.accordion[$scope.name] = false
     $scope.show $scope.nextPanel
 
   $scope.onTimeout = ->
-    if $scope[$scope.name].$valid
-      $scope.next()
+    $scope.accordion[$scope.name] = !$scope[$scope.name].$valid
 
   $scope.valid = ->
     $scope.form().$valid

app/assets/javascripts/store/all.js

@@ -1,12 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-
-//= require 'jquery'
-//= require store/spree_frontend
-//= require store/spree_auth
-
-//= require_tree .

app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml

@@ -0,0 +1,15 @@
+%h4.modal-title
+  = t('js.admin.orders.index.compiling_invoices')
+
+%p.message{ ng: { show: 'message' } }
+  {{message}}
+%p.error{ ng: { show: 'error' } }
+  {{error}}
+
+%img.spinner{ src: "/assets/spinning-circles.svg", ng: { show: "loading" } }
+%p{ ng: { show: "loading" } }
+  = t('js.admin.orders.index.please_wait')
+
+%a.button{ target: '_blank', ng: { click: 'showBulkInvoice()', href: '/admin/orders/invoices/{{invoice_id}}', show: "!loading && !error" } }
+  = t('js.admin.orders.index.view_file')
+

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

@@ -1,7 +1,7 @@
 .container
   .row.modal-centered
-    %h2 {{'welcome_to_ofn' | t}}
-    %h5 {{'signup_or_login' | t}}:
+    %h2 {{'js.registration.welcome_to_ofn' | t}}
+    %h5 {{'js.registration.signup_or_login' | t}}:
   %div{"ng-controller" => "AuthenticationCtrl"}
     %tabset
       %ng-include{src: "'signup.html'"}
@@ -9,9 +9,9 @@
       %ng-include{src: "'forgot.html'"}
     %div{ ng: { show: "active('/signup')"} }
       %hr
-      {{'have_an_account' | t}}
+      {{'js.registration.have_an_account' | t}}
       %a{ href: "", ng: { click: "select('/login')"}}
-        {{'action_login' | t}}
+        {{'js.registration.action_login' | t}}
 
 %a.close-reveal-modal{"ng-click" => "$close()"}
   %i.ofn-i_009-close

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

@@ -4,6 +4,9 @@
       .large-12.columns
         .alert-box.success{ng: {show: 'messages != null'}}
           {{ messages }}
+      .large-12.columns
+        .alert-box.alert{ng: {show: 'errors.message != null'}}
+          {{ errors.message }}
     .row
       .large-12.columns
         %label{for: "email"} {{'signup_email' | t}}

app/assets/stylesheets/admin/all.scss

@@ -7,12 +7,14 @@
  *= require admin/spree_backend
  *= require admin/spree_auth
 
- *= require shared/jquery-ui-timepicker-addon
+ *= require jquery-ui-timepicker-addon
  *= require shared/textAngular
  *= require shared/ng-tags-input.min
+ *= require admin/custom
 
  *= require_self
 */
 
 @import 'variables';
-@import '**/*';
+@import 'components/*';
+@import '*';

app/assets/stylesheets/admin/components/input.css.scss

@@ -0,0 +1,10 @@
+@import '../../darkswarm/branding';
+
+.container {
+  input {
+    &[readonly] {
+      background-color: $disabled-light;
+      cursor: default;
+    }
+  }
+}

app/assets/stylesheets/admin/components/ng-cloak.css.scss

@@ -0,0 +1,8 @@
+// https://docs.angularjs.org/api/ng/directive/ngCloak
+[ng-cloak],
+[data-ng-cloak],
+[x-ng-cloak],
+.ng-cloak,
+.x-ng-cloak {
+  display: none !important;
+}

app/assets/stylesheets/admin/components/pagination.scss

@@ -0,0 +1,20 @@
+@import "admin/variables";
+
+.pagination {
+  text-align: center;
+  margin: 2em 0 1em;
+
+  button {
+    margin: 0 0.35em;
+
+    &.active {
+      background-color: darken($spree-blue, 15%);
+      cursor: default;
+    }
+
+    &.disabled {
+      background-color: $disabled_button;
+      cursor: default;
+    }
+  }
+}

app/assets/stylesheets/admin/components/per_page_controls.scss

@@ -0,0 +1,7 @@
+.per-page {
+  float: left;
+
+  .per-page-feedback {
+    margin-left: 1em;
+  }
+}

app/assets/stylesheets/admin/components/simple_modal.css.scss

@@ -0,0 +1,20 @@
+@import '../variables';
+
+.reveal-modal.simple-modal {
+  width: 300px;
+
+  .close-reveal-modal {
+    color: $modal-close-button-color;
+    font-size: 23px;
+    right: .45rem;
+    top: .35rem;
+
+    :hover {
+      color: $modal-close-button-hover-color;
+    }
+  }
+
+  label {
+    margin-top: 20px;
+  }
+}

app/assets/stylesheets/admin/custom.css

@@ -0,0 +1,2 @@
+/* Custom fix */
+.ui-timepicker-div.ui-timepicker-oneLine dl dd { width: 25%; }

app/assets/stylesheets/admin/orders.css.scss

@@ -87,3 +87,50 @@ div#group_buy_calculation {
 th.actions {
   white-space: nowrap;
 }
+
+table.index td.actions {
+  text-align: left;
+}
+
+.orders-loading {
+  margin-top: 1em;
+
+  img {
+    width: 85px;
+  }
+
+  span {
+    font-size: 1.2em;
+  }
+}
+
+.index-controls {
+
+  button {
+    float: right;
+
+    &:disabled {
+      background-color: $disabled-button;
+    }
+  }
+}
+
+.simple-modal {
+  text-align: center;
+
+  .modal-title {
+    margin-bottom: 1.5em;
+  }
+
+  .message, .error {
+    margin-bottom: 1em;
+  }
+
+  .spinner {
+    margin-bottom: 1em;
+  }
+
+  .error {
+    color: $warning-red;
+  }
+}

app/assets/stylesheets/admin/pages/subscription_form.css.scss

@@ -0,0 +1,7 @@
+@import '../variables';
+
+.admin-subscription-form-subscription-line-items {
+  .not-in-open-and-upcoming-order-cycles-warning {
+    color: $warning-red;
+  }
+}

app/assets/stylesheets/admin/pages/subscription_review.css.scss

@@ -0,0 +1,7 @@
+@import '../variables';
+
+.admin-subscription-review-subscription-line-items {
+  .not-in-open-and-upcoming-order-cycles-warning {
+    color: $warning-red;
+  }
+}

app/assets/stylesheets/admin/product_import.css.scss

@@ -1,15 +1,22 @@
 @import "variables";
 
-div.panel-section {
+$pi-red: $warning-red;
+$pi-green: lighten($spree-green, 10%);
+$pi-orange: $bright-orange;
+$pi-blue: lighten($spree-blue, 10%);
+$pi-light-yellow: #faffaf;
 
-  .neutral {
-    color: #bfbfbf;
+// scss-lint:disable NestingDepth
+
+div.panel-section {
+  .error {
+    color: $pi-red;
   }
   .warning {
-    color: $warning-red;
+    color: $bright-orange;
   }
   .success {
-    color: #86d83a;
+    color: $pi-green;
   }
   .info {
     color: #68b7c0;
@@ -85,21 +92,29 @@ div.panel-section {
       td, th {
         white-space: nowrap;
       }
-      tr.error {
-        color: #c84C4c;
+
+      tr {
+        &.error {
+          color: #c84C4c;
+        }
+
+        &:hover td.invalid {
+          background-color: darken(#f05c51, 5%);
+        }
+
+        i {
+          display: block;
+          margin-bottom: -0.2em;
+          font-size: 1.4em !important;
+        }
       }
-      tr:hover td.invalid {
-        background-color: #ed5135;
-      }
-      tr i {
-        display: block;
-        margin-bottom: -0.2em;
-        font-size: 1.4em !important;
-      }
-      td.invalid {
-        background-color: #f05c51;
-        box-shadow: inset 0px 0px 1px red;
-        color: white;
+
+      td {
+        &.invalid {
+          background-color: #f05c51;
+          box-shadow: inset 0px 0px 1px red;
+          color: white;
+        }
       }
     }
 
@@ -123,52 +138,6 @@ br.panels.clearfix {
   clear: both;
 }
 
-table.import-settings {
-  background-color: transparent !important;
-  width: auto;
-
-  tbody tr:hover td {
-    background-color: #f3f3f3;
-  }
-  td {
-    border: 0;
-    border-bottom: 1px solid #eee;
-    text-align: left;
-
-    input {
-      width: 15em;
-    }
-    input[type="checkbox"] {
-      width: auto;
-    }
-
-  }
-  td.description {
-    font-weight: bold;
-    padding-right: 2.5em;
-  }
-  tr:first-child td {
-    border-top: 0;
-  }
-  tr:last-child td {
-    border-bottom: 0;
-  }
-  div.select2-container {
-    width: 13.5em;
-  }
-  div.select2-container.select2-container-disabled {
-    a.select2-choice, span.select2-arrow {
-      background-color: #d5d5d5;
-    }
-  }
-  input[disabled], input:disabled {
-    background-color: #d5d5d5;
-    opacity: 1;
-    border-color: transparent;
-    color: white !important;
-  }
-}
-
 .panel-section.import-settings {
 
   .header-description {
@@ -177,7 +146,7 @@ table.import-settings {
 
   span.header-error {
     font-size: 0.85em;
-    color: $warning-red;
+    color: $pi-red;
   }
 
   .select2-search {
@@ -208,10 +177,10 @@ table.import-settings {
     }
 
     i.fa-check-circle {
-      color: #86d83a;
+      color: $pi-green;
     }
     i.fa-info-circle {
-      color: #68b7c0;
+      color: $pi-blue;
     }
   }
 
@@ -234,6 +203,10 @@ form.product-import, div.post-save-results, div.import-wrapper {
 
 div.import-wrapper {
 
+  .alert-box {
+    margin: 0 0 1.75em;
+  }
+
   .ng-hide:not(.ng-hide-animate) {
     // We have to use !important here to override angular's display properties
     // scss-lint:disable ImportantRule
@@ -281,7 +254,7 @@ div.progress-bar {
 
   span.progress-track{
     display: block;
-    background: #b7ea53;
+    background: lighten($pi-green, 10%);
     height: 100%;
     border-radius: 0.3em;
     box-shadow: inset 0 0 3px rgba(0,0,0,0.3);
@@ -312,7 +285,7 @@ div.progress-bar {
 
   span.category {
     display: inline-block;
-    background-color: lighten($spree-blue, 10%);
+    background-color: $pi-blue;
     color: white;
     padding: 0.3em 0.6em;
     margin: 0 0.4em 0.5em 0;

app/assets/stylesheets/admin/products.css.scss

@@ -98,25 +98,6 @@ table#listing_products.bulk {
   }
 }
 
-.reveal-modal.product-image-upload {
-  width: 300px;
-  a.close-reveal-modal {
-    font-size: 23px;
-    color: #de6060;
-    right: 0.45rem;
-    top: 0.35rem;
-    :hover {
-      color: #bf4545;
-    }
-  }
-  div.image-preview {
-    //float: left;
-  }
-  label {
-    margin-top: 20px;
-  }
-}
-
 form#image_upload {
   text-align: center;
   .spinner {

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

@@ -6,7 +6,13 @@ $spree-light-blue: #eff5fc;
 
 $warning-red: #da5354;
 $warning-orange: #da7f52;
+$bright-orange: #ffa92e;
 $medium-grey: #919191;
 $pale-blue: #cee1f4;
+$light-grey: #ccc;
 
 $admin-table-border: $pale-blue;
+
+$modal-close-button-color: #de6060;
+$modal-close-button-hover-color: #bf4545;
+$disabled-button: $light-grey;

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

@@ -1,86 +0,0 @@
-@import typography
-
-.darkswarm
-
-  navigation
-    display: block
-    background: #f7f7f7
-
-    distributor.details
-      box-sizing: border-box
-      display: block
-      min-height: 150px
-      padding: 30px 0px 20px 0px
-      select
-        width: 200px
-      position: relative
-      img
-        display: block
-        height: 100px
-        width: 100px
-        margin-right: 12px
-
-      location
-        @include headingFont
-      @media all and (max-width: 768px)
-        location, location + small
-          display: block
-
-      #distributor_title h3
-        margin-top: 0
-        @media all and (max-width: 768px)
-          margin-bottom: 8px
-
-
-      ordercycle
-        text-align: right
-        p
-          max-width: 400px
-        h4 i
-          margin-right: 0.3rem
-        @media all and (max-width: 640px)
-          float: left
-          clear: left
-          text-align: left
-          padding: 12px 10px
-          width: 100%
-          margin-top: 10px
-          background: #e5e5e5
-          p
-            max-width: 100%
-        float: right
-        form.custom
-          text-align: right
-          & > strong
-            line-height: 2.5
-            font-size: 1.29em
-            padding-right: 14px
-            @media all and (max-width: 768px)
-          select
-            width: inherit
-            display: inline-block
-            border-width: 1px
-            border-color: #999
-            color: #666
-            font-size: 1em
-            margin-bottom: 0
-            padding: 8px 20px 8px 12px
-            @media all and (max-width: 768px)
-              font-size: 0.875em
-            @media screen and (-webkit-min-device-pixel-ratio:0)
-              font-size: 16px
-        closing
-          @include headingFont
-          @media all and (max-width: 768px)
-            font-size: 1.2em
-            padding-bottom: 10px
-          color: black
-          font-size: 1.5em
-          display: block
-          padding-bottom: 12px
-        span
-          @media all and (max-width: 768px)
-            font-size: 0.875em
-
-
-

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

@@ -0,0 +1,103 @@
+@import "typography";
+
+.darkswarm navigation {
+  display: block;
+  background: #f7f7f7;
+
+  distributor.details {
+    box-sizing: border-box;
+    display: block;
+    min-height: 150px;
+    padding: 30px 0 20px 0;
+    position: relative;
+    select {
+      width: 200px;
+    }
+    img {
+      display: block;
+      height: 100px;
+      width: 100px;
+      margin-right: 12px;
+    }
+
+    location {
+      @include headingFont;
+    }
+    @media all and (max-width: 768px) {
+      location, location + small {
+        display: block;
+      }
+    }
+
+    #distributor_title h3 {
+      margin-top: 0;
+      @media all and (max-width: 768px) {
+          margin-bottom: 8px;
+      }
+    }
+
+
+
+    ordercycle {
+      text-align: right;
+      float: right;
+      p {
+        max-width: 400px;
+      }
+      h4 i {
+        margin-right: 0.3rem;
+      }
+      @media all and (max-width: 640px) {
+        float: left;
+        clear: left;
+        text-align: left;
+        padding: 12px 10px;
+        width: 100%;
+        margin-top: 10px;
+        background: #e5e5e5;
+        p {
+          max-width: 100%;
+        }
+      }
+      form.custom {
+        text-align: right;
+        & > strong {
+          line-height: 2.5;
+          font-size: 1.29em;
+          padding-right: 14px;
+        }
+        select {
+          width: inherit;
+          display: inline-block;
+          border: 1px #999;
+          color: #666;
+          font-size: 1em;
+          margin-bottom: 0;
+          padding: 8px 20px 8px 12px;
+          @media all and (max-width: 768px) {
+            font-size: 0.875em;
+          }
+          @media screen and (-webkit-min-device-pixel-ratio: 0) {
+            font-size: 16px;
+          }
+        }
+      }
+      closing {
+        @include headingFont;
+        color: black;
+        font-size: 1.5em;
+        display: block;
+        padding-bottom: 12px;
+        @media all and (max-width: 768px) {
+          font-size: 1.2em;
+          padding-bottom: 10px;
+        }
+        span {
+          @media all and (max-width: 768px) {
+            font-size: 0.875em;
+          }
+        }
+      }
+    }
+  }
+}

app/assets/stylesheets/darkswarm/all.scss

@@ -9,8 +9,11 @@
 @import 'foundation';
 @import 'foundation-icons';
 
+@import 'base/*';
 @import '*';
+@import 'pages/*';
+@import '../web/all';
 
 ofn-modal {
   display: block;
-}
+}

app/assets/stylesheets/darkswarm/all_split2.css

@@ -1,3 +0,0 @@
-/*
- *= require 'darkswarm/all'
- */

app/assets/stylesheets/darkswarm/animations.scss

@@ -123,9 +123,12 @@
   -moz-transition: -moz-transform 0.2s ease-out;
   -o-transition: -o-transform 0.2s ease-out;
   transition: transform 0.2s ease-out;
-  -webkit-transform: translate(0, -25%);
-  -ms-transform: translate(0, -25%);
-  transform: translate(0, -25%);
+
+  @media only screen and (min-width: 641px) {
+    -webkit-transform: translate(0, -5%);
+    -ms-transform: translate(0, -5%);
+    transform: translate(0, -5%);
+  }
 }
 
 .reveal-modal.in {

app/assets/stylesheets/darkswarm/base/colors.css.scss

@@ -0,0 +1,13 @@
+@import 'darkswarm/branding';
+
+$modal-background-color: #efefef;
+$modal-content-background-color: #fff;
+$modal-alert-link-color: #fff;
+$modal-alert-link-hover-color: rgba(255, 255, 255, .7);
+
+$cookies-banner-background-color: $dark-grey;
+$cookies-banner-button-background-color: $clr-turquoise;
+$cookies-banner-text-color: $white;
+$cookies-policy-modal-background-color: $disabled-light;
+$cookies-policy-modal-border-bottom-color: $disabled-light;
+$cookies-policy-modal-table-tr-even-background-color: $disabled-very-light;

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

@@ -1,86 +0,0 @@
-@import mixins
-@import branding
-@import animations
-
-.order-summary
-  background-color: #e1f0f5
-  padding: 1em
-  width: 100%
-  border: none
-  color: inherit
-
-checkout
-  display: block
-
-  @media all and (max-width: 640px)
-    &.row .row
-      margin-left: 0
-      margin-right: 0
-
-  orderdetails
-    .button, table
-      width: 100%
-    @media all and (max-width: 640px)
-      form.edit_order
-        border: 1px solid $disabled-bright
-        margin-bottom: 2rem
-
-  #details, #billing, #shipping, #payment
-    border: 0
-    margin: 1em 0
-    padding: 0
-    .content
-      border: 1px solid #efefef
-
-  h5
-    margin: 0
-    padding: 0.65em
-    background: #f7f7f7
-
-    .label
-      font-size: 1em
-      padding: 0.3rem 0.35rem 0.275rem
-
-    // Logic to turn on & off the alerts for success against each fieldset
-
-    label, label.alert, label.success, &.valid label.alert, &.dirty label.success
-      display: none
-
-    &.dirty label.alert
-      display: inline
-    &.dirty.valid label.alert
-      display: none
-    &.valid label.success
-      display: inline
-
-  h5.dirty
-    background: #f7ccc5
-  h5.valid, h5.dirty.valid
-    background: #bfefd1
-
-  orderdetails table tr th
-    text-align: left
-
-  // Logic to swap out up / down accordion icons
-  //Foundation overrides
-  dd > a
-    @include csstrans
-    background: $disabled-light !important
-
-  dd > a:hover
-    background: $disabled-v-dark !important
-    color: white
-
-  dd
-    span.accordion-up
-      display: none
-    span.accordion-down
-      display: inline
-    &.open
-      span.accordion-up
-        display: inline
-      span.accordion-down
-        display: none
-
-  .error
-    color: #c82020

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

@@ -0,0 +1,117 @@
+@import "mixins";
+@import "branding";
+@import "animations";
+
+.order-summary {
+  background-color: #e1f0f5;
+  padding: 1em;
+  width: 100%;
+  border: none;
+  color: inherit;
+}
+
+checkout {
+  display: block;
+
+  @media all and (max-width: 640px) {
+    &.row .row {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
+  orderdetails {
+    .button, table {
+      width: 100%;
+    }
+    @media all and (max-width: 640px) {
+      form.edit_order {
+        border: 1px solid $disabled-bright;
+        margin-bottom: 2rem;
+      }
+    }
+  }
+
+  #details, #billing, #shipping, #payment {
+    border: 0;
+    margin: 1em 0;
+    padding: 0;
+    .content {
+      border: 1px solid #efefef;
+    }
+  }
+
+  h5 {
+    margin: 0;
+    padding: 0.65em;
+    background: #f7f7f7;
+
+    .label {
+      font-size: 1em;
+      padding: 0.3rem 0.35rem 0.275rem;
+    }
+
+    // Logic to turn on & off the alerts for success against each fieldset
+
+    label, label.alert, label.success, &.valid label.alert, &.dirty label.success {
+      display: none;
+    }
+
+    &.dirty label.alert {
+      display: inline;
+    }
+    &.dirty.valid label.alert {
+      display: none;
+    }
+    &.valid label.success {
+      display: inline;
+    }
+  }
+
+  h5.dirty {
+    background: #f7ccc5;
+  }
+
+  h5.valid, h5.dirty.valid {
+    background: #bfefd1;
+  }
+
+  orderdetails table tr th {
+    text-align: left;
+  }
+
+
+  // Logic to swap out up / down accordion icons
+  //Foundation overrides
+  dd > a {
+    @include csstrans;
+    background: $disabled-light !important;
+  }
+
+  dd > a:hover {
+    background: $disabled-v-dark !important;
+    color: white;
+  }
+
+  dd {
+    span.accordion-up {
+      display: none;
+    }
+    span.accordion-down {
+      display: inline;
+    }
+    &.open {
+      span.accordion-up {
+        display: inline;
+      }
+      span.accordion-down {
+        display: none;
+      }
+    }
+  }
+
+  .error {
+    color: #c82020;
+  }
+}
+

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

@@ -4,3 +4,11 @@
 fieldset {
   border: 0;
 }
+
+.user-form {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 1184px;
+  padding-left: .9375rem;
+  padding-right: .9375rem;
+}

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

@@ -1,25 +0,0 @@
-// Styling for login modal to style tabs
-.reveal-modal.login-modal {
-  border-bottom-color: #efefef;
-}
-
-.login-modal {
-  background: #efefef;
-
-  .tabs-content {
-    background: #fff;
-    padding-top: 10px;
-  }
-
-  .alert-box {
-    a {
-      color: white;
-      text-decoration: underline;
-
-      &:hover {
-        color: rgba(255, 255, 255, 0.7);
-        text-decoration: underline;
-      }
-    }
-  }
-}

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

@@ -20,16 +20,16 @@ dialog
 
   // Small - when modal IS full screen
   @media only screen and (max-width: 640px) {
-    height: 500px;
+    left: 0;
+    max-height: 100%;
     position: absolute !important;
     top: 0;
-    left: 0;
   }
 
   // Medium and up - when modal IS NOT full screen
   @media only screen and (min-width: 641px) {
-    top: 10%;
-    max-height: 100%;
+    max-height: 90%;
+    top: 5%;
   }
 }
 

app/assets/stylesheets/darkswarm/pages/login_modal.css.scss

@@ -0,0 +1,25 @@
+@import '../base/colors';
+
+// Styling for login modal to style tabs
+.reveal-modal.login-modal {
+  border-bottom-color: $modal-background-color;
+}
+
+.login-modal {
+  background: $modal-background-color;
+
+  .tabs-content {
+    background: $modal-content-background-color;
+    padding-top: 10px;
+  }
+
+  .alert-box a {
+    color: $modal-alert-link-color;
+    text-decoration: underline;
+
+    &:hover {
+      color: $modal-alert-link-hover-color;
+      text-decoration: underline;
+    }
+  }
+}

app/assets/stylesheets/shared/jquery-ui-timepicker-addon.css

@@ -1,10 +0,0 @@
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

app/assets/stylesheets/store/all.css

@@ -1,12 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * 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 store/spree_frontend
- *= require store/spree_auth
-
- *= require_self
- *= require_tree .
-*/

app/controllers/admin/cache_settings_controller.rb

@@ -1,13 +1,27 @@
 require 'open_food_network/products_cache_integrity_checker'
 
-class Admin::CacheSettingsController < Spree::Admin::BaseController
+module Admin
+  class CacheSettingsController < Spree::Admin::BaseController
+    def edit
+      @results = Exchange.cachable.map do |exchange|
+        checker = OpenFoodNetwork::ProductsCacheIntegrityChecker
+          .new(exchange.receiver, exchange.order_cycle)
 
-  def show
-    @results = Exchange.cachable.map do |exchange|
-      checker = OpenFoodNetwork::ProductsCacheIntegrityChecker.new(exchange.receiver, exchange.order_cycle)
+        {
+          distributor: exchange.receiver,
+          order_cycle: exchange.order_cycle,
+          status: checker.ok?,
+          diff: checker.diff
+        }
+      end
+    end
 
-      {distributor: exchange.receiver, order_cycle: exchange.order_cycle, status: checker.ok?, diff: checker.diff}
+    def update
+      Spree::Config.set(params[:preferences])
+
+      respond_to do |format|
+        format.html { redirect_to main_app.edit_admin_cache_settings_path }
+      end
     end
   end
-
 end

app/controllers/admin/contents_controller.rb

@@ -1,21 +1,15 @@
 module Admin
   class ContentsController < Spree::Admin::BaseController
     def edit
-      @preference_sections = [{name: I18n.t('admin.contents.edit.header'), preferences: [:logo, :logo_mobile, :logo_mobile_svg]},
-                              {name: I18n.t('admin.contents.edit.home_page'), preferences: [:home_hero, :home_show_stats]},
-                              {name: I18n.t('admin.contents.edit.producer_signup_page'), preferences: [:producer_signup_pricing_table_html, :producer_signup_case_studies_html, :producer_signup_detail_html]},
-                              {name: I18n.t('admin.contents.edit.hub_signup_page'), preferences: [:hub_signup_pricing_table_html, :hub_signup_case_studies_html, :hub_signup_detail_html]},
-                              {name: I18n.t('admin.contents.edit.group_signup_page'), preferences: [:group_signup_pricing_table_html, :group_signup_case_studies_html, :group_signup_detail_html]},
-                              {name: I18n.t('admin.contents.edit.main_links'), preferences: [:menu_1, :menu_1_icon_name, :menu_2, :menu_2_icon_name, :menu_3, :menu_3_icon_name, :menu_4, :menu_4_icon_name, :menu_5, :menu_5_icon_name, :menu_6, :menu_6_icon_name, :menu_7, :menu_7_icon_name]},
-                              {name: I18n.t('admin.contents.edit.footer_and_external_links'), preferences: [:footer_logo,
-                                                             :footer_facebook_url, :footer_twitter_url, :footer_instagram_url, :footer_linkedin_url, :footer_googleplus_url, :footer_pinterest_url,
-                                                             :footer_email, :community_forum_url, :footer_links_md, :footer_about_url]}]
+      @preference_sections = preference_sections.map do |preference_section|
+        { name: preference_section.name, preferences: preference_section.preferences }
+      end
     end
 
     def update
       params.each do |name, value|
         if ContentConfig.has_preference?(name) || ContentConfig.has_attachment?(name)
-          ContentConfig.send("#{name}=", value)
+          ContentConfig.public_send("#{name}=", value)
         end
       end
 
@@ -26,5 +20,20 @@ module Admin
 
       redirect_to main_app.edit_admin_content_path
     end
+
+    private
+
+    def preference_sections
+      [
+        PreferenceSections::HeaderSection.new,
+        PreferenceSections::HomePageSection.new,
+        PreferenceSections::ProducerSignupPageSection.new,
+        PreferenceSections::HubSignupPageSection.new,
+        PreferenceSections::GroupSignupPageSection.new,
+        PreferenceSections::MainLinksSection.new,
+        PreferenceSections::FooterAndExternalLinksSection.new,
+        PreferenceSections::UserGuideSection.new
+      ]
+    end
   end
 end

app/controllers/admin/enterprise_fees_controller.rb

@@ -2,7 +2,6 @@ module Admin
   class EnterpriseFeesController < ResourceController
     before_filter :load_enterprise_fee_set, :only => :index
     before_filter :load_data
-    before_filter :do_not_destroy_referenced_fees, :only => :destroy
 
 
     def index
@@ -45,22 +44,6 @@ module Admin
 
     private
 
-    def do_not_destroy_referenced_fees
-      product_distribution = ProductDistribution.where(:enterprise_fee_id => @object).first
-      if product_distribution
-        p = product_distribution.product
-        error = I18n.t(:enterprise_fees_destroy_error, id: p.id, name: p.name)
-
-        respond_with(@object) do |format|
-          format.html do
-            flash[:error] = error
-            redirect_to collection_url
-          end
-          format.js { render text: error, status: 403 }
-        end
-      end
-    end
-
     def load_enterprise_fee_set
       @enterprise_fee_set = EnterpriseFeeSet.new :collection => collection
     end

app/controllers/admin/inventory_items_controller.rb

@@ -19,7 +19,7 @@ module Admin
     # we can authorise #create using an object with required attributes
     def build_resource
       if parent_data.present?
-        parent.send(controller_name).build
+        parent.public_send(controller_name).build
       else
         model_class.new(params[object_name]) # This line changed
       end

app/controllers/admin/product_import_controller.rb

@@ -14,9 +14,9 @@ module Admin
       @filepath = save_uploaded_file(params[:file])
       @importer = ProductImport::ProductImporter.new(File.new(@filepath), spree_current_user, params[:settings])
       @original_filename = params[:file].try(:original_filename)
+      @non_updatable_fields = ProductImport::EntryValidator.non_updatable_fields
 
-      check_file_errors @importer
-      check_spreadsheet_has_data @importer
+      return if contains_errors? @importer
 
       @ams_data = ams_data
     end
@@ -53,7 +53,7 @@ module Admin
       @importer = ProductImport::ProductImporter.new(File.new(params[:filepath]), spree_current_user, start: params[:start], end: params[:end], settings: params[:settings])
 
       begin
-        @importer.send("#{method}_entries")
+        @importer.public_send("#{method}_entries")
       rescue StandardError => e
         render json: e.message, response: 500
         return false
@@ -62,25 +62,28 @@ module Admin
       true
     end
 
-    def check_file_errors(importer)
+    def contains_errors?(importer)
       if importer.errors.present?
         redirect_to '/admin/product_import', notice: @importer.errors.full_messages.to_sentence
+        return true
       end
+
+      check_spreadsheet_has_data importer
     end
 
     def check_spreadsheet_has_data(importer)
       unless importer.item_count
         redirect_to '/admin/product_import', notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
+        true
       end
     end
 
     def save_uploaded_file(upload)
-      filename = 'import' + Time.zone.now.strftime('%d-%m-%Y-%H-%M-%S')
-      extension = '.' + upload.original_filename.split('.').last
-      directory = 'tmp/product_import'
-      Dir.mkdir(directory) unless File.exist?(directory)
-      File.open(Rails.root.join(directory, filename + extension), 'wb') do |f|
-        f.write(upload.read)
+      extension = File.extname(upload.original_filename)
+      directory = Dir.mktmpdir 'product_import'
+      File.open(File.join(directory, "import#{extension}"), 'wb') do |f|
+        data = UploadSanitizer.new(upload.read).call
+        f.write(data)
         f.path
       end
     end
@@ -89,7 +92,7 @@ module Admin
       {
         filepath: @filepath,
         item_count: @importer.item_count,
-        supplier_product_counts: @importer.supplier_products,
+        enterprise_product_counts: @importer.enterprise_products,
         import_url: main_app.admin_product_import_process_async_path,
         save_url: main_app.admin_product_import_save_async_path,
         reset_url: main_app.admin_product_import_reset_async_path,

app/controllers/admin/resource_controller.rb

@@ -15,18 +15,18 @@ module Admin
 
     def edit_object_url(object, options = {})
       if parent_data.present?
-        main_app.send "edit_admin_#{model_name}_#{object_name}_url", parent, object, options
+        main_app.public_send "edit_admin_#{model_name}_#{object_name}_url", parent, object, options
       else
-        main_app.send "edit_admin_#{object_name}_url", object, options
+        main_app.public_send "edit_admin_#{object_name}_url", object, options
       end
     end
 
     def object_url(object = nil, options = {})
       target = object ? object : @object
       if parent_data.present?
-        main_app.send "admin_#{model_name}_#{object_name}_url", parent, target, options
+        main_app.public_send "admin_#{model_name}_#{object_name}_url", parent, target, options
       else
-        main_app.send "admin_#{object_name}_url", target, options
+        main_app.public_send "admin_#{object_name}_url", target, options
       end
     end
 

app/controllers/admin/subscription_line_items_controller.rb

@@ -1,5 +1,6 @@
 require 'open_food_network/permissions'
 require 'open_food_network/order_cycle_permissions'
+require 'open_food_network/scope_variant_to_hub'
 
 module Admin
   class SubscriptionLineItemsController < ResourceController
@@ -12,7 +13,8 @@ module Admin
     def build
       @subscription_line_item.assign_attributes(params[:subscription_line_item])
       @subscription_line_item.price_estimate = price_estimate
-      render json: @subscription_line_item, serializer: Api::Admin::SubscriptionLineItemSerializer
+      render json: @subscription_line_item, serializer: Api::Admin::SubscriptionLineItemSerializer,
+             shop: @shop, schedule: @schedule
     end
 
     private
@@ -25,7 +27,7 @@ module Admin
       @shop = Enterprise.managed_by(spree_current_user).find_by_id(params[:shop_id])
       @schedule = permissions.editable_schedules.find_by_id(params[:schedule_id])
       @order_cycle = @schedule.andand.current_or_next_order_cycle
-      @variant = Spree::Variant.stockable_by(@shop).find_by_id(params[:subscription_line_item][:variant_id])
+      @variant = variant_if_eligible(params[:subscription_line_item][:variant_id]) if @shop.present?
     end
 
     def new_actions
@@ -49,5 +51,9 @@ module Admin
       OpenFoodNetwork::ScopeVariantToHub.new(@shop).scope(@variant)
       @variant.price + fee_calculator.indexed_fees_for(@variant)
     end
+
+    def variant_if_eligible(variant_id)
+      SubscriptionVariantsService.eligible_variants(@shop).find_by_id(variant_id)
+    end
   end
 end

app/controllers/admin/variant_overrides_controller.rb

@@ -61,10 +61,8 @@ module Admin
 
     def inventory_import_dates
       import_dates = VariantOverride.
-        select('DISTINCT variant_overrides.import_date').
-        where('variant_overrides.hub_id IN (?)
-        AND variant_overrides.import_date IS NOT NULL', editable_enterprises.collect(&:id)).
-        order('import_date DESC')
+        distinct_import_dates.
+        for_hubs(editable_enterprises.collect(&:id))
 
       options = [{ id: '0', name: 'All' }]
       import_dates.collect(&:import_date).map { |i| options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long)) }