Merge pull request #6546 from andrewpbrett/sca-backend

Fix #6543

.codeclimate.yml

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

.github/ISSUE_TEMPLATE/release.md

@@ -9,10 +9,11 @@ assignees: ''
 
 Steps: 
 
-- [ ] Include translations
+- [ ] Include translations: `tx pull --force`
 - [ ] [Draft new release]
 - [ ] Notify #instance-managers of user-facing changes.
 - [ ] Test: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master <!-- replace the URL -->
+- [ ] Update translations if necessary
 - [ ] Publish and notify #global-community
 - [ ] Deploy and notify #instance-managers
 - [ ] Nudge next release manager

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,25 +13,11 @@ Provide context for others to understand it. -->
 
 
 #### Release notes
-<!-- Write a line or two to be included in the release notes.
-Everything is worth mentioning, because you did it for a reason. -->
+<!-- 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. -->
 
-
-
-<!-- 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
-
-#### How is this related to the Spree upgrade?
-<!-- Any known conflicts with the Spree Upgrade?
-Explain them or remove this section. -->
-
-
-
-#### Discourse thread
-<!-- Is there a discussion about this in Discourse?
-Add the link or remove this section. -->
+<!-- Please select one for your PR and delete the other. -->
+Changelog Category: User facing changes | Technical changes
 
 
 
@@ -42,6 +28,5 @@ Add the link or remove this section. -->
 
 
 #### Documentation updates
-<!-- Are their any wiki pages that need updating after merging this PR?
+<!-- Are there any wiki pages that need updating after merging this PR?
 List them here or remove this section. -->
-

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/brakeman-analysis.yml

@@ -0,0 +1,44 @@
+# This workflow integrates Brakeman with GitHub's Code Scanning feature
+# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
+
+name: Brakeman Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  brakeman-scan:
+    name: Brakeman Scan
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository to the GitHub Actions runner
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    # Customize the ruby version depending on your needs
+    - name: Setup Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: '2.7'
+
+    - name: Setup Brakeman
+      env:
+        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
+      run: |
+        gem install brakeman --version $BRAKEMAN_VERSION
+
+    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+    - name: Scan
+      continue-on-error: true
+      run: |
+        brakeman -f sarif -o output.sarif.json .
+
+    # Upload the SARIF file generated in the previous step
+    - name: Upload SARIF
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: output.sarif.json

.gitignore

@@ -1,5 +1,6 @@
 .bundle
 .rbenv-version
+.python-version
 .byebug_history
 .swp
 *.swo

.hound.yml

@@ -0,0 +1,4 @@
+rubocop:
+  config_file: .rubocop_styleguide.yml
+scss:
+  config_file: .scss-lint.yml

.rubocop_manual_todo.yml

@@ -42,7 +42,6 @@ Layout/LineLength:
   - app/helpers/angular_form_helper.rb
   - app/helpers/checkout_helper.rb
   - app/helpers/enterprises_helper.rb
-  - app/helpers/injection_helper.rb
   - app/helpers/markdown_helper.rb
   - app/helpers/order_cycles_helper.rb
   - app/helpers/spree/orders_helper.rb
@@ -62,30 +61,26 @@ 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/app_configuration.rb
   - app/models/spree/gateway/stripe_connect.rb
-  - app/models/spree/line_item_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.rb
-  - app/models/spree/shipping_method_decorator.rb
-  - app/models/spree/taxon_decorator.rb
-  - app/models/spree/tax_rate_decorator.rb
+  - app/models/spree/image.rb
+  - app/models/spree/order.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/product.rb
   - app/models/spree/user.rb
+  - app/models/spree/variant.rb
   - app/models/subscription.rb
   - app/models/variant_override.rb
   - app/models/variant_override_set.rb
   - app/serializers/api/admin/subscription_line_item_serializer.rb
   - app/services/cart_service.rb
+  - app/services/checkout/post_checkout_actions.rb
   - app/services/default_stock_location.rb
   - 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
@@ -103,13 +98,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
   - lib/tasks/data.rake
   - lib/tasks/enterprises.rake
   - spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -134,6 +126,8 @@ 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
@@ -156,11 +150,15 @@ 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.rb
+  - spec/factories/shipment_factory.rb
+  - spec/factories/stock_location_factory.rb
+  - spec/factories/user_factory.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
@@ -169,7 +167,6 @@ 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
@@ -193,7 +190,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/darkwarm_caching_spec.rb
+  - spec/features/consumer/caching/darkswarm_caching_spec.rb
   - spec/features/consumer/caching/shops_caching_spec.rb
   - spec/features/consumer/groups_spec.rb
   - spec/features/consumer/multilingual_spec.rb
@@ -202,6 +199,7 @@ 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
@@ -220,18 +218,15 @@ 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
@@ -239,11 +234,14 @@ 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
@@ -261,18 +259,23 @@ 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/inventory_unit_spec.rb
   - spec/models/spree/line_item_spec.rb
+  - spec/models/spree/order/checkout_spec.rb
+  - spec/models/spree/order_inventory_spec.rb
   - spec/models/spree/order_spec.rb
+  - spec/models/spree/order/state_machine_spec.rb
   - spec/models/spree/payment_method_spec.rb
   - spec/models/spree/payment_spec.rb
   - spec/models/spree/product_set_spec.rb
   - spec/models/spree/product_spec.rb
+  - spec/models/spree/return_authorization_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
@@ -286,8 +289,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
@@ -300,6 +303,7 @@ Layout/LineLength:
   - spec/serializers/api/order_serializer_spec.rb
   - spec/services/cart_service_spec.rb
   - spec/services/checkout/form_data_adapter_spec.rb
+  - spec/services/checkout/post_checkout_actions_spec.rb
   - spec/services/embedded_page_service_spec.rb
   - spec/services/exchange_products_renderer_spec.rb
   - spec/services/order_cycle_distributed_products_spec.rb
@@ -307,11 +311,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
@@ -321,6 +325,8 @@ Layout/LineLength:
   - spec/support/request/shop_workflow.rb
   - spec/support/request/web_helper.rb
   - spec/support/seeds.rb
+  - spec/swagger_helper.rb
+  - spec/views/spree/admin/payment_methods/index.html.haml_spec.rb
 
 Metrics/AbcSize:
   Max: 15
@@ -331,6 +337,7 @@ Metrics/AbcSize:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/admin/order_cycles_controller.rb
   - app/controllers/admin/product_import_controller.rb
+  - app/controllers/admin/resource_controller.rb
   - app/controllers/admin/stripe_accounts_controller.rb
   - app/controllers/admin/subscription_line_items_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
@@ -340,10 +347,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
@@ -351,12 +358,13 @@ Metrics/AbcSize:
   - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/resource_controller.rb
   - 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/paypal_controller_decorator.rb
   - app/controllers/spree/user_passwords_controller.rb
   - app/controllers/spree/user_registrations_controller.rb
   - app/controllers/spree/users_controller.rb
@@ -366,7 +374,6 @@ 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,23 +389,35 @@ 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_decorator.rb
-  - app/models/spree/calculator/default_tax_decorator.rb
-  - app/models/spree/calculator/flexi_rate_decorator.rb
-  - app/models/spree/line_item_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/product_decorator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/line_item.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/order_contents.rb
+  - app/models/spree/order_inventory.rb
+  - app/models/spree/order.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/payment.rb
+  - app/models/spree/preference.rb
+  - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/preferences/preferable.rb
+  - app/models/spree/product.rb
+  - app/models/spree/return_authorization.rb
   - app/models/spree/shipment.rb
-  - app/models/spree/taxon_decorator.rb
-  - app/models/spree/tax_rate_decorator.rb
-  - app/serializers/api/admin/enterprise_serializer.rb
+  - app/models/spree/taxon.rb
+  - app/models/spree/tax_rate.rb
+  - app/models/spree/variant.rb
+  - app/models/spree/zone.rb
   - app/serializers/api/product_serializer.rb
   - app/serializers/api/variant_serializer.rb
   - app/services/cart_service.rb
   - app/services/create_order_cycle.rb
   - app/services/order_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
@@ -406,12 +425,10 @@ 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
@@ -423,13 +440,17 @@ 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
@@ -437,13 +458,14 @@ 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
+  - spec/support/request/web_helper.rb
 
 Metrics/BlockLength:
   Max: 25
@@ -461,16 +483,21 @@ 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
@@ -478,10 +505,12 @@ 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
+  - spec/swagger_helper.rb
 
 Metrics/CyclomaticComplexity:
   Max: 6
@@ -491,23 +520,30 @@ 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_decorator.rb
-  - app/models/spree/payment_decorator.rb
-  - app/models/spree/payment_method_decorator.rb
-  - app/models/spree/product_decorator.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/preference.rb
+  - app/models/spree/preferences/preferable.rb
+  - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/product.rb
+  - app/models/spree/return_authorization.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
@@ -522,18 +558,24 @@ Metrics/PerceivedComplexity:
   - 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_decorator.rb
-  - app/models/spree/order_decorator.rb
-  - app/models/spree/product_decorator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/order.rb
+  - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/preferences/preferable.rb
+  - app/models/spree/product.rb
+  - app/models/spree/return_authorization.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
@@ -549,6 +591,7 @@ Metrics/MethodLength:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/admin/manager_invitations_controller.rb
   - app/controllers/admin/order_cycles_controller.rb
+  - app/controllers/admin/resource_controller.rb
   - app/controllers/admin/stripe_accounts_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
   - app/controllers/api/products_controller.rb
@@ -557,20 +600,19 @@ 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
   - app/controllers/spree/admin/payments_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/resource_controller.rb
   - 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/paypal_controller_decorator.rb
   - app/controllers/spree/user_sessions_controller.rb
   - app/controllers/stripe/callbacks_controller.rb
   - app/controllers/user_confirmations_controller.rb
@@ -589,31 +631,47 @@ 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_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_decorator.rb
-  - app/models/spree/payment_method_decorator.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/order_contents.rb
+  - app/models/spree/order_inventory.rb
+  - app/models/spree/order.rb
+  - app/models/spree/payment_method.rb
+  - app/models/spree/payment/processing.rb
+  - app/models/spree/preference.rb
+  - app/models/spree/preferences/preferable_class_methods.rb
+  - app/models/spree/preferences/preferable.rb
+  - app/models/spree/preferences/store.rb
+  - app/models/spree/product.rb
   - app/models/spree/product_decorator.rb
+  - app/models/spree/return_authorization.rb
   - app/models/spree/shipment.rb
+  - app/models/spree/taxon.rb
+  - app/models/spree/tax_rate.rb
+  - app/models/spree/variant.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
@@ -624,33 +682,33 @@ 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/controller_helpers/auth.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/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
+  - spec/support/i18n_translations_checker.rb
 
 Metrics/ClassLength:
   Max: 100
   Exclude:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/admin/order_cycles_controller.rb
+  - app/controllers/admin/resource_controller.rb
   - app/controllers/admin/schedules_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
   - app/controllers/api/products_controller.rb
@@ -660,7 +718,6 @@ Metrics/ClassLength:
   - app/controllers/spree/admin/payment_methods_controller.rb
   - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
-  - app/controllers/spree/admin/resource_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/models/enterprise.rb
@@ -668,15 +725,23 @@ 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_decorator.rb
+  - app/models/spree/ability.rb
+  - app/models/spree/address.rb
+  - app/models/spree/credit_card.rb
+  - app/models/spree/line_item.rb
+  - app/models/spree/order.rb
+  - app/models/spree/payment.rb
+  - app/models/spree/product.rb
   - app/models/spree/shipment.rb
   - app/models/spree/user.rb
+  - app/models/spree/variant.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/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
@@ -694,40 +759,20 @@ Metrics/ModuleLength:
   - app/helpers/injection_helper.rb
   - app/helpers/spree/admin/base_helper.rb
   - app/helpers/spree/admin/navigation_helper.rb
-  - engines/order_management/spec/services/order_management/stock/package_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
+  - app/models/spree/order/checkout.rb
+  - app/models/spree/payment/processing.rb
   - engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
-  - engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
   - 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
-  - spec/controllers/spree/admin/payment_methods_controller_spec.rb
-  - spec/lib/open_food_network/address_finder_spec.rb
-  - spec/lib/open_food_network/customers_report_spec.rb
-  - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
-  - spec/lib/open_food_network/option_value_namer_spec.rb
   - spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
   - spec/lib/open_food_network/order_cycle_permissions_spec.rb
-  - spec/lib/open_food_network/order_grouper_spec.rb
-  - spec/lib/open_food_network/permissions_spec.rb
-  - spec/lib/open_food_network/products_and_inventory_report_spec.rb
-  - spec/lib/open_food_network/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/variant_spec.rb
-  - spec/services/permissions/order_spec.rb
-  - spec/support/request/web_helper.rb
 
 Metrics/ParameterLists:
   Max: 5
@@ -736,3 +781,9 @@ 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/**/*'
+  - 'app/models/spree/taxon.rb'
+  - 'lib/spree/core/controller_helpers/common.rb'

.rubocop_specs.yml

@@ -0,0 +1,7 @@
+inherit_from:
+  - .rubocop.yml
+
+# This rubocop config file is only used for specs
+# Here we allow specs to be 300 lines long
+Metrics/ModuleLength:
+  Max: 300

.scss-lint.yml

@@ -1,3 +1,19 @@
 scss_files: 'app/assets/stylesheets/**/*.css.scss'
 
 exclude: 'app/assets/stylesheets/shared/**'
+
+linters:
+  ImportantRule:
+    enabled: false
+    VendorPrefix:
+      enabled: false
+    LeadingZero:
+      enabled: false
+    PropertySortOrder:
+      enabled: false
+    StringQuotes:
+      enabled: false
+    DeclarationOrder:
+      enabled: false
+    NestingDepth:
+      enabled: false

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# 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

@@ -1,62 +0,0 @@
-### 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

@@ -1,4 +1,10 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+ENV TZ Europe/London
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
 
 # Install all the requirements
 RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip
@@ -19,7 +25,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.2
+    gem install bundler --version=1.17.3
 
 # 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,8 +33,11 @@ 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
-RUN apt-get install -y nodejs
+# 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 Chrome
 RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
@@ -43,5 +52,9 @@ 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.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/README.md).
 Otherwise, for a local setup you will need:
 * Ruby 2.3.7 and bundler
 * PostgreSQL database

Gemfile

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 ruby "2.3.7"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
-gem 'i18n', '~> 0.6.11'
-gem 'i18n-js', '~> 3.7.1'
-gem 'rails', '~> 4.0.13'
-gem 'rails-i18n', '~> 4.0'
+gem 'i18n'
+gem 'i18n-js', '~> 3.8.0'
+gem 'rails', '~> 4.2'
+gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
+gem 'responders', '~> 2.0'
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
@@ -18,26 +21,17 @@ gem 'web', path: './engines/web'
 gem 'activerecord-postgresql-adapter'
 gem 'pg', '~> 0.21.0'
 
-# OFN-maintained and patched version of Spree v2.0.4. See
-# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Tech-Doc:-OFN's-Spree-fork%F0%9F%8D%B4
-# for details.
-gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-1-0-stable'
-
-### Dependencies brought from spree core
-gem 'acts_as_list', '= 0.2.0'
-gem 'awesome_nested_set', '~> 3.0.0.rc.1'
+gem 'acts_as_list', '0.9.19'
+gem 'awesome_nested_set', '~> 3.2.1'
 gem 'cancan', '~> 1.6.10'
-gem 'ffaker', '~> 1.16'
-gem 'highline', '= 1.6.18' # Necessary for the install generator
-gem 'httparty', '~> 0.18' # Used to check alerts in spree_core, this is not used in OFN.
-gem 'json', '>= 1.7.7'
-gem 'money', '5.1.1'
+gem 'ffaker'
+gem 'highline', '2.0.3' # Necessary for the install generator
+gem 'json'
+gem 'money', '< 6.1.0'
 gem 'paranoia', '~> 2.0'
 gem 'ransack', '~> 1.8.10'
-gem 'state_machine', '1.2.0'
-gem 'stringex', '~> 1.5.1'
-
-gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
+gem 'state_machines-activerecord'
+gem 'stringex', '~> 2.8.5'
 
 # Our branch contains the following changes:
 # - Pass customer email and phone number to PayPal (merged to upstream master)
@@ -51,9 +45,9 @@ gem 'stripe'
 # which is needed for Pin Payments (and possibly others).
 gem 'activemerchant', '~> 1.78.0'
 
-gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
+gem 'devise'
 gem 'devise-encryptable'
-gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
+gem 'devise-token_authenticatable'
 gem 'jwt', '~> 2.2'
 gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
 
@@ -61,20 +55,17 @@ gem 'daemons'
 gem 'delayed_job_active_record'
 gem 'delayed_job_web'
 
-# Spree's default pagination gem (locked to the current version used by Spree)
-# We use it's methods in OFN code as well, so this is a direct dependency
-gem 'kaminari', '~> 0.14.1'
+gem 'kaminari', '~> 0.17.0'
 
 gem 'andand'
 gem 'angularjs-rails', '1.5.5'
-gem 'aws-sdk', '1.11.1' # temporarily locked down due to https://github.com/aws/aws-sdk-ruby/issues/273
+gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
 gem 'db2fog'
 gem 'haml'
 gem 'redcarpet'
 gem 'sass'
 gem 'sass-rails'
-gem 'truncate_html', '0.9.2'
 gem 'unicorn'
 
 gem 'actionpack-action_caching'
@@ -86,12 +77,11 @@ gem 'acts-as-taggable-on', '~> 4.0'
 gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'oj'
-gem 'paper_trail', '~> 5.2.3'
+gem 'paper_trail', '~> 7.1.3'
 gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
@@ -101,7 +91,6 @@ gem 'combine_pdf'
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
-gem 'foreigner'
 gem 'immigrant'
 gem 'roo', '~> 2.8.3'
 
@@ -118,12 +107,11 @@ 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'
 
 gem 'jquery-migrate-rails'
-gem 'jquery-rails', '3.1.5'
+gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
 gem 'select2-rails', '~> 3.4.7'
 
@@ -138,9 +126,9 @@ group :test, :development do
   # Pretty printed test output
   gem 'atomic'
   gem 'awesome_print'
-  gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
+  gem 'capybara'
   gem 'database_cleaner', require: false
-  gem "factory_bot_rails", '4.10.0', require: false
+  gem "factory_bot_rails", '5.2.0', require: false
   gem 'fuubar', '~> 2.5.0'
   gem 'json_spec', '~> 1.1.4'
   gem 'knapsack'
@@ -157,6 +145,8 @@ end
 
 group :test do
   gem 'simplecov', require: false
+  gem 'test-prof'
+  gem 'test_after_commit' # needed to test Devise callbacks
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'
@@ -165,7 +155,6 @@ end
 group :development do
   gem 'byebug', '~> 11.0.0' # 11.1 requires ruby 2.4
   gem 'debugger-linecache'
-  gem "newrelic_rpm", "~> 3.0"
   gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
   gem 'pry-byebug', '~> 3.7.0' # 3.8 requires ruby 2.4
   gem 'rubocop'

Gemfile.lock

@@ -6,12 +6,11 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 1736e3268239a841576d2719a1f276cf9b74c5c5
+  revision: 1a477e9f7763297944cc99b6f4dd3d962aa963e9
   branch: 2-1-0-stable
   specs:
     spree_paypal_express (2.0.3)
       paypal-sdk-merchant (= 1.106.1)
-      spree_core (~> 2.1.0)
 
 GIT
   remote: https://github.com/openfoodfoundation/ofn-qz.git
@@ -20,41 +19,6 @@ GIT
   specs:
     ofn-qz (0.1.0)
 
-GIT
-  remote: https://github.com/openfoodfoundation/spree.git
-  revision: 0b0c422369c82b6dd7e7cb627a24e3a9fca19a6c
-  branch: 2-1-0-stable
-  specs:
-    spree_core (2.1.0)
-      activemerchant (= 1.78.0)
-      acts_as_list (= 0.2.0)
-      awesome_nested_set (~> 3.0.0.rc.1)
-      aws-sdk (= 1.11.1)
-      cancan (~> 1.6.10)
-      ffaker (~> 1.16)
-      highline (= 1.6.18)
-      httparty (~> 0.11)
-      json (>= 1.7.7)
-      kaminari (~> 0.14.1)
-      money (= 5.1.1)
-      paperclip (~> 3.4.1)
-      paranoia (~> 2.0)
-      rails (~> 4.0)
-      ransack (~> 1.0)
-      state_machine (= 1.2.0)
-      stringex (~> 1.5.1)
-      truncate_html (= 0.9.2)
-
-GIT
-  remote: https://github.com/spree/spree_i18n.git
-  revision: 752eb67204e9c5a4e22b62591a8fd55fe2285e43
-  branch: 1-3-stable
-  specs:
-    spree_i18n (1.0.0)
-      i18n (~> 0.5)
-      rails-i18n
-      spree_core (>= 1.1)
-
 PATH
   remote: engines/catalog
   specs:
@@ -64,6 +28,7 @@ PATH
   remote: engines/dfc_provider
   specs:
     dfc_provider (0.0.1)
+      active_model_serializers (~> 0.8.4)
       jwt (~> 2.2)
       rspec (~> 3.9)
 
@@ -81,34 +46,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.6)
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
+    actionmailer (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.3)
+      actionview (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-action_caching (1.2.1)
       actionpack (>= 4.0.0)
+    actionview (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
+    activejob (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      globalid (>= 0.3.0)
     activemerchant (1.78.0)
       activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activerecord-import (1.0.6)
+    activemodel (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      builder (~> 3.1)
+    activerecord (4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      arel (~> 6.0)
+    activerecord-import (1.0.7)
       activerecord (>= 3.2)
     activerecord-postgresql-adapter (0.0.1)
       pg
@@ -118,18 +94,20 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+    activesupport (4.2.11.3)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     acts-as-taggable-on (4.0.0)
       activerecord (>= 4.0)
-    acts_as_list (0.2.0)
+    acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    aliyun-sdk (0.8.0)
+      nokogiri (~> 1.6)
+      rest-client (~> 2.0)
     andand (1.3.3)
     angular-rails-templates (0.3.0)
       railties (>= 3.1)
@@ -137,32 +115,34 @@ GEM
       tilt
     angularjs-file-upload-rails (2.4.1)
     angularjs-rails (1.5.5)
-    arel (4.0.2)
+    arel (6.0.4)
     ast (2.4.0)
     atomic (1.1.101)
-    awesome_nested_set (3.0.3)
-      activerecord (>= 4.0.0, < 5)
+    awesome_nested_set (3.2.1)
+      activerecord (>= 4.0.0, < 7.0)
     awesome_print (1.8.0)
-    aws-sdk (1.11.1)
+    aws-sdk (1.67.0)
+      aws-sdk-v1 (= 1.67.0)
+    aws-sdk-v1 (1.67.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    bcrypt (3.1.13)
-    bugsnag (6.15.0)
+      nokogiri (~> 1)
+    bcrypt (3.1.16)
+    bugsnag (6.18.0)
       concurrent-ruby (~> 1.0)
-    builder (3.1.4)
+    builder (3.2.4)
     byebug (11.0.1)
     cancan (1.6.10)
-    capybara (2.18.0)
+    capybara (3.15.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     childprocess (3.0.0)
     chronic (0.10.2)
-    chunky_png (1.3.11)
+    chunky_png (1.3.14)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -174,7 +154,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    combine_pdf (1.0.16)
+    combine_pdf (1.0.21)
       ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -192,61 +172,61 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    concurrent-ruby (1.1.7)
+    crack (0.4.4)
+    crass (1.0.6)
     css_parser (1.7.1)
       addressable
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     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.39.0)
+    ddtrace (0.43.0)
       msgpack
     debugger-linecache (1.2.0)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_active_record (4.1.4)
-      activerecord (>= 3.0, < 6.1)
+    delayed_job (4.1.9)
+      activesupport (>= 3.0, < 6.2)
+    delayed_job_active_record (4.1.5)
+      activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
     delayed_job_web (1.4.3)
       activerecord (> 3.0.0)
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (3.5.10)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
-    devise-token_authenticatable (0.4.10)
-      devise (>= 3.5.2, < 4.0.0)
-    diff-lcs (1.3)
-    diffy (3.3.0)
+    devise-token_authenticatable (1.1.0)
+      devise (>= 4.0.0, < 5.0.0)
+    diff-lcs (1.4.4)
     docile (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     dry-inflector (0.1.2)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    excon (0.71.1)
+    excon (0.78.0)
     execjs (2.7.0)
-    factory_bot (4.10.0)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.10.0)
-      factory_bot (~> 4.10.0)
-      railties (>= 3.0.0)
-    faraday (1.0.0)
+    factory_bot (5.2.0)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.2.0)
+      factory_bot (~> 5.2.0)
+      railties (>= 4.2.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.32.1)
-    ffi (1.12.2)
-    figaro (1.1.1)
-      thor (~> 0.14)
+    ffaker (2.11.0)
+    ffi (1.13.1)
+    figaro (1.2.0)
+      thor (>= 0.14.0, < 2)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.41.0)
@@ -283,7 +263,8 @@ GEM
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       json (>= 1.8, < 2.0)
-    fog-aliyun (0.3.5)
+    fog-aliyun (0.3.19)
+      aliyun-sdk (~> 0.8.0)
       fog-core
       fog-json
       ipaddress (~> 0.8)
@@ -329,7 +310,7 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-internet-archive (0.0.1)
+    fog-internet-archive (0.0.2)
       fog-core
       fog-json
       fog-xml
@@ -386,7 +367,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (3.2.1)
+    fog-vsphere (3.4.0)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xenserver (1.0.0)
@@ -396,8 +377,6 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foreigner (1.7.4)
-      activerecord (>= 3.0.0)
     formatador (0.2.5)
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
@@ -408,29 +387,33 @@ GEM
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geocoder (1.6.3)
-    get_process_mem (0.2.5)
+    geocoder (1.6.4)
+    get_process_mem (0.2.7)
       ffi (~> 1.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     gmaps4rails (2.1.2)
-    haml (5.1.2)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
-    highline (1.6.18)
+    highline (2.0.3)
     hike (1.2.3)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.11)
-    i18n-js (3.7.1)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    i18n-js (3.8.0)
       i18n (>= 0.6.6)
     immigrant (0.3.6)
       activerecord (>= 3.0)
     ipaddress (0.8.3)
     jaro_winkler (1.5.4)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (3.1.5)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
@@ -440,18 +423,21 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.2.1)
-    kaminari (0.14.1)
+    jwt (2.2.2)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.11.3)
-    knapsack (1.18.0)
+    knapsack (1.20.0)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.7.0)
       launchy (~> 2.2)
     libv8 (7.3.492.27.1)
+    loofah (2.8.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
@@ -462,17 +448,16 @@ GEM
     mini_portile2 (2.4.0)
     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)
+    minitest (5.14.2)
+    money (5.0.0)
+      i18n (~> 0.4)
+      json
     msgpack (1.3.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    newrelic_rpm (3.18.1.330)
-    nokogiri (1.10.9)
+    netrc (0.11.0)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
@@ -481,10 +466,10 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     oj (3.10.8)
-    optimist (3.0.0)
+    optimist (3.0.1)
     orm_adapter (0.5.0)
-    paper_trail (5.2.3)
-      activerecord (>= 3.0, < 6.0)
+    paper_trail (7.1.3)
+      activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     paperclip (3.4.2)
       activemodel (>= 3.0.0)
@@ -510,8 +495,8 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.5)
-    rack (1.5.5)
+    public_suffix (4.0.6)
+    rack (1.6.13)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
     rack-protection (1.5.5)
@@ -521,21 +506,32 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
+    rails (4.2.11.3)
+      actionmailer (= 4.2.11.3)
+      actionpack (= 4.2.11.3)
+      actionview (= 4.2.11.3)
+      activejob (= 4.2.11.3)
+      activemodel (= 4.2.11.3)
+      activerecord (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    rails-i18n (4.0.5)
-      i18n (~> 0.6)
+      railties (= 4.2.11.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
       railties (~> 4.0)
     rails_safe_tasks (1.0.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
+    railties (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
@@ -546,52 +542,59 @@ GEM
       activerecord (>= 3.0, < 5.2)
       activesupport (>= 3.0, < 5.2)
       i18n
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbvmomi (2.2.0)
+    rbvmomi (2.4.1)
       builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)
       optimist (~> 3.0)
     redcarpet (3.5.0)
-    request_store (1.4.1)
+    regexp_parser (1.8.2)
+    request_store (1.5.0)
       rack (>= 1.4)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rexml (3.2.4)
-    roadie (3.4.0)
+    roadie (3.5.1)
       css_parser (~> 1.4)
-      nokogiri (~> 1.5)
+      nokogiri (~> 1.8)
     roadie-rails (1.3.0)
       railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.2)
+    rspec-support (3.10.0)
     rswag (2.3.1)
       rswag-api (= 2.3.1)
       rswag-specs (= 2.3.1)
@@ -620,7 +623,6 @@ 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)
@@ -634,8 +636,8 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    shoulda-matchers (3.1.3)
-      activesupport (>= 4.0.0)
+    shoulda-matchers (4.0.1)
+      activesupport (>= 4.2.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -645,7 +647,8 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    spring (1.7.2)
+    spring (2.0.2)
+      activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (2.12.5)
@@ -657,22 +660,34 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    state_machine (1.2.0)
-    stringex (1.5.1)
-    stripe (5.22.0)
+    state_machines (0.5.0)
+    state_machines-activemodel (0.7.1)
+      activemodel (>= 4.1)
+      state_machines (>= 0.5.0)
+    state_machines-activerecord (0.6.0)
+      activerecord (>= 4.1)
+      state_machines-activemodel (>= 0.5.0)
+    stringex (2.8.5)
+    stripe (5.28.0)
     temple (0.8.2)
-    test-unit (3.3.6)
+    test-prof (0.7.5)
+    test-unit (3.3.7)
       power_assert
+    test_after_commit (1.2.2)
+      activerecord (>= 3.2, < 5.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    timecop (0.9.1)
-    truncate_html (0.9.2)
-    tzinfo (0.3.57)
+    timecop (0.9.2)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    unicorn (5.6.0)
+    unicorn (5.7.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -681,14 +696,13 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
-    uuidtools (2.1.5)
     warden (1.2.7)
       rack (>= 1.0)
     webdrivers (4.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.3)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -699,8 +713,8 @@ GEM
     wkhtmltopdf-binary (0.12.5)
     xml-simple (1.1.5)
     xmlrpc (0.3.0)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -713,19 +727,19 @@ DEPENDENCIES
   activerecord-postgresql-adapter
   activerecord-session_store
   acts-as-taggable-on (~> 4.0)
-  acts_as_list (= 0.2.0)
+  acts_as_list (= 0.9.19)
   andand
   angular-rails-templates (~> 0.3.0)
   angularjs-file-upload-rails (~> 2.4.1)
   angularjs-rails (= 1.5.5)
   atomic
-  awesome_nested_set (~> 3.0.0.rc.1)
+  awesome_nested_set (~> 3.2.1)
   awesome_print
-  aws-sdk (= 1.11.1)
+  aws-sdk (= 1.67.0)
   bugsnag
   byebug (~> 11.0.0)
   cancan (~> 1.6.10)
-  capybara (>= 2.18.0)
+  capybara
   catalog!
   coffee-rails (~> 4.2.2)
   combine_pdf
@@ -739,45 +753,40 @@ DEPENDENCIES
   debugger-linecache
   delayed_job_active_record
   delayed_job_web
-  devise (~> 3.5.10)
+  devise
   devise-encryptable
-  devise-token_authenticatable (~> 0.4.10)
+  devise-token_authenticatable
   dfc_provider!
-  diffy
   eventmachine (>= 1.2.3)
-  factory_bot_rails (= 4.10.0)
-  ffaker (~> 1.16)
+  factory_bot_rails (= 5.2.0)
+  ffaker
   figaro
-  foreigner
   foundation-icons-sass-rails
   foundation-rails (= 5.5.2.1)
   fuubar (~> 2.5.0)
   geocoder
   gmaps4rails
   haml
-  highline (= 1.6.18)
-  httparty (~> 0.18)
-  i18n (~> 0.6.11)
-  i18n-js (~> 3.7.1)
+  highline (= 2.0.3)
+  i18n
+  i18n-js (~> 3.8.0)
   immigrant
   jquery-migrate-rails
-  jquery-rails (= 3.1.5)
+  jquery-rails (= 4.4.0)
   jquery-ui-rails (~> 4.2)
-  json (>= 1.7.7)
+  json
   json_spec (~> 1.1.4)
   jwt (~> 2.2)
-  kaminari (~> 0.14.1)
+  kaminari (~> 0.17.0)
   knapsack
   letter_opener (>= 1.4.1)
   mini_racer (= 0.2.15)
-  momentjs-rails
-  money (= 5.1.1)
-  newrelic_rpm (~> 3.0)
+  money (< 6.1.0)
   oauth2 (~> 1.4.4)
   ofn-qz!
   oj
   order_management!
-  paper_trail (~> 5.2.3)
+  paper_trail (~> 7.1.3)
   paperclip (~> 3.4.1)
   paranoia (~> 2.0)
   pg (~> 0.21.0)
@@ -786,11 +795,12 @@ DEPENDENCIES
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
-  rails (~> 4.0.13)
-  rails-i18n (~> 4.0)
+  rails (~> 4.2)
+  rails-i18n
   rails_safe_tasks (~> 1.0)
   ransack (~> 1.8.10)
   redcarpet
+  responders (~> 2.0)
   roadie-rails (~> 1.3.0)
   roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
@@ -804,17 +814,16 @@ DEPENDENCIES
   selenium-webdriver
   shoulda-matchers
   simplecov
-  spree_core!
-  spree_i18n!
   spree_paypal_express!
   spring
   spring-commands-rspec
-  state_machine (= 1.2.0)
-  stringex (~> 1.5.1)
+  state_machines-activerecord
+  stringex (~> 2.8.5)
   stripe
+  test-prof
   test-unit (~> 3.3)
+  test_after_commit
   timecop
-  truncate_html (= 0.9.2)
   uglifier (>= 1.0.3)
   unicorn
   unicorn-rails

README.md

@@ -9,17 +9,22 @@ 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.
+* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel and join #dev for all tech-related topics.
 * 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).
 
 ## Contributing
 
-If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through our [Contributor Guide][contributor-guide].
+If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through the [OFN Handbook][ofn-handbook].
 
 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.
@@ -28,7 +33,9 @@ We also have a [Super Admin Guide][super-admin-guide] to help with configuration
 
 ## Testing
 
-We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
+If you'd like to help out with testing, please introduce yourself on the #testing channel on [Slack][slack-invite] and download the [ZenHub browser extension][zenhub] to view the development pipeline.
+
+We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them! 
 
 ## Licence
 
@@ -36,6 +43,8 @@ Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 [slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
-[contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
+[ofn-handbook]: https://ofn-user-guide.gitbook.io/ofn-handbook/
 [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
+[zenhub]: https://www.zenhub.com/extension

Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

app/assets/images/flag.svg

@@ -1,10 +0,0 @@
-<?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 spree
+//= require admin/spree/spree
 //= require admin/spree/spree-select2
 //= require modernizr
 //= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express
-//= require admin/handlebar_extensions
+//= require admin/spree/handlebar_extensions
 
 // OFN specific
 //= require_tree ../templates/admin
@@ -71,20 +71,23 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//= require moment
-//= require moment/de.js
-//= require moment/en-gb.js
-//= require moment/es.js
-//= require moment/fr.js
-//= require moment/it.js
-//= require moment/nb.js
-//= require moment/pt-br.js
-//= require moment/pt.js
-//= require moment/ru.js
-//= require moment/sv.js
-//= require moment/ca.js
-//= require moment/ar.js
-//= require moment/tr.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
 
 // 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, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser) ->
+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) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -13,37 +13,29 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
   ]
 
-  $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.q = {
+    producerFilter: ""
+    categoryFilter: ""
+    importDateFilter: ""
+    query: ""
+    sorting: ""
+  }
 
   $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 '[query, producerFilter, categoryFilter, importDateFilter, per_page]', ->
+  $scope.$watchCollection '[q.query, q.producerFilter, q.categoryFilter, q.importDateFilter, per_page]', ->
     $scope.page = 1 # Reset page when changing filters for new search
 
   $scope.changePage = (newPage) ->
@@ -53,25 +45,27 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.fetchProducts = ->
     removeClearedValues()
     params = {
-      '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,
+      '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,
       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.producerFilter if $scope.producerFilter == "0"
-    delete $scope.categoryFilter if $scope.categoryFilter == "0"
-    delete $scope.importDateFilter if $scope.importDateFilter == "0"
+    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"
 
   $timeout ->
     if $scope.showLatestImport
-      $scope.importDateFilter = $scope.importDates[1].id
+      $scope.q.importDateFilter = $scope.importDates[1].id
 
   $scope.resetProducts = ->
     DirtyProducts.clear()
@@ -101,16 +95,16 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.visibleTab = tab
 
   $scope.resetSelectFilters = ->
-    $scope.query = ""
-    $scope.producerFilter = "0"
-    $scope.categoryFilter = "0"
-    $scope.importDateFilter = "0"
+    $scope.q.query = ""
+    $scope.q.producerFilter = "0"
+    $scope.q.categoryFilter = "0"
+    $scope.q.importDateFilter = "0"
     $scope.fetchProducts()
 
   $scope.$watch 'sortOptions', (sort) ->
     return unless sort && sort.predicate != ""
 
-    $scope.sorting = sort.getSortingExpr()
+    $scope.q.sorting = sort.getSortingExpr()
     $scope.fetchProducts()
   , true
 
@@ -122,8 +116,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
   $scope.editWarn = (product, variant) ->
     if confirm_unsaved_changes()
-      window.open(editProductUrl(product, variant), "_blank")
-
+      $window.location.href = ProductFiltersUrl.buildUrl(editProductUrl(product, variant), $scope.q)
 
   $scope.toggleShowAllVariants = ->
     showVariants = !DisplayProperties.showVariants 0
@@ -220,10 +213,10 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       data:
         products: productsToSubmit
         filters:
-          'q[name_cont]': $scope.query
-          'q[supplier_id_eq]': $scope.producerFilter
-          'q[primary_taxon_id_eq]': $scope.categoryFilter
-          import_date: $scope.importDateFilter
+          '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
         page: $scope.page
         per_page: $scope.per_page
     ).success((data) ->

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -47,3 +47,8 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
         tag.text.toLowerCase().indexOf(query.toLowerCase()) != -1
       defer.resolve filtered
     defer.promise
+
+  $scope.displayBalanceStatus = (customer) ->
+    return unless customer.balance_status
+
+    t('admin.customers.index.' + customer.balance_status)

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

@@ -5,5 +5,10 @@ angular.module("ofn.admin").directive "ofnSelect2MinSearch", ->
       minimumResultsForSearch: attrs.ofnSelect2MinSearch
 
     ngModel.$formatters.push (value) ->
-      if (value)
-        element.select2('val', 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}")
+

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

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

app/assets/javascripts/admin/enterprises/directives/terms_and_conditions_warning.js.coffee

@@ -0,0 +1,30 @@
+angular.module("admin.enterprises").directive 'termsAndConditionsWarning', ($compile, $templateCache, DialogDefaults, $timeout) ->
+  restrict: 'A'
+  scope: true
+
+  link: (scope, element, attr) ->
+    # This file input click handler will hold the browser file input dialog and show a warning modal
+    scope.hold_file_input_and_show_warning_modal = (event) ->
+      event.preventDefault()
+      scope.template = $compile($templateCache.get('admin/modals/terms_and_conditions_warning.html'))(scope)
+      if scope.template.dialog
+        scope.template.dialog(DialogDefaults)
+        scope.template.dialog('open')
+      scope.$apply()
+
+    element.bind 'click', scope.hold_file_input_and_show_warning_modal
+
+    # When the user presses continue in the warning modal, we open the browser file input dialog
+    scope.continue = ->
+      scope.template.dialog('close')
+
+      # unbind warning modal handler and click file input again to open the browser file input dialog
+      element.unbind('click').trigger('click')
+      # afterwards, bind warning modal handler again so that the warning is shown the next time
+      $timeout ->
+        element.bind 'click', scope.hold_file_input_and_show_warning_modal
+      return
+
+    scope.close = ->
+      scope.template.dialog('close')
+      return

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

@@ -9,22 +9,19 @@ 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
-          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)
-            )
-
+        $(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)
+                )
+            }
+          )
+        )
 
   .directive 'ofnOnChange', ->
     (scope, element, attrs) ->

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

@@ -53,17 +53,18 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
       [value, unit_name]
 
     scale_for_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,""]
+      # 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
 
-      unit
+      # 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)]

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

@@ -1,22 +1,41 @@
-angular.module("admin.products").factory "VariantUnitManager", ->
+angular.module("admin.products").factory "VariantUnitManager", (availableUnits) ->
   class VariantUnitManager
-    @unitNames:
+    @units:
       'weight':
-        1.0: 'g'
-        1000.0: 'kg'
-        1000000.0: 'T'
+        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'
       'volume':
-        0.001: 'mL'
-        1.0: 'L'
-        1000.0: 'kL'
+        0.001:
+          name: 'mL'
+          system: 'metric'
+        1.0:
+          name: 'L'
+          system: 'metric'
+        1000.0:
+          name: 'kL'
+          system: 'metric'
 
     @variantUnitOptions: ->
-      options = for unit_type, scale_with_name of @unitNames
-        for scale in @unitScales(unit_type)
+      available = availableUnits.split(",")
+      options = for unit_type, _ of @units
+        for scale in @unitScales(unit_type, available)
           name = @getUnitName(scale, unit_type)
           ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
       options.push [[I18n.t('items'), 'items']]
-      [].concat options...
+      options = [].concat options...
 
     @getScale: (value, unitType) ->
       scaledValue = null
@@ -30,7 +49,21 @@ angular.module("admin.products").factory "VariantUnitManager", ->
         unitScales[0]
 
     @getUnitName: (scale, unitType) ->
-      @unitNames[unitType][scale]
+      if @units[unitType][scale]
+        @units[unitType][scale]['name']
+      else
+        ''
 
-    @unitScales: (unitType) ->
-      (parseFloat(scale) for scale in Object.keys(@unitNames[unitType])).sort()
+    @unitScales: (unitType, availableUnits = null) ->
+      scales = Object.keys(@units[unitType])
+      if availableUnits
+        scales = scales.filter (scale) ->
+          availableUnits.includes(VariantUnitManager.getUnitName(scale, unitType))
+
+      (parseFloat(scale) for scale in scales).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

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

@@ -14,4 +14,7 @@ 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,3 +52,4 @@ 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

@@ -0,0 +1,23 @@
+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

@@ -1,5 +1,4 @@
 //= require_self
-//= require admin/handlebar_extensions
 //= require admin/spree/orders/variant_autocomplete
 
 /**
@@ -116,7 +115,8 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 }
 
 $(document).ready(function() {
-  if (typeof Spree !== 'undefined') {
+  if (typeof Spree !== 'undefined' &&
+    typeof Spree.translations !== 'undefined') {
     handle_date_picker_fields = function(){
       $('.datepicker').datepicker({
         dateFormat: Spree.translations.date_picker,
@@ -127,7 +127,16 @@ $(document).ready(function() {
         nextText: Spree.translations.next,
         showOn: "focus"
       });
-
+      
+       $.datepicker.regional[I18n.locale] = {
+          prevText: Spree.translations.previous,
+          nextText: Spree.translations.next,
+          monthNames: Spree.translations.month_names,
+          dayNames: Spree.translations.abbr_day_names,
+          dayNamesMin: Spree.translations.abbr_day_names,
+          dateFormat: Spree.translations.date_picker
+      };
+      $.datepicker.setDefaults( $.datepicker.regional[I18n.locale]);
       // Correctly display range dates
       $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
         $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );

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

@@ -0,0 +1,9 @@
+//= require handlebars
+
+Handlebars.registerHelper("t", function(key) {
+  if (Spree.translations[key]) {
+    return Spree.translations[key]
+  } else {
+    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
+  }
+});

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

@@ -1,59 +0,0 @@
-$(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,27 +1,17 @@
 var update_state = function(region) {
   var country        = $('span#' + region + 'country .select2').select2('val');
-
   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();
-    }
+  $.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();
   })
 };

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

@@ -0,0 +1,17 @@
+$(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

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

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

@@ -28,20 +28,23 @@
 #= require angular-backstretch.js
 #= require angular-flash.min.js
 #
-#= require moment
-#= require moment/de.js
-#= require moment/en-gb.js
-#= require moment/es.js
-#= require moment/fr.js
-#= require moment/it.js
-#= require moment/nb.js
-#= require moment/pt-br.js
-#= require moment/pt.js
-#= require moment/ru.js
-#= require moment/sv.js
-#= require moment/ca.js
-#= require moment/ar.js
-#= require moment/tr.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 modernizr
 #

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

@@ -1,7 +1,7 @@
 Darkswarm.controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards) ->
   angular.extend(this, new FieldsetMixin($scope))
   $scope.savedCreditCards = CreditCards.saved
-  $scope.setDefault = CreditCards.setDefault
+  $scope.confirmSetDefault = CreditCards.confirmSetDefault
   $scope.CreditCard = CreditCard
   $scope.secrets = CreditCard.secrets
   $scope.showForm = CreditCard.show

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

@@ -2,15 +2,6 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, $rootScope, $timeout, OrderCycle
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
-  # Timeout forces this to be evaluated after everything is loaded
-  # This is a hack. We should probably write our own "popover" directive
-  # That takes an expression instead of a trigger, and binds to that
-  $timeout =>
-    $rootScope.$broadcast 'orderCycleSelected'
-    if !$scope.OrderCycle.selected()
-      $("#order_cycle_id").trigger("openTrigger")
-
-
 Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
   # Track previous order cycle id for use with revertOrderCycle()
   $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id
@@ -34,3 +25,6 @@ Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, Orde
     Cart.reloadFinalisedLineItems()
     ChangeableOrdersAlert.reload()
     $rootScope.$broadcast 'orderCycleSelected'
+
+  $scope.closesInLessThan3Months = () ->
+    moment().diff(moment(OrderCycle.orders_close_at(),  "YYYY-MM-DD HH:mm:SS Z"), 'days') > -75

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

@@ -1,4 +1,4 @@
-Darkswarm.controller "PageSelectionCtrl", ($scope, $location) ->
+Darkswarm.controller "PageSelectionCtrl", ($scope, $rootScope, $location) ->
   $scope.selectedPage = ->
     # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`.
     # We remove the slash at the beginning.
@@ -15,3 +15,8 @@ Darkswarm.controller "PageSelectionCtrl", ($scope, $location) ->
   $scope.whitelistPages = (pages) ->
     $scope.whitelist = pages
     $scope.lastPage = pages[0]
+
+  # when an order cycle is changed, ensure the shop tab is active to save a click
+  $rootScope.$on "orderCycleSelected", ->
+    if $scope.selectedPage() != "shop"
+      $location.path("shop")

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

@@ -12,6 +12,11 @@ Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Product
   $scope.supplied_properties = null
   $scope.showFilterSidebar = false
 
+  # Update filters after initial load of shop tab
+  $timeout =>
+    $scope.update_filters()
+
+  # Update filters when order cycle changed
   $rootScope.$on "orderCycleSelected", ->
     $scope.update_filters()
     $scope.clearAll()
@@ -63,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_supplier_name_cont]': $scope.query,
+      'q[name_or_meta_keywords_or_variants_display_as_or_variants_display_name_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

@@ -0,0 +1,39 @@
+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/darkswarm.js.coffee

@@ -16,8 +16,5 @@ window.Darkswarm = angular.module("Darkswarm", [
   $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
   $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"
 
-  # This allows us to trigger these two events on tooltips
-  $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' )
-
   # We manually handle our scrolling
   $anchorScrollProvider.disableAutoScrolling()

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

@@ -43,7 +43,7 @@ Darkswarm.directive 'mapSearch', ($timeout, Search) ->
     # When the map loads, and we have a search from ?query, perform that search
     scope.performUrlSearch = (map) ->
       google.maps.event.addListenerOnce map, "idle", =>
-        google.maps.event.trigger(scope.input, 'focus');
+        google.maps.event.trigger(scope.input, 'focus',{});
         google.maps.event.trigger(scope.input, 'keydown', {keyCode: 13});
 
     # Bias the SearchBox results towards places that are within the bounds of the

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,6 +15,3 @@ 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

@@ -1,10 +0,0 @@
-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,10 +4,4 @@ Darkswarm.directive "shopVariant", ->
   templateUrl: 'shop_variant.html'
   scope:
     variant: '='
-  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)
+  controller: 'ShopVariantCtrl'

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

@@ -5,15 +5,13 @@ Darkswarm.directive "tabsetCtrl", (Tabsets, $location) ->
     selected: "@"
     navigate: "="
     prefix: "@?"
-    alwaysopen: "="
   controller: ($scope, $element) ->
     if $scope.navigate
       path = $location.path()?.match(/^\/\w+$/)?[0]
       $scope.selected = path[1..] if path
 
     this.toggle = (name) ->
-      state = if $scope.alwaysopen then 'open' else null
-      Tabsets.toggle($scope.id, name, state)
+      Tabsets.toggle($scope.id, name)
 
     this.select = (selection) ->
       $scope.$broadcast("selection:changed", selection)

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

@@ -6,7 +6,7 @@ Darkswarm.filter "localizeCurrency", (currencyConfig)->
     # Set decimal points, 2 or 0 if hide_cents.
     decimals = if currencyConfig.hide_cents == "true" then 0 else 2
     # Set format if the currency symbol should come after the number, otherwise (default) use the locale setting.
-    format = if currencyConfig.symbol_position == "after" then "%n %u" else undefined
+    format = if currencyConfig.symbol_position == "after" then "%n%u" else undefined
     # We need to use parseFloat as the amount should come in as a string.
     amount = parseFloat(amount)
 

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, RailsFlashLoader) ->
+Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, Messages) ->
   # Handles syncing of current cart/order state to server
   new class Cart
     dirty: false
@@ -50,7 +50,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
         @popQueue() if @update_enqueued
 
       .error (response, status)=>
-        RailsFlashLoader.loadFlash({error: t('js.cart.add_to_cart_failed')})
+        Messages.flash({error: response.error})
         @update_running = false
 
     compareAndNotifyStockLevels: (stockLevels) =>

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, RailsFlashLoader, Loading)->
+Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, Messages)->
   new class Checkout
     errors: {}
     secrets: {}
@@ -13,7 +13,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
         @submit()
 
     submit: =>
-      Loading.message = t 'submitting_order'
+      Messages.loading(t 'submitting_order')
       $http.put('/checkout.json', {order: @preprocess()})
       .then (response) =>
         Navigation.go response.data.path
@@ -24,7 +24,8 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
           try
             @loadFlash(error: t("checkout.failed")) # inform the user about the unexpected error
           finally
-            throw error # generate a BugsnagJS alert
+            Bugsnag.notify(error)
+            throw error
 
     handle_checkout_error_response: (response) =>
       throw response unless response.data?
@@ -38,8 +39,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
         @loadFlash(response.data.flash)
 
     loadFlash: (flash) =>
-      Loading.clear()
-      RailsFlashLoader.loadFlash(flash)
+      Messages.flash(flash)
 
     # Rails wants our Spree::Address data to be provided with _attributes
     preprocess: ->
@@ -95,6 +95,10 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
               last_name: @order.bill_address.lastname
               save_requested_by_customer: @secrets.save_requested_by_customer
           }
+
+      if @terms_and_conditions_accepted()
+        munged_order["terms_and_conditions_accepted"] = true
+
       munged_order
 
     shippingMethod: ->
@@ -114,3 +118,7 @@ Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeE
 
     cartTotal: ->
       @order.display_total + @shippingPrice() + @paymentPrice()
+
+    terms_and_conditions_accepted: ->
+      terms_and_conditions_checkbox = angular.element("#accept_terms")[0]
+      terms_and_conditions_checkbox? && terms_and_conditions_checkbox.checked

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, RailsFlashLoader, Loading)->
+Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, Messages)->
   new class CreditCard
     visible: false
     errors: {}
@@ -12,16 +12,15 @@ Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeEleme
       params = @process_params()
       $http.put('/credit_cards/new_from_token', params )
         .success (data, status) =>
-          Loading.clear()
+          Messages.clear()
           @reset()
           CreditCards.add(data)
         .error (response, status) =>
           if response.path
             Navigation.go response.path
           else
-            Loading.clear()
             @errors = response.errors
-            RailsFlashLoader.loadFlash(response.flash)
+            Messages.flash(response.flash)
 
     setFullName: ->
       @secrets.name = "#{@secrets.first_name} #{@secrets.last_name}"

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, RailsFlashLoader)->
+Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages, Customers)->
   new class CreditCard
     saved: $filter('orderBy')(savedCreditCards,'-is_default')
 
@@ -10,6 +10,14 @@ Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, RailsFlashLo
       for othercard in @saved when othercard != card
         othercard.is_default = false
       $http.put("/credit_cards/#{card.id}", is_default: true).then (data) ->
-        RailsFlashLoader.loadFlash({success: t('js.default_card_updated')})
+        Messages.success(t('js.default_card_updated'))
+        Customers.clearAllAllowCharges()
       , (response) ->
-        RailsFlashLoader.loadFlash({error: response.data.flash.error})
+        Messages.flash(response.data.flash)
+
+    confirmSetDefault: (card, event) =>
+      if confirm t("js.default_card_voids_auth")
+        @setDefault(card)
+      else
+        event.preventDefault()
+        return false

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

@@ -1,4 +1,4 @@
-angular.module("Darkswarm").factory 'Customer', ($resource, RailsFlashLoader) ->
+angular.module("Darkswarm").factory 'Customer', ($resource, $injector, Messages) ->
   Customer = $resource('/api/customers/:id/:action.json', {}, {
     'index':
       method: 'GET'
@@ -12,9 +12,22 @@ angular.module("Darkswarm").factory 'Customer', ($resource, RailsFlashLoader) ->
   })
 
   Customer.prototype.update = ->
+    if @allow_charges
+      Messages.loading(t('js.authorising'))
     @$update().then (response) =>
-      RailsFlashLoader.loadFlash({success: t('js.changes_saved')})
+      if response.gateway_recurring_payment_client_secret && $injector.has('stripePublishableKey')
+        Messages.clear()
+        stripe = Stripe($injector.get('stripePublishableKey'), { stripeAccount: response.gateway_shop_id })
+        stripe.confirmCardSetup(response.gateway_recurring_payment_client_secret).then (result) =>
+          if result.error
+            @allow_charges = false
+            @$update(allow_charges: false)
+            Messages.error(result.error.message)
+          else
+            Messages.success(t('js.changes_saved'))
+      else
+        Messages.success(t('js.changes_saved'))
     , (response) =>
-      RailsFlashLoader.loadFlash({error: response.data.error})
+      Messages.error(response.data.error)
 
   Customer

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

@@ -12,3 +12,7 @@ angular.module("Darkswarm").factory 'Customers', (Customer) ->
       for customer in customers
         @all.push customer
         @byID[customer.id] = customer
+
+    clearAllAllowCharges: () ->
+      for customer in @index()
+        customer.allow_charges = false

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

@@ -1,5 +1,5 @@
 Darkswarm.factory "Loading", ->
   new class Loading
-    message: null 
+    message: null
     clear: =>
       @message = null

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

@@ -0,0 +1,17 @@
+Darkswarm.factory "Messages", (Loading, RailsFlashLoader)->
+  new class Messages
+    loading: (message) ->
+      Loading.message = message
+
+    success: (message) ->
+      @flash(success: message)
+
+    error: (message) ->
+      @flash(error: message)
+
+    flash: (flash) ->
+      @clear()
+      RailsFlashLoader.loadFlash(flash)
+
+    clear: ->
+      Loading.clear()

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

@@ -1,4 +1,4 @@
-Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
+Darkswarm.factory 'StripeElements', ($rootScope, Messages) ->
   new class StripeElements
     # These are both set from the StripeElements directive
     stripe: null
@@ -8,39 +8,49 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
     requestToken: (secrets, submit, loading_message = t("processing_payment")) ->
       return unless @stripe? && @card?
 
-      Loading.message = loading_message
+      Messages.loading loading_message
       cardData = @makeCardData(secrets)
 
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
-          Loading.clear()
-          RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
-          @triggerAngularDigest()
-          console.error(JSON.stringify(response.error))
+          @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.token.id
           secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
+      .catch (response) =>
+        # Stripe handles errors in the response above. This code may never be
+        # reached. But if we get here, we want to know.
+        @reportError(response, t("js.stripe_elements.unknown_error_from_stripe"))
+        throw response
 
     # Create Payment Method to be used with the Stripe Payment Intents API
     createPaymentMethod: (secrets, submit, loading_message = t("processing_payment")) ->
       return unless @stripe? && @card?
 
-      Loading.message = loading_message
+      Messages.loading loading_message
       cardData = @makeCardData(secrets)
 
       @stripe.createPaymentMethod({ type: 'card', card: @card }, @card, cardData).then (response) =>
         if(response.error)
-          Loading.clear()
-          RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
-          @triggerAngularDigest()
-          console.error(JSON.stringify(response.error))
+          @reportError(response.error, t("error") + ": #{response.error.message}")
         else
           secrets.token = response.paymentMethod.id
           secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
+      .catch (response) =>
+        # Stripe handles errors in the response above. This code may never be
+        # reached. But if we get here, we want to know.
+        @reportError(response, t("js.stripe_elements.unknown_error_from_stripe"))
+        throw response
+
+    reportError: (error, messageForUser) ->
+      Messages.error(messageForUser)
+      @triggerAngularDigest()
+      console.error(error)
+      Bugsnag.notify(new Error(JSON.stringify(error)))
 
     triggerAngularDigest: ->
       # $evalAsync is improved way of triggering a digest without calling $apply

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

@@ -7,12 +7,10 @@ Darkswarm.factory 'Tabsets', ->
         @tabsets.push { ctrl: ctrl, id: id, selected: selected }
         ctrl.select(selected) if selected?
 
-    toggle: (id, name, state=null) ->
+    toggle: (id, name) ->
       tabset = @findTabsetByObject(id)
-      if tabset.selected == name
-        @select(tabset, null) unless state == "open"
-      else
-        @select(tabset, name) unless state == "closed"
+      if tabset.selected != name
+        @select(tabset, name)
 
     select: (tabset, name) ->
       tabset.selected = name

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

@@ -10,7 +10,6 @@ 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/admin/modals/terms_and_conditions_info.html.haml

@@ -0,0 +1,13 @@
+%div
+  .margin-bottom-30.text-center
+    .text-big
+      {{ 'js.admin.modals.terms_and_conditions_info.title' | t }}
+  .margin-bottom-30
+    %p
+      {{ 'js.admin.modals.terms_and_conditions_info.message_1' | t }}
+  .margin-bottom-30
+    %p
+      {{ 'js.admin.modals.terms_and_conditions_info.message_2' | t }}
+
+  .text-center
+    %input.button.red.icon-plus{ type: 'button', value: t('js.admin.modals.got_it'), ng: { click: 'close()' } }

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

@@ -0,0 +1,14 @@
+%div
+  .margin-bottom-30.text-center
+    .text-big
+      {{ 'js.admin.modals.terms_and_conditions_warning.title' | t }}
+  .margin-bottom-30
+    %p
+      {{ 'js.admin.modals.terms_and_conditions_warning.message_1' | t }}
+  .margin-bottom-30
+    %p
+      {{ 'js.admin.modals.terms_and_conditions_warning.message_2' | t }}
+
+  .text-center
+    %input.button.red{ type: 'button', value: t('js.admin.modals.close'), ng: { click: 'close()' } }
+    %input.button.red{ type: 'button', value: t('js.admin.modals.continue'), ng: { click: 'continue()' } }

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

@@ -0,0 +1,37 @@
+.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/hub_details.html.haml

@@ -14,8 +14,9 @@
             {{'hubs_delivery' | t}}
     .row
       .columns.small-12
-        %a.cta-hub{"ng-href" => "{{::enterprise.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
+        %a.cta-hub{"ng-href" => "{{::enterprise.path}}#/shop", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}",
         "ng-class" => "{primary: enterprise.active, secondary: !enterprise.active}",
+        "ng-click" => "$close()",
         "ofn-change-hub" => "enterprise"}
           .hub-name{"ng-bind" => "::enterprise.name"}
           %span{"ng-if" => "::enterprise.active"} ({{'maps_open' | t}})

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

@@ -12,8 +12,9 @@
     .row
       .columns.small-12
         %a.cta-hub{"ng-repeat" => "hub in enterprise.hubs | filter:{id: '!'+enterprise.id} | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}", "ofn-empties-cart" => "hub",
-        "ng-class" => "::{primary: hub.active, secondary: !hub.active}"}
+        "ng-href" => "{{::hub.path}}#/shop", "ofn-empties-cart" => "hub",
+        "ng-class" => "::{primary: hub.active, secondary: !hub.active}",
+        "ng-click" => "$close()"}
           .hub-name{"ng-bind" => "::hub.name"}
           %span{"ng-if" => "::hub.active"} ({{'maps_open' | t}})
           %span{"ng-if" => "::!hub.active"} ({{'maps_closed' | t}})

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

@@ -1,14 +1,16 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  %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}}"}
+  %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"}}

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

@@ -1,28 +1,17 @@
 .small-5.medium-3.large-3.columns.text-right{"ng-if" => "::variant.product.group_buy"}
 
-  %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"}
+  %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"}}

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

@@ -1,37 +1,28 @@
-.joyride-tip-guide.price_breakdown{"ng-class" => "{ in: tt_isOpen, fade: tt_animation }"}
-  %span.joyride-nub.right
+.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-content-wrapper
-    .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
+    %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 }}
+           

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

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

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

@@ -1,31 +1,16 @@
 .variants.row
-  .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}}
+  .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 }}
 
   %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,7 +35,6 @@
 @import 'plugins/font-awesome';
 @import 'plugins/select2';
 
-@import 'sections/image_settings';
 @import 'sections/orders';
 @import 'sections/products';
 

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

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

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

@@ -29,11 +29,6 @@ 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/pages/enterprise_form.scss

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

app/assets/stylesheets/admin/products.scss

@@ -121,3 +121,10 @@ form#image_upload {
   }
 }
 
+form.edit_image {
+  .field {
+    img {
+      max-width: 150px;
+    }
+  }
+}

app/assets/stylesheets/admin/reports.scss

@@ -3,6 +3,7 @@
 .report__table {
   margin-top: 2em;
 }
+
 .report__message {
   margin-top: 2em;
   border: 1px solid $pale-blue;
@@ -10,3 +11,7 @@
   padding: .5em;
   text-align: center;
 }
+
+.customer-names-tip {
+  margin-top: 1em;
+}

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

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

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

@@ -8,23 +8,61 @@
           box-sizing: border-box;
 }
 
-// Helpers
-.block-table {
-  display: table;
-  width: 100%;
+.admin {
+  &__section-header {
+    padding: 15px 0;
+    background-color: very-light($color-3, 4);
+    border-bottom: 1px solid $color-border;
 
-  .table-cell {
-    display: table-cell;
-    vertical-align: middle;
-    padding: 0 10px;
-
-    &:first-child {
-      padding-left: 0;
-      width: 70%;
+    .ofn-drop-down {
+      border: 0;
+      background-color: $spree-blue;
+      color: $color-1;
+      float: none;
+      margin-left: 3px;
+      &:hover,
+      &.expanded {
+        border: 0;
+        color: $color-1;
+      }
     }
-    &:last-child {
-      padding-right: 0;
-      width: 30%;
+
+    &__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;
+        }
+      }
     }
   }
 }
@@ -33,12 +71,6 @@
   display: none;
 }
 
-// For block grids
-.frameless {
-  margin-left: -10px;
-  margin-right: -10px;
-}
-
 // Header
 //---------------------------------------------------
 #header {
@@ -66,25 +98,6 @@
   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,3 +132,29 @@ 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;
+}
+
+.white-space-nowrap {
+  white-space: nowrap;
+}

app/assets/stylesheets/admin/typography.scss

@@ -1,20 +0,0 @@
-@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,93 +6,110 @@
 .darkswarm {
   // #search
   @include placeholder(rgba(0, 0, 0, 0.4), #777);
+}
 
-  // ordering
-  product {
-    input {
-      @include border-radius(0);
+.reveal-modal.product-bulk-modal {
+  width: 26em;
+}
 
-      @include csstrans;
+// 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;
 
-      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;
-      }
+  &:hover {
+    background-color: $orange-600;
+  }
+  &[disabled] {
+    &:hover, &:focus {
+      background-color: $orange-500;
     }
+  }
+  &: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;
+  }
+}
 
-    // BULK
+button.add-variant {
+  min-width: 6rem;
+  padding: 0 1em;
 
-    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;
-      }
+  &[disabled] {
+    &:hover, &:focus {
+      background-color: $orange-500;
     }
   }
 }
+
+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: 3em;
+  margin-top: 3.4em;
   padding: 1em;
   height: 7.6em;
   position: absolute;

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

@@ -4,86 +4,69 @@
 // 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
-  background-color: #999;
-  color: #1f1f1f;
-  margin-left: -8px;
+  margin-left: -7.4rem;
+  margin-top: 0.1rem;
 
-  @include box-shadow(0 1px 2px 0 rgba(0, 0, 0, 0.7));
+  @include box-shadow(0 2px 8px 0 rgba(0, 0, 0, 0.35));
 
   .joyride-content-wrapper {
-    padding: 1.125rem 1.25rem 1.5rem;
-    padding: 1rem;
-    margin: 1%;
+    padding: .625rem;
     width: 98%;
-    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;
+    background-color: $grey-800;
     color: white;
-    font-size: 0.75rem;
-    font-style: oblique;
-    line-height: 1;
-    height: auto;
-
-    .right {
-      padding: 0.5rem 0.25rem 0 0;
-    }
-
-    .meter {
-      background-color: #0b8c61;
-      padding: 0.5rem 0.25rem;
-      border-right: 1px solid #539f92;
-    }
   }
 
-  .expanded {
-    ul, li {
-      list-style: none;
-      margin: 0;
-      font-size: 0.875rem;
-    }
+  h6 {
+    font-size: 0.937rem;
+    line-height: 1;
+    border-bottom: .1em solid $grey-700;
+    padding: 0 0 .625em 0;
+    margin-bottom: 2px;
+  }
 
-    li {
-      background-color: #13bf85;
-      padding: 0 0.25rem;
-      margin-bottom: 2px;
-      color: white;
-    }
+  .joyride-nub.top {
+    left: 7.4rem;
+    z-index: -1;
+  }
 
-    li.cost {
-      background-color: #0b8c61;
-    }
+  .background {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    cursor: pointer;
+  }
 
-    li:last-child {
-      margin-bottom: 0.75rem;
-    }
+  ul, li {
+    list-style: none;
+    margin: 0;
+    font-size: 0.875rem;
+  }
+
+  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;
   }
 }
 
 button.graph-button {
   // z-index: 9999999
-  border: 1px solid transparent;
   padding: 0;
   margin: 0;
-  display: inline;
+  display: inline-block;
   background-color: rgba(255, 255, 255, 0.5);
-  padding: 4px;
 
   @include box-shadow(none);
 
@@ -97,7 +80,6 @@ button.graph-button {
   }
 
   &:focus {
-    border: 1px solid #e0e0e0;
     background-color: rgba(255, 255, 255, 1);
 
     &:before {
@@ -107,22 +89,15 @@ button.graph-button {
 
   &:hover, &:active {
     background-color: rgba(255, 255, 255, 1);
-    border: 1px solid transparent;
 
     &:before {
-      color: $clr-brick-bright;
+      color: $teal-500;
     }
   }
-
-  @include breakpoint(tablet) {
-    // Hide for small
-    display: none;
-  }
 }
 
 button.graph-button.open {
-  border: 1px solid transparent;
-  background-color: $clr-brick-bright;
+  background-color: $teal-500;
 
   &:before {
     content: "";

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

@@ -10,91 +10,58 @@
         .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;
-          }
         }
+      }
 
-        .table-cell {
-          display: table-cell;
-          vertical-align: middle;
-          height: 37px;
+      .shop-variants {
+        // product-thumb width + 1rem
+        padding-left: calc(22.222% + 1rem);
+
+        @include breakpoint(phablet) {
+          padding-left: 0;
+          clear: left;
         }
       }
 
       // ROW VARIANTS
       .row.variants {
-        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;
-          }
-        }
+        margin: 0 0 1em 0;
 
         &.out-of-stock {
           opacity: 0.2;
         }
 
+        .variant-name,
+        .total-price {
+          padding-top: .74em;
+        }
+        .variant-price {
+          padding-top: .65em;
+        }
+
         // Variant name
         .variant-name {
-          padding-left: 7.9375rem;
+          padding-left: 0;
+          padding-right: 0;
 
-          @include breakpoint(tablet) {
-            padding-left: 4.9375rem;
-          }
-        }
-
-        .variant-name {
           @include breakpoint(phablet) {
-            background: #333;
-            color: white;
-            padding-left: 0.9375rem;
-            font-weight: bold;
-
-            .table-cell {
-              height: 27px;
-            }
+            padding-left: 0.5rem;
           }
-        }
 
-        // 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;
+          & > *:nth-child(n + 2) {
+            color: $grey-550;
+            font-size: 0.875rem;
+            font-style: italic;
+            line-height: normal;
           }
         }
 
         // Variant price
         .variant-price {
-          padding-left: 0.25rem;
-          padding-right: 0.25rem;
-
+          white-space: nowrap;
           @include breakpoint(phablet) {
-            text-align: right;
+            padding-left: 1rem;
           }
         }
 
@@ -108,24 +75,16 @@
           }
 
           @include breakpoint(phablet) {
-            background: #777;
-            color: $disabled-med;
-
-            .filled {
-              color: white;
-            }
-
-            .table-cell {
-              height: 27px;
-            }
+            display: none;
           }
         }
       }
 
       // ROW SUMMARY
-      .row.summary {
+      .summary {
         margin-left: 0;
         margin-right: 0;
+        margin-bottom: 1.25em;
         background: #fff;
 
         .columns {
@@ -140,39 +99,77 @@
         }
 
         .summary-header {
-          padding-left: 7.9375rem;
-
-          @include breakpoint(tablet) {
-            padding-left: 4.9375rem;
-          }
+          // product-thumb width + 1rem
+          padding-left: calc(22.222% + 1rem);
+          padding-right: 1rem;
 
           @include breakpoint(phablet) {
-            padding-left: 0.9375rem;
+            padding-left: calc(33.333% + 1rem);
           }
 
-          small {
-            font-size: 80%;
+          .product-producer {
+            color: $grey-550;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            font-style: italic;
+
+            a {
+              color: $teal-500;
+
+              &:hover, &:focus, &:active {
+                color: $teal-600;
+                text-decoration: underline;
+              }
+            }
           }
 
           h3 {
-            font-size: 1.5rem;
-            margin: 0;
+            font-size: 1.3rem;
+            margin-top: 0.75rem;
+            margin-bottom: 0.6rem;
           }
 
           h3 a {
-            color: #222;
-
-            i {
-              @include csstrans;
-
-              font-size: 0.6em;
-            }
+            color: $orange-500;
 
             &:hover, &:focus, &:active {
-              color: $clr-brick;
+              color: $orange-600;
+              text-decoration: underline;
+            }
+          }
 
-              i {
-                font-size: 0.8em;
+          .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;
               }
             }
           }

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

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

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

@@ -1,47 +0,0 @@
-@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,7 +11,6 @@ $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;
@@ -48,6 +47,7 @@ $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,6 +56,7 @@ $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

@@ -5,7 +5,7 @@ $large-menu-height: 4.6875rem;
 $medium-menu-height: 3rem;
 $gutter-width: 0.9375rem;
 
-nav.top-bar ul.left li.powered-by {
+.top-bar .powered-by {
   display: none;
 }
 
@@ -59,13 +59,6 @@ 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/expanding-sidebar.scss

@@ -16,12 +16,14 @@
     width: 100%;
     background-color: $shop-sidebar-overlay;
     opacity: 0;
-    transition: opacity $transition-sidebar;
+    visibility: hidden;
+    transition: all $transition-sidebar;
   }
 
   &.shown {
     .background {
       opacity: 1;
+      visibility: visible;
     }
 
     .sidebar,

app/assets/stylesheets/darkswarm/hub_node.scss

@@ -16,6 +16,22 @@
 
     .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
@@ -44,13 +60,6 @@
       }
     }
 
-    //Hub Link
-    @include breakpoint(phablet) {
-      a.hub {
-        display: block;
-      }
-    }
-
     //Hub Name
     span.hub-name-listing {
       font-weight: 700;
@@ -67,11 +76,11 @@
       .active_table_row {
         border: 1px solid transparent;
 
-        @include breakpoint(phablet) {
-          border-color: $clr-brick-light;
+        &:hover, &:active, &:focus {
+          border-color: $clr-brick-light-bright;
         }
 
-        &:hover, &:active, &:focus {
+        @include breakpoint(phablet) {
           border-color: $clr-brick-light-bright;
         }
       }
@@ -165,8 +174,9 @@
         }
 
         @include breakpoint(phablet) {
-          .active_table_row:first-child .skinny-head {
-            background-color: rgba(255, 255, 255, 0.85);
+          .active_table_row:first-child,
+          .active_table_row:last-child, {
+            background-color: rgba($white, 0.75);
           }
         }
       }

app/assets/stylesheets/darkswarm/menu.scss

@@ -44,6 +44,13 @@ nav.top-bar {
 
 .top-bar-section {
   border-bottom: 1px solid $light-grey-transparency;
+  display: flex;
+  justify-content: space-between;
+
+  .nav-main-menu,
+  .nav-icons-menu {
+    flex-shrink: 0;
+  }
 
   a.icon {
     &:hover {
@@ -99,21 +106,14 @@ nav.top-bar {
     }
   }
 
-  ul.center {
-    display: inline-block;
-
-    // By default, we center between the left and right uls, but we want to be centered
-    // relative to the whole page. The difference in width between the other uls is 74px,
-    // so we offset by that amount here.
-    margin-left: -74px;
-  }
-
   ul.dropdown {
     border: 1px solid $smoke;
     border-top: none;
+    left: auto;
+    right: 0;
   }
 
-  ul.right {
+  .nav-icons-menu {
     > li {
       border-left: 1px solid #ddd;
       padding: 0 14px;
@@ -212,7 +212,7 @@ nav.top-bar {
 }
 
 .off-canvas-wrap {
-  overflow: inherit;
+  overflow: initial;
 }
 
 .off-canvas-list li.language-switcher ul li {
@@ -244,9 +244,7 @@ nav.top-bar {
 
 .top-bar .ofn-logo img {
   height: auto;
-  width: auto;
   max-height: 44px;
-  max-width: 250px;
 }
 
 .left-off-canvas-menu {
@@ -289,10 +287,6 @@ nav.top-bar {
     .has-dropdown > a {
       padding: 0 ($topbar-height / 8) !important;
     }
-
-    ul.center {
-      margin-left: -24px;
-    }
   }
 }
 

app/assets/stylesheets/darkswarm/mixins.scss

@@ -1,4 +1,5 @@
 // Note this mixin file is used in ADMIN and FRONTEND
+@import 'shared/variables/layout';
 
 @import "branding";
 
@@ -141,57 +142,6 @@
 
 // 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;
@@ -201,12 +151,6 @@
   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;
 
@@ -258,15 +202,15 @@
 
 @mixin breakpoint($point) {
   @if $point == desktop {
-    @media all and (max-width: 1024px) { @content; }
+    @media all and (max-width: $desktop_breakpoint) { @content; }
   }
   @else if $point == tablet {
-    @media all and (max-width: 768px) { @content; }
+    @media all and (max-width: $tablet_breakpoint) { @content; }
   }
   @else if $point == phablet {
-    @media all and (max-width: 640px)  { @content; }
+    @media all and (max-width: $phablet_breakpoint)  { @content; }
   }
   @else if $point == mobile {
-    @media all and (max-width: 480px)  { @content; }
+    @media all and (max-width: $mobile_breakpoint)  { @content; }
   }
 }

app/assets/stylesheets/darkswarm/producer_node.scss

@@ -5,6 +5,11 @@
   .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;