Update latest translations

.codeclimate.yml

@@ -20,9 +20,6 @@ plugins:
         enabled: false
       DeclarationOrder:
         enabled: false
-      NestingDepth:
-        enabled: false
-
   duplication:
     enabled: true
     exclude_patterns:

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,11 +13,21 @@ Provide context for others to understand it. -->
 
 
 #### Release notes
-<!-- Write a one liner description of the change to be included in the release notes.
-Every PR is worth mentioning, because you did it for a reason. -->
+<!-- Write a line or two to be included in the release notes.
+Everything is worth mentioning, because you did it for a reason. -->
 
-<!-- Please select one for your PR and delete the other. -->
-Changelog Category: User facing changes | Technical changes
+
+
+<!-- Please assign one category to your PR and delete the others. 
+The categories are based on https://keepachangelog.com/en/1.0.0/. -->
+
+Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
+
+
+
+#### Discourse thread
+<!-- Is there a discussion about this in Discourse?
+Add the link or remove this section. -->
 
 
 
@@ -28,5 +38,6 @@ Add the link or remove this section. -->
 
 
 #### Documentation updates
-<!-- Are there any wiki pages that need updating after merging this PR?
+<!-- Are their any wiki pages that need updating after merging this PR?
 List them here or remove this section. -->
+

.rubocop_manual_todo.yml

@@ -62,13 +62,20 @@ Layout/LineLength:
   - 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/app_configuration_decorator.rb
+  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/classification_decorator.rb
+  - app/models/spree/concerns/payment_method_distributors.rb
   - app/models/spree/gateway/stripe_connect.rb
-  - app/models/spree/image.rb
   - app/models/spree/line_item_decorator.rb
   - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_method.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/payment_method_decorator.rb
   - app/models/spree/product_decorator.rb
+  - app/models/spree/shipping_method_decorator.rb
+  - app/models/spree/taxon_decorator.rb
+  - app/models/spree/tax_rate_decorator.rb
   - app/models/spree/user.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
@@ -79,8 +86,6 @@ Layout/LineLength:
   - app/services/embedded_page_service.rb
   - app/services/order_cycle_form.rb
   - app/services/order_factory.rb
-  - app/services/variant_units/variant_and_line_item_naming.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
   - engines/order_management/app/services/order_management/subscriptions/validator.rb
   - engines/web/app/helpers/web/cookies_policy_helper.rb
   - engines/web/config/routes.rb
@@ -88,6 +93,7 @@ Layout/LineLength:
   - Gemfile
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/available_payment_method_filter.rb
+  - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/customers_report.rb
   - lib/open_food_network/enterprise_fee_applicator.rb
   - lib/open_food_network/enterprise_fee_calculator.rb
@@ -97,8 +103,10 @@ Layout/LineLength:
   - lib/open_food_network/order_cycle_form_applicator.rb
   - lib/open_food_network/order_cycle_management_report.rb
   - lib/open_food_network/payments_report.rb
+  - lib/open_food_network/reports/bulk_coop_allocation_report.rb
   - lib/open_food_network/sales_tax_report.rb
   - lib/open_food_network/scope_variants_for_search.rb
+  - lib/open_food_network/variant_and_line_item_naming.rb
   - lib/open_food_network/xero_invoices_report.rb
   - lib/spree/localized_number.rb
   - lib/spree/product_filters.rb
@@ -126,8 +134,6 @@ Layout/LineLength:
   - spec/controllers/api/product_images_controller_spec.rb
   - spec/controllers/api/products_controller_spec.rb
   - spec/controllers/api/promo_images_controller_spec.rb
-  - spec/controllers/api/states_controller_spec.rb
-  - spec/controllers/api/terms_and_conditions_controller_spec.rb
   - spec/controllers/api/variants_controller_spec.rb
   - spec/controllers/cart_controller_spec.rb
   - spec/controllers/checkout_controller_spec.rb
@@ -150,15 +156,11 @@ Layout/LineLength:
   - spec/controllers/stripe/callbacks_controller_spec.rb
   - spec/controllers/stripe/webhooks_controller_spec.rb
   - spec/controllers/user_confirmations_controller_spec.rb
-  - spec/factories/line_item_factory.rb
   - spec/factories/order_factory.rb
-  - spec/factories/shipment_factory.rb
-  - spec/factories/stock_location_factory.rb
-  - spec/factories/user_factory.rb
+  - spec/factories.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/configuration/content_spec.rb
   - spec/features/admin/customers_spec.rb
   - spec/features/admin/enterprise_fees_spec.rb
   - spec/features/admin/enterprise_relationships_spec.rb
@@ -167,6 +169,7 @@ Layout/LineLength:
   - 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/complex_creating_specific_time_spec.rb
   - spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
@@ -190,7 +193,7 @@ Layout/LineLength:
   - spec/features/consumer/account/settings_spec.rb
   - spec/features/consumer/account_spec.rb
   - spec/features/consumer/authentication_spec.rb
-  - spec/features/consumer/caching/darkswarm_caching_spec.rb
+  - spec/features/consumer/caching/darkwarm_caching_spec.rb
   - spec/features/consumer/caching/shops_caching_spec.rb
   - spec/features/consumer/groups_spec.rb
   - spec/features/consumer/multilingual_spec.rb
@@ -199,7 +202,6 @@ Layout/LineLength:
   - 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/checkout_stripe_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
@@ -218,15 +220,18 @@ Layout/LineLength:
   - spec/jobs/subscription_confirm_job_spec.rb
   - spec/jobs/subscription_placement_job_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/customers_report_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/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_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/scope_variant_to_hub_spec.rb
@@ -234,14 +239,11 @@ Layout/LineLength:
   - spec/lib/open_food_network/user_balance_calculator_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/spree/core/calculated_adjustments_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/calculator/flexi_rate_spec.rb
-  - spec/models/calculator/price_sack_spec.rb
   - spec/models/calculator/weight_spec.rb
   - spec/models/column_preference_spec.rb
   - spec/models/concerns/order_shipment_spec.rb
@@ -259,8 +261,9 @@ Layout/LineLength:
   - spec/models/product_import/reset_absent_spec.rb
   - spec/models/proxy_order_spec.rb
   - spec/models/spree/ability_spec.rb
-  - spec/models/spree/address_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/line_item_spec.rb
@@ -270,7 +273,6 @@ Layout/LineLength:
   - spec/models/spree/product_set_spec.rb
   - spec/models/spree/product_spec.rb
   - spec/models/spree/shipping_method_spec.rb
-  - spec/models/spree/stock_item_spec.rb
   - spec/models/spree/taxon_spec.rb
   - spec/models/spree/tax_rate_spec.rb
   - spec/models/spree/user_spec.rb
@@ -284,8 +286,8 @@ Layout/LineLength:
   - spec/models/variant_override_spec.rb
   - spec/performance/orders_controller_spec.rb
   - spec/performance/shop_controller_spec.rb
-  - spec/requests/api/orders_spec.rb
   - spec/requests/checkout/failed_checkout_spec.rb
+  - spec/requests/checkout/stripe_sca_spec.rb
   - spec/requests/embedded_shopfronts_headers_spec.rb
   - spec/serializers/api/admin/customer_serializer_spec.rb
   - spec/serializers/api/admin/exchange_serializer_spec.rb
@@ -305,11 +307,11 @@ Layout/LineLength:
   - spec/services/order_cycle_form_spec.rb
   - spec/services/order_factory_spec.rb
   - spec/services/order_syncer_spec.rb
+  - spec/services/order_tax_adjustments_fetcher_spec.rb
   - spec/services/permissions/order_spec.rb
   - spec/services/permitted_attributes/order_cycle_spec.rb
   - spec/services/products_renderer_spec.rb
   - spec/services/product_tag_rules_filterer_spec.rb
-  - spec/services/variant_units/option_value_namer_spec.rb
   - spec/spec_helper.rb
   - spec/support/cancan_helper.rb
   - spec/support/delayed_job_helper.rb
@@ -319,8 +321,22 @@ Layout/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - spec/controllers/base_controller2_spec.rb
+  - spec/features/consumer/caching/darkswarm_caching_spec.rb
+  - spec/models/calculator/flexi_rate_spec.rb
+  - spec/models/calculator/price_sack_spec.rb
+  - spec/models/spree/stock_item_spec.rb
+  - spec/requests/api/orders_spec.rb
   - spec/swagger_helper.rb
   - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
+  - app/models/spree/image.rb
+  - app/models/spree/payment_method.rb
+  - spec/factories/line_item_factory.rb
+  - spec/factories/shipment_factory.rb
+  - spec/factories/stock_location_factory.rb
+  - spec/factories/user_factory.rb
+  - spec/lib/spree/core/calculated_adjustments_spec.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -340,10 +356,10 @@ Metrics/AbcSize:
   - app/controllers/api/shipments_controller.rb
   - app/controllers/api/taxons_controller.rb
   - app/controllers/api/variants_controller.rb
-  - app/controllers/application_controller.rb
   - app/controllers/cart_controller.rb
   - app/controllers/discourse_sso_controller.rb
   - app/controllers/enterprises_controller.rb
+  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/overview_controller.rb
@@ -355,7 +371,6 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/search_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
-  - app/controllers/spree/admin/variants_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/controllers/spree/user_passwords_controller.rb
@@ -367,6 +382,7 @@ Metrics/AbcSize:
   - app/controllers/user_passwords_controller.rb
   - app/controllers/user_registrations_controller.rb
   - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
@@ -382,18 +398,16 @@ Metrics/AbcSize:
   - app/models/product_import/entry_validator.rb
   - app/models/product_import/product_importer.rb
   - app/models/proxy_order.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
+  - app/models/spree/ability_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/checkout.rb
   - app/models/spree/order_decorator.rb
-  - app/models/spree/payment/processing.rb
-  - app/models/spree/payment.rb
+  - app/models/spree/payment_decorator.rb
   - app/models/spree/product_decorator.rb
   - app/models/spree/shipment.rb
-  - app/models/spree/taxon.rb
-  - app/models/spree/tax_rate.rb
-  - app/models/spree/zone.rb
+  - app/models/spree/taxon_decorator.rb
+  - app/models/spree/tax_rate_decorator.rb
   - app/serializers/api/admin/enterprise_serializer.rb
   - app/serializers/api/product_serializer.rb
   - app/serializers/api/variant_serializer.rb
@@ -401,10 +415,7 @@ Metrics/AbcSize:
   - app/services/create_order_cycle.rb
   - app/services/order_cycle_form.rb
   - app/services/order_syncer.rb
-  - app/services/variant_units/option_value_namer.rb
-  - app/services/variant_units/variant_and_line_item_naming.rb
   - engines/order_management/app/services/order_management/order/updater.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
   - engines/order_management/app/services/order_management/stock/packer.rb
@@ -412,10 +423,12 @@ Metrics/AbcSize:
   - lib/active_merchant/billing/gateways/stripe_decorator.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/discourse/single_sign_on.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
@@ -427,17 +440,13 @@ Metrics/AbcSize:
   - 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/api/controller_setup.rb
-  - lib/spree/core/calculated_adjustments.rb
   - lib/spree/core/controller_helpers/order.rb
   - lib/spree/core/controller_helpers/respond_with.rb
   - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/core/delegate_belongs_to.rb
-  - lib/spree/core/permalinks.rb
-  - lib/spree/core/s3_support.rb
   - lib/spree/localized_number.rb
-  - lib/spree/money.rb
   - lib/stripe/account_connector.rb
   - lib/tasks/enterprises.rake
   - lib/tasks/sample_data/order_factory.rb
@@ -445,13 +454,25 @@ Metrics/AbcSize:
   - spec/features/admin/product_import_spec.rb
   - spec/features/admin/reports_spec.rb
   - spec/features/admin/subscriptions_spec.rb
+  - spec/features/consumer/shopping/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/shopping_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/enterprise_spec.rb
   - spec/models/product_importer_spec.rb
   - spec/services/order_checkout_restart_spec.rb
-  - spec/support/i18n_translations_checker.rb
   - spec/support/performance_helper.rb
+  - app/controllers/application_controller.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/money.rb
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -469,21 +490,16 @@ Metrics/BlockLength:
     "scenario"
   ]
   Exclude:
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
   - app/models/spree/shipment.rb
   - lib/spree/core/controller_helpers/common.rb
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/tasks/data.rake
   - spec/controllers/spree/admin/invoices_controller_spec.rb
-  - spec/factories/address_factory.rb
   - spec/factories/enterprise_factory.rb
   - spec/factories/order_cycle_factory.rb
   - spec/factories/order_factory.rb
-  - spec/factories/payment_method_factory.rb
   - spec/factories/product_factory.rb
   - spec/factories.rb
-  - spec/factories/shipment_factory.rb
   - spec/factories/shipping_method_factory.rb
   - spec/factories/subscription_factory.rb
   - spec/factories/user_factory.rb
@@ -491,12 +507,17 @@ Metrics/BlockLength:
   - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
   - spec/lib/open_food_network/group_buy_report_spec.rb
   - spec/models/tag_rule/discount_order_spec.rb
-  - spec/requests/api/orders_spec.rb
   - spec/spec_helper.rb
   - spec/support/delayed_job_helper.rb
   - spec/support/matchers/select2_matchers.rb
   - spec/support/matchers/table_matchers.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - spec/requests/api/orders_spec.rb
   - spec/swagger_helper.rb
+  - spec/factories/address_factory.rb
+  - spec/factories/payment_method_factory.rb
+  - spec/factories/shipment_factory.rb
 
 Metrics/CyclomaticComplexity:
   Max: 6
@@ -506,149 +527,68 @@ Metrics/CyclomaticComplexity:
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/payment_method_decorator.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/zone.rb
   - app/models/variant_override_set.rb
   - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
   - lib/spree/core/controller_helpers/order.rb
   - lib/spree/core/controller_helpers/respond_with.rb
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
 
 Metrics/PerceivedComplexity:
   Max: 7
   Exclude:
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/enterprise.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/zone.rb
-  - app/models/variant_override_set.rb
-  - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/localized_number.rb
-  - spec/models/product_importer_spec.rb
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/api/variants_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
+  - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
   - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
+  - app/models/spree/ability_decorator.rb
   - app/models/spree/order_decorator.rb
   - app/models/spree/product_decorator.rb
-  - app/models/spree/zone.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
   - lib/spree/core/controller_helpers/order.rb
   - lib/spree/core/controller_helpers/respond_with.rb
   - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
   - spec/models/product_importer_spec.rb
+  - app/models/spree/order/checkout.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
 
 Metrics/MethodLength:
   Max: 10
   Exclude:
-  - app/controllers/admin/enterprise_fees_controller.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/base_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/enterprise.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/zone.rb
-  - app/models/variant_override_set.rb
-  - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/localized_number.rb
-  - spec/models/product_importer_spec.rb
-  - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/api/variants_controller.rb
-  - app/controllers/spree/admin/taxons_controller.rb
-  - app/controllers/spree/orders_controller.rb
-  - app/helpers/checkout_helper.rb
-  - app/helpers/order_cycles_helper.rb
-  - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/enterprise_relationship.rb
-  - app/models/spree/ability.rb
-  - app/models/spree/address.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/zone.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/stock/estimator.rb
-  - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
-  - lib/discourse/single_sign_on.rb
-  - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/spree/core/calculated_adjustments.rb
-  - lib/spree/core/controller_helpers/order.rb
-  - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/controller_helpers/ssl.rb
-  - lib/spree/localized_number.rb
-  - spec/models/product_importer_spec.rb
   - app/controllers/admin/contents_controller.rb
   - app/controllers/admin/customers_controller.rb
   - app/controllers/admin/enterprise_fees_controller.rb
@@ -663,6 +603,7 @@ Metrics/MethodLength:
   - app/controllers/api/variants_controller.rb
   - app/controllers/cart_controller.rb
   - app/controllers/shop_controller.rb
+  - app/controllers/spree/admin/image_settings_controller.rb
   - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/orders/customer_details_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
@@ -673,9 +614,9 @@ Metrics/MethodLength:
   - app/controllers/spree/admin/tax_categories_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
-  - app/controllers/spree/admin/variants_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
+  - app/controllers/spree/user_registrations_controller.rb
   - app/controllers/spree/user_sessions_controller.rb
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
@@ -694,38 +635,32 @@ Metrics/MethodLength:
   - 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.rb
-  - app/models/spree/address.rb
-  - app/models/spree/credit_card.rb
-  - app/models/spree/order/checkout.rb
+  - app/models/spree/ability_decorator.rb
+  - app/models/spree/calculator/default_tax_decorator.rb
+  - app/models/spree/calculator/flexi_rate_decorator.rb
   - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_method.rb
-  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment_decorator.rb
+  - app/models/spree/payment_method_decorator.rb
   - app/models/spree/product_decorator.rb
   - app/models/spree/shipment.rb
-  - app/models/spree/taxon.rb
-  - app/models/spree/tax_rate.rb
-  - app/models/spree/zone.rb
   - app/serializers/api/admin/order_cycle_serializer.rb
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/services/order_cycle_form.rb
   - app/services/permitted_attributes/checkout.rb
-  - app/services/variant_units/option_value_namer.rb
   - engines/order_management/app/services/order_management/order/updater.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - engines/order_management/app/services/order_management/stock/estimator.rb
   - engines/order_management/app/services/order_management/stock/package.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.rb
   - lib/discourse/single_sign_on.rb
+  - lib/open_food_network/bulk_coop_report.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/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
@@ -736,25 +671,40 @@ Metrics/MethodLength:
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/products_and_inventory_report.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/api/controller_setup.rb
-  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/controller_helpers/auth.rb
   - lib/spree/core/controller_helpers/order.rb
   - lib/spree/core/controller_helpers/respond_with.rb
-  - lib/spree/core/delegate_belongs_to.rb
-  - lib/spree/core/permalinks.rb
-  - lib/spree/core/s3_support.rb
+  - lib/spree/core/controller_helpers/ssl.rb
   - lib/spree/localized_number.rb
-  - lib/spree/responder.rb
   - lib/stripe/profile_storer.rb
+  - lib/tasks/data/truncate_data.rb
   - lib/tasks/sample_data/group_factory.rb
   - lib/tasks/sample_data/order_factory.rb
   - lib/tasks/sample_data/product_factory.rb
+  - spec/features/consumer/shopping/checkout_paypal_spec.rb
   - spec/features/consumer/shopping/variant_overrides_spec.rb
   - spec/models/product_importer_spec.rb
+  - spec/support/request/authentication_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_allocation_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_supplier_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/zone.rb
+  - lib/spree/core/calculated_adjustments.rb
+  - lib/spree/core/delegate_belongs_to.rb
+  - lib/spree/core/permalinks.rb
+  - lib/spree/core/s3_support.rb
+  - lib/spree/responder.rb
   - spec/support/i18n_translations_checker.rb
 
 Metrics/ClassLength:
@@ -779,19 +729,16 @@ Metrics/ClassLength:
   - 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.rb
-  - app/models/spree/address.rb
-  - app/models/spree/credit_card.rb
-  - app/models/spree/payment.rb
+  - app/models/spree/ability_decorator.rb
   - app/models/spree/shipment.rb
   - app/models/spree/user.rb
-  - app/models/spree/zone.rb
   - app/serializers/api/cached_enterprise_serializer.rb
   - app/serializers/api/enterprise_shopfront_serializer.rb
   - app/services/cart_service.rb
-  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - engines/order_management/app/services/order_management/order/updater.rb
   - engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
   - lib/active_merchant/billing/gateways/stripe_payment_intents.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
@@ -801,6 +748,10 @@ Metrics/ClassLength:
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/users_and_enterprises_report.rb
   - lib/open_food_network/xero_invoices_report.rb
+  - app/models/spree/payment.rb
+  - engines/order_management/app/services/order_management/reports/bulk_coop/bulk_coop_report.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/zone.rb
 
 Metrics/ModuleLength:
   Max: 100
@@ -809,8 +760,6 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
-  - app/models/spree/order/checkout.rb
-  - app/models/spree/payment/processing.rb
   - engines/order_management/spec/services/order_management/order/updater_spec.rb
   - engines/order_management/spec/services/order_management/stock/package_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
@@ -820,6 +769,7 @@ Metrics/ModuleLength:
   - engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
   - engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
   - lib/open_food_network/column_preference_defaults.rb
+  - spec/controllers/admin/enterprises_controller_spec.rb
   - spec/controllers/admin/order_cycles_controller_spec.rb
   - spec/controllers/api/order_cycles_controller_spec.rb
   - spec/controllers/api/orders_controller_spec.rb
@@ -827,24 +777,28 @@ Metrics/ModuleLength:
   - 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/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/scope_variant_to_hub_spec.rb
   - spec/lib/open_food_network/tag_rule_applicator_spec.rb
   - spec/lib/open_food_network/user_balance_calculator_spec.rb
   - spec/lib/open_food_network/users_and_enterprises_report_spec.rb
+  - spec/models/spree/ability_spec.rb
   - spec/models/spree/adjustment_spec.rb
-  - spec/models/spree/credit_card_spec.rb
   - spec/models/spree/line_item_spec.rb
+  - spec/models/spree/payment_spec.rb
   - spec/models/spree/product_spec.rb
-  - spec/models/spree/shipping_method_spec.rb
   - spec/models/spree/variant_spec.rb
   - spec/services/permissions/order_spec.rb
-  - spec/services/variant_units/option_value_namer_spec.rb
+  - spec/support/request/web_helper.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
+  - spec/lib/open_food_network/packing_report_spec.rb
+  - spec/models/spree/credit_card_spec.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -853,3 +807,8 @@ Metrics/ParameterLists:
   - app/models/product_import/entry_processor.rb
   - lib/open_food_network/xero_invoices_report.rb
   - spec/features/admin/reports_spec.rb
+
+Lint/UselessAssignment:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_todo.yml

@@ -1,18 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1400`
-# on 2020-10-14 09:49:36 +0100 using RuboCop version 0.81.0.
+# on 2020-09-10 16:12:05 +1000 using RuboCop version 0.81.0.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/ArgumentAlignment:
   Exclude:
-    - 'spec/models/spree/address_spec.rb'
     - 'spec/models/spree/order/checkout_spec.rb'
 
 # Offense count: 1
@@ -23,11 +22,10 @@ Layout/BlockAlignment:
   Exclude:
     - 'spec/models/spree/order/checkout_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 Layout/EmptyLines:
   Exclude:
-    - 'spec/features/admin/variants_spec.rb'
     - 'spec/models/spree/payment_spec.rb'
 
 # Offense count: 4
@@ -120,7 +118,7 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'spec/services/checkout/form_data_adapter_spec.rb'
     - 'spec/services/user_locale_setter_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
@@ -128,7 +126,6 @@ Layout/TrailingEmptyLines:
   Exclude:
     - 'spec/factories.rb'
     - 'spec/factories/address_factory.rb'
-    - 'spec/support/request/stripe_helper.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -174,18 +171,11 @@ Lint/UselessAccessModifier:
     - 'app/services/mail_configuration.rb'
     - 'lib/open_food_network/feature_toggle.rb'
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/spree/core/controller_helpers/common.rb'
-    - 'app/models/spree/taxon.rb'
-
 # Offense count: 9
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/spree/admin/taxonomies_controller.rb'
-    - 'app/models/spree/adjustment.rb'
+    - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'lib/spree/core/controller_helpers/common.rb'
     - 'spec/support/request/shop_workflow.rb'
@@ -218,14 +208,14 @@ Naming/PredicateName:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_relationship.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/spree/adjustment.rb'
+    - 'app/models/spree/ability_decorator.rb'
+    - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/preferences/file_configuration.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/user.rb'
+    - 'app/models/spree/shipping_method_decorator.rb'
     - 'lib/open_food_network/customers_report.rb'
     - 'lib/open_food_network/order_cycle_management_report.rb'
     - 'lib/open_food_network/order_grouper.rb'
@@ -248,12 +238,6 @@ Rails/ActiveRecordAliases:
     - 'spec/features/consumer/shopping/orders_spec.rb'
     - 'spec/requests/api/orders_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Rails/ApplicationController:
-  Exclude:
-    - 'engines/dfc_provider/app/controllers/dfc_provider/api/base_controller.rb'
-
 # Offense count: 3
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -287,15 +271,15 @@ Rails/FilePath:
     - 'spec/controllers/api/logos_controller_spec.rb'
     - 'spec/controllers/api/product_images_controller_spec.rb'
     - 'spec/controllers/api/promo_images_controller_spec.rb'
-    - 'spec/controllers/api/terms_and_conditions_controller_spec.rb'
     - 'spec/factories/product_factory.rb'
+    - 'spec/features/admin/content_spec.rb'
     - 'spec/features/admin/enterprises/images_spec.rb'
     - 'spec/models/content_configuration_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
     - 'spec/serializers/api/admin/enterprise_serializer_spec.rb'
     - 'spec/support/downloads_helper.rb'
 
-# Offense count: 7
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -305,6 +289,7 @@ Rails/FindBy:
     - 'app/models/product_import/entry_processor.rb'
     - 'app/models/product_import/entry_validator.rb'
     - 'app/models/product_import/spreadsheet_data.rb'
+    - 'app/models/spree/shipment.rb'
     - 'app/models/spree/user.rb'
 
 # Offense count: 2
@@ -316,21 +301,18 @@ Rails/FindEach:
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/shipment.rb'
 
-# Offense count: 9
+# Offense count: 6
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
-    - 'app/models/concerns/payment_method_distributors.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
+    - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/line_item_decorator.rb'
-    - 'app/models/spree/role.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/user.rb'
     - 'app/models/spree/zone.rb'
 
-# Offense count: 35
+# Offense count: 27
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
@@ -338,16 +320,13 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/customer.rb'
     - 'app/models/enterprise.rb'
     - 'app/models/order_cycle.rb'
-    - 'app/models/spree/address.rb'
-    - 'app/models/spree/adjustment.rb'
+    - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment_method.rb'
     - 'app/models/spree/property.rb'
     - 'app/models/spree/shipment.rb'
-    - 'app/models/spree/shipping_category.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/taxonomy.rb'
+    - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
     - 'app/models/subscription.rb'
@@ -368,7 +347,7 @@ Rails/HelperInstanceVariable:
     - 'app/helpers/spree/admin/orders_helper.rb'
     - 'app/helpers/spree/orders_helper.rb'
 
-# Offense count: 33
+# Offense count: 35
 # Configuration parameters: Include.
 # Include: app/controllers/**/*.rb
 Rails/LexicallyScopedActionFilter:
@@ -384,6 +363,7 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/adjustments_controller.rb'
     - 'app/controllers/spree/admin/payment_methods_controller.rb'
     - 'app/controllers/spree/admin/payments_controller.rb'
+    - 'app/controllers/spree/admin/product_properties_controller.rb'
     - 'app/controllers/spree/admin/products_controller.rb'
     - 'app/controllers/spree/admin/search_controller.rb'
     - 'app/controllers/spree/admin/shipping_methods_controller.rb'
@@ -423,7 +403,7 @@ Rails/ReflectionClassName:
     - 'app/models/enterprise_role.rb'
     - 'app/models/subscription.rb'
 
-# Offense count: 243
+# Offense count: 241
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -439,15 +419,12 @@ Rails/SkipsModelValidations:
     - 'app/models/enterprise_relationship.rb'
     - 'app/models/product_import/inventory_reset_strategy.rb'
     - 'app/models/proxy_order.rb'
-    - 'app/models/spree/address.rb'
-    - 'app/models/spree/adjustment.rb'
+    - 'app/models/spree/address_decorator.rb'
     - 'app/models/spree/credit_card.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/payment.rb'
     - 'app/models/spree/shipment.rb'
-    - 'app/models/spree/shipping_method.rb'
-    - 'app/models/spree/tax_category.rb'
-    - 'app/models/spree/taxonomy.rb'
+    - 'app/models/spree/shipping_method_decorator.rb'
     - 'app/models/spree/zone.rb'
     - 'app/models/subscription.rb'
     - 'app/models/variant_override.rb'
@@ -495,6 +472,7 @@ Rails/SkipsModelValidations:
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
     - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb'
     - 'spec/lib/stripe/credit_card_cloner_spec.rb'
+    - 'spec/models/calculator/weight_spec.rb'
     - 'spec/models/concerns/variant_stock_spec.rb'
     - 'spec/models/enterprise_relationship_spec.rb'
     - 'spec/models/exchange_spec.rb'
@@ -502,7 +480,6 @@ Rails/SkipsModelValidations:
     - 'spec/models/spree/asset_spec.rb'
     - 'spec/models/spree/line_item_spec.rb'
     - 'spec/models/spree/order_spec.rb'
-    - 'spec/models/spree/tax_category_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
     - 'spec/models/tag_rule/discount_order_spec.rb'
     - 'spec/serializers/api/admin/subscription_line_item_serializer_spec.rb'
@@ -517,7 +494,7 @@ Rails/SkipsModelValidations:
     - 'spec/support/request/shop_workflow.rb'
     - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
@@ -525,7 +502,6 @@ Rails/UniqueValidationWithoutIndex:
     - 'app/models/customer.rb'
     - 'app/models/exchange.rb'
     - 'app/models/spree/stock_item.rb'
-    - 'app/models/spree/tax_category.rb'
     - 'app/models/spree/zone.rb'
 
 # Offense count: 2
@@ -536,6 +512,14 @@ Rails/UnknownEnv:
     - 'app/models/spree/app_configuration_decorator.rb'
     - 'lib/spree/core/controller_helpers/ssl.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Exclude:
+    - 'spec/support/request/web_helper.rb'
+
 # Offense count: 2
 Style/CaseEquality:
   Exclude:
@@ -624,7 +608,7 @@ Style/FormatStringToken:
     - 'lib/open_food_network/sales_tax_report.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
 
-# Offense count: 818
+# Offense count: 829
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -691,6 +675,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/spree/admin/base_controller.rb'
     - 'app/controllers/spree/admin/countries_controller.rb'
     - 'app/controllers/spree/admin/general_settings_controller.rb'
+    - 'app/controllers/spree/admin/image_settings_controller.rb'
     - 'app/controllers/spree/admin/images_controller.rb'
     - 'app/controllers/spree/admin/invoices_controller.rb'
     - 'app/controllers/spree/admin/mail_methods_controller.rb'
@@ -725,6 +710,7 @@ Style/FrozenStringLiteralComment:
     - 'app/controllers/user_passwords_controller.rb'
     - 'app/controllers/user_registrations_controller.rb'
     - 'app/helpers/admin/enterprises_helper.rb'
+    - 'app/helpers/admin/image_settings_helper.rb'
     - 'app/helpers/admin/injection_helper.rb'
     - 'app/helpers/admin/orders_helper.rb'
     - 'app/helpers/admin/subscriptions_helper.rb'
@@ -753,6 +739,7 @@ Style/FrozenStringLiteralComment:
     - 'app/helpers/spree/admin/taxons_helper.rb'
     - 'app/helpers/spree/admin/zones_helper.rb'
     - 'app/helpers/spree/api/api_helpers.rb'
+    - 'app/helpers/spree/base_helper_decorator.rb'
     - 'app/helpers/spree/orders_helper.rb'
     - 'app/helpers/spree/reports_helper.rb'
     - 'app/helpers/spree_currency_helper.rb'
@@ -816,7 +803,13 @@ Style/FrozenStringLiteralComment:
     - '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/address_decorator.rb'
+    - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/app_configuration_decorator.rb'
+    - 'app/models/spree/calculator_decorator.rb'
+    - 'app/models/spree/classification_decorator.rb'
+    - 'app/models/spree/concerns/payment_method_distributors.rb'
     - 'app/models/spree/gateway/migs.rb'
     - 'app/models/spree/gateway/pin.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
@@ -830,6 +823,9 @@ Style/FrozenStringLiteralComment:
     - 'app/models/spree/product_property_decorator.rb'
     - 'app/models/spree/product_set.rb'
     - 'app/models/spree/property.rb'
+    - 'app/models/spree/shipping_method_decorator.rb'
+    - 'app/models/spree/tax_rate_decorator.rb'
+    - 'app/models/spree/taxon_decorator.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant_decorator.rb'
     - 'app/models/stripe_account.rb'
@@ -949,7 +945,6 @@ Style/FrozenStringLiteralComment:
     - 'app/services/tax_rate_finder.rb'
     - 'app/services/upload_sanitizer.rb'
     - 'app/services/variant_deleter.rb'
-    - 'app/services/variant_units/variant_and_line_item_naming.rb'
     - 'app/services/variants_stock_levels.rb'
     - 'app/validators/date_time_string_validator.rb'
     - 'app/validators/distributors_validator.rb'
@@ -1048,8 +1043,10 @@ Style/FrozenStringLiteralComment:
     - 'lib/open_food_network/tag_rule_applicator.rb'
     - 'lib/open_food_network/user_balance_calculator.rb'
     - 'lib/open_food_network/users_and_enterprises_report.rb'
+    - 'lib/open_food_network/variant_and_line_item_naming.rb'
     - 'lib/open_food_network/xero_invoices_report.rb'
     - 'lib/spree/api/controller_setup.rb'
+    - 'lib/spree/api/testing_support/setup.rb'
     - 'lib/spree/authentication_helpers.rb'
     - 'lib/spree/localized_number.rb'
     - 'lib/spree/money_decorator.rb'
@@ -1108,7 +1105,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/controllers/api/statuses_controller_spec.rb'
     - 'spec/controllers/api/taxonomies_controller_spec.rb'
     - 'spec/controllers/api/taxons_controller_spec.rb'
-    - 'spec/controllers/api/terms_and_conditions_controller_spec.rb'
     - 'spec/controllers/api/variants_controller_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
     - 'spec/controllers/cart_controller_spec.rb'
@@ -1121,6 +1117,7 @@ Style/FrozenStringLiteralComment:
     - '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/image_settings_controller_spec.rb'
     - 'spec/controllers/spree/admin/invoices_controller_spec.rb'
     - 'spec/controllers/spree/admin/mail_methods_controller_spec.rb'
     - 'spec/controllers/spree/admin/orders/customer_details_controller_spec.rb'
@@ -1150,7 +1147,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/factories/order_cycle_factory.rb'
     - 'spec/factories/order_factory.rb'
     - 'spec/factories/product_factory.rb'
-    - 'spec/factories/return_authorization_factory.rb'
     - 'spec/factories/shipment_factory.rb'
     - 'spec/factories/shipping_method_factory.rb'
     - 'spec/factories/state_factory.rb'
@@ -1163,23 +1159,26 @@ Style/FrozenStringLiteralComment:
     - 'spec/features/admin/authentication_spec.rb'
     - 'spec/features/admin/bulk_order_management_spec.rb'
     - 'spec/features/admin/bulk_product_update_spec.rb'
-    - 'spec/features/admin/configuration/content_spec.rb'
     - 'spec/features/admin/configuration/general_settings_spec.rb'
+    - 'spec/features/admin/configuration/image_settings_spec.rb'
     - 'spec/features/admin/configuration/mail_methods_spec.rb'
     - 'spec/features/admin/configuration/states_spec.rb'
     - 'spec/features/admin/configuration/tax_categories_spec.rb'
     - 'spec/features/admin/configuration/tax_rates_spec.rb'
     - 'spec/features/admin/configuration/taxonomies_spec.rb'
     - 'spec/features/admin/configuration/zones_spec.rb'
+    - 'spec/features/admin/content_spec.rb'
     - 'spec/features/admin/customers_spec.rb'
     - 'spec/features/admin/enterprise_fees_spec.rb'
     - 'spec/features/admin/enterprise_groups_spec.rb'
     - 'spec/features/admin/enterprise_relationships_spec.rb'
     - 'spec/features/admin/enterprise_roles_spec.rb'
     - 'spec/features/admin/enterprise_user_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/external_services_spec.rb'
+    - 'spec/features/admin/image_settings_spec.rb'
     - 'spec/features/admin/multilingual_spec.rb'
     - 'spec/features/admin/overview_spec.rb'
     - 'spec/features/admin/payment_method_spec.rb'
@@ -1251,6 +1250,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/lib/open_food_network/group_buy_report_spec.rb'
     - 'spec/lib/open_food_network/i18n_config_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_management_report_spec.rb'
@@ -1331,6 +1331,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/spree/shipping_method_spec.rb'
     - 'spec/models/spree/stock/availability_validator_spec.rb'
     - 'spec/models/spree/tax_rate_spec.rb'
+    - 'spec/models/spree/taxon_spec.rb'
     - 'spec/models/spree/user_spec.rb'
     - 'spec/models/spree/variant_spec.rb'
     - 'spec/models/stripe_account_spec.rb'
@@ -1396,7 +1397,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/services/search_orders_spec.rb'
     - 'spec/services/tax_rate_finder_spec.rb'
     - 'spec/services/upload_sanitizer_spec.rb'
-    - 'spec/services/variant_units/option_value_namer_spec.rb'
     - 'spec/services/variants_stock_levels_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/ability_helper.rb'
@@ -1425,7 +1425,7 @@ Style/FrozenStringLiteralComment:
     - 'spec/support/products_helper.rb'
     - 'spec/support/request/admin_helper.rb'
     - 'spec/support/request/authentication_helper.rb'
-    - 'spec/support/request/checkout_helper.rb'
+    - 'spec/support/request/checkout_workflow.rb'
     - 'spec/support/request/cookie_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/menu_helper.rb'
@@ -1460,16 +1460,16 @@ Style/GuardClause:
     - 'app/models/enterprise.rb'
     - 'app/models/enterprise_group.rb'
     - 'app/models/producer_property.rb'
+    - 'app/models/spree/classification_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
     - 'app/models/spree/price_decorator.rb'
     - 'app/models/spree/product_decorator.rb'
     - 'app/services/order_syncer.rb'
-    - 'app/services/variant_units/variant_and_line_item_naming.rb'
     - 'lib/discourse/single_sign_on.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
+    - 'lib/open_food_network/variant_and_line_item_naming.rb'
     - 'spec/support/delayed_job_helper.rb'
-    - 'spec/support/request/checkout_helper.rb'
     - 'spec/support/request/distribution_helper.rb'
     - 'spec/support/request/shop_workflow.rb'
 
@@ -1495,7 +1495,7 @@ Style/MixinUsage:
     - 'lib/open_food_network/orders_and_fulfillments_report.rb'
     - 'spec/lib/open_food_network/packing_report_spec.rb'
 
-# Offense count: 36
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -1508,6 +1508,7 @@ Style/NumericPredicate:
     - 'app/helpers/shared_helper.rb'
     - 'app/models/product_import/product_importer.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
+    - 'app/models/spree/adjustment_decorator.rb'
     - 'app/models/spree/gateway/stripe_connect.rb'
     - 'app/models/spree/line_item_decorator.rb'
     - 'app/models/spree/order_decorator.rb'
@@ -1537,6 +1538,12 @@ Style/RandomWithOffset:
   Exclude:
     - 'spec/factories.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantPercentQ:
+  Exclude:
+    - 'spec/support/request/web_helper.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
@@ -1556,6 +1563,7 @@ Style/RescueStandardError:
 # Offense count: 231
 Style/Send:
   Exclude:
+    - 'app/models/spree/shipping_method_decorator.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
     - 'spec/controllers/spree/admin/base_controller_spec.rb'
@@ -1567,6 +1575,7 @@ Style/Send:
     - '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/lettuce_share_report_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/permissions_spec.rb'
     - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb'
@@ -1588,7 +1597,6 @@ Style/Send:
     - 'spec/models/tag_rule/filter_shipping_methods_spec.rb'
     - 'spec/services/cart_service_spec.rb'
     - 'spec/services/products_renderer_spec.rb'
-    - 'spec/services/variant_units/option_value_namer_spec.rb'
     - 'spec/spec_helper.rb'
     - 'spec/support/localized_number_helper.rb'
     - 'spec/support/matchers/delegate_matchers.rb'

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Code of Conduct of the Open Food Network
-
-**Welcome!** We are currently working on a Code of Conduct. You are welcome to contribute. We started this work at the Global Gathering 2020 and you find [notes of the initial session](https://community.openfoodnetwork.org/t/global-gathering-2020-day-5-a-code-of-conduct-for-ofn/2071/1) in the community forum. You can edit this file on Github to suggest new content. Alternatively, you can post in our [community forum](https://community.openfoodnetwork.org) or reach us on [Slack](https://openfoodnetwork.org/slack-invite).

CONTRIBUTING.md

@@ -40,7 +40,7 @@ Push your changes to a branch on your fork:
 
 ## Submitting a Pull Request
 
-Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr]. 
+Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr].
 
 TL;DR:
 * Write tests

DOCKER.md

@@ -0,0 +1,62 @@
+### Docker
+
+It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
+The objective is to spare configuration time, in order to help people testing the app and contribute to it.
+It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
+
+### Install Docker
+
+Please check the documentation here, https://docs.docker.com/install/ to install Docker.
+
+For Docker Compose, information are here: https://docs.docker.com/compose/install/.
+
+Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
+
+
+### Use Docker with Open Food Network
+
+Open a terminal with a shell.
+
+Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
+
+```sh
+$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
+```
+
+Otherwise, if you just want to get things running, clone from the OFN main repo:
+
+```sh
+$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
+```
+
+Go at the root of the app:
+
+```sh
+$ cd openfoodnetwork
+```
+
+Download the Docker images and build the containers:
+
+```sh
+$ docker-compose build
+```
+
+Setup the database and seed it with sample data:
+```sh
+$ docker-compose run web bundle exec rake db:reset
+$ docker-compose run web bundle exec rake db:test:prepare
+$ docker-compose run web bundle exec rake ofn:sample_data
+```
+
+Finally, run the app with all the required containers:
+
+```sh
+$ docker-compose up
+```
+
+The default admin user is 'ofn@example.com' with 'ofn123' password.
+Check the app in the browser at `http://localhost:3000`.
+
+You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
+
+You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).

Dockerfile

@@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBE
     echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
     rbenv install $(cat .ruby-version) && \
     rbenv global $(cat .ruby-version) && \
-    gem install bundler --version=1.17.3
+    gem install bundler --version=1.17.2
 
 # Install Postgres
 RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
@@ -27,11 +27,8 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main'
     apt-get update && \
     apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
 
-# Install node & yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-    apt-get install -y nodejs yarn
+# Install node
+RUN apt-get install -y nodejs
 
 # Install Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -46,9 +43,5 @@ RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.z
 
 # Copy code and install app dependencies
 COPY . /usr/src/app/
-
-# Install front-end dependencies
-RUN yarn install
-
 # Run bundler install in parallel with the amount of available CPUs
 RUN bundle install --jobs="$(nproc)"

GETTING_STARTED.md

@@ -4,7 +4,7 @@ This is a general guide to setting up an Open Food Network **development environ
 
 ### Requirements
 
-The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](docker/README.md).
+The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](DOCKER.md).
 Otherwise, for a local setup you will need:
 * Ruby 2.3.7 and bundler
 * PostgreSQL database

Gemfile

@@ -3,7 +3,7 @@ ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.8.0'
+gem 'i18n-js', '~> 3.7.1'
 gem 'rails', '~> 4.0.13'
 gem 'rails-i18n', '~> 4.0'
 gem 'rails_safe_tasks', '~> 1.0'
@@ -117,6 +117,7 @@ gem 'uglifier', '>= 1.0.3'
 
 gem 'angular-rails-templates', '~> 0.3.0'
 gem 'foundation-icons-sass-rails'
+gem 'momentjs-rails'
 
 gem 'foundation-rails', '= 5.5.2.1'
 
@@ -155,7 +156,6 @@ end
 
 group :test do
   gem 'simplecov', require: false
-  gem 'test-prof'
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'

Gemfile.lock

@@ -64,7 +64,6 @@ PATH
   remote: engines/dfc_provider
   specs:
     dfc_provider (0.0.1)
-      active_model_serializers (~> 0.8.4)
       jwt (~> 2.2)
       rspec (~> 3.9)
 
@@ -109,7 +108,7 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.7)
+    activerecord-import (1.0.6)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -194,17 +193,18 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     css_parser (1.7.1)
       addressable
     daemons (1.3.1)
-    dalli (2.7.11)
+    dalli (2.7.10)
     database_cleaner (1.8.5)
     db2fog (0.9.0)
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.42.0)
+    ddtrace (0.40.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -407,11 +407,11 @@ GEM
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.6.4)
+    geocoder (1.6.3)
     get_process_mem (0.2.5)
       ffi (~> 1.0)
     gmaps4rails (2.1.2)
-    haml (5.2.0)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
@@ -421,7 +421,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
-    i18n-js (3.8.0)
+    i18n-js (3.7.1)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
@@ -444,7 +444,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.11.3)
-    knapsack (1.19.0)
+    knapsack (1.18.0)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -462,6 +462,8 @@ GEM
     mini_racer (0.2.15)
       libv8 (> 7.3)
     minitest (4.7.5)
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
     money (5.1.1)
       i18n (~> 0.6.0)
     msgpack (1.3.3)
@@ -507,7 +509,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.6)
+    public_suffix (4.0.5)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -617,6 +619,7 @@ GEM
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
     rubyzip (1.3.0)
+    safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
@@ -655,21 +658,20 @@ GEM
       sprockets (>= 2.8, < 4.0)
     state_machine (1.2.0)
     stringex (1.5.1)
-    stripe (5.25.0)
+    stripe (5.22.0)
     temple (0.8.2)
-    test-prof (0.7.5)
     test-unit (3.3.6)
       power_assert
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    timecop (0.9.2)
+    timecop (0.9.1)
     truncate_html (0.9.2)
     tzinfo (0.3.57)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.7.0)
+    unicorn (5.6.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -685,7 +687,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.9.3)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -754,7 +756,7 @@ DEPENDENCIES
   highline (= 1.6.18)
   httparty (~> 0.18)
   i18n (~> 0.6.11)
-  i18n-js (~> 3.8.0)
+  i18n-js (~> 3.7.1)
   immigrant
   jquery-migrate-rails
   jquery-rails (= 3.1.5)
@@ -766,6 +768,7 @@ DEPENDENCIES
   knapsack
   letter_opener (>= 1.4.1)
   mini_racer (= 0.2.15)
+  momentjs-rails
   money (= 5.1.1)
   newrelic_rpm (~> 3.0)
   oauth2 (~> 1.4.4)
@@ -807,7 +810,6 @@ DEPENDENCIES
   state_machine (= 1.2.0)
   stringex (~> 1.5.1)
   stripe
-  test-prof
   test-unit (~> 3.3)
   timecop
   truncate_html (= 0.9.2)

README.md

@@ -9,7 +9,7 @@ Supported by the Open Food Foundation and a network of global affiliates, we are
 
 We're part of global movement - get involved!
 
-* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel and join #dev for all tech-related topics.
+* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel.
 * Head to [https://openfoodnetwork.org](https://openfoodnetwork.org) for more information about the global OFN project.
 * Check out the [User Guide](https://guide.openfoodnetwork.org/) for a list of features and tutorials.
 * Join our [discussion forum](https://community.openfoodnetwork.org).
@@ -20,11 +20,6 @@ If you are interested in contributing to the OFN in any capacity, please introdu
 
 Our [GETTING_STARTED](GETTING_STARTED.md) and [CONTRIBUTING](CONTRIBUTING.md) guides are the best place to start for developers looking to set up a development environment and make contributions to the codebase.
 
-### Hacktoberfest :tada:
-
-Are you participating in [Hacktoberfest](https://hacktoberfest.digitalocean.com/)? Go check out our [Welcome New Developers project board][welcome-dev]! We have curated all issues we consider to be a good starting point for new members of the community and categorized them by skills and level of complexity. 
-Have a look and pick the one you would prefer working on!
-
 ## Provisioning
 
 If you're interested in provisioning a server, see [ofn-install][ofn-install] for the project's Ansible playbooks.
@@ -44,4 +39,3 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 [contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide
-[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27

app/assets/images/flag.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="15 13 34 38.4" enable-background="new 15 13 34 38.4" xml:space="preserve">
+<g>
+	<polygon fill="#FFFFFF" points="15.5,13.5 48.5,13.5 48.5,50.7 31.6,45.5 15.5,50.7 	"/>
+	<path fill="#999999" d="M48,14v36l-16.4-5L16,50V14H48 M49,13h-1H16h-1v1v36v1.4l1.3-0.4l15.3-5l16.1,5l1.3,0.4V50V14V13L49,13z"/>
+</g>
+</svg>

app/assets/javascripts/admin/all.js

@@ -27,14 +27,14 @@
 //= require lodash.underscore.js
 
 // spree
-//= require admin/spree/spree
+//= require spree
 //= require admin/spree/spree-select2
 //= require modernizr
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express
-//= require handlebars
+//= require admin/handlebar_extensions
 
 // OFN specific
 //= require_tree ../templates/admin
@@ -71,23 +71,20 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment/min/moment.min.js
-//= require moment/locale/ar.js
-//= require moment/locale/ca.js
-//= require moment/locale/de.js
-//= require moment/locale/en-gb.js
-//= require moment/locale/es.js
-//= require moment/locale/fil.js
-//= require moment/locale/fr.js
-//= require moment/locale/it.js
-//= require moment/locale/nb.js
-//= require moment/locale/nl-be.js
-//= require moment/locale/pt-br.js
-//= require moment/locale/pt.js
-//= require moment/locale/ru.js
-//= require moment/locale/sv.js
-//= require moment/locale/tr.js
-//= require moment/locale/pl.js
+//= require moment
+//= require moment/de.js
+//= require moment/en-gb.js
+//= require moment/es.js
+//= require moment/fr.js
+//= require moment/it.js
+//= require moment/nb.js
+//= require moment/pt-br.js
+//= require moment/pt.js
+//= require moment/ru.js
+//= require moment/sv.js
+//= require moment/ca.js
+//= require moment/ar.js
+//= require moment/tr.js
 
 // foundation
 //= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, $location, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser, ProductFiltersUrl) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -13,29 +13,37 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
   ]
 
-  $scope.q = {
-    producerFilter: ""
-    categoryFilter: ""
-    importDateFilter: ""
-    query: ""
-    sorting: ""
-  }
+  $scope.filterableColumns = [
+    { name: t("label_producers"),       db_column: "producer_name" },
+    { name: t("name"),           db_column: "name" }
+  ]
+
+  $scope.filterTypes = [
+    { name: t("equals"),         predicate: "eq" },
+    { name: t("contains"),       predicate: "cont" }
+  ]
+
+  $scope.optionTabs =
+    filters:        { title: t("filter_products"),   visible: false }
 
   $scope.producers = producers
   $scope.taxons = Taxons.all
   $scope.tax_categories = tax_categories
+  $scope.producerFilter = ""
+  $scope.categoryFilter = ""
+  $scope.importDateFilter = ""
   $scope.page = 1
   $scope.per_page = 15
   $scope.products = BulkProducts.products
+  $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
   $scope.sortOptions = SortOptions
 
   $scope.initialise = ->
-    $scope.q = ProductFiltersUrl.loadFromUrl($location.search())
     $scope.fetchProducts()
 
-  $scope.$watchCollection '[q.query, q.producerFilter, q.categoryFilter, q.importDateFilter, per_page]', ->
+  $scope.$watchCollection '[query, producerFilter, categoryFilter, importDateFilter, per_page]', ->
     $scope.page = 1 # Reset page when changing filters for new search
 
   $scope.changePage = (newPage) ->
@@ -45,27 +53,25 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.fetchProducts = ->
     removeClearedValues()
     params = {
-      'q[name_cont]': $scope.q.query,
-      'q[supplier_id_eq]': $scope.q.producerFilter,
-      'q[primary_taxon_id_eq]': $scope.q.categoryFilter,
-      'q[s]': $scope.q.sorting,
-      import_date: $scope.q.importDateFilter,
+      'q[name_cont]': $scope.query,
+      'q[supplier_id_eq]': $scope.producerFilter,
+      'q[primary_taxon_id_eq]': $scope.categoryFilter,
+      'q[s]': $scope.sorting,
+      import_date: $scope.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
     }
     RequestMonitor.load(BulkProducts.fetch(params).$promise).then ->
-      # update url with the filters used
-      $location.search(ProductFiltersUrl.generate($scope.q))
       $scope.resetProducts()
 
   removeClearedValues = ->
-    delete $scope.q.producerFilter if $scope.q.producerFilter == "0"
-    delete $scope.q.categoryFilter if $scope.q.categoryFilter == "0"
-    delete $scope.q.importDateFilter if $scope.q.importDateFilter == "0"
+    delete $scope.producerFilter if $scope.producerFilter == "0"
+    delete $scope.categoryFilter if $scope.categoryFilter == "0"
+    delete $scope.importDateFilter if $scope.importDateFilter == "0"
 
   $timeout ->
     if $scope.showLatestImport
-      $scope.q.importDateFilter = $scope.importDates[1].id
+      $scope.importDateFilter = $scope.importDates[1].id
 
   $scope.resetProducts = ->
     DirtyProducts.clear()
@@ -95,10 +101,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.visibleTab = tab
 
   $scope.resetSelectFilters = ->
-    $scope.q.query = ""
-    $scope.q.producerFilter = "0"
-    $scope.q.categoryFilter = "0"
-    $scope.q.importDateFilter = "0"
+    $scope.query = ""
+    $scope.producerFilter = "0"
+    $scope.categoryFilter = "0"
+    $scope.importDateFilter = "0"
     $scope.fetchProducts()
 
   $scope.$watch 'sortOptions', (sort) ->
@@ -116,7 +122,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
-      $window.location.href = ProductFiltersUrl.buildUrl(editProductUrl(product, variant), $scope.q)
+      window.open(editProductUrl(product, variant), "_blank")
+
 
   $scope.toggleShowAllVariants = ->
     showVariants = !DisplayProperties.showVariants 0
@@ -213,10 +220,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       data:
         products: productsToSubmit
         filters:
-          'q[name_cont]': $scope.q.query
-          'q[supplier_id_eq]': $scope.q.producerFilter
-          'q[primary_taxon_id_eq]': $scope.q.categoryFilter
-          import_date: $scope.q.importDateFilter
+          'q[name_cont]': $scope.query
+          'q[supplier_id_eq]': $scope.producerFilter
+          'q[primary_taxon_id_eq]': $scope.categoryFilter
+          import_date: $scope.importDateFilter
         page: $scope.page
         per_page: $scope.per_page
     ).success((data) ->

app/assets/javascripts/admin/directives/select2_min_search.js.coffee

@@ -5,10 +5,5 @@ angular.module("ofn.admin").directive "ofnSelect2MinSearch", ->
       minimumResultsForSearch: attrs.ofnSelect2MinSearch
 
     ngModel.$formatters.push (value) ->
-      # select2 populates options with a value like "number:3" or "string:category" but
-      # select2('val', value) doesn't do the type conversion for us as one would expect
-      if isNaN(value)
-        element.select2('val', "string:#{value}")
-      else
-        element.select2('val', "number:#{value}")
-
+      if (value)
+        element.select2('val', value);

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

@@ -69,24 +69,25 @@ angular.module("admin.enterprises")
       $scope.newUser = $scope.invite_errors = $scope.invite_success = null
 
     $scope.removeLogo = ->
-      $scope.performEnterpriseAction("removeLogo", "immediate_logo_removal_warning", "removed_logo_successfully")
+      return unless confirm(t("admin.enterprises.remove_logo.immediate_removal_warning"))
 
-    $scope.removePromoImage = ->
-      $scope.performEnterpriseAction("removePromoImage", "immediate_promo_image_removal_warning", "removed_promo_image_successfully")
-
-    $scope.removeTermsAndConditions = ->
-      $scope.performEnterpriseAction("removeTermsAndConditions", "immediate_terms_and_conditions_removal_warning", "removed_terms_and_conditions_successfully")
-
-    $scope.performEnterpriseAction = (enterpriseActionName, warning_message_key, success_message_key) ->
-      return unless confirm($scope.translation(warning_message_key))
-
-      Enterprises[enterpriseActionName]($scope.Enterprise).then (data) ->
+      Enterprises.removeLogo($scope.Enterprise).then (data) ->
         $scope.Enterprise = angular.copy(data)
         $scope.$emit("enterprise:updated", $scope.Enterprise)
-        StatusMessage.display("success", $scope.translation(success_message_key))
+
+        StatusMessage.display("success", t("admin.enterprises.remove_logo.removed_successfully"))
       , (response) ->
         if response.data.error?
           StatusMessage.display("failure", response.data.error)
 
-    $scope.translation = (key) ->
-      t('js.admin.enterprises.form.images.' + key)
+    $scope.removePromoImage = ->
+      return unless confirm(t("admin.enterprises.remove_promo_image.immediate_removal_warning"))
+
+      Enterprises.removePromoImage($scope.Enterprise).then (data) ->
+        $scope.Enterprise = angular.copy(data)
+        $scope.$emit("enterprise:updated", $scope.Enterprise)
+
+        StatusMessage.display("success", t("admin.enterprises.remove_promo_image.removed_successfully"))
+      , (response) ->
+        if response.data.error?
+          StatusMessage.display("failure", response.data.error)

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

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

app/assets/javascripts/admin/products/services/option_value_namer.js.coffee

@@ -53,18 +53,17 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       [value, unit_name]
 
     scale_for_unit_value: ->
-      # Find the largest available and compatible unit where unit_value comes
-      # to >= 1 when expressed in it.
-      # If there is none available where this is true, use the smallest
-      # available unit.
-      product = @variant.product
-      scales = VariantUnitManager.compatibleUnitScales(product.variant_unit_scale, product.variant_unit)
-      variantUnitValue = @variant.unit_value
+      # Find the largest available unit where unit_value comes to >= 1 when expressed in it.
+      # If there is none available where this is true, use the smallest available unit.
+      unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit] when @variant.unit_value / scale >= 1).reduce (unit, [scale, unit_name]) ->
+        if (unit && scale > unit[0]) || !unit?
+          [scale, unit_name]
+        else
+          unit
+      , null
+      if !unit?
+        unit = ([scale, unit_name] for scale, unit_name of VariantUnitManager.unitNames[@variant.product.variant_unit]).reduce (unit, [scale, unit_name]) ->
+          if scale < unit[0] then [scale, unit_name] else unit
+        , [Infinity,""]
 
-      # sets largestScale = last element in filtered scales array
-      [_, ..., largestScale] = (scales.filter (s) -> variantUnitValue / s >= 1)
-
-      if (largestScale)
-        [largestScale, VariantUnitManager.getUnitName(largestScale, product.variant_unit)]
-      else
-        [scales[0], VariantUnitManager.getUnitName(scales[0], product.variant_unit)]
+      unit

app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee

@@ -1,35 +1,17 @@
 angular.module("admin.products").factory "VariantUnitManager", ->
   class VariantUnitManager
-    @units:
+    @unitNames:
       'weight':
-        1.0:
-          name: 'g'
-          system: 'metric'
-        1000.0:
-          name: 'kg'
-          system: 'metric'
-        1000000.0:
-          name: 'T'
-          system: 'metric'
-        453.6:
-          name: 'lb'
-          system: 'imperial'
-        28.35:
-          name: 'oz'
-          system: 'imperial'
+        1.0: 'g'
+        1000.0: 'kg'
+        1000000.0: 'T'
       'volume':
-        0.001:
-          name: 'mL'
-          system: 'metric'
-        1.0:
-          name: 'L'
-          system: 'metric'
-        1000.0:
-          name: 'kL'
-          system: 'metric'
+        0.001: 'mL'
+        1.0: 'L'
+        1000.0: 'kL'
 
     @variantUnitOptions: ->
-      options = for unit_type, _ of @units
+      options = for unit_type, scale_with_name of @unitNames
         for scale in @unitScales(unit_type)
           name = @getUnitName(scale, unit_type)
           ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
@@ -48,16 +30,7 @@ angular.module("admin.products").factory "VariantUnitManager", ->
         unitScales[0]
 
     @getUnitName: (scale, unitType) ->
-      if @units[unitType][scale]
-        @units[unitType][scale]['name']
-      else
-        ''
+      @unitNames[unitType][scale]
 
     @unitScales: (unitType) ->
-      (parseFloat(scale) for scale in Object.keys(@units[unitType])).sort (a, b) ->
-         a - b
-
-    @compatibleUnitScales: (scale, unitType) ->
-      scaleSystem = @units[unitType][scale]['system']
-      (parseFloat(scale) for scale, scaleInfo of @units[unitType] when scaleInfo['system'] == scaleSystem).sort (a, b) ->
-         a - b
+      (parseFloat(scale) for scale in Object.keys(@unitNames[unitType])).sort()

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

@@ -14,7 +14,4 @@ angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
     'removePromoImage':
       url: '/api/enterprises/:id/promo_image.json'
       method: 'DELETE'
-    'removeTermsAndConditions':
-      url: '/api/enterprises/:id/terms_and_conditions.json'
-      method: 'DELETE'
   })

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

@@ -52,4 +52,3 @@ angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource
 
     removeLogo: performActionOnEnterpriseResource(EnterpriseResource.removeLogo)
     removePromoImage: performActionOnEnterpriseResource(EnterpriseResource.removePromoImage)
-    removeTermsAndConditions: performActionOnEnterpriseResource(EnterpriseResource.removeTermsAndConditions)

app/assets/javascripts/admin/services/product_filters.js.coffee

@@ -1,23 +0,0 @@
-angular.module("ofn.admin").factory "ProductFiltersUrl", ($httpParamSerializer) ->
-  new class ProductFiltersUrl
-    productFilters: ['producerFilter', 'categoryFilter', 'query', 'sorting', 'importDateFilter']
-
-    loadFromUrl: (filters) ->
-      loadedFilters = {}
-      for filter in @productFilters
-        loadedFilters[filter] = if filters[filter] then filters[filter] else ""
-
-      loadedFilters
-
-    generate: (ctrlFilters) ->
-      filters = {}
-      for filter in @productFilters
-        filters[filter] = ctrlFilters[filter] if ctrlFilters[filter]
-
-      filters
-
-    buildUrl: (baseUrl, ctrlFilters) ->
-      filterUrl = $httpParamSerializer(@generate(ctrlFilters))
-      filterUrl = "?#{filterUrl}" if filterUrl isnt ""
-
-      "#{baseUrl}#{filterUrl}"

app/assets/javascripts/admin/spree/base.js.erb

@@ -116,8 +116,7 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined' &&
-    typeof Spree.translations !== 'undefined') {
+  if (typeof Spree !== 'undefined') {
     handle_date_picker_fields = function(){
       $('.datepicker').datepicker({
         dateFormat: Spree.translations.date_picker,

app/assets/javascripts/admin/spree/image_settings.js.erb

@@ -0,0 +1,59 @@
+$(document).ready(function() {
+
+  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0) {
+    $('#s3_settings, #s3_headers').show();
+  }
+
+  // Toggle display of S3 settings based on value of use_s3 checkbox
+  $('input#preferences_use_s3[type="checkbox"]').click(function() {
+    $('#s3_settings, #s3_headers').toggle();
+  });
+
+  $(document).on('click', '.destroy_style', function(e) {
+    e.preventDefault();
+    $(this).parent().remove();
+  });
+
+  $(document).on('click', '.destroy_new_attachment_styles', function(e) {
+    e.preventDefault();
+    $(this).closest('.new_attachment_styles').remove();
+  });
+
+  $(document).on('click', '.destroy_new_s3_headers', function(e) {
+    e.preventDefault();
+    $(this).closest('.new_s3_headers').remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $(document).on('click', '.add_new_style', function(e) {
+    e.preventDefault();
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+  });
+
+  // Handle adding new headers
+  var headers_hash_index = 1;
+  $(document).on('click', '.add_header', function(e) {
+    e.preventDefault();
+    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<div class="' + hash_name + ' row"><div class="field">';
+    html += '<div class="five columns">';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += Spree.translations.name + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
+    html += '</div><div class="five columns">'
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += Spree.translations.value + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
+    html += '</div><div class="two columns">'
+    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
+    html += '</div></div></div>';
+
+    index += 1;
+    return html;
+  };
+});

app/assets/javascripts/admin/spree/orders/address_states.js

@@ -1,17 +1,27 @@
 var update_state = function(region) {
   var country        = $('span#' + region + 'country .select2').select2('val');
-  var state_select   = $('span#' + region + 'state select.select2');
 
-  $.get(Spree.routes.states_search + "?country_id=" + country, function(states) {
-    state_select.html('');
-    var states_with_blank = [{name: '', id: ''}].concat(states);
-    $.each(states_with_blank, function(pos,state) {
-      var opt = $(document.createElement('option'))
-                .attr('value', state.id)
-                .html(state.name);
-      state_select.append(opt);
-    });
-    state_select.prop("disabled", false).show();
-    state_select.select2();
+  var state_select   = $('span#' + region + 'state select.select2');
+  var state_input    = $('span#' + region + 'state input.state_name');
+
+  $.get(Spree.routes.states_search + "?country_id=" + country, function(data) {
+    var states = data["states"]
+    if (states.length > 0) {
+      state_select.html('');
+      var states_with_blank = [{name: '', id: ''}].concat(states);
+      $.each(states_with_blank, function(pos,state) {
+        var opt = $(document.createElement('option'))
+                  .attr('value', state.id)
+                  .html(state.name);
+        state_select.append(opt);
+      });
+      state_select.prop("disabled", false).show();
+      state_select.select2();
+      state_input.hide().prop("disabled", true);
+
+    } else {
+      state_input.prop("disabled", false).show();
+      state_select.select2('destroy').hide();
+    }
   })
 };

app/assets/javascripts/admin/spree/orders/use_billing.js

@@ -1,17 +0,0 @@
-$(document).ready(function() {
-  var order_use_billing_input = $('input#order_use_billing');
-
-  var order_use_billing = function () {
-    if (!order_use_billing_input.is(':checked')) {
-      $('#shipping').show();
-    } else {
-      $('#shipping').hide();
-    }
-  };
-
-  order_use_billing_input.click(function() {
-    order_use_billing();
-  });
-
-  order_use_billing();
-});

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

@@ -1,13 +0,0 @@
-#= require jsuri
-
-class window.Spree
-  # Helper function to take a URL and add query parameters to it
-  @url: (uri, query) ->
-    if uri.path == undefined
-      uri = new Uri(uri)
-    if query
-      $.each query, (key, value) ->
-        uri.addQueryParam(key, value)
-    if Spree.api_key
-      uri.addQueryParam('token', Spree.api_key)
-    return uri

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

@@ -1,30 +1,22 @@
-$(document).ready(function(){
-  window.JQUERY_UI_DATE_PICKER_DEFAULTS = {
-    dateFormat: Spree.translations.date_picker,
+$(document).ready(function() {
+  $('.datetimepicker').datetimepicker({
+    dateFormat: 'yy-mm-dd',
+    timeFormat: 'HH:mm',
     dayNames: Spree.translations.abbr_day_names,
     dayNamesMin: Spree.translations.abbr_day_names,
     monthNames: Spree.translations.month_names,
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,
-    oneLine: true,
     showOn: 'button',
+    controlType: 'select',
+    oneLine: true,
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
-    buttonImageOnly: true
-  }
+    buttonImageOnly: true,
+    stepMinute: 15
+  });
+});
 
-  window.JQUERY_UI_DATETIME_PICKER_DEFAULTS = Object.assign(
-    {},
-    window.JQUERY_UI_DATE_PICKER_DEFAULTS,
-    {
-      currentText: Spree.translations.datetime_ui_current_text,
-      closeText: Spree.translations.datetime_ui_close_text,
-      timeText: Spree.translations.datetime_ui_time_text,
-      timeFormat: 'HH:mm',
-      controlType: 'select',
-      stepMinute: 15
-    }
-  );
-  $('.datetimepicker').datetimepicker(window.JQUERY_UI_DATETIME_PICKER_DEFAULTS);
+$(document).ready(function(){
   $('a.close').click(function(event){
     event.preventDefault();
     $(this).parent().slideUp(250);

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

@@ -28,23 +28,20 @@
 #= require angular-backstretch.js
 #= require angular-flash.min.js
 #
-#= require moment/min/moment.min.js
-#= require moment/locale/ar.js
-#= require moment/locale/ca.js
-#= require moment/locale/de.js
-#= require moment/locale/en-gb.js
-#= require moment/locale/es.js
-#= require moment/locale/fil.js
-#= require moment/locale/fr.js
-#= require moment/locale/it.js
-#= require moment/locale/nb.js
-#= require moment/locale/nl-be.js
-#= require moment/locale/pt-br.js
-#= require moment/locale/pt.js
-#= require moment/locale/ru.js
-#= require moment/locale/sv.js
-#= require moment/locale/tr.js
-#= require moment/locale/pl.js
+#= require moment
+#= require moment/de.js
+#= require moment/en-gb.js
+#= require moment/es.js
+#= require moment/fr.js
+#= require moment/it.js
+#= require moment/nb.js
+#= require moment/pt-br.js
+#= require moment/pt.js
+#= require moment/ru.js
+#= require moment/sv.js
+#= require moment/ca.js
+#= require moment/ar.js
+#= require moment/tr.js
 #
 #= require modernizr
 #

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

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

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

@@ -68,7 +68,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
       id: $scope.order_cycle.order_cycle_id,
       page: page || $scope.page,
       per_page: $scope.per_page,
-      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
       'q[properties_id_or_supplier_properties_id_in_any][]': $scope.activeProperties,
       'q[primary_taxon_id_in_any][]': $scope.activeTaxons
     }

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

@@ -1,39 +0,0 @@
-Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
-  $scope.$watchGroup [
-    'variant.line_item.quantity',
-    'variant.line_item.max_quantity'
-  ], (new_value, old_value) ->
-    return if old_value[0] == null && new_value[0] == null
-    Cart.adjust($scope.variant.line_item)
-
-  $scope.add = (quantity) ->
-    item = $scope.variant.line_item
-    item.quantity += quantity
-    if $scope.variant.product.group_buy
-      if item.quantity < 1 || item.max_quantity < item.quantity
-        item.max_quantity = item.quantity
-
-  $scope.addMax = (quantity) ->
-    item = $scope.variant.line_item
-    item.max_quantity += quantity
-    if item.max_quantity < item.quantity
-      item.quantity = item.max_quantity
-
-  $scope.canAdd = (quantity) ->
-    wantedQuantity = $scope.variant.line_item.quantity + quantity
-    $scope.quantityValid(wantedQuantity)
-
-  $scope.canAddMax = (quantity) ->
-    variant = $scope.variant
-    wantedQuantity = variant.line_item.max_quantity + quantity
-    $scope.quantityValid(wantedQuantity) && variant.line_item.quantity > 0
-
-  $scope.quantityValid = (quantity) ->
-    variant = $scope.variant
-    minimum = 0
-    maximum = variant.on_demand && Infinity || variant.on_hand
-    quantity >= minimum && quantity <= maximum
-
-  $scope.addBulk = (quantity) ->
-    $scope.add(quantity)
-    $modal.open(templateUrl: "bulk_buy_modal.html", scope: $scope, windowClass: "product-bulk-modal")

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

@@ -2,7 +2,7 @@ Darkswarm.directive "priceBreakdown", ($tooltip)->
   # We use the $tooltip service from Angular foundation to give us boilerplate
   # Subsequently we patch the scope, template and restrictions
   tooltip = $tooltip 'priceBreakdown', 'priceBreakdown', 'click'
-  tooltip.scope =
+  tooltip.scope = 
     variant: "="
   tooltip.templateUrl = "price_breakdown_button.html"
   tooltip.replace = true
@@ -15,3 +15,6 @@ Darkswarm.directive 'priceBreakdownPopup', ->
   replace: true
   templateUrl: 'price_breakdown.html'
   scope: false
+
+  link: (scope, elem, attrs) ->
+    scope.expanded = false unless scope.expanded?

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

@@ -0,0 +1,10 @@
+Darkswarm.directive "pricePercentage", ->
+  restrict: 'E'
+  replace: true
+  templateUrl: 'price_percentage.html'
+  scope:
+    percentage: '='
+
+  link: (scope, elem, attrs) ->
+    elem.find(".meter").css
+      width: "#{scope.percentage}%"

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

@@ -4,4 +4,10 @@ Darkswarm.directive "shopVariant", ->
   templateUrl: 'shop_variant.html'
   scope:
     variant: '='
-  controller: 'ShopVariantCtrl'
+  controller: ($scope, Cart) ->
+    $scope.$watchGroup [
+      'variant.line_item.quantity',
+      'variant.line_item.max_quantity'
+    ], (new_value, old_value) ->
+      return if old_value[0] == null && new_value[0] == null
+      Cart.adjust($scope.variant.line_item)

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

@@ -10,6 +10,7 @@ Darkswarm.factory 'Variants', ->
 
     extend: (variant)->
       variant.extended_name = @extendedVariantName(variant)
+      variant.base_price_percentage = Math.round(variant.price / variant.price_with_fees * 100)
       variant.line_item ||= @lineItemFor(variant) # line_item may have been initialised in Cart#constructor
       variant.line_item.total_price = variant.price_with_fees * variant.line_item.quantity
       variant

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

@@ -1,37 +0,0 @@
-.row
-  .columns.small-12
-    %h3{"ng-bind" => "::variant.extended_name"}
-
-.row.variant-bulk-buy-price-summary
-  .columns.small-6
-    .variant-unit {{ ::variant.unit_to_display }}
-  .columns.small-6
-    {{ variant.line_item.total_price | localizeCurrency }}
-
-.row
-  .columns.small-6
-    .variant-bulk-buy-quantity-label
-      {{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
-    %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
-        -# U+FF0D Fullwidth Hyphen-Minus
-        －
-      %span.bulk-buy.variant-quantity>
-        {{ variant.line_item.quantity }}
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-        -# U+FF0B Fullwidth Plus Sign
-        ＋
-  .columns.small-6
-    .variant-bulk-buy-quantity-label
-      {{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
-    %div
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
-        -# U+FF0D Fullwidth Hyphen-Minus
-        －
-      %span.bulk-buy.variant-quantity>
-        {{ variant.line_item.max_quantity }}
-      %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
-        -# U+FF0B Fullwidth Plus Sign
-        ＋
-
-%ng-include{src: "'partials/close.html'"}

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

@@ -1,16 +1,14 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
-    {{ "js.shopfront.variant.add_to_cart" | t }}
-  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(-1)"}}>
-    -# U+FF0D Fullwidth Hyphen-Minus
-    －
-  %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}}
-    -# U+FF0B Fullwidth Plus Sign
-    ＋
-  %br
-  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
-    {{ "js.shopfront.variant.quantity_in_cart" | t:{quantity: variant.line_item.quantity || 0} }}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.quantity"}}
+  %input{type: :number,
+  integer: true,
+  value: nil,
+  min: 0,
+  placeholder: "0",
+  "ofn-disable-scroll" => true,
+  "ng-debounce" => "500",
+  onwheel: "this.blur()",
+  "ng-model" => "variant.line_item.quantity",
+  "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
+  "ng-disabled" => "!variant.on_demand && variant.on_hand == 0",
+  name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}

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

@@ -1,17 +1,28 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::variant.product.group_buy"}
 
-  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "addBulk(1)", disabled: "!canAdd(1)"}}
-    {{ "js.shopfront.variant.add_to_cart" | t }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}>
-    {{ variant.line_item.quantity }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}
-    {{ variant.line_item.max_quantity || "-" }}
-  %br
-  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
-    {{ "js.shopfront.variant.in_cart" | t }}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.quantity"}}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.max_quantity"}}
+  %span.bulk-input-container
+    %span.bulk-input
+      %input.bulk.first{type: :number,
+      value: nil,
+      integer: true,
+      min: 0,
+      "ng-model" => "variant.line_item.quantity",
+      placeholder: "{{::'shop_variant_quantity_min' | t}}",
+      "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
+      "ofn-on-hand" => "{{variant.on_demand && 9999 || variant.on_hand }}",
+      name: "variants[{{::variant.id}}]", id: "variants_{{::variant.id}}"}
+    %span.bulk-input
+      %input.bulk.second{type: :number,
+      "ng-disabled" => "!variant.line_item.quantity",
+      integer: true,
+      min: 0,
+      "ng-model" => "variant.line_item.max_quantity",
+      placeholder: "{{::'shop_variant_quantity_max' | t}}",
+      "ofn-disable-scroll" => true,
+      "ng-debounce" => "500",
+      onwheel: "this.blur()",
+      min: "{{variant.line_item.quantity}}",
+      name: "variant_attributes[{{::variant.id}}][max_quantity]",
+      id: "variants_{{::variant.id}}_max"}

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

@@ -1,28 +1,37 @@
-.joyride-tip-guide.price_breakdown{ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
-  %span.joyride-nub.top
-  .background{ng: {click: "tt_isOpen = false"}}
+.joyride-tip-guide.price_breakdown{"ng-class" => "{ in: tt_isOpen, fade: tt_animation }"}
+  %span.joyride-nub.right
   .joyride-content-wrapper
-    %h6 {{ "js.shopfront.price_breakdown" | t }}
-    %ul
-      %li
-        .right {{ ::variant.price | localizeCurrency }}
-        %span{"ng-bind" => "::'item_cost' | t"}
-      %li{"ng-if" => "::variant.fees.admin"}
-        .right {{ ::variant.fees.admin | localizeCurrency }}
-        %span{"ng-bind" => "::'admin_fee' | t"}
-      %li{"ng-if" => "::variant.fees.sales"}
-        .right {{ ::variant.fees.sales | localizeCurrency }}
-        %span{"ng-bind" => "::'sales_fee' | t"}
-      %li{"ng-if" => "::variant.fees.packing"}
-        .right {{ ::variant.fees.packing | localizeCurrency }}
-        %span{"ng-bind" => "::'packing_fee' | t"}
-      %li{"ng-if" => "::variant.fees.transport"}
-        .right {{ ::variant.fees.transport | localizeCurrency }}
-        %span{"ng-bind" => "::'transport_fee' | t"}
-      %li{"ng-if" => "::variant.fees.fundraising"}
-        .right {{ ::variant.fees.fundraising | localizeCurrency }}
-        %span{"ng-bind" => "::'fundraising_fee' | t"}
-      %li
-        %strong
-          .right = {{ ::variant.price_with_fees | localizeCurrency }}
-           
+    .collapsed{"ng-show" => "!expanded"}
+      %price-percentage{percentage: 'variant.base_price_percentage'}
+      %a{"ng-click" => "expanded = !expanded"}
+        %span{"ng-bind" => "::'price_breakdown' | t"}
+        %i.ofn-i_005-caret-down
+
+    .expanded{"ng-show" => "expanded"}
+      %ul
+        %li.cost
+          .right {{ ::variant.price | localizeCurrency }}
+          %span{"ng-bind" => "::'item_cost' | t"}
+        %li.admin-fee{"ng-if" => "::variant.fees.admin"}
+          .right {{ ::variant.fees.admin | localizeCurrency }}
+          %span{"ng-bind" => "::'admin_fee' | t"}
+        %li.sales-fee{"ng-if" => "::variant.fees.sales"}
+          .right {{ ::variant.fees.sales | localizeCurrency }}
+          %span{"ng-bind" => "::'sales_fee' | t"}
+        %li.packing-fee{"ng-if" => "::variant.fees.packing"}
+          .right {{ ::variant.fees.packing | localizeCurrency }}
+          %span{"ng-bind" => "::'packing_fee' | t"}
+        %li.transport-fee{"ng-if" => "::variant.fees.transport"}
+          .right {{ ::variant.fees.transport | localizeCurrency }}
+          %span{"ng-bind" => "::'transport_fee' | t"}
+        %li.fundraising-fee{"ng-if" => "::variant.fees.fundraising"}
+          .right {{ ::variant.fees.fundraising | localizeCurrency }}
+          %span{"ng-bind" => "::'fundraising_fee' | t"}
+        %li.total
+          %strong
+            .right = {{ ::variant.price_with_fees | localizeCurrency }}
+             
+
+      %a{"ng-click" => "expanded = !expanded"}
+        %span{"ng-bind" => "::'price_graph' | t"}
+        %i.ofn-i_006-caret-up

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

@@ -0,0 +1,4 @@
+.progress
+  .right {{::'fees' | t}}
+  .meter
+    {{::'item_cost' | t}}

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

@@ -1,16 +1,31 @@
 .variants.row
-  .small-4.medium-4.large-6.columns.variant-name
-    .inline{"ng-if" => "::variant.display_name"} {{ ::variant.display_name }}
-    .variant-unit {{ ::variant.unit_to_display }}
-  .small-3.medium-3.large-2.columns.variant-price
-    %price-breakdown{"price-breakdown" => "_", variant: "variant",
-      "price-breakdown-append-to-body" => "true",
-      "price-breakdown-placement" => "bottom",
-      "price-breakdown-animation" => true}
-    {{ variant.price_with_fees | localizeCurrency }}
-  .medium-2.large-1.columns.total-price
-    %span{"ng-class" => "{filled: variant.line_item.total_price}"}
-      {{ variant.line_item.total_price | localizeCurrency }}
+  .small-12.medium-4.large-4.columns.variant-name
+    .table-cell
+      .inline {{ ::variant.name_to_display }}
+      .bulk-buy.inline{"ng-if" => "::variant.product.group_buy"}
+        %i.ofn-i_056-bulk><
+        %em><
+          \ {{::'bulk' | t}}
 
   %ng-include{src: "'partials/shop_variant_no_group_buy.html'"}
   %ng-include{src: "'partials/shop_variant_with_group_buy.html'"}
+
+  .small-3.medium-1.large-1.columns.variant-unit
+    .table-cell
+      %em {{ ::variant.unit_to_display }}
+
+  .small-4.medium-2.large-2.columns.variant-price
+    .table-cell.price
+      %i.ofn-i_009-close
+      {{ variant.price_with_fees | localizeCurrency }}
+
+      -# Now in a template in app/assets/javascripts/templates !
+      %price-breakdown{"price-breakdown" => "_", variant: "variant",
+        "price-breakdown-append-to-body" => "true",
+        "price-breakdown-placement" => "left",
+        "price-breakdown-animation" => true}
+
+  .small-12.medium-2.large-2.columns.total-price.text-right
+    .table-cell
+      %strong{"ng-class" => "{filled: variant.line_item.total_price}"}
+        {{ variant.line_item.total_price | localizeCurrency }}

app/assets/stylesheets/admin/all.scss

@@ -35,6 +35,7 @@
 @import 'plugins/font-awesome';
 @import 'plugins/select2';
 
+@import 'sections/image_settings';
 @import 'sections/orders';
 @import 'sections/products';
 

app/assets/stylesheets/admin/enterprise_console.scss

@@ -1,9 +1,7 @@
-@import "../variables";
+@import "variables";
 
-span.unavailable,
-span.available {
+span.unavailable, span.available {
   font-weight: bold;
-
   i {
     font-size: 150%;
   }
@@ -15,4 +13,4 @@ span.available {
 
 span.unavailable {
   color: $warning-red;
-}
+}

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

@@ -1,5 +1,3 @@
-@import 'shared/variables/layout';
-
 // -------------------------------------------------------------
 //   Variables used in all other files
 //--------------------------------------------------------------

app/assets/stylesheets/admin/hacks/ie.scss

@@ -29,6 +29,11 @@ html.ie {
       z-index: 0;
     }
   }
+
+  // Fix margin-top for destroy paperclip styles background
+  .destroy_new_attachment_styles {
+    margin-top: 17px !important;
+  }
 }
 
 // IE8 Hacks

app/assets/stylesheets/admin/sections/image_settings.scss

@@ -0,0 +1,3 @@
+.destroy_style, .destroy_header {
+  float: right;
+}

app/assets/stylesheets/admin/shared/layout.scss

@@ -8,61 +8,23 @@
           box-sizing: border-box;
 }
 
-.admin {
-  &__section-header {
-    padding: 15px 0;
-    background-color: very-light($color-3, 4);
-    border-bottom: 1px solid $color-border;
+// Helpers
+.block-table {
+  display: table;
+  width: 100%;
 
-    .ofn-drop-down {
-      border: 0;
-      background-color: $spree-blue;
-      color: $color-1;
-      float: none;
-      margin-left: 3px;
-      &:hover,
-      &.expanded {
-        border: 0;
-        color: $color-1;
-      }
+  .table-cell {
+    display: table-cell;
+    vertical-align: middle;
+    padding: 0 10px;
+
+    &:first-child {
+      padding-left: 0;
+      width: 70%;
     }
-
-    &__content {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      @media all and (min-width: $tablet_breakpoint) {
-        flex-wrap: nowrap;
-      }
-    }
-
-    &__title {
-      width: 100%;
-      margin-bottom: 10px;
-      @media all and (min-width: $tablet_breakpoint) {
-        margin-bottom: 0;
-      }
-    }
-
-    &__actions {
-      display: flex;
-      flex: 1 0 auto;
-      align-items: center;
-      list-style: none;
-      @media all and (min-width: $tablet_breakpoint) {
-        justify-content: flex-end;
-      }
-      > li {
-        display: flex;
-        margin-right: 10px;
-        &:empty {
-          display: none;
-        }
-        &:last-child {
-          margin-right: 0;
-        }
-      }
+    &:last-child {
+      padding-right: 0;
+      width: 30%;
     }
   }
 }
@@ -71,6 +33,12 @@
   display: none;
 }
 
+// For block grids
+.frameless {
+  margin-left: -10px;
+  margin-right: -10px;
+}
+
 // Header
 //---------------------------------------------------
 #header {
@@ -98,6 +66,25 @@
   margin-top: 15px;
 }
 
+#content-header {
+  padding: 15px 0;
+  background-color: very-light($color-3, 4);
+  border-bottom: 1px solid $color-border;
+
+  .page-title {
+    font-size: 20px;
+
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+  .page-actions {
+    text-align: right;
+    form {
+      display: inline-block;
+    }
+  }
+}
+
 // Footer
 //---------------------------------------------------
 #footer {

app/assets/stylesheets/admin/shared/typography.scss

@@ -132,25 +132,3 @@ dl {
   padding: 40px 0px;
   color: lighten($color-body-text, 15);
 }
-
-.text-normal {
-  font-size: 1rem;
-  font-weight: 300;
-}
-
-.text-big {
-  font-size: 1.2rem;
-  font-weight: 300;
-}
-
-.text-red {
-  color: $warning-red;
-}
-
-input.text-big {
-  font-size: 1.1rem;
-}
-
-.pad-top {
-  padding-top: 1em;
-}

app/assets/stylesheets/admin/typography.scss

@@ -0,0 +1,20 @@
+@import "variables";
+
+.text-normal {
+  font-size: 1.0rem;
+  font-weight: 300;
+}
+
+.text-big {
+  font-size: 1.2rem;
+  font-weight: 300;
+}
+
+.text-red {
+  color: $warning-red;
+}
+
+
+input.text-big {
+  font-size: 1.1rem;
+}

app/assets/stylesheets/darkswarm/_shop-inputs.scss

@@ -6,110 +6,93 @@
 .darkswarm {
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
-}
 
-.reveal-modal.product-bulk-modal {
-  width: 26em;
-}
+  // ordering
+  product {
+    input {
+      @include border-radius(0);
 
-// Components to add variants to cart and change quantities
-//
-// They are not nested so that they can be used in modals.
-button.add-variant, button.variant-quantity {
-  height: 2.5rem;
-  border-radius: 0;
-  background-color: $orange-500;
-  color: white;
-  // Override foundation button styles:
-  font-size: 1rem;
-  margin: 0;
-  padding: 0;
-  transition: none;
+      @include csstrans;
 
-  &:hover {
-    background-color: $orange-600;
-  }
-  &[disabled] {
-    &:hover, &:focus {
-      background-color: $orange-500;
+      margin: 0;
+      width: 10rem;
+      display: inline;
+
+      @include box-shadow(none);
+
+      border-color: #b3b3b3;
+      text-align: right;
+
+      @include breakpoint(desktop) {
+        width: 8rem;
+      }
+
+      @include breakpoint(tablet) {
+        width: 7rem;
+      }
+
+      @include breakpoint(phablet) {
+        float: left !important;
+        font-size: 0.75rem;
+        padding-left: 0.25rem;
+        padding-right: 0.25rem;
+      }
+
+      @include breakpoint(mobile) {
+        width: 5.8rem;
+      }
+
+      &:hover {
+        @include box-shadow(none);
+
+        border-color: #888;
+        background-color: #fafafa;
+      }
+
+      &:active, &:focus, &.active {
+        @include box-shadow(none);
+
+        background-color: #f9f4b9;
+        border-color: #666;
+      }
     }
-  }
-  &:nth-of-type(1) {
-    border-bottom-left-radius: 0.25em;
-    border-top-left-radius: 0.25em;
-  }
-  &:nth-last-of-type(1) {
-    border-top-right-radius: 0.25em;
-    border-bottom-right-radius: 0.25em;
-  }
-}
 
-button.add-variant {
-  min-width: 6rem;
-  padding: 0 1em;
+    // BULK
 
-  &[disabled] {
-    &:hover, &:focus {
-      background-color: $orange-500;
+    input.bulk {
+      width: 5rem;
+
+      @include breakpoint(desktop) {
+        width: 4rem;
+      }
+
+      @include breakpoint(tablet) {
+        width: 3.5rem;
+      }
+
+      @include breakpoint(mobile) {
+        width: 2.8rem;
+      }
+    }
+
+    input.bulk.first {
+      border-right: 0;
+    }
+
+    input.bulk.second {
+      border-left: 0;
+    }
+
+    .bulk-input-container {
+      float: right;
+
+      @include breakpoint(phablet) {
+        float: left !important;
+      }
+
+      .bulk-input {
+        float: left;
+      }
     }
   }
 }
-
-button.variant-quantity {
-  width: 3rem;
-
-  &:nth-of-type(1):not(.bulk-buy):not(.bulk-buy-add) {
-    border-right: .1em solid $orange-400;
-  }
-}
-
-.variant-quantity-display {
-  display: inline-block;
-  font-size: 0.875em;
-  margin-top: 0.25em;
-  text-align: center;
-  width: 6rem;
-  visibility: hidden;
-
-  &.visible {
-    visibility: visible;
-  }
-}
-
-button.bulk-buy.variant-quantity {
-  background-color: transparent;
-  border: .1em solid $grey-200;
-  color: inherit;
-}
-
-button.bulk-buy-add.variant-quantity {
-  width: 2.5rem;
-
-  &[disabled] {
-    background-color: $grey-400;
-
-    &:hover, &:focus {
-      background-color: $grey-400;
-    }
-  }
-}
-
-span.bulk-buy.variant-quantity {
-  border: .1em solid $grey-200;
-  height: 2.5rem;
-  display: inline-block;
-  min-width: 3em;
-  padding: .5em;
-  text-align: center;
-  vertical-align: top;
-}
-
-.variant-bulk-buy-price-summary {
-  color: $disabled-med;
-  margin-bottom: 1em;
-}
-
-.variant-bulk-buy-quantity-label {
-  font-size: 0.875rem;
-  margin-bottom: .5em;
-}

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

@@ -178,7 +178,7 @@ shop ordercycle {
 }
 
 shop navigation ordercycle {
-  margin-top: 3.4em;
+  margin-top: 3em;
   padding: 1em;
   height: 7.6em;
   position: absolute;

app/assets/stylesheets/darkswarm/_shop-popovers.scss

@@ -4,69 +4,86 @@
 // Pop over
 // Foundation overrides
 .joyride-tip-guide.price_breakdown {
-  width: 16rem;
-  max-width: 65%;
   // JS needs to be tweaked to adjust for left alignment - this is dynamic can't rewrite in CSS
-  margin-left: -7.4rem;
-  margin-top: 0.1rem;
+  background-color: #999;
+  color: #1f1f1f;
+  margin-left: -8px;
 
-  @include box-shadow(0 2px 8px 0 rgba(0, 0, 0, 0.35));
+  @include box-shadow(0 1px 2px 0 rgba(0, 0, 0, 0.7));
 
   .joyride-content-wrapper {
-    padding: .625rem;
+    padding: 1.125rem 1.25rem 1.5rem;
+    padding: 1rem;
+    margin: 1%;
     width: 98%;
-    background-color: $grey-800;
+    background-color: white;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    color: #1f1f1f;
+  }
+
+  .joyride-nub.right {
+    top: 38px;
+    border-color: #999 !important;
+    border-top-color: transparent !important;
+    border-right-color: transparent !important;
+    border-bottom-color: transparent !important;
+  }
+
+  .progress {
+    background-color: #13bf85;
+    padding: 0;
+    border: none;
     color: white;
-  }
-
-  h6 {
-    font-size: 0.937rem;
+    font-size: 0.75rem;
+    font-style: oblique;
     line-height: 1;
-    border-bottom: .1em solid $grey-700;
-    padding: 0 0 .625em 0;
-    margin-bottom: 2px;
+    height: auto;
+
+    .right {
+      padding: 0.5rem 0.25rem 0 0;
+    }
+
+    .meter {
+      background-color: #0b8c61;
+      padding: 0.5rem 0.25rem;
+      border-right: 1px solid #539f92;
+    }
   }
 
-  .joyride-nub.top {
-    left: 7.4rem;
-    z-index: -1;
-  }
+  .expanded {
+    ul, li {
+      list-style: none;
+      margin: 0;
+      font-size: 0.875rem;
+    }
 
-  .background {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-    cursor: pointer;
-  }
+    li {
+      background-color: #13bf85;
+      padding: 0 0.25rem;
+      margin-bottom: 2px;
+      color: white;
+    }
 
-  ul, li {
-    list-style: none;
-    margin: 0;
-    font-size: 0.875rem;
-  }
+    li.cost {
+      background-color: #0b8c61;
+    }
 
-  li {
-    line-height: 1;
-    border-bottom: .1em solid $grey-700;
-    padding: 0.625rem 0;
-    margin-bottom: 2px;
-  }
-
-  li:last-child {
-    border-bottom: 0;
-    padding-bottom: 0;
+    li:last-child {
+      margin-bottom: 0.75rem;
+    }
   }
 }
 
 button.graph-button {
   // z-index: 9999999
+  border: 1px solid transparent;
   padding: 0;
   margin: 0;
-  display: inline-block;
+  display: inline;
   background-color: rgba(255, 255, 255, 0.5);
+  padding: 4px;
 
   @include box-shadow(none);
 
@@ -80,6 +97,7 @@ button.graph-button {
   }
 
   &:focus {
+    border: 1px solid #e0e0e0;
     background-color: rgba(255, 255, 255, 1);
 
     &:before {
@@ -89,15 +107,22 @@ button.graph-button {
 
   &:hover, &:active {
     background-color: rgba(255, 255, 255, 1);
+    border: 1px solid transparent;
 
     &:before {
-      color: $teal-500;
+      color: $clr-brick-bright;
     }
   }
+
+  @include breakpoint(tablet) {
+    // Hide for small
+    display: none;
+  }
 }
 
 button.graph-button.open {
-  background-color: $teal-500;
+  border: 1px solid transparent;
+  background-color: $clr-brick-bright;
 
   &:before {
     content: "";

app/assets/stylesheets/darkswarm/_shop-product-rows.scss

@@ -10,57 +10,91 @@
         .columns {
           padding-top: 0em;
           padding-bottom: 0em;
+          display: table;
           line-height: 1.1;
+
+          // outline: 1px solid red
+
+          @include breakpoint(tablet) {
+            font-size: 0.875rem;
+          }
+
+          @include breakpoint(phablet) {
+            font-size: 0.75rem;
+          }
         }
-      }
 
-      .shop-variants {
-        // product-thumb width + 1rem
-        padding-left: calc(22.222% + 1rem);
-
-        @include breakpoint(phablet) {
-          padding-left: 0;
-          clear: left;
+        .table-cell {
+          display: table-cell;
+          vertical-align: middle;
+          height: 37px;
         }
       }
 
       // ROW VARIANTS
       .row.variants {
-        margin: 0 0 1em 0;
+        margin-left: 0;
+        margin-right: 0;
+        background-color: #ECECEC;
+
+        &:hover, &:focus, &:active {
+          background-color: $clr-brick-light;
+        }
+
+        &:nth-of-type(even) {
+          background-color: #f9f9f9;
+
+          &:hover, &:focus, &:active {
+            background-color: $clr-brick-ultra-light;
+          }
+        }
 
         &.out-of-stock {
           opacity: 0.2;
         }
 
-        .variant-name,
-        .total-price {
-          padding-top: .74em;
-        }
-        .variant-price {
-          padding-top: .65em;
-        }
-
         // Variant name
         .variant-name {
-          padding-left: 0;
-          padding-right: 0;
+          padding-left: 7.9375rem;
 
-          @include breakpoint(phablet) {
-            padding-left: 0.5rem;
+          @include breakpoint(tablet) {
+            padding-left: 4.9375rem;
           }
+        }
 
-          & > *:nth-child(n + 2) {
-            color: $grey-550;
-            font-size: 0.875rem;
-            font-style: italic;
-            line-height: normal;
+        .variant-name {
+          @include breakpoint(phablet) {
+            background: #333;
+            color: white;
+            padding-left: 0.9375rem;
+            font-weight: bold;
+
+            .table-cell {
+              height: 27px;
+            }
+          }
+        }
+
+        // Variant unit
+        .variant-unit {
+          padding-left: 0rem;
+          padding-right: 0rem;
+          color: #888;
+          font-size: 0.875rem;
+          overflow: hidden;
+
+          @include breakpoint(tablet) {
+            font-size: 0.75rem;
           }
         }
 
         // Variant price
         .variant-price {
+          padding-left: 0.25rem;
+          padding-right: 0.25rem;
+
           @include breakpoint(phablet) {
-            padding-left: 1rem;
+            text-align: right;
           }
         }
 
@@ -74,16 +108,24 @@
           }
 
           @include breakpoint(phablet) {
-            display: none;
+            background: #777;
+            color: $disabled-med;
+
+            .filled {
+              color: white;
+            }
+
+            .table-cell {
+              height: 27px;
+            }
           }
         }
       }
 
       // ROW SUMMARY
-      .summary {
+      .row.summary {
         margin-left: 0;
         margin-right: 0;
-        margin-bottom: 1.25em;
         background: #fff;
 
         .columns {
@@ -98,77 +140,39 @@
         }
 
         .summary-header {
-          // product-thumb width + 1rem
-          padding-left: calc(22.222% + 1rem);
-          padding-right: 1rem;
+          padding-left: 7.9375rem;
 
-          @include breakpoint(phablet) {
-            padding-left: calc(33.333% + 1rem);
+          @include breakpoint(tablet) {
+            padding-left: 4.9375rem;
           }
 
-          .product-producer {
-            color: $grey-550;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            font-style: italic;
+          @include breakpoint(phablet) {
+            padding-left: 0.9375rem;
+          }
 
-            a {
-              color: $teal-500;
-
-              &:hover, &:focus, &:active {
-                color: $teal-600;
-                text-decoration: underline;
-              }
-            }
+          small {
+            font-size: 80%;
           }
 
           h3 {
-            font-size: 1.3rem;
-            margin-top: 0.75rem;
-            margin-bottom: 0.6rem;
+            font-size: 1.5rem;
+            margin: 0;
           }
 
           h3 a {
-            color: $orange-500;
+            color: #222;
+
+            i {
+              @include csstrans;
+
+              font-size: 0.6em;
+            }
 
             &:hover, &:focus, &:active {
-              color: $orange-600;
-              text-decoration: underline;
-            }
-          }
+              color: $clr-brick;
 
-          .product-description {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            margin-bottom: 0.75rem;
-          }
-
-          .product-properties {
-            margin: .5em 0;
-
-            li {
-              margin: 0 0.25rem 0.25rem 0;
-
-              a {
-                padding: 0.1em 0.625em;
-
-                cursor: auto;
-
-                &.has-tip {
-                  cursor: pointer;
-                  font-weight: normal;
-                }
-                &:hover, &:focus {
-                  border-color: #ccc;
-                }
-              }
-
-              // Foundation doesn't show the nub on mobile.
-              // Repeating the style to show it here.
-              .nub {
-                border-color: transparent transparent #333333 transparent;
+              i {
+                font-size: 0.8em;
               }
             }
           }

app/assets/stylesheets/darkswarm/_shop-product-thumb.scss

@@ -1,32 +1,80 @@
+@import "mixins";
+@import "branding";
+@import "animations";
+
 .darkswarm {
   products {
     product {
       .product-thumb {
-        // Desktop: the product summary is nine columns wide. Use two
-        // for the image. 100% / 9 * 2 = 22.222% <= 192px
-        width: calc(22.222%);
+        @include csstrans;
+
+        position: absolute;
+        top: 2px;
+        left: 0px;
+        width: 7rem;
+        height: 7rem;
         float: left;
+        display: block;
+        z-index: 1;
+        background-color: white;
+        overflow: hidden;
 
-        // Mobile: the summary has full twelve columns and the image
-        // should take four of them. 100% / 12 * 4 = 33.333% <= 227px
-        @include breakpoint(phablet) {
-          width: calc(33.333%);
-        }
+        i {
+          @include csstrans;
 
-        // Make this an anchor for the bulk label.
-        position: relative;
-
-        .product-thumb__bulk-label {
-          background-color: $grey-700;
-          color: white;
+          transition-delay: 150ms;
           position: absolute;
-          right: 0;
-          top: .8em;
-          padding: .25em .5em;
+          left: 45%;
+          top: 45%;
+          z-index: 99999;
+          color: white;
+          font-size: 1rem;
+          opacity: 0;
         }
 
-        &:hover {
-          filter: brightness(96%);
+        img {
+          @include csstrans;
+
+          opacity: 1;
+
+          @include transform-scale(scale(1));
+        }
+
+        &:hover, &:focus, &:active {
+          background-color: $clr-brick;
+
+          i {
+            left: 32%;
+            top: 30%;
+            font-size: 3rem;
+            opacity: 1;
+          }
+
+          img {
+            opacity: 0.5;
+
+            @include transform-scale(scale(1.1));
+          }
+        }
+
+        @include breakpoint(tablet) {
+          top: 2px;
+          width: 4rem;
+          height: 4rem;
+
+          &:hover, &:focus, &:active {
+            i {
+              left: 30%;
+              top: 30%;
+              font-size: 2rem;
+            }
+          }
+        }
+
+        @include breakpoint(phablet) {
+          display: none;
+          width: 0rem;
+          height: 0rem;
         }
       }
     }

app/assets/stylesheets/darkswarm/_shop-taxon-flag.scss

@@ -0,0 +1,47 @@
+@import "mixins";
+
+.darkswarm {
+  products {
+    product {
+      .taxon-flag {
+        background: transparent image-url("flag.svg") top center no-repeat;
+        background-size: 34px 39px;
+        min-height: 40px;
+        width: 34px;
+        margin-top: -1.1rem;
+        padding-top: 0.25rem;
+        z-index: 999999;
+
+        @include breakpoint(mobile) {
+          background-size: 28px 32px;
+          min-height: 32px;
+          width: 28px;
+        }
+
+        render-svg {
+          svg {
+            width: 24px;
+            height: 24px;
+
+            path {
+              fill: #999;
+            }
+          }
+        }
+
+        @include breakpoint(tablet) {
+          margin-top: -0.85rem;
+        }
+
+        @include breakpoint(mobile) {
+          render-svg {
+            svg {
+              width: 18px;
+              height: 18px;
+            }
+          }
+        }
+      }
+    }
+  }
+}

app/assets/stylesheets/darkswarm/branding.scss

@@ -11,6 +11,7 @@ $ofn-grey: #808184;
 $clr-brick: #c1122b;
 $clr-brick-light: #f5e6e7;
 $clr-brick-light-trans: rgba(245, 230, 231, 0.9);
+$clr-brick-ultra-light: #faf5f6;
 $clr-brick-bright: #eb4c46;
 $clr-brick-med-bright: #e5a2a0;
 $clr-brick-light-bright: #f5c4c9;
@@ -47,7 +48,6 @@ $grey-200: #ddd;
 $grey-300: #ccc;
 $grey-400: #bbb;
 $grey-500: #999;
-$grey-550: #888;
 $grey-600: #777;
 $grey-650: #666;
 $grey-700: #555;
@@ -56,7 +56,6 @@ $grey-800: #333;
 $teal-300: #80d3df;
 $teal-400: #4cb5c5;
 $teal-500: #0096ad;
-$teal-600: #007a9a;
 
 $orange-400: #ff9466;
 $orange-450: #f4704c;

app/assets/stylesheets/darkswarm/embedded_shopfront.scss

@@ -59,6 +59,13 @@ body.embedded {
         line-height: $large-menu-height;
         height: $large-menu-height;
         vertical-align: top;
+
+        &.cart {
+          div.joyride-tip-guide { // Cart Dropdown
+            top: 75px;
+            overflow: visible;
+          }
+        }
       }
     }
 

app/assets/stylesheets/darkswarm/hub_node.scss

@@ -16,22 +16,6 @@
 
     .active_table_row {
       line-height: 1rem;
-
-      @include breakpoint(phablet) {
-        display: inline-block;
-        width: 100%;
-        background-color: rgba($white, 0.75);
-
-        &:not(.open) {
-          .columns:last-child {
-            padding-left: 0;
-          }
-        }
-
-        a.hub {
-          display: inline-block;
-        }
-      }
     }
 
     //Generic text link style
@@ -60,6 +44,13 @@
       }
     }
 
+    //Hub Link
+    @include breakpoint(phablet) {
+      a.hub {
+        display: block;
+      }
+    }
+
     //Hub Name
     span.hub-name-listing {
       font-weight: 700;
@@ -76,11 +67,11 @@
       .active_table_row {
         border: 1px solid transparent;
 
-        &:hover, &:active, &:focus {
-          border-color: $clr-brick-light-bright;
+        @include breakpoint(phablet) {
+          border-color: $clr-brick-light;
         }
 
-        @include breakpoint(phablet) {
+        &:hover, &:active, &:focus {
           border-color: $clr-brick-light-bright;
         }
       }
@@ -174,9 +165,8 @@
         }
 
         @include breakpoint(phablet) {
-          .active_table_row:first-child,
-          .active_table_row:last-child, {
-            background-color: rgba($white, 0.75);
+          .active_table_row:first-child .skinny-head {
+            background-color: rgba(255, 255, 255, 0.85);
           }
         }
       }

app/assets/stylesheets/darkswarm/menu.scss

@@ -212,7 +212,7 @@ nav.top-bar {
 }
 
 .off-canvas-wrap {
-  overflow: initial;
+  overflow: inherit;
 }
 
 .off-canvas-list li.language-switcher ul li {

app/assets/stylesheets/darkswarm/mixins.scss

@@ -1,5 +1,4 @@
 // Note this mixin file is used in ADMIN and FRONTEND
-@import 'shared/variables/layout';
 
 @import "branding";
 
@@ -142,6 +141,57 @@
 
 // Background options \\
 
+@mixin darkbg {
+  background-color: $clr-brick;
+
+  &, & * {
+    color: white;
+  }
+
+  a {
+    color: $clr-brick-ultra-light;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-brick-light;
+    }
+  }
+}
+
+@mixin lightbg {
+  background-color: $clr-brick-light;
+
+  &, & * {
+    color: black;
+  }
+
+  a {
+    color: $clr-brick;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-brick-bright;
+    }
+  }
+}
+
+@mixin turqbg {
+  background-color: $clr-turquoise-light;
+
+  &, & * {
+    color: $clr-turquoise;
+  }
+
+  a {
+    color: $clr-turquoise;
+
+    &:hover {
+      text-decoration: none;
+      color: $clr-turquoise-bright;
+    }
+  }
+}
+
 @mixin fullbg {
   background-position: center center;
   background-repeat: no-repeat;
@@ -151,6 +201,12 @@
   background-size: cover;
 }
 
+@mixin fullwidthbg {
+  background-position: center top;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
+
 @mixin gradient($gradient-clr1, $gradient-clr2) {
   background: $gradient-clr1;
 
@@ -202,15 +258,15 @@
 
 @mixin breakpoint($point) {
   @if $point == desktop {
-    @media all and (max-width: $desktop_breakpoint) { @content; }
+    @media all and (max-width: 1024px) { @content; }
   }
   @else if $point == tablet {
-    @media all and (max-width: $tablet_breakpoint) { @content; }
+    @media all and (max-width: 768px) { @content; }
   }
   @else if $point == phablet {
-    @media all and (max-width: $phablet_breakpoint)  { @content; }
+    @media all and (max-width: 640px)  { @content; }
   }
   @else if $point == mobile {
-    @media all and (max-width: $mobile_breakpoint)  { @content; }
+    @media all and (max-width: 480px)  { @content; }
   }
 }

app/assets/stylesheets/darkswarm/producer_node.scss

@@ -5,11 +5,6 @@
   .active_table .active_table_node {
     // Header row
     @include breakpoint(phablet) {
-      .active_table_row {
-        display: inline-block;
-        width: 100%;
-      }
-
       .skinny-head {
         background-color: $clr-turquoise-light;
 

app/assets/stylesheets/darkswarm/shop.scss

@@ -8,30 +8,10 @@
 @import "shop-inputs";
 @import "shop-navigation";
 @import "shop-product-rows";
+@import "shop-taxon-flag";
 @import "shop-popovers";
 
 .darkswarm {
-  .product-listing {
-    @include breakpoint(desktop) {
-      padding-right: 0;
-      padding-left: 0;
-    }
-
-    .row.full {
-      width: 100%;
-      margin: 0;
-
-      .columns.full {
-        padding-right: 0;
-        padding-left: 0;
-      }
-    }
-  }
-
-  .filter-header {
-    margin-top: 1.1em;
-  }
-
   products {
     display: block;
 
@@ -71,18 +51,32 @@
     product {
       @include csstrans;
 
-      // Avoid margin collapsing which breaks the flush alignment of the first
-      // image.
-      overflow: auto;
-
-      &:nth-child(n + 2) {
-        border-top: 1px solid $grey-100;
-      }
+      border-bottom: 1px solid #e5e5e5;
+      border-top: 1px solid #e5e5e5;
       padding-bottom: 1px;
+      margin-bottom: 20px !important;
       position: relative;
       display: block;
       color: $med-drk-grey;
 
+      &:hover, &:focus, &:active {
+        border-bottom: 1px solid $clr-brick-med-bright;
+        border-top: 1px solid $clr-brick-med-bright;
+      }
+
+      // BULK
+      .bulk-buy {
+        font-size: 0.875rem;
+
+        @include breakpoint(tablet) {
+          font-size: 0.75rem;
+        }
+      }
+
+      .bulk-buy, .bulk-buy i {
+        color: #888;
+      }
+
       .inline {
         display: inline;
       }
@@ -91,6 +85,27 @@
         width: 100px;
         margin-bottom: 20px;
       }
+
+      // ICONS
+      i {
+        font-size: 0.75em;
+        padding-right: 0.9375rem;
+
+        @include breakpoint(phablet) {
+          padding-right: 0.25rem;
+        }
+      }
+
+      i.ofn-i_056-bulk {
+        font-size: 1rem;
+        padding-right: 0rem;
+      }
+
+      i.ofn-i_036-producers {
+        padding-left: 0.2rem;
+        padding-right: 0rem;
+        font-size: 0.8rem;
+      }
     }
   }
 

app/assets/stylesheets/darkswarm/shop_search.scss

@@ -6,6 +6,7 @@
   background-color: $grey-100;
   height: 5em;
   padding: 1em 0;
+  margin-bottom: 1em;
   position: relative;
   z-index: 5;
 
@@ -49,7 +50,7 @@
 
   button {
     background-color: $grey-600;
-    margin: 0 0 0 1em;
+    margin-left: 1em;
     height: 3em;
     width: 7em;
     padding: 0;

app/assets/stylesheets/darkswarm/shop_tabs.scss

@@ -34,7 +34,7 @@
     >a {
       outline: none;
       display: block;
-      color: $black;
+      color: $grey-500;
       font-family: "Oswald", sans-serif;
     }
 
@@ -42,9 +42,9 @@
       @include headingFont;
 
       background: transparent;
-      text-transform: capitalize;
+      text-transform: uppercase;
       line-height: 1;
-      font-size: 1em;
+      font-size: 0.875em;
       padding: 1em 2em;
       border: none;
 
@@ -58,7 +58,6 @@
 
       @include breakpoint(phablet) {
         padding: 0.35em 0 0.65em 0;
-        font-size: 0.875em;
       }
     }
 

app/assets/stylesheets/darkswarm/ui.scss

@@ -159,6 +159,11 @@ a.button.large {
   display: flex;
 }
 
+.no-gutter {
+  padding-right: 0;
+  padding-left: 0;
+}
+
 .disable-scroll {
   overflow: hidden;
 }

app/assets/stylesheets/shared/variables/_layout.scss

@@ -1,6 +0,0 @@
-// Breakpoints
-$desktop_breakpoint: 1024px;
-$tablet_breakpoint: 768px;
-$phablet_breakpoint: 640px;
-$mobile_breakpoint: 480px;
-

app/controllers/admin/enterprises_controller.rb

@@ -73,7 +73,7 @@ module Admin
 
       if @enterprise.update(attributes)
         flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name)
-        redirect_to spree.admin_dashboard_path
+        redirect_to admin_dashboard_path
       else
         flash[:error] = I18n.t(:enterprise_register_error, enterprise: @enterprise.name)
         render :welcome, layout: "spree/layouts/bare_admin"

app/controllers/api/base_controller.rb

@@ -33,6 +33,12 @@ module Api
     use_renderers :json
     check_authorization
 
+    # Temporary measure to help debugging strong_parameters
+    rescue_from ActiveModel::ForbiddenAttributesError, with: :print_params
+    def print_params
+      raise ActiveModel::ForbiddenAttributesError, params.to_s
+    end
+
     def set_jsonp_format
       return unless params[:callback] && request.get?
 

app/controllers/api/order_cycles_controller.rb

@@ -75,7 +75,7 @@ module Api
     end
 
     def permitted_ransack_params
-      [:name_or_meta_keywords_or_variants_display_as_or_variants_display_name_or_supplier_name_cont,
+      [:name_or_meta_keywords_or_supplier_name_cont,
        :properties_id_or_supplier_properties_id_in_any,
        :primary_taxon_id_in_any]
     end

app/controllers/api/states_controller.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class StatesController < Api::BaseController
-    respond_to :json
-
-    skip_authorization_check
-
-    def index
-      render json: states, each_serializer: Api::StateSerializer, status: :ok
-    end
-
-    def show
-      @state = scope.find(params[:id])
-      render json: @state, serializer: Api::StateSerializer, status: :ok
-    end
-
-    private
-
-    def scope
-      if params[:country_id]
-        @country = Spree::Country.find(params[:country_id])
-        @country.states
-      else
-        Spree::State.all
-      end
-    end
-
-    def states
-      states = scope.ransack(params[:q]).result.
-        includes(:country).order('name ASC')
-
-      if pagination?
-        states = states.page(params[:page]).per(params[:per_page])
-      end
-
-      states
-    end
-
-    def pagination?
-      params[:page] || params[:per_page]
-    end
-  end
-end

app/controllers/api/terms_and_conditions_controller.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TermsAndConditionsController < Api::EnterpriseAttachmentController
-    private
-
-    def attachment_name
-      :terms_and_conditions
-    end
-
-    def enterprise_authorize_action
-      case action_name.to_sym
-      when :destroy
-        :remove_terms_and_conditions
-      end
-    end
-  end
-end

app/controllers/application_controller.rb

@@ -10,6 +10,12 @@ class ApplicationController < ActionController::Base
   include EnterprisesHelper
   include Spree::AuthenticationHelpers
 
+  # Temporary measure to help debugging strong_parameters
+  rescue_from ActiveModel::ForbiddenAttributesError, with: :print_params
+  def print_params
+    raise ActiveModel::ForbiddenAttributesError, params.to_s
+  end
+
   def redirect_to(options = {}, response_status = {})
     ::Rails.logger.error("Redirected by #{begin
                                             caller(1).first

app/controllers/checkout_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open_food_network/address_finder'
-require 'spree/core/gateway_error'
 
 class CheckoutController < Spree::StoreController
   layout 'darkswarm'
@@ -48,6 +47,8 @@ class CheckoutController < Spree::StoreController
     params_adapter = Checkout::FormDataAdapter.new(permitted_params, @order, spree_current_user)
     return action_failed unless @order.update(params_adapter.params[:order])
 
+    fire_event('spree.checkout.update')
+
     checkout_workflow(params_adapter.shipping_method_id)
   rescue Spree::Core::GatewayError => e
     rescue_from_spree_gateway_error(e)
@@ -149,7 +150,7 @@ class CheckoutController < Spree::StoreController
   def handle_redirect_from_stripe
     if OrderWorkflow.new(@order).next && order_complete?
       checkout_succeeded
-      redirect_to(spree.order_path(@order)) && return
+      redirect_to(order_path(@order)) && return
     else
       checkout_failed
     end
@@ -209,10 +210,10 @@ class CheckoutController < Spree::StoreController
   def update_succeeded_response
     respond_to do |format|
       format.html do
-        respond_with(@order, location: spree.order_path(@order))
+        respond_with(@order, location: order_path(@order))
       end
       format.json do
-        render json: { path: spree.order_path(@order) }, status: :ok
+        render json: { path: order_path(@order) }, status: :ok
       end
     end
   end

app/controllers/spree/admin/general_settings_controller.rb

@@ -17,7 +17,7 @@ module Spree
         end
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
 
-        redirect_to spree.edit_admin_general_settings_path
+        redirect_to edit_admin_general_settings_path
       end
     end
   end

app/controllers/spree/admin/image_settings_controller.rb

@@ -0,0 +1,79 @@
+module Spree
+  module Admin
+    class ImageSettingsController < Spree::Admin::BaseController
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      end
+
+      def update
+        update_styles(params)
+        update_headers(params) if Spree::Config[:use_s3]
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:success] = Spree.t(:image_settings_updated)
+            redirect_to spree.edit_admin_image_settings_path
+          }
+        end
+      end
+
+      private
+
+      def update_styles(params)
+        if params[:new_attachment_styles].present?
+          params[:new_attachment_styles].each do |_index, style|
+            params[:attachment_styles][style[:name]] = style[:value] if style[:value].present?
+          end
+        end
+
+        styles = params[:attachment_styles]
+
+        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_headers(params)
+        if params[:new_s3_headers].present?
+          params[:new_s3_headers].each do |_index, header|
+            params[:s3_headers][header[:name]] = header[:value] if header[:value].present?
+          end
+        end
+
+        headers = params[:s3_headers]
+
+        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
+      end
+
+      def update_paperclip_settings
+        if Spree::Config[:use_s3]
+          s3_creds = { access_key_id: Spree::Config[:s3_access_key],
+                       secret_access_key: Spree::Config[:s3_secret],
+                       bucket: Spree::Config[:s3_bucket] }
+          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+          Spree::Image.attachment_definitions[:attachment][:s3_headers] =
+            ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+        else
+          Spree::Image.attachment_definitions[:attachment].delete :storage
+        end
+
+        Spree::Image.attachment_definitions[:attachment][:styles] =
+          ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+        Spree::Image.attachment_definitions[:attachment][:default_url] =
+          Spree::Config[:attachment_default_url]
+        Spree::Image.attachment_definitions[:attachment][:default_style] =
+          Spree::Config[:attachment_default_style]
+
+        # Spree stores attachent definitions in JSON. This converts the style name and format to
+        # strings. However, when paperclip encounters these, it doesn't recognise the format.
+        # Here we solve that problem by converting format and style name to symbols.
+        Spree::Image.reformat_styles
+      end
+    end
+  end
+end

app/controllers/spree/admin/images_controller.rb

@@ -8,60 +8,14 @@ module Spree
 
       before_action :load_data
 
-      def index
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def new
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
-        render layout: !request.xhr?
-      end
-
-      def create
-        @url_filters = ::ProductFilters.new.extract(params)
-        set_viewable
-
-        @object.attributes = permitted_resource_params
-        if @object.save
-          flash[:success] = flash_message_for(@object, :successfully_created)
-          redirect_to admin_product_images_url(params[:product_id], @url_filters)
-        else
-          respond_with(@object)
-        end
-      end
-
-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def update
-        @url_filters = ::ProductFilters.new.extract(params)
-        set_viewable
-
-        if @object.update(permitted_resource_params)
-          flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to admin_product_images_url(params[:product_id], @url_filters)
-        else
-          respond_with(@object)
-        end
-      end
-
-      def destroy
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-        destroy_before
-
-        if @object.destroy
-          flash[:success] = flash_message_for(@object, :successfully_removed)
-        end
-
-        redirect_to admin_product_images_url(params[:product_id], @url_filters)
-      end
+      create.before :set_viewable
+      update.before :set_viewable
+      destroy.before :destroy_before
 
       private
 
       def location_after_save
-        spree.admin_product_images_url(@product)
+        admin_product_images_url(@product)
       end
 
       def load_data

app/controllers/spree/admin/mail_methods_controller.rb

@@ -23,7 +23,7 @@ module Spree
       rescue StandardError => e
         flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e }
       ensure
-        redirect_to spree.edit_admin_mail_methods_url
+        redirect_to edit_admin_mail_methods_url
       end
 
       private

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

@@ -27,7 +27,7 @@ module Spree
 
             @order.shipments.map(&:refresh_rates)
             flash[:success] = Spree.t('customer_details_updated')
-            redirect_to spree.admin_order_customer_path(@order)
+            redirect_to admin_order_customer_path(@order)
           else
             render action: :edit
           end

app/controllers/spree/admin/orders_controller.rb

@@ -29,7 +29,7 @@ module Spree
         @order = Order.create
         @order.created_by = spree_current_user
         @order.save
-        redirect_to spree.edit_admin_order_url(@order)
+        redirect_to edit_admin_order_url(@order)
       end
 
       def edit
@@ -48,16 +48,16 @@ module Spree
           if @order.line_items.empty?
             @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
           end
-          return redirect_to(spree.edit_admin_order_path(@order),
+          return redirect_to(edit_admin_order_path(@order),
                              flash: { error: @order.errors.full_messages.join(', ') })
         end
 
         @order.update!
         if @order.complete?
-          redirect_to spree.edit_admin_order_path(@order)
+          redirect_to edit_admin_order_path(@order)
         else
           # Jump to next step if order is not complete
-          redirect_to spree.admin_order_customer_path(@order)
+          redirect_to admin_order_customer_path(@order)
         end
       end
 
@@ -91,9 +91,7 @@ module Spree
         Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
         flash[:success] = t('admin.orders.invoice_email_sent')
 
-        respond_with(@order) { |format|
-          format.html { redirect_to spree.edit_admin_order_path(@order) }
-        }
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
       end
 
       def print
@@ -133,9 +131,7 @@ module Spree
 
         flash[:error] = t(:must_have_valid_business_number,
                           enterprise_name: @order.distributor.name)
-        respond_with(@order) { |format|
-          format.html { redirect_to spree.edit_admin_order_path(@order) }
-        }
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
       end
 
       def load_distribution_choices

app/controllers/spree/admin/payment_methods_controller.rb

@@ -22,7 +22,7 @@ module Spree
         if @payment_method.save
           invoke_callbacks(:create, :after)
           flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
           respond_with(@payment_method)
@@ -43,7 +43,7 @@ module Spree
         if @payment_method.update(params_for_update)
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
-          redirect_to spree.edit_admin_payment_method_path(@payment_method)
+          redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)
           respond_with(@payment_method)
@@ -122,7 +122,7 @@ module Spree
         return if valid_payment_methods.include?(params[:payment_method][:type])
 
         flash[:error] = Spree.t(:invalid_payment_provider)
-        redirect_to spree.new_admin_payment_method_path
+        redirect_to new_admin_payment_method_path
       end
 
       def load_hubs

app/controllers/spree/admin/payments_controller.rb

@@ -12,7 +12,7 @@ module Spree
 
       def index
         @payments = @order.payments
-        redirect_to spree.new_admin_order_payment_url(@order) if @payments.empty?
+        redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
 
       def new
@@ -25,7 +25,7 @@ module Spree
 
         begin
           unless @payment.save
-            redirect_to spree.admin_order_payments_path(@order)
+            redirect_to admin_order_payments_path(@order)
             return
           end
 
@@ -35,16 +35,16 @@ module Spree
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
 
-            redirect_to spree.admin_order_payments_path(@order)
+            redirect_to admin_order_payments_path(@order)
           else
             OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
-            redirect_to spree.edit_admin_order_url(@order)
+            redirect_to edit_admin_order_url(@order)
           end
         rescue Spree::Core::GatewayError => e
           flash[:error] = e.message.to_s
-          redirect_to spree.new_admin_order_payment_path(@order)
+          redirect_to new_admin_order_payment_path(@order)
         end
       end
 
@@ -118,7 +118,7 @@ module Spree
         return if @order.payment? || @order.complete?
 
         flash[:notice] = Spree.t(:fill_in_customer_info)
-        redirect_to spree.edit_admin_order_customer_url(@order)
+        redirect_to edit_admin_order_customer_url(@order)
       end
 
       def load_order

app/controllers/spree/admin/product_properties_controller.rb

@@ -5,20 +5,6 @@ module Spree
       before_action :find_properties
       before_action :setup_property, only: [:index]
 
-      def index
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def destroy
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
-        if @object.destroy
-          flash[:success] = flash_message_for(@object, :successfully_removed)
-        end
-        # if destroy fails it won't show any errors to the user
-        redirect_to admin_product_product_properties_url(params[:product_id], @url_filters)
-      end
-
       private
 
       def find_properties

app/controllers/spree/admin/products_controller.rb

@@ -10,32 +10,35 @@ module Spree
       include OrderCyclesHelper
       include EnterprisesHelper
 
+      create.before :create_before
+      update.before :update_before
+
       before_action :load_data
       before_action :load_form_data, only: [:index, :new, :create, :edit, :update]
       before_action :load_spree_api_key, only: [:index, :variant_overrides]
       before_action :strip_new_properties, only: [:create, :update]
 
+      respond_override create: { html: {
+        success: lambda {
+          if params[:button] == "add_another"
+            redirect_to new_admin_product_path
+          else
+            redirect_to admin_products_path
+          end
+        },
+        failure: lambda {
+          render :new
+        }
+      } }
+
       def new
         @object.shipping_category = DefaultShippingCategory.find_or_create
+        super
       end
 
       def create
         delete_stock_params_and_set_after do
-          if params[:product][:prototype_id].present?
-            @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-          end
-
-          @object.attributes = permitted_resource_params
-          if @object.save
-            flash[:success] = flash_message_for(@object, :successfully_created)
-            if params[:button] == "add_another"
-              redirect_to spree.new_admin_product_path
-            else
-              redirect_to spree.admin_products_path
-            end
-          else
-            render :new
-          end
+          super
         end
       rescue Paperclip::Errors::NotIdentifiedByImageMagickError
         invoke_callbacks(:create, :fails)
@@ -53,24 +56,14 @@ module Spree
         @show_latest_import = params[:latest_import] || false
       end
 
-      def edit
-        @url_filters = ::ProductFilters.new.extract(params)
-      end
-
       def update
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
         original_supplier_id = @product.supplier_id
-        delete_stock_params_and_set_after do
-          params[:product] ||= {} if params[:clear_product_properties]
-          if @object.update(permitted_resource_params)
-            if original_supplier_id != @product.supplier_id
-              ExchangeVariantDeleter.new.delete(@product)
-            end
 
-            flash[:success] = flash_message_for(@object, :successfully_updated)
+        delete_stock_params_and_set_after do
+          super
+          if original_supplier_id != @product.supplier_id
+            ExchangeVariantDeleter.new.delete(@product)
           end
-          redirect_to spree.edit_admin_product_url(@object, @url_filters)
         end
       end
 
@@ -97,15 +90,7 @@ module Spree
                             Spree.t('notice_messages.product_not_cloned')
                           end
 
-        redirect_to spree.edit_admin_product_url(@new)
-      end
-
-      def group_buy_options
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def seo
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
+        redirect_to edit_admin_product_url(@new)
       end
 
       protected
@@ -150,6 +135,19 @@ module Spree
         @collection
       end
 
+      def create_before
+        return if params[:product][:prototype_id].blank?
+
+        @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+      end
+
+      def update_before
+        # We only reset the product properties if we're receiving a post from the form on that tab
+        return unless params[:clear_product_properties]
+
+        params[:product] ||= {}
+      end
+
       def product_includes
         [{ variants: [:images, { option_values: :option_type }] },
          { master: [:images, :default_price] }]

app/controllers/spree/admin/shipping_methods_controller.rb

@@ -74,7 +74,7 @@ module Spree
       end
 
       def location_after_save
-        spree.edit_admin_shipping_method_path(@shipping_method)
+        edit_admin_shipping_method_path(@shipping_method)
       end
 
       def load_data
@@ -84,13 +84,13 @@ module Spree
 
       def permitted_resource_params
         params.require(:shipping_method).permit(
-          :name, :description, :display_on, :require_ship_address, :tag_list, :calculator_type,
+          :name, :description, :display_on,
+          :require_ship_address, :tag_list, :calculator_type,
           distributor_ids: [],
           calculator_attributes: [
-            :id, :preferred_currency, :preferred_amount, :preferred_unit_from_list,
-            :preferred_per_unit, :preferred_flat_percent, :preferred_first_item,
-            :preferred_additional_item, :preferred_max_items, :preferred_minimal_amount,
-            :preferred_normal_amount, :preferred_discount_amount
+            :id, :preferred_currency, :preferred_amount, :preferred_per_kg, :preferred_flat_percent,
+            :preferred_first_item, :preferred_additional_item, :preferred_max_items,
+            :preferred_minimal_amount, :preferred_normal_amount, :preferred_discount_amount
           ]
         )
       end

app/controllers/spree/admin/states_controller.rb

@@ -14,7 +14,7 @@ module Spree
       protected
 
       def location_after_save
-        spree.admin_country_states_url(@country)
+        admin_country_states_url(@country)
       end
 
       def collection

app/controllers/spree/admin/tax_rates_controller.rb

@@ -3,6 +3,9 @@ module Spree
     class TaxRatesController < ResourceController
       before_action :load_data
 
+      update.after :update_after
+      create.after :create_after
+
       private
 
       def load_data
@@ -11,6 +14,14 @@ module Spree
         @calculators = TaxRate.calculators.sort_by(&:name)
       end
 
+      def update_after
+        Rails.cache.delete('vat_rates')
+      end
+
+      def create_after
+        Rails.cache.delete('vat_rates')
+      end
+
       def permitted_resource_params
         params.require(:tax_rate).permit(
           :name, :amount, :included_in_price, :zone_id,

app/controllers/spree/admin/tax_settings_controller.rb

@@ -6,7 +6,7 @@ module Spree
 
         respond_to do |format|
           format.html {
-            redirect_to spree.edit_admin_tax_settings_path
+            redirect_to edit_admin_tax_settings_path
           }
         end
       end

app/controllers/spree/admin/taxonomies_controller.rb

@@ -11,9 +11,9 @@ module Spree
 
       def location_after_save
         if @taxonomy.created_at == @taxonomy.updated_at
-          spree.edit_admin_taxonomy_url(@taxonomy)
+          edit_admin_taxonomy_url(@taxonomy)
         else
-          spree.admin_taxonomies_url
+          admin_taxonomies_url
         end
       end
 

app/controllers/spree/admin/taxons_controller.rb

@@ -15,9 +15,9 @@ module Spree
           respond_with(@taxon) do |format|
             format.html do
               if redirect_to @taxonomy
-                spree.edit_admin_taxonomy_url(@taxonomy)
+                edit_admin_taxonomy_url(@taxonomy)
               else
-                spree.admin_taxonomies_url
+                admin_taxonomies_url
               end
             end
           end
@@ -95,7 +95,7 @@ module Spree
         end
 
         respond_with(@taxon) do |format|
-          format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
+          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
           format.json { render json: @taxon.to_json }
         end
       end

app/controllers/spree/admin/users_controller.rb

@@ -60,14 +60,14 @@ module Spree
         if @user.generate_spree_api_key!
           flash[:success] = t('spree.api.key_generated')
         end
-        redirect_to spree.edit_admin_user_path(@user)
+        redirect_to edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
           flash[:success] = t('spree.api.key_cleared')
         end
-        redirect_to spree.edit_admin_user_path(@user)
+        redirect_to edit_admin_user_path(@user)
       end
 
       protected

app/controllers/spree/admin/variants_controller.rb

@@ -4,46 +4,14 @@ module Spree
   module Admin
     class VariantsController < ResourceController
       helper 'spree/products'
-
       belongs_to 'spree/product', find_by: :permalink
       new_action.before :new_before
 
-      def index
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def edit
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
-      def update
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
-        if @object.update(permitted_resource_params)
-          flash[:success] = flash_message_for(@object, :successfully_updated)
-          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
-        else
-          redirect_to edit_admin_product_variant_url(params[:product_id], @object, @url_filters)
-        end
-      end
-
-      def new
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-      end
-
       def create
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
         on_demand = params[:variant].delete(:on_demand)
         on_hand = params[:variant].delete(:on_hand)
 
-        @object.attributes = permitted_resource_params
-        if @object.save
-          flash[:success] = flash_message_for(@object, :successfully_created)
-          redirect_to admin_product_variants_url(params[:product_id], @url_filters)
-        else
-          redirect_to new_admin_product_variant_url(params[:product_id], @url_filters)
-        end
+        super
 
         return unless @object.present? && @object.valid?
 
@@ -58,24 +26,20 @@ module Spree
       end
 
       def destroy
-        @url_filters = ::ProductFilters.new.extract(request.query_parameters)
-
         @variant = Spree::Variant.find(params[:id])
-        flash[:success] = delete_variant
+        flash[:success] = if VariantDeleter.new.delete(@variant)
+                            Spree.t('notice_messages.variant_deleted')
+                          else
+                            Spree.t('notice_messages.variant_not_deleted')
+                          end
 
-        redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters)
+        respond_with(@variant) do |format|
+          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
+        end
       end
 
       protected
 
-      def delete_variant
-        if VariantDeleter.new.delete(@variant)
-          Spree.t('notice_messages.variant_deleted')
-        else
-          Spree.t('notice_messages.variant_not_deleted')
-        end
-      end
-
       def create_before
         option_values = params[:new_variant]
         option_values.andand.each_value { |id| @object.option_values << OptionValue.find(id) }

app/controllers/spree/base_controller.rb

@@ -3,8 +3,8 @@
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/respond_with'
-require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/ssl'
 
 module Spree
   class BaseController < ApplicationController

app/controllers/spree/credit_cards_controller.rb

@@ -48,10 +48,10 @@ module Spree
       else
         flash[:error] = I18n.t(:card_could_not_be_removed)
       end
-      redirect_to spree.account_path(anchor: 'cards')
+      redirect_to account_path(anchor: 'cards')
     rescue Stripe::CardError
       flash[:error] = I18n.t(:card_could_not_be_removed)
-      redirect_to spree.account_path(anchor: 'cards')
+      redirect_to account_path(anchor: 'cards')
     end
 
     private

app/controllers/spree/orders_controller.rb

@@ -78,7 +78,11 @@ module Spree
         discard_empty_line_items
         with_open_adjustments { update_totals_and_taxes }
 
-        @order.update_distribution_charge!
+        if @order == current_order
+          fire_event('spree.order.contents_changed')
+        else
+          @order.update_distribution_charge!
+        end
 
         respond_with(@order) do |format|
           format.html do
@@ -86,7 +90,7 @@ module Spree
               @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             elsif @order.complete?
-              redirect_to spree.order_path(@order)
+              redirect_to order_path(@order)
             else
               redirect_to main_app.cart_path
             end
@@ -153,7 +157,7 @@ module Spree
       else
         flash[:error] = I18n.t(:orders_could_not_cancel)
       end
-      redirect_to request.referer || spree.order_path(@order)
+      redirect_to request.referer || order_path(@order)
     end
 
     private
@@ -217,7 +221,7 @@ module Spree
 
       if items.empty?
         flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-        redirect_to spree.order_path(order_to_update)
+        redirect_to order_path(order_to_update)
       end
     end
 

app/controllers/spree/user_passwords_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserPasswordsController < Devise::PasswordsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common

app/controllers/spree/user_registrations_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common

app/controllers/spree/user_sessions_controller.rb

@@ -7,7 +7,7 @@ require "spree/core/controller_helpers/ssl"
 
 module Spree
   class UserSessionsController < Devise::SessionsController
-    helper 'spree/base'
+    helper 'spree/base', 'spree/store'
 
     include Spree::Core::ControllerHelpers::Auth
     include Spree::Core::ControllerHelpers::Common