Merge pull request #10838 from filipefurtad0/fix_negative_adjustment_error

Adds minus sign to validation criteria

.env.development

@@ -5,6 +5,8 @@
 #
 #     cp .env.development .env.local
 
+VERBOSE_QUERY_LOGS=true
+
 SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 OFN_REDIS_URL="redis://localhost:6379/1"

.github/workflows/build.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   knapsack_rspec_controllers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -86,7 +86,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   knapsack_rspec_models:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -155,7 +155,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   knapsack_rspec_system_admin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -233,7 +233,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_system_consumer:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -311,7 +311,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_engines:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -389,7 +389,7 @@ jobs:
           if-no-files-found: ignore
 
   knapsack_rspec_test_the_rest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10
@@ -459,7 +459,7 @@ jobs:
           bundle exec rake knapsack_pro:rspec
 
   non_knapsack_jest_karma:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:10

.prettierignore

@@ -1,8 +1,5 @@
 # Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js
-*.css
-*.scss
-# Except v2
-!/app/webpacker/css/admin/v2/**/*.scss
+
 *.md
 *.yml
 *.yaml
@@ -12,6 +9,10 @@
 babel.config.js
 postcss.config.js
 
+/app/webpacker/css/darkswarm/
+/app/webpacker/css/mail/
+/app/webpacker/css/shared/
+
 /app/assets/
 /config/
 /coverage/

.prettierrc.json

@@ -1 +1,3 @@
-{}
+{
+  "printWidth": 100
+}

.rubocop_styleguide.yml

@@ -40,6 +40,7 @@ Metrics/BlockLength:
     "resources",
     "scenario",
     "shared_examples",
+    "shared_examples_for",
     "xdescribe",
   ]
 

.rubocop_todo.yml

@@ -1,41 +1,11 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400`
-# on 2023-04-14 06:27:24 UTC using RuboCop version 1.50.1.
+# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp`
+# using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/DeprecatedAttributeAssignment:
-  Exclude:
-    - 'engines/catalog/catalog.gemspec'
-    - 'engines/dfc_provider/dfc_provider.gemspec'
-    - 'engines/order_management/order_management.gemspec'
-    - 'engines/web/web.gemspec'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequireMFA:
-  Exclude:
-    - 'engines/catalog/catalog.gemspec'
-    - 'engines/dfc_provider/dfc_provider.gemspec'
-    - 'engines/order_management/order_management.gemspec'
-    - 'engines/web/web.gemspec'
-
 # Offense count: 4
 # Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
@@ -114,13 +84,6 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/requests/checkout/concurrency_spec.rb'
     - 'spec/system/admin/order_cycles/list_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -236,7 +199,7 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/system/consumer/cookies_spec.rb'
     - 'spec/system/consumer/shopping/cart_spec.rb'
 
-# Offense count: 605
+# Offense count: 615
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -449,7 +412,7 @@ Layout/TrailingEmptyLines:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 67
+# Offense count: 70
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:

CONTRIBUTING.md

@@ -71,5 +71,5 @@ From here, your pull request will progress through the [Review, Test, Merge & De
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
 [ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
 [i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Internationalisation-%28i18n%29
-[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/2
+[welcome-dev]: https://github.com/orgs/openfoodfoundation/projects/5
 [ci]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Continuous-Integration

Gemfile

@@ -14,11 +14,11 @@ gem "aws-sdk-s3", require: false
 gem "image_processing"
 
 gem 'activemerchant', '>= 1.78.0'
-gem 'rexml'
 gem 'angular-rails-templates', '>= 0.3.0'
 gem 'awesome_nested_set'
 gem 'ransack', '~> 2.6.0'
 gem 'responders'
+gem 'rexml'
 gem 'webpacker', '~> 5'
 
 gem 'i18n'
@@ -70,8 +70,8 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 gem 'omniauth_openid_connect'
-gem 'openid_connect', '~> 1.3'
 gem 'omniauth-rails_csrf_protection'
+gem 'openid_connect', '~> 1.3'
 
 gem 'angularjs-rails', '1.8.0'
 gem 'bugsnag'
@@ -150,6 +150,7 @@ group :test, :development do
   gem 'capybara'
   gem 'cuprite'
   gem 'database_cleaner', require: false
+  gem 'debug', '>= 1.0.0'
   gem "factory_bot_rails", '6.2.0', require: false
   gem 'fuubar', '~> 2.5.1'
   gem 'json_spec', '~> 1.1.4'
@@ -160,7 +161,6 @@ group :test, :development do
   gem 'rswag-specs'
   gem 'shoulda-matchers'
   gem 'timecop'
-  gem 'debug', '>= 1.0.0'
 end
 
 group :test do
@@ -175,10 +175,11 @@ end
 
 group :development do
   gem 'debugger-linecache'
-  gem 'rails-erd'
   gem 'foreman'
   gem 'listen'
   gem 'pry', '~> 0.13.0'
+  gem 'query_count'
+  gem 'rails-erd'
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'spring'

Gemfile.lock

@@ -137,7 +137,7 @@ GEM
       activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.2)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
@@ -157,16 +157,16 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.750.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.760.0)
+    aws-sdk-core (3.171.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
+    aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -235,13 +235,13 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.3)
-    ddtrace (1.10.1)
+    ddtrace (1.11.1)
       debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
       libdatadog (~> 2.0.0.1.0)
-      libddwaf (~> 1.6.2.0.0)
+      libddwaf (~> 1.8.2.0.0)
       msgpack
     debase-ruby_core_source (3.2.0)
-    debug (1.7.2)
+    debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     debugger-linecache (1.2.0)
@@ -338,7 +338,7 @@ GEM
     hiredis (0.6.3)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -349,7 +349,7 @@ GEM
       activerecord (>= 3.0)
     io-console (0.6.0)
     ipaddress (0.8.3)
-    irb (1.6.3)
+    irb (1.6.4)
       reline (>= 0.3.0)
     jmespath (1.6.2)
     jquery-rails (4.4.0)
@@ -373,14 +373,14 @@ GEM
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jwt (2.7.0)
-    knapsack_pro (3.9.0)
+    knapsack_pro (3.11.0)
       rake
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     libdatadog (2.0.0.1.0)
-    libddwaf (1.6.2.0.0)
+    libddwaf (1.8.2.0.0)
       ffi (~> 1.0)
     libv8-node (16.10.0.0)
     listen (3.8.0)
@@ -405,7 +405,7 @@ GEM
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
     minitest (5.18.0)
@@ -413,7 +413,7 @@ GEM
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    msgpack (1.6.1)
+    msgpack (1.7.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     net-imap (0.3.4)
@@ -487,9 +487,12 @@ GEM
     public_suffix (5.0.1)
     puma (6.2.2)
       nio4r (~> 2.0)
+    query_count (1.1.1)
+      activerecord (>= 4.2)
+      railties (>= 4.2)
     raabro (1.4.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-oauth2 (1.21.3)
@@ -583,33 +586,33 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.1)
+    rspec-rails (6.0.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.11)
-      rspec-expectations (~> 3.11)
-      rspec-mocks (~> 3.11)
-      rspec-support (~> 3.11)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.12.0)
-    rswag-api (2.8.0)
+    rswag-api (2.9.0)
       railties (>= 3.1, < 7.1)
-    rswag-specs (2.8.0)
+    rswag-specs (2.9.0)
       activesupport (>= 3.1, < 7.1)
       json-schema (>= 2.2, < 4.0)
       railties (>= 3.1, < 7.1)
       rspec-core (>= 2.14)
-    rswag-ui (2.8.0)
+    rswag-ui (2.9.0)
       actionpack (>= 3.1, < 7.1)
       railties (>= 3.1, < 7.1)
     rubocop (1.50.2)
@@ -652,11 +655,11 @@ GEM
     semantic_range (3.0.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.0.9)
+    sidekiq (7.1.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.11.0)
+      redis-client (>= 0.14.0)
     sidekiq-scheduler (5.0.2)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
@@ -726,7 +729,7 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.1.0)
-    view_component (2.82.0)
+    view_component (3.0.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -765,7 +768,7 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -857,6 +860,7 @@ DEPENDENCIES
   private_address_check
   pry (~> 0.13.0)
   puma
+  query_count
   rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-timeout

app/assets/javascripts/admin/spree/orders/shipments.js.erb

@@ -15,7 +15,7 @@ $(document).ready(function() {
       console.log(msg);
     });
   }
-  $('[data-hook=admin_order_edit_form] a.ship').click(handle_ship_click);
+  $('.admin-order-edit-form a.ship').click(handle_ship_click);
 
   //handle shipping method edit click
   $('a.edit-method').click(toggleMethodEdit);
@@ -37,7 +37,7 @@ $(document).ready(function() {
       console.log(msg);
     });
   }
-  $('[data-hook=admin_order_edit_form] a.save-method').click(handle_shipping_method_save);
+  $('.admin-order-edit-form a.save-method').click(handle_shipping_method_save);
 
   //handle tracking info edit/delete
 
@@ -64,8 +64,8 @@ $(document).ready(function() {
     return Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipmentNumber + ".json");
   }
 
-  $('[data-hook=admin_order_edit_form] a.save-tracking').click(saveTrackingInfo);
-  $('[data-hook=admin_order_edit_form] a.delete-tracking').click(deleteTrackingInfo);
+  $('.admin-order-edit-form a.save-tracking').click(saveTrackingInfo);
+  $('.admin-order-edit-form a.delete-tracking').click(deleteTrackingInfo);
 
   // handle note edit/delete
 
@@ -96,8 +96,8 @@ $(document).ready(function() {
     }); 
   }
 
-  $('[data-hook=admin_order_edit_form] a.save-note').click(saveNote);
-  $('[data-hook=admin_order_edit_form] a.delete-note').click(deleteNote);
+  $('.admin-order-edit-form a.save-note').click(saveNote);
+  $('.admin-order-edit-form a.delete-note').click(deleteNote);
 
   // Makes API call for notes/tracking info
   makeApiCall = function(url, params) {

app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb

@@ -4,7 +4,8 @@ $(document).ready(function() {
 
   initAlert()
   initConfirm()
-  initCancelOrder()
+  initButtonCancel()
+  initLinkCancel()
 
   if ($('#variant_autocomplete_template').length > 0) {
     window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
@@ -276,17 +277,23 @@ ofnConfirm = function(callback) {
   $('#custom-confirm').show();
 }
 
-initCancelOrder = function() {
-    $('#cancel_order_form').submit(function(e){
-        ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => {
-            if (confirm) {
-                var redirectTo = new URL(Spree.routes.cancel_order.toString());
-                redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
-                redirectTo.searchParams.append("restock_items", restock_items);
-                window.location.href = redirectTo.toString();
-            }
-        });
-        e.preventDefault();
-        return false;
+initCancelAction = function(e){
+  ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => {
+      if (confirm) {
+          var redirectTo = new URL(Spree.routes.cancel_order.toString());
+          redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation);
+          redirectTo.searchParams.append("restock_items", restock_items);
+          window.location.href = redirectTo.toString();
+      }
     });
+  e.preventDefault();
+  return false;
+};
+
+initButtonCancel = function() {
+  $('#cancel_order_form').submit(initCancelAction)
+}
+
+initLinkCancel = function() {
+  $('#links-dropdown a[href$="cancel"]').click(initCancelAction);
 }

app/controllers/admin/contents_controller.rb

@@ -18,6 +18,8 @@ module Admin
         end
       end
 
+      ContentConfig.updated_at = Time.zone.now
+
       flash[:success] =
         t(:successfully_updated, resource: I18n.t('admin.contents.edit.your_content'))
 

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

@@ -65,6 +65,7 @@ module Spree
           params.require(:order).permit(
             :email,
             :use_billing,
+            :customer_id,
             bill_address_attributes: ::PermittedAttributes::Address.attributes,
             ship_address_attributes: ::PermittedAttributes::Address.attributes
           )

app/controllers/spree/admin/orders_controller.rb

@@ -9,11 +9,9 @@ module Spree
       helper CheckoutHelper
 
       before_action :load_order, only: [:edit, :update, :fire, :resend,
-                                        :invoice, :print]
-      before_action :load_distribution_choices, only: [:new, :edit, :update]
+                                        :invoice, :print, :distribution]
+      before_action :load_distribution_choices, only: [:new, :edit, :update, :distribution]
 
-      # Ensure that the distributor is set for an order when
-      before_action :ensure_distribution, only: :new
       before_action :require_distributor_abn, only: :invoice
 
       respond_to :html, :json
@@ -21,8 +19,20 @@ module Spree
       def new
         @order = Order.create
         @order.created_by = spree_current_user
+        @order.generate_order_number
         @order.save
-        redirect_to spree.edit_admin_order_url(@order)
+        redirect_to spree.distribution_admin_order_path(@order)
+      end
+
+      def distribution
+        return if order_params.blank?
+
+        on_update
+
+        @order.assign_attributes(order_params)
+        return unless @order.save(context: :set_distribution_step)
+
+        redirect_to spree.admin_order_customer_path(@order)
       end
 
       def edit
@@ -33,12 +43,7 @@ module Spree
       end
 
       def update
-        @order.recreate_all_fees!
-
-        unless @order.cart?
-          @order.create_tax_charge!
-          @order.update_order!
-        end
+        on_update
 
         if params[:set_distribution_step] && @order.update(order_params)
           return redirect_to spree.admin_order_customer_path(@order)
@@ -105,6 +110,15 @@ module Spree
 
       private
 
+      def on_update
+        @order.recreate_all_fees!
+
+        return if @order.cart?
+
+        @order.create_tax_charge!
+        @order.update_order!
+      end
+
       def order_params
         return params[:order] if params[:order].blank?
 
@@ -142,17 +156,6 @@ module Spree
                         ocs.closed +
                         ocs.undated
       end
-
-      def ensure_distribution
-        unless @order
-          @order = Spree::Order.new
-          @order.generate_order_number
-          @order.save!
-        end
-        return if @order.distribution_set?
-
-        render 'set_distribution', locals: { order: @order }
-      end
     end
   end
 end

app/controllers/spree/admin/payment_methods_controller.rb

@@ -7,7 +7,6 @@ module Spree
       before_action :load_data
       before_action :validate_payment_method_provider, only: [:create]
       before_action :load_hubs, only: [:new, :edit, :update]
-      before_action :validate_calculator_preferred_value, only: [:update]
 
       respond_to :html
 
@@ -17,6 +16,10 @@ module Spree
         @payment_method = payment_method_class.constantize.new(base_params)
         @object = @payment_method
 
+        if !base_params["calculator_type"] && gateway_params["calculator_type"]
+          @payment_method.calculator_type = gateway_params["calculator_type"]
+        end
+
         load_hubs
 
         if @payment_method.save
@@ -44,6 +47,7 @@ module Spree
           redirect_to spree.edit_admin_payment_method_path(@payment_method)
         else
           respond_with(@payment_method)
+          clear_preference_cache
         end
       end
 
@@ -182,33 +186,23 @@ module Spree
             end
           end
 
+          # Ensure the calculator to be updated is the correct type
+          if params_for_update["calculator_type"] && params_for_update["calculator_attributes"]
+            add_type_to_calculator_attributes(params_for_update)
+          end
+
           params_for_update
         end
       end
 
-      def validate_calculator_preferred_value
-        return if calculator_preferred_values.all? do |value|
-          preferred_value_from_params = gateway_params.dig(:calculator_attributes, value)
-          preferred_value_from_params.nil? || Float(preferred_value_from_params,
-                                                    exception: false)
+      def clear_preference_cache
+        @payment_method.calculator.preferences.each_key do |key|
+          Rails.cache.delete(@payment_method.calculator.preference_cache_key(key))
         end
-
-        flash[:error] = I18n.t(:calculator_preferred_value_error)
-        redirect_to spree.edit_admin_payment_method_path(@payment_method)
       end
 
-      def calculator_preferred_values
-        [
-          :preferred_amount,
-          :preferred_flat_percent,
-          :preferred_flat_percent,
-          :preferred_first_item,
-          :preferred_additional_item,
-          :preferred_max_items,
-          :preferred_normal_amount,
-          :preferred_discount_amount,
-          :preferred_minimal_amount
-        ]
+      def add_type_to_calculator_attributes(hash)
+        hash["calculator_attributes"]["type"] = hash["calculator_type"]
       end
     end
   end

app/helpers/application_helper.rb

@@ -68,4 +68,14 @@ module ApplicationHelper
       wicked_pdf_stylesheet_pack_tag(source)
     end
   end
+
+  def cache_with_locale(key = nil, options = {}, &block)
+    cache(cache_key_with_locale(key, I18n.locale), options) do
+      yield(block)
+    end
+  end
+
+  def cache_key_with_locale(key, locale)
+    Array.wrap(key) + [locale.to_s, I18nDigests.for_locale(locale)]
+  end
 end

app/helpers/enterprises_helper.rb

@@ -87,4 +87,10 @@ module EnterprisesHelper
       main_app.producers_url
     end
   end
+
+  def main_logo_link(enterprise)
+    return enterprise.white_label_logo_link if enterprise&.white_label_logo_link.present?
+
+    main_app.root_path
+  end
 end

app/helpers/spree/admin/base_helper.rb

@@ -29,8 +29,8 @@ module Spree
 
       def preference_field_tag(name, value, options)
         case options[:type]
-        when :integer
-          text_field_tag(name, value, preference_field_options(options))
+        when :integer, :decimal
+          number_field_tag(name, value, preference_field_options(options))
         when :boolean
           hidden_field_tag(name, 0) +
             check_box_tag(name, 1, value, preference_field_options(options))
@@ -49,8 +49,8 @@ module Spree
 
       def preference_field_for(form, field, options, object)
         case options[:type]
-        when :integer
-          form.text_field(field, preference_field_options(options))
+        when :integer, :decimal
+          form.number_field(field, preference_field_options(options))
         when :boolean
           form.check_box(field, preference_field_options(options))
         when :string
@@ -80,26 +80,24 @@ module Spree
       end
 
       def preference_field_options(options)
-        field_options = case options[:type]
-                        when :integer
-                          { size: 10,
-                            class: 'input_integer' }
-                        when :boolean
-                          {}
-                        when :string
-                          { size: 10,
-                            class: 'input_string fullwidth' }
-                        when :password
-                          { size: 10,
-                            class: 'password_string fullwidth' }
-                        when :text
-                          { rows: 15,
-                            cols: 85,
-                            class: 'fullwidth' }
-                        else
-                          { size: 10,
-                            class: 'input_string fullwidth' }
-                        end
+        field_options =
+          case options[:type]
+          when :integer
+            { size: 10, class: 'input_integer', step: 1 }
+          when :decimal
+            # Allow any number of decimal places
+            { size: 10, class: 'input_integer', step: :any }
+          when :boolean
+            {}
+          when :string
+            { size: 10, class: 'input_string fullwidth' }
+          when :password
+            { size: 10, class: 'password_string fullwidth' }
+          when :text
+            { rows: 15, cols: 85, class: 'fullwidth' }
+          else
+            { size: 10, class: 'input_string fullwidth' }
+          end
 
         field_options.merge!(
           readonly: options[:readonly],

app/helpers/spree/admin/orders_helper.rb

@@ -105,8 +105,7 @@ module Spree
       def cancel_order_link
         { name: t(:cancel_order),
           url: spree.fire_admin_order_path(@order.number, e: 'cancel'),
-          icon: 'icon-trash',
-          confirm: t(:are_you_sure) }
+          icon: 'icon-trash' }
       end
 
       def cancel_event_link

app/models/calculator/flat_percent_item_total.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: false
 
-require 'spree/localized_number'
-
 module Calculator
   class FlatPercentItemTotal < Spree::Calculator
-    extend Spree::LocalizedNumber
-
     preference :flat_percent, :decimal, default: 0
 
-    localize_number :preferred_flat_percent
+    validates :preferred_flat_percent,
+              numericality: true
 
     def self.description
       Spree.t(:flat_percent)

app/models/calculator/flat_percent_per_item.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'spree/localized_number'
-
 class Calculator::FlatPercentPerItem < Spree::Calculator
   # Spree's FlatPercentItemTotal calculator sums all amounts, and then calculates a percentage
   # on them.
   # In the cart, we display line item individual amounts rounded, so to have consistent
   # calculations we do the same internally. Here, we round adjustments at the individual
   # item level first, then multiply by the item quantity.
-  extend Spree::LocalizedNumber
-
   preference :flat_percent, :decimal, default: 0
 
-  localize_number :preferred_flat_percent
+  validates :preferred_flat_percent,
+            numericality: true
 
   def self.description
     I18n.t(:flat_percent_per_item)

app/models/calculator/flat_rate.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: false
 
-require 'spree/localized_number'
-
 module Calculator
   class FlatRate < Spree::Calculator
-    extend Spree::LocalizedNumber
-
     preference :amount, :decimal, default: 0
 
-    localize_number :preferred_amount
+    validates :preferred_amount,
+              numericality: true
 
     def self.description
       I18n.t(:flat_rate_per_order)

app/models/calculator/flexi_rate.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: false
 
-require 'spree/localized_number'
-
 module Calculator
   class FlexiRate < Spree::Calculator
-    extend Spree::LocalizedNumber
-
     preference :first_item,      :decimal, default: 0.0
     preference :additional_item, :decimal, default: 0.0
     preference :max_items,       :integer, default: 0
 
-    localize_number :preferred_first_item,
-                    :preferred_additional_item
+    validates :preferred_first_item,
+              :preferred_additional_item,
+              numericality: true
 
     def self.description
       I18n.t(:flexible_rate)

app/models/calculator/per_item.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: false
 
-require 'spree/localized_number'
-
 module Calculator
   class PerItem < Spree::Calculator
-    extend Spree::LocalizedNumber
-
     preference :amount, :decimal, default: 0
 
-    localize_number :preferred_amount
+    validates :preferred_amount,
+              numericality: true
 
     def self.description
       I18n.t(:flat_rate_per_item)

app/models/calculator/price_sack.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: false
 
-require 'spree/localized_number'
-
 module Calculator
   class PriceSack < Spree::Calculator
-    extend Spree::LocalizedNumber
-
     preference :minimal_amount, :decimal, default: 0
     preference :normal_amount, :decimal, default: 0
     preference :discount_amount, :decimal, default: 0
 
-    localize_number :preferred_minimal_amount,
-                    :preferred_normal_amount,
-                    :preferred_discount_amount
+    validates :preferred_minimal_amount,
+              :preferred_normal_amount,
+              :preferred_discount_amount,
+              numericality: true
 
     def self.description
       I18n.t(:price_sack)

app/models/content_configuration.rb

@@ -83,4 +83,19 @@ class ContentConfiguration < Spree::Preferences::Configuration
 
   # User Guide
   preference :user_guide_link, :string, default: 'https://guide.openfoodnetwork.org/'
+
+  # ContentConfig Caching
+  preference :updated_at_timestamp, :integer, default: Time.zone.today.to_time.to_i
+
+  def updated_at
+    Time.zone.at updated_at_timestamp
+  end
+
+  def updated_at=(time)
+    self.updated_at_timestamp = time.to_i
+  end
+
+  def cache_key
+    "ContentConfig:#{updated_at_timestamp}"
+  end
 end

app/models/report_blob.rb

@@ -31,6 +31,6 @@ class ReportBlob < ActiveStorage::Blob
   end
 
   def result
-    @result ||= download
+    @result ||= download.force_encoding(Encoding::UTF_8)
   end
 end

app/models/spree/ability.rb

@@ -274,7 +274,7 @@ module Spree
           # Enterprise User can access orders that are placed inside a OC they coordinate
           order.order_cycle&.coordinated_by?(user)
       end
-      can [:admin, :bulk_management, :managed], Spree::Order do
+      can [:admin, :bulk_management, :managed, :distribution], Spree::Order do
         user.admin? || user.enterprises.any?(&:is_distributor)
       end
       can [:admin, :create, :show, :poll], :invoice

app/models/spree/app_configuration.rb

@@ -88,7 +88,6 @@ module Spree
     # Default mail headers settings
     preference :mails_from, :string, default: 'ofn@example.com'
     preference :mail_bcc, :string, default: 'ofn@example.com'
-    preference :intercept_email, :string, default: nil
 
     # Default smtp settings
     preference :mail_host, :string, default: 'localhost'

app/models/spree/order.rb

@@ -97,6 +97,8 @@ module Spree
     validates :email, presence: true,
                       format: /\A([\w.%+\-']+)@([\w\-]+\.)+(\w{2,})\z/i,
                       if: :require_email
+    validates :order_cycle, presence: true, on: :set_distribution_step
+    validates :distributor, presence: true, on: :set_distribution_step
 
     make_permalink field: :number
 

app/models/spree/order_inventory.rb

@@ -63,7 +63,7 @@ module Spree
     # first unshipped that's leaving from a stock_location that stocks this variant
     def determine_target_shipment(variant)
       target_shipment = order.shipments.detect do |shipment|
-        (shipment.ready? || shipment.pending?) && shipment.include?(variant)
+        (shipment.ready? || shipment.pending?) && shipment.contains?(variant)
       end
 
       target_shipment || order.shipments.detect do |shipment|

app/models/spree/payment_method.rb

@@ -17,6 +17,7 @@ module Spree
 
     validates :name, presence: true
     validate :distributor_validation
+    validates_associated :calculator
 
     after_initialize :init
 
@@ -40,9 +41,8 @@ module Spree
       where(id: non_unique_matches.map(&:id))
     }
 
-    scope :for_distributor, lambda { |distributor|
-      joins(:distributors).
-        where('enterprises.id = ?', distributor)
+    scope :for_distributor, ->(distributor) {
+      joins(:distributors).where('enterprises.id = ?', distributor)
     }
 
     scope :for_subscriptions, -> { where(type: Subscription::ALLOWED_PAYMENT_METHOD_TYPES) }

app/models/spree/preference.rb

@@ -22,7 +22,8 @@ module Spree
         when :password
           self[:value].to_s
         when :decimal
-          BigDecimal(self[:value].to_s).round(2, BigDecimal::ROUND_HALF_UP)
+          BigDecimal(self[:value].to_s, exception: false)&.round(2, BigDecimal::ROUND_HALF_UP) ||
+            self[:value]
         when :integer
           self[:value].to_i
         when :boolean

app/models/spree/preferences/preferable.rb

@@ -117,7 +117,7 @@ module Spree
           value.to_s
         when :decimal
           value = 0 if value.blank?
-          BigDecimal(value.to_s).round(2, BigDecimal::ROUND_HALF_UP)
+          BigDecimal(value.to_s, exception: false)&.round(2, BigDecimal::ROUND_HALF_UP) || value
         when :integer
           value.to_i
         when :boolean

app/models/spree/shipment.rb

@@ -246,7 +246,7 @@ module Spree
       @tracking_url ||= shipping_method.build_tracking_url(tracking)
     end
 
-    def include?(variant)
+    def contains?(variant)
       inventory_units_for(variant).present?
     end
 

app/models/spree/shipping_method.rb

@@ -61,7 +61,7 @@ module Spree
     # Here we allow checkout with shipping methods without zones (see issue #3928 for details)
     #   and also checkout with addresses outside of the zones of the selected shipping method
     # This method could be used, like in Spree, to validate shipping method zones on checkout.
-    def include?(address)
+    def delivers_to?(address)
       address.present?
     end
 

app/models/spree/tax_rate.rb

@@ -69,7 +69,8 @@ module Spree
       return 0 unless category
 
       address ||= Address.new(country_id: DefaultCountry.id)
-      rate = category.tax_rates.detect { |tax_rate| tax_rate.zone.include? address }.try(:amount)
+      rate = category.tax_rates
+        .detect { |tax_rate| tax_rate.zone.contains_address? address }.try(:amount)
 
       rate || 0
     end

app/models/spree/zone.rb

@@ -24,7 +24,7 @@ module Spree
       # do nothing - just here to satisfy the form
     end
 
-    def include?(address)
+    def contains_address?(address)
       return false unless address
 
       members.any? do |zone_member|
@@ -44,7 +44,7 @@ module Spree
     def self.match(address)
       return unless matches = includes(:zone_members).
         order('zone_members_count', 'created_at').
-        select { |zone| zone.include? address }
+        select { |zone| zone.contains_address? address }
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }

app/reflexes/white_label_reflex.rb

@@ -6,6 +6,8 @@ class WhiteLabelReflex < ApplicationReflex
 
   def remove_logo
     @enterprise.update!(white_label_logo: nil)
+    # delete the white_label_logo_link attribute as well since it has no meaning without the logo
+    @enterprise.update!(white_label_logo_link: "")
 
     f = ActionView::Helpers::FormBuilder.new(:enterprise, @enterprise, view_context, {})
 

app/serializers/api/admin/enterprise_serializer.rb

@@ -14,7 +14,8 @@ module Api
                  :logo, :promo_image, :terms_and_conditions,
                  :terms_and_conditions_file_name, :terms_and_conditions_updated_at,
                  :preferred_invoice_order_by_supplier, :preferred_product_low_stock_display,
-                 :visible, :hide_ofn_navigation, :white_label_logo
+                 :visible, :hide_ofn_navigation, :white_label_logo,
+                 :white_label_logo_link
 
       has_one :owner, serializer: Api::Admin::UserSerializer
       has_many :users, serializer: Api::Admin::UserSerializer

app/serializers/api/enterprise_shopfront_serializer.rb

@@ -10,7 +10,7 @@ module Api
                :phone, :whatsapp_phone, :whatsapp_url, :visible, :email_address, :hash, :logo,
                :promo_image, :path, :category, :active, :producers, :orders_close_at, :hubs,
                :taxons, :supplied_taxons, :pickup, :delivery, :preferred_product_low_stock_display,
-               :hide_ofn_navigation, :white_label_logo
+               :hide_ofn_navigation, :white_label_logo, :white_label_logo_link
 
     has_one :address, serializer: Api::AddressSerializer
     has_many :supplied_properties, serializer: Api::PropertySerializer

app/services/mail_configuration.rb

@@ -22,7 +22,6 @@ class MailConfiguration
       secure_connection_type: ENV.fetch('MAIL_SECURE_CONNECTION', 'None'),
       mails_from: ENV.fetch('MAILS_FROM', "no-reply@#{ENV.fetch('MAIL_DOMAIN')}"),
       mail_bcc: ENV.fetch('MAIL_BCC', ''),
-      intercept_email: ''
     }
   end
 

app/services/permissions/order.rb

@@ -31,9 +31,7 @@ module Permissions
     end
 
     def visible_line_items
-      Spree::LineItem.where(id:
-        editable_line_items.select(:id) |
-        produced_line_items.select("spree_line_items.id"))
+      editable_line_items.or(produced_line_items)
     end
 
     # Any line items that I can edit

app/services/permitted_attributes/enterprise.rb

@@ -35,7 +35,7 @@ module PermittedAttributes
         :show_customer_names_to_suppliers, :preferred_shopfront_product_sorting_method,
         :preferred_invoice_order_by_supplier,
         :preferred_product_low_stock_display,
-        :hide_ofn_navigation, :white_label_logo,
+        :hide_ofn_navigation, :white_label_logo, :white_label_logo_link
       ]
     end
   end

app/views/admin/contents/edit.html.haml

@@ -8,6 +8,6 @@
     - @preference_sections.each do |preference_section|
       = render 'fieldset', name: preference_section[:name], preferences: preference_section[:preferences]
 
-    .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
+    .form-buttons.filter-actions.actions
       = button t(:update), 'icon-refresh'
       = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_contents_path, class: 'button'

app/views/admin/enterprises/_admin_index.html.haml

@@ -10,7 +10,7 @@
         %col{style: "width: 18%;"}/
       %col{style: "width: 25%;"}/
     %thead
-      %tr{"data-hook" => "enterprises_header"}
+      %tr
         %th= t('.name')
         %th= t('.role')
         - if spree_current_user.admin?
@@ -32,7 +32,7 @@
           %td= enterprise_form.check_box :visible, {}, 'public', 'hidden'
           - if spree_current_user.admin?
             %td= enterprise_form.select :owner_id, enterprise.users.map{ |e| [ e.email, e.id ] }, {}, class: "select2 fullwidth"
-          %td{"data-hook" => "admin_users_index_row_actions"}
+          %td
             = render 'actions', enterprise: enterprise
       - if @enterprises.empty?
         %tr

app/views/admin/enterprises/form/_add_new_unregistered_manager.html.haml

@@ -1,22 +1,21 @@
-%div#add_manager_modal
-  %form{ "data-reflex": "submit->InviteManager#invite", "data-reflex-serialize-form": true }
-    .margin-bottom-30.text-center
-      .text-big
-        = t('js.admin.modals.invite_title')
+%form#add_manager_modal{ 'data-reflex': 'submit->InviteManager#invite', 'data-reflex-serialize-form': true }
+  .margin-bottom-30.text-center
+    .text-big
+      = t('js.admin.modals.invite_title')
 
+  - if success
+    %p.alert-box.ok= t('user_invited', email: email)
+
+  - if error
+    %p.alert-box.error= error
+
+  = text_field_tag :email, nil, class: 'fullwidth margin-bottom-20'
+  = hidden_field_tag :enterprise_id, @enterprise&.id || enterprise.id
+
+  .modal-actions
     - if success
-      %p.alert-box.ok= t('user_invited', email: email)
-
-    - if error
-      %p.alert-box.error= error
-
-    = text_field_tag :email, nil, class: 'fullwidth margin-bottom-20'
-    = hidden_field_tag :enterprise_id, @enterprise&.id || enterprise.id
-
-    .modal-actions
-      - if success
-        %input{ class: "button icon-plus secondary", type: 'button', value: t('js.admin.modals.close'), "data-action": "click->help-modal#close" }
-      - else
-        %input{ class: "button icon-plus secondary", type: 'button', value: t('js.admin.modals.cancel'), "data-action": "click->help-modal#close" }
-        = submit_tag "#{t('js.admin.modals.invite')}"
-      
+      %input{ class: "button icon-plus secondary", type: 'button', value: t('js.admin.modals.close'), "data-action": "click->help-modal#close" }
+    - else
+      %input{ class: "button icon-plus secondary", type: 'button', value: t('js.admin.modals.cancel'), "data-action": "click->help-modal#close" }
+      = submit_tag "#{t('js.admin.modals.invite')}"
+    

app/views/admin/enterprises/form/_white_label.html.haml

@@ -6,18 +6,26 @@
   .three.columns
     = f.check_box :hide_ofn_navigation, { "data-controller": "checkbox-display", "data-checkbox-display-target-id-value": "white_label_logo" }
     
-.row{id: "white_label_logo"}
-  .three.columns.alpha
-    = f.label :white_label_logo, t('.upload_logo')
-  .three.columns
-    = image_tag @object.white_label_logo_url if @object.white_label_logo.present?
-    = f.file_field :white_label_logo, accept: "image/*"
-    - if @object.white_label_logo.variable?
-      %button.button.small{ type: "button", "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "remove_logo" }
-        = t('.remove_logo')
+%div{id: "white_label_logo"}
+  .row
+    .three.columns.alpha
+      = f.label :white_label_logo, t('.upload_logo')
+    .three.columns
+      = image_tag @object.white_label_logo_url if @object.white_label_logo.present?
+      = f.file_field :white_label_logo, accept: "image/*"
+      - if @object.white_label_logo.present?
+        %button.button.small{ type: "button", "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "remove_logo" }
+          = t('.remove_logo')
+
+  - if @object.white_label_logo.present?
+    .row
+      .three.columns.alpha
+        = f.label :white_label_logo_link, t('.white_label_logo_link_label')
+      .three.columns
+        = f.text_field :white_label_logo_link
     
 
-- if @object.white_label_logo.variable?
+- if @object.white_label_logo.present?
   = render ConfirmModalComponent.new(id: "remove_logo", confirm_reflexes: "click->WhiteLabel#remove_logo" ) do
     .margin-bottom-30
       = t('.remove_logo_confirm')

app/views/admin/invoice_settings/edit.html.haml

@@ -20,5 +20,5 @@
     = check_box_tag 'preferences[enterprise_number_required_on_invoices?]', '1',  Spree::Config[:enterprise_number_required_on_invoices?]
     = label_tag nil, t('.enterprise_number_required_on_invoices?')
 
-  .form-buttons{"data-hook" => "buttons"}
+  .form-buttons
     = button t(:update), 'icon-refresh'

app/views/admin/matomo_settings/edit.html.haml

@@ -23,5 +23,5 @@
     = preference_field_tag("preferences[#{:matomo_tag_manager_url}]", Spree::Config[:matomo_tag_manager_url], type: Spree::Config.preference_type(:matomo_tag_manager_url))
     .warning.note= t('.config_instructions_tag_manager_html')
 
-  .form-buttons{"data-hook" => "buttons"}
+  .form-buttons
     = button t(:update), 'icon-refresh'

app/views/admin/producer_properties/_form.html.haml

@@ -1,12 +1,12 @@
 %fieldset.no-border-top
-  .add_producer_properties{"data-hook" => "add_producer_properties"}
+  .add_producer_properties
   = image_pack_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator'
-  %table.index.sortable{"data-hook" => "", "data-sortable-link" => main_app.update_positions_admin_enterprise_producer_properties_url(@enterprise)}
+  %table.index.sortable{"data-sortable-link" => main_app.update_positions_admin_enterprise_producer_properties_url(@enterprise)}
     %thead
-      %tr{"data-hook" => "producer_properties_header"}
+      %tr
         %th{colspan: "2"}= t('admin.products.properties.property_name')
         %th= t('admin.description')
         %th.actions
-    %tbody#producer_properties{"data-hook" => ""}
+    %tbody#producer_properties
       = f.fields_for :producer_properties do |pp_form|
         = render 'admin/producer_properties/producer_property_fields', f: pp_form

app/views/admin/producer_properties/_producer_property_fields.html.haml

@@ -1,5 +1,5 @@
 -# admin/admin.js.erb in spree requires id to start with "spree_" for sortable tables
-%tr.product_property.fields{"data-hook" => "producer_property", id: "spree_#{dom_id(f.object)}"}
+%tr.product_property.fields{id: "spree_#{dom_id(f.object)}"}
   %td.no-border
     %span.handle
     = f.hidden_field :id

app/views/admin/shared/_enterprises_sub_menu.html.haml

@@ -1,5 +1,5 @@
 - content_for :sub_menu do
-  %ul#sub_nav.inline-menu{"data-hook" => "admin_enterprise_sub_tabs"}
+  %ul#sub_nav.inline-menu
     = tab :enterprises, url: main_app.admin_enterprises_path
     = tab :enterprise_relationships, url: main_app.admin_enterprise_relationships_path
     - if ENV["OPENID_APP_ID"].present? && ENV["OPENID_APP_SECRET"].present?

app/views/admin/shared/_users_sub_menu.html.haml

@@ -1,4 +1,4 @@
 - content_for :sub_menu do
-  %ul#sub_nav.inline-menu{"data-hook" => "admin_user_sub_tabs"}
+  %ul#sub_nav.inline-menu
     = tab :users, url: spree.admin_users_path
     = tab :roles, url: main_app.admin_enterprise_roles_path, match_path: '/enterprise_roles'

app/views/admin/stripe_connect_settings/edit.html.haml

@@ -14,7 +14,7 @@
           = f.label :stripe_connect_enabled, t('.stripe_connect_enabled')
           = f.check_box :stripe_connect_enabled, disabled: disabled
     .row
-      .twelve.columns.alpha.omega.form-buttons{"data-hook" => "buttons"}
+      .twelve.columns.alpha.omega.form-buttons
         = button t(:update), 'icon-refresh', value: "update"
 
 %fieldset.no-border-bottom

app/views/admin/subscriptions/_review.html.haml

@@ -77,7 +77,7 @@
               %td.price.align-center {{ item.price_estimate | localizeCurrency }}
               %td.quantity {{ item.quantity }}
               %td.total.align-center {{ (item.price_estimate * item.quantity) | localizeCurrency }}
-          %tbody#subtotal.no-border-top{"data-hook" => "admin_order_form_subtotal"}
+          %tbody#subtotal.no-border-top
             %tr#subtotal-row
               %td{:colspan => "3"}
                 %b
@@ -85,7 +85,7 @@
                   \:
               %td.total.align-center
                 %span {{ subscription.estimatedSubtotal() | localizeCurrency }}
-          %tbody#order-total.grand-total.no-border-top{"data-hook" => "admin_order_form_total"}
+          %tbody#order-total.grand-total.no-border-top
             %tr
               %td{:colspan => "3"}
                 %b

app/views/admin/subscriptions/_subscription_line_items.html.haml

@@ -25,7 +25,7 @@
       %td.total.align-center {{ (item.price_estimate * item.quantity) | localizeCurrency }}
       %td.actions
         %a.delete-item.icon-trash.no-text{ ng: { click: 'removeSubscriptionLineItem(item)'}, :href => "javascript:void(0)" }
-  %tbody#subtotal.no-border-top{"data-hook" => "admin_order_form_subtotal"}
+  %tbody#subtotal.no-border-top
     %tr#subtotal-row
       %td{:colspan => "3"}
         %b
@@ -43,7 +43,7 @@
       %td.total.align-center
         %span#order_fees {{ subscription.estimatedFees() | localizeCurrency }}
       %td.actions
-  %tbody#order-total.grand-total.no-border-top{"data-hook" => "admin_order_form_total"}
+  %tbody#order-total.grand-total.no-border-top
     %tr
       %td{:colspan => "3"}
         %b

app/views/components/_spinner.html.haml

@@ -1 +1,2 @@
-%img.spinner{ src: image_pack_path("spinning-circles.svg"), style: "max-width: 100%" }
+= cache do
+  %img.spinner{ src: image_pack_path("spinning-circles.svg"), style: "max-width: 100%" }

app/views/home/_tagline.html.haml

@@ -1,8 +1,9 @@
-#tagline
-  .row
-    .small-12.text-center.columns
-      %h1
-        %img{src: image_pack_path("logo-white-notext.png"), title: Spree::Config.site_name}
-        %br/
-        %a.button.transparent{href: "/shops"}
-          = t :home_shop
+= cache_with_locale "sitename:#{Spree::Config.site_name}" do
+  #tagline
+    .row
+      .small-12.text-center.columns
+        %h1
+          %img{src: image_pack_path("logo-white-notext.png"), title: Spree::Config.site_name}
+          %br/
+          %a.button.transparent{href: "/shops"}
+            = t :home_shop

app/views/producers/_fat.html.haml

@@ -1,91 +1,92 @@
-.row.active_table_row{"ng-if" => "open()", "ng-click" => "toggle($event)", "ng-class" => "{'open' : open()}"}
-  .columns.small-12.fat.text-center{"ng-show" => "open() && shopfront_loading"}
-    %p.fullwidth
-      = render partial: "components/spinner"
+= cache_with_locale do
+  .row.active_table_row{"ng-if" => "open()", "ng-click" => "toggle($event)", "ng-class" => "{'open' : open()}"}
+    .columns.small-12.fat.text-center{"ng-show" => "open() && shopfront_loading"}
+      %p.fullwidth
+        = render partial: "components/spinner"
 
-  .columns.small-12.medium-7.large-7.fat{"ng-show" => "open() && !shopfront_loading"}
-    / Will add in long description available once clean up HTML formatting producer.long_description
-    %div{"ng-if" => "::producer.description"}
-      %label
-        = t :producers_about
-      %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
-      %p.text-small{ "ng-bind" => "::producer.description"}
-    %div.show-for-medium-up{"ng-if" => "::producer.description.length==0"}
-      %label  
-      %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
+    .columns.small-12.medium-7.large-7.fat{"ng-show" => "open() && !shopfront_loading"}
+      / Will add in long description available once clean up HTML formatting producer.long_description
+      %div{"ng-if" => "::producer.description"}
+        %label
+          = t :producers_about
+        %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
+        %p.text-small{ "ng-bind" => "::producer.description"}
+      %div.show-for-medium-up{"ng-if" => "::producer.description.length==0"}
+        %label  
+        %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
 
-  .columns.small-12.medium-5.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
+    .columns.small-12.medium-5.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
 
-    %div{"ng-if" => "::producer.supplied_taxons"}
-      %label
-        = t :producers_buy
-      %p.trans-sentence
-        %div
-          %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"}
-            %span{"ng-bind" => "::taxon.name"}
-        %div
-          %span.fat-properties{"ng-repeat" => "property in producer.supplied_properties"}
-            %span{"ng-bind" => "property.presentation"}
+      %div{"ng-if" => "::producer.supplied_taxons"}
+        %label
+          = t :producers_buy
+        %p.trans-sentence
+          %div
+            %span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"}
+              %span{"ng-bind" => "::taxon.name"}
+          %div
+            %span.fat-properties{"ng-repeat" => "property in producer.supplied_properties"}
+              %span{"ng-bind" => "property.presentation"}
 
-    %div.show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}
-       
+      %div.show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}
+         
 
-    %div{"ng-if" => "::producer.email_address || producer.website || producer.phone"}
-      %label
-        = t :producers_contact
+      %div{"ng-if" => "::producer.email_address || producer.website || producer.phone"}
+        %label
+          = t :producers_contact
 
-      %p.word-wrap{"ng-if" => "::producer.phone"}
-        = t :producers_contact_phone
-        %span{"ng-bind" => "::producer.phone"}
+        %p.word-wrap{"ng-if" => "::producer.phone"}
+          = t :producers_contact_phone
+          %span{"ng-bind" => "::producer.phone"}
 
-      %p.word-wrap{"ng-if" => "::producer.whatsapp_phone"}
-        %a{"ng-href" => "{{::producer.whatsapp_url}}", target: "_blank"}
-          %img{ src: image_pack_path("social-logos/whatsapp.svg") }
-          %span{"ng-bind" => "::producer.whatsapp_phone"}
+        %p.word-wrap{"ng-if" => "::producer.whatsapp_phone"}
+          %a{"ng-href" => "{{::producer.whatsapp_url}}", target: "_blank"}
+            %img{ src: image_pack_path("social-logos/whatsapp.svg") }
+            %span{"ng-bind" => "::producer.whatsapp_phone"}
 
-      %p.word-wrap{"ng-if" => "::producer.email_address"}
-        %a{"ng-href" => "{{::producer.email_address | stripUrl}}", target: "_blank", mailto: true}
-          %span.obfuscatedEmail.email{"ng-bind" => "::producer.email_address | stripUrl"}
+        %p.word-wrap{"ng-if" => "::producer.email_address"}
+          %a{"ng-href" => "{{::producer.email_address | stripUrl}}", target: "_blank", mailto: true}
+            %span.obfuscatedEmail.email{"ng-bind" => "::producer.email_address | stripUrl"}
 
-      %p.word-wrap{"ng-if" => "::producer.website"}
-        %a{"ng-href" => "http://{{::producer.website | stripUrl}}", target: "_blank" }
-          %span{"ng-bind" => "::producer.website | stripUrl"}
+        %p.word-wrap{"ng-if" => "::producer.website"}
+          %a{"ng-href" => "http://{{::producer.website | stripUrl}}", target: "_blank" }
+            %span{"ng-bind" => "::producer.website | stripUrl"}
 
-    %div{"ng-if" => "::producer.twitter || producer.facebook || producer.linkedin || producer.instagram"}
-      %label
-        = t :producers_social
-      .follow-icons
-        %span{"ng-if" => "::producer.twitter"}
-          %a{"ng-href" => "http://twitter.com/{{::producer.twitter}}", target: "_blank"}
-            %i.ofn-i_041-twitter
+      %div{"ng-if" => "::producer.twitter || producer.facebook || producer.linkedin || producer.instagram"}
+        %label
+          = t :producers_social
+        .follow-icons
+          %span{"ng-if" => "::producer.twitter"}
+            %a{"ng-href" => "http://twitter.com/{{::producer.twitter}}", target: "_blank"}
+              %i.ofn-i_041-twitter
 
-        %span{"ng-if" => "::producer.facebook"}
-          %a{"ng-href" => "http://{{::producer.facebook | stripUrl}}", target: "_blank"}
-            %i.ofn-i_044-facebook
+          %span{"ng-if" => "::producer.facebook"}
+            %a{"ng-href" => "http://{{::producer.facebook | stripUrl}}", target: "_blank"}
+              %i.ofn-i_044-facebook
 
-        %span{"ng-if" => "::producer.linkedin"}
-          %a{"ng-href" => "http://{{::producer.linkedin | stripUrl}}", target: "_blank"}
-            %i.ofn-i_042-linkedin
+          %span{"ng-if" => "::producer.linkedin"}
+            %a{"ng-href" => "http://{{::producer.linkedin | stripUrl}}", target: "_blank"}
+              %i.ofn-i_042-linkedin
 
-        %span{"ng-if" => "::producer.instagram"}
-          %a{"ng-href" => "http://instagram.com/{{::producer.instagram}}", target: "_blank"}
-            %i.ofn-i_043-instagram
+          %span{"ng-if" => "::producer.instagram"}
+            %a{"ng-href" => "http://instagram.com/{{::producer.instagram}}", target: "_blank"}
+              %i.ofn-i_043-instagram
 
-.row.active_table_row.pad-top{"ng-if" => "open() && producer.hubs && !shopfront_loading"}
-  .columns.small-12{"ng-if" => "producer.hubs.length > 0"}
-    .row
-      .columns.small-12.fat
-        %div{"ng-if" => "::producer.name"}
-          %label
-            = t :producers_buy_at_html, enterprise: '<span class="turquoise" ng-bind="::producer.name"></span>'.html_safe
-        %div.show-for-medium-up{"ng-if" => "::!producer.name"}
-          &nbsp;
-    .row.cta-container
-      .columns.small-12
-        %a.cta-hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined }}",
-        "ng-class" => "::{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
-          %i.ofn-i_068-shop-reversed{"ng-if" => "::hub.active"}
-          %i.ofn-i_068-shop-reversed{"ng-if" => "::!hub.active"}
-          .hub-name{"ng-bind" => "::hub.name"}
-          .button-address{"ng-bind" => "::[hub.address.city, hub.address.state_name] | printArray"}
+  .row.active_table_row.pad-top{"ng-if" => "open() && producer.hubs && !shopfront_loading"}
+    .columns.small-12{"ng-if" => "producer.hubs.length > 0"}
+      .row
+        .columns.small-12.fat
+          %div{"ng-if" => "::producer.name"}
+            %label
+              = t :producers_buy_at_html, enterprise: '<span class="turquoise" ng-bind="::producer.name"></span>'.html_safe
+          %div.show-for-medium-up{"ng-if" => "::!producer.name"}
+            &nbsp;
+      .row.cta-container
+        .columns.small-12
+          %a.cta-hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
+          "ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined }}",
+          "ng-class" => "::{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
+            %i.ofn-i_068-shop-reversed{"ng-if" => "::hub.active"}
+            %i.ofn-i_068-shop-reversed{"ng-if" => "::!hub.active"}
+            .hub-name{"ng-bind" => "::hub.name"}
+            .button-address{"ng-bind" => "::[hub.address.city, hub.address.state_name] | printArray"}

app/views/shared/_footer.html.haml

@@ -1,115 +1,119 @@
 %footer
   .footer-global
-    .row
-      .small-12.columns.text-center
-        .logo
-          %img{src: image_pack_path("logo-white-notext.png") }
-    .row
-      .small-12.medium-8.medium-offset-2.columns.text-center
-        .alert-box
-          = render 'shared/register_call'
+    = cache_with_locale "global" do
+      .row
+        .small-12.columns.text-center
+          .logo
+            %img{src: image_pack_path("logo-white-notext.png") }
+      .row
+        .small-12.medium-8.medium-offset-2.columns.text-center
+          .alert-box
+            = render 'shared/register_call'
 
   .footer-local
-    .row
-      .small-12.medium-2.medium-offset-2.columns.text-center
-        %p.secure-icon
-          %i.ofn-i_017-locked
-      .small-12.medium-6.columns.text-center
-        %p.text-big.secure-text
-          = t '.footer_secure'
-        %p.secure-text
-          = t '.footer_secure_text'
-      .small-12.medium-2.columns
+    = cache_with_locale "local" do
+      .row
+        .small-12.medium-2.medium-offset-2.columns.text-center
+          %p.secure-icon
+            %i.ofn-i_017-locked
+        .small-12.medium-6.columns.text-center
+          %p.text-big.secure-text
+            = t '.footer_secure'
+          %p.secure-text
+            = t '.footer_secure_text'
+        .small-12.medium-2.columns
 
-    .row
-      .small-12.medium-8.medium-offset-2.columns.text-center
-        %hr.hr-light
-        %br
+      .row
+        .small-12.medium-8.medium-offset-2.columns.text-center
+          %hr.hr-light
+          %br
 
-    .row
-      .small-6.medium-3.medium-offset-2.columns.text-left
-        // This is the instance-managed set of links:
-        %h4
-          = t '.footer_contact_headline'
-        - if show_social_icons?
-          %p.social-icons
-            - if ContentConfig.footer_facebook_url.present?
-              %a{href: ContentConfig.footer_facebook_url}
-                %i.ofn-i_044-facebook
-            - if ContentConfig.footer_twitter_url.present?
-              %a{href: ContentConfig.footer_twitter_url}
-                %i.ofn-i_041-twitter
-            - if ContentConfig.footer_instagram_url.present?
-              %a{href: ContentConfig.footer_instagram_url}
-                %i.ofn-i_043-instagram
-            - if ContentConfig.footer_linkedin_url.present?
-              %a{href: ContentConfig.footer_linkedin_url}
-                %i.ofn-i_042-linkedin
-            - if ContentConfig.footer_googleplus_url.present?
-              %a{href: ContentConfig.footer_googleplus_url}
-                %i.ofn-i_046-g
-            - if ContentConfig.footer_pinterest_url.present?
-              %a{href: ContentConfig.footer_pinterest_url}
-                %i.ofn-i_045-pintrest
-        - if ContentConfig.footer_email.present?
+    = cache_with_locale ContentConfig.cache_key do
+      .row
+        .small-6.medium-3.medium-offset-2.columns.text-left
+          // This is the instance-managed set of links:
+          %h4
+            = t '.footer_contact_headline'
+          - if show_social_icons?
+            %p.social-icons
+              - if ContentConfig.footer_facebook_url.present?
+                %a{href: ContentConfig.footer_facebook_url}
+                  %i.ofn-i_044-facebook
+              - if ContentConfig.footer_twitter_url.present?
+                %a{href: ContentConfig.footer_twitter_url}
+                  %i.ofn-i_041-twitter
+              - if ContentConfig.footer_instagram_url.present?
+                %a{href: ContentConfig.footer_instagram_url}
+                  %i.ofn-i_043-instagram
+              - if ContentConfig.footer_linkedin_url.present?
+                %a{href: ContentConfig.footer_linkedin_url}
+                  %i.ofn-i_042-linkedin
+              - if ContentConfig.footer_googleplus_url.present?
+                %a{href: ContentConfig.footer_googleplus_url}
+                  %i.ofn-i_046-g
+              - if ContentConfig.footer_pinterest_url.present?
+                %a{href: ContentConfig.footer_pinterest_url}
+                  %i.ofn-i_045-pintrest
+          - if ContentConfig.footer_email.present?
+            %p
+              %a{href: ContentConfig.footer_email.reverse, mailto: true, target: '_blank'}
+                = t '.footer_contact_email'
+          = render_markdown(ContentConfig.footer_links_md).html_safe
+
+
+        .small-6.medium-3.columns.text-left
+          %h4
+            = t '.footer_nav_headline'
           %p
-            %a{href: ContentConfig.footer_email.reverse, mailto: true, target: '_blank'}
-              = t '.footer_contact_email'
-        = render_markdown(ContentConfig.footer_links_md).html_safe
+            %a{href: "/shops"}
+              = t :label_shops
+          %p
+            %a{href: "/map"}
+              = t :label_map
+          %p
+            %a{href: "/producers"}
+              = t :label_producers
+          %p
+            %a{href: "/groups"}
+              = t :label_groups
+          %p
+            %a{href: ContentConfig.footer_about_url}
+              = t :label_about
 
+        .small-12.medium-2.columns.text-left
+          %h4
+            = t '.footer_join_headline'
+          %p
+            = t '.footer_join_body'
+            %a{href:  "/sell"}
+              = t '.footer_join_cta'
 
-      .small-6.medium-3.columns.text-left
-        %h4
-          = t '.footer_nav_headline'
-        %p
-          %a{href: "/shops"}
-            = t :label_shops
-        %p
-          %a{href: "/map"}
-            = t :label_map
-        %p
-          %a{href: "/producers"}
-            = t :label_producers
-        %p
-          %a{href: "/groups"}
-            = t :label_groups
-        %p
-          %a{href: ContentConfig.footer_about_url}
-            = t :label_about
+        .medium-2.columns.text-center
+          / Placeholder
 
-      .small-12.medium-2.columns.text-left
-        %h4
-          = t '.footer_join_headline'
-        %p
-          = t '.footer_join_body'
-          %a{href:  "/sell"}
-            = t '.footer_join_cta'
+      .row
+        .small-12.medium-8.medium-offset-2.columns.text-center
+          %hr.hr-light
+          %br
 
-      .medium-2.columns.text-center
-        / Placeholder
-
-    .row
-      .small-12.medium-8.medium-offset-2.columns.text-center
-        %hr.hr-light
-        %br
-
-    .row.legal
-      .small-12.medium-3.medium-offset-2.columns.text-left
-        %a{href: main_app.root_path}
-          %img{src: ContentConfig.url_for(:footer_logo), width: "220"}
-      .small-12.medium-5.columns.text-left
-        %p.text-small
-          = t '.footer_legal_call'
-          = link_to_platform_terms
-          |
-          = t '.footer_legal_visit'
-          %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank"} GitHub
-        %p.text-small
-          = t('.footer_legal_text_html', content_license: link_to('CC BY-SA 3.0', 'https://creativecommons.org/licenses/by-sa/3.0/'), code_license: link_to('AGPL 3', 'https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)' ))
-        %p.text-small
-          - if Spree::Config.privacy_policy_url.present?
-            = t('.footer_data_text_with_privacy_policy_html', cookies_policy: cookies_policy_link.html_safe, privacy_policy: privacy_policy_link.html_safe)
-          - else
-            = t('.footer_data_text_without_privacy_policy_html', cookies_policy: cookies_policy_link.html_safe)
-      .medium-2.columns.text-center
-        / Placeholder
+    = cache_with_locale [ContentConfig.cache_key, TermsOfServiceFile.current_url, Spree::Config.privacy_policy_url] do
+      .row.legal
+        .small-12.medium-3.medium-offset-2.columns.text-left
+          %a{href: main_app.root_path}
+            %img{src: ContentConfig.url_for(:footer_logo), width: "220"}
+        .small-12.medium-5.columns.text-left
+          %p.text-small
+            = t '.footer_legal_call'
+            = link_to_platform_terms
+            |
+            = t '.footer_legal_visit'
+            %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank"} GitHub
+          %p.text-small
+            = t('.footer_legal_text_html', content_license: link_to('CC BY-SA 3.0', 'https://creativecommons.org/licenses/by-sa/3.0/'), code_license: link_to('AGPL 3', 'https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)' ))
+          %p.text-small
+            - if Spree::Config.privacy_policy_url.present?
+              = t('.footer_data_text_with_privacy_policy_html', cookies_policy: cookies_policy_link.html_safe, privacy_policy: privacy_policy_link.html_safe)
+            - else
+              = t('.footer_data_text_without_privacy_policy_html', cookies_policy: cookies_policy_link.html_safe)
+        .medium-2.columns.text-center
+          / Placeholder

app/views/shared/_register_call.html.haml

@@ -1,12 +1,13 @@
-.alert-cta
-  %h6
-    -# Please forgive the hard-coded link:
-    -# The more elegant 'registration_path' resolves to /signup due to spree_auth_device > config > routes.rb
-    -# This is one of several possible fixes. Long-term, we'd like to bring the accounts page into OFN.
-    -# View the discussion here: https://github.com/openfoodfoundation/openfoodnetwork/pull/3174
-    %a{href: "/register", target: "_blank"}
-      = t '.selling_on_ofn'
-       
-      %strong
-        = t '.register'
-        %i.ofn-i_054-point-right
+= cache_with_locale do
+  .alert-cta
+    %h6
+      -# Please forgive the hard-coded link:
+      -# The more elegant 'registration_path' resolves to /signup due to spree_auth_device > config > routes.rb
+      -# This is one of several possible fixes. Long-term, we'd like to bring the accounts page into OFN.
+      -# View the discussion here: https://github.com/openfoodfoundation/openfoodnetwork/pull/3174
+      %a{href: "/register", target: "_blank"}
+        = t '.selling_on_ofn'
+         
+        %strong
+          = t '.register'
+          %i.ofn-i_054-point-right

app/views/shared/menu/_cart.html.haml

@@ -1,8 +1,9 @@
-%span.cart-span{"ng-controller" => "CartCtrl", "ng-class" => "{ dirty: Cart.dirty || Cart.empty(), 'pure-dirty': Cart.dirty }"}
-  %a#cart.icon{"ng-click" => "toggleCartSidebar()"}
-    %span
-      = t '.cart'
-    %span.count
-      %img{ src: image_pack_path("menu/icn-cart.svg") }
+= cache_with_locale do
+  %span.cart-span{"ng-controller" => "CartCtrl", "ng-class" => "{ dirty: Cart.dirty || Cart.empty(), 'pure-dirty': Cart.dirty }"}
+    %a#cart.icon{"ng-click" => "toggleCartSidebar()"}
       %span
-        {{ Cart.total_item_count() }}
+        = t '.cart'
+      %span.count
+        %img{ src: image_pack_path("menu/icn-cart.svg") }
+        %span
+          {{ Cart.total_item_count() }}

app/views/shared/menu/_cart_sidebar.html.haml

@@ -1,38 +1,40 @@
 .expanding-sidebar.cart-sidebar{ng: {controller: 'CartCtrl', class: "{'shown': showCartSidebar}"}}
   .background{ng: {click: 'toggleCartSidebar()'}}
   .sidebar
-    .cart-header
-      %span.title{"ng-show" => "Cart.line_items.length == 1"}
-        = t('.items_in_cart_singular', num: "{{ Cart.total_item_count() }}")
-      %span.title{"ng-show" => "Cart.line_items.length > 1"}
-        = t('.items_in_cart_plural', num: "{{ Cart.total_item_count() }}")
-      %a.close{ng: {click: 'toggleCartSidebar()'}}
-        = t('.close')
-        %i.ofn-i_009-close
+    = cache_with_locale "cart-header" do
+      .cart-header
+        %span.title{"ng-show" => "Cart.line_items.length == 1"}
+          = t('.items_in_cart_singular', num: "{{ Cart.total_item_count() }}")
+        %span.title{"ng-show" => "Cart.line_items.length > 1"}
+          = t('.items_in_cart_plural', num: "{{ Cart.total_item_count() }}")
+        %a.close{ng: {click: 'toggleCartSidebar()'}}
+          = t('.close')
+          %i.ofn-i_009-close
 
     .cart-content
-      %table
-        %tr.product-cart{"ng-repeat" => "line_item in Cart.line_items", "id" => "cart-variant-{{ line_item.variant.id }}"}
-          %td.image
-            %img{'ng-src' => '{{ line_item.variant.thumb_url }}'}
-          %td
-            %span {{ line_item.variant.extended_name | truncate: max_characters }}
-            %br
-            %span.options-text {{ line_item.variant.options_text | truncate: max_characters }}
-          %td.text-right
-            %span.quantity {{ line_item.quantity }}
-          %td
-            .total-price.text-right {{ line_item.total_price | localizeCurrency }}
-            .unit-price
-              %div{:style => "margin-right: 5px"}
-                %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
-                "question-mark-with-tooltip-append-to-body" => "true",
-                "question-mark-with-tooltip-placement" => "top",
-                "question-mark-with-tooltip-animation" => true,
-                key: "'js.shopfront.unit_price_tooltip'",
-                context: "'cart-sidebar'"}
-              .options-text
-                {{ line_item.variant.unit_price_price | localizeCurrency }} / {{ line_item.variant.unit_price_unit }}
+      = cache_with_locale "cart-table" do
+        %table
+          %tr.product-cart{"ng-repeat" => "line_item in Cart.line_items", "id" => "cart-variant-{{ line_item.variant.id }}"}
+            %td.image
+              %img{'ng-src' => '{{ line_item.variant.thumb_url }}'}
+            %td
+              %span {{ line_item.variant.extended_name | truncate: max_characters }}
+              %br
+              %span.options-text {{ line_item.variant.options_text | truncate: max_characters }}
+            %td.text-right
+              %span.quantity {{ line_item.quantity }}
+            %td
+              .total-price.text-right {{ line_item.total_price | localizeCurrency }}
+              .unit-price
+                %div{:style => "margin-right: 5px"}
+                  %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
+                  "question-mark-with-tooltip-append-to-body" => "true",
+                  "question-mark-with-tooltip-placement" => "top",
+                  "question-mark-with-tooltip-animation" => true,
+                  key: "'js.shopfront.unit_price_tooltip'",
+                  context: "'cart-sidebar'"}
+                .options-text
+                  {{ line_item.variant.unit_price_price | localizeCurrency }} / {{ line_item.variant.unit_price_unit }}
 
       .cart-empty{"ng-show" => "Cart.line_items.length == 0"}
         %p
@@ -42,15 +44,16 @@
           = t('.take_me_shopping')
 
   .sidebar-footer{"ng-show" => "Cart.line_items.length > 0"}
-    %p.cart-total
-      %strong
-        = t 'total'
-        {{ Cart.total()  | localizeCurrency }}
+    = cache_with_locale "cart-footer" do
+      %p.cart-total
+        %strong
+          = t 'total'
+          {{ Cart.total()  | localizeCurrency }}
 
-    %div.fullwidth
-      %a.edit-cart.button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"}
-        %div{ ng: { if: "Cart.dirty" } }= t(:cart_updating)
-        %div{ ng: { if: "!Cart.dirty && Cart.empty()" } }= t(:cart_empty)
-        %div{ ng: { if: "!Cart.dirty && !Cart.empty()" } }= t('.edit_cart')
-      %a.checkout.button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"}
-        = t '.checkout'
+      %div.fullwidth
+        %a.edit-cart.button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"}
+          %div{ ng: { if: "Cart.dirty" } }= t(:cart_updating)
+          %div{ ng: { if: "!Cart.dirty && Cart.empty()" } }= t(:cart_empty)
+          %div{ ng: { if: "!Cart.dirty && !Cart.empty()" } }= t('.edit_cart')
+        %a.checkout.button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"}
+          = t '.checkout'

app/views/shared/menu/_language_selector.html.haml

@@ -1,8 +1,9 @@
-%li.language-switcher.has-dropdown.not-click
-  %a{href: '#', class: "top-bar--menu-item-with-icon"}
-    %i.ofn-i_071-globe
-    %span= t 'language_name'
-  %ul.dropdown
-    - OpenFoodNetwork::I18nConfig.locale_options.each do |l|
-      %li
-        = link_to t('language_name', locale: l), main_app.locale_path(l.to_s)
+= cache_with_locale OpenFoodNetwork::I18nConfig.locale_options do
+  %li.language-switcher.has-dropdown.not-click
+    %a{href: '#', class: "top-bar--menu-item-with-icon"}
+      %i.ofn-i_071-globe
+      %span= t 'language_name'
+    %ul.dropdown
+      - OpenFoodNetwork::I18nConfig.locale_options.each do |l|
+        %li
+          = link_to t('language_name', locale: l), main_app.locale_path(l.to_s)

app/views/shared/menu/_large_menu.html.haml

@@ -1,27 +1,30 @@
 %nav.top-bar.show-for-large-up
   %section.top-bar-section
     %ul.nav-logo
-      %li.ofn-logo
-        %a{href: main_app.root_path}
-          - if @white_label_logo&.variable?
-            = image_tag @white_label_distributor.white_label_logo_url(:default)
-          - else
-            %img{src: ContentConfig.url_for(:logo)}
-      %li.powered-by
-        %img{src: '/favicon.ico'}
-        %span
-          = t 'powered_by'
-          %a{href: '/'}
-            = t 'title'
+      = cache_with_locale [@white_label_distributor, ContentConfig.cache_key] do
+        %li.ofn-logo
+          %a{href: main_logo_link(@white_label_distributor)}
+            - if @white_label_logo&.variable?
+              = image_tag @white_label_distributor.white_label_logo_url(:default)
+            - else
+              %img{src: ContentConfig.url_for(:logo)}
+        %li.powered-by
+          %img{src: '/favicon.ico'}
+          %span
+            = t 'powered_by'
+            %a{href: '/'}
+              = t 'title'
+
     - unless @hide_ofn_navigation
-      %ul.nav-main-menu
-        - [*1..7].each do |menu_number|
-          - menu_name = "menu_#{menu_number}"
-          - if ContentConfig[menu_name].present?
-            %li
-              %a{href: t("#{menu_name}_url") }
-                %span.nav-primary
-                  = t "#{menu_name}_title"
+      = cache_with_locale ContentConfig.cache_key do
+        %ul.nav-main-menu
+          - [*1..7].each do |menu_number|
+            - menu_name = "menu_#{menu_number}"
+            - if ContentConfig[menu_name].present?
+              %li
+                %a{href: t("#{menu_name}_url") }
+                  %span.nav-primary
+                    = t "#{menu_name}_title"
     %ul.nav-icons-menu
       - if OpenFoodNetwork::I18nConfig.selectable_locales.count > 1
         = render 'shared/menu/language_selector'
@@ -31,11 +34,12 @@
       - else
         = render 'shared/menu/signed_in'
 
-      %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true}
-        %a{href: main_app.shop_path}
-          %span{ class: "top-bar--current-hub-prefix" }
-            = t 'label_shopping'
-            = '@'
-          %span{ class: "top-bar--current-hub-name" } {{ CurrentHub.hub.name | truncate:25 }}
-      %li.cart{"ng-cloak" => true}
-        = render partial: "shared/menu/cart"
+      = cache_with_locale "cart" do
+        %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true}
+          %a{href: main_app.shop_path}
+            %span{ class: "top-bar--current-hub-prefix" }
+              = t 'label_shopping'
+              = '@'
+            %span{ class: "top-bar--current-hub-name" } {{ CurrentHub.hub.name | truncate:25 }}
+        %li.cart{"ng-cloak" => true}
+          = render partial: "shared/menu/cart"

app/views/shared/menu/_mobile_menu.html.haml

@@ -1,25 +1,26 @@
-%nav.tab-bar.show-for-medium-down
-  %section.left
-    %a.left-off-canvas-toggle.menu-icon
-      = image_pack_tag "menu/btn-menu-mobile.png"
+= cache_with_locale [@white_label_distributor, ContentConfig.cache_key] do
+  %nav.tab-bar.show-for-medium-down
+    %section.left
+      %a.left-off-canvas-toggle.menu-icon
+        = image_pack_tag "menu/btn-menu-mobile.png"
 
-  %section.left
-    .ofn-logo
-      %a{href: main_app.root_path}
-        - if @white_label_logo&.variable?
-          = image_tag @white_label_distributor.white_label_logo_url(:mobile)
-        - else
-          %img{src: ContentConfig.url_for(:logo_mobile), srcset: ContentConfig.url_for(:logo_mobile_svg), width: "75", height: "26"}
+    %section.left
+      .ofn-logo
+        %a{href: main_app.root_path}
+          - if @white_label_logo&.variable?
+            = image_tag @white_label_distributor.white_label_logo_url(:mobile)
+          - else
+            %img{src: ContentConfig.url_for(:logo_mobile), srcset: ContentConfig.url_for(:logo_mobile_svg), width: "75", height: "26"}
 
-  %section.right{"ng-cloak" => true}
-    %span.cart-span{"ng-class" => "{ dirty: Cart.dirty || Cart.empty(), 'pure-dirty': Cart.dirty }"}
-      %a.icon{ng: {click: 'toggleCartSidebar()'}}
-        %span
-          = t '.cart'
-        %span.count
-          = image_pack_tag "menu/icn-cart.svg"
+    %section.right{"ng-cloak" => true}
+      %span.cart-span{"ng-class" => "{ dirty: Cart.dirty || Cart.empty(), 'pure-dirty': Cart.dirty }"}
+        %a.icon{ng: {click: 'toggleCartSidebar()'}}
           %span
-            {{ Cart.total_item_count() }}
+            = t '.cart'
+          %span.count
+            = image_pack_tag "menu/icn-cart.svg"
+            %span
+              {{ Cart.total_item_count() }}
 
-    %a{href: main_app.shop_path}
-      {{ CurrentHub.hub.name }}
+      %a{href: main_app.shop_path}
+        {{ CurrentHub.hub.name }}

app/views/shared/menu/_offcanvas_menu.html.haml

@@ -1,16 +1,18 @@
 %aside.left-off-canvas-menu.show-for-medium-down{ ng: { controller: "OffcanvasCtrl" } }
   %ul.off-canvas-list
-    %li.ofn-logo
-      %a{href: main_app.root_path}
-        %img{src: ContentConfig.url_for(:logo_mobile), srcset: ContentConfig.url_for(:logo_mobile_svg), width: "75", height: "26"}
-    - [*1..7].each do |menu_number|
-      - menu_name = "menu_#{menu_number}"
-      - if ContentConfig[menu_name].present?
-        %li.li-menu
-          %a{href: t("#{menu_name}_url") }
-            %span.nav-primary
-              %i{class: ContentConfig["#{menu_name}_icon_name"]}
-              = t "#{menu_name}_title"
+    = cache_with_locale ContentConfig.cache_key do
+      %li.ofn-logo
+        %a{href: main_app.root_path}
+          %img{src: ContentConfig.url_for(:logo_mobile), srcset: ContentConfig.url_for(:logo_mobile_svg), width: "75", height: "26"}
+      - [*1..7].each do |menu_number|
+        - menu_name = "menu_#{menu_number}"
+        - if ContentConfig[menu_name].present?
+          %li.li-menu
+            %a{href: t("#{menu_name}_url") }
+              %span.nav-primary
+                %i{class: ContentConfig["#{menu_name}_icon_name"]}
+                = t "#{menu_name}_title"
+
     - if OpenFoodNetwork::I18nConfig.selectable_locales.count > 1
       %li.language-switcher.li-menu
         %a

app/views/shared/menu/_signed_out.html.haml

@@ -1,5 +1,6 @@
-%li#login-link{ "data-controller": "login-modal" }
-  %a{"auth": "login", "data-action": "click->login-modal#call" }
-    %img{ src: image_pack_path("menu/icn-login.svg") }
-    %span
-      = t 'label_login'
+= cache_with_locale do
+  %li#login-link{ "data-controller": "login-modal" }
+    %a{"auth": "login", "data-action": "click->login-modal#call" }
+      %img{ src: image_pack_path("menu/icn-login.svg") }
+      %span
+        = t 'label_login'

app/views/shop/products/_applied_filters_feedback.haml

@@ -1,9 +1,10 @@
-%span{ "ng-show" => "query && ( appliedPropertiesList() || appliedTaxonsList() )" }
-  = t :products_filters_in
+= cache_with_locale do
+  %span{ "ng-show" => "query && ( appliedPropertiesList() || appliedTaxonsList() )" }
+    = t :products_filters_in
 
-%span.applied-properties{'ng-bind-html' => 'appliedPropertiesList()'}
+  %span.applied-properties{'ng-bind-html' => 'appliedPropertiesList()'}
 
-%span{ "ng-show" => "appliedPropertiesList() && appliedTaxonsList()" }
-  = t :products_and
+  %span{ "ng-show" => "appliedPropertiesList() && appliedTaxonsList()" }
+    = t :products_and
 
-%span.applied-taxons{'ng-bind-html' => 'appliedTaxonsList()'}
+  %span.applied-taxons{'ng-bind-html' => 'appliedTaxonsList()'}

app/views/shop/products/_filters.html.haml

@@ -1,5 +1,6 @@
-.filter-shopfront.taxon-selectors{ng: {show: 'supplied_taxons != null'}}
-  %filter-selector{ 'selector-set' => "taxonSelectors", objects: "supplied_taxons", "active-selectors" => "activeTaxons"}
+= cache_with_locale do
+  .filter-shopfront.taxon-selectors{ng: {show: 'supplied_taxons != null'}}
+    %filter-selector{ 'selector-set' => "taxonSelectors", objects: "supplied_taxons", "active-selectors" => "activeTaxons"}
 
-.filter-shopfront.property-selectors{ng: {show: 'supplied_properties != null'}}
-  %filter-selector{ 'selector-set' => "propertySelectors", objects: "supplied_properties", "active-selectors" => "activeProperties"}
+  .filter-shopfront.property-selectors{ng: {show: 'supplied_properties != null'}}
+    %filter-selector{ 'selector-set' => "propertySelectors", objects: "supplied_properties", "active-selectors" => "activeProperties"}

app/views/shop/products/_form.html.haml

@@ -1,51 +1,52 @@
-%form{action: main_app.cart_path}
-  %products{"ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true }
+= cache_with_locale do
+  %form{action: main_app.cart_path}
+    %products{"ng-init" => "refreshStaleData()", "ng-show" => "order_cycle.order_cycle_id != null", "ng-cloak" => true }
 
-    = render partial: "shop/products/searchbar"
+      = render partial: "shop/products/searchbar"
 
-    .row
-      .footer-pad.small-12.columns.product-listing
-        .row.full
-          .medium-12.large-9.columns.full
-            = render partial: "shop/products/search_feedback"
+      .row
+        .footer-pad.small-12.columns.product-listing
+          .row.full
+            .medium-12.large-9.columns.full
+              = render partial: "shop/products/search_feedback"
 
-            %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading', "infinite-scroll-immediate-check": "false" }
-              %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
-                = render "shop/products/summary"
-                .shop-variants
-                  .variants.row{"ng-controller": "ShopVariantCtrl", variant: 'variant', "ng-repeat" => "variant in product.variants | orderBy: ['name_to_display','unit_value'] track by variant.id", "id" => "variant-{{ variant.id }}", "ng-class" => "{'out-of-stock': !variant.on_demand && variant.on_hand == 0}"}
-                    = render "shop/products/shop_variant"
-              %product{"ng-show" => "Products.loading"}
-                .summary
-                  .small-12.columns.text-center
-                    = t :products_loading
-                .row.full
-                  .small-12.columns.text-center
-                    = render partial: "components/spinner"
+              %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading', "infinite-scroll-immediate-check": "false" }
+                %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
+                  = render "shop/products/summary"
+                  .shop-variants
+                    .variants.row{"ng-controller": "ShopVariantCtrl", variant: 'variant', "ng-repeat" => "variant in product.variants | orderBy: ['name_to_display','unit_value'] track by variant.id", "id" => "variant-{{ variant.id }}", "ng-class" => "{'out-of-stock': !variant.on_demand && variant.on_hand == 0}"}
+                      = render "shop/products/shop_variant"
+                %product{"ng-show" => "Products.loading"}
+                  .summary
+                    .small-12.columns.text-center
+                      = t :products_loading
+                  .row.full
+                    .small-12.columns.text-center
+                      = render partial: "components/spinner"
 
-          .hide-for-medium-down.large-1.columns
-            -# Space between products and filters
-             
+            .hide-for-medium-down.large-1.columns
+              -# Space between products and filters
+               
 
-          .sticky-shop-filters-container.thin-scroll-bar.hide-for-medium-down.large-2.columns
-            %h5.filter-header
-              = t(:products_filter_by)
-              %span{ng: {show: 'filtersCount()' }}
-                = "({{ filtersCount() }} #{t(:products_filter_selected)})"
-            = render partial: "shop/products/filters"
-
-          .expanding-sidebar.shop-filters-sidebar.hide-for-large-up{ng: {show: 'showFilterSidebar', class: "{'shown': showFilterSidebar}"}}
-            .background{ng: {click: 'toggleFilterSidebar()'}}
-            .sidebar
-              %h5
+            .sticky-shop-filters-container.thin-scroll-bar.hide-for-medium-down.large-2.columns
+              %h5.filter-header
                 = t(:products_filter_by)
                 %span{ng: {show: 'filtersCount()' }}
                   = "({{ filtersCount() }} #{t(:products_filter_selected)})"
-
               = render partial: "shop/products/filters"
 
-              .sidebar-footer
-                %button.large.dark.left{type: 'button', ng: {click: 'clearFilters()'}}
-                  = t(:products_filter_clear)
-                %button.large.bright.right{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
-                  = t(:products_filter_done)
+            .expanding-sidebar.shop-filters-sidebar.hide-for-large-up{ng: {show: 'showFilterSidebar', class: "{'shown': showFilterSidebar}"}}
+              .background{ng: {click: 'toggleFilterSidebar()'}}
+              .sidebar
+                %h5
+                  = t(:products_filter_by)
+                  %span{ng: {show: 'filtersCount()' }}
+                    = "({{ filtersCount() }} #{t(:products_filter_selected)})"
+
+                = render partial: "shop/products/filters"
+
+                .sidebar-footer
+                  %button.large.dark.left{type: 'button', ng: {click: 'clearFilters()'}}
+                    = t(:products_filter_clear)
+                  %button.large.bright.right{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
+                    = t(:products_filter_done)

app/views/shop/products/_search_feedback.haml

@@ -1,24 +1,25 @@
-.row.animate-slide{ "ng-show" => "query || appliedPropertiesList() || appliedTaxonsList()" }
-  .small-12.columns
-    .alert-box.search-alert.ng-scope
-      %div{"ng-show" => "Products.products.length > 0"}
+= cache_with_locale do
+  .row.animate-slide{ "ng-show" => "query || appliedPropertiesList() || appliedTaxonsList()" }
+    .small-12.columns
+      .alert-box.search-alert.ng-scope
+        %div{"ng-show" => "Products.products.length > 0"}
 
-        %a.clear-all.right{"ng-click" => "clearAll()"}
-          = t :products_clear
-          %i.ofn-i_009-close
+          %a.clear-all.right{"ng-click" => "clearAll()"}
+            = t :products_clear
+            %i.ofn-i_009-close
 
-        %span.filter-label
-          = t :products_results_for
-          %span{ ng: { hide: "!query"} }
-            %span.applied-search
-              {{ query }}
-          = render partial: 'shop/products/applied_filters_feedback'
+          %span.filter-label
+            = t :products_results_for
+            %span{ ng: { hide: "!query"} }
+              %span.applied-search
+                {{ query }}
+            = render partial: 'shop/products/applied_filters_feedback'
 
-      %div.no-results-bar{"ng-show" => "Products.products.length == 0 && !Products.loading"}
-        .row.summary
-          .small-12.columns
-            %p.no-results
-              = t :products_no_results_html, query: "<span class='applied-search'>{{query}}</span>".html_safe
-              = render partial: 'shop/products/applied_filters_feedback'
-            %button.clear-search{type: 'button', ng: {click: 'clearAll()'}}
-              = t :products_clear_search
+        %div.no-results-bar{"ng-show" => "Products.products.length == 0 && !Products.loading"}
+          .row.summary
+            .small-12.columns
+              %p.no-results
+                = t :products_no_results_html, query: "<span class='applied-search'>{{query}}</span>".html_safe
+                = render partial: 'shop/products/applied_filters_feedback'
+              %button.clear-search{type: 'button', ng: {click: 'clearAll()'}}
+                = t :products_clear_search

app/views/shop/products/_searchbar.haml

@@ -1,17 +1,18 @@
-.shop-searchbar
-  .row
-    .small-12.large-5.columns.flex
-      %div.search-wrap
-        %input#search.text{"ng-model" => "query",
-              type: 'search',
-              placeholder: t(:products_search),
-              "ng-debounce" => "200",
-              "disable-enter-with-blur" => true}
-        %a.clear{type: 'button', ng: {show: 'query', click: 'clearQuery()'}, 'focus-search' => true}
-          = image_pack_tag "icn-close.png"
+= cache_with_locale do
+  .shop-searchbar
+    .row
+      .small-12.large-5.columns.flex
+        %div.search-wrap
+          %input#search.text{"ng-model" => "query",
+                type: 'search',
+                placeholder: t(:products_search),
+                "ng-debounce" => "200",
+                "disable-enter-with-blur" => true}
+          %a.clear{type: 'button', ng: {show: 'query', click: 'clearQuery()'}, 'focus-search' => true}
+            = image_pack_tag "icn-close.png"
 
-      .hide-for-large-up
-        %button{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
-          = t(:products_filter_heading)
-          %span{ng: {show: 'filtersCount()' }}
-            ({{ filtersCount() }})
+        .hide-for-large-up
+          %button{type: 'button', ng: {click: 'toggleFilterSidebar()'}}
+            = t(:products_filter_heading)
+            %span{ng: {show: 'filtersCount()' }}
+              ({{ filtersCount() }})

app/views/shop/products/_shop_variant.html.haml

@@ -1,22 +1,23 @@
-.small-4.medium-4.large-5.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 }}
-  .unit-price.variant-unit-price
-    %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
-    "question-mark-with-tooltip-append-to-body" => "true",
-    "question-mark-with-tooltip-placement" => "top",
-    "question-mark-with-tooltip-animation" => true,
-    key: "'js.shopfront.unit_price_tooltip'"}
-    {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
+= cache_with_locale do
+  .small-4.medium-4.large-5.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 }}
+    .unit-price.variant-unit-price
+      %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
+      "question-mark-with-tooltip-append-to-body" => "true",
+      "question-mark-with-tooltip-placement" => "top",
+      "question-mark-with-tooltip-animation" => true,
+      key: "'js.shopfront.unit_price_tooltip'"}
+      {{ variant.unit_price_price | localizeCurrency }} / {{ variant.unit_price_unit }}
 
-.medium-2.large-2.columns.total-price
-  %span{"ng-class" => "{filled: variant.line_item.total_price}"}
-    {{ variant.line_item.total_price | localizeCurrency }}
-= render partial: "shop/products/shop_variant_no_group_buy"
-= render partial: "shop/products/shop_variant_with_group_buy"
+  .medium-2.large-2.columns.total-price
+    %span{"ng-class" => "{filled: variant.line_item.total_price}"}
+      {{ variant.line_item.total_price | localizeCurrency }}
+  = render partial: "shop/products/shop_variant_no_group_buy"
+  = render partial: "shop/products/shop_variant_with_group_buy"

app/views/shop/products/_shop_variant_no_group_buy.html.haml

@@ -1,22 +1,23 @@
-.small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::!variant.product.group_buy"}
+= cache_with_locale do
+  .small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::!variant.product.group_buy"}
 
-  .variant-quantity-inputs{ng: {if: "variant.line_item.quantity == 0"}}
-    %button.add-variant{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-      {{ "js.shopfront.variant.add_to_cart" | t }}
+    .variant-quantity-inputs{ng: {if: "variant.line_item.quantity == 0"}}
+      %button.add-variant{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
+        {{ "js.shopfront.variant.add_to_cart" | t }}
 
-  .variant-quantity-inputs{ng: {if: "variant.line_item.quantity != 0"}}
-    %button.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
-      -# U+FF0D Fullwidth Hyphen-Minus
-      －
-    %input.variant-quantity{ type: "number", min: "0", max: "{{ available() }}",
-      ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
-    %button.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
-      -# U+FF0B Fullwidth Plus Sign
-      ＋
-  .variant-remaining-stock{ng: {if: "displayRemainingInStock()"}}
-    {{ "js.shopfront.variant.remaining_in_stock" | t:{quantity: available()} }}
-  .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"}}
+    .variant-quantity-inputs{ng: {if: "variant.line_item.quantity != 0"}}
+      %button.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
+        -# U+FF0D Fullwidth Hyphen-Minus
+        －
+      %input.variant-quantity{ type: "number", min: "0", max: "{{ available() }}",
+        ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
+      %button.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
+        -# U+FF0B Fullwidth Plus Sign
+        ＋
+    .variant-remaining-stock{ng: {if: "displayRemainingInStock()"}}
+      {{ "js.shopfront.variant.remaining_in_stock" | t:{quantity: available()} }}
+    .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/views/shop/products/_shop_variant_with_group_buy.html.haml

@@ -1,17 +1,18 @@
-.small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::variant.product.group_buy"}
+= cache_with_locale do
+  .small-5.medium-3.large-3.columns.variant-quantity-column.text-right{"ng-if" => "::variant.product.group_buy"}
 
-  %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "addBulk(1)", disabled: "!canAdd(1)"}}
-    {{ "js.shopfront.variant.add_to_cart" | t }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}>
-    {{ variant.line_item.quantity }}
-  %button.bulk-buy.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "addBulk(0)"}}
-    {{ variant.line_item.max_quantity || "-" }}
-  %br
-  .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}}
-    {{ "js.shopfront.variant.in_cart" | t }}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.quantity"}}
-  %input{type: :hidden,
-         name: "variants[{{::variant.id}}]",
-         ng: {model: "variant.line_item.max_quantity"}}
+    %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/views/shop/products/_summary.html.haml

@@ -1,21 +1,22 @@
-.product-thumb
-  %a{"ng-click" => "triggerProductModal()"}
-    %span.product-thumb__bulk-label{"ng-if" => "::product.group_buy"}
-      = t(".bulk")
-    %img{"ng-src" => "{{::product.primaryImageOrMissing}}"}
+= cache_with_locale do
+  .product-thumb
+    %a{"ng-click" => "triggerProductModal()"}
+      %span.product-thumb__bulk-label{"ng-if" => "::product.group_buy"}
+        = t(".bulk")
+      %img{"ng-src" => "{{::product.primaryImageOrMissing}}"}
 
-.summary
-  .summary-header
-    %h3
-      %a{"ng-click" => "triggerProductModal()", href: 'javascript:void(0)'}
-        %span{"ng-bind" => "::product.name"}
-    .product-description{ng: {"bind-html": "::product.description_html", click: "triggerProductModal()", show: "product.description_html.length"}}
-    %div{ "ng-switch" => "enterprise.visible" }
-      .product-producer
-        = t :products_from
-        %span{ "ng-switch-when": "hidden", "ng-bind" => "::enterprise.name"}
-        %span{ "ng-switch-default": true }
-          %enterprise-modal{"ng-bind" => "::enterprise.name"}
+  .summary
+    .summary-header
+      %h3
+        %a{"ng-click" => "triggerProductModal()", href: 'javascript:void(0)'}
+          %span{"ng-bind" => "::product.name"}
+      .product-description{ng: {"bind-html": "::product.description_html", click: "triggerProductModal()", show: "product.description_html.length"}}
+      %div{ "ng-switch" => "enterprise.visible" }
+        .product-producer
+          = t :products_from
+          %span{ "ng-switch-when": "hidden", "ng-bind" => "::enterprise.name"}
+          %span{ "ng-switch-default": true }
+            %enterprise-modal{"ng-bind" => "::enterprise.name"}
 
-    .product-properties.filter-shopfront.property-selectors
-      %filter-selector{ 'selector-set' => "productPropertySelectors", objects: "[product] | propertiesWithValuesOf" }
+      .product-properties.filter-shopfront.property-selectors
+        %filter-selector{ 'selector-set' => "productPropertySelectors", objects: "[product] | propertiesWithValuesOf" }

app/views/shops/_fat.html.haml

@@ -1,53 +1,54 @@
-.row.active_table_row{"ng-show" => "open()", "ng-click" => "toggle($event)", "ng-class" => "{'open' : open()}"}
-  .columns.small-12.fat.text-center{"ng-show" => "open() && shopfront_loading"}
-    %p.fullwidth
-      = render partial: "components/spinner"
+= cache_with_locale do
+  .row.active_table_row{"ng-show" => "open()", "ng-click" => "toggle($event)", "ng-class" => "{'open' : open()}"}
+    .columns.small-12.fat.text-center{"ng-show" => "open() && shopfront_loading"}
+      %p.fullwidth
+        = render partial: "components/spinner"
 
-  .columns.small-12.medium-6.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
-    %div{"ng-if" => "::hub.taxons"}
-      %label
-        = t :hubs_buy
-      .trans-sentence
-        %div
-          %span.fat-taxons{"ng-repeat" => "taxon in hub.taxons"}
-            %span{"ng-bind" => "::taxon.name"}
-        %div
-          %span.fat-properties{"ng-repeat" => "property in hub.distributed_properties"}
-            %span{"ng-bind" => "property.presentation"}
-    %div.show-for-medium-up{"ng-if" => "::hub.taxons.length==0"}
-       
-  .columns.small-12.medium-3.large-2.fat{"ng-show" => "open() && !shopfront_loading"}
-    %div{"ng-if" => "::(hub.pickup || hub.delivery)"}
-      %label
-        = t :hubs_delivery_options
-      %ul.small-block-grid-2.medium-block-grid-1.large-block-grid-1
-        %li.pickup{"ng-if" => "::hub.pickup"}
-          %i.ofn-i_038-takeaway
-          = t :hubs_pickup
-        %li.delivery{"ng-if" => "::hub.delivery"}
-          %i.ofn-i_039-delivery
-          = t :hubs_delivery
-  .columns.small-12.medium-3.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
-    %div{"ng-if" => "::hub.producers"}
-      %label
-        = t :hubs_producers
-      %ul.small-block-grid-2.medium-block-grid-1.large-block-grid-2{"ng-class" => "{'show-more-producers' : toggleMoreProducers}", "class" => "producers-list"}
-        %li{"ng-repeat" => "enterprise in hub.producers | limitTo:7"}
-          %enterprise-modal
-            %i.ofn-i_036-producers
-            %span{"ng-bind" => "::enterprise.name"}
-        %li{"ng-repeat" => "enterprise in hub.producers.slice(7,hub.producers.length)", "class" => "additional-producer"}
-          %enterprise-modal
-            %i.ofn-i_036-producers
-            %span{"ng-bind" => "::enterprise.name"}
-        %li{"data-is-link" => "true", "class" => "more-producers-link", "ng-show" => "::hub.producers.length>7"}
-          %a{"ng-click" => "toggleMoreProducers=!toggleMoreProducers; $event.stopPropagation()"}
-            .more
-              +
-              %span{"ng-bind" => "::hub.producers.length-7"}
-              = t :label_more
-            .less
-              = t :label_less
+    .columns.small-12.medium-6.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
+      %div{"ng-if" => "::hub.taxons"}
+        %label
+          = t :hubs_buy
+        .trans-sentence
+          %div
+            %span.fat-taxons{"ng-repeat" => "taxon in hub.taxons"}
+              %span{"ng-bind" => "::taxon.name"}
+          %div
+            %span.fat-properties{"ng-repeat" => "property in hub.distributed_properties"}
+              %span{"ng-bind" => "property.presentation"}
+      %div.show-for-medium-up{"ng-if" => "::hub.taxons.length==0"}
+         
+    .columns.small-12.medium-3.large-2.fat{"ng-show" => "open() && !shopfront_loading"}
+      %div{"ng-if" => "::(hub.pickup || hub.delivery)"}
+        %label
+          = t :hubs_delivery_options
+        %ul.small-block-grid-2.medium-block-grid-1.large-block-grid-1
+          %li.pickup{"ng-if" => "::hub.pickup"}
+            %i.ofn-i_038-takeaway
+            = t :hubs_pickup
+          %li.delivery{"ng-if" => "::hub.delivery"}
+            %i.ofn-i_039-delivery
+            = t :hubs_delivery
+    .columns.small-12.medium-3.large-5.fat{"ng-show" => "open() && !shopfront_loading"}
+      %div{"ng-if" => "::hub.producers"}
+        %label
+          = t :hubs_producers
+        %ul.small-block-grid-2.medium-block-grid-1.large-block-grid-2{"ng-class" => "{'show-more-producers' : toggleMoreProducers}", "class" => "producers-list"}
+          %li{"ng-repeat" => "enterprise in hub.producers | limitTo:7"}
+            %enterprise-modal
+              %i.ofn-i_036-producers
+              %span{"ng-bind" => "::enterprise.name"}
+          %li{"ng-repeat" => "enterprise in hub.producers.slice(7,hub.producers.length)", "class" => "additional-producer"}
+            %enterprise-modal
+              %i.ofn-i_036-producers
+              %span{"ng-bind" => "::enterprise.name"}
+          %li{"data-is-link" => "true", "class" => "more-producers-link", "ng-show" => "::hub.producers.length>7"}
+            %a{"ng-click" => "toggleMoreProducers=!toggleMoreProducers; $event.stopPropagation()"}
+              .more
+                +
+                %span{"ng-bind" => "::hub.producers.length-7"}
+                = t :label_more
+              .less
+                = t :label_less
 
-    %div.show-for-medium-up{"ng-if" => "::hub.producers.length==0"}
-       
+      %div.show-for-medium-up{"ng-if" => "::hub.producers.length==0"}
+         

app/views/shops/_hubs.html.haml

@@ -7,31 +7,32 @@
   = render "shared/components/enterprise_search"
   = render "filters"
 
-  .row
-    .small-12.columns
-      .name-matches{"ng-show" => "nameMatchesFiltered.length > 0"}
-        %h2
-          = t :hubs_matches
-        = render "hubs_table", enterprises: "nameMatches"
+  = cache_with_locale do
+    .row
+      .small-12.columns
+        .name-matches{"ng-show" => "nameMatchesFiltered.length > 0"}
+          %h2
+            = t :hubs_matches
+          = render "hubs_table", enterprises: "nameMatches"
 
-      .distance-matches{"ng-if" => "nameMatchesFiltered.length == 0 || distanceMatchesShown"}
-        %h2{"ng-show" => "nameMatchesFiltered.length > 0 || query.length > 0"}
-          = t :hubs_matches
-          %span{"ng-show" => "nameMatchesFiltered.length > 0"} {{ nameMatchesFiltered[0].name }}...
-          %span{"ng-hide" => "nameMatchesFiltered.length > 0"} {{ query }}...
+        .distance-matches{"ng-if" => "nameMatchesFiltered.length == 0 || distanceMatchesShown"}
+          %h2{"ng-show" => "nameMatchesFiltered.length > 0 || query.length > 0"}
+            = t :hubs_matches
+            %span{"ng-show" => "nameMatchesFiltered.length > 0"} {{ nameMatchesFiltered[0].name }}...
+            %span{"ng-hide" => "nameMatchesFiltered.length > 0"} {{ query }}...
 
-        = render "hubs_table", enterprises: "distanceMatches"
+          = render "hubs_table", enterprises: "distanceMatches"
 
-      .show-distance-matches{"ng-show" => "nameMatchesFiltered.length > 0 && !distanceMatchesShown"}
-        %a{href: "", "ng-click" => "showDistanceMatches()"}
-          = t :hubs_distance_filter, location: "{{ nameMatchesFiltered[0].name }}"
-  .more-controls
-    %span{ng: {show: "closed_shops_loading", cloak: true}}
-      = render partial: "components/spinner"
-    %span{ng: {if: "!show_closed", cloak: true}}
-      %a.button{href: "", ng: {click: "showClosedShops()"}}
-        = t '.show_closed_shops'
-    %span{ng: {if: "show_closed", cloak: true}}
-      %a.button{href: "", ng: {click: "hideClosedShops()"}}
-        = t '.hide_closed_shops'
-    %a.button{href: main_app.map_path}= t '.show_on_map'
+        .show-distance-matches{"ng-show" => "nameMatchesFiltered.length > 0 && !distanceMatchesShown"}
+          %a{href: "", "ng-click" => "showDistanceMatches()"}
+            = t :hubs_distance_filter, location: "{{ nameMatchesFiltered[0].name }}"
+    .more-controls
+      %span{ng: {show: "closed_shops_loading", cloak: true}}
+        = render partial: "components/spinner"
+      %span{ng: {if: "!show_closed", cloak: true}}
+        %a.button{href: "", ng: {click: "showClosedShops()"}}
+          = t '.show_closed_shops'
+      %span{ng: {if: "show_closed", cloak: true}}
+        %a.button{href: "", ng: {click: "hideClosedShops()"}}
+          = t '.hide_closed_shops'
+      %a.button{href: main_app.map_path}= t '.show_on_map'

app/views/shops/_hubs_table.html.haml

@@ -1,10 +1,11 @@
-.active_table
-  %hub.active_table_node.row{"ng-repeat" => "hub in #{enterprises}Filtered = (#{enterprises} | closedShops:show_closed | taxons:activeTaxons | properties:activeProperties:'distributed_properties' | shipping:shippingTypes | orderBy:['-active', '+distance', '+orders_close_at'])",
-  "ng-class" => "{'is_profile' : hub.category == 'hub_profile', 'closed' : !open(), 'open' : open(), 'inactive' : !hub.active, 'current' : current()}",
-  "ng-controller" => "HubNodeCtrl",
-  id: "{{hub.hash}}"}
-    .small-12.columns
-      = render 'skinny'
-      = render 'fat'
+= cache_with_locale enterprises do
+  .active_table
+    %hub.active_table_node.row{"ng-repeat" => "hub in #{enterprises}Filtered = (#{enterprises} | closedShops:show_closed | taxons:activeTaxons | properties:activeProperties:'distributed_properties' | shipping:shippingTypes | orderBy:['-active', '+distance', '+orders_close_at'])",
+    "ng-class" => "{'is_profile' : hub.category == 'hub_profile', 'closed' : !open(), 'open' : open(), 'inactive' : !hub.active, 'current' : current()}",
+    "ng-controller" => "HubNodeCtrl",
+    id: "{{hub.hash}}"}
+      .small-12.columns
+        = render 'skinny'
+        = render 'fat'
 
-  = render 'shared/components/enterprise_no_results', enterprises: "#{enterprises}Filtered"
+    = render 'shared/components/enterprise_no_results', enterprises: "#{enterprises}Filtered"

app/views/shops/_skinny.html.haml

@@ -1,46 +1,47 @@
-.row.active_table_row{"ng-if" => "hub.is_distributor", "ng-click" => "toggle($event)", "ng-class" => "{'closed' : !open(), 'is_distributor' : producer.is_distributor}"}
-  .columns.small-12.medium-5.large-5.skinny-head
-    %a.hub{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub", "data-is-link" => "true"}
-      %i{ng: {class: "::hub.icon_font"}}
-      %span.margin-top.hub-name-listing{"ng-bind" => "::hub.name | truncate:40"}
+= cache_with_locale do
+  .row.active_table_row{"ng-if" => "hub.is_distributor", "ng-click" => "toggle($event)", "ng-class" => "{'closed' : !open(), 'is_distributor' : producer.is_distributor}"}
+    .columns.small-12.medium-5.large-5.skinny-head
+      %a.hub{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub", "data-is-link" => "true"}
+        %i{ng: {class: "::hub.icon_font"}}
+        %span.margin-top.hub-name-listing{"ng-bind" => "::hub.name | truncate:40"}
 
-  .columns.small-4.medium-2.large-2
-    %span.margin-top{"ng-bind" => "::hub.address.city"}
-  .columns.small-2.medium-1.large-1
-    %span.margin-top{"ng-bind" => "::hub.address.state_name"}
-    %span.margin-top{"ng-if" => "hub.distance != null && hub.distance > 0"} ({{ hub.distance / 1000 | number:0 }} km)
+    .columns.small-4.medium-2.large-2
+      %span.margin-top.ellipsed{"ng-bind" => "::hub.address.city"}
+    .columns.small-3.medium-2.large-2
+      %span.margin-top.ellipsed{"ng-bind" => "::hub.address.state_name"}
+      %span.margin-top{"ng-if" => "hub.distance != null && hub.distance > 0"} ({{ hub.distance / 1000 | number:0 }} km)
 
-  .columns.small-5.medium-3.large-3.text-right{"ng-if" => "::hub.active"}
-    %a.hub.open_closed{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
-      %i.ofn-i_068-shop-reversed.show-for-medium-up
-      %span.margin-top{ ng: { if: "::current()" } }
-        %em= t :hubs_shopping_here
-      %span.margin-top{ ng: { if: "::!current()" } }
-        %span{"ng-bind" => "::hub.orders_close_at | sensible_timeframe"}
+    .columns.small-5.medium-3.large-3.text-right.no-wrap.flex.flex-align-center.flex-justify-end{"ng-if" => "::hub.active"}
+      %a.hub.open_closed.flex.flex-align-center{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
+        %span{ ng: { if: "::current()" } }
+          %em= t :hubs_shopping_here
+        %span{ ng: { if: "::!current()" } }
+          %span{"ng-bind" => "::hub.orders_close_at | sensible_timeframe"}
+        %i.ofn-i_068-shop-reversed.show-for-medium-up
+      %span{style: "margin-left: 0.5rem;"}
+        %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
 
-  .columns.small-5.medium-3.large-3.text-right{"ng-if" => "::!hub.active"}
-    %a.hub.open_closed{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
-      %span.margin-top{ ng: { if: "::current()" } }
-        %em= t :hubs_shopping_here
-      %span.margin-top{ ng: { if: "::!current()" } }
-        = t :hubs_orders_closed
-      %i.ofn-i_068-shop-reversed.show-for-medium-up
+    .columns.small-5.medium-3.large-3.text-right.no-wrap.flex.flex-align-center.flex-justify-end{"ng-if" => "::!hub.active"}
+      %a.hub.open_closed.flex{"ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "ng-class" => "{primary: hub.active, secondary: !hub.active}", "ofn-change-hub" => "hub"}
+        %span{ ng: { if: "::current()" } }
+          %em= t :hubs_shopping_here
+        %span{ ng: { if: "::!current()" } }
+          = t :hubs_orders_closed
+        %i.ofn-i_068-shop-reversed.show-for-medium-up
+      %span{style: "margin-left: 0.5rem;"}
+        %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
 
-  .columns.small-1.medium-1.large-1.text-right
-    %span.margin-top
-      %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
+  .row.active_table_row{"ng-if" => "!hub.is_distributor", "ng-class" => "closed"}
+    .columns.small-12.medium-6.large-5.skinny-head
+      %a.hub{"ng-click" => "openModal(hub)", "ng-class" => "{primary: hub.active, secondary: !hub.active}"}
+        %i{ng: {class: "hub.icon_font"}}
+        %span.hub-name-listing{"ng-bind" => "::hub.name | truncate:40"}
 
-.row.active_table_row{"ng-if" => "!hub.is_distributor", "ng-class" => "closed"}
-  .columns.small-12.medium-6.large-5.skinny-head
-    %a.hub{"ng-click" => "openModal(hub)", "ng-class" => "{primary: hub.active, secondary: !hub.active}"}
-      %i{ng: {class: "hub.icon_font"}}
-      %span.margin-top.hub-name-listing{"ng-bind" => "::hub.name | truncate:40"}
+    .columns.small-4.medium-2.large-2
+      %span.ellipsed{"ng-bind" => "::hub.address.city"}
+    .columns.small-2.medium-1.large-1
+      %span.ellipsed{"ng-bind" => "::hub.address.state_name"}
 
-  .columns.small-4.medium-2.large-2
-    %span.margin-top{"ng-bind" => "::hub.address.city"}
-  .columns.small-2.medium-1.large-1
-    %span.margin-top{"ng-bind" => "::hub.address.state_name"}
-
-  .columns.small-6.medium-3.large-4.text-right
-    %span.margin-top{ ng: { if: "::!current()" } }
-      %em= t :hubs_profile_only
+    .columns.small-6.medium-3.large-4.text-right.no-wrap.flex.flex-align-center.flex-justify-end
+      %span{ ng: { if: "::!current()" } }
+        %em= t :hubs_profile_only

app/views/spree/admin/adjustments/_adjustments_table.html.haml

@@ -1,5 +1,5 @@
-%table.index{"data-hook" => "adjustments"}
-  %thead{"data-hook" => "adjustmment_head"}
+%table.index
+  %thead
     %tr
       %th= "#{t('spree.date')}/#{t('spree.time')}"
       %th= t(:description)
@@ -15,7 +15,7 @@
       - taxable = adjustment.adjustable_type == "Spree::Shipment" ? adjustment.adjustable : adjustment
       - tr_class = cycle('odd', 'even')
       - tr_id = spree_dom_id(adjustment)
-      %tr{:class => tr_class, "data-hook" => "adjustment_row", :id => tr_id}
+      %tr{:class => tr_class, :id => tr_id}
         %td.align-center.created_at
           = pretty_time(adjustment.created_at)
         %td.align-center.label

app/views/spree/admin/adjustments/_form.html.haml

@@ -1,4 +1,4 @@
-.row{"data-hook" => "admin_adjustment_form_fields"}
+.row
   - if @adjustment.new_record?
     = render 'new_form', f: f
   - else

app/views/spree/admin/adjustments/edit.html.haml

@@ -14,6 +14,6 @@
 = form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :method => :put do |f|
   %fieldset.no-border-top
     = render :partial => 'form', :locals => { :f => f }
-    .filter-actions.actions{"data-hook" => "buttons"}
+    .filter-actions.actions
       = button Spree.t(:continue), 'icon-arrow-right'
       = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button'

app/views/spree/admin/adjustments/new.html.haml

@@ -13,6 +13,6 @@
 = form_for @adjustment, :url => admin_order_adjustments_path do |f|
   %fieldset.no-border-top
     = render :partial => 'form', :locals => { :f => f }
-    .filter-actions.actions{"data-hook" => "buttons"}
+    .filter-actions.actions
       = button Spree.t(:continue), 'icon-arrow-right'
       = button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'icon-remove'

app/views/spree/admin/general_settings/edit.html.haml

@@ -5,7 +5,7 @@
   = Spree.t(:general_settings)
 
 = form_tag admin_general_settings_path, :method => :put do
-  #preferences{"data-hook" => ""}
+  #preferences
 
     %fieldset.general.no-border-top
       - @preferences_general.each do |key|
@@ -85,6 +85,6 @@
                 = preference_field_tag("available_units[#{unit}]", selected, { type: :boolean, selected: selected })
                 = label_tag(unit, unit.downcase) + tag(:br)
 
-      .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
+      .form-buttons.filter-actions.actions
         = button Spree.t('actions.update'), 'icon-refresh'
         = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button'

app/views/spree/admin/mail_methods/_form.html.haml

@@ -18,10 +18,3 @@
         %br/
         %span.info
           = t("spree.smtp_send_copy_to_this_addresses")
-      .field
-        = label_tag :intercept_email, t("spree.intercept_email_address")
-        %br/
-        = text_field_tag :intercept_email, Spree::Config[:intercept_email], disabled: true, class: 'fullwidth'
-        %br/
-        %span.info
-          = t("spree.intercept_email_instructions")

app/views/spree/admin/orders/_add_product.html.haml

@@ -1,13 +1,13 @@
 = render :partial => "spree/admin/variants/autocomplete", :formats => :js
 
-#add-line-item{"data-hook" => ""}
+#add-line-item
   %fieldset.no-border-bottom
     %legend{:align => "center"}= Spree.t(:add_product)
 
     - if @order.canceled?
       = t(".cannot_add_item_to_canceled_order")
     - else
-      .field.nine.columns.alpha{"data-hook" => "add_product_name"}
+      .field.nine.columns.alpha
         = label_tag :add_variant_id, Spree.t(:name_or_sku)
         = hidden_field_tag :add_variant_id, "", :class => "variant_autocomplete fullwidth"
       .five.columns.omega

app/views/spree/admin/orders/_filters.html.haml

@@ -1,4 +1,4 @@
-%div{"data-hook" => "admin_orders_index_search"}
+%div.admin-orders-index-search
   = form_tag spree.admin_orders_url, {name: "orders_form", "ng-submit" => "fetchResults()"} do
     .field-block.alpha.four.columns
       .date-range-filter.field

app/views/spree/admin/orders/_form.html.haml

@@ -1,4 +1,4 @@
-%div{"data-hook" => "admin_order_form_fields"}
+%div.admin-order-form-fields
   - if @line_item.try(:errors).present?
     = render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item }
 
@@ -13,7 +13,7 @@
   = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => order_adjustments_for_display(@order), :title => t(".order_adjustments")}
 
   - if order.line_items.exists?
-    %fieldset#order-total.no-border-bottom{"data-hook" => "order_details_total"}
+    %fieldset#order-total.no-border-bottom.order-details-total
       %legend{ align: 'center' }= t(".order_total")
       %span.order-total= order.display_total
 

app/views/spree/admin/orders/_shipment.html.haml

@@ -1,6 +1,6 @@
 %div{ :id => "shipment_#{shipment.id}" }
   %fieldset.no-border-bottom
-    %legend.stock-location{ :align => "center", "data-hook" => "stock-location" }
+    %legend.stock-location{ :align => "center" }
       %span.shipment-number
         = shipment.number
       = "-"
@@ -10,7 +10,7 @@
         = "-"
         = link_to t(:ship), '#', :class => 'ship button icon-arrow-right', :data => { 'shipment-number' => shipment.number }
 
-  %table.stock-contents.index{ "data-hook" => "stock-contents" }
+  %table.stock-contents.index
     %colgroup
       %col{ :style => "width: 10%;" }
       %col{ :style => "width: 30%;" }
@@ -28,7 +28,7 @@
         = Spree.t(:quantity)
       %th.force-rounded-right
         = Spree.t(:total)
-      %th.orders-actions.actions{ "data-hook" => "admin_order_form_line_items_header_actions" }
+      %th.orders-actions.actions
 
     %tbody{ "data-shipment-number" => "#{shipment.number}", "data-order-number" => "#{order.number}" }
       = render 'spree/admin/orders/shipment_manifest', order: order, shipment: shipment

app/views/spree/admin/orders/_shipment_manifest.html.haml

@@ -17,7 +17,7 @@
       %td.item-total.align-center
         = line_item_shipment_price(line_item, item.quantity)
 
-      %td.cart-item-delete.actions{ "data-hook" => "cart_item_delete" }
+      %td.cart-item-delete.actions
         - if shipment.can_modify? && can?(:update, shipment)
           .flex
             = link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('actions.save'), :style => 'display: none'

app/views/spree/admin/orders/customer_details/_form.html.haml

@@ -1,19 +1,19 @@
-%fieldset.no-border-top{"data-hook" => "admin_customer_detail_form_fields"}
-  %fieldset.index.no-border-bottom{"data-hook" => "customer_guest"}
+%fieldset.no-border-top
+  %fieldset.index.no-border-bottom
     %legend{:align => "center"}= Spree.t(:account)
-    .row{"data-hook" => "customer_fields"}
+    .row
       .alpha.eight.columns.fullwidth
         .field
           = f.label :email, Spree.t(:email) + ':'
           = f.email_field :email, :class => 'fullwidth'
 
-  .alpha.eight.columns{"data-hook" => "bill_address_wrapper"}
+  .alpha.eight.columns
     %fieldset.no-border-bottom
       %legend{:align => "center"}= Spree.t(:billing_address)
       = f.fields_for :bill_address do |ba_form|
         = render :partial => 'address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false }
 
-  .omega.eight.columns{"data-hook" => "ship_address_wrapper"}
+  .omega.eight.columns
     %fieldset.no-border-bottom
       %legend{:align => "center"}= Spree.t(:shipping_address)
       = f.fields_for :ship_address do |sa_form|
@@ -21,7 +21,7 @@
 
   .clear
 
-  .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
+  .form-buttons.filter-actions.actions
     = button Spree.t('actions.update'), 'icon-refresh'
 
   - content_for :head do

app/views/spree/admin/orders/customer_details/edit.html.haml

@@ -12,7 +12,7 @@
   %li= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left'
 
 - if @order.cart? || @order.address?
-  #select-customer{"data-hook" => ""}
+  #select-customer
     %fieldset.no-border-bottom
       %legend{:align => "center"}= Spree.t(:customer_search)
       - content_for :main_ng_app_name do
@@ -24,3 +24,4 @@
 
 = form_for @order, :url => admin_order_customer_url(@order) do |f|
   = render 'form', :f => f
+  = f.hidden_field :customer_id, value: @order.customer_id, id: "customer_id"

app/views/spree/admin/orders/distribution.html.haml

@@ -17,7 +17,7 @@
   = render 'spree/shared/error_messages', :target => @order
 
 %div{"ng-app" => "admin.orders", "ng-controller" => "orderCtrl"}
-  = form_for @order, url: admin_order_url(@order), method: :put do |f|
+  = form_for @order, url: distribution_admin_order_path(@order), method: :put do |f|
     = render 'spree/admin/orders/_form/distribution_fields'
     -# This param passed to stop validation error in next page due to no line items in order yet:
     = hidden_field_tag 'suppress_error_msg', "true"

app/views/spree/admin/orders/edit.html.haml

@@ -15,7 +15,7 @@
 = render partial: "spree/admin/shared/order_page_title"
 = render partial: "spree/admin/shared/order_tabs", locals: { current: 'Order Details' }
 
-%div{"data-hook" => "admin_order_edit_header"}
+%div
   -# Suppress errors when manually creating a new order - needs to proceed to edit page
   -# without having line items (which otherwise gives a validation error)
   - unless params["suppress_error_msg"]
@@ -31,5 +31,5 @@
       .no-objects-found
         = Spree.t(:your_order_is_empty_add_product)
 
-    %div{"data-hook" => "admin_order_edit_form"}
+    %div.admin-order-edit-form
       = render :partial => 'form', :locals => { :order => @order }

app/views/spree/admin/payment_methods/_providers.html.haml

@@ -3,6 +3,6 @@
     .alpha.four.columns
       = label :payment_method, :type, t('.provider')
     .omega.twelve.columns
-      = collection_select(:payment_method, :type, @providers, :to_s, :clean_name, (!@object.persisted? ? { :selected => "Spree::PaymentMethod::Check"} : {}), { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"})
+      = collection_select(:payment_method, :type, @providers, :to_s, :clean_name, {}, { class: 'select2 fullwidth', 'provider-prefs-for' => "#{@object.id}"})
 
   %div{"ng-include" => "include_html" }

app/views/spree/admin/product_properties/_product_property_fields.html.haml

@@ -1,4 +1,4 @@
-%tr.product_property.fields{"data-hook" => "product_property", id: "spree_#{dom_id(f.object)}"}
+%tr.product_property.fields{id: "spree_#{dom_id(f.object)}"}
   %td.no-border
     %span.handle
     = f.hidden_field :id

app/views/spree/admin/products/_form.html.haml

@@ -1,4 +1,4 @@
-%div{"data-hook" => "admin_product_form_fields"}
+%div.admin-product-form-fields
   .left.twelve.columns.alpha
     = f.field_container :name do
       = f.label :name, raw(t(:name) + content_tag(:span, ' *', :class => 'required'))