Merge pull request #3769 from amers185/fix_rebase_error

Closes translation bug for enterprise fee settings

.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,7 +33,6 @@ public/images
 public/spree
 config/abr.yml
 config/initializers/feature_toggle.rb
-config/initializers/db2fog.rb
 NERD_tree*
 coverage
 libpeerconnection.log
@@ -41,3 +40,6 @@ libpeerconnection.log
 node_modules
 vendor/bundle/
 coverage
+/reports/
+!/reports/README.md
+bin/

.rubocop_manual_todo.yml

@@ -25,7 +25,6 @@ Metrics/LineLength:
   - 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/cache_settings_controller.rb
   - app/controllers/admin/contents_controller.rb
   - app/controllers/admin/customers_controller.rb
   - app/controllers/admin/enterprise_fees_controller.rb
@@ -47,7 +46,6 @@ Metrics/LineLength:
   - app/controllers/base_controller.rb
   - app/controllers/cart_controller.rb
   - app/controllers/checkout_controller.rb
-  - app/controllers/enterprises_controller.rb
   - app/controllers/shop_controller.rb
   - app/controllers/spree/admin/adjustments_controller_decorator.rb
   - app/controllers/spree/admin/base_controller_decorator.rb
@@ -100,7 +98,6 @@ Metrics/LineLength:
   - app/models/exchange.rb
   - app/models/inventory_item.rb
   - app/models/order_cycle.rb
-  - app/models/product_distribution.rb
   - app/models/product_import/entry_processor.rb
   - app/models/product_import/entry_validator.rb
   - app/models/product_import/product_importer.rb
@@ -320,7 +317,6 @@ Metrics/LineLength:
   - 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/orders_and_fulfillments_report_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
@@ -350,7 +346,6 @@ Metrics/LineLength:
   - spec/models/model_set_spec.rb
   - spec/models/order_cycle_spec.rb
   - spec/models/producer_property_spec.rb
-  - spec/models/product_distribution_spec.rb
   - spec/models/product_importer_spec.rb
   - spec/models/proxy_order_spec.rb
   - spec/models/spree/ability_spec.rb
@@ -413,7 +408,6 @@ Metrics/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
-  - spec/support/spree/init.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -435,7 +429,6 @@ Metrics/AbcSize:
   - app/controllers/cart_controller.rb
   - app/controllers/checkout_controller.rb
   - app/controllers/discourse_sso_controller.rb
-  - app/controllers/enterprises_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

.rubocop_styleguide.yml

@@ -187,13 +187,15 @@ Metrics/AbcSize:
   Max: 15
 
 Metrics/BlockLength:
-  ExcludedMethods: ["describe", "context"]
+  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
@@ -203,6 +205,8 @@ Metrics/CyclomaticComplexity:
 
 Metrics/MethodLength:
   Max: 10
+  Exclude:
+  - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
 
 Metrics/ParameterLists:
   Max: 5

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2018-10-25 13:57:32 +1100 using RuboCop version 0.57.2.
+# on 2019-01-02 13:44:41 +0100 using RuboCop version 0.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -20,14 +20,11 @@ Layout/AlignArray:
   Exclude:
     - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/customers_report.rb'
-    - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'lib/open_food_network/packing_report.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
 
-# Offense count: 121
+# Offense count: 122
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -56,8 +53,9 @@ Layout/AlignHash:
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
 
-# Offense count: 60
+# Offense count: 49
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_parameter, with_fixed_indentation
@@ -68,7 +66,6 @@ Layout/AlignParameters:
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/serializers/api/address_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
@@ -94,11 +91,12 @@ Layout/BlockAlignment:
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 Layout/BlockEndNewline:
   Exclude:
     - 'spec/features/consumer/shopping/cart_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -124,7 +122,7 @@ Layout/ElseAlignment:
     - 'app/serializers/api/admin/order_cycle_serializer.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
 
-# Offense count: 197
+# Offense count: 187
 # Cop supports --auto-correct.
 Layout/EmptyLines:
   Exclude:
@@ -137,7 +135,6 @@ Layout/EmptyLines:
     - 'app/controllers/spree/admin/adjustments_controller_decorator.rb'
     - 'app/controllers/spree/admin/base_controller_decorator.rb'
     - 'app/controllers/spree/admin/general_settings_controller_decorator.rb'
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/controllers/spree/admin/payments_controller_decorator.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
     - 'app/controllers/spree/admin/variants_controller_decorator.rb'
@@ -148,16 +145,12 @@ Layout/EmptyLines:
     - 'app/jobs/finalize_account_invoices.rb'
     - 'app/jobs/products_cache_integrity_checker_job.rb'
     - 'app/jobs/refresh_products_cache_job.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/coordinator_fee.rb'
     - 'app/models/enterprise_fee.rb'
-    - 'app/models/enterprise_relationship.rb'
     - 'app/models/exchange.rb'
     - 'app/models/exchange_fee.rb'
     - 'app/models/inventory_item.rb'
-    - 'app/models/order_cycle.rb'
     - 'app/models/producer_property.rb'
-    - 'app/models/product_distribution.rb'
     - 'app/models/spree/calculator_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/gateway/migs.rb'
@@ -176,7 +169,6 @@ Layout/EmptyLines:
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/tax_rate_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'lib/open_food_network/cached_products_renderer.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
     - 'lib/open_food_network/enterprise_issue_validator.rb'
@@ -188,7 +180,6 @@ Layout/EmptyLines:
     - 'lib/open_food_network/products_cache.rb'
     - 'lib/open_food_network/products_cache_integrity_checker.rb'
     - 'lib/open_food_network/products_renderer.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/scope_product_to_hub.rb'
@@ -239,19 +230,16 @@ Layout/EmptyLines:
     - 'spec/models/enterprise_fee_spec.rb'
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/model_set_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/spree/adjustment_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
-    - 'spec/models/variant_override_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/credit_card_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
@@ -261,15 +249,13 @@ Layout/EmptyLinesAroundArguments:
   Exclude:
     - 'spec/archive/features/consumer/checkout_spec.rb'
 
-# Offense count: 59
+# Offense count: 51
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/controllers/spree/api/orders_controller_decorator.rb'
-    - 'app/controllers/spree/api/products_controller_decorator.rb'
     - 'app/controllers/spree/checkout_controller_decorator.rb'
     - 'app/models/spree/calculator/default_tax_decorator.rb'
     - 'app/models/spree/calculator_decorator.rb'
@@ -279,21 +265,17 @@ Layout/EmptyLinesAroundBlockBody:
     - 'lib/spree/money_decorator.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/admin/tag_rules_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/reports_controller_spec.rb'
     - 'spec/controllers/spree/api/orders_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
     - 'spec/controllers/user_confirmations_controller_spec.rb'
-    - 'spec/controllers/user_registrations_controller_spec.rb'
     - 'spec/features/admin/caching_spec.rb'
     - 'spec/features/admin/orders_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
-    - 'spec/features/admin/variant_overrides_spec.rb'
     - 'spec/features/consumer/cookies_spec.rb'
     - 'spec/features/consumer/shopping/embedded_groups_spec.rb'
     - 'spec/features/consumer/shopping/embedded_shopfronts_spec.rb'
     - 'spec/features/consumer/shopping/shopping_spec.rb'
-    - 'spec/features/consumer/shopping/variant_overrides_spec.rb'
     - 'spec/helpers/admin/business_model_configuration_helper_spec.rb'
     - 'spec/helpers/shared_helper_spec.rb'
     - 'spec/helpers/shop_helper_spec.rb'
@@ -305,7 +287,6 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/lib/open_food_network/referer_parser_spec.rb'
     - 'spec/lib/open_food_network/user_balance_calculator_spec.rb'
     - 'spec/models/billable_period_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/tag_rule/filter_payment_methods_spec.rb'
@@ -317,21 +298,19 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/support/matchers/select2_matchers.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
-# Offense count: 24
+# Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'app/controllers/admin/account_controller.rb'
-    - 'app/controllers/admin/cache_settings_controller.rb'
     - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/inventory_items_controller.rb'
     - 'app/controllers/admin/tag_rules_controller.rb'
     - 'app/controllers/api/enterprises_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/home_controller.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/coordinator_fee.rb'
     - 'app/models/producer_property.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
@@ -358,7 +337,7 @@ Layout/EndAlignment:
     - 'app/serializers/api/admin/for_order_cycle/supplied_product_serializer.rb'
     - 'app/serializers/api/admin/order_cycle_serializer.rb'
 
-# Offense count: 47
+# Offense count: 45
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
@@ -368,7 +347,6 @@ Layout/ExtraSpacing:
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/spree/classification_decorator.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'config.ru'
     - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/option_value_namer.rb'
@@ -453,7 +431,7 @@ Layout/IndentationWidth:
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/spree/calculator/flexi_rate_spec.rb'
 
-# Offense count: 44
+# Offense count: 43
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
   Exclude:
@@ -463,7 +441,6 @@ Layout/LeadingCommentSpace:
     - 'app/models/spree/inventory_unit_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/serializers/api/address_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/serializers/api/product_serializer.rb'
     - 'spec/archive/features/consumer/checkout_spec.rb'
     - 'spec/controllers/spree/api/line_items_controller_spec.rb'
@@ -479,7 +456,7 @@ Layout/LeadingCommentSpace:
     - 'spec/support/matchers/select2_matchers.rb'
     - 'spec/support/request/authentication_workflow.rb'
 
-# Offense count: 44
+# Offense count: 45
 # Cop supports --auto-correct.
 Layout/MultilineBlockLayout:
   Exclude:
@@ -499,6 +476,7 @@ Layout/MultilineBlockLayout:
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
     - 'spec/serializers/enterprise_serializer_spec.rb'
 
 # Offense count: 4
@@ -645,7 +623,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/web_helper.rb'
 
-# Offense count: 55
+# Offense count: 50
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -656,11 +634,9 @@ Layout/SpaceAroundOperators:
     - 'app/overrides/remove_search_bar.rb'
     - 'app/overrides/remove_side_bar.rb'
     - 'app/overrides/replace_shipping_address_form_with_distributor_details.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/controllers/admin/enterprises_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
@@ -721,7 +697,7 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb'
     - 'spec/models/spree/order_spec.rb'
 
-# Offense count: 194
+# Offense count: 192
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -759,7 +735,6 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
-    - 'spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb'
     - 'spec/lib/open_food_network/products_renderer_spec.rb'
     - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
     - 'spec/models/column_preference_spec.rb'
@@ -774,14 +749,13 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/spec_helper.rb'
     - 'spec/support/cancan_helper.rb'
 
-# Offense count: 728
+# Offense count: 702
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   Exclude:
-    - 'app/controllers/admin/cache_settings_controller.rb'
     - 'app/controllers/admin/enterprise_relationships_controller.rb'
     - 'app/controllers/admin/enterprise_roles_controller.rb'
     - 'app/controllers/api/statuses_controller.rb'
@@ -825,7 +799,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
     - 'spec/controllers/api/statuses_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/shop_controller_spec.rb'
@@ -845,7 +818,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/features/admin/reports_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
     - 'spec/helpers/checkout_helper_spec.rb'
-    - 'spec/helpers/i18n_helper_spec.rb'
     - 'spec/helpers/order_cycles_helper_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/feature_toggle_spec.rb'
@@ -861,7 +833,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/models/enterprise_relationship_spec.rb'
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/model_set_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/product_importer_spec.rb'
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/gateway/stripe_connect_spec.rb'
@@ -877,7 +848,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/requests/checkout/failed_checkout_spec.rb'
     - 'spec/requests/checkout/stripe_connect_spec.rb'
     - 'spec/serializers/enterprise_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/services/order_syncer_spec.rb'
     - 'spec/services/subscription_form_spec.rb'
     - 'spec/spec_helper.rb'
@@ -915,15 +885,7 @@ Layout/Tab:
     - 'spec/lib/spree/product_filters_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'spec/controllers/cart_controller_spec.rb'
-
-# Offense count: 60
+# Offense count: 57
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -939,7 +901,6 @@ Layout/TrailingWhitespace:
     - 'app/views/json/partials/_producer.rabl'
     - 'spec/controllers/admin/column_preferences_controller_spec.rb'
     - 'spec/features/admin/customers_spec.rb'
-    - 'spec/features/admin/variant_overrides_spec.rb'
     - 'spec/features/consumer/cookies_spec.rb'
     - 'spec/helpers/enterprises_helper_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
@@ -952,9 +913,10 @@ Layout/TrailingWhitespace:
     - 'spec/serializers/enterprise_serializer_spec.rb'
     - 'spec/support/request/menu_helper.rb'
 
-# Offense count: 1
+# Offense count: 2
 Lint/AmbiguousOperator:
   Exclude:
+    - 'spec/controllers/api/enterprise_fees_controller_spec.rb'
     - 'spec/controllers/spree/admin/payments_controller_spec.rb'
 
 # Offense count: 4
@@ -963,14 +925,13 @@ Lint/DuplicateMethods:
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/subscription_summary.rb'
 
-# Offense count: 16
+# Offense count: 15
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/variant_override.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/products_cache.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
 
 # Offense count: 2
@@ -1070,18 +1031,17 @@ Lint/UnusedMethodArgument:
     - 'lib/open_food_network/paperclippable.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/products_cache.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 242
+# Offense count: 240
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
@@ -1092,7 +1052,6 @@ Lint/Void:
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/shop_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/variants_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
     - 'spec/controllers/spree/api/variants_controller_spec.rb'
@@ -1116,7 +1075,6 @@ Lint/Void:
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/enterprise_issue_validator_spec.rb'
     - 'spec/lib/open_food_network/group_buy_report_spec.rb'
-    - 'spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
     - 'spec/lib/open_food_network/reports/rule_spec.rb'
@@ -1136,53 +1094,26 @@ Lint/Void:
     - 'spec/serializers/enterprise_serializer_spec.rb'
     - 'spec/support/request/web_helper.rb'
 
-# Offense count: 192
-Metrics/AbcSize:
-  Max: 293
-
-# Offense count: 1039
+# Offense count: 110
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 787
 
 # Offense count: 1
-# Configuration parameters: CountBlocks.
-Metrics/BlockNesting:
-  Max: 4
-
-# Offense count: 23
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 331
+  Max: 117
 
-# Offense count: 36
-Metrics/CyclomaticComplexity:
-  Max: 23
-
-# Offense count: 2717
+# Offense count: 1
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 619
+  Max: 141
 
-# Offense count: 161
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 95
-
-# Offense count: 27
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 633
-
-# Offense count: 6
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 8
-
-# Offense count: 28
-Metrics/PerceivedComplexity:
-  Max: 21
+  Max: 14
 
 # Offense count: 7
 Naming/AccessorMethodName:
@@ -1237,7 +1168,7 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 13
+# Offense count: 12
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at
 Naming/UncommunicativeMethodParamName:
@@ -1247,7 +1178,6 @@ Naming/UncommunicativeMethodParamName:
     - 'app/helpers/spree/base_helper_decorator.rb'
     - 'app/models/exchange.rb'
     - 'app/services/subscription_validator.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
@@ -1260,7 +1190,7 @@ Naming/VariableName:
   Exclude:
     - 'app/helpers/admin/injection_helper.rb'
 
-# Offense count: 16
+# Offense count: 10
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
@@ -1418,7 +1348,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/variant_decorator.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 45
+# Offense count: 46
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: numeric, symbolic
@@ -1427,16 +1357,15 @@ Rails/HttpStatus:
     - 'app/controllers/admin/bulk_line_items_controller.rb'
     - 'app/controllers/admin/column_preferences_controller.rb'
     - 'app/controllers/admin/customers_controller.rb'
-    - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprise_relationships_controller.rb'
     - 'app/controllers/admin/enterprise_roles_controller.rb'
     - 'app/controllers/admin/manager_invitations_controller.rb'
     - 'app/controllers/admin/tag_rules_controller.rb'
     - 'app/controllers/admin/variant_overrides_controller.rb'
     - 'app/controllers/api/customers_controller.rb'
+    - 'app/controllers/api/enterprise_fees_controller.rb'
     - 'app/controllers/api/enterprises_controller.rb'
     - 'app/controllers/application_controller.rb'
-    - 'app/controllers/cart_controller.rb'
     - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/enterprises_controller.rb'
     - 'app/controllers/line_items_controller.rb'
@@ -1474,12 +1403,11 @@ Rails/Presence:
   Exclude:
     - 'app/serializers/api/admin/customer_serializer.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
 Rails/Present:
   Exclude:
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/models/producer_property.rb'
     - 'lib/open_food_network/products_and_inventory_report.rb'
 
@@ -1546,7 +1474,6 @@ Rails/Validation:
     - 'app/models/enterprise_role.rb'
     - 'app/models/exchange.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/product_distribution.rb'
     - 'app/models/spree/product_decorator.rb'
     - 'app/models/variant_override.rb'
 
@@ -1611,7 +1538,6 @@ Style/BracesAroundHashParameters:
     - 'spec/controllers/admin/manager_invitations_controller_spec.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/line_items_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
@@ -1638,13 +1564,11 @@ Style/BracesAroundHashParameters:
     - 'spec/lib/open_food_network/order_cycle_form_applicator_spec.rb'
     - 'spec/lib/open_food_network/subscription_summarizer_spec.rb'
     - 'spec/models/billable_period_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/spree/ability_spec.rb'
     - 'spec/models/spree/order_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/serializers/admin/customer_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/cancan_helper.rb'
     - 'spec/support/request/authentication_workflow.rb'
@@ -1656,7 +1580,7 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 85
+# Offense count: 82
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -1665,7 +1589,6 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/admin/account_controller.rb'
     - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
     - 'app/controllers/admin/business_model_configuration_controller.rb'
-    - 'app/controllers/admin/cache_settings_controller.rb'
     - 'app/controllers/spree/store_controller_decorator.rb'
     - 'app/helpers/angular_form_helper.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
@@ -1800,7 +1723,7 @@ Style/EmptyLiteral:
     - 'app/helpers/checkout_helper.rb'
     - 'app/models/spree/order_decorator.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
@@ -1810,7 +1733,6 @@ Style/EmptyMethod:
     - 'app/controllers/home_controller.rb'
     - 'app/controllers/map_controller.rb'
     - 'app/controllers/producers_controller.rb'
-    - 'app/controllers/shops_controller.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
 
 # Offense count: 2
@@ -1829,19 +1751,17 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/models/enterprise_spec.rb'
 
-# Offense count: 80
+# Offense count: 76
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'app/controllers/admin/accounts_and_billing_settings_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/application_controller.rb'
     - 'app/controllers/base_controller.rb'
     - 'app/controllers/checkout_controller.rb'
-    - 'app/controllers/enterprises_controller.rb'
     - 'app/controllers/home_controller.rb'
     - 'app/controllers/spree/admin/adjustments_controller_decorator.rb'
     - 'app/controllers/spree/admin/base_controller_decorator.rb'
@@ -1854,7 +1774,6 @@ Style/GuardClause:
     - 'app/jobs/products_cache_integrity_checker_job.rb'
     - 'app/jobs/update_account_invoices.rb'
     - 'app/jobs/update_billable_periods.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
@@ -1877,7 +1796,7 @@ Style/GuardClause:
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 924
+# Offense count: 872
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
@@ -1909,7 +1828,6 @@ Style/HashSyntax:
     - 'app/helpers/spree/admin/navigation_helper_decorator.rb'
     - 'app/helpers/spree/admin/orders_helper_decorator.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer_decorator.rb'
     - 'app/models/billable_period.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
@@ -1919,7 +1837,6 @@ Style/HashSyntax:
     - 'app/models/enterprise_role.rb'
     - 'app/models/exchange_variant.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/product_distribution.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/gateway/migs.rb'
@@ -1933,22 +1850,13 @@ Style/HashSyntax:
     - 'app/models/spree/product_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user_decorator.rb'
-    - 'app/overrides/add_distributor_details_js_to_product.rb'
-    - 'app/overrides/add_distributor_details_to_product.rb'
-    - 'app/overrides/add_distributor_to_add_to_cart_form.rb'
     - 'app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb'
-    - 'app/overrides/add_source_to_product.rb'
     - 'app/overrides/remove_search_bar.rb'
     - 'app/overrides/remove_side_bar.rb'
-    - 'app/overrides/replace_checkout_payment_button.rb'
-    - 'app/overrides/replace_order_details_steps_data.rb'
-    - 'app/overrides/replace_payment_name_with_description.rb'
-    - 'app/overrides/replace_shipping_address_form_with_distributor_details.rb'
     - 'app/overrides/set_auth_token_in_backend.rb'
     - 'app/overrides/set_auth_token_in_frontend.rb'
     - 'app/presenters/variant_presenter.rb'
     - 'app/serializers/api/admin/enterprise_fee_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/views/api/order_cycles/bulk_show.v1.rabl'
     - 'app/views/json/_order_cycle.rabl'
     - 'app/views/json/partials/_hub.rabl'
@@ -1972,8 +1880,6 @@ Style/HashSyntax:
     - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
     - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
@@ -2011,7 +1917,6 @@ Style/HashSyntax:
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/spree/calculator/flat_percent_item_total_spec.rb'
     - 'spec/models/spree/calculator/flat_rate_spec.rb'
     - 'spec/models/spree/image_spec.rb'
@@ -2061,7 +1966,6 @@ Style/MethodCallWithoutArgsParentheses:
   Exclude:
     - 'app/controllers/spree/admin/payment_methods_controller_decorator.rb'
     - 'app/views/json/_groups.rabl'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/features/consumer/registration_spec.rb'
     - 'spec/models/spree/payment_method_spec.rb'
     - 'spec/support/request/ui_component_helper.rb'
@@ -2093,7 +1997,6 @@ Style/MixinUsage:
     - 'spec/features/admin/orders_spec.rb'
     - 'spec/lib/open_food_network/bulk_coop_report_spec.rb'
     - 'spec/lib/open_food_network/order_cycle_management_report_spec.rb'
-    - 'spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
 # Offense count: 4
@@ -2162,7 +2065,7 @@ Style/NumericLiteralPrefix:
   Exclude:
     - 'spec/features/admin/order_cycles_spec.rb'
 
-# Offense count: 13
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
@@ -2199,14 +2102,13 @@ Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/controllers/checkout_controller.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
   Exclude:
     - 'app/controllers/spree/orders_controller_decorator.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
 
 # Offense count: 18
 # Cop supports --auto-correct.
@@ -2264,7 +2166,7 @@ Style/RedundantReturn:
     - 'app/models/spree/classification_decorator.rb'
     - 'app/serializers/api/admin/enterprise_serializer.rb'
 
-# Offense count: 96
+# Offense count: 95
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
@@ -2311,15 +2213,14 @@ Style/RegexpLiteral:
     - 'spec/mailers/subscription_mailer_spec.rb'
     - 'spec/models/content_configuration_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Exclude:
     - 'app/controllers/application_controller.rb'
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 268
+# Offense count: 266
 Style/Send:
   Exclude:
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -2350,7 +2251,6 @@ Style/Send:
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/exchange_spec.rb'
     - 'spec/models/order_cycle_spec.rb'
-    - 'spec/models/product_distribution_spec.rb'
     - 'spec/models/spree/gateway/stripe_connect_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/order_spec.rb'
@@ -2395,7 +2295,7 @@ Style/StructInheritance:
   Exclude:
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
 
-# Offense count: 93
+# Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
@@ -2419,7 +2319,6 @@ Style/SymbolProc:
     - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
     - 'spec/controllers/spree/api/variants_controller_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'

.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

@@ -69,10 +69,14 @@ 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`.
@@ -114,7 +118,7 @@ $ createdb open_food_network_test --owner=ofn
 If these commands succeed, you should be able to [continue the setup process](#get-it-running).
 
 [developer-wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
-[sierra]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-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

Gemfile

@@ -5,11 +5,12 @@ 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'
@@ -22,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
@@ -63,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'
 
@@ -88,10 +91,7 @@ group :assets do
   gem 'compass-rails'
   gem 'coffee-rails', '~> 3.2.1'
 
-  gem 'mini_racer'
-  # We found that the following version of libv8 breaks the compilation of mini_racer.
-  # Nothing else depends on libv8.
-  gem 'libv8', '!= 6.7.288.46.1'
+  gem 'therubyracer', '=0.12.0'
 
   gem 'uglifier', '>= 1.0.3'
 
@@ -120,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'
@@ -145,6 +146,8 @@ group :development do
   gem 'guard-rails'
   gem 'guard-rspec', '~> 4.7.3'
   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

Gemfile.lock

@@ -133,6 +133,11 @@ GIT
       activemodel (>= 3.0)
       railties (>= 3.0)
 
+PATH
+  remote: engines/order_management
+  specs:
+    order_management (0.0.1)
+
 PATH
   remote: engines/web
   specs:
@@ -186,8 +191,10 @@ 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)
@@ -201,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)
@@ -213,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)
@@ -228,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)
@@ -244,23 +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
-    daemons (1.2.2)
-    dalli (2.7.2)
+    daemons (1.3.1)
+    dalli (2.7.10)
     database_cleaner (0.7.1)
     db2fog (0.9.0)
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.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)
@@ -269,7 +290,7 @@ 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)
@@ -284,10 +305,10 @@ GEM
     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)
+    ffi (1.10.0)
     figaro (1.1.1)
       thor (~> 0.14)
     fission (0.5.0)
@@ -444,18 +465,18 @@ GEM
     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)
@@ -484,10 +505,11 @@ 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)
+    io-like (0.3.0)
     ipaddress (0.8.3)
     jaro_winkler (1.5.1)
     journey (1.0.4)
@@ -499,33 +521,31 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.11.2)
-    knapsack (1.16.0)
+    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 (6.3.292.48.1)
+    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)
-    mini_racer (0.1.15)
-      libv8 (~> 6.3)
-    momentjs-rails (2.5.1)
+    momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.0)
       i18n (~> 0.6.0)
@@ -533,22 +553,24 @@ 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 (3.6.10)
+    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)
@@ -563,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)
@@ -586,6 +604,8 @@ GEM
       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
@@ -611,7 +631,7 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
-    rake (12.3.1)
+    rake (12.3.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -626,13 +646,16 @@ GEM
       trollop (~> 2.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.2.3)
-    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)
+    redcarpet (3.4.0)
+    ref (2.0.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)
@@ -640,29 +663,29 @@ 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-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.7.1)
+    rspec-support (3.8.0)
     rubocop (0.57.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -673,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)
@@ -682,6 +706,9 @@ 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)
@@ -690,12 +717,19 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    skylight (1.7.1)
+    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)
@@ -703,8 +737,12 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     state_machine (1.2.0)
     stringex (1.3.3)
-    stripe (3.3.2)
-      faraday (~> 0.9)
+    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.3)
     tilt (1.4.1)
     timecop (0.9.1)
@@ -716,11 +754,11 @@ GEM
     turbo-sprockets-rails3 (0.3.14)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.2.0)
-    tzinfo (0.3.54)
-    uglifier (4.1.19)
+    tzinfo (0.3.55)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.2)
-    unicorn (5.4.1)
+    unicorn (5.5.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -733,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)
@@ -758,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
@@ -767,7 +801,9 @@ DEPENDENCIES
   bugsnag
   byebug (~> 9.0.0)
   capybara (>= 2.15.4)
+  chromedriver-helper
   coffee-rails (~> 3.2.1)
+  combine_pdf
   compass-rails
   custom_error_message!
   daemons
@@ -777,6 +813,7 @@ DEPENDENCIES
   debugger-linecache
   deface!
   delayed_job_active_record
+  delayed_job_web
   diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails
@@ -794,26 +831,24 @@ 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)
-  libv8 (!= 6.7.288.46.1)
   listen (= 3.0.8)
-  mini_racer
   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
   pg
-  poltergeist (>= 1.16.0)
   pry-byebug (>= 3.4.3)
   rabl
   rack-mini-profiler (< 1.0.0)
@@ -822,7 +857,7 @@ DEPENDENCIES
   rails (~> 3.2.22)
   rails-i18n (~> 3.0.0)
   redcarpet
-  roadie-rails (~> 1.0.3)
+  roadie-rails (~> 1.1.1)
   roo (~> 2.7.0)
   roo-xls (~> 1.1.0)
   rspec-rails (>= 3.5.2)
@@ -830,6 +865,7 @@ DEPENDENCIES
   rubocop (>= 0.49.1)
   sass (~> 3.3)
   sass-rails (~> 3.2.3)
+  selenium-webdriver
   shoulda-matchers
   simple_form!
   simplecov
@@ -839,7 +875,10 @@ DEPENDENCIES
   spree_auth_devise!
   spree_i18n!
   spree_paypal_express!
-  stripe (~> 3.3.2)
+  spring (= 1.7.2)
+  spring-commands-rspec
+  stripe
+  therubyracer (= 0.12.0)
   timecop
   truncate_html
   turbo-sprockets-rails3
@@ -856,4 +895,4 @@ RUBY VERSION
    ruby 2.1.5p273
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

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

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/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,18 +26,21 @@ 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')
 
+    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]": "#{moment($scope.startDate).format()}",
-      "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}"
+      "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]": "#{moment($scope.startDate).format()}",
-      "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}"
+      "q[order][completed_at_gteq]": formatted_start_date,
+      "q[order][completed_at_lt]": formatted_end_date
     )
 
     unless $scope.initialized
@@ -45,11 +48,9 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       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()
@@ -59,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')
@@ -154,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/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/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/orders_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, Orders, SortOptions) ->
+angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, Orders, SortOptions, $window, $filter) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.pagination = Orders.pagination
   $scope.orders = Orders.all
@@ -8,6 +8,11 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
     {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.initialise = ->
     $scope.per_page = 15
@@ -17,6 +22,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
     $scope.fetchResults()
 
   $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'],
@@ -25,8 +31,9 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
       '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'],
-      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'],
-      'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_null'],
+      # 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'],
@@ -35,6 +42,26 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
       page: page
     })
 
+  $scope.resetSelected = ->
+    $scope.selected_orders.length = 0
+    $scope.selected = false
+    $scope.select_all = false
+    $scope.checkboxes = {}
+
+  $scope.toggleSelection = (id) ->
+    index = $scope.selected_orders.indexOf(id)
+
+    if index == -1
+      $scope.selected_orders.push(id)
+    else
+      $scope.selected_orders.splice(index, 1)
+
+  $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
+
   $scope.$watch 'sortOptions', (sort) ->
     if sort && sort.predicate != ""
       $scope.sorting = sort.predicate + ' desc' if sort.reverse

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

@@ -10,6 +10,7 @@ angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $htt
   $scope.updated_ids = []
   $scope.update_errors = []
 
+  $scope.batchSize = 50
   $scope.step = 'settings'
   $scope.chunks = 0
   $scope.completed = 0
@@ -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/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/services/orders.js.coffee

@@ -9,7 +9,7 @@ angular.module("admin.resources").factory 'Orders', ($q, OrderResource, RequestM
       request = OrderResource.index params, (data) =>
         @load(data)
         (callback || angular.noop)(data)
-      RequestMonitor.load(request.$promise)
+      @all.$promise = request.$promise
       @all
 
     load: (data) ->

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

@@ -7,9 +7,10 @@
  *= 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
 */
@@ -17,4 +18,3 @@
 @import 'variables';
 @import 'components/*';
 @import '*';
-@import 'pages/*';

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

@@ -1,6 +1,6 @@
 @import '../variables';
 
-.reveal-modal.product-image-upload {
+.reveal-modal.simple-modal {
   width: 300px;
 
   .close-reveal-modal {

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

@@ -103,3 +103,34 @@ table.index td.actions {
     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/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/base/colors.css.scss

@@ -1,4 +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/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/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/product_import_controller.rb

@@ -16,8 +16,7 @@ module Admin
       @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
@@ -63,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

app/controllers/admin/subscription_line_items_controller.rb

@@ -13,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
@@ -26,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
@@ -50,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/cart_controller.rb

@@ -20,28 +20,16 @@ class CartController < BaseController
 
         variant_ids = variant_ids_in(cart_service.variants_h)
 
-        render json: { error: false, stock_levels: stock_levels(current_order, variant_ids) },
-               status: 200
-
+        render json: { error: false,
+                       stock_levels: VariantsStockLevels.new.call(current_order, variant_ids) },
+               status: :ok
       else
-        render json: { error: true }, status: 412
+        render json: { error: true }, status: :precondition_failed
       end
     end
     populate_variant_attributes
   end
 
-  # Report the stock levels in the order for all variant ids requested
-  def stock_levels(order, variant_ids)
-    stock_levels = li_stock_levels(order)
-
-    li_variant_ids = stock_levels.keys
-    (variant_ids - li_variant_ids).each do |variant_id|
-      stock_levels[variant_id] = { quantity: 0, max_quantity: 0, on_hand: Spree::Variant.find(variant_id).on_hand }
-    end
-
-    stock_levels
-  end
-
   def variant_ids_in(variants_h)
     variants_h.map { |v| v[:variant_id].to_i }
   end
@@ -79,21 +67,4 @@ class CartController < BaseController
                                    max_quantity: max_quantity)
     end
   end
-
-  def li_stock_levels(order)
-    Hash[
-      order.line_items.map do |li|
-        [li.variant.id,
-         { quantity: li.quantity,
-           max_quantity: li.max_quantity,
-           on_hand: wrap_json_infinity(li.variant.on_hand) }]
-      end
-    ]
-  end
-
-  # Rails to_json encodes Float::INFINITY as Infinity, which is not valid JSON
-  # Return it as a large integer (max 32 bit signed int)
-  def wrap_json_infinity(number)
-    number == Float::INFINITY ? 2147483647 : number
-  end
 end

app/controllers/checkout_controller.rb

@@ -18,7 +18,7 @@ class CheckoutController < Spree::CheckoutController
     # This is only required because of spree_paypal_express. If we implement
     # a version of paypal that uses this controller, and more specifically
     # the #update_failed method, then we can remove this call
-    restart_checkout
+    RestartCheckout.new(@order).call
   end
 
   def update
@@ -139,7 +139,8 @@ class CheckoutController < Spree::CheckoutController
 
   def update_failed
     clear_ship_address
-    restart_checkout
+    RestartCheckout.new(@order).call
+
     respond_to do |format|
       format.html do
         render :edit
@@ -158,15 +159,6 @@ class CheckoutController < Spree::CheckoutController
     end
   end
 
-  def restart_checkout
-    return if @order.state == 'cart'
-    @order.restart_checkout! # resets state to 'cart'
-    @order.update_attributes!(shipping_method_id: nil)
-    @order.shipments.with_state(:pending).destroy_all
-    @order.payments.with_state(:checkout).destroy_all
-    @order.reload
-  end
-
   def skip_state_validation?
     true
   end

app/controllers/enterprises_controller.rb

@@ -7,13 +7,27 @@ class EnterprisesController < BaseController
 
   # These prepended filters are in the reverse order of execution
   prepend_before_filter :set_order_cycles, :require_distributor_chosen, :reset_order, only: :shop
-  before_filter :check_stock_levels, :set_noindex_meta_tag, only: :shop
 
   before_filter :clean_permalink, only: :check_permalink
   before_filter :enable_embedded_shopfront
 
   respond_to :js, only: :permalink_checker
 
+  def shop
+    return redirect_to spree.cart_path unless enough_stock?
+    set_noindex_meta_tag
+
+    enterprises = current_distributor
+      .plus_relatives_and_oc_producers(shop_order_cycles)
+      .activated
+      .includes(address: :state)
+      .all
+
+    enterprises = inject_json_ams('enterprises', enterprises)
+
+    render locals: { enterprises: enterprises }
+  end
+
   def relatives
     set_enterprise
 
@@ -48,10 +62,8 @@ class EnterprisesController < BaseController
     params[:permalink] = params[:permalink].parameterize
   end
 
-  def check_stock_levels
-    if current_order(true).insufficient_stock_lines.present?
-      redirect_to spree.cart_path
-    end
+  def enough_stock?
+    current_order(true).insufficient_stock_lines.blank?
   end
 
   def reset_order
@@ -85,7 +97,25 @@ class EnterprisesController < BaseController
     order.order_cycle = order_cycle_options.first if order_cycle_options.count == 1
   end
 
+  def shop_order_cycles
+    if current_order_cycle
+      [current_order_cycle]
+    else
+      OrderCycle.not_closed.with_distributor(current_distributor)
+    end
+  end
+
   def set_noindex_meta_tag
     @noindex_meta_tag = true unless current_distributor.visible?
   end
+
+  def inject_json_ams(name, object)
+    options = {
+      each_serializer: Api::EnterpriseSerializer,
+      data: OpenFoodNetwork::EnterpriseInjectionData.new
+    }
+    serializer_instance = ActiveModel::ArraySerializer.new(object, options)
+
+    { name: name, json: serializer_instance.to_json }
+  end
 end

app/controllers/shops_controller.rb

@@ -4,5 +4,11 @@ class ShopsController < BaseController
   before_filter :enable_embedded_shopfront
 
   def index
+    @enterprises = Enterprise
+      .activated
+      .includes(address: :state)
+      .includes(:properties)
+      .includes(supplied_products: :properties)
+      .all
   end
 end

app/controllers/spree/admin/invoices_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Admin
+    class InvoicesController < Spree::Admin::BaseController
+      respond_to :json
+      authorize_resource class: false
+
+      def create
+        invoice_service = BulkInvoiceService.new
+        invoice_service.start_pdf_job(params[:order_ids])
+
+        render json: invoice_service.id, status: :ok
+      end
+
+      def show
+        invoice_id = params[:id]
+        invoice_pdf = BulkInvoiceService.new.filepath(invoice_id)
+
+        send_file(invoice_pdf, type: 'application/pdf', disposition: :inline)
+      end
+
+      def poll
+        invoice_id = params[:invoice_id]
+
+        if BulkInvoiceService.new.invoice_created? invoice_id
+          render json: { created: true }, status: :ok
+        else
+          render json: { created: false }, status: :unprocessable_entity
+        end
+      end
+    end
+  end
+end

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -37,8 +37,8 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def invoice
-    template = if Spree::Config.invoice_style2? then "spree/admin/orders/invoice2" else "spree/admin/orders/invoice" end
-    pdf = render_to_string pdf: "invoice-#{@order.number}.pdf", template: template, formats: [:html], encoding: "UTF-8"
+    pdf = InvoiceRenderer.new.render_to_string(@order)
+
     Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
     flash[:success] = t('admin.orders.invoice_email_sent')
 
@@ -46,8 +46,7 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def print
-    template = if Spree::Config.invoice_style2? then "spree/admin/orders/invoice2" else "spree/admin/orders/invoice" end
-    render pdf: "invoice-#{@order.number}", template: template, encoding: "UTF-8"
+    render InvoiceRenderer.new.args(@order)
   end
 
   def print_ticket

app/controllers/spree/admin/products_controller_decorator.rb

@@ -23,9 +23,6 @@ Spree::Admin::ProductsController.class_eval do
       render :new
     } } }
 
-  def product_distributions
-  end
-
   def index
     @current_user = spree_current_user
     @show_latest_import = params[:latest_import] || false

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

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

app/controllers/spree/admin/reports_controller_decorator.rb

@@ -1,4 +1,6 @@
 require 'csv'
+
+require 'open_food_network/reports/list'
 require 'open_food_network/order_and_distributor_report'
 require 'open_food_network/products_and_inventory_report'
 require 'open_food_network/lettuce_share_report'
@@ -24,35 +26,7 @@ Spree::Admin::ReportsController.class_eval do
   before_filter :load_data, only: [:customers, :products_and_inventory, :order_cycle_management, :packing]
 
   def report_types
-    {
-      orders_and_fulfillment: [
-        [I18n.t('admin.reports.supplier_totals'), :order_cycle_supplier_totals],
-        [I18n.t('admin.reports.supplier_totals_by_distributor'), :order_cycle_supplier_totals_by_distributor],
-        [I18n.t('admin.reports.totals_by_supplier'), :order_cycle_distributor_totals_by_supplier],
-        [I18n.t('admin.reports.customer_totals'), :order_cycle_customer_totals]
-      ],
-      products_and_inventory: [
-        [I18n.t('admin.reports.all_products'), :all_products],
-        [I18n.t('admin.reports.inventory'), :inventory],
-        [I18n.t('admin.reports.lettuce_share'), :lettuce_share]
-      ],
-      customers: [
-        [I18n.t('admin.reports.mailing_list'), :mailing_list],
-        [I18n.t('admin.reports.addresses'), :addresses]
-      ],
-      order_cycle_management: [
-        [I18n.t('admin.reports.payment_methods'), :payment_methods],
-        [I18n.t('admin.reports.delivery'), :delivery]
-      ],
-      sales_tax: [
-        [I18n.t('admin.reports.tax_types'), :tax_types],
-        [I18n.t('admin.reports.tax_rates'), :tax_rates]
-      ],
-      packing: [
-        [I18n.t('admin.reports.pack_by_customer'), :pack_by_customer],
-        [I18n.t('admin.reports.pack_by_supplier'), :pack_by_supplier]
-      ]
-    }
+    OpenFoodNetwork::Reports::List.all
   end
 
   # Override spree reports list.
@@ -71,16 +45,6 @@ Spree::Admin::ReportsController.class_eval do
   def order_cycle_management
     params[:q] ||= {}
 
-    # -- Prepare form options
-    my_distributors = Enterprise.is_distributor.managed_by(spree_current_user)
-    my_suppliers = Enterprise.is_primary_producer.managed_by(spree_current_user)
-
-    # My distributors and any distributors distributing products I supply
-    @distributors = my_distributors | Enterprise.with_distributed_products_outer.merge(Spree::Product.in_any_supplier(my_suppliers))
-    # My suppliers and any suppliers supplying products I distribute
-    @suppliers = my_suppliers | my_distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
-    @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
-
     @report_types = report_types[:order_cycle_management]
     @report_type = params[:report_type]
 
@@ -94,22 +58,12 @@ Spree::Admin::ReportsController.class_eval do
   def packing
     params[:q] ||= {}
 
-    # -- Prepare form options
-    my_distributors = Enterprise.is_distributor.managed_by(spree_current_user)
-    my_suppliers = Enterprise.is_primary_producer.managed_by(spree_current_user)
-
-    # My distributors and any distributors distributing products I supply
-    @distributors = my_distributors | Enterprise.with_distributed_products_outer.merge(Spree::Product.in_any_supplier(my_suppliers))
-    # My suppliers and any suppliers supplying products I distribute
-    @suppliers = my_suppliers | my_distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
-    @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
     @report_types = report_types[:packing]
     @report_type = params[:report_type]
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::PackingReport.new spree_current_user, params, render_content?
-    order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
-    @table = order_grouper.table(@report.table_items)
+    @table = order_grouper_table
 
     render_report(@report.header, @table, params[:csv], "packing_#{timestamp}.csv")
   end
@@ -122,7 +76,7 @@ Spree::Admin::ReportsController.class_eval do
   end
 
   def sales_tax
-    @distributors = Enterprise.is_distributor.managed_by(spree_current_user)
+    @distributors = my_distributors
     @report_type = params[:report_type]
     @report = OpenFoodNetwork::SalesTaxReport.new spree_current_user, params, render_content?
     render_report(@report.header, @report.table, params[:csv], "sales_tax.csv")
@@ -130,13 +84,12 @@ Spree::Admin::ReportsController.class_eval do
 
   def bulk_coop
     # -- Prepare form options
-    @distributors = Enterprise.is_distributor.managed_by(spree_current_user)
+    @distributors = my_distributors
     @report_type = params[:report_type]
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::BulkCoopReport.new spree_current_user, params, render_content?
-    order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
-    @table = order_grouper.table(@report.table_items)
+    @table = order_grouper_table
     csv_file_name = "bulk_coop_#{params[:report_type]}_#{timestamp}.csv"
 
     render_report(@report.header, @table, params[:csv], csv_file_name)
@@ -144,13 +97,12 @@ Spree::Admin::ReportsController.class_eval do
 
   def payments
     # -- Prepare Form Options
-    @distributors = Enterprise.is_distributor.managed_by(spree_current_user)
+    @distributors = my_distributors
     @report_type = params[:report_type]
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::PaymentsReport.new spree_current_user, params, render_content?
-    order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
-    @table = order_grouper.table(@report.table_items)
+    @table = order_grouper_table
     csv_file_name = "payments_#{timestamp}.csv"
 
     render_report(@report.header, @table, params[:csv], csv_file_name)
@@ -166,7 +118,7 @@ Spree::Admin::ReportsController.class_eval do
     # My suppliers and any suppliers supplying products I distribute
     @suppliers = permissions.visible_enterprises_for_order_reports.is_primary_producer
 
-    @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
+    @order_cycles = my_order_cycles
 
     @report_types = report_types[:orders_and_fulfillment]
     @report_type = params[:report_type]
@@ -175,8 +127,7 @@ Spree::Admin::ReportsController.class_eval do
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::OrdersAndFulfillmentsReport.new spree_current_user, params, render_content?
-    order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
-    @table = order_grouper.table(@report.table_items)
+    @table = order_grouper_table
     csv_file_name = "#{params[:report_type]}_#{timestamp}.csv"
 
     render_report(@report.header, @table, params[:csv], csv_file_name)
@@ -200,8 +151,8 @@ Spree::Admin::ReportsController.class_eval do
   def xero_invoices
     params[:q] ||= {}
 
-    @distributors = Enterprise.is_distributor.managed_by(spree_current_user)
-    @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
+    @distributors = my_distributors
+    @order_cycles = my_order_cycles
 
     @report = OpenFoodNetwork::XeroInvoicesReport.new spree_current_user, params, render_content?
     render_report(@report.header, @report.table, params[:csv], "xero_invoices_#{timestamp}.csv")
@@ -254,15 +205,33 @@ Spree::Admin::ReportsController.class_eval do
   end
 
   def load_data
-    # Load distributors either owned by the user or selling their enterprises products.
-    my_distributors = Enterprise.is_distributor.managed_by(spree_current_user)
-    my_suppliers = Enterprise.is_primary_producer.managed_by(spree_current_user)
-    distributors_of_my_products = Enterprise.with_distributed_products_outer.merge(Spree::Product.in_any_supplier(my_suppliers))
-    @distributors = my_distributors | distributors_of_my_products
-    # Load suppliers either owned by the user or supplying products their enterprises distribute.
-    suppliers_of_products_i_distribute = my_distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
-    @suppliers = my_suppliers | suppliers_of_products_i_distribute
-    @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
+    @distributors = my_distributors
+    @suppliers = my_suppliers | suppliers_of_products_distributed_by(@distributors)
+    @order_cycles = my_order_cycles
+  end
+
+  # Load managed distributor enterprises of current user
+  def my_distributors
+    Enterprise.is_distributor.managed_by(spree_current_user)
+  end
+
+  # Load managed producer enterprises of current user
+  def my_suppliers
+    Enterprise.is_primary_producer.managed_by(spree_current_user)
+  end
+
+  def suppliers_of_products_distributed_by(distributors)
+    distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
+  end
+
+  # Load order cycles the current user has access to
+  def my_order_cycles
+    OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
+  end
+
+  def order_grouper_table
+    order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
+    order_grouper.table(@report.table_items)
   end
 
   def authorized_reports
@@ -275,6 +244,7 @@ Spree::Admin::ReportsController.class_eval do
       :products_and_inventory,
       :sales_total,
       :users_and_enterprises,
+      :enterprise_fee_summary,
       :order_cycle_management,
       :sales_tax,
       :xero_invoices,
@@ -295,7 +265,13 @@ Spree::Admin::ReportsController.class_eval do
         locals: { report_types: report_types[report] }
       ).html_safe
     end
-    { name: name, description: description }
+    { name: name, url: url_for_report(report), description: description }
+  end
+
+  def url_for_report(report)
+    public_send("#{report}_admin_reports_url".to_sym)
+  rescue NoMethodError
+    url_for([:new, :admin, :reports, report.to_s.singularize])
   end
 
   def timestamp

app/controllers/spree/admin/shipping_methods_controller_decorator.rb

@@ -29,12 +29,8 @@ module Spree
         collection
       end
 
-      # This method was originally written because ProductDistributions referenced shipping
-      # methods, and deleting a referenced shipping method would break all the reports that
-      # queried it.
-      # This has changed, and now all we're protecting is Orders, which is a spree resource.
-      # Do we really need to protect it ourselves? Does spree do this, or provide some means
-      # of preserving the shipping method information for past orders?
+      # Spree allows soft deletes of shipping_methods but our reports are not adapted to that.
+      #   So, here we prevent the deletion (even soft) of shipping_methods used in orders.
       def do_not_destroy_referenced_shipping_methods
         order = Order.where(:shipping_method_id => @object).first
         if order

app/controllers/spree/admin/variants_controller_decorator.rb

@@ -10,12 +10,13 @@ Spree::Admin::VariantsController.class_eval do
 
   def destroy
     @variant = Spree::Variant.find(params[:id])
-    @variant.delete # This line changed, as well as removal of following conditional
+    @variant.delete_and_refresh_cache
+
     flash[:success] = I18n.t('notice_messages.variant_deleted')
 
     respond_with(@variant) do |format|
       format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-      format.js   { render_js_for_destroy }
+      format.js { render_js_for_destroy }
     end
   end
 

app/controllers/spree/api/orders_controller_decorator.rb

@@ -1,7 +0,0 @@
-Spree::Api::OrdersController.class_eval do
-
-  # We need to add expections for collection actions other than :index here
-  # because Spree's API controller causes authorize_read! to be called, which
-  # results in an ActiveRecord::NotFound Exception as the order object is not
-  # defined for collection actions
-end

app/controllers/user_registrations_controller.rb

@@ -5,25 +5,29 @@ class UserRegistrationsController < Spree::UserRegistrationsController
 
   before_filter :set_checkout_redirect, only: :create
 
+  include I18nHelper
+  before_filter :set_locale
+
   # POST /resource/sign_up
   def create
     @user = build_resource(params[:spree_user])
-    if resource.save
-      session[:spree_user_signup] = true
-      session[:confirmation_return_url] = params[:return_url]
-      associate_user
+    @user.locale = I18n.locale.to_s
+    unless resource.save
+      return render_error(@user.errors)
+    end
 
-      respond_to do |format|
-        format.html do
-          set_flash_message(:success, :signed_up_but_unconfirmed)
-          redirect_to after_sign_in_path_for(@user)
-        end
-        format.js do
-          render json: { email: @user.email }
-        end
+    session[:spree_user_signup] = true
+    session[:confirmation_return_url] = params[:return_url]
+    associate_user
+
+    respond_to do |format|
+      format.html do
+        set_flash_message(:success, :signed_up_but_unconfirmed)
+        redirect_to after_sign_in_path_for(@user)
+      end
+      format.js do
+        render json: { email: @user.email }
       end
-    else
-      render_error(@user.errors)
     end
   rescue StandardError => error
     OpenFoodNetwork::ErrorLogger.notify(error)

app/helpers/add_to_cart_helper.rb

@@ -1,21 +0,0 @@
-module AddToCartHelper
-  def product_out_of_stock
-    !@product.has_stock? && !Spree::Config[:allow_backorders]
-  end
-
-  def distributor_available_for?(order, product)
-    DistributionChangeValidator.new(order).distributor_available_for?(product)
-  end
-
-  def order_cycle_available_for?(order, product)
-    DistributionChangeValidator.new(order).order_cycle_available_for?(product)
-  end
-
-  def available_distributors_for(order, product)
-    DistributionChangeValidator.new(order).available_distributors_for(product)
-  end
-
-  def available_order_cycles_for(order, product)
-    DistributionChangeValidator.new(order).available_order_cycles_for(product)
-  end
-end

app/helpers/admin/injection_helper.rb

@@ -65,6 +65,10 @@ module Admin
       admin_inject_json_ams_array opts[:module], "columns", column_preferences, Api::Admin::ColumnPreferenceSerializer
     end
 
+    def admin_inject_currency_config
+      admin_inject_json_ams 'admin.utils', "currencyConfig", {}, Api::CurrencyConfigSerializer
+    end
+
     def admin_inject_enterprise_permissions
       permissions =
         {can_manage_shipping_methods: can?(:manage_shipping_methods, @enterprise),

app/helpers/checkout_helper.rb

@@ -54,7 +54,7 @@ module CheckoutHelper
   end
 
   def display_adjustment_tax_rates(adjustment)
-    tax_rates = adjustment.tax_rates
+    tax_rates = TaxRateFinder.tax_rates_of(adjustment)
     tax_rates.map { |tr| number_to_percentage(tr.amount * 100, :precision => 1) }.join(", ")
   end
 

app/helpers/i18n_helper.rb

@@ -1,7 +1,7 @@
 module I18nHelper
   def set_locale
     # Save a given locale
-    if params[:locale] && Rails.application.config.i18n.available_locales.include?(params[:locale])
+    if params[:locale] && available_locale?(params[:locale])
       spree_current_user.update_attributes!(locale: params[:locale]) if spree_current_user
       cookies[:locale] = params[:locale]
     end
@@ -13,4 +13,20 @@ module I18nHelper
 
     I18n.locale = spree_current_user.andand.locale || cookies[:locale] || I18n.default_locale
   end
+
+  def valid_locale(user)
+    if user.present? &&
+       user.locale.present? &&
+       available_locale?(user.locale)
+      user.locale
+    else
+      I18n.default_locale
+    end
+  end
+
+  private
+
+  def available_locale?(locale)
+    Rails.application.config.i18n.available_locales.include?(locale)
+  end
 end

app/helpers/injection_helper.rb

@@ -1,23 +1,19 @@
 require 'open_food_network/enterprise_injection_data'
 
 module InjectionHelper
-  def inject_enterprises
-    inject_json_ams "enterprises", Enterprise.activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data
+  def inject_enterprises(enterprises = Enterprise.activated.includes(address: :state).all)
+    inject_json_ams(
+      'enterprises',
+      enterprises,
+      Api::EnterpriseSerializer,
+      enterprise_injection_data
+    )
   end
 
   def inject_enterprise_and_relatives
     inject_json_ams "enterprises", current_distributor.relatives_including_self.activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data
   end
 
-  def inject_shop_enterprises
-    ocs = if current_order_cycle
-            [current_order_cycle]
-          else
-            OrderCycle.not_closed.with_distributor(current_distributor)
-          end
-    inject_json_ams "enterprises", current_distributor.plus_relatives_and_oc_producers(ocs).activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data
-  end
-
   def inject_group_enterprises
     inject_json_ams "group_enterprises", @group.enterprises.activated.all, Api::EnterpriseSerializer, enterprise_injection_data
   end

app/helpers/spree/orders_helper.rb

@@ -5,10 +5,6 @@ module Spree
       order.nil? || order.line_items.empty?
     end
 
-    def alternative_available_distributors(order)
-      DistributionChangeValidator.new(order).available_distributors(Enterprise.all) - [order.distributor]
-    end
-
     def last_completed_order
       spree_current_user.orders.complete.last
     end

app/jobs/refresh_products_cache_job.rb

@@ -2,12 +2,17 @@ require 'open_food_network/products_renderer'
 
 RefreshProductsCacheJob = Struct.new(:distributor_id, :order_cycle_id) do
   def perform
-    Rails.cache.write "products-json-#{distributor_id}-#{order_cycle_id}", products_json
+    Rails.cache.write(key, products_json)
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 
-
   private
 
+  def key
+    "products-json-#{distributor_id}-#{order_cycle_id}"
+  end
+
   def products_json
     distributor = Enterprise.find distributor_id
     order_cycle = OrderCycle.find order_cycle_id

app/jobs/subscription_confirm_job.rb

@@ -25,7 +25,7 @@ class SubscriptionConfirmJob
   def proxy_orders
     ProxyOrder.not_canceled.where('confirmed_at IS NULL AND placed_at IS NOT NULL')
       .joins(:order_cycle).merge(recently_closed_order_cycles)
-      .joins(:order).merge(Spree::Order.complete)
+      .joins(:order).merge(Spree::Order.complete.not_state('canceled'))
   end
 
   def recently_closed_order_cycles

app/mailers/enterprise_mailer.rb

@@ -1,15 +1,18 @@
 require 'devise/mailers/helpers'
 class EnterpriseMailer < Spree::BaseMailer
   include Devise::Mailers::Helpers
+  include I18nHelper
 
   def welcome(enterprise)
     @enterprise = enterprise
-    subject = t('enterprise_mailer.welcome.subject',
-                enterprise: @enterprise.name,
-                sitename: Spree::Config[:site_name])
-    mail(:to => enterprise.contact.email,
-         :from => from_address,
-         :subject => subject)
+    I18n.with_locale valid_locale(@enterprise.owner) do
+      subject = t('enterprise_mailer.welcome.subject',
+                  enterprise: @enterprise.name,
+                  sitename: Spree::Config[:site_name])
+      mail(:to => enterprise.contact.email,
+           :from => from_address,
+           :subject => subject)
+    end
   end
 
   def manager_invitation(enterprise, user)
@@ -17,11 +20,12 @@ class EnterpriseMailer < Spree::BaseMailer
     @instance = Spree::Config[:site_name]
     @instance_email = from_address
 
-    subject = t('enterprise_mailer.invite_manager.subject', enterprise: @enterprise.name)
-
-    mail(to: user.email,
-         from: from_address,
-         subject: subject)
+    I18n.with_locale valid_locale(@enterprise.owner) do
+      subject = t('enterprise_mailer.invite_manager.subject', enterprise: @enterprise.name)
+      mail(to: user.email,
+           from: from_address,
+           subject: subject)
+    end
   end
 
   private

app/mailers/producer_mailer.rb

@@ -1,4 +1,5 @@
 class ProducerMailer < Spree::BaseMailer
+  include I18nHelper
 
   def order_cycle_report(producer, order_cycle)
     @producer = producer
@@ -10,9 +11,11 @@ class ProducerMailer < Spree::BaseMailer
     @total = total_from_line_items(line_items)
     @tax_total = tax_total_from_line_items(line_items)
 
-    subject = "[#{Spree::Config.site_name}] #{I18n.t('producer_mailer.order_cycle.subject', producer: producer.name)}"
+    I18n.with_locale valid_locale(@producer.owner) do
+      order_cycle_subject = I18n.t('producer_mailer.order_cycle.subject', producer: producer.name)
+      subject = "[#{Spree::Config.site_name}] #{order_cycle_subject}"
 
-    if has_orders?(order_cycle, producer)
+      return unless has_orders?(order_cycle, producer)
       mail(
         to: @producer.contact.email,
         from: from_address,
@@ -23,7 +26,6 @@ class ProducerMailer < Spree::BaseMailer
     end
   end
 
-
   private
 
   def has_orders?(order_cycle, producer)

app/mailers/spree/order_mailer_decorator.rb

@@ -2,44 +2,59 @@ Spree::OrderMailer.class_eval do
   helper HtmlHelper
   helper CheckoutHelper
   helper SpreeCurrencyHelper
+  include I18nHelper
 
   def cancel_email(order, resend = false)
     @order = find_order(order)
-    subject = (resend ? "[#{t(:resend).upcase}] " : '')
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
-    mail(to: order.email, from: from_address, subject: subject)
+    I18n.with_locale valid_locale(@order.user) do
+      mail(to: order.email,
+           from: from_address,
+           subject: mail_subject(t('order_mailer.cancel_email.subject'), resend))
+    end
   end
 
   def confirm_email_for_customer(order, resend = false)
     find_order(order) # Finds an order instance from an id
-    subject = (resend ? "[#{t(:resend).upcase}] " : '')
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
-    mail(:to => @order.email,
-         :from => from_address,
-         :subject => subject,
-         :reply_to => @order.distributor.contact.email)
+    I18n.with_locale valid_locale(@order.user) do
+      mail(to: @order.email,
+           from: from_address,
+           subject: mail_subject(t('order_mailer.confirm_email.subject'), resend),
+           reply_to: @order.distributor.contact.email)
+    end
   end
 
   def confirm_email_for_shop(order, resend = false)
     find_order(order) # Finds an order instance from an id
-    subject = (resend ? "[#{t(:resend).upcase}] " : '')
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
-    mail(:to => @order.distributor.contact.email,
-         :from => from_address,
-         :subject => subject)
+    I18n.with_locale valid_locale(@order.user) do
+      mail(to: @order.distributor.contact.email,
+           from: from_address,
+           subject: mail_subject(t('order_mailer.confirm_email.subject'), resend))
+    end
   end
 
   def invoice_email(order, pdf)
     find_order(order) # Finds an order instance from an id
-    attachments["invoice-#{@order.number}.pdf"] = pdf if pdf.present?
-    subject = "#{Spree::Config[:site_name]} #{t(:invoice)} ##{@order.number}"
-    mail(:to => @order.email,
-         :from => from_address,
-         :subject => subject,
-         :reply_to => @order.distributor.contact.email)
+    attach_file("invoice-#{@order.number}.pdf", pdf)
+    I18n.with_locale valid_locale(@order.user) do
+      mail(to: @order.email,
+           from: from_address,
+           subject: mail_subject(t(:invoice), false),
+           reply_to: @order.distributor.contact.email)
+    end
   end
 
   def find_order(order)
     @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
   end
+
+  private
+
+  def mail_subject(base_subject, resend)
+    resend_prefix = (resend ? "[#{t(:resend).upcase}] " : '')
+    "#{resend_prefix}#{Spree::Config[:site_name]} #{base_subject} ##{@order.number}"
+  end
+
+  def attach_file(filename, file)
+    attachments[filename] = file if file.present?
+  end
 end

app/mailers/spree/user_mailer_decorator.rb

@@ -1,8 +1,12 @@
 Spree::UserMailer.class_eval do
+  include I18nHelper
+
   def signup_confirmation(user)
     @user = user
-    mail(:to => user.email, :from => from_address,
-         :subject => t(:welcome_to) + Spree::Config[:site_name])
+    I18n.with_locale valid_locale(@user) do
+      mail(:to => user.email, :from => from_address,
+           :subject => t(:welcome_to) + Spree::Config[:site_name])
+    end
   end
 
   # Overriding `Spree::UserMailer.confirmation_instructions` which is
@@ -12,10 +16,12 @@ Spree::UserMailer.class_eval do
     @instance = Spree::Config[:site_name]
     @contact = ContentConfig.footer_email
 
-    subject = t('spree.user_mailer.confirmation_instructions.subject')
-    mail(to: confirmation_email_address,
-         from: from_address,
-         subject: subject)
+    I18n.with_locale valid_locale(@user) do
+      subject = t('spree.user_mailer.confirmation_instructions.subject')
+      mail(to: confirmation_email_address,
+           from: from_address,
+           subject: subject)
+    end
   end
 
   private

app/mailers/subscription_mailer.rb

@@ -1,6 +1,7 @@
 class SubscriptionMailer < Spree::BaseMailer
   helper CheckoutHelper
   helper ShopMailHelper
+  include I18nHelper
 
   def confirmation_email(order)
     @type = 'confirmation'
@@ -46,10 +47,13 @@ class SubscriptionMailer < Spree::BaseMailer
   private
 
   def send_mail(order)
-    subject = "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
-    mail(to: order.email,
-         from: from_address,
-         subject: subject,
-         reply_to: order.distributor.contact.email)
+    I18n.with_locale valid_locale(order.user) do
+      confirm_email_subject = t('order_mailer.confirm_email.subject')
+      subject = "#{Spree::Config[:site_name]} #{confirm_email_subject} ##{order.number}"
+      mail(to: order.email,
+           from: from_address,
+           subject: subject,
+           reply_to: order.distributor.contact.email)
+    end
   end
 end

app/models/calculator/weight.rb

@@ -1,7 +1,11 @@
+require 'spree/localized_number'
+
 module Calculator
   class Weight < Spree::Calculator
+    extend Spree::LocalizedNumber
     preference :per_kg, :decimal, default: 0.0
     attr_accessible :preferred_per_kg
+    localize_number :preferred_per_kg
 
     def self.description
       I18n.t('spree.weight')
@@ -12,19 +16,5 @@ module Calculator
       total_weight = line_items.sum { |li| ((li.variant.andand.weight || 0) * li.quantity) }
       total_weight * preferred_per_kg
     end
-
-    private
-
-    def line_items_for(object)
-      if object.respond_to? :order
-        object.order.line_items
-      elsif object.respond_to? :line_items
-        object.line_items
-      elsif object.respond_to?(:variant) && object.respond_to?(:quantity)
-        [object]
-      else
-        raise "Unknown object type: #{object.inspect}"
-      end
-    end
   end
 end

app/models/concerns/address_display.rb

@@ -0,0 +1,5 @@
+module AddressDisplay
+  def full_name_reverse
+    [lastname, firstname].reject(&:blank?).join(" ")
+  end
+end

app/models/concerns/stock_settings_override_validation.rb

@@ -0,0 +1,59 @@
+# Validates the combination of on_demand and count_on_hand values.
+#
+# `on_demand` can have three values: true, false or nil
+# `count_on_hand` can either be: nil or a number
+#
+# This means that a variant override can be in six different stock states
+# but only three of them are valid.
+#
+# | on_demand | count_on_hand | stock_overridden? | use_producer_stock_settings? | valid? |
+# |-----------|---------------|-------------------|------------------------------|--------|
+# | 1         | nil           | false             | false                        | true   |
+# | 0         | x             | true              | false                        | true   |
+# | nil       | nil           | false             | true                         | true   |
+# | 1         | x             | ?                 | ?                            | false  |
+# | 0         | nil           | ?                 | ?                            | false  |
+# | nil       | x             | ?                 | ?                            | false  |
+#
+# This module has one method for each invalid case.
+module StockSettingsOverrideValidation
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :require_compatible_on_demand_and_count_on_hand
+  end
+
+  def require_compatible_on_demand_and_count_on_hand
+    disallow_count_on_hand_if_using_producer_stock_settings
+    disallow_count_on_hand_if_on_demand
+    require_count_on_hand_if_limited_stock
+  end
+
+  def disallow_count_on_hand_if_using_producer_stock_settings
+    return unless on_demand.nil? && count_on_hand.present?
+
+    error_message = I18n.t("count_on_hand.using_producer_stock_settings_but_count_on_hand_set",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def disallow_count_on_hand_if_on_demand
+    return unless on_demand? && count_on_hand.present?
+
+    error_message = I18n.t("count_on_hand.on_demand_but_count_on_hand_set",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def require_count_on_hand_if_limited_stock
+    return unless on_demand == false && count_on_hand.blank?
+
+    error_message = I18n.t("count_on_hand.limited_stock_but_no_count_on_hand",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def i18n_scope_for_stock_settings_override_validation_error
+    "activerecord.errors.models.#{self.class.name.underscore}"
+  end
+end

app/models/enterprise.rb

@@ -27,8 +27,6 @@ class Enterprise < ActiveRecord::Base
   has_many :supplied_products, :class_name => 'Spree::Product', :foreign_key => 'supplier_id', :dependent => :destroy
   has_many :distributed_orders, :class_name => 'Spree::Order', :foreign_key => 'distributor_id'
   belongs_to :address, :class_name => 'Spree::Address'
-  has_many :product_distributions, :foreign_key => 'distributor_id', :dependent => :destroy
-  has_many :distributed_products, :through => :product_distributions, :source => :product
   has_many :enterprise_fees
   has_many :enterprise_roles, :dependent => :destroy
   has_many :users, through: :enterprise_roles
@@ -109,17 +107,20 @@ class Enterprise < ActiveRecord::Base
   scope :is_primary_producer, where(:is_primary_producer => true)
   scope :is_distributor, where('sells != ?', 'none')
   scope :is_hub, where(sells: 'any')
-  scope :supplying_variant_in, lambda { |variants| joins(:supplied_products => :variants_including_master).where('spree_variants.id IN (?)', variants).select('DISTINCT enterprises.*') }
+  scope :supplying_variant_in, lambda { |variants|
+    joins(:supplied_products => :variants_including_master).
+      where('spree_variants.id IN (?)', variants).
+      select('DISTINCT enterprises.*')
+  }
 
-  scope :with_distributed_products_outer,
-    joins('LEFT OUTER JOIN product_distributions ON product_distributions.distributor_id = enterprises.id').
-    joins('LEFT OUTER JOIN spree_products ON spree_products.id = product_distributions.product_id')
   scope :with_order_cycles_as_supplier_outer,
     joins("LEFT OUTER JOIN exchanges ON (exchanges.sender_id = enterprises.id AND exchanges.incoming = 't')").
     joins('LEFT OUTER JOIN order_cycles ON (order_cycles.id = exchanges.order_cycle_id)')
+
   scope :with_order_cycles_as_distributor_outer,
     joins("LEFT OUTER JOIN exchanges ON (exchanges.receiver_id = enterprises.id AND exchanges.incoming = 'f')").
     joins('LEFT OUTER JOIN order_cycles ON (order_cycles.id = exchanges.order_cycle_id)')
+
   scope :with_order_cycles_outer,
     joins("LEFT OUTER JOIN exchanges ON (exchanges.receiver_id = enterprises.id OR exchanges.sender_id = enterprises.id)").
     joins('LEFT OUTER JOIN order_cycles ON (order_cycles.id = exchanges.order_cycle_id)')
@@ -136,16 +137,15 @@ class Enterprise < ActiveRecord::Base
   }
 
   scope :distributing_products, lambda { |products|
-    # TODO: remove this when we pull out product distributions
-    pds = joins("INNER JOIN product_distributions ON product_distributions.distributor_id = enterprises.id").
-      where("product_distributions.product_id IN (?)", products).select('DISTINCT enterprises.id')
-
-    exs = joins("INNER JOIN exchanges ON (exchanges.receiver_id = enterprises.id AND exchanges.incoming = 'f')").
+    exchanges = joins("
+        INNER JOIN exchanges
+          ON (exchanges.receiver_id = enterprises.id AND exchanges.incoming = 'f')
+      ").
       joins('INNER JOIN exchange_variants ON (exchange_variants.exchange_id = exchanges.id)').
       joins('INNER JOIN spree_variants ON (spree_variants.id = exchange_variants.variant_id)').
       where('spree_variants.product_id IN (?)', products).select('DISTINCT enterprises.id')
 
-    where(id: pds | exs)
+    where(id: exchanges)
   }
 
   scope :managed_by, lambda { |user|
@@ -247,14 +247,6 @@ class Enterprise < ActiveRecord::Base
     Spree::Variant.joins(:product).merge(Spree::Product.in_distributor(self)).select('spree_variants.*')
   end
 
-  def product_distribution_variants
-    Spree::Variant.joins(:product).merge(Spree::Product.in_product_distribution_by(self)).select('spree_variants.*')
-  end
-
-  def available_variants
-    Spree::Variant.joins(:product => :product_distributions).where('product_distributions.distributor_id=?', self.id)
-  end
-
   def is_distributor
     self.sells != "none"
   end

app/models/enterprise_fee.rb

@@ -26,7 +26,6 @@ class EnterpriseFee < ActiveRecord::Base
   validates_presence_of :name
 
   before_save :ensure_valid_tax_category_settings
-  before_destroy :ensure_no_product_distributions
 
   scope :for_enterprise, lambda { |enterprise| where(enterprise_id: enterprise) }
   scope :for_enterprises, lambda { |enterprises| where(enterprise_id: enterprises) }
@@ -46,10 +45,6 @@ class EnterpriseFee < ActiveRecord::Base
     joins(:calculator).where('spree_calculators.type IN (?)', PER_ORDER_CALCULATORS)
   }
 
-  def self.clear_all_adjustments_for(line_item)
-    line_item.order.adjustments.where(originator_type: 'EnterpriseFee', source_id: line_item, source_type: 'Spree::LineItem').destroy_all
-  end
-
   def self.clear_all_adjustments_on_order(order)
     order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
   end
@@ -69,15 +64,6 @@ class EnterpriseFee < ActiveRecord::Base
     return true
   end
 
-  def ensure_no_product_distributions
-    dependent_distribution = ProductDistribution.where(enterprise_fee_id: self).first
-    return unless dependent_distribution
-    product = dependent_distribution.product
-    error = I18n.t(:enterprise_fees_destroy_error, id: product.id, name: product.name)
-    errors.add(:base, error)
-    false
-  end
-
   def refresh_products_cache
     OpenFoodNetwork::ProductsCache.enterprise_fee_changed self
   end

app/models/feature_flags.rb

@@ -11,18 +11,17 @@ class FeatureFlags
   #
   # @return [Boolean]
   def product_import_enabled?
-    superadmin?
+    user.superadmin?
+  end
+
+  # Checks whether the "Enterprise Fee Summary" is enabled for the specified user
+  #
+  # @return [Boolean]
+  def enterprise_fee_summary_enabled?
+    user.superadmin?
   end
 
   private
 
   attr_reader :user
-
-  # Checks whether the specified user is a superadmin, with full control of the
-  # instance
-  #
-  # @return [Boolean]
-  def superadmin?
-    user.has_spree_role?('admin')
-  end
 end

app/models/order_cycle.rb

@@ -39,18 +39,10 @@ class OrderCycle < ActiveRecord::Base
 
   scope :by_name, order('name')
 
-  scope :distributing_product, lambda { |product|
-    joins(:exchanges).
-      merge(Exchange.outgoing).
-      merge(Exchange.with_product(product)).
-      select('DISTINCT order_cycles.*')
-  }
-
   scope :with_distributor, lambda { |distributor|
     joins(:exchanges).merge(Exchange.outgoing).merge(Exchange.to_enterprise(distributor))
   }
 
-
   scope :managed_by, lambda { |user|
     if user.has_spree_role?('admin')
       scoped
@@ -156,7 +148,6 @@ class OrderCycle < ActiveRecord::Base
   end
 
   def distributed_variants
-    # TODO: only used in DistributionChangeValidator, can we remove?
     self.exchanges.outgoing.map(&:variants).flatten.uniq.reject(&:deleted?)
   end
 
@@ -175,17 +166,6 @@ class OrderCycle < ActiveRecord::Base
     variants_distributed_by(distributor).map(&:product).uniq
   end
 
-  # If a product without variants is added to an order cycle, and then some variants are added
-  # to that product, but not the order cycle, then the master variant should not available for customers
-  # to purchase.
-  # This method filters out such products so that the customer cannot purchase them.
-  def valid_products_distributed_by(distributor)
-    variants = variants_distributed_by(distributor)
-    products = variants.map(&:product).uniq
-    product_ids = products.reject{ |p| product_has_only_obsolete_master_in_distribution?(p, variants) }.map(&:id)
-    Spree::Product.where(id: product_ids)
-  end
-
   def products
     self.variants.map(&:product).uniq
   end
@@ -265,17 +245,6 @@ class OrderCycle < ActiveRecord::Base
 
   private
 
-  # If a product without variants is added to an order cycle, and then some variants are added
-  # to that product, but not the order cycle, then the master variant should not available for customers
-  # to purchase.
-  # This method is used by #valid_products_distributed_by to filter out such products so that
-  # the customer cannot purchase them.
-  def product_has_only_obsolete_master_in_distribution?(product, distributed_variants)
-    product.has_variants? &&
-      distributed_variants.include?(product.master) &&
-      (product.variants & distributed_variants).empty?
-  end
-
   def orders_close_at_after_orders_open_at?
     return if orders_open_at.blank? || orders_close_at.blank?
     return if orders_close_at > orders_open_at

app/models/product_distribution.rb

@@ -1,27 +0,0 @@
-class ProductDistribution < ActiveRecord::Base
-  belongs_to :product, :class_name => 'Spree::Product'
-  belongs_to :distributor, :class_name => 'Enterprise'
-  belongs_to :enterprise_fee
-
-  validates_presence_of :product_id, :on => :update
-  validates_presence_of :distributor_id, :enterprise_fee_id
-  validates_uniqueness_of :product_id, :scope => :distributor_id
-
-
-  def adjustment_for(line_item)
-    adjustments = line_item.order.adjustments.enterprise_fee.where(originator_id: enterprise_fee)
-
-    raise "Multiple adjustments for this enterprise fee on this line item. This method is not designed to deal with this scenario." if adjustments.count > 1
-
-    adjustments.first
-  end
-
-  def create_adjustment_for(line_item)
-    a = enterprise_fee.create_adjustment(adjustment_label_for(line_item), line_item.order, line_item, true)
-    AdjustmentMetadata.create! adjustment: a, enterprise: enterprise_fee.enterprise, fee_name: enterprise_fee.name, fee_type: enterprise_fee.fee_type, enterprise_role: 'distributor'
-  end
-
-  def adjustment_label_for(line_item)
-    I18n.t(:products_distribution_adjustment_label, distributor: distributor.name, product: line_item.product.name )
-  end
-end

app/models/product_import/entry_processor.rb

@@ -175,7 +175,7 @@ module ProductImport
         assign_errors product.errors.full_messages, entry.line_number
       end
 
-      @already_created[entry.enterprise_id] = { entry.name => product.id }
+      @already_created.deep_merge! entry.enterprise_id => { entry.name => product.id }
     end
 
     def save_variant(entry)
@@ -212,12 +212,20 @@ module ProductImport
         case setting['mode']
         when 'overwrite_all'
           object.assign_attributes(attribute => setting['value'])
+          # In case of new products, some attributes are saved on the variant.
+          # We write them to the entry here to be copied to the variant later.
+          if entry.respond_to? "#{attribute}="
+            entry.public_send("#{attribute}=", setting['value'])
+          end
         when 'overwrite_empty'
           if object.public_send(attribute).blank? ||
              ((attribute == 'on_hand' || attribute == 'count_on_hand') &&
              entry.on_hand_nil)
 
             object.assign_attributes(attribute => setting['value'])
+            if entry.respond_to? "#{attribute}="
+              entry.public_send("#{attribute}=", setting['value'])
+            end
           end
         end
       end

app/models/product_import/entry_validator.rb

@@ -68,6 +68,18 @@ module ProductImport
 
     private
 
+    def find_or_initialize_variant_override(entry, existing_variant)
+      existing_variant_override = VariantOverride.where(
+        variant_id: existing_variant.id,
+        hub_id: entry.enterprise_id
+      ).first
+
+      existing_variant_override || VariantOverride.new(
+        variant_id: existing_variant.id,
+        hub_id: entry.enterprise_id
+      )
+    end
+
     def enterprise_validation(entry)
       return if name_presence_error entry
       return if enterprise_not_found_error entry
@@ -177,7 +189,7 @@ module ProductImport
       products.flat_map(&:variants).each do |existing_variant|
         unit_scale = existing_variant.product.variant_unit_scale
         unscaled_units = entry.unscaled_units || 0
-        entry.unit_value = unscaled_units * unit_scale
+        entry.unit_value = unscaled_units * unit_scale unless unit_scale.nil?
 
         if entry_matches_existing_variant?(entry, existing_variant)
           variant_override = create_inventory_item(entry, existing_variant)
@@ -242,6 +254,7 @@ module ProductImport
       new_product = Spree::Product.new
       new_product.assign_attributes(entry.attributes.except('id'))
       new_product.supplier_id = entry.producer_id
+      entry.on_hand = 0 if entry.on_hand.nil?
 
       if new_product.valid?
         entry.validates_as = 'new_product' unless entry.errors?
@@ -310,21 +323,12 @@ module ProductImport
     end
 
     def create_inventory_item(entry, existing_variant)
-      existing_variant_override = VariantOverride.where(
-        variant_id: existing_variant.id,
-        hub_id: entry.enterprise_id
-      ).first
+      find_or_initialize_variant_override(entry, existing_variant).tap do |variant_override|
+        check_variant_override_stock_settings(entry, variant_override)
 
-      variant_override = existing_variant_override || VariantOverride.new(
-        variant_id: existing_variant.id,
-        hub_id: entry.enterprise_id
-      )
-
-      variant_override.assign_attributes(count_on_hand: entry.on_hand, import_date: @import_time)
-      check_on_hand_nil(entry, variant_override)
-      variant_override.assign_attributes(entry.attributes.slice('price', 'on_demand'))
-
-      variant_override
+        variant_override.assign_attributes(import_date: @import_time)
+        variant_override.assign_attributes(entry.attributes.slice('price', 'on_demand'))
+      end
     end
 
     def mark_as_inventory_item(entry, variant_override)
@@ -355,5 +359,11 @@ module ProductImport
       object.count_on_hand = 0 if object.respond_to?(:count_on_hand)
       entry.on_hand_nil = true
     end
+
+    def check_variant_override_stock_settings(entry, object)
+      object.count_on_hand = entry.on_hand.presence
+      object.on_demand = object.count_on_hand.blank? if entry.on_demand.blank?
+      entry.on_hand_nil = object.count_on_hand.blank?
+    end
   end
 end

app/models/product_import/product_importer.rb

@@ -206,7 +206,7 @@ module ProductImport
 
     def open_spreadsheet
       if accepted_mimetype
-        Roo::Spreadsheet.open(@file, extension: accepted_mimetype)
+        Roo::Spreadsheet.open(@file, extension: accepted_mimetype, encoding: Encoding::UTF_8)
       else
         errors.add(:importer, I18n.t(:product_importer_spreadsheet_error))
         delete_uploaded_file
@@ -227,6 +227,14 @@ module ProductImport
       (2..@sheet.last_row).map do |i|
         @sheet.row(i)
       end
+    rescue ArgumentError => e
+      if e.message.include? 'invalid byte sequence'
+        errors.add(:importer, I18n.t('admin.product_import.model.encoding_error'))
+      else
+        errors.add(:importer, I18n.t('admin.product_import.model.unexpected_error',
+                                     error_message: e.message))
+      end
+      []
     end
 
     def build_entries_in_range

app/models/spree/ability_decorator.rb

@@ -138,7 +138,10 @@ class AbilityDecorator
   def add_product_management_abilities(user)
     # Enterprise User can only access products that they are a supplier for
     can [:create], Spree::Product
-    can [:admin, :read, :index, :update, :product_distributions, :seo, :group_buy_options, :bulk_update, :clone, :delete, :destroy], Spree::Product do |product|
+    can [:admin, :read, :index, :update,
+         :seo, :group_buy_options,
+         :bulk_update, :clone, :delete,
+         :destroy], Spree::Product do |product|
       OpenFoodNetwork::Permissions.new(user).managed_product_enterprises.include? product.supplier
     end
 
@@ -184,7 +187,10 @@ class AbilityDecorator
     can [:admin, :index, :guide, :import, :save, :save_data, :validate_data, :reset_absent_products], ProductImport::ProductImporter
 
     # Reports page
-    can [:admin, :index, :customers, :orders_and_distributors, :group_buys, :bulk_coop, :payments, :orders_and_fulfillment, :products_and_inventory, :order_cycle_management, :packing], :report
+    can [:admin, :index, :customers, :orders_and_distributors, :group_buys, :bulk_coop, :payments,
+         :orders_and_fulfillment, :products_and_inventory, :order_cycle_management, :packing],
+        :report
+    add_enterprise_fee_summary_abilities(user)
   end
 
   def add_order_cycle_management_abilities(user)
@@ -210,7 +216,10 @@ class AbilityDecorator
       # during the order creation process from the admin backend
       order.distributor.nil? || user.enterprises.include?(order.distributor) || order.order_cycle.andand.coordinated_by?(user)
     end
-    can [:admin, :bulk_management, :managed], Spree::Order if user.admin? || user.enterprises.any?(&:is_distributor)
+    can [:admin, :bulk_management, :managed], Spree::Order do
+      user.admin? || user.enterprises.any?(&:is_distributor)
+    end
+    can [:admin, :create, :show, :poll], :invoice
     can [:admin, :visible], Enterprise
     can [:admin, :index, :create, :update, :destroy], :line_item
     can [:admin, :index, :create], Spree::LineItem
@@ -254,7 +263,10 @@ class AbilityDecorator
     end
 
     # Reports page
-    can [:admin, :index, :customers, :group_buys, :bulk_coop, :sales_tax, :payments, :orders_and_distributors, :orders_and_fulfillment, :products_and_inventory, :order_cycle_management, :xero_invoices], :report
+    can [:admin, :index, :customers, :group_buys, :bulk_coop, :sales_tax, :payments,
+         :orders_and_distributors, :orders_and_fulfillment, :products_and_inventory,
+         :order_cycle_management, :xero_invoices], :report
+    add_enterprise_fee_summary_abilities(user)
 
     can [:create], Customer
     can [:admin, :index, :update, :destroy, :show], Customer, enterprise_id: Enterprise.managed_by(user).pluck(:id)
@@ -277,6 +289,16 @@ class AbilityDecorator
       user.enterprises.include? enterprise_relationship.parent
     end
   end
+
+  def add_enterprise_fee_summary_abilities(user)
+    feature_enabled = FeatureFlags.new(user).enterprise_fee_summary_enabled?
+    return unless feature_enabled
+
+    # Reveal the report link in spree/admin/reports#index
+    can [:enterprise_fee_summary], :report
+    # Allow direct access to the report resource
+    can [:admin, :new, :create], :enterprise_fee_summary
+  end
 end
 
 Spree::Ability.register_ability(AbilityDecorator)

app/models/spree/address_decorator.rb

@@ -1,4 +1,6 @@
 Spree::Address.class_eval do
+  include AddressDisplay
+
   has_one :enterprise, dependent: :restrict
   belongs_to :country, class_name: "Spree::Country"
 

app/models/spree/adjustment_decorator.rb

@@ -40,33 +40,6 @@ module Spree
       included_tax > 0
     end
 
-    # @return [Array<Spree::TaxRate>]
-    def tax_rates
-      case originator
-      when Spree::TaxRate
-        [originator]
-      when EnterpriseFee
-        case source
-        when Spree::LineItem
-          tax_category = originator.inherits_tax_category? ? source.product.tax_category : originator.tax_category
-          return tax_category ? tax_category.tax_rates.match(source.order) : []
-        when Spree::Order
-          return originator.tax_category ? originator.tax_category.tax_rates.match(source) : []
-        end
-      else
-        find_closest_tax_rates_from_included_tax
-      end
-    end
-
-    # shipping fees and adjustments created from the admin panel have
-    # taxes set at creation in the included_tax field without relation
-    # to the corresponding TaxRate, so we look for the closest one
-    def find_closest_tax_rates_from_included_tax
-      approximation = (included_tax / (amount - included_tax))
-      return [] if approximation.infinite? or approximation.zero?
-      [Spree::TaxRate.order("ABS(amount - #{approximation})").first]
-    end
-
     def self.without_callbacks
       skip_callback :save, :after, :update_adjustable
       skip_callback :destroy, :after, :update_adjustable

app/models/spree/app_configuration_decorator.rb

@@ -52,4 +52,7 @@ Spree::AppConfiguration.class_eval do
 
   # Number localization
   preference :enable_localized_number?, :boolean, default: false
+
+  # Enable cache
+  preference :enable_products_cache?, :boolean, default: !Rails.env.development?
 end

app/models/spree/calculator_decorator.rb

@@ -1,18 +1,20 @@
 module Spree
   Calculator.class_eval do
 
-
     private
 
     # Given an object which might be an Order or a LineItem (amongst
     # others), return a collection of line items.
     def line_items_for(object)
-      if object.respond_to? :line_items
+      if object.is_a?(Spree::LineItem)
+        [object]
+      elsif object.respond_to? :line_items
         object.line_items
+      elsif object.order.present?
+        object.order.line_items
       else
         [object]
       end
     end
-
   end
 end

app/models/spree/order_decorator.rb

@@ -218,10 +218,6 @@ Spree::Order.class_eval do
       line_items.each do |line_item|
         if provided_by_order_cycle? line_item
           OpenFoodNetwork::EnterpriseFeeCalculator.new.create_line_item_adjustments_for line_item
-
-        else
-          pd = product_distribution_for line_item
-          pd.create_adjustment_for line_item if pd
         end
       end
 
@@ -293,7 +289,7 @@ Spree::Order.class_eval do
 
   def tax_adjustment_totals
     tax_adjustments.each_with_object(Hash.new) do |adjustment, hash|
-      tax_rates = adjustment.tax_rates
+      tax_rates = TaxRateFinder.tax_rates_of(adjustment)
       tax_rates_hash = Hash[tax_rates.collect do |tax_rate|
         tax_amount = tax_rates.one? ? adjustment.included_tax : tax_rate.compute_tax(adjustment.amount)
         [tax_rate, tax_amount]
@@ -383,10 +379,6 @@ Spree::Order.class_eval do
     order_cycle_variants.include? line_item.variant
   end
 
-  def product_distribution_for(line_item)
-    line_item.variant.product.product_distribution_for distributor
-  end
-
   def require_customer?
     return true unless new_record? || state == 'cart'
   end

app/models/spree/payment_decorator.rb

@@ -4,6 +4,8 @@ module Spree
   Payment.class_eval do
     extend Spree::LocalizedNumber
 
+    delegate :line_items, to: :order
+
     has_one :adjustment, as: :source, dependent: :destroy
 
     after_save :ensure_correct_adjustment, :update_order
@@ -30,15 +32,6 @@ module Spree
       I18n.t('payment_method_fee')
     end
 
-    # This is called by the calculator of a payment method
-    def line_items
-      if order.complete? && Spree::Config[:track_inventory_levels]
-        order.line_items.select { |li| inventory_units.pluck(:variant_id).include?(li.variant_id) }
-      else
-        order.line_items
-      end
-    end
-
     # Pin payments lacks void and credit methods, but it does have refund
     # Here we swap credit out for refund and remove void as a possible action
     def actions_with_pin_payment_adaptations

app/models/spree/payment_method_decorator.rb

@@ -23,6 +23,11 @@ Spree::PaymentMethod.class_eval do
     end
   }
 
+  scope :for_distributors, ->(distributors) {
+    non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
+    where(id: non_unique_matches.map(&:id))
+  }
+
   scope :for_distributor, lambda { |distributor|
     joins(:distributors).
       where('enterprises.id = ?', distributor)

app/models/spree/product_decorator.rb

@@ -11,22 +11,17 @@ Spree::Product.class_eval do
   belongs_to :supplier, :class_name => 'Enterprise', touch: true
   belongs_to :primary_taxon, class_name: 'Spree::Taxon'
 
-  has_many :product_distributions, :dependent => :destroy
-  has_many :distributors, :through => :product_distributions
-
-  accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
   delegate :images_attributes=, :display_as=, to: :master
 
-  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids, :product_distributions_attributes
+  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids
   attr_accessible :group_buy, :group_buy_unit_size, :unit_description, :notes, :images_attributes, :display_as
   attr_accessible :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value
   attr_accessible :inherits_properties, :sku
 
-  # validates_presence_of :variants, unless: :new_record?, message: "Product must have at least one variant"
   validates_presence_of :supplier
-  validates :primary_taxon, presence: { message: I18n.t("validation_msg_product_category_cant_be_blank") }
-  validates :tax_category_id, presence: { message: I18n.t("validation_msg_tax") }, if: "Spree::Config.products_require_tax_category"
+  validates :primary_taxon, presence: true
+  validates :tax_category_id, presence: true, if: "Spree::Config.products_require_tax_category"
 
   validates_presence_of :variant_unit
   validates_presence_of :variant_unit_scale,
@@ -37,7 +32,6 @@ Spree::Product.class_eval do
   after_initialize :set_available_on_to_now, :if => :new_record?
   before_validation :sanitize_permalink
   before_save :add_primary_taxon_to_taxons
-  after_touch :touch_distributors
   after_save :remove_previous_primary_taxon_from_taxons
   after_save :ensure_standard_variant
   after_save :update_units
@@ -45,8 +39,6 @@ Spree::Product.class_eval do
 
 
   # -- Joins
-  scope :with_product_distributions_outer, joins('LEFT OUTER JOIN product_distributions ON product_distributions.product_id = spree_products.id')
-
   scope :with_order_cycles_outer, joins('LEFT OUTER JOIN spree_variants AS o_spree_variants ON (o_spree_variants.product_id = spree_products.id)').
     joins('LEFT OUTER JOIN exchange_variants AS o_exchange_variants ON (o_exchange_variants.variant_id = o_spree_variants.id)').
     joins('LEFT OUTER JOIN exchanges AS o_exchanges ON (o_exchanges.id = o_exchange_variants.exchange_id)').
@@ -65,37 +57,28 @@ Spree::Product.class_eval do
   # -- Scopes
   scope :in_supplier, lambda { |supplier| where(:supplier_id => supplier) }
 
-  scope :in_any_supplier, lambda { |suppliers|
-    where('supplier_id IN (?)', suppliers.map(&:id))
-  }
-
-  # Find products that are distributed via the given distributor EITHER through a product distribution OR through an order cycle
+  # Products distributed via the given distributor through an OC
   scope :in_distributor, lambda { |distributor|
     distributor = distributor.respond_to?(:id) ? distributor.id : distributor.to_i
 
-    with_product_distributions_outer.with_order_cycles_outer.
-      where('product_distributions.distributor_id = ? OR (o_exchanges.incoming = ? AND o_exchanges.receiver_id = ?)', distributor, false, distributor).
+    with_order_cycles_outer.
+      where('(o_exchanges.incoming = ? AND o_exchanges.receiver_id = ?)', false, distributor).
       select('distinct spree_products.*')
   }
 
-  scope :in_product_distribution_by, lambda { |distributor|
-    distributor = distributor.respond_to?(:id) ? distributor.id : distributor.to_i
-
-    with_product_distributions_outer.
-      where('product_distributions.distributor_id = ?', distributor).
-      select('distinct spree_products.*')
-  }
-
-  # Find products that are supplied by a given enterprise or distributed via that enterprise EITHER through a product distribution OR through an order cycle
+  # Products supplied by a given enterprise or distributed via that enterprise through an OC
   scope :in_supplier_or_distributor, lambda { |enterprise|
     enterprise = enterprise.respond_to?(:id) ? enterprise.id : enterprise.to_i
 
-    with_product_distributions_outer.with_order_cycles_outer.
-      where('spree_products.supplier_id = ? OR product_distributions.distributor_id = ? OR (o_exchanges.incoming = ? AND o_exchanges.receiver_id = ?)', enterprise, enterprise, false, enterprise).
+    with_order_cycles_outer.
+      where("
+        spree_products.supplier_id = ?
+        OR (o_exchanges.incoming = ? AND o_exchanges.receiver_id = ?)
+      ", enterprise, false, enterprise).
       select('distinct spree_products.*')
   }
 
-  # Find products that are distributed by the given order cycle
+  # Products distributed by the given order cycle
   scope :in_order_cycle, lambda { |order_cycle| with_order_cycles_inner.
     merge(Exchange.outgoing).
     where('order_cycles.id = ?', order_cycle) 
@@ -155,10 +138,6 @@ Spree::Product.class_eval do
     self.class.in_order_cycle(order_cycle).include? self
   end
 
-  def product_distribution_for(distributor)
-    self.product_distributions.find_by_distributor_id(distributor)
-  end
-
   # overriding to check self.on_demand as well
   def has_stock?
     has_variants? ? variants.any?(&:in_stock?) : (on_demand || master.in_stock?)
@@ -180,15 +159,6 @@ Spree::Product.class_eval do
     variants.map(&:import_date).compact.max
   end
 
-  # Build a product distribution for each distributor
-  def build_product_distributions_for_user user
-    Enterprise.is_distributor.managed_by(user).each do |distributor|
-      unless self.product_distributions.find_by_distributor_id distributor.id
-        self.product_distributions.build(:distributor => distributor)
-      end
-    end
-  end
-
   def variant_unit_option_type
     if variant_unit.present?
       option_type_name = "unit_#{variant_unit}"