Update all locales with the latest Transifex translations

Update cancan permissions for second iteration of bulk invoices

.codeclimate.yml

@@ -3,6 +3,8 @@ plugins:
   rubocop:
     enabled: true
     channel: "rubocop-0-57"
+    config:
+      file: ".rubocop_styleguide.yml"
   scss-lint:
     enabled: true
     checks:

.gitignore

@@ -41,3 +41,6 @@ libpeerconnection.log
 node_modules
 vendor/bundle/
 coverage
+/reports/
+!/reports/README.md
+bin/

.rubocop.yml

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

.rubocop_manual_todo.yml

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

.rubocop_styleguide.yml

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

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2018-10-25 13:57:32 +1100 using RuboCop version 0.57.2.
+# on 2019-01-02 13:44:41 +0100 using RuboCop version 0.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -23,11 +23,9 @@ Layout/AlignArray:
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'lib/open_food_network/packing_report.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
 
-# Offense count: 121
+# Offense count: 122
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -56,8 +54,9 @@ Layout/AlignHash:
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
 
-# Offense count: 60
+# Offense count: 49
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_parameter, with_fixed_indentation
@@ -68,10 +67,8 @@ Layout/AlignParameters:
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/serializers/api/address_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/serializers/api/shipping_method_serializer.rb'
     - 'lib/spree/product_filters.rb'
-    - 'lib/tasks/dev.rake'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/shop_controller_spec.rb'
     - 'spec/features/admin/enterprise_fees_spec.rb'
@@ -95,11 +92,12 @@ Layout/BlockAlignment:
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/product_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 Layout/BlockEndNewline:
   Exclude:
     - 'spec/features/consumer/shopping/cart_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -125,7 +123,7 @@ Layout/ElseAlignment:
     - 'app/serializers/api/admin/order_cycle_serializer.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
 
-# Offense count: 197
+# Offense count: 187
 # Cop supports --auto-correct.
 Layout/EmptyLines:
   Exclude:
@@ -138,7 +136,6 @@ Layout/EmptyLines:
     - 'app/controllers/spree/admin/adjustments_controller_decorator.rb'
     - 'app/controllers/spree/admin/base_controller_decorator.rb'
     - 'app/controllers/spree/admin/general_settings_controller_decorator.rb'
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/controllers/spree/admin/payments_controller_decorator.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
     - 'app/controllers/spree/admin/variants_controller_decorator.rb'
@@ -149,14 +146,11 @@ Layout/EmptyLines:
     - 'app/jobs/finalize_account_invoices.rb'
     - 'app/jobs/products_cache_integrity_checker_job.rb'
     - 'app/jobs/refresh_products_cache_job.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/coordinator_fee.rb'
     - 'app/models/enterprise_fee.rb'
-    - 'app/models/enterprise_relationship.rb'
     - 'app/models/exchange.rb'
     - 'app/models/exchange_fee.rb'
     - 'app/models/inventory_item.rb'
-    - 'app/models/open_food_network/calculator/weight.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/producer_property.rb'
     - 'app/models/product_distribution.rb'
@@ -178,7 +172,6 @@ Layout/EmptyLines:
     - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/tax_rate_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'lib/open_food_network/cached_products_renderer.rb'
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
     - 'lib/open_food_network/enterprise_issue_validator.rb'
@@ -190,14 +183,12 @@ Layout/EmptyLines:
     - 'lib/open_food_network/products_cache.rb'
     - 'lib/open_food_network/products_cache_integrity_checker.rb'
     - 'lib/open_food_network/products_renderer.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'lib/open_food_network/scope_product_to_hub.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/core/controller_helpers/order_decorator.rb'
     - 'lib/tasks/cache.rake'
-    - 'lib/tasks/dev.rake'
     - 'lib/tasks/enterprises.rake'
     - 'spec/archive/features/consumer/checkout_spec.rb'
     - 'spec/controllers/admin/column_preferences_controller_spec.rb'
@@ -249,12 +240,10 @@ Layout/EmptyLines:
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
-    - 'spec/models/variant_override_spec.rb'
     - 'spec/serializers/admin/exchange_serializer_spec.rb'
     - 'spec/serializers/admin/for_order_cycle/enterprise_serializer_spec.rb'
     - 'spec/serializers/admin/for_order_cycle/supplied_product_serializer_spec.rb'
     - 'spec/serializers/credit_card_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/support/delayed_job_helper.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
@@ -264,15 +253,13 @@ Layout/EmptyLinesAroundArguments:
   Exclude:
     - 'spec/archive/features/consumer/checkout_spec.rb'
 
-# Offense count: 59
+# Offense count: 51
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/controllers/spree/api/orders_controller_decorator.rb'
-    - 'app/controllers/spree/api/products_controller_decorator.rb'
     - 'app/controllers/spree/checkout_controller_decorator.rb'
     - 'app/models/spree/calculator/default_tax_decorator.rb'
     - 'app/models/spree/calculator_decorator.rb'
@@ -280,24 +267,19 @@ Layout/EmptyLinesAroundBlockBody:
     - 'app/models/spree/option_value_decorator.rb'
     - 'lib/open_food_network/group_buy_report.rb'
     - 'lib/spree/money_decorator.rb'
-    - 'lib/tasks/dev.rake'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/admin/tag_rules_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/reports_controller_spec.rb'
     - 'spec/controllers/spree/api/orders_controller_spec.rb'
     - 'spec/controllers/spree/orders_controller_spec.rb'
     - 'spec/controllers/user_confirmations_controller_spec.rb'
-    - 'spec/controllers/user_registrations_controller_spec.rb'
     - 'spec/features/admin/caching_spec.rb'
     - 'spec/features/admin/orders_spec.rb'
     - 'spec/features/admin/reports_spec.rb'
-    - 'spec/features/admin/variant_overrides_spec.rb'
     - 'spec/features/consumer/cookies_spec.rb'
     - 'spec/features/consumer/shopping/embedded_groups_spec.rb'
     - 'spec/features/consumer/shopping/embedded_shopfronts_spec.rb'
     - 'spec/features/consumer/shopping/shopping_spec.rb'
-    - 'spec/features/consumer/shopping/variant_overrides_spec.rb'
     - 'spec/helpers/admin/business_model_configuration_helper_spec.rb'
     - 'spec/helpers/shared_helper_spec.rb'
     - 'spec/helpers/shop_helper_spec.rb'
@@ -321,7 +303,7 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/support/matchers/select2_matchers.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
-# Offense count: 24
+# Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
@@ -335,7 +317,6 @@ Layout/EmptyLinesAroundClassBody:
     - 'app/controllers/api/enterprises_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/home_controller.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/coordinator_fee.rb'
     - 'app/models/producer_property.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
@@ -362,7 +343,7 @@ Layout/EndAlignment:
     - 'app/serializers/api/admin/for_order_cycle/supplied_product_serializer.rb'
     - 'app/serializers/api/admin/order_cycle_serializer.rb'
 
-# Offense count: 47
+# Offense count: 45
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
@@ -372,7 +353,6 @@ Layout/ExtraSpacing:
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/spree/classification_decorator.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'config.ru'
     - 'lib/open_food_network/bulk_coop_report.rb'
     - 'lib/open_food_network/option_value_namer.rb'
@@ -457,13 +437,7 @@ Layout/IndentationWidth:
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/spree/calculator/flexi_rate_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/LeadingBlankLines:
-  Exclude:
-    - 'lib/tasks/dev.rake'
-
-# Offense count: 44
+# Offense count: 43
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
   Exclude:
@@ -473,7 +447,6 @@ Layout/LeadingCommentSpace:
     - 'app/models/spree/inventory_unit_decorator.rb'
     - 'app/models/spree/taxon_decorator.rb'
     - 'app/serializers/api/address_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/serializers/api/product_serializer.rb'
     - 'spec/archive/features/consumer/checkout_spec.rb'
     - 'spec/controllers/spree/api/line_items_controller_spec.rb'
@@ -489,7 +462,7 @@ Layout/LeadingCommentSpace:
     - 'spec/support/matchers/select2_matchers.rb'
     - 'spec/support/request/authentication_workflow.rb'
 
-# Offense count: 44
+# Offense count: 45
 # Cop supports --auto-correct.
 Layout/MultilineBlockLayout:
   Exclude:
@@ -509,6 +482,7 @@ Layout/MultilineBlockLayout:
     - 'spec/models/order_cycle_spec.rb'
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
+    - 'spec/models/variant_override_spec.rb'
     - 'spec/serializers/enterprise_serializer_spec.rb'
 
 # Offense count: 4
@@ -655,7 +629,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/web_helper.rb'
 
-# Offense count: 55
+# Offense count: 50
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -666,11 +640,9 @@ Layout/SpaceAroundOperators:
     - 'app/overrides/remove_search_bar.rb'
     - 'app/overrides/remove_side_bar.rb'
     - 'app/overrides/replace_shipping_address_form_with_distributor_details.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/controllers/admin/enterprises_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
@@ -679,7 +651,6 @@ Layout/SpaceAroundOperators:
     - 'spec/jobs/update_billable_periods_spec.rb'
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - 'spec/lib/stripe/account_connector_spec.rb'
-    - 'spec/models/calculator/weight_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/cancan_helper.rb'
     - 'spec/support/seeds.rb'
@@ -732,7 +703,7 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - 'spec/lib/open_food_network/users_and_enterprises_report_spec.rb'
     - 'spec/models/spree/order_spec.rb'
 
-# Offense count: 194
+# Offense count: 192
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -746,7 +717,6 @@ Layout/SpaceInsideBlockBraces:
     - 'app/models/column_preference.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'lib/spree/product_filters.rb'
-    - 'lib/tasks/dev.rake'
     - 'lib/tasks/karma.rake'
     - 'spec/archive/features/consumer/checkout_spec.rb'
     - 'spec/controllers/admin/accounts_and_billing_settings_controller_spec.rb'
@@ -786,7 +756,7 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/spec_helper.rb'
     - 'spec/support/cancan_helper.rb'
 
-# Offense count: 728
+# Offense count: 702
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
@@ -837,7 +807,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
     - 'spec/controllers/api/statuses_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/shop_controller_spec.rb'
@@ -857,7 +826,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/features/admin/reports_spec.rb'
     - 'spec/features/consumer/shopping/checkout_spec.rb'
     - 'spec/helpers/checkout_helper_spec.rb'
-    - 'spec/helpers/i18n_helper_spec.rb'
     - 'spec/helpers/order_cycles_helper_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
     - 'spec/lib/open_food_network/feature_toggle_spec.rb'
@@ -889,7 +857,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/requests/checkout/failed_checkout_spec.rb'
     - 'spec/requests/checkout/stripe_connect_spec.rb'
     - 'spec/serializers/enterprise_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/services/order_syncer_spec.rb'
     - 'spec/services/subscription_form_spec.rb'
     - 'spec/spec_helper.rb'
@@ -927,15 +894,7 @@ Layout/Tab:
     - 'spec/lib/spree/product_filters_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'spec/controllers/cart_controller_spec.rb'
-
-# Offense count: 60
+# Offense count: 57
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -951,7 +910,6 @@ Layout/TrailingWhitespace:
     - 'app/views/json/partials/_producer.rabl'
     - 'spec/controllers/admin/column_preferences_controller_spec.rb'
     - 'spec/features/admin/customers_spec.rb'
-    - 'spec/features/admin/variant_overrides_spec.rb'
     - 'spec/features/consumer/cookies_spec.rb'
     - 'spec/helpers/enterprises_helper_spec.rb'
     - 'spec/lib/open_food_network/enterprise_fee_calculator_spec.rb'
@@ -964,9 +922,10 @@ Layout/TrailingWhitespace:
     - 'spec/serializers/enterprise_serializer_spec.rb'
     - 'spec/support/request/menu_helper.rb'
 
-# Offense count: 1
+# Offense count: 2
 Lint/AmbiguousOperator:
   Exclude:
+    - 'spec/controllers/api/enterprise_fees_controller_spec.rb'
     - 'spec/controllers/spree/admin/payments_controller_spec.rb'
 
 # Offense count: 4
@@ -975,14 +934,13 @@ Lint/DuplicateMethods:
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/subscription_summary.rb'
 
-# Offense count: 16
+# Offense count: 15
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'app/models/variant_override.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/products_cache.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
 
 # Offense count: 2
@@ -1082,18 +1040,17 @@ Lint/UnusedMethodArgument:
     - 'lib/open_food_network/paperclippable.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'app/models/column_preference.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/products_cache.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
 
-# Offense count: 242
+# Offense count: 240
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
@@ -1104,7 +1061,6 @@ Lint/Void:
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/shop_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/variants_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
     - 'spec/controllers/spree/api/variants_controller_spec.rb'
@@ -1148,53 +1104,26 @@ Lint/Void:
     - 'spec/serializers/enterprise_serializer_spec.rb'
     - 'spec/support/request/web_helper.rb'
 
-# Offense count: 192
-Metrics/AbcSize:
-  Max: 293
-
-# Offense count: 1039
+# Offense count: 110
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 787
 
 # Offense count: 1
-# Configuration parameters: CountBlocks.
-Metrics/BlockNesting:
-  Max: 4
-
-# Offense count: 23
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 331
+  Max: 117
 
-# Offense count: 36
-Metrics/CyclomaticComplexity:
-  Max: 23
-
-# Offense count: 2717
+# Offense count: 1
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 619
+  Max: 141
 
-# Offense count: 161
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 95
-
-# Offense count: 27
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 633
-
-# Offense count: 6
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 8
-
-# Offense count: 28
-Metrics/PerceivedComplexity:
-  Max: 21
+  Max: 14
 
 # Offense count: 7
 Naming/AccessorMethodName:
@@ -1249,7 +1178,7 @@ Naming/PredicateName:
     - 'lib/open_food_network/packing_report.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 13
+# Offense count: 12
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at
 Naming/UncommunicativeMethodParamName:
@@ -1259,7 +1188,6 @@ Naming/UncommunicativeMethodParamName:
     - 'app/helpers/spree/base_helper_decorator.rb'
     - 'app/models/exchange.rb'
     - 'app/services/subscription_validator.rb'
-    - 'lib/open_food_network/property_merge.rb'
     - 'lib/open_food_network/reports/bulk_coop_report.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'spec/lib/open_food_network/reports/report_spec.rb'
@@ -1272,14 +1200,13 @@ Naming/VariableName:
   Exclude:
     - 'app/helpers/admin/injection_helper.rb'
 
-# Offense count: 16
+# Offense count: 10
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
   Exclude:
     - 'spec/archive/features/consumer/checkout_spec.rb'
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
-    - 'spec/models/calculator/weight_spec.rb'
 
 # Offense count: 1
 Performance/Caller:
@@ -1431,7 +1358,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/variant_decorator.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 45
+# Offense count: 46
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: numeric, symbolic
@@ -1440,16 +1367,15 @@ Rails/HttpStatus:
     - 'app/controllers/admin/bulk_line_items_controller.rb'
     - 'app/controllers/admin/column_preferences_controller.rb'
     - 'app/controllers/admin/customers_controller.rb'
-    - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprise_relationships_controller.rb'
     - 'app/controllers/admin/enterprise_roles_controller.rb'
     - 'app/controllers/admin/manager_invitations_controller.rb'
     - 'app/controllers/admin/tag_rules_controller.rb'
     - 'app/controllers/admin/variant_overrides_controller.rb'
     - 'app/controllers/api/customers_controller.rb'
+    - 'app/controllers/api/enterprise_fees_controller.rb'
     - 'app/controllers/api/enterprises_controller.rb'
     - 'app/controllers/application_controller.rb'
-    - 'app/controllers/cart_controller.rb'
     - 'app/controllers/checkout_controller.rb'
     - 'app/controllers/enterprises_controller.rb'
     - 'app/controllers/line_items_controller.rb'
@@ -1487,12 +1413,11 @@ Rails/Presence:
   Exclude:
     - 'app/serializers/api/admin/customer_serializer.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
 Rails/Present:
   Exclude:
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'app/models/producer_property.rb'
     - 'lib/open_food_network/products_and_inventory_report.rb'
 
@@ -1624,7 +1549,6 @@ Style/BracesAroundHashParameters:
     - 'spec/controllers/admin/manager_invitations_controller_spec.rb'
     - 'spec/controllers/admin/order_cycles_controller_spec.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/enterprises_controller_spec.rb'
     - 'spec/controllers/line_items_controller_spec.rb'
     - 'spec/controllers/spree/admin/adjustments_controller_spec.rb'
@@ -1657,7 +1581,6 @@ Style/BracesAroundHashParameters:
     - 'spec/models/spree/product_spec.rb'
     - 'spec/models/spree/taxon_spec.rb'
     - 'spec/serializers/admin/customer_serializer_spec.rb'
-    - 'spec/services/cart_service_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/cancan_helper.rb'
     - 'spec/support/request/authentication_workflow.rb'
@@ -1669,7 +1592,7 @@ Style/CaseEquality:
     - 'app/helpers/angular_form_helper.rb'
     - 'spec/models/spree/payment_spec.rb'
 
-# Offense count: 85
+# Offense count: 82
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -1682,7 +1605,6 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/spree/store_controller_decorator.rb'
     - 'app/helpers/angular_form_helper.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
-    - 'app/models/open_food_network/calculator/weight.rb'
     - 'app/models/spree/gateway/migs.rb'
     - 'app/models/spree/gateway/pin.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
@@ -1814,7 +1736,7 @@ Style/EmptyLiteral:
     - 'app/helpers/checkout_helper.rb'
     - 'app/models/spree/order_decorator.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
@@ -1824,7 +1746,6 @@ Style/EmptyMethod:
     - 'app/controllers/home_controller.rb'
     - 'app/controllers/map_controller.rb'
     - 'app/controllers/producers_controller.rb'
-    - 'app/controllers/shops_controller.rb'
     - 'app/controllers/spree/admin/products_controller_decorator.rb'
 
 # Offense count: 2
@@ -1843,19 +1764,17 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/models/enterprise_spec.rb'
 
-# Offense count: 80
+# Offense count: 76
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'app/controllers/admin/accounts_and_billing_settings_controller.rb'
-    - 'app/controllers/admin/enterprise_fees_controller.rb'
     - 'app/controllers/admin/enterprises_controller.rb'
     - 'app/controllers/admin/order_cycles_controller.rb'
     - 'app/controllers/admin/product_import_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/base_controller.rb'
     - 'app/controllers/checkout_controller.rb'
-    - 'app/controllers/enterprises_controller.rb'
     - 'app/controllers/home_controller.rb'
     - 'app/controllers/spree/admin/adjustments_controller_decorator.rb'
     - 'app/controllers/spree/admin/base_controller_decorator.rb'
@@ -1868,7 +1787,6 @@ Style/GuardClause:
     - 'app/jobs/products_cache_integrity_checker_job.rb'
     - 'app/jobs/update_account_invoices.rb'
     - 'app/jobs/update_billable_periods.rb'
-    - 'app/mailers/producer_mailer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
@@ -1891,7 +1809,7 @@ Style/GuardClause:
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
-# Offense count: 924
+# Offense count: 872
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
@@ -1923,7 +1841,6 @@ Style/HashSyntax:
     - 'app/helpers/spree/admin/navigation_helper_decorator.rb'
     - 'app/helpers/spree/admin/orders_helper_decorator.rb'
     - 'app/mailers/enterprise_mailer.rb'
-    - 'app/mailers/spree/order_mailer_decorator.rb'
     - 'app/mailers/spree/user_mailer_decorator.rb'
     - 'app/models/billable_period.rb'
     - 'app/models/calculator/flat_percent_per_item.rb'
@@ -1932,7 +1849,6 @@ Style/HashSyntax:
     - 'app/models/enterprise_group.rb'
     - 'app/models/enterprise_role.rb'
     - 'app/models/exchange_variant.rb'
-    - 'app/models/open_food_network/calculator/weight.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/product_distribution.rb'
     - 'app/models/spree/adjustment_decorator.rb'
@@ -1963,7 +1879,6 @@ Style/HashSyntax:
     - 'app/overrides/set_auth_token_in_frontend.rb'
     - 'app/presenters/variant_presenter.rb'
     - 'app/serializers/api/admin/enterprise_fee_serializer.rb'
-    - 'app/serializers/api/enterprise_serializer.rb'
     - 'app/views/api/order_cycles/bulk_show.v1.rabl'
     - 'app/views/json/_order_cycle.rabl'
     - 'app/views/json/partials/_hub.rabl'
@@ -1987,8 +1902,6 @@ Style/HashSyntax:
     - 'spec/controllers/admin/stripe_connect_settings_controller_spec.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
-    - 'spec/controllers/cart_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/admin/payment_methods_controller_spec.rb'
     - 'spec/controllers/spree/admin/payments_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
@@ -2022,7 +1935,6 @@ Style/HashSyntax:
     - 'spec/lib/open_food_network/order_grouper_spec.rb'
     - 'spec/lib/open_food_network/tag_rule_applicator_spec.rb'
     - 'spec/mailers/order_mailer_spec.rb'
-    - 'spec/models/calculator/weight_spec.rb'
     - 'spec/models/enterprise_fee_spec.rb'
     - 'spec/models/enterprise_spec.rb'
     - 'spec/models/exchange_spec.rb'
@@ -2077,7 +1989,6 @@ Style/MethodCallWithoutArgsParentheses:
   Exclude:
     - 'app/controllers/spree/admin/payment_methods_controller_decorator.rb'
     - 'app/views/json/_groups.rabl'
-    - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/features/consumer/registration_spec.rb'
     - 'spec/models/spree/payment_method_spec.rb'
     - 'spec/support/request/ui_component_helper.rb'
@@ -2178,7 +2089,7 @@ Style/NumericLiteralPrefix:
   Exclude:
     - 'spec/features/admin/order_cycles_spec.rb'
 
-# Offense count: 13
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
@@ -2215,14 +2126,13 @@ Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/controllers/checkout_controller.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
   Exclude:
     - 'app/controllers/spree/orders_controller_decorator.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
 
 # Offense count: 18
 # Cop supports --auto-correct.
@@ -2280,7 +2190,7 @@ Style/RedundantReturn:
     - 'app/models/spree/classification_decorator.rb'
     - 'app/serializers/api/admin/enterprise_serializer.rb'
 
-# Offense count: 96
+# Offense count: 95
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
@@ -2288,7 +2198,6 @@ Style/RedundantSelf:
     - 'app/models/calculator/flat_percent_per_item.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/exchange.rb'
-    - 'app/models/open_food_network/calculator/weight.rb'
     - 'app/models/order_cycle.rb'
     - 'app/models/producer_property.rb'
     - 'app/models/spree/calculator/flat_percent_item_total_decorator.rb'
@@ -2328,15 +2237,14 @@ Style/RegexpLiteral:
     - 'spec/mailers/subscription_mailer_spec.rb'
     - 'spec/models/content_configuration_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Exclude:
     - 'app/controllers/application_controller.rb'
-    - 'app/controllers/spree/admin/orders_controller_decorator.rb'
     - 'lib/tasks/data.rake'
 
-# Offense count: 268
+# Offense count: 266
 Style/Send:
   Exclude:
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -2412,7 +2320,7 @@ Style/StructInheritance:
   Exclude:
     - 'lib/open_food_network/enterprise_fee_applicator.rb'
 
-# Offense count: 93
+# Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
@@ -2436,7 +2344,6 @@ Style/SymbolProc:
     - 'lib/open_food_network/reports/bulk_coop_supplier_report.rb'
     - 'lib/spree/product_filters.rb'
     - 'spec/controllers/api/order_cycles_controller_spec.rb'
-    - 'spec/controllers/spree/admin/orders_controller_spec.rb'
     - 'spec/controllers/spree/api/products_controller_spec.rb'
     - 'spec/controllers/spree/api/variants_controller_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'

.travis.yml

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

GETTING_STARTED.md

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

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 gem 'rails', '~> 3.2.22'
 gem 'rails-i18n', '~> 3.0.0'
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.0.0'
+gem 'i18n-js', '~> 3.1.0'
 
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
@@ -13,7 +13,7 @@ gem 'nokogiri', '>= 1.6.7.1'
 gem 'web', path: './engines/web'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '69db1c090f3711088d84b524f1b94d25e6d21616'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '41906362d931695e0616194341a68d2c4c85aaaf'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
 
@@ -22,13 +22,13 @@ gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch:
 # - Change type of password from string to password to hide it in the form
 gem 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "spree-upgrade-intermediate"
 #gem 'spree_paypal_express', github: "spree-contrib/better_spree_paypal_express", branch: "1-3-stable"
-gem 'stripe', '~> 3.3.2'
+gem 'stripe', '~> 4.5.0'
 # We need at least this version to have Digicert's root certificate
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78'
 
-gem 'oauth2', '~> 1.2.0' # Used for Stripe Connect
-gem 'jwt', '~> 1.5'
+gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect
+gem 'jwt', '~> 2.1'
 
 gem 'delayed_job_active_record'
 gem 'daemons'
@@ -63,15 +63,16 @@ gem 'spinjs-rails'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'rack-rewrite'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
-gem 'angularjs-file-upload-rails', '~> 1.1.6'
-gem 'roadie-rails', '~> 1.0.3'
+gem 'angularjs-file-upload-rails', '~> 2.4.1'
+gem 'roadie-rails', '~> 1.1.1'
 gem 'figaro'
 gem 'blockenspiel'
 gem 'acts-as-taggable-on', '~> 3.4'
-gem 'paper_trail', '~> 3.0.8'
+gem 'paper_trail', '~> 5.2.3'
 gem 'diffy'
 gem 'skylight', '< 2.0'
 
+gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
@@ -88,10 +89,7 @@ group :assets do
   gem 'compass-rails'
   gem 'coffee-rails', '~> 3.2.1'
 
-  gem 'mini_racer'
-  # We found that the following version of libv8 breaks the compilation of mini_racer.
-  # Nothing else depends on libv8.
-  gem 'libv8', '!= 6.7.288.46.1'
+  gem 'therubyracer', '=0.12.0'
 
   gem 'uglifier', '>= 1.0.3'
 
@@ -120,7 +118,8 @@ group :test, :development do
   gem 'awesome_print'
   gem 'letter_opener', '>= 1.4.1'
   gem 'timecop'
-  gem 'poltergeist', '>= 1.16.0'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
   gem 'rspec-retry'
   gem 'json_spec', '~> 1.1.4'
   gem 'unicorn-rails'
@@ -145,9 +144,13 @@ group :development do
   gem 'guard-rails'
   gem 'guard-rspec', '~> 4.7.3'
   gem 'rubocop', '>= 0.49.1'
+  gem 'spring', '1.7.2'
+  gem 'spring-commands-rspec'
 
   # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
   # While we don't require this gem directly, no dependents forced the upgrade to a version
   # greater than 1.0.9, so we just required the latest available version here.
   gem 'eventmachine', '>= 1.2.3'
+
+  gem 'rack-mini-profiler', '< 1.0.0'
 end

Gemfile.lock

@@ -31,8 +31,8 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 69db1c090f3711088d84b524f1b94d25e6d21616
-  ref: 69db1c090f3711088d84b524f1b94d25e6d21616
+  revision: 41906362d931695e0616194341a68d2c4c85aaaf
+  ref: 41906362d931695e0616194341a68d2c4c85aaaf
   branch: step-6a
   specs:
     spree (1.3.99)
@@ -186,14 +186,16 @@ GEM
       railties (>= 3.1)
       sprockets (~> 2.0)
       tilt
-    angularjs-file-upload-rails (1.1.6)
+    angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.5.5)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
     arel (3.0.3)
     ast (2.4.0)
     atomic (1.1.101)
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
-    awesome_print (1.0.2)
+    awesome_print (1.8.0)
     aws-sdk (1.11.1)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -201,7 +203,7 @@ GEM
     bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    blockenspiel (0.4.5)
+    blockenspiel (0.5.0)
     bugsnag (4.1.0)
     builder (3.0.4)
     byebug (9.0.6)
@@ -213,10 +215,14 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.1.0)
+      archive-zip (~> 0.7.0)
+      nokogiri (~> 1.6)
     chronic (0.10.2)
     chunky_png (1.3.10)
-    climate_control (0.1.0)
-    cliver (0.3.2)
+    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
@@ -228,6 +234,8 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.8.1)
+    combine_pdf (1.0.15)
+      ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -244,11 +252,12 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.3.5)
+    css_parser (1.6.0)
       addressable
-    daemons (1.2.2)
+    daemons (1.3.1)
     dalli (2.7.2)
     database_cleaner (0.7.1)
     db2fog (0.9.0)
@@ -256,10 +265,10 @@ GEM
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
     debugger-linecache (1.2.0)
-    delayed_job (4.1.4)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
+    delayed_job_active_record (4.1.3)
+      activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
@@ -269,7 +278,7 @@ GEM
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     diff-lcs (1.3)
-    diffy (3.1.0)
+    diffy (3.3.0)
     docile (1.3.1)
     dry-inflector (0.1.2)
     em-websocket (0.5.1)
@@ -284,7 +293,7 @@ GEM
     factory_bot_rails (4.8.2)
       factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffaker (1.15.0)
     ffi (1.9.25)
@@ -444,18 +453,18 @@ GEM
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foundation-rails (5.5.0.0)
+    foundation-rails (5.5.2.1)
       railties (>= 3.1.0)
-      sass (>= 3.2.0, < 3.4)
+      sass (>= 3.3.0, < 3.5)
     fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
-    guard (2.14.1)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -484,10 +493,11 @@ GEM
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.11)
-    i18n-js (3.0.11)
+    i18n-js (3.1.0)
       i18n (>= 0.6.6, < 2)
     immigrant (0.3.6)
       activerecord (>= 3.0)
+    io-like (0.3.0)
     ipaddress (0.8.3)
     jaro_winkler (1.5.1)
     journey (1.0.4)
@@ -499,33 +509,31 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    kgio (2.9.3)
-    knapsack (1.16.0)
+    kgio (2.11.2)
+    knapsack (1.17.1)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.6.0)
+    letter_opener (1.7.0)
       launchy (~> 2.2)
-    libv8 (6.3.292.48.1)
+    libv8 (3.16.14.19)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (1.25.1)
     mini_mime (1.0.1)
     mini_portile2 (2.1.0)
-    mini_racer (0.1.15)
-      libv8 (~> 6.3)
-    momentjs-rails (2.5.1)
+    momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.0)
       i18n (~> 0.6.0)
@@ -533,22 +541,24 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.6.10)
+    oj (3.7.8)
     orm_adapter (0.5.0)
-    paper_trail (3.0.9)
-      activerecord (>= 3.0, < 5.0)
-      activesupport (>= 3.0, < 5.0)
+    paper_trail (5.2.3)
+      activerecord (>= 3.0, < 6.0)
+      request_store (~> 1.1)
     paperclip (3.5.4)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -563,15 +573,11 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.21.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
-    pry (0.11.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.4.3)
@@ -584,6 +590,8 @@ GEM
     rack (1.4.7)
     rack-cache (1.8.0)
       rack (>= 0.4)
+    rack-mini-profiler (0.10.7)
+      rack (>= 1.2.0)
     rack-rewrite (1.5.1)
     rack-ssl (1.3.4)
       rack
@@ -608,8 +616,8 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.13.0)
-    rake (12.3.1)
+    raindrops (0.19.0)
+    rake (12.3.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -624,13 +632,16 @@ GEM
       trollop (~> 2.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.2.3)
-    roadie (3.0.1)
-      css_parser (~> 1.3.4)
-      nokogiri (~> 1.6.0)
-    roadie-rails (1.0.3)
-      rails (>= 3.0, < 4.2)
-      roadie (~> 3.0)
+    redcarpet (3.4.0)
+    ref (2.0.0)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    roadie (3.4.0)
+      css_parser (~> 1.4)
+      nokogiri (~> 1.5)
+    roadie-rails (1.1.1)
+      railties (>= 3.0, < 5.1)
+      roadie (~> 3.1)
     roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
@@ -638,29 +649,29 @@ GEM
       nokogiri
       roo (>= 2.0.0beta1, < 3)
       spreadsheet (> 0.9.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
-    rspec-support (3.7.1)
+    rspec-support (3.8.0)
     rubocop (0.57.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -671,6 +682,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.10.0)
+    ruby-rc4 (0.1.5)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sass (3.3.14)
@@ -680,6 +692,9 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.5.10)
       thor (~> 0.14)
+    selenium-webdriver (3.12.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
@@ -688,12 +703,15 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    skylight (1.6.1)
+    skylight (1.7.2)
       activesupport (>= 3.0.0)
     spinjs-rails (1.3)
       rails (>= 3.1)
     spreadsheet (1.1.4)
       ruby-ole (>= 1.0)
+    spring (1.7.2)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -701,9 +719,13 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     state_machine (1.2.0)
     stringex (1.3.3)
-    stripe (3.3.2)
-      faraday (~> 0.9)
-    thor (0.20.0)
+    stripe (4.5.0)
+      faraday (~> 0.13)
+      net-http-persistent (~> 3.0)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.20.3)
     tilt (1.4.1)
     timecop (0.9.1)
     treetop (1.4.15)
@@ -711,18 +733,17 @@ GEM
       polyglot (>= 0.3.1)
     trollop (2.9.9)
     truncate_html (0.9.2)
-    turbo-sprockets-rails3 (0.3.6)
+    turbo-sprockets-rails3 (0.3.14)
       railties (> 3.2.8, < 4.0.0)
-      sprockets (>= 2.0.0)
-    tzinfo (0.3.54)
-    uglifier (4.1.19)
+      sprockets (>= 2.2.0)
+    tzinfo (0.3.55)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.2)
-    unicorn (4.9.0)
+    unicorn (5.4.1)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    unicorn-rails (1.1.0)
+    unicorn-rails (2.2.1)
       rack
       unicorn
     uuidtools (2.1.5)
@@ -732,18 +753,14 @@ GEM
       railties (>= 3.0)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    whenever (0.9.2)
-      activesupport (>= 2.3.4)
+    whenever (0.10.0)
       chronic (>= 0.6.3)
     wicked_pdf (1.1.0)
-    wkhtmltopdf-binary (0.12.3.1)
+    wkhtmltopdf-binary (0.12.4)
     xml-simple (1.1.5)
     xpath (2.1.0)
       nokogiri (~> 1.3)
@@ -757,7 +774,7 @@ DEPENDENCIES
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.3.0)
-  angularjs-file-upload-rails (~> 1.1.6)
+  angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.5.5)
   atomic
   awesome_print
@@ -766,7 +783,9 @@ DEPENDENCIES
   bugsnag
   byebug (~> 9.0.0)
   capybara (>= 2.15.4)
+  chromedriver-helper
   coffee-rails (~> 3.2.1)
+  combine_pdf
   compass-rails
   custom_error_message!
   daemons
@@ -793,34 +812,32 @@ DEPENDENCIES
   guard-rspec (~> 4.7.3)
   haml
   i18n (~> 0.6.11)
-  i18n-js (~> 3.0.0)
+  i18n-js (~> 3.1.0)
   immigrant
   jquery-migrate-rails
   jquery-rails
   json_spec (~> 1.1.4)
-  jwt (~> 1.5)
+  jwt (~> 2.1)
   knapsack
   letter_opener (>= 1.4.1)
-  libv8 (!= 6.7.288.46.1)
   listen (= 3.0.8)
-  mini_racer
   momentjs-rails
   nokogiri (>= 1.6.7.1)
-  oauth2 (~> 1.2.0)
+  oauth2 (~> 1.4.1)
   ofn-qz!
   oj
-  paper_trail (~> 3.0.8)
+  paper_trail (~> 5.2.3)
   paperclip
   pg
-  poltergeist (>= 1.16.0)
   pry-byebug (>= 3.4.3)
   rabl
+  rack-mini-profiler (< 1.0.0)
   rack-rewrite
   rack-ssl
   rails (~> 3.2.22)
   rails-i18n (~> 3.0.0)
   redcarpet
-  roadie-rails (~> 1.0.3)
+  roadie-rails (~> 1.1.1)
   roo (~> 2.7.0)
   roo-xls (~> 1.1.0)
   rspec-rails (>= 3.5.2)
@@ -828,6 +845,7 @@ DEPENDENCIES
   rubocop (>= 0.49.1)
   sass (~> 3.3)
   sass-rails (~> 3.2.3)
+  selenium-webdriver
   shoulda-matchers
   simple_form!
   simplecov
@@ -837,7 +855,10 @@ DEPENDENCIES
   spree_auth_devise!
   spree_i18n!
   spree_paypal_express!
-  stripe (~> 3.3.2)
+  spring (= 1.7.2)
+  spring-commands-rspec
+  stripe (~> 4.5.0)
+  therubyracer (= 0.12.0)
   timecop
   truncate_html
   turbo-sprockets-rails3
@@ -854,4 +875,4 @@ RUBY VERSION
    ruby 2.1.5p273
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

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

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

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

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

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

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

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

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

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

@@ -26,8 +26,19 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
       $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
 
-    RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
-    RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
+    RequestMonitor.load $scope.orders = Orders.index(
+      "q[state_not_eq]": "canceled",
+      "q[completed_at_not_null]": "true",
+      "q[completed_at_gteq]": "#{moment($scope.startDate).format()}",
+      "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}"
+    )
+
+    RequestMonitor.load $scope.lineItems = LineItems.index(
+      "q[order][state_not_eq]": "canceled",
+      "q[order][completed_at_not_null]": "true",
+      "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}",
+      "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}"
+    )
 
     unless $scope.initialized
       RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])

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

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

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

@@ -1,4 +1,4 @@
-angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, Orders, SortOptions) ->
+angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, Orders, SortOptions, $window, $filter) ->
   $scope.RequestMonitor = RequestMonitor
   $scope.pagination = Orders.pagination
   $scope.orders = Orders.all
@@ -8,6 +8,11 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
     {id: 50, name: t('js.admin.orders.index.per_page', results: 50)},
     {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
   ]
+  $scope.selected_orders = []
+  $scope.checkboxes = {}
+  $scope.selected = false
+  $scope.select_all = false
+  $scope.poll = 0
 
   $scope.initialise = ->
     $scope.per_page = 15
@@ -17,24 +22,46 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor,
     $scope.fetchResults()
 
   $scope.fetchResults = (page=1) ->
+    $scope.resetSelected()
     Orders.index({
-      'q[created_at_lt]': $scope['q']['created_at_lt'],
-      'q[created_at_gt]': $scope['q']['created_at_gt'],
+      'q[completed_at_lt]': $scope['q']['completed_at_lt'],
+      'q[completed_at_gt]': $scope['q']['completed_at_gt'],
       'q[state_eq]': $scope['q']['state_eq'],
       'q[number_cont]': $scope['q']['number_cont'],
       'q[email_cont]': $scope['q']['email_cont'],
       'q[bill_address_firstname_start]': $scope['q']['bill_address_firstname_start'],
       'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
-      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'],
-      'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_null'],
+      # Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
+      'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
+      'q[inventory_units_shipment_id_null]': $scope['q']['inventory_units_shipment_id_null'] || null,
       'q[distributor_id_in]': $scope['q']['distributor_id_in'],
       'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
       'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
-      'q[s]': $scope.sorting || 'id desc',
+      'q[s]': $scope.sorting || 'completed_at desc',
       per_page: $scope.per_page,
       page: page
     })
 
+  $scope.resetSelected = ->
+    $scope.selected_orders.length = 0
+    $scope.selected = false
+    $scope.select_all = false
+    $scope.checkboxes = {}
+
+  $scope.toggleSelection = (id) ->
+    index = $scope.selected_orders.indexOf(id)
+
+    if index == -1
+      $scope.selected_orders.push(id)
+    else
+      $scope.selected_orders.splice(index, 1)
+
+  $scope.toggleAll = ->
+    $scope.selected_orders.length = 0
+    $scope.orders.forEach (order) ->
+      $scope.checkboxes[order.id] = $scope.select_all
+      $scope.selected_orders.push order.id if $scope.select_all
+
   $scope.$watch 'sortOptions', (sort) ->
     if sort && sort.predicate != ""
       $scope.sorting = sort.predicate + ' desc' if sort.reverse

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

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

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

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

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

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

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

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

app/assets/javascripts/admin/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/utils/directives/variant_autocomplete.js.coffee

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/stylesheets/admin/all.scss

@@ -17,4 +17,3 @@
 @import 'variables';
 @import 'components/*';
 @import '*';
-@import 'pages/*';

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

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

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

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

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

@@ -103,3 +103,34 @@ table.index td.actions {
     font-size: 1.2em;
   }
 }
+
+.index-controls {
+
+  button {
+    float: right;
+
+    &:disabled {
+      background-color: $disabled-button;
+    }
+  }
+}
+
+.simple-modal {
+  text-align: center;
+
+  .modal-title {
+    margin-bottom: 1.5em;
+  }
+
+  .message, .error {
+    margin-bottom: 1em;
+  }
+
+  .spinner {
+    margin-bottom: 1em;
+  }
+
+  .error {
+    color: $warning-red;
+  }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/controllers/admin/enterprise_fees_controller.rb

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

app/controllers/admin/product_import_controller.rb

@@ -16,8 +16,7 @@ module Admin
       @original_filename = params[:file].try(:original_filename)
       @non_updatable_fields = ProductImport::EntryValidator.non_updatable_fields
 
-      check_file_errors @importer
-      check_spreadsheet_has_data @importer
+      return if contains_errors? @importer
 
       @ams_data = ams_data
     end
@@ -63,15 +62,19 @@ module Admin
       true
     end
 
-    def check_file_errors(importer)
+    def contains_errors?(importer)
       if importer.errors.present?
         redirect_to '/admin/product_import', notice: @importer.errors.full_messages.to_sentence
+        return true
       end
+
+      check_spreadsheet_has_data importer
     end
 
     def check_spreadsheet_has_data(importer)
       unless importer.item_count
         redirect_to '/admin/product_import', notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
+        true
       end
     end
 

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/api/enterprise_fees_controller.rb

@@ -0,0 +1,21 @@
+module Api
+  class EnterpriseFeesController < BaseController
+    respond_to :json
+
+    def destroy
+      authorize! :destroy, enterprise_fee
+
+      if enterprise_fee.destroy
+        render text: I18n.t(:successfully_removed), status: 204
+      else
+        render text: enterprise_fee.errors.full_messages.first, status: 403
+      end
+    end
+
+    private
+
+    def enterprise_fee
+      @enterprise_fee ||= EnterpriseFee.find_by_id params[:id]
+    end
+  end
+end

app/controllers/cart_controller.rb

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

app/controllers/checkout_controller.rb

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

app/controllers/enterprises_controller.rb

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

app/controllers/shops_controller.rb

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

app/controllers/spree/admin/invoices_controller.rb

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

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -37,8 +37,10 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def invoice
-    template = if Spree::Config.invoice_style2? then "spree/admin/orders/invoice2" else "spree/admin/orders/invoice" end
-    pdf = render_to_string pdf: "invoice-#{@order.number}.pdf", template: template, formats: [:html], encoding: "UTF-8"
+    pdf = render_to_string pdf: "invoice-#{@order.number}.pdf",
+                           template: invoice_template,
+                           formats: [:html], encoding: "UTF-8"
+
     Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
     flash[:success] = t('admin.orders.invoice_email_sent')
 
@@ -46,8 +48,7 @@ Spree::Admin::OrdersController.class_eval do
   end
 
   def print
-    template = if Spree::Config.invoice_style2? then "spree/admin/orders/invoice2" else "spree/admin/orders/invoice" end
-    render pdf: "invoice-#{@order.number}", template: template, encoding: "UTF-8"
+    render pdf: "invoice-#{@order.number}", template: invoice_template, encoding: "UTF-8"
   end
 
   def print_ticket
@@ -60,6 +61,10 @@ 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/api/products_controller_decorator.rb

@@ -76,7 +76,11 @@ Spree::Api::ProductsController.class_eval do
   end
 
   def render_paged_products(products)
-    render text: { products: ActiveModel::ArraySerializer.new(products, each_serializer: Api::Admin::ProductSerializer), pages: products.num_pages }.to_json
-  end
+    serializer = ActiveModel::ArraySerializer.new(
+      products,
+      each_serializer: Api::Admin::ProductSerializer
+    )
 
+    render text: { products: serializer, pages: products.num_pages }.to_json
+  end
 end

app/controllers/user_registrations_controller.rb

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

app/helpers/checkout_helper.rb

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

app/helpers/enterprises_helper.rb

@@ -55,7 +55,7 @@ module EnterprisesHelper
     if enterprise.sells == 'none'
       enterprise.producer_profile_only ? I18n.t(:profile) : I18n.t(:supplier_only)
     else
-      "Has Shopfront"
+      I18n.t(:has_shopfront)
     end
   end
 

app/helpers/i18n_helper.rb

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

app/helpers/injection_helper.rb

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

app/mailers/enterprise_mailer.rb

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

app/mailers/producer_mailer.rb

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

app/mailers/spree/order_mailer_decorator.rb

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

app/mailers/spree/user_mailer_decorator.rb

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

app/mailers/subscription_mailer.rb

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

app/models/calculator/weight.rb

@@ -0,0 +1,16 @@
+module Calculator
+  class Weight < Spree::Calculator
+    preference :per_kg, :decimal, default: 0.0
+    attr_accessible :preferred_per_kg
+
+    def self.description
+      I18n.t('spree.weight')
+    end
+
+    def compute(object)
+      line_items = line_items_for object
+      total_weight = line_items.sum { |li| ((li.variant.andand.weight || 0) * li.quantity) }
+      total_weight * preferred_per_kg
+    end
+  end
+end

app/models/concerns/stock_settings_override_validation.rb

@@ -0,0 +1,41 @@
+module StockSettingsOverrideValidation
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :require_compatible_on_demand_and_count_on_hand
+  end
+
+  def require_compatible_on_demand_and_count_on_hand
+    disallow_count_on_hand_if_using_producer_stock_settings
+    disallow_count_on_hand_if_on_demand
+    require_count_on_hand_if_limited_stock
+  end
+
+  def disallow_count_on_hand_if_using_producer_stock_settings
+    return unless on_demand.nil? && count_on_hand.present?
+
+    error_message = I18n.t("count_on_hand.using_producer_stock_settings_but_count_on_hand_set",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def disallow_count_on_hand_if_on_demand
+    return unless on_demand? && count_on_hand.present?
+
+    error_message = I18n.t("count_on_hand.on_demand_but_count_on_hand_set",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def require_count_on_hand_if_limited_stock
+    return unless on_demand == false && count_on_hand.blank?
+
+    error_message = I18n.t("count_on_hand.limited_stock_but_no_count_on_hand",
+                           scope: i18n_scope_for_stock_settings_override_validation_error)
+    errors.add(:count_on_hand, error_message)
+  end
+
+  def i18n_scope_for_stock_settings_override_validation_error
+    "activerecord.errors.models.#{self.class.name.underscore}"
+  end
+end

app/models/enterprise.rb

@@ -80,8 +80,6 @@ class Enterprise < ActiveRecord::Base
   before_validation :set_unused_address_fields
   after_validation :geocode_address
 
-  validates :instagram, format: /\A@[a-zA-Z0-9._]{1,30}\z/, allow_blank: true
-
   after_touch :touch_distributors
   after_create :set_default_contact
   after_create :relate_to_owners_enterprises
@@ -332,10 +330,6 @@ class Enterprise < ActiveRecord::Base
     abn.present?
   end
 
-  def instagram=(value)
-    write_attribute(:instagram, value.try(:gsub, instagram_regex, '@\1'))
-  end
-
   protected
 
   def devise_mailer
@@ -344,10 +338,6 @@ class Enterprise < ActiveRecord::Base
 
   private
 
-  def instagram_regex
-    %r{\A(?:https?://)?(?:www\.)?instagram\.com/([a-zA-Z0-9._]{1,30})/?\z}
-  end
-
   def name_is_unique
     dups = Enterprise.where(name: name)
     dups = dups.where('id != ?', id) unless new_record?

app/models/enterprise_fee.rb

@@ -26,6 +26,7 @@ class EnterpriseFee < ActiveRecord::Base
   validates_presence_of :name
 
   before_save :ensure_valid_tax_category_settings
+  before_destroy :ensure_no_product_distributions
 
   scope :for_enterprise, lambda { |enterprise| where(enterprise_id: enterprise) }
   scope :for_enterprises, lambda { |enterprises| where(enterprise_id: enterprises) }
@@ -68,6 +69,15 @@ class EnterpriseFee < ActiveRecord::Base
     return true
   end
 
+  def ensure_no_product_distributions
+    dependent_distribution = ProductDistribution.where(enterprise_fee_id: self).first
+    return unless dependent_distribution
+    product = dependent_distribution.product
+    error = I18n.t(:enterprise_fees_destroy_error, id: product.id, name: product.name)
+    errors.add(:base, error)
+    false
+  end
+
   def refresh_products_cache
     OpenFoodNetwork::ProductsCache.enterprise_fee_changed self
   end

app/models/open_food_network/calculator/weight.rb

@@ -1,29 +0,0 @@
-module OpenFoodNetwork
-  class Calculator::Weight < Spree::Calculator
-    preference :per_kg, :decimal, :default => 0.0
-    attr_accessible :preferred_per_kg
-
-    def self.description
-      I18n.t('spree.weight')
-    end
-
-    def compute(object)
-      line_items = line_items_for object
-      total_weight = line_items.sum { |li| ((li.variant.andand.weight || 0) * li.quantity) }
-      total_weight * self.preferred_per_kg
-    end
-
-
-    private
-
-    def line_items_for(object)
-      if object.respond_to? :line_items
-        object.line_items
-      elsif object.respond_to?(:variant) && object.respond_to?(:quantity)
-        [object]
-      else
-        raise "Unknown object type: #{object.inspect}"
-      end
-    end
-  end
-end

app/models/product_import/entry_validator.rb

@@ -68,6 +68,18 @@ module ProductImport
 
     private
 
+    def find_or_initialize_variant_override(entry, existing_variant)
+      existing_variant_override = VariantOverride.where(
+        variant_id: existing_variant.id,
+        hub_id: entry.enterprise_id
+      ).first
+
+      existing_variant_override || VariantOverride.new(
+        variant_id: existing_variant.id,
+        hub_id: entry.enterprise_id
+      )
+    end
+
     def enterprise_validation(entry)
       return if name_presence_error entry
       return if enterprise_not_found_error entry
@@ -310,21 +322,12 @@ module ProductImport
     end
 
     def create_inventory_item(entry, existing_variant)
-      existing_variant_override = VariantOverride.where(
-        variant_id: existing_variant.id,
-        hub_id: entry.enterprise_id
-      ).first
+      find_or_initialize_variant_override(entry, existing_variant).tap do |variant_override|
+        check_variant_override_stock_settings(entry, variant_override)
 
-      variant_override = existing_variant_override || VariantOverride.new(
-        variant_id: existing_variant.id,
-        hub_id: entry.enterprise_id
-      )
-
-      variant_override.assign_attributes(count_on_hand: entry.on_hand, import_date: @import_time)
-      check_on_hand_nil(entry, variant_override)
-      variant_override.assign_attributes(entry.attributes.slice('price', 'on_demand'))
-
-      variant_override
+        variant_override.assign_attributes(import_date: @import_time)
+        variant_override.assign_attributes(entry.attributes.slice('price', 'on_demand'))
+      end
     end
 
     def mark_as_inventory_item(entry, variant_override)
@@ -355,5 +358,11 @@ module ProductImport
       object.count_on_hand = 0 if object.respond_to?(:count_on_hand)
       entry.on_hand_nil = true
     end
+
+    def check_variant_override_stock_settings(entry, object)
+      object.count_on_hand = entry.on_hand.presence
+      object.on_demand = object.count_on_hand.blank? if entry.on_demand.blank?
+      entry.on_hand_nil = object.count_on_hand.blank?
+    end
   end
 end

app/models/product_import/product_importer.rb

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

app/models/spree/ability_decorator.rb

@@ -210,7 +210,10 @@ class AbilityDecorator
       # during the order creation process from the admin backend
       order.distributor.nil? || user.enterprises.include?(order.distributor) || order.order_cycle.andand.coordinated_by?(user)
     end
-    can [:admin, :bulk_management, :managed], Spree::Order if user.admin? || user.enterprises.any?(&:is_distributor)
+    can [:admin, :bulk_management, :managed], Spree::Order do
+      user.admin? || user.enterprises.any?(&:is_distributor)
+    end
+    can [:admin, :create, :show, :poll], :invoice
     can [:admin, :visible], Enterprise
     can [:admin, :index, :create, :update, :destroy], :line_item
     can [:admin, :index, :create], Spree::LineItem

app/models/spree/adjustment_decorator.rb

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

app/models/spree/calculator_decorator.rb

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

app/models/spree/order_decorator.rb

@@ -293,7 +293,7 @@ Spree::Order.class_eval do
 
   def tax_adjustment_totals
     tax_adjustments.each_with_object(Hash.new) do |adjustment, hash|
-      tax_rates = adjustment.tax_rates
+      tax_rates = TaxRateFinder.tax_rates_of(adjustment)
       tax_rates_hash = Hash[tax_rates.collect do |tax_rate|
         tax_amount = tax_rates.one? ? adjustment.included_tax : tax_rate.compute_tax(adjustment.amount)
         [tax_rate, tax_amount]

app/models/spree/property_decorator.rb

@@ -26,6 +26,9 @@ module Spree
     # When a Property is destroyed, dependent-destroy will destroy all ProductProperties,
     # which will take care of refreshing the products cache
 
+    def property
+      self
+    end
 
     private
 

app/models/variant_override.rb

@@ -1,5 +1,6 @@
 class VariantOverride < ActiveRecord::Base
   extend Spree::LocalizedNumber
+  include StockSettingsOverrideValidation
 
   acts_as_taggable
 
@@ -82,7 +83,7 @@ class VariantOverride < ActiveRecord::Base
   def reset_stock!
     if resettable
       if default_stock?
-        self.attributes = { count_on_hand: default_stock }
+        self.attributes = { on_demand: false, count_on_hand: default_stock }
         self.save
       else
         Bugsnag.notify RuntimeError.new "Attempting to reset stock level for a variant with no default stock level."

app/overrides/spree/admin/orders/_form/add_distribution_fields.html.haml.deface

@@ -1,3 +0,0 @@
-/ insert_before "[data-hook='admin_order_form_buttons']"
-
-= render partial: 'spree/admin/orders/_form/distribution_fields'

app/overrides/spree/admin/orders/_form/hide_form_until_distribution.deface

@@ -1,2 +0,0 @@
-add_to_attributes "table.index, [data-hook='admin_order_form_buttons']"
-attributes "ng-show" => "distributionChosen()"

app/overrides/spree/admin/orders/_form/relabel_update_button.html.haml.deface

@@ -1,3 +0,0 @@
-/ replace "code[erb-loud]:contains('button t(:update)')"
-
-= button t(:update_and_recalculate_fees), 'icon-refresh'

app/overrides/spree/admin/orders/_line_item/replace_variant_label.html.haml.deface

@@ -1,3 +0,0 @@
-/ replace 'code[erb-loud]:contains(\'"(#{f.object.variant.options_text})"\')'
-
-= "(#{f.object.full_name})"

app/overrides/spree/admin/orders/_line_item/replace_variant_price.html.haml.deface

@@ -1,3 +0,0 @@
-/ replace 'code[erb-loud]:contains(\'f.object.variant.display_amount\')'
-
-= f.object.single_money

app/overrides/spree/admin/orders/edit/add_action_dropdown.html.haml.deface

@@ -1,6 +0,0 @@
-/ insert_after "code[erb-loud]:contains('button_link_to t(:resend)')"
-
-%li.links-dropdown#links-dropdown{ links: order_links(@order).to_json }
-
-:coffee
-  angular.bootstrap(document.getElementById("links-dropdown"),['admin.dropdown'])

app/overrides/spree/admin/orders/edit/suppress_errors.html.haml.deface

@@ -1,6 +0,0 @@
-/ replace "code[erb-loud]:contains(\'error_messages\')"
-
--# Suppress errors when manually creating a new order - needs to proceed to edit page
--# without having line items (which otherwise gives a validation error)
-- unless params["suppress_error_msg"]
-  = render partial: "spree/shared/error_messages", :locals => { :target => @order }

app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface

@@ -1 +0,0 @@
-remove "div.clear"

app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface

@@ -1,5 +0,0 @@
-/ insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")"
-
-.one.column  
-= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :payment_method }
-.clear

app/overrides/spree/admin/payment_methods/edit/add_new_payment_method_button.html.haml.deface

@@ -1,4 +0,0 @@
-/ insert_after "code[erb-silent]:contains('content_for :page_actions do')"
-
-%li
-  = button_link_to t(:new), spree.new_admin_payment_method_path, :icon => 'icon-plus' %>

app/overrides/spree/admin/payment_methods/edit/remove_configuration_sidebar.deface

@@ -1 +0,0 @@
-remove "code[erb-loud]:contains(\"render :partial => 'spree/admin/shared/configuration_menu'\")"

app/overrides/spree/admin/payment_methods/new/add_hubs_sidebar.html.haml.deface

@@ -1,5 +0,0 @@
-/ insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")"
-
-.one.column  
-= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :payment_method }
-.clear

app/overrides/spree/admin/payment_methods/new/remove_configuration_sidebar.deface

@@ -1 +0,0 @@
-remove "code[erb-loud]:contains(\"render :partial => 'spree/admin/shared/configuration_menu'\")"

app/overrides/spree/admin/products/_form/add_description_wysiwyg.html.haml.deface

@@ -1,3 +0,0 @@
-/ replace "[data-hook=admin_product_form_left] code[erb-loud]:contains('f.text_area :description')"
-%text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"}
-  = sanitize(@product.description)

app/overrides/spree/admin/products/_form/add_primary_taxon_field.html.haml.deface

@@ -1,3 +0,0 @@
-/ insert_after "div[class='variant_units_form']"
-
-= render 'spree/admin/products/primary_taxon_form', f: f

app/overrides/spree/admin/products/_form/add_supplier.html.haml.deface

@@ -1,6 +0,0 @@
-/ insert_before "code[erb-loud]:contains('f.field_container :price')"
-= f.field_container :supplier do
-  = f.label :supplier, t(:spree_admin_supplier)
-  %br
-  = f.collection_select(:supplier_id, @producers, :id, :name, {:include_blank => true}, {:class => "select2"})
-  = f.error_message_on :supplier

app/overrides/spree/admin/products/_form/add_units_form.html.haml.deface

@@ -1,17 +0,0 @@
-/ insert_top "[data-hook='admin_product_form_right']"
-
-.variant_units_form{ 'ng-app' => 'admin.products', 'ng-controller' => 'editUnitsCtrl' }
-
-  = f.field_container :units do
-    = f.label :variant_unit_with_scale, t(:spree_admin_variant_unit_scale)
-    %select.select2.fullwidth{ id: 'product_variant_unit_with_scale', 'ng-model' => 'variant_unit_with_scale', 'ng-change' => 'setFields()', 'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options' }
-      %option{'value' => ''}
-
-  = f.text_field :variant_unit, {'id' => 'variant_unit', 'ng-value' => 'product.variant_unit', 'hidden' => true}
-  = f.text_field :variant_unit_scale, {'id' => 'variant_unit_scale', 'ng-value' => 'product.variant_unit_scale', 'hidden' => true}
-
-  .variant_unit_name{'ng-show' => 'product.variant_unit == "items"'}
-    = f.field_container :variant_unit_name do
-      = f.label :variant_unit_name, t(:spree_admin_variant_unit_name)
-      = f.text_field :variant_unit_name, {placeholder: t('admin.products.unit_name_placeholder')}
-      = f.error_message_on :variant_unit_name

app/overrides/spree/admin/products/_form/remove_available_on.deface

@@ -1,2 +0,0 @@
-remove "code[erb-loud]:contains('f.label :available_on')"
-closing_selector("code[erb-loud]:contains('f.text_field :available_on')")

app/overrides/spree/admin/products/_form/remove_cost_currency.deface

@@ -1,2 +0,0 @@
-remove "code[erb-loud]:contains('f.field_container :cost_currency')"
-closing_selector("code[erb-silent]:contains('end')")

app/overrides/spree/admin/products/_form/remove_cost_price.deface

@@ -1,2 +0,0 @@
-remove "code[erb-loud]:contains('f.field_container :cost_price')"
-closing_selector("code[erb-silent]:contains('end')")

app/overrides/spree/admin/products/_form/remove_meta_description.deface

@@ -1 +0,0 @@
-remove "div[data-hook='admin_product_form_meta']"

app/overrides/spree/admin/products/_form/remove_option_types_and_taxons.deface

@@ -1 +0,0 @@
-remove "div[class='twelve columns alpha omega']"

app/overrides/spree/admin/products/_form/replace_master_price_label.html.haml.deface

@@ -1,2 +0,0 @@
-/ replace "[data-hook=admin_product_form_right] code[erb-loud]:contains('f.label :price')"
-= f.label :price, raw(t(:price) + content_tag(:span, ' *', :class => 'required'))