Merge pull request #3891 from openfoodfoundation/2-0-1

Bring changes introduced in v2.0.1 into 2-0-stable

.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,11 +33,11 @@ public/images
 public/spree
 config/abr.yml
 config/initializers/feature_toggle.rb
-config/initializers/db2fog.rb
 NERD_tree*
 coverage
 libpeerconnection.log
 /config/application.yml
+/config/newrelic.yml
 node_modules
 vendor/bundle/
 coverage

.rubocop_manual_todo.yml

@@ -22,10 +22,7 @@
 Metrics/LineLength:
   Max: 100
   Exclude:
-  - app/controllers/admin/accounts_and_billing_settings_controller.rb
   - app/controllers/admin/bulk_line_items_controller.rb
-  - app/controllers/admin/business_model_configuration_controller.rb
-  - app/controllers/admin/cache_settings_controller.rb
   - app/controllers/admin/contents_controller.rb
   - app/controllers/admin/customers_controller.rb
   - app/controllers/admin/enterprise_fees_controller.rb
@@ -63,7 +60,6 @@ Metrics/LineLength:
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
   - app/helpers/admin/account_helper.rb
-  - app/helpers/admin/business_model_configuration_helper.rb
   - app/helpers/admin/injection_helper.rb
   - app/helpers/angular_form_builder.rb
   - app/helpers/angular_form_helper.rb
@@ -79,16 +75,12 @@ Metrics/LineLength:
   - app/helpers/spree/admin/navigation_helper_decorator.rb
   - app/helpers/spree/admin/orders_helper_decorator.rb
   - app/helpers/spree/orders_helper.rb
-  - app/jobs/finalize_account_invoices.rb
   - app/jobs/products_cache_integrity_checker_job.rb
   - app/jobs/subscription_confirm_job.rb
   - app/jobs/subscription_placement_job.rb
-  - app/jobs/update_account_invoices.rb
-  - app/jobs/update_billable_periods.rb
   - app/mailers/producer_mailer.rb
   - app/mailers/spree/order_mailer_decorator.rb
   - app/mailers/subscription_mailer.rb
-  - app/models/billable_period.rb
   - app/models/column_preference.rb
   - app/models/content_configuration.rb
   - app/models/customer.rb
@@ -99,7 +91,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
@@ -160,13 +151,10 @@ Metrics/LineLength:
   - engines/web/app/helpers/web/cookies_policy_helper.rb
   - Gemfile
   - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/accounts_and_billing_settings_validator.rb
   - lib/open_food_network/available_payment_method_filter.rb
-  - lib/open_food_network/bill_calculator.rb
   - lib/open_food_network/bulk_coop_report.rb
-  - lib/open_food_network/business_model_configuration_validator.rb
   - lib/open_food_network/customers_report.rb
-  - lib/open_food_network/distribution_change_validator.rb
+  - app/services/order_cycle_distributed_variants.rb
   - lib/open_food_network/enterprise_fee_applicator.rb
   - lib/open_food_network/enterprise_fee_calculator.rb
   - lib/open_food_network/enterprise_issue_validator.rb
@@ -201,7 +189,6 @@ Metrics/LineLength:
   - lib/tasks/dev.rake
   - lib/tasks/enterprises.rake
   - spec/archive/features/consumer/checkout_spec.rb
-  - spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb
   - spec/controllers/admin/bulk_line_items_controller_spec.rb
   - spec/controllers/admin/column_preferences_controller_spec.rb
   - spec/controllers/admin/customers_controller_spec.rb
@@ -245,7 +232,6 @@ Metrics/LineLength:
   - spec/controllers/stripe/webhooks_controller_spec.rb
   - spec/controllers/user_confirmations_controller_spec.rb
   - spec/controllers/user_registrations_controller_spec.rb
-  - spec/features/admin/accounts_and_billing_settings_spec.rb
   - spec/features/admin/adjustments_spec.rb
   - spec/features/admin/bulk_order_management_spec.rb
   - spec/features/admin/bulk_product_update_spec.rb
@@ -289,7 +275,6 @@ Metrics/LineLength:
   - spec/features/consumer/shopping/shopping_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/features/consumer/shops_spec.rb
-  - spec/helpers/admin/business_model_configuration_helper_spec.rb
   - spec/helpers/admin/subscriptions_helper_spec.rb
   - spec/helpers/checkout_helper_spec.rb
   - spec/helpers/enterprises_helper_spec.rb
@@ -298,17 +283,14 @@ Metrics/LineLength:
   - spec/helpers/order_cycles_helper_spec.rb
   - spec/helpers/spree/admin/base_helper_spec.rb
   - spec/jobs/confirm_order_job_spec.rb
-  - spec/jobs/finalize_account_invoices_spec.rb
   - spec/jobs/refresh_products_cache_job_spec.rb
   - spec/jobs/subscription_confirm_job_spec.rb
   - spec/jobs/subscription_placement_job_spec.rb
-  - spec/jobs/update_account_invoices_spec.rb
-  - spec/jobs/update_billable_periods_spec.rb
   - spec/lib/open_food_network/address_finder_spec.rb
   - spec/lib/open_food_network/bulk_coop_report_spec.rb
   - spec/lib/open_food_network/cached_products_renderer_spec.rb
   - spec/lib/open_food_network/customers_report_spec.rb
-  - spec/lib/open_food_network/distribution_change_validator_spec.rb
+  - spec/services/order_cycle_distributed_variants.rb
   - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
   - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
   - spec/lib/open_food_network/enterprise_injection_data_spec.rb
@@ -319,7 +301,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
@@ -337,7 +318,6 @@ Metrics/LineLength:
   - spec/mailers/order_mailer_spec.rb
   - spec/mailers/producer_mailer_spec.rb
   - spec/mailers/subscription_mailer_spec.rb
-  - spec/models/billable_period_spec.rb
   - spec/models/column_preference_spec.rb
   - spec/models/customer_spec.rb
   - spec/models/enterprise_caching_spec.rb
@@ -349,7 +329,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
@@ -412,7 +391,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
@@ -452,18 +430,13 @@ Metrics/AbcSize:
   - app/controllers/user_confirmations_controller.rb
   - app/controllers/user_passwords_controller.rb
   - app/controllers/user_registrations_controller.rb
-  - app/helpers/admin/business_model_configuration_helper.rb
   - app/helpers/checkout_helper.rb
   - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/orders_helper_decorator.rb
   - app/helpers/spree/orders_helper.rb
-  - app/jobs/finalize_account_invoices.rb
   - app/jobs/subscription_placement_job.rb
-  - app/jobs/update_account_invoices.rb
-  - app/jobs/update_billable_periods.rb
   - app/mailers/producer_mailer.rb
-  - app/models/billable_period.rb
   - app/models/calculator/flat_percent_per_item.rb
   - app/models/column_preference.rb
   - app/models/enterprise_group.rb
@@ -492,7 +465,6 @@ Metrics/AbcSize:
   - app/services/order_syncer.rb
   - app/services/subscription_validator.rb
   - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/bill_calculator.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/customers_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
@@ -534,13 +506,10 @@ Metrics/CyclomaticComplexity:
   - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/orders_controller_decorator.rb
   - app/controllers/spree/orders_controller_decorator.rb
-  - app/helpers/admin/business_model_configuration_helper.rb
   - app/helpers/checkout_helper.rb
   - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/orders_helper_decorator.rb
-  - app/jobs/update_account_invoices.rb
-  - app/jobs/update_billable_periods.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
   - app/models/product_import/entry_processor.rb
@@ -553,7 +522,6 @@ Metrics/CyclomaticComplexity:
   - app/models/variant_override_set.rb
   - app/services/cart_service.rb
   - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/bill_calculator.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
   - lib/open_food_network/orders_and_fulfillments_report.rb
@@ -569,12 +537,10 @@ Metrics/PerceivedComplexity:
   - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/orders_controller_decorator.rb
   - app/controllers/spree/orders_controller_decorator.rb
-  - app/helpers/admin/business_model_configuration_helper.rb
   - app/helpers/checkout_helper.rb
   - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/orders_helper_decorator.rb
-  - app/jobs/update_account_invoices.rb
   - app/models/enterprise_relationship.rb
   - app/models/product_import/entry_processor.rb
   - app/models/product_import/entry_validator.rb
@@ -624,12 +590,8 @@ Metrics/MethodLength:
   - app/helpers/checkout_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/orders_helper_decorator.rb
-  - app/jobs/finalize_account_invoices.rb
   - app/jobs/subscription_placement_job.rb
-  - app/jobs/update_account_invoices.rb
-  - app/jobs/update_billable_periods.rb
   - app/mailers/producer_mailer.rb
-  - app/models/billable_period.rb
   - app/models/column_preference.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb

.rubocop_styleguide.yml

@@ -194,6 +194,8 @@ Metrics/BlockNesting:
 
 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

@@ -20,7 +20,6 @@ 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/lib/open_food_network/order_grouper_spec.rb'
@@ -143,7 +142,6 @@ Layout/EmptyLines:
     - 'app/helpers/angular_form_helper.rb'
     - 'app/helpers/injection_helper.rb'
     - 'app/helpers/spree/admin/base_helper_decorator.rb'
-    - 'app/jobs/finalize_account_invoices.rb'
     - 'app/jobs/products_cache_integrity_checker_job.rb'
     - 'app/jobs/refresh_products_cache_job.rb'
     - 'app/models/coordinator_fee.rb'
@@ -151,10 +149,7 @@ Layout/EmptyLines:
     - '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'
     - 'app/models/spree/gateway/pin.rb'
@@ -219,7 +214,6 @@ Layout/EmptyLines:
     - 'spec/features/consumer/shopping/variant_overrides_spec.rb'
     - 'spec/features/consumer/shops_spec.rb'
     - 'spec/helpers/checkout_helper_spec.rb'
-    - 'spec/jobs/finalize_account_invoices_spec.rb'
     - 'spec/jobs/heartbeat_job_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/option_value_namer_spec.rb'
@@ -233,7 +227,6 @@ 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'
@@ -262,7 +255,6 @@ Layout/EmptyLinesAroundBlockBody:
     - 'app/controllers/spree/api/orders_controller_decorator.rb'
     - 'app/controllers/spree/checkout_controller_decorator.rb'
     - 'app/models/spree/calculator/default_tax_decorator.rb'
-    - 'app/models/spree/calculator_decorator.rb'
     - 'app/models/spree/money_decorator.rb'
     - 'app/models/spree/option_value_decorator.rb'
     - 'lib/open_food_network/group_buy_report.rb'
@@ -280,18 +272,14 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/features/consumer/shopping/embedded_groups_spec.rb'
     - 'spec/features/consumer/shopping/embedded_shopfronts_spec.rb'
     - 'spec/features/consumer/shopping/shopping_spec.rb'
-    - 'spec/helpers/admin/business_model_configuration_helper_spec.rb'
     - 'spec/helpers/shared_helper_spec.rb'
     - 'spec/helpers/shop_helper_spec.rb'
     - 'spec/helpers/spree/orders_helper_spec.rb'
-    - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/group_buy_report_spec.rb'
     - 'spec/lib/open_food_network/lettuce_share_report_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - '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'
@@ -309,8 +297,6 @@ Layout/EmptyLinesAroundBlockBody:
 # 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'
@@ -325,7 +311,7 @@ Layout/EmptyLinesAroundClassBody:
     - 'app/serializers/api/currency_config_serializer.rb'
     - 'app/serializers/api/product_serializer.rb'
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/distribution_change_validator.rb'
+    - 'app/services/order_cycle_distributed_variants.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
@@ -360,7 +346,6 @@ Layout/ExtraSpacing:
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
     - 'lib/spree/product_filters.rb'
     - 'lib/tasks/karma.rake'
-    - 'spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/admin/orders_spec.rb'
@@ -375,7 +360,6 @@ Layout/ExtraSpacing:
     - 'spec/models/spree/adjustment_spec.rb'
     - 'spec/models/spree/gateway/stripe_connect_spec.rb'
     - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
     - 'spec/serializers/admin/for_order_cycle/enterprise_serializer_spec.rb'
     - 'spec/serializers/admin/for_order_cycle/supplied_product_serializer_spec.rb'
     - 'spec/spec_helper.rb'
@@ -412,7 +396,6 @@ Layout/IndentationConsistency:
     - 'lib/open_food_network/permissions.rb'
     - 'spec/controllers/admin/tag_rules_controller_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
-    - 'spec/helpers/admin/business_model_configuration_helper_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
 
@@ -428,7 +411,6 @@ Layout/IndentationWidth:
     - 'app/serializers/api/admin/for_order_cycle/supplied_product_serializer.rb'
     - 'app/serializers/api/admin/order_cycle_serializer.rb'
     - 'spec/features/consumer/shopping/variant_overrides_spec.rb'
-    - 'spec/helpers/admin/business_model_configuration_helper_spec.rb'
     - 'spec/helpers/groups_helper_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
@@ -442,7 +424,6 @@ Layout/IndentationWidth:
 Layout/LeadingCommentSpace:
   Exclude:
     - 'Gemfile'
-    - 'app/models/billable_period.rb'
     - 'app/models/content_configuration.rb'
     - 'app/models/spree/inventory_unit_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
@@ -452,7 +433,6 @@ Layout/LeadingCommentSpace:
     - 'spec/controllers/spree/api/line_items_controller_spec.rb'
     - 'spec/features/admin/products_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
-    - 'spec/jobs/finalize_account_invoices_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - 'spec/lib/open_food_network/user_balance_calculator_spec.rb'
     - 'spec/models/enterprise_spec.rb'
@@ -474,7 +454,6 @@ Layout/MultilineBlockLayout:
     - 'spec/features/admin/variant_overrides_spec.rb'
     - 'spec/features/consumer/shopping/cart_spec.rb'
     - 'spec/helpers/enterprises_helper_spec.rb'
-    - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/permissions_spec.rb'
     - 'spec/lib/open_food_network/user_balance_calculator_spec.rb'
@@ -492,7 +471,6 @@ Layout/MultilineBlockLayout:
 Layout/MultilineHashBraceLayout:
   Exclude:
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
-    - 'app/models/billable_period.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/support/request/authentication_workflow.rb'
 
@@ -531,7 +509,6 @@ Layout/MultilineOperationIndentation:
     - 'app/models/producer_property.rb'
     - 'app/models/spree/ability_decorator.rb'
     - 'app/models/variant_override_set.rb'
-    - 'lib/open_food_network/accounts_and_billing_settings_validator.rb'
     - 'lib/open_food_network/order_cycle_permissions.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
@@ -543,7 +520,6 @@ Layout/SpaceAfterColon:
     - 'spec/features/admin/variants_spec.rb'
     - 'spec/features/consumer/account_spec.rb'
     - 'spec/models/spree/ability_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
     - 'spec/spec_helper.rb'
 
 # Offense count: 83
@@ -555,8 +531,6 @@ Layout/SpaceAfterComma:
     - 'app/controllers/spree/orders_controller_decorator.rb'
     - 'app/models/column_preference.rb'
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/accounts_and_billing_settings_validator.rb'
-    - 'lib/open_food_network/business_model_configuration_validator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
     - 'spec/controllers/admin/enterprises_controller_spec.rb'
@@ -565,7 +539,6 @@ Layout/SpaceAfterComma:
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/admin/customers_spec.rb'
     - 'spec/features/admin/variant_overrides_spec.rb'
-    - 'spec/jobs/update_account_invoices_spec.rb'
     - 'spec/lib/open_food_network/group_buy_report_spec.rb'
     - 'spec/lib/open_food_network/subscription_summary_spec.rb'
     - 'spec/models/content_configuration_spec.rb'
@@ -612,9 +585,6 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/variant_override_set.rb'
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/accounts_and_billing_settings_validator.rb'
-    - 'lib/open_food_network/bill_calculator.rb'
-    - 'lib/open_food_network/business_model_configuration_validator.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/enterprise_issue_validator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
@@ -635,8 +605,6 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundOperators:
   Exclude:
     - 'app/controllers/checkout_controller.rb'
-    - 'app/helpers/admin/business_model_configuration_helper.rb'
-    - 'app/jobs/update_billable_periods.rb'
     - 'app/overrides/remove_search_bar.rb'
     - 'app/overrides/remove_side_bar.rb'
     - 'app/overrides/replace_shipping_address_form_with_distributor_details.rb'
@@ -648,7 +616,6 @@ Layout/SpaceAroundOperators:
     - 'spec/features/consumer/shopping/checkout_spec.rb'
     - 'spec/helpers/checkout_helper_spec.rb'
     - 'spec/helpers/order_cycles_helper_spec.rb'
-    - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - 'spec/lib/stripe/account_connector_spec.rb'
     - 'spec/spec_helper.rb'
@@ -698,7 +665,6 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - 'lib/open_food_network/users_and_enterprises_report.rb'
     - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
-    - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb'
     - 'spec/models/spree/order_spec.rb'
@@ -719,8 +685,6 @@ Layout/SpaceInsideBlockBraces:
     - 'lib/spree/product_filters.rb'
     - 'lib/tasks/karma.rake'
     - 'spec/archive/features/consumer/checkout_spec.rb'
-    - 'spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb'
-    - 'spec/controllers/admin/business_model_configuration_controller_spec.rb'
     - 'spec/controllers/admin/inventory_items_controller_spec.rb'
     - 'spec/controllers/admin/tag_rules_controller_spec.rb'
     - 'spec/controllers/admin/variant_overrides_controller_spec.rb'
@@ -736,12 +700,8 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/helpers/enterprises_helper_spec.rb'
     - 'spec/helpers/injection_helper_spec.rb'
     - 'spec/helpers/spree/orders_helper_spec.rb'
-    - 'spec/jobs/finalize_account_invoices_spec.rb'
-    - 'spec/jobs/update_account_invoices_spec.rb'
-    - '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'
@@ -763,7 +723,6 @@ Layout/SpaceInsideBlockBraces:
 # 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'
@@ -771,7 +730,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'app/controllers/spree/admin/line_items_controller_decorator.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
     - 'app/controllers/spree/admin/search_controller_decorator.rb'
-    - 'app/helpers/admin/business_model_configuration_helper.rb'
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/helpers/angular_form_builder.rb'
     - 'app/helpers/injection_helper.rb'
@@ -779,9 +737,7 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'app/helpers/serializer_helper.rb'
     - 'app/helpers/spree/admin/base_helper_decorator.rb'
     - 'app/helpers/spree/admin/navigation_helper_decorator.rb'
-    - 'app/jobs/update_billable_periods.rb'
     - 'app/mailers/spree/base_mailer_decorator.rb'
-    - 'app/models/billable_period.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship.rb'
@@ -800,8 +756,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
-    - 'spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb'
-    - 'spec/controllers/admin/business_model_configuration_controller_spec.rb'
     - 'spec/controllers/admin/enterprises_controller_spec.rb'
     - 'spec/controllers/admin/manager_invitations_controller_spec.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
@@ -820,7 +774,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/controllers/user_passwords_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
-    - 'spec/features/admin/accounts_and_billing_settings_spec.rb'
     - 'spec/features/admin/image_settings_spec.rb'
     - 'spec/features/admin/products_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
@@ -841,7 +794,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'
@@ -852,7 +804,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
     - 'spec/models/tag_rule/discount_order_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
     - 'spec/performance/orders_controller_spec.rb'
     - 'spec/requests/checkout/failed_checkout_spec.rb'
     - 'spec/requests/checkout/stripe_connect_spec.rb'
@@ -938,7 +889,6 @@ Lint/DuplicateMethods:
 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'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
@@ -978,7 +928,6 @@ Lint/ShadowingOuterLocalVariable:
 # Cop supports --auto-correct.
 Lint/StringConversionInInterpolation:
   Exclude:
-    - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
     - 'app/controllers/enterprises_controller.rb'
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/helpers/injection_helper.rb'
@@ -1031,8 +980,6 @@ Lint/UnusedMethodArgument:
     - 'app/helpers/angular_form_helper.rb'
     - 'app/helpers/order_cycles_helper.rb'
     - 'app/helpers/spree/base_helper_decorator.rb'
-    - 'app/jobs/finalize_account_invoices.rb'
-    - 'app/jobs/update_account_invoices.rb'
     - 'app/models/spree/ability_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
@@ -1084,7 +1031,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'
@@ -1100,7 +1046,6 @@ Lint/Void:
     - 'spec/models/spree/payment_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'
     - 'spec/support/request/web_helper.rb'
 
@@ -1344,8 +1289,6 @@ Rails/HasAndBelongsToMany:
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
-    - 'app/models/account_invoice.rb'
-    - 'app/models/billable_period.rb'
     - 'app/models/customer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/order_cycle.rb'
@@ -1382,7 +1325,6 @@ Rails/HttpStatus:
     - 'app/controllers/shop_controller.rb'
     - 'app/controllers/spree/admin/line_items_controller_decorator.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
-    - 'app/controllers/spree/credit_cards_controller.rb'
     - 'app/controllers/spree/store_controller_decorator.rb'
     - 'app/controllers/stripe/callbacks_controller.rb'
     - 'app/controllers/stripe/webhooks_controller.rb'
@@ -1402,8 +1344,6 @@ Rails/OutputSafety:
 Rails/PluralizationGrammar:
   Exclude:
     - 'spec/features/admin/order_cycles_spec.rb'
-    - 'spec/jobs/update_account_invoices_spec.rb'
-    - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/spree/product_spec.rb'
 
@@ -1463,7 +1403,6 @@ Rails/TimeZone:
     - 'spec/lib/open_food_network/products_cache_refreshment_spec.rb'
     - 'spec/lib/open_food_network/products_cache_spec.rb'
     - 'spec/models/enterprise_relationship_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: Environments.
@@ -1484,9 +1423,7 @@ 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'
 
 # Offense count: 18
 # Cop supports --auto-correct.
@@ -1525,15 +1462,9 @@ Style/BracesAroundHashParameters:
     - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
     - 'app/controllers/spree/admin/search_controller_decorator.rb'
-    - 'app/helpers/admin/account_helper.rb'
-    - 'app/helpers/admin/business_model_configuration_helper.rb'
     - 'app/helpers/angular_form_builder.rb'
     - 'app/helpers/checkout_helper.rb'
     - 'app/helpers/spree/admin/orders_helper_decorator.rb'
-    - 'app/jobs/finalize_account_invoices.rb'
-    - 'app/jobs/update_account_invoices.rb'
-    - 'app/jobs/update_billable_periods.rb'
-    - 'app/models/billable_period.rb'
     - 'app/models/exchange.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/line_item_decorator.rb'
@@ -1543,8 +1474,6 @@ Style/BracesAroundHashParameters:
     - 'lib/open_food_network/reports/rule.rb'
     - 'lib/open_food_network/variant_and_line_item_naming.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
-    - 'spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb'
-    - 'spec/controllers/admin/business_model_configuration_controller_spec.rb'
     - 'spec/controllers/admin/enterprises_controller_spec.rb'
     - 'spec/controllers/admin/manager_invitations_controller_spec.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
@@ -1562,20 +1491,14 @@ Style/BracesAroundHashParameters:
     - 'spec/controllers/spree/orders_controller_spec.rb'
     - 'spec/controllers/user_confirmations_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
-    - 'spec/features/admin/accounts_and_billing_settings_spec.rb'
-    - 'spec/features/admin/business_model_configuration_spec.rb'
     - 'spec/features/admin/order_cycles_spec.rb'
     - 'spec/features/admin/products_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
     - 'spec/features/admin/tax_settings_spec.rb'
     - 'spec/helpers/order_cycles_helper_spec.rb'
-    - 'spec/jobs/finalize_account_invoices_spec.rb'
-    - 'spec/jobs/update_account_invoices_spec.rb'
     - 'spec/lib/open_food_network/feature_toggle_spec.rb'
     - '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'
@@ -1598,10 +1521,6 @@ Style/CaseEquality:
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
-    - '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'
@@ -1768,7 +1687,6 @@ Style/FormatStringToken:
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
-    - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
     - 'app/controllers/admin/enterprises_controller.rb'
     - 'app/controllers/admin/order_cycles_controller.rb'
     - 'app/controllers/admin/product_import_controller.rb'
@@ -1785,8 +1703,6 @@ Style/GuardClause:
     - 'app/controllers/spree/orders_controller_decorator.rb'
     - 'app/controllers/spree/paypal_controller_decorator.rb'
     - 'app/jobs/products_cache_integrity_checker_job.rb'
-    - 'app/jobs/update_account_invoices.rb'
-    - 'app/jobs/update_billable_periods.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
@@ -1796,7 +1712,6 @@ Style/GuardClause:
     - 'app/models/spree/product_decorator.rb'
     - 'app/models/spree/user_decorator.rb'
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/accounts_and_billing_settings_validator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/products_cache.rb'
     - 'lib/open_food_network/products_renderer.rb'
@@ -1815,7 +1730,6 @@ Style/GuardClause:
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
   Exclude:
-    - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
     - 'app/controllers/admin/contents_controller.rb'
     - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprises_controller.rb'
@@ -1833,7 +1747,6 @@ Style/HashSyntax:
     - 'app/controllers/spree/paypal_controller_decorator.rb'
     - 'app/controllers/spree/store_controller_decorator.rb'
     - 'app/controllers/user_passwords_controller.rb'
-    - 'app/helpers/admin/account_helper.rb'
     - 'app/helpers/angular_form_builder.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/checkout_helper.rb'
@@ -1842,7 +1755,6 @@ Style/HashSyntax:
     - 'app/helpers/spree/admin/orders_helper_decorator.rb'
     - 'app/mailers/enterprise_mailer.rb'
     - 'app/mailers/spree/user_mailer_decorator.rb'
-    - 'app/models/billable_period.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_fee.rb'
@@ -1850,7 +1762,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'
@@ -1864,17 +1775,9 @@ 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'
@@ -1906,7 +1809,6 @@ Style/HashSyntax:
     - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
     - 'spec/controllers/spree/api/variants_controller_spec.rb'
-    - 'spec/controllers/spree/credit_cards_controller_spec.rb'
     - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/controllers/user_registrations_controller_spec.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
@@ -1939,8 +1841,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'
     - 'spec/models/spree/order_spec.rb'
@@ -2001,7 +1901,7 @@ Style/MethodDefParentheses:
   Exclude:
     - 'app/helpers/enterprises_helper.rb'
     - 'app/models/spree/product_decorator.rb'
-    - 'lib/open_food_network/distribution_change_validator.rb'
+    - 'app/services/order_cycle_distributed_variants.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/group_buy_report.rb'
     - 'spec/support/request/authentication_workflow.rb'
@@ -2020,7 +1920,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
@@ -2102,9 +2001,7 @@ Style/NumericLiterals:
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
-    - 'app/helpers/admin/business_model_configuration_helper.rb'
     - 'app/helpers/checkout_helper.rb'
-    - 'app/jobs/update_account_invoices.rb'
     - 'app/models/spree/calculator/flexi_rate_decorator.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
@@ -2184,7 +2081,6 @@ Style/RedundantReturn:
   Exclude:
     - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprises_controller.rb'
-    - 'app/controllers/spree/credit_cards_controller.rb'
     - 'app/models/enterprise_fee.rb'
     - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/classification_decorator.rb'
@@ -2194,7 +2090,6 @@ Style/RedundantReturn:
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
-    - 'app/models/billable_period.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/exchange.rb'
@@ -2215,7 +2110,6 @@ Style/RedundantSelf:
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user_decorator.rb'
     - 'app/models/spree/variant_decorator.rb'
-    - 'app/models/variant_override.rb'
     - 'lib/open_food_network/locking.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
     - 'lib/open_food_network/reports/report.rb'
@@ -2275,7 +2169,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'
@@ -2309,7 +2202,6 @@ Style/StabbyLambdaParentheses:
 Style/StringLiteralsInInterpolation:
   Exclude:
     - 'app/controllers/application_controller.rb'
-    - 'app/jobs/update_billable_periods.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
@@ -2387,12 +2279,9 @@ Style/UnneededCondition:
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Exclude:
-    - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
     - 'app/controllers/admin/resource_controller.rb'
-    - 'app/helpers/admin/business_model_configuration_helper.rb'
     - 'app/helpers/angular_form_builder.rb'
     - 'app/helpers/injection_helper.rb'
-    - 'app/jobs/update_billable_periods.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'

.travis.yml

@@ -39,7 +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 openfoodnetwork:specs:engines:rspec; else echo "Skipping RSpec run in engines"; 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

@@ -75,7 +75,7 @@ Then the main application tests can be run with:
 
 The tests of all custom engines can be run with:
 
-    bundle exec rake openfoodnetwork:specs:engines:rspec
+    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.
 

Gemfile

@@ -5,33 +5,40 @@ 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.1.0'
+gem 'i18n-js', '~> 3.2.1'
 
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
 
+gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '41906362d931695e0616194341a68d2c4c85aaaf'
+
+# OFN-maintained and patched version of Spree v2.0.4. See
+# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade
+# for details.
+gem 'spree', github: 'openfoodfoundation/spree', branch: '2-0-4-stable'
+
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
-gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
 
 # Our branch contains two changes
 # - Pass customer email and phone number to PayPal (merged to upstream master)
 # - 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 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "2-0-stable"
+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.4.1' # Used for Stripe Connect
-gem 'jwt', '~> 1.5'
+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
@@ -54,8 +61,8 @@ gem 'rabl'
 # Once Rails is updated to 5.x we should bump directly to 0.10.x
 gem "active_model_serializers", "0.8.4"
 gem 'oj'
-gem 'deface', github: 'spree/deface', ref: '1110a13'
-gem 'paperclip'
+gem 'deface', '1.0.0'
+gem 'paperclip', '~> 3.4.1'
 gem 'dalli'
 gem 'geocoder'
 gem 'gmaps4rails'
@@ -102,7 +109,7 @@ end
 gem "foundation-rails"
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
 
-gem 'jquery-rails'
+gem 'jquery-rails', '3.0.0'
 gem 'jquery-migrate-rails'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
@@ -136,6 +143,7 @@ end
 
 group :development do
   gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
+  gem "newrelic_rpm", "~> 3.0"
   gem 'pry-byebug', '>= 3.4.3'
   gem 'debugger-linecache'
   gem 'guard'

Gemfile.lock

@@ -14,12 +14,12 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 8d95f4544c682634812becaf50999fba0cd04df0
-  branch: spree-upgrade-intermediate
+  revision: 27ad7165ea4c6e8c5f120b42b676cb9c2c272100
+  branch: 2-0-stable
   specs:
     spree_paypal_express (2.0.3)
       paypal-sdk-merchant (= 1.106.1)
-      spree_core (~> 1.3.99)
+      spree_core (~> 2.0.3)
 
 GIT
   remote: https://github.com/openfoodfoundation/ofn-qz.git
@@ -31,87 +31,72 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 41906362d931695e0616194341a68d2c4c85aaaf
-  ref: 41906362d931695e0616194341a68d2c4c85aaaf
-  branch: step-6a
+  revision: 46d6f8f5fd434105b0c69958276d1727a3066a97
+  branch: 2-0-4-stable
   specs:
-    spree (1.3.99)
-      spree_api (= 1.3.99)
-      spree_backend (= 1.3.99)
-      spree_cmd (= 1.3.99)
-      spree_core (= 1.3.99)
-      spree_dash (= 1.3.99)
-      spree_frontend (= 1.3.99)
-      spree_sample (= 1.3.99)
-    spree_api (1.3.99)
-      rabl (= 0.7.2)
-      spree_core (= 1.3.99)
-      versioncake (= 0.4.0)
-    spree_backend (1.3.99)
+    spree (2.0.4)
+      spree_api (= 2.0.4)
+      spree_backend (= 2.0.4)
+      spree_cmd (= 2.0.4)
+      spree_core (= 2.0.4)
+      spree_frontend (= 2.0.4)
+      spree_sample (= 2.0.4)
+    spree_api (2.0.4)
+      rabl (= 0.8.4)
+      spree_core (= 2.0.4)
+      versioncake (= 1.0.0)
+    spree_backend (2.0.4)
       deface (>= 0.9.0)
-      jquery-rails (~> 2.0)
+      jquery-rails (~> 3.0.0)
+      jquery-ui-rails (~> 4.0.0)
       rails (~> 3.2.8)
-      select2-rails (~> 3.2)
-      spree_api (= 1.3.99)
-      spree_core (= 1.3.99)
-      stringex (~> 1.3.2)
-    spree_cmd (1.3.99)
+      select2-rails (~> 3.4.7)
+      spree_api (= 2.0.4)
+      spree_core (= 2.0.4)
+    spree_cmd (2.0.4)
       thor (>= 0.14.6)
-    spree_core (1.3.99)
-      activemerchant (~> 1.50)
-      acts_as_list (= 0.1.9)
+    spree_core (2.0.4)
+      activemerchant (~> 1.34)
+      acts_as_list (= 0.2.0)
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
-      cancan (= 1.6.8)
-      deface (>= 0.9.0)
-      ffaker (~> 1.15.0)
-      highline (= 1.6.15)
-      httparty (= 0.9.0)
-      json (>= 1.5.5)
-      kaminari (= 0.13.0)
-      money (= 5.1.0)
+      cancan (~> 1.6.10)
+      deface (>= 0.9.1)
+      ffaker (~> 1.16)
+      highline (= 1.6.18)
+      httparty (~> 0.11)
+      json (>= 1.7.7)
+      kaminari (~> 0.14.1)
+      money (= 5.1.1)
       paperclip (~> 3.0)
-      rails (~> 3.2.13)
+      paranoia (~> 1.3)
+      rails (~> 3.2.14)
       ransack (= 0.7.2)
       state_machine (= 1.2.0)
-      stringex (~> 1.3.2)
+      stringex (~> 1.5.1)
       truncate_html (= 0.9.2)
-    spree_dash (1.3.99)
-      httparty (~> 0.9.0)
-      spree_backend (= 1.3.99)
-      spree_frontend (= 1.3.99)
-    spree_frontend (1.3.99)
+    spree_frontend (2.0.4)
+      canonical-rails
       deface (>= 0.9.0)
-      jquery-rails (~> 2.2.1)
-      rails (~> 3.2.8)
-      select2-rails (~> 3.2)
-      spree_api (= 1.3.99)
-      spree_core (= 1.3.99)
-      stringex (~> 1.3.2)
-    spree_sample (1.3.99)
-      spree_core (= 1.3.99)
+      jquery-rails (~> 3.0.0)
+      rails (~> 3.2.13)
+      spree_api (= 2.0.4)
+      spree_core (= 2.0.4)
+      stringex (~> 1.5.1)
+    spree_sample (2.0.4)
+      spree_core (= 2.0.4)
 
 GIT
-  remote: https://github.com/openfoodfoundation/spree_auth_devise.git
-  revision: da9eecefc6fe13dedf4c6f3febec79caad839ec3
-  branch: spree-upgrade-intermediate
+  remote: https://github.com/spree/spree_auth_devise.git
+  revision: 0181835fb6ac77a05191d26f6f32a0f4a548d851
+  branch: 2-0-stable
   specs:
     spree_auth_devise (2.0.0)
       devise (~> 2.2.5)
       devise-encryptable (= 0.1.2)
-      spree_backend (~> 1.3.6)
-      spree_core (~> 1.3.6)
-      spree_frontend (~> 1.3.6)
-
-GIT
-  remote: https://github.com/spree/deface.git
-  revision: 1110a1336252109bce7f98f9182042e0bc2930ae
-  ref: 1110a13
-  specs:
-    deface (1.0.0.rc3)
-      colorize (>= 0.5.8)
-      nokogiri (~> 1.6.0)
-      rails (>= 3.1)
+      spree_backend (~> 2.0.0)
+      spree_core (~> 2.0.0)
+      spree_frontend (~> 2.0.0)
 
 GIT
   remote: https://github.com/spree/spree_i18n.git
@@ -133,6 +118,11 @@ GIT
       activemodel (>= 3.0)
       railties (>= 3.0)
 
+PATH
+  remote: engines/order_management
+  specs:
+    order_management (0.0.1)
+
 PATH
   remote: engines/web
   specs:
@@ -178,7 +168,8 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
-    acts_as_list (0.1.9)
+    acts_as_list (0.2.0)
+      activerecord (>= 3.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     andand (1.3.3)
@@ -204,10 +195,13 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.5.0)
-    bugsnag (4.1.0)
+    bugsnag (6.11.1)
+      concurrent-ruby (~> 1.0)
     builder (3.0.4)
     byebug (9.0.6)
-    cancan (1.6.8)
+    cancan (1.6.10)
+    canonical-rails (0.1.0)
+      rails (>= 3.1, < 5.1)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -234,7 +228,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.8.1)
-    combine_pdf (1.0.15)
+    combine_pdf (1.0.16)
       ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -252,23 +246,34 @@ 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.6.0)
       addressable
     daemons (1.3.1)
-    dalli (2.7.2)
+    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)
+    deface (1.0.0)
+      colorize (>= 0.5.8)
+      nokogiri (~> 1.6.0)
+      rails (>= 3.1)
     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)
@@ -287,15 +292,15 @@ GEM
     eventmachine (1.2.7)
     excon (0.62.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.10.0)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.10.0)
+      factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.15.0)
-    ffi (1.9.25)
+    ffaker (1.22.1)
+    ffi (1.10.0)
     figaro (1.1.1)
       thor (~> 0.14)
     fission (0.5.0)
@@ -485,15 +490,14 @@ GEM
     haml (4.0.7)
       tilt
     hashdiff (0.3.7)
-    highline (1.6.15)
+    highline (1.6.18)
     hike (1.2.3)
     http_parser.rb (0.6.0)
-    httparty (0.9.0)
-      multi_json (~> 1.0)
-      multi_xml
+    httparty (0.16.2)
+      multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.1.0)
-      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)
@@ -501,18 +505,19 @@ GEM
     jaro_winkler (1.5.1)
     journey (1.0.4)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (2.2.2)
+    jquery-rails (3.0.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.5)
+      railties (>= 3.1.0)
     json (1.8.6)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (1.5.6)
-    kaminari (0.13.0)
+    jwt (2.1.0)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     kgio (2.11.2)
     knapsack (1.17.1)
       rake
@@ -534,12 +539,15 @@ GEM
     mini_portile2 (2.1.0)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
-    money (5.1.0)
+    money (5.1.1)
       i18n (~> 0.6.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
+    newrelic_rpm (3.18.1.330)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
@@ -551,17 +559,20 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.7.8)
+    oj (3.7.12)
     orm_adapter (0.5.0)
     paper_trail (5.2.3)
       activerecord (>= 3.0, < 6.0)
       request_store (~> 1.1)
-    paperclip (3.5.4)
+    paperclip (3.4.2)
       activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
+      cocaine (~> 0.5.0)
       mime-types
     parallel (1.11.2)
+    paranoia (1.3.4)
+      activerecord (~> 3.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
@@ -581,14 +592,15 @@ GEM
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
     public_suffix (3.0.3)
-    rabl (0.7.2)
+    rabl (0.8.4)
       activesupport (>= 2.3.14)
-      multi_json (~> 1.0)
     rack (1.4.7)
     rack-cache (1.8.0)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
       rack (>= 1.2.0)
+    rack-protection (1.5.5)
+      rack
     rack-rewrite (1.5.1)
     rack-ssl (1.3.4)
       rack
@@ -629,7 +641,7 @@ GEM
       trollop (~> 2.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.2.3)
+    redcarpet (3.4.0)
     ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)
@@ -658,7 +670,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -687,11 +699,12 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.5.10)
+    select2-rails (3.4.9)
+      sass-rails
       thor (~> 0.14)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.2)
+      rubyzip (~> 1.2, >= 1.2.2)
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
@@ -700,11 +713,15 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
     skylight (1.7.2)
       activesupport (>= 3.0.0)
-    spinjs-rails (1.3)
+    spinjs-rails (1.4)
       rails (>= 3.1)
-    spreadsheet (1.1.4)
+    spreadsheet (1.1.7)
       ruby-ole (>= 1.0)
     spring (1.7.2)
     spring-commands-rspec (1.0.4)
@@ -715,9 +732,10 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     state_machine (1.2.0)
-    stringex (1.3.3)
-    stripe (3.3.2)
-      faraday (~> 0.9)
+    stringex (1.5.1)
+    stripe (4.11.0)
+      faraday (~> 0.13)
+      net-http-persistent (~> 3.0)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
@@ -736,14 +754,14 @@ GEM
     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)
       rack
       unicorn
     uuidtools (2.1.5)
-    versioncake (0.4.0)
+    versioncake (1.0.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -753,7 +771,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    whenever (0.10.0)
+    whenever (0.11.0)
       chronic (>= 0.6.3)
     wicked_pdf (1.1.0)
     wkhtmltopdf-binary (0.12.4)
@@ -789,8 +807,9 @@ DEPENDENCIES
   database_cleaner (= 0.7.1)
   db2fog
   debugger-linecache
-  deface!
+  deface (= 1.0.0)
   delayed_job_active_record
+  delayed_job_web
   diffy
   eventmachine (>= 1.2.3)
   factory_bot_rails
@@ -808,22 +827,24 @@ DEPENDENCIES
   guard-rspec (~> 4.7.3)
   haml
   i18n (~> 0.6.11)
-  i18n-js (~> 3.1.0)
+  i18n-js (~> 3.2.1)
   immigrant
   jquery-migrate-rails
-  jquery-rails
+  jquery-rails (= 3.0.0)
   json_spec (~> 1.1.4)
-  jwt (~> 1.5)
+  jwt (~> 2.1)
   knapsack
   letter_opener (>= 1.4.1)
   listen (= 3.0.8)
   momentjs-rails
+  newrelic_rpm (~> 3.0)
   nokogiri (>= 1.6.7.1)
   oauth2 (~> 1.4.1)
   ofn-qz!
   oj
+  order_management!
   paper_trail (~> 5.2.3)
-  paperclip
+  paperclip (~> 3.4.1)
   pg
   pry-byebug (>= 3.4.3)
   rabl
@@ -853,7 +874,7 @@ DEPENDENCIES
   spree_paypal_express!
   spring (= 1.7.2)
   spring-commands-rspec
-  stripe (~> 3.3.2)
+  stripe
   therubyracer (= 0.12.0)
   timecop
   truncate_html

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

@@ -1 +0,0 @@
-angular.module("admin.accounts_and_billing_settings", ["admin.utils"])

app/assets/javascripts/admin/accounts_and_billing_settings/directives/method_settings.js.coffee

@@ -1,14 +0,0 @@
-angular.module("admin.accounts_and_billing_settings").directive "methodSettingsFor", ->
-  template: "<div ng-include='include_html'></div>"
-  restrict: 'A'
-  scope: {
-    enterprise_id: '=methodSettingsFor'
-  }
-  link: (scope, element, attrs) ->
-    scope.include_html = ""
-
-    scope.$watch "enterprise_id", (newVal, oldVal)->
-      if !newVal? || newVal == ""
-        scope.include_html = ""
-      else
-        scope.include_html = "/admin/accounts_and_billing_settings/show_methods?enterprise_id=#{newVal};"

app/assets/javascripts/admin/all.js

@@ -8,8 +8,8 @@
 //= require jquery
 //= require jquery-migrate-min
 //= require jquery_ujs
-//= require jquery-ui
-//= require shared/jquery-ui-timepicker-addon
+//= require jquery.ui.all
+//= require jquery-ui-timepicker-addon
 //= require angular
 //= require angular-resource
 //= require angular-animate
@@ -23,8 +23,6 @@
 //= require angular-rails-templates
 //= require_tree ../templates/admin
 //= require ./admin_ofn
-//= require ./accounts_and_billing_settings/accounts_and_billing_settings
-//= require ./business_model_configuration/business_model_configuration
 //= require ./customers/customers
 //= require ./dropdown/dropdown
 //= require ./enterprises/enterprises

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

@@ -1 +0,0 @@
-angular.module("admin.businessModelConfiguration", ["admin.utils"])

app/assets/javascripts/admin/business_model_configuration/controllers/business_model_configuration_controller.js.coffee

@@ -1,25 +0,0 @@
-angular.module("admin.businessModelConfiguration").controller "BusinessModelConfigCtrl", ($scope, $filter) ->
-  $scope.turnover = 1000
-
-  $scope.bill = ->
-    return $filter('currency')(0) unless $scope.fixed || $scope.rate
-    Number($scope.fixed) + Number($scope.turnover) * Number($scope.rate)
-
-  $scope.cappedBill = ->
-    return $scope.bill() if !$scope.cap? || Number($scope.cap) == 0
-    Math.min($scope.bill(), Number($scope.cap))
-
-  $scope.finalBill = ->
-    return 0 if Number($scope.turnover) < Number($scope.minBillableTurnover)
-    $scope.cappedBill()
-
-  $scope.capReached = ->
-    return t('no') if !$scope.cap? || Number($scope.cap) == 0
-    if $scope.bill() >= Number($scope.cap) then t('yes') else t('no')
-
-  $scope.includedTax = ->
-    return 0 if !$scope.taxRate? || Number($scope.taxRate) == 0
-    ($scope.cappedBill() * Number($scope.taxRate))
-
-  $scope.total = ->
-    $scope.finalBill() + $scope.includedTax()

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/enterprises/directives/monthly_pricing_description.js.coffee

@@ -1,8 +0,0 @@
-angular.module("admin.enterprises").directive "monthlyPricingDescription", (monthlyBillDescription) ->
-  restrict: 'E'
-  scope:
-    joiner: "@"
-  template: "<span ng-bind-html='billDescription'></span>"
-  link: (scope, element, attrs) ->
-    joiners = { comma: ", ", newline: "<br>" }
-    scope.billDescription = monthlyBillDescription.replace("{joiner}", joiners[scope.joiner])

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

@@ -24,3 +24,8 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl
 
   for shop in $scope.shops
     shop.disabled = !$scope.distributorHasOrderCycles(shop)
+
+  # Removes the split button introduced by spree in the order form
+  #   We only have one stock location in OFN so it's meaningless to split the order between stock locations
+  #   We delete it instead of hiding or changing CSS so that, when spree code toggles the element, nothing hapens
+  $('.split-item').remove()

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

@@ -33,7 +33,6 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
       'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
       # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
       'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
-      'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_null'] || null,
       'q[distributor_id_in]': $scope['q']['distributor_id_in'],
       'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
       'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],

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

@@ -19,4 +19,4 @@ angular.module("admin.subscriptions").controller "OrdersPanelController", ($scop
     text = if closes_at > moment() then t('js.subscriptions.closes') else t('js.subscriptions.closed')
     "#{text} #{closes_at.fromNow()}"
 
-  $scope.stateText = (state) -> t("spree.order_state.#{state}")
+  $scope.stateText = (state) -> t("js.admin.orders.order_state.#{state}")

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,7 +22,9 @@ 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) ->
+              window.variants = data # this is how spree auto complete JS code picks up variants
               results: data
           formatResult: (variant) ->
             if variant["images"][0] != undefined && variant["images"][0].image != undefined

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

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require jquery-ui
+#= require jquery.ui.all
 #= require spin
 #
 #= require angular

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

@@ -15,7 +15,7 @@ Darkswarm.directive "ofnOnHand", ->
     ngModel.$parsers.push (viewValue) ->
       on_hand = parseInt(attr.ofnOnHand)
       if parseInt(viewValue) > on_hand
-        alert t('insufficient_stock', {on_hand: on_hand})
+        alert t("js.insufficient_stock", {on_hand: on_hand})
         viewValue = on_hand
         ngModel.$setViewValue viewValue
         ngModel.$render()

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

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

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

@@ -57,18 +57,20 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
       scope = $rootScope.$new(true)
       scope.variants = []
 
-      # TODO: These changes to quantity/max_quantity trigger another cart update, which
-      #       is unnecessary.
-
+      # TODO: These changes to quantity/max_quantity trigger another cart update, which is unnecessary.
       for li in @line_items when li.quantity > 0
-        if stockLevels[li.variant.id]?
-          li.variant.count_on_hand = stockLevels[li.variant.id].on_hand
-          if li.quantity > li.variant.count_on_hand
-            li.quantity = li.variant.count_on_hand
-            scope.variants.push li.variant
-          if li.variant.count_on_hand == 0 && li.max_quantity > li.variant.count_on_hand
-            li.max_quantity = li.variant.count_on_hand
-            scope.variants.push(li.variant) unless li.variant in scope.variants
+        continue unless stockLevels[li.variant.id]?
+
+        li.variant.on_hand = stockLevels[li.variant.id].on_hand
+        li.variant.on_demand = stockLevels[li.variant.id].on_demand
+        continue if li.variant.on_demand
+
+        if li.quantity > li.variant.on_hand
+          li.quantity = li.variant.on_hand
+          scope.variants.push li.variant
+        if li.variant.on_hand == 0 && li.max_quantity > li.variant.on_hand
+          li.max_quantity = li.variant.on_hand
+          scope.variants.push(li.variant) unless li.variant in scope.variants
 
       if scope.variants.length > 0
         $modal.open(templateUrl: "out_of_stock.html", scope: scope, windowClass: 'out-of-stock-modal')

app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml

@@ -19,10 +19,6 @@
         %h3
           {{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
 
-        %p
-          %strong
-            %monthly-pricing-description{ joiner: "comma" }
-
         %p
           {{ 'js.admin.panels.enterprise_package.hub_shop_text1' | t }}
 
@@ -66,10 +62,6 @@
         %h3
           {{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
 
-        %p
-          %strong
-            %monthly-pricing-description{ joiner: "comma" }
-
         %p
           {{ 'js.admin.panels.enterprise_package.producer_shop_text1' | t }}
 
@@ -80,10 +72,6 @@
         %h3
           {{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
 
-        %p
-          %strong
-            %monthly-pricing-description{ joiner: "comma" }
-
         %p
           {{ 'js.admin.panels.enterprise_package.producer_hub_text1' | t }}
 
@@ -121,8 +109,6 @@
             {{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_produce_others' | t }}
-        .bottom
-          %monthly-pricing-description{ joiner: "newline" }
 
     %div{ ng: { switch: { when: "true" } } }
       %a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
@@ -139,8 +125,6 @@
             {{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_own_produce' | t }}
-        .bottom
-          %monthly-pricing-description{ joiner: "newline" }
 
       %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
         .top
@@ -148,8 +132,6 @@
             {{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
           %p
             {{ 'js.admin.panels.enterprise_package.sell_both' | t }}
-        .bottom
-          %monthly-pricing-description{ joiner: "newline" }
 
     %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
       %span{ ng: {hide: "saved() || saving" } }

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

@@ -9,7 +9,7 @@
 
 %p{'ng-repeat' => "v in variants"}
   %em {{ v.name_to_display }} - {{ v.unit_to_display }}
-  %span{'ng-if' => "v.count_on_hand == 0"}
+  %span{'ng-if' => "v.on_hand == 0"}
     {{ 'js.out_of_stock.now_out_of_stock' | t }}
-  %span{'ng-if' => "v.count_on_hand > 0"}
-    {{ 'js.out_of_stock.only_n_remainging' | t:{ num: v.count_on_hand } }}
+  %span{'ng-if' => "v.on_hand > 0"}
+    {{ 'js.out_of_stock.only_n_remainging' | t:{ num: v.on_hand } }}

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

@@ -7,6 +7,6 @@
   placeholder: "0",
   "ofn-disable-scroll" => true,
   "ng-model" => "variant.line_item.quantity",
-  "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.count_on_hand }}",
-  "ng-disabled" => "!variant.on_demand && variant.count_on_hand == 0",
+  "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
+  "ng-disabled" => "!variant.on_demand && variant.on_hand == 0",
   name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}

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

@@ -9,7 +9,7 @@
       "ng-model" => "variant.line_item.quantity",
       placeholder: "{{::'shop_variant_quantity_min' | t}}",
       "ofn-disable-scroll" => true,
-      "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.count_on_hand }}",
+      "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
       name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
     %span.bulk-input
       %input.bulk.second{type: :number,

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

@@ -1,19 +0,0 @@
-@import "variables";
-
-.row.invoice_title {
-  margin-bottom: 0px;
-}
-
-table.invoice_summary {
-  margin-bottom: 70px;
-
-  tr.total {
-    font-weight: bold;
-  }
-}
-
-.invoice_title {
-  .balance {
-    color: $spree-green;
-  }
-}

app/assets/stylesheets/admin/all.scss

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

app/assets/stylesheets/admin/components/admin-menu.css.scss

@@ -0,0 +1,12 @@
+#admin-menu {
+  li {
+    a {
+      font-weight: 600;
+    }
+
+    a::before {
+      font-weight: normal;
+      padding-top: 0;
+    }
+  }
+}

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

@@ -0,0 +1,10 @@
+.page-actions {
+  li {
+    margin-top: 1px;
+    margin-bottom: 1px;
+  }
+
+  a {
+    display: inline-block;
+  }
+}

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

@@ -1,7 +1,18 @@
 @import "../variables";
 
-.state {
-  @extend .state;
+#subscriptions .state {
+  border-radius: 3px;
+  text-transform: uppercase;
+  font-weight: 600;
+  border: 1px solid transparent;
+  padding: 2px 5px;
+  width: 100%;
+  display: inline-block;
+  text-align: center;
+
+  &:before {
+    display: none;
+  }
 
   &.active {
     background-color: $spree-green;

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

@@ -1,12 +0,0 @@
-@import "../variables";
-
-#trial_progress_bar {
-  position: fixed;
-  left: 0px;
-  bottom: 0px;
-  width: 100vw;
-  padding: 8px 10px;
-  font-weight: bold;
-  background-color: $spree-blue;
-  color: white;
-}

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

@@ -14,6 +14,7 @@ tbody.panel-ctrl {
     i.icon-chevron::before {
       font-size: 1.2rem;
       content: "\f078";
+      padding: 0;
     }
 
     &.error::before {
@@ -109,6 +110,12 @@ tbody.panel-ctrl {
       border-color: #6788a2;
       padding: 0;
       .panel {
+        .actions {
+          .button {
+            display: inline-block;
+          }
+        }
+
         .row{
           margin: 0px -4px;
 

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

@@ -2,6 +2,7 @@
 
 input[type="submit"], input[type="button"], button, .button {
   cursor: pointer;
+  font-size: 85%;
 }
 
 .text-center {

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

@@ -1,6 +0,0 @@
-class Admin::AccountController < Spree::Admin::BaseController
-
-  def show
-    @invoices = spree_current_user.account_invoices
-  end
-end

app/controllers/admin/accounts_and_billing_settings_controller.rb

@@ -1,74 +0,0 @@
-require 'open_food_network/accounts_and_billing_settings_validator'
-
-class Admin::AccountsAndBillingSettingsController < Spree::Admin::BaseController
-  before_filter :load_distributors, only: [:edit, :update, :start_job]
-  before_filter :load_jobs, only: [:edit, :update, :start_job]
-  before_filter :load_settings, only: [:edit, :update, :start_job]
-  before_filter :require_valid_settings, only: [:update, :start_job]
-  before_filter :require_known_job, only: [:start_job]
-
-  def update
-    Spree::Config.set(params[:settings])
-    flash[:success] = t(:successfully_updated, :resource => t(:billing_and_account_settings))
-    redirect_to_edit
-  end
-
-  def start_job
-    if @update_account_invoices_job || @finalize_account_invoices_job
-      flash[:error] = I18n.t(:accounts_and_billing_task_already_running_error)
-    else
-      new_job = "#{params[:job][:name]}".camelize.constantize.new
-      Delayed::Job.enqueue new_job
-      flash[:success] = I18n.t(:accounts_and_billing_start_task_notice)
-    end
-
-    redirect_to_edit
-  end
-
-  def show_methods
-    @enterprise = Enterprise.find_by_id(params[:enterprise_id])
-    @shipping_methods = @enterprise.shipping_methods
-    @payment_methods = @enterprise.payment_methods
-    render partial: 'method_settings'
-  end
-
-  private
-
-  def redirect_to_edit
-    redirect_to main_app.edit_admin_accounts_and_billing_settings_path
-  end
-
-  def require_valid_settings
-    render :edit unless @settings.valid?
-  end
-
-  def known_jobs
-    ['update_account_invoices', 'finalize_account_invoices']
-  end
-
-  def require_known_job
-    unless known_jobs.include?(params[:job][:name])
-      flash[:error] = "Unknown Task: #{params[:job][:name].to_s}"
-      redirect_to_edit
-    end
-  end
-
-  def load_settings
-    @settings = OpenFoodNetwork::AccountsAndBillingSettingsValidator.new(params[:settings] || {
-      accounts_distributor_id: Spree::Config[:accounts_distributor_id],
-      default_accounts_payment_method_id: Spree::Config[:default_accounts_payment_method_id],
-      default_accounts_shipping_method_id: Spree::Config[:default_accounts_shipping_method_id],
-      auto_update_invoices: Spree::Config[:auto_update_invoices],
-      auto_finalize_invoices: Spree::Config[:auto_finalize_invoices]
-    })
-  end
-
-  def load_distributors
-    @distributors = Enterprise.is_distributor.select([:id, :name])
-  end
-
-  def load_jobs
-    @update_account_invoices_job = Delayed::Job.where("handler LIKE (?)", "%UpdateAccountInvoices%").last
-    @finalize_account_invoices_job = Delayed::Job.where("handler LIKE (?)", "%FinalizeAccountInvoices%").last
-  end
-end

app/controllers/admin/business_model_configuration_controller.rb

@@ -1,35 +0,0 @@
-require 'open_food_network/business_model_configuration_validator'
-
-class Admin::BusinessModelConfigurationController < Spree::Admin::BaseController
-  before_filter :load_settings, only: [:edit, :update]
-  before_filter :require_valid_settings, only: [:update]
-
-  def update
-    Spree::Config.set(params[:settings])
-    flash[:success] = t(:successfully_updated,
-                        resource: t('admin.business_model_configuration.edit.business_model_configuration'))
-    redirect_to_edit
-  end
-
-  private
-
-  def redirect_to_edit
-    redirect_to main_app.edit_admin_business_model_configuration_path
-  end
-
-  def load_settings
-    @settings = OpenFoodNetwork::BusinessModelConfigurationValidator.new(params[:settings] || {
-      shop_trial_length_days: Spree::Config[:shop_trial_length_days],
-      account_invoices_monthly_fixed: Spree::Config[:account_invoices_monthly_fixed],
-      account_invoices_monthly_rate: Spree::Config[:account_invoices_monthly_rate],
-      account_invoices_monthly_cap: Spree::Config[:account_invoices_monthly_cap],
-      account_invoices_tax_rate: Spree::Config[:account_invoices_tax_rate],
-      minimum_billable_turnover: Spree::Config[:minimum_billable_turnover]
-
-    })
-  end
-
-  def require_valid_settings
-    render :edit unless @settings.valid?
-  end
-end

app/controllers/admin/cache_settings_controller.rb

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

app/controllers/admin/contents_controller.rb

@@ -18,7 +18,7 @@ module Admin
 
       flash[:success] = t(:successfully_updated, :resource => I18n.t('admin.contents.edit.your_content'))
 
-      redirect_to main_app.edit_admin_content_path
+      redirect_to main_app.edit_admin_contents_path
     end
 
     private

app/controllers/admin/enterprises_controller.rb

@@ -64,10 +64,6 @@ module Admin
 
       attributes = { sells: params[:sells], visible: true }
 
-      if ['own', 'any'].include? params[:sells]
-        attributes[:shop_trial_start_date] = @enterprise.shop_trial_start_date || Time.zone.now
-      end
-
       if @enterprise.update_attributes(attributes)
         flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name)
         redirect_to admin_path

app/controllers/admin/product_import_controller.rb

@@ -79,12 +79,11 @@ module Admin
     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/admin/variant_overrides_controller.rb

@@ -76,7 +76,8 @@ module Admin
     end
 
     def collection
-      @variant_overrides = VariantOverride.for_hubs(params[:hub_id] || @hubs)
+      @variant_overrides = VariantOverride.includes(:variant).for_hubs(params[:hub_id] || @hubs)
+      @variant_overrides.select { |vo| vo.variant.present? }
     end
 
     def collection_actions

app/controllers/api/base_controller.rb

@@ -13,5 +13,13 @@ module Api
     def respond_with_conflict(json_hash)
       render json: json_hash, status: :conflict
     end
+
+    private
+
+    # Use logged in user (spree_current_user) for API authentication (current_api_user)
+    def authenticate_user
+      @current_api_user = try_spree_current_user
+      super
+    end
   end
 end

app/controllers/api/customers_controller.rb

@@ -1,7 +1,7 @@
 module Api
   class CustomersController < BaseController
     def index
-      @customers = current_api_user.customers.of_regular_shops
+      @customers = current_api_user.customers
       render json: @customers, each_serializer: CustomerSerializer
     end
 

app/controllers/checkout_controller.rb

@@ -22,45 +22,48 @@ class CheckoutController < Spree::CheckoutController
   end
 
   def update
-    if @order.update_attributes(object_params)
-      check_order_for_phantom_fees
-      fire_event('spree.checkout.update')
-      while @order.state != "complete"
-        if @order.state == "payment"
-          return if redirect_to_paypal_express_form_if_needed
-        end
+    shipping_method_id = object_params.delete(:shipping_method_id)
 
-        next if advance_order_state(@order)
+    return update_failed unless @order.update_attributes(object_params)
 
-        if @order.errors.present?
-          flash[:error] = @order.errors.full_messages.to_sentence
-        else
-          flash[:error] = t(:payment_processing_failed)
-        end
-        update_failed
-        return
+    check_order_for_phantom_fees
+    fire_event('spree.checkout.update')
+
+    while @order.state != "complete"
+      if @order.state == "payment"
+        return if redirect_to_paypal_express_form_if_needed
       end
-      if @order.state == "complete" ||  @order.completed?
-        set_default_bill_address
-        set_default_ship_address
 
-        ResetOrderService.new(self, current_order).call
-        session[:access_token] = current_order.token
+      if @order.state == "delivery"
+        @order.select_shipping_method(shipping_method_id)
+      end
 
-        flash[:notice] = t(:order_processed_successfully)
-        respond_to do |format|
-          format.html do
-            respond_with(@order, :location => order_path(@order))
-          end
-          format.json do
-            render json: {path: order_path(@order)}, status: 200
-          end
-        end
+      next if advance_order_state(@order)
+
+      if @order.errors.present?
+        flash[:error] = @order.errors.full_messages.to_sentence
       else
-        update_failed
+        flash[:error] = t(:payment_processing_failed)
       end
-    else
       update_failed
+      return
+    end
+    return update_failed unless @order.state == "complete" ||  @order.completed?
+
+    set_default_bill_address
+    set_default_ship_address
+
+    ResetOrderService.new(self, current_order).call
+    session[:access_token] = current_order.token
+
+    flash[:notice] = t(:order_processed_successfully)
+    respond_to do |format|
+      format.html do
+        respond_with(@order, :location => order_path(@order))
+      end
+      format.json do
+        render json: {path: order_path(@order)}, status: 200
+      end
     end
   end
 
@@ -166,7 +169,7 @@ class CheckoutController < Spree::CheckoutController
   def load_order
     @order = current_order
     redirect_to main_app.shop_path and return unless @order and @order.checkout_allowed?
-    raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
+    redirect_to_cart_path and return unless valid_order_line_items?
     redirect_to main_app.shop_path and return if @order.completed?
     before_address
     setup_for_current_state
@@ -181,8 +184,11 @@ class CheckoutController < Spree::CheckoutController
     @order.ship_address = finder.ship_address
   end
 
-  # Overriding Spree's methods
-  def raise_insufficient_quantity
+  def valid_order_line_items?
+    @order.insufficient_stock_lines.empty? && OrderCycleDistributedVariants.new(@order.order_cycle, @order.distributor).distributes_order_variants?(@order)
+  end
+
+  def redirect_to_cart_path
     respond_to do |format|
       format.html do
         redirect_to cart_path

app/controllers/spree/admin/adjustments_controller_decorator.rb

@@ -3,7 +3,7 @@ module Spree
     AdjustmentsController.class_eval do
       prepend_before_filter :set_included_tax, only: [:create, :update]
       before_filter :set_default_tax_rate, only: :edit
-
+      before_filter :enable_updates, only: :update
 
       private
 
@@ -38,6 +38,17 @@ module Spree
           params[:adjustment][:included_tax] = 0
         end
       end
+
+      # Spree 2.0 keeps shipping fee adjustments open unless they are manually
+      # closed. But open adjustments cannot be edited.
+      # To preserve updates, like changing the amount of the shipping fee,
+      # we close the adjustment first.
+      #
+      # The Spree admin interface allows to open and close adjustments manually
+      # but we removed that functionality as it had no purpose for us.
+      def enable_updates
+        @adjustment.close
+      end
     end
   end
 end

app/controllers/spree/admin/images_controller_decorator.rb

@@ -0,0 +1,6 @@
+Spree::Admin::ImagesController.class_eval do
+  # This will make resource controller redirect correctly after deleting product images.
+  # This can be removed after upgrading to Spree 2.1.
+  # See here https://github.com/spree/spree/commit/334a011d2b8e16355e4ae77ae07cd93f7cbc8fd1
+  belongs_to 'spree/product', :find_by => :permalink
+end

app/controllers/spree/admin/invoices_controller.rb

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class InvoicesController < Spree::Admin::BaseController
       respond_to :json
+      authorize_resource class: false
 
       def create
         invoice_service = BulkInvoiceService.new

app/controllers/spree/admin/line_items_controller_decorator.rb

@@ -1,60 +0,0 @@
-require 'open_food_network/scope_variant_to_hub'
-
-Spree::Admin::LineItemsController.class_eval do
-  prepend_before_filter :load_order, except: :index
-  around_filter :apply_enterprise_fees_with_lock, only: :update
-
-  def create
-    variant = Spree::Variant.find(params[:line_item][:variant_id])
-    OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
-
-    @line_item = @order.add_variant(variant, params[:line_item][:quantity].to_i)
-
-    if @order.save
-      respond_with(@line_item) do |format|
-        format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
-      end
-    else
-      respond_with(@line_item) do |format|
-        format.js { render :action => 'create', :locals => { :order => @order.reload } }
-      end
-    end
-  end
-
-  # TODO: simplify this, 3 formats per action is too much
-  #       we need `js` format for admin/orders/edit (jquery-rails gem)
-  #       we don't know if `html` format is needed
-  def update
-    respond_to do |format|
-      format.html { render_order_form }
-      format.js {
-        if @line_item.update_attributes(params[:line_item])
-          render nothing: true, status: 204 # No Content, does not trigger ng resource auto-update
-        else
-          render json: { errors: @line_item.errors }, status: 412
-        end
-      }
-    end
-  end
-
-  private
-
-  def render_order_form
-    respond_to do |format|
-      format.html { render partial: 'spree/admin/orders/form', locals: {order: @order.reload} }
-    end
-  end
-
-  def load_order
-    @order = Spree::Order.find_by_number!(params[:order_id])
-    authorize! :update, @order
-  end
-
-  def apply_enterprise_fees_with_lock
-    authorize! :read, @order
-    @order.with_lock do
-      yield
-      @order.update_distribution_charge!
-    end
-  end
-end

app/controllers/spree/admin/orders/customer_details_controller_decorator.rb

@@ -1,6 +1,22 @@
 Spree::Admin::Orders::CustomerDetailsController.class_eval do
   before_filter :set_guest_checkout_status, only: :update
 
+  def update
+    if @order.update_attributes(params[:order])
+      if params[:guest_checkout] == "false"
+        @order.associate_user!(Spree.user_class.find_by_email(@order.email))
+      end
+
+      AdvanceOrderService.new(@order).call
+
+      @order.shipments.map &:refresh_rates
+      flash[:success] = Spree.t('customer_details_updated')
+      redirect_to admin_order_customer_path(@order)
+    else
+      render :action => :edit
+    end
+  end
+
   # Inherit CanCan permissions for the current order
   def model_class
     load_order unless @order

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -27,6 +27,34 @@ Spree::Admin::OrdersController.class_eval do
     # within the page then fetches the data it needs from Api::OrdersController
   end
 
+  def edit
+    @order.shipments.map &:refresh_rates
+
+    AdvanceOrderService.new(@order).call
+
+    # The payment step shows an error of 'No pending payments'
+    # Clearing the errors from the order object will stop this error
+    # appearing on the edit page where we don't want it to.
+    @order.errors.clear
+  end
+
+  # Re-implement spree method so that it redirects to edit instead of rendering edit
+  #   This allows page reloads while adding variants to the order (/edit), without being redirected to customer details page (/update)
+  def update
+    unless @order.update_attributes(params[:order]) && @order.line_items.present?
+      @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
+      return redirect_to edit_admin_order_path(@order), :flash => { :error => @order.errors.full_messages.join(', ') }
+    end
+
+    @order.update!
+    if @order.complete?
+      redirect_to edit_admin_order_path(@order)
+    else
+      # Jump to next step if order is not complete
+      redirect_to admin_order_customer_path(@order)
+    end
+  end
+
   # Overwrite to use confirm_email_for_customer instead of confirm_email.
   # This uses a new template. See mailers/spree/order_mailer_decorator.rb.
   def resend
@@ -37,9 +65,7 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def invoice
-    pdf = render_to_string pdf: "invoice-#{@order.number}.pdf",
-                           template: invoice_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')
@@ -48,7 +74,7 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def print
-    render pdf: "invoice-#{@order.number}", template: invoice_template, encoding: "UTF-8"
+    render InvoiceRenderer.new.args(@order)
   end
 
   def print_ticket
@@ -61,10 +87,6 @@ Spree::Admin::OrdersController.class_eval do
 
   private
 
-  def invoice_template
-    Spree::Config.invoice_style2? ? "spree/admin/orders/invoice2" : "spree/admin/orders/invoice"
-  end
-
   def require_distributor_abn
     unless @order.distributor.abn.present?
       flash[:error] = t(:must_have_valid_business_number, enterprise_name: @order.distributor.name)

app/controllers/spree/admin/payments_controller_decorator.rb

@@ -1,6 +1,35 @@
 Spree::Admin::PaymentsController.class_eval do
   append_before_filter :filter_payment_methods
 
+  def create
+    @payment = @order.payments.build(object_params)
+    if @payment.payment_method.is_a?(Spree::Gateway) && @payment.payment_method.payment_profiles_supported? && params[:card].present? and params[:card] != 'new'
+      @payment.source = CreditCard.find_by_id(params[:card])
+    end
+
+    begin
+      unless @payment.save
+        redirect_to admin_order_payments_path(@order)
+        return
+      end
+
+      if @order.completed?
+        @payment.process!
+        flash[:success] = flash_message_for(@payment, :successfully_created)
+
+         redirect_to admin_order_payments_path(@order)
+      else
+        AdvanceOrderService.new(@order).call!
+
+        flash[:success] = Spree.t(:new_order_completed)
+        redirect_to edit_admin_order_url(@order)
+      end
+
+    rescue Spree::Core::GatewayError => e
+      flash[:error] = "#{e.message}"
+      redirect_to new_admin_order_payment_path(@order)
+    end
+  end
 
   # When a user fires an event, take them back to where they came from
   # (we can't use respond_override because Spree no longer uses respond_with)

app/controllers/spree/admin/products_controller_decorator.rb

@@ -23,14 +23,23 @@ 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
   end
 
+  def create
+    delete_stock_params_and_set_after do
+      super
+    end
+  end
+
+  def update
+    delete_stock_params_and_set_after do
+      super
+    end
+  end
+
   def bulk_update
     collection_hash = Hash[params[:products].each_with_index.map { |p,i| [i,p] }]
     product_set = Spree::ProductSet.new({:collection_attributes => collection_hash})
@@ -66,8 +75,13 @@ Spree::Admin::ProductsController.class_eval do
     params[:q][:deleted_at_null] ||= "1"
 
     params[:q][:s] ||= "name asc"
-
-    @search = Spree::Product.ransack(params[:q]) # this line is modified - hit Spree::Product instead of super, avoiding cancan error for fetching records with block permissions via accessible_by
+    # The next line is modified.
+    # Hit Spree::Product instead of super, avoiding cancan error for fetching
+    # records with block permissions via accessible_by.
+    @collection = Spree::Product
+    @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null).blank?
+    # @search needs to be defined as this is passed to search_form_for
+    @search = @collection.ransack(params[:q])
     @collection = @search.result.
       managed_by(spree_current_user). # this line is added to the original spree code!!!!!
       group_by_products_id.
@@ -119,4 +133,22 @@ Spree::Admin::ProductsController.class_eval do
       end
     end
   end
+
+  def delete_stock_params_and_set_after
+    on_demand = params[:product].delete(:on_demand)
+    on_hand = params[:product].delete(:on_hand)
+
+    yield
+
+    set_stock_levels(@product, on_hand, on_demand) if @product.valid?
+  end
+
+  def set_stock_levels(product, on_hand, on_demand)
+    variant = product.master
+    if product.variants.any?
+      variant = product.variants.first
+    end
+    variant.on_demand = on_demand if on_demand.present?
+    variant.on_hand = on_hand.to_i if on_hand.present?
+  end
 end

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,12 +244,13 @@ Spree::Admin::ReportsController.class_eval do
       :products_and_inventory,
       :sales_total,
       :users_and_enterprises,
+      :enterprise_fee_summary,
       :order_cycle_management,
       :sales_tax,
       :xero_invoices,
       :packing
     ]
-    reports = all_reports.select { |action| can? action, :report }
+    reports = all_reports.select { |action| can? action, Spree::Admin::ReportsController }
     reports.map { |report| [report, describe_report(report)] }.to_h
   end
 
@@ -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

@@ -5,22 +5,10 @@ module Spree
       before_filter :load_hubs, only: [:new, :edit, :create, :update]
 
       # Sort shipping methods by distributor name
-      # ! Code copied from Spree::Admin::ResourceController with two added lines
       def collection
-        return parent.public_send(controller_name) if parent_data.present?
+        collection = super
+        collection = collection.managed_by(spree_current_user).by_name
 
-        collection = if model_class.respond_to?(:accessible_by) &&
-                         !current_ability.has_block?(params[:action], model_class)
-
-                       model_class.accessible_by(current_ability, action)
-
-                     else
-                       model_class.scoped
-                     end
-
-        collection = collection.managed_by(spree_current_user).by_name # This line added
-
-        # This block added
         if params.key? :enterprise_id
           distributor = Enterprise.find params[:enterprise_id]
           collection = collection.for_distributor(distributor)
@@ -29,14 +17,10 @@ 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, this method prevents the deletion (even soft) of shipping_methods that are referenced in orders.
       def do_not_destroy_referenced_shipping_methods
-        order = Order.where(:shipping_method_id => @object).first
+        order = Order.joins(shipments: :shipping_rates).where( spree_shipping_rates: { :shipping_method_id => @object } ).first
         if order
           flash[:error] = I18n.t(:shipping_method_destroy_error, number: order.number)
           redirect_to collection_url and return

app/controllers/spree/admin/variants_controller_decorator.rb

@@ -3,6 +3,18 @@ require 'open_food_network/scope_variants_for_search'
 Spree::Admin::VariantsController.class_eval do
   helper 'spree/products'
 
+  def create
+    on_demand = params[:variant].delete(:on_demand)
+    on_hand = params[:variant].delete(:on_hand)
+
+    super
+
+    if @object.present? && @object.valid?
+      @object.on_demand = on_demand if on_demand.present?
+      @object.on_hand = on_hand.to_i if on_hand.present?
+    end
+  end
+
   def search
     scoper = OpenFoodNetwork::ScopeVariantsForSearch.new(params)
     @variants = scoper.search
@@ -10,12 +22,15 @@ 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
-    flash[:success] = I18n.t('notice_messages.variant_deleted')
+    if VariantDeleter.new.delete(@variant) # This line changed
+      flash[:success] = Spree.t('notice_messages.variant_deleted')
+    else
+      flash[:success] = Spree.t('notice_messages.variant_not_deleted')
+    end
 
     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/spree/api/products_controller_decorator.rb

@@ -33,7 +33,7 @@ Spree::Api::ProductsController.class_eval do
     authorize! :delete, Spree::Product
     @product = find_product(params[:product_id])
     authorize! :delete, @product
-    @product.delete
+    @product.destroy
     respond_with(@product, :status => 204)
   end
 
@@ -56,8 +56,8 @@ Spree::Api::ProductsController.class_eval do
   def product_scope
     if current_api_user.has_spree_role?("admin") || current_api_user.enterprises.present? # This line modified
       scope = Spree::Product
-      unless params[:show_deleted]
-        scope = scope.not_deleted
+      if params[:show_deleted]
+        scope = scope.with_deleted
       end
     else
       scope = Spree::Product.active

app/controllers/spree/api/shipments_controller_decorator.rb

@@ -0,0 +1,47 @@
+require 'open_food_network/scope_variant_to_hub'
+
+Spree::Api::ShipmentsController.class_eval do
+  def create
+    variant = scoped_variant(params[:variant_id])
+    quantity = params[:quantity].to_i
+    @shipment = get_or_create_shipment(params[:stock_location_id])
+
+    @order.contents.add(variant, quantity, nil, @shipment)
+
+    @shipment.refresh_rates
+    @shipment.save!
+
+    respond_with(@shipment.reload, default_template: :show)
+  end
+
+  def add
+    variant = scoped_variant(params[:variant_id])
+    quantity = params[:quantity].to_i
+
+    @order.contents.add(variant, quantity, nil, @shipment)
+
+    respond_with(@shipment, default_template: :show)
+  end
+
+  def remove
+    variant = scoped_variant(params[:variant_id])
+    quantity = params[:quantity].to_i
+
+    @order.contents.remove(variant, quantity, @shipment)
+    @shipment.reload if @shipment.persisted?
+
+    respond_with(@shipment, default_template: :show)
+  end
+
+  private
+
+  def scoped_variant(variant_id)
+    variant = Spree::Variant.find(variant_id)
+    OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
+    variant
+  end
+
+  def get_or_create_shipment(stock_location_id)
+    @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
+  end
+end

app/controllers/spree/api/variants_controller_decorator.rb

@@ -3,7 +3,7 @@ Spree::Api::VariantsController.class_eval do
     @variant = scope.find(params[:variant_id])
     authorize! :delete, @variant
 
-    @variant.delete
+    VariantDeleter.new.delete(@variant)
     respond_with @variant, status: 204
   end
 end

app/controllers/spree/credit_cards_controller.rb

@@ -10,10 +10,10 @@ module Spree
         render json: @credit_card, serializer: ::Api::CreditCardSerializer, status: :ok
       else
         message = t(:card_could_not_be_saved)
-        render json: { flash: { error: I18n.t(:spree_gateway_error_flash_for_checkout, error: message) } }, status: 400
+        render json: { flash: { error: I18n.t(:spree_gateway_error_flash_for_checkout, error: message) } }, status: :bad_request
       end
     rescue Stripe::CardError => e
-      return render json: { flash: { error: I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message) } }, status: 400
+      render json: { flash: { error: I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message) } }, status: :bad_request
     end
 
     def update
@@ -26,6 +26,8 @@ module Spree
       else
         update_failed
       end
+    rescue ArgumentError
+      update_failed
     end
 
     def destroy
@@ -79,7 +81,7 @@ module Spree
     end
 
     def update_failed
-      render json: { flash: { error: t(:card_could_not_be_updated) } }, status: 400
+      render json: { flash: { error: t(:card_could_not_be_updated) } }, status: :bad_request
     end
   end
 end

app/controllers/spree/orders_controller_decorator.rb

@@ -21,14 +21,15 @@ Spree::OrdersController.class_eval do
   def edit
     @order = current_order(true)
     @insufficient_stock_lines = @order.insufficient_stock_lines
+    @unavailable_order_variants = OrderCycleDistributedVariants.new(current_order_cycle, current_distributor).unavailable_order_variants(@order)
 
     if @order.line_items.empty?
       redirect_to main_app.shop_path
     else
       associate_user
 
-      if @order.insufficient_stock_lines.present?
-        flash[:error] = t(:spree_inventory_error_flash_for_insufficient_quantity)
+      if @order.insufficient_stock_lines.present? || @unavailable_order_variants.present?
+        flash[:error] = t("spree.orders.error_flash_for_unavailable_items")
       end
     end
   end
@@ -42,7 +43,8 @@ Spree::OrdersController.class_eval do
     end
 
     if @order.update_attributes(params[:order])
-      @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+      discard_empty_line_items
+      with_open_adjustments { update_totals_and_taxes }
 
       render :edit and return unless apply_coupon_code
 
@@ -130,6 +132,34 @@ Spree::OrdersController.class_eval do
 
   private
 
+  # Updates the various denormalized total attributes of the order and
+  # recalculates the shipment taxes
+  def update_totals_and_taxes
+    @order.updater.update_totals
+    @order.shipment.ensure_correct_adjustment_with_included_tax if @order.shipment
+  end
+
+  # Sets the adjustments to open to perform the block's action and restores
+  # their state to whatever the they had. Note that it does not change any new
+  # adjustments that might get created in the yielded block.
+  def with_open_adjustments
+    previous_states = @order.adjustments.each_with_object({}) do |adjustment, hash|
+      hash[adjustment.id] = adjustment.state
+    end
+    @order.adjustments.each(&:open)
+
+    yield
+
+    @order.adjustments.each do |adjustment|
+      previous_state = previous_states[adjustment.id]
+      adjustment.update_attribute(:state, previous_state) if previous_state
+    end
+  end
+
+  def discard_empty_line_items
+    @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
+  end
+
   def require_order_authentication
     return if session[:access_token] || params[:token] || spree_current_user
 

app/controllers/spree/users_controller_decorator.rb

@@ -10,10 +10,6 @@ Spree::UsersController.class_eval do
   def show
     @orders = @user.orders.where(state: 'complete').order('completed_at desc')
     @unconfirmed_email = spree_current_user.unconfirmed_email
-
-    return unless Spree::Config.accounts_distributor_id
-
-    @orders = @orders.where('distributor_id != ?', Spree::Config.accounts_distributor_id)
   end
 
   # Endpoint for queries to check if a user is already registered

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

@@ -1,14 +0,0 @@
-module Admin
-  module AccountHelper
-    def invoice_description_for(invoice)
-      month = t(:abbr_month_names, :scope => :date)[invoice.month]
-      year = invoice.year
-      star = invoice.order.nil? || invoice.order.completed? ? "" : "*"
-      "#{month} #{year}#{star}"
-    end
-
-    def invoice_total_for(invoice)
-      invoice.order.andand.display_total || Spree::Money.new(0, { :currency => Spree::Config[:currency] })
-    end
-  end
-end

app/helpers/admin/business_model_configuration_helper.rb

@@ -1,71 +0,0 @@
-module Admin
-  module BusinessModelConfigurationHelper
-    def monthly_bill_description
-      plus = monthly_bill_includes_fixed? && monthly_bill_includes_rate? ? " + " : ""
-      ts = trial_description.empty? ? "": " "
-      ms = minimum_description.empty? ? "": " "
-
-      if fixed_description.empty? && rate_description.empty?
-        t(:free).upcase
-      elsif monthly_bill_includes_rate_limits? && monthly_bill_includes_rate? # only care about cap/min-bill-to if there is a rate too
-        "#{trial_description}#{ts}#{fixed_description}#{plus}#{rate_description}#{ms}#{minimum_description}#{cap_description} #{t(:per_month).upcase}#{tax_description.upcase}"
-      else
-        "#{trial_description}#{ts}#{fixed_description}#{plus}#{rate_description} #{t(:per_month).upcase}#{tax_description.upcase}"
-      end
-    end
-
-    private
-
-    def free_use?
-      Spree::Config[:account_invoices_monthly_fixed] == 0 && Spree::Config[:account_invoices_monthly_rate] == 0
-    end
-
-    def fixed_description
-      fixed_amount = Spree::Money.new(Spree::Config[:account_invoices_monthly_fixed], {currency: Spree::Config[:currency]} ).rounded
-      monthly_bill_includes_fixed? ? "#{fixed_amount}" : ""
-    end
-
-    def rate_description
-      percentage = (Spree::Config[:account_invoices_monthly_rate]*100).round(2)
-      monthly_bill_includes_rate? ? t(:percentage_of_sales, percentage: "#{percentage}%").upcase : ""
-    end
-
-    def cap_description
-      cap_amount = Spree::Money.new(Spree::Config[:account_invoices_monthly_cap], { currency: Spree::Config[:currency] }).rounded
-      monthly_bill_includes_cap? ? ", #{t(:capped_at_cap, cap: cap_amount).upcase}" : ""
-    end
-
-    def tax_description
-      Spree::Config[:account_invoices_tax_rate] > 0 ? ", #{t(:plus_tax).upcase}" : ""
-    end
-
-    def trial_description
-      Spree::Config[:shop_trial_length_days] > 0 ? "#{t(:free_trial).upcase} #{t(:then).upcase}" : ""
-    end
-
-    def minimum_description
-      mbt_amount = Spree::Money.new(Spree::Config[:minimum_billable_turnover], { currency: Spree::Config[:currency] }).rounded
-      monthly_bill_includes_min_turnover? ? "#{t(:min_bill_turnover_desc, mbt_amount: mbt_amount).upcase}" : ""
-    end
-
-    def monthly_bill_includes_fixed?
-      Spree::Config[:account_invoices_monthly_fixed] > 0
-    end
-
-    def monthly_bill_includes_rate?
-      Spree::Config[:account_invoices_monthly_rate] > 0
-    end
-
-    def monthly_bill_includes_cap?
-      Spree::Config[:account_invoices_monthly_cap] > 0
-    end
-
-    def monthly_bill_includes_min_turnover?
-      Spree::Config[:minimum_billable_turnover] > 1
-    end
-
-    def monthly_bill_includes_rate_limits?
-      monthly_bill_includes_min_turnover? || monthly_bill_includes_cap?
-    end
-  end
-end

app/helpers/admin/injection_helper.rb

@@ -1,7 +1,5 @@
 module Admin
   module InjectionHelper
-    include BusinessModelConfigurationHelper
-
     def admin_inject_enterprise
       admin_inject_json_ams "admin.enterprises", "enterprise", @enterprise, Api::Admin::EnterpriseSerializer
     end
@@ -65,6 +63,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),
@@ -106,10 +108,6 @@ module Admin
       admin_inject_json_ams_array "admin.orders", "orderCycles", @order_cycles, Api::Admin::BasicOrderCycleSerializer, current_user: spree_current_user
     end
 
-    def admin_inject_monthly_bill_description
-      render partial: "admin/json/injection_ams", locals: {ngModule: "admin.enterprises", name: "monthlyBillDescription", json: monthly_bill_description.to_json}
-    end
-
     def admin_inject_spree_api_key
       render partial: "admin/json/injection_ams", locals: {ngModule: 'admin.indexUtils', name: 'SpreeApiKey', json: "'#{@spree_api_key.to_s}'"}
     end

app/helpers/admin/orders_helper.rb

@@ -0,0 +1,13 @@
+module Admin
+  module OrdersHelper
+    # Adjustments to display under "Order adjustments".
+    #
+    # We exclude shipping method adjustments because they are displayed in a
+    # separate table together with the order line items.
+    def order_adjustments_for_display(order)
+      order.adjustments.eligible.select do |adjustment|
+        adjustment.originator_type != "Spree::ShippingMethod"
+      end
+    end
+  end
+end

app/helpers/enterprises_helper.rb

@@ -78,22 +78,6 @@ module EnterprisesHelper
     link_to_with_icon 'icon-trash', name, url, options
   end
 
-  def shop_trial_in_progress?(enterprise)
-    !!enterprise.shop_trial_start_date &&
-    (enterprise.shop_trial_start_date + Spree::Config[:shop_trial_length_days].days > Time.zone.now) &&
-    %w(own any).include?(enterprise.sells)
-  end
-
-  def shop_trial_expired?(enterprise)
-    !!enterprise.shop_trial_start_date &&
-    (enterprise.shop_trial_start_date + Spree::Config[:shop_trial_length_days].days <= Time.zone.now) &&
-    %w(own any).include?(enterprise.sells)
-  end
-
-  def remaining_trial_days(enterprise)
-    distance_of_time_in_words(Time.zone.now, enterprise.shop_trial_start_date + Spree::Config[:shop_trial_length_days].days)
-  end
-
   def order_changes_allowed?
     current_order.andand.distributor.andand.allow_order_changes?
   end

app/helpers/injection_helper.rb

@@ -65,7 +65,7 @@ module InjectionHelper
   end
 
   def inject_shops
-    customers = spree_current_user.customers.of_regular_shops
+    customers = spree_current_user.customers
     shops = Enterprise.where(id: @orders.pluck(:distributor_id).uniq | customers.pluck(:enterprise_id))
     inject_json_ams "shops", shops.all, Api::ShopForOrdersSerializer
   end

app/helpers/spree/admin/navigation_helper_decorator.rb

@@ -20,6 +20,7 @@ module Spree
         klass = Spree::Order if klass == :bulk_order_management
         klass = EnterpriseGroup if klass == :group
         klass = VariantOverride if klass == :Inventory
+        klass = Spree::Admin::ReportsController if klass == :report
         klass
       end
       alias_method_chain :klass_for, :sym_fallback

app/helpers/spree/admin/orders_helper_decorator.rb

@@ -3,7 +3,6 @@ module Spree
     module OrdersHelper
       def order_links(order)
         links = []
-        links << { name: t(:view_order), url: admin_order_path(order), icon: 'icon-eye-open' } unless action_name == "show"
         links << { name: t(:edit_order), url: edit_admin_order_path(order), icon: 'icon-edit' } unless action_name == "edit"
         if @order.complete?
           links << { name: t(:resend_confirmation), url: resend_admin_order_path(order), icon: 'icon-email', method: 'post', confirm: t(:confirm_resend_order_confirmation) }

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

@@ -1,110 +0,0 @@
-# This class is part of the system that charges hubs for using OFN. It does so
-# by creating orders. These are not orders for food that customers place, but
-# instead are orders for OFN usage, so to speak. Thus, they're technically not
-# "shipped" anywhere, so they're just given a default shipping method.
-#
-# The "orders" used by this class are not real orders, they are basically
-# "invoices" that enterprise owners need to pay for use of an open food network
-# instance. The amount that the enterprise owner is charged is configurable by
-# the instance, and can be based on a combination of a percentage of their
-# turnover, fixed fees, caps and floors and trial periods. This "orders" hold
-# the billing information for a particular enterprise owner for a given month.
-#
-# We assign them also a default shipping method because there is a validation
-# on Spree::Shipment that requires it.
-class FinalizeAccountInvoices
-  attr_reader :year, :month, :start_date, :end_date
-
-  def initialize(year = nil, month = nil)
-    ref_point = Time.zone.now - 1.month
-    @year = year || ref_point.year
-    @month = month || ref_point.month
-    @start_date = Time.zone.local(@year, @month)
-    @end_date = Time.zone.local(@year, @month) + 1.month
-  end
-
-  def before(job)
-    UpdateBillablePeriods.new(year, month).perform
-    UpdateAccountInvoices.new(year, month).perform
-  end
-
-  def perform
-    return unless settings_are_valid?
-
-
-    invoice_orders = AccountInvoice.where(year: year, month: month).map(&:order)
-    invoice_orders.select{ |order| order.present? && order.completed_at.nil? }.each{ |order| finalize(order) }
-  end
-
-  def finalize(invoice_order)
-    # TODO: When we implement per-customer and/or per-user preferences around shipping and payment methods
-    # we can update these to read from those preferences
-    invoice_order.payments.create(payment_method_id: Spree::Config.default_accounts_payment_method_id, amount: invoice_order.total)
-    invoice_order.update_attribute(:shipping_method_id, Spree::Config.default_accounts_shipping_method_id)
-    while invoice_order.state != "complete"
-      if invoice_order.errors.any?
-        Bugsnag.notify(RuntimeError.new("FinalizeInvoiceError"), {
-          job: "FinalizeAccountInvoices",
-          error: "Cannot finalize invoice due to errors",
-          data: {
-            errors: invoice_order.errors.full_messages
-          }
-        })
-        break
-      else
-        invoice_order.next
-      end
-    end
-  end
-
-  private
-
-  def settings_are_valid?
-    unless end_date <= Time.zone.now
-      Bugsnag.notify(RuntimeError.new("InvalidJobSettings"), {
-        job: "FinalizeAccountInvoices",
-        error: "end_date is in the future",
-        data: {
-          end_date: end_date.in_time_zone.strftime("%F %T"),
-          now: Time.zone.now.strftime("%F %T")
-        }
-      })
-      return false
-    end
-
-    unless @accounts_distributor = Enterprise.find_by_id(Spree::Config.accounts_distributor_id)
-      Bugsnag.notify(RuntimeError.new("InvalidJobSettings"), {
-        job: "FinalizeAccountInvoices",
-        error: "accounts_distributor_id is invalid",
-        data: {
-          accounts_distributor_id: Spree::Config.accounts_distributor_id
-        }
-      })
-      return false
-    end
-
-    unless @accounts_distributor.payment_methods.find_by_id(Spree::Config.default_accounts_payment_method_id)
-      Bugsnag.notify(RuntimeError.new("InvalidJobSettings"), {
-        job: "FinalizeAccountInvoices",
-        error: "default_accounts_payment_method_id is invalid",
-        data: {
-          default_accounts_payment_method_id: Spree::Config.default_accounts_payment_method_id
-        }
-      })
-      return false
-    end
-
-    unless @accounts_distributor.shipping_methods.find_by_id(Spree::Config.default_accounts_shipping_method_id)
-      Bugsnag.notify(RuntimeError.new("InvalidJobSettings"), {
-        job: "FinalizeAccountInvoices",
-        error: "default_accounts_shipping_method_id is invalid",
-        data: {
-          default_accounts_shipping_method_id: Spree::Config.default_accounts_shipping_method_id
-        }
-      })
-      return false
-    end
-
-    true
-  end
-end

app/jobs/products_cache_integrity_checker_job.rb

@@ -3,7 +3,14 @@ require 'open_food_network/products_cache_integrity_checker'
 ProductsCacheIntegrityCheckerJob = Struct.new(:distributor_id, :order_cycle_id) do
   def perform
     unless checker.ok?
-      Bugsnag.notify RuntimeError.new("Products JSON differs from cached version for distributor: #{distributor_id}, order cycle: #{order_cycle_id}"), diff: checker.diff.to_s(:text)
+      exception = RuntimeError.new(
+        "Products JSON differs from cached version for distributor: #{distributor_id}, " \
+        "order cycle: #{order_cycle_id}"
+      )
+
+      Bugsnag.notify(exception) do |report|
+        report.add_tab(:products_cache, diff: checker.diff.to_s(:text))
+      end
     end
   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/jobs/subscription_placement_job.rb

@@ -67,7 +67,7 @@ class SubscriptionPlacementJob
   end
 
   def available_variants_for(order)
-    DistributionChangeValidator.new(order).variants_available_for_distribution(order.distributor, order.order_cycle)
+    OrderCycleDistributedVariants.new(order.order_cycle, order.distributor).available_variants
   end
 
   def send_placement_email(order, changes)