Revert accidental push of a byebug statement with the direct translations push to master 🙈

Transifex

.rubocop_todo.yml

@@ -681,7 +681,6 @@ Style/FrozenStringLiteralComment:
     - 'app/models/product_import/entry_validator.rb'
     - 'app/models/product_import/inventory_reset_strategy.rb'
     - 'app/models/product_import/product_importer.rb'
-    - 'app/models/product_import/products_reset_strategy.rb'
     - 'app/models/product_import/reset_absent.rb'
     - 'app/models/product_import/settings.rb'
     - 'app/models/product_import/spreadsheet_data.rb'
@@ -1257,7 +1256,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/models/producer_property_spec.rb'
     - 'spec/models/product_import/entry_processor_spec.rb'
     - 'spec/models/product_import/inventory_reset_strategy_spec.rb'
-    - 'spec/models/product_import/products_reset_strategy_spec.rb'
     - 'spec/models/product_import/reset_absent_spec.rb'
     - 'spec/models/product_import/settings_spec.rb'
     - 'spec/models/product_importer_spec.rb'

Gemfile

@@ -12,6 +12,7 @@ gem "activerecord-import"
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
 
+gem "catalog", path: "./engines/catalog"
 gem "order_management", path: "./engines/order_management"
 gem 'web', path: './engines/web'
 
@@ -111,10 +112,9 @@ gem 'momentjs-rails'
 gem 'turbo-sprockets-rails3'
 
 gem "foundation-rails"
-gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
 
 gem 'jquery-migrate-rails'
-gem 'jquery-rails', '3.0.4'
+gem 'jquery-rails', '3.1.5'
 gem 'jquery-ui-rails', '~> 4.0.0'
 gem 'select2-rails', '~> 3.4.7'
 
@@ -166,5 +166,5 @@ group :development do
   # greater than 1.0.9, so we just required the latest available version here.
   gem 'eventmachine', '>= 1.2.3'
 
-  gem 'rack-mini-profiler', '< 2.0.0'
+  gem 'rack-mini-profiler', '< 3.0.0'
 end

Gemfile.lock

@@ -65,15 +65,10 @@ GIT
       rails-i18n
       spree_core (>= 1.1)
 
-GIT
-  remote: https://github.com/willrjmarshall/foundation_rails_helper.git
-  revision: 4d5d53fdc4b1fb71e66524d298c5c635de82cfbb
-  branch: rails3
+PATH
+  remote: engines/catalog
   specs:
-    foundation_rails_helper (0.4)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      railties (>= 3.0)
+    catalog (0.0.1)
 
 PATH
   remote: engines/order_management
@@ -168,7 +163,7 @@ GEM
       xpath (>= 2.0, < 4.0)
     childprocess (3.0.0)
     chronic (0.10.2)
-    chunky_png (1.3.10)
+    chunky_png (1.3.11)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -195,7 +190,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (3.1.0)
+    compass-rails (4.0.0)
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
@@ -211,7 +206,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.33.1)
+    ddtrace (0.34.0)
       msgpack
     debugger-linecache (1.2.0)
     deface (1.0.2)
@@ -252,7 +247,7 @@ GEM
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffaker (1.22.1)
-    ffi (1.11.3)
+    ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
     fission (0.5.0)
@@ -419,7 +414,7 @@ GEM
     gmaps4rails (1.5.6)
     haml (4.0.7)
       tilt
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     highline (1.6.18)
     hike (1.2.3)
     httparty (0.16.2)
@@ -433,7 +428,7 @@ GEM
     jaro_winkler (1.5.4)
     journey (1.0.4)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.5)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.0.5)
@@ -494,7 +489,7 @@ GEM
     parallel (1.19.1)
     paranoia (1.3.4)
       activerecord (~> 3.1)
-    parser (2.7.0.4)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
@@ -516,9 +511,9 @@ GEM
     rabl (0.8.4)
       activesupport (>= 2.3.14)
     rack (1.4.7)
-    rack-cache (1.9.0)
+    rack-cache (1.11.0)
       rack (>= 0.4)
-    rack-mini-profiler (1.1.6)
+    rack-mini-profiler (2.0.1)
       rack (>= 1.2.0)
     rack-protection (1.5.5)
       rack
@@ -548,14 +543,14 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.1)
-    rake (13.0.0)
+    rake (13.0.1)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rbvmomi (1.13.0)
       builder (~> 3.0)
       json (>= 1.8)
@@ -580,15 +575,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -598,16 +593,17 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.0)
-    rubocop (0.80.1)
+    rspec-support (3.9.2)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.4.2)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-rails (2.5.0)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
@@ -665,8 +661,8 @@ GEM
     tzinfo (0.3.56)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.1)
-    unicorn (5.5.3)
+    unicode-display_width (1.7.0)
+    unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -679,7 +675,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.2)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -711,6 +707,7 @@ DEPENDENCIES
   bugsnag
   byebug (~> 9.0.0)
   capybara (>= 2.18.0)
+  catalog!
   coffee-rails (~> 3.2.1)
   combine_pdf
   compass-rails
@@ -733,7 +730,6 @@ DEPENDENCIES
   foreigner
   foundation-icons-sass-rails
   foundation-rails
-  foundation_rails_helper!
   fuubar (~> 2.5.0)
   geocoder
   gmaps4rails
@@ -742,7 +738,7 @@ DEPENDENCIES
   i18n-js (~> 3.6.0)
   immigrant
   jquery-migrate-rails
-  jquery-rails (= 3.0.4)
+  jquery-rails (= 3.1.5)
   jquery-ui-rails (~> 4.0.0)
   json_spec (~> 1.1.4)
   jwt (~> 2.2)
@@ -762,7 +758,7 @@ DEPENDENCIES
   pg (~> 0.21.0)
   pry-byebug (>= 3.4.3)
   rabl
-  rack-mini-profiler (< 2.0.0)
+  rack-mini-profiler (< 3.0.0)
   rack-rewrite
   rack-ssl
   rails (~> 3.2.22)

README.md

@@ -35,7 +35,7 @@ We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. B
 Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
-[slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/enQtNzY3NDEwNzM2MDM0LWFmNGRhNDUwYzNmNWNkYmFkMzgxNDg1OTg1ODNjNWY4Y2FhNDIwNmE4ZWI0OThiMGNmZjFkODczNGZiYTJmNWI
+[slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
 [contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide

app/assets/images/black-caret.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4"
+   xml:space="preserve"
+   enable-background="new 0 0 6 3"
+   viewBox="0 0 6 3"
+   height="3px"
+   width="24px"
+   y="0px"
+   x="12px"
+   version="1.1"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><polygon
+     style="fill:#000000;fill-opacity:1"
+     id="polygon2"
+     points="5.992,0 2.992,3 -0.008,0 " /></svg>

app/assets/images/white-caret.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4"
+   xml:space="preserve"
+   enable-background="new 0 0 6 3"
+   viewBox="0 0 6 3"
+   height="3px"
+   width="24px"
+   y="0px"
+   x="12px"
+   version="1.1"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><polygon
+     style="fill:#ffffff;fill-opacity:1"
+     id="polygon2"
+     points="5.992,0 2.992,3 -0.008,0 " /></svg>

app/assets/javascripts/admin/all.js

@@ -20,7 +20,6 @@
 //= require angular
 //= require angular-resource
 //= require angular-animate
-//= require angular-sanitize
 //= require angularjs-file-upload
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ../shared/ng-tags-input.min.js
@@ -67,6 +66,8 @@
 
 // text, dates and translations
 //= require textAngular-rangy.min.js
+// This replaces angular-sanitize. We should include only one.
+// https://github.com/textAngular/textAngular#where-to-get-it
 //= require textAngular-sanitize.min.js
 //= require textAngular.min.js
 //= require i18n/translations

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

@@ -1,7 +1,7 @@
 angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, SortOptions, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
   $scope.initialized = false
   $scope.RequestMonitor = RequestMonitor
-  $scope.filteredLineItems = []
+  $scope.line_items = LineItems.all
   $scope.confirmDelete = true
   $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
   $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
@@ -15,50 +15,77 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.confirmRefresh = ->
     LineItems.allSaved() || confirm(t("unsaved_changes_warning"))
 
+  $scope.resetFilters = ->
+    $scope.distributorFilter = ''
+    $scope.supplierFilter = ''
+    $scope.orderCycleFilter = ''
+    $scope.quickSearch = ''
+
   $scope.resetSelectFilters = ->
-    $scope.distributorFilter = 0
-    $scope.supplierFilter = 0
-    $scope.orderCycleFilter = 0
-    $scope.quickSearch = ""
+    $scope.resetFilters()
+    $scope.refreshData()
 
   $scope.refreshData = ->
-    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
-      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
-      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == ''
+      $scope.setOrderCycleDateRange()
 
-    formatted_start_date = moment($scope.startDate).format()
-    formatted_end_date = moment($scope.endDate).add(1,'day').format()
+    $scope.formattedStartDate = moment($scope.startDate).format()
+    $scope.formattedEndDate = moment($scope.endDate).add(1,'day').format()
 
+    return unless moment($scope.formattedStartDate).isValid() and moment($scope.formattedEndDate).isValid()
+
+    $scope.loadOrders()
+    $scope.loadLineItems()
+
+    unless $scope.initialized
+      $scope.loadAssociatedData()
+
+    $scope.dereferenceLoadedData()
+
+  $scope.setOrderCycleDateRange = ->
+    start_date = OrderCycles.byID[$scope.orderCycleFilter].orders_open_at
+    end_date = OrderCycles.byID[$scope.orderCycleFilter].orders_close_at
+    format = "YYYY-MM-DD HH:mm:ss Z"
+    $scope.startDate = moment(start_date, format).format('YYYY-MM-DD')
+    $scope.endDate = moment(end_date, format).startOf('day').format('YYYY-MM-DD')
+
+  $scope.loadOrders = ->
     RequestMonitor.load $scope.orders = Orders.index(
       "q[state_not_eq]": "canceled",
       "q[completed_at_not_null]": "true",
-      "q[completed_at_gteq]": formatted_start_date,
-      "q[completed_at_lt]": formatted_end_date
+      "q[distributor_id_eq]": $scope.distributorFilter,
+      "q[order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[completed_at_gteq]": $scope.formattedStartDate,
+      "q[completed_at_lt]": $scope.formattedEndDate
     )
 
-    RequestMonitor.load $scope.lineItems = LineItems.index(
-      "q[order][state_not_eq]": "canceled",
-      "q[order][completed_at_not_null]": "true",
-      "q[order][completed_at_gteq]": formatted_start_date,
-      "q[order][completed_at_lt]": formatted_end_date
+  $scope.loadLineItems = ->
+    RequestMonitor.load LineItems.index(
+      "q[order_state_not_eq]": "canceled",
+      "q[order_completed_at_not_null]": "true",
+      "q[order_distributor_id_eq]": $scope.distributorFilter,
+      "q[variant_product_supplier_id_eq]": $scope.supplierFilter,
+      "q[order_order_cycle_id_eq]": $scope.orderCycleFilter,
+      "q[order_completed_at_gteq]": $scope.formattedStartDate,
+      "q[order_completed_at_lt]": $scope.formattedEndDate
     )
 
-    unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+  $scope.loadAssociatedData = ->
+    RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+    RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
+    RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
 
-    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
+  $scope.dereferenceLoadedData = ->
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise, $scope.suppliers.$promise, $scope.line_items.$promise]).then ->
       Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
       Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
-      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "supplier", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.line_items, "order", Orders.byID
       $scope.bulk_order_form.$setPristine()
       StatusMessage.clear()
+
       unless $scope.initialized
         $scope.initialized = true
-        $timeout ->
-          $scope.resetSelectFilters()
 
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
@@ -77,13 +104,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.deleteLineItem = (lineItem) ->
     if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
-      LineItems.delete lineItem, =>
-        $scope.lineItems.splice $scope.lineItems.indexOf(lineItem), 1
+      LineItems.delete lineItem
 
-  $scope.deleteLineItems = (lineItems) ->
+  $scope.deleteLineItems = (lineItemsToDelete) ->
     existingState = $scope.confirmDelete
     $scope.confirmDelete = false
-    $scope.deleteLineItem lineItem for lineItem in lineItems when lineItem.checked
+    $scope.deleteLineItem lineItem for lineItem in lineItemsToDelete when lineItem.checked
     $scope.confirmDelete = existingState
 
   $scope.allBoxesChecked = ->
@@ -154,4 +180,5 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
       lineItem.final_weight_volume = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
       $scope.weightAdjustedPrice(lineItem)
 
+  $scope.resetFilters()
   $scope.refreshData()

app/assets/javascripts/admin/payments/services/stripe_elements.js.coffee

@@ -14,9 +14,10 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
           StatusMessage.display 'error', response.error.message
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapCC(response.token.card.brand)
+          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
 
@@ -29,15 +30,16 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
       @stripe.createPaymentMethod({ type: 'card', card: @card }, @card, cardData).then (response) =>
         if(response.error)
           StatusMessage.display 'error', response.error.message
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = response.paymentMethod.card.brand
+          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
 
-    # Maps the brand returned by Stripe to that required by activemerchant
-    mapCC: (ccType) ->
-      switch ccType
+    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
+    mapTokenApiCardBrand: (cardBrand) ->
+      switch cardBrand
         when 'MasterCard' then return 'master'
         when 'Visa' then return 'visa'
         when 'American Express' then return 'american_express'
@@ -45,6 +47,14 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
         when 'JCB' then return 'jcb'
         when 'Diners Club' then return 'diners_club'
 
+    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
+    mapPaymentMethodsApiCardBrand: (cardBrand) ->
+      switch cardBrand
+        when 'mastercard' then return 'master'
+        when 'amex' then return 'american_express'
+        when 'diners' then return 'diners_club'
+        else return cardBrand # a few brands are equal, for example, visa
+
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

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

@@ -2,7 +2,6 @@ angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
   $resource('/admin/bulk_line_items/:id.json', {}, {
     'index':
       method: 'GET'
-      isArray: true
     'update':
       method: 'PUT'
       transformRequest: (data, headersGetter) =>

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

@@ -1,20 +1,27 @@
 angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
   new class LineItems
+    all: []
     byID: {}
     pristineByID: {}
+    pagination: {}
 
     index: (params={}, callback=null) ->
-    	LineItemResource.index params, (data) =>
+    	request = LineItemResource.index params, (data) =>
         @load(data)
         (callback || angular.noop)(data)
+      @all.$promise = request.$promise
+      @all
 
     resetData: ->
+      @all.length = 0
       @byID = {}
       @pristineByID = {}
 
-    load: (lineItems) ->
+    load: (data) ->
+      angular.extend(@pagination, data.pagination)
       @resetData()
-      for lineItem in lineItems
+      for lineItem in data.line_items
+        @all.push lineItem
         @byID[lineItem.id] = lineItem
         @pristineByID[lineItem.id] = angular.copy(lineItem)
 
@@ -25,8 +32,9 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     save: (lineItem) ->
       deferred = $q.defer()
+      lineItemResource = new LineItemResource(lineItem)
       lineItem.errors = {}
-      lineItem.$update({id: lineItem.id})
+      lineItemResource.$update({id: lineItem.id})
       .then( (data) =>
         @pristineByID[lineItem.id] = angular.copy(lineItem)
         deferred.resolve(data)
@@ -54,8 +62,10 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     delete: (lineItem, callback=null) ->
       deferred = $q.defer()
-      lineItem.$delete({id: lineItem.id})
+      lineItemResource = new LineItemResource(lineItem)
+      lineItemResource.$delete({id: lineItem.id})
       .then( (data) =>
+        @all.splice(@all.indexOf(lineItem),1)
         delete @byID[lineItem.id]
         delete @pristineByID[lineItem.id]
         (callback || angular.noop)(data)

app/assets/javascripts/admin/utils/directives/textangular_strip.js.coffee

@@ -2,4 +2,10 @@ angular.module("admin.utils").directive "textangularStrip", () ->
   restrict: 'CA'
   link: (scope, element, attrs) ->
     scope.stripFormatting = ($html) ->
-      return String($html).replace(/<[^>]+>/gm, '')
+      element = document.createElement("div")
+      element.innerHTML = String($html)
+      allTags = element.getElementsByTagName("*")
+      for child in allTags
+        child.removeAttribute("style")
+        child.removeAttribute("class")
+      return element.innerHTML

app/assets/javascripts/application.js

@@ -1,9 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

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

@@ -9,6 +9,8 @@
 #= require angular-animate
 #= require angular-resource
 #= require lodash.underscore.js
+# bluebird.js is a dependency of angular-google-maps.js 2.0.0
+#= require bluebird.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.9.0-20180826174721.min.js

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

@@ -0,0 +1,17 @@
+Darkswarm.controller "PageSelectionCtrl", ($scope, $location) ->
+  $scope.selectedPage = ->
+    # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`.
+    # We remove the slash at the beginning.
+    page = $location.path()[1..]
+
+    return $scope.whitelist[0] unless page
+
+    # If the path points to an unrelated path like `/login`, stay where we were.
+    return $scope.lastPage unless page in $scope.whitelist
+
+    $scope.lastPage = page
+    page
+
+  $scope.whitelistPages = (pages) ->
+    $scope.whitelist = pages
+    $scope.lastPage = pages[0]

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

@@ -7,7 +7,7 @@ window.Darkswarm = angular.module("Darkswarm", [
   'templates',
   'ngSanitize',
   'ngAnimate',
-  'google-maps',
+  'uiGmapgoogle-maps',
   'duScroll',
   'angularFileUpload',
   'angularSlideables'

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

@@ -1,6 +1,6 @@
 Darkswarm.directive 'mapOsmTiles', ($timeout) ->
   restrict: 'E'
-  require: '^googleMap'
+  require: '^uiGmapGoogleMap'
   scope: {}
   link: (scope, elem, attrs, ctrl) ->
     $timeout =>

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

@@ -1,7 +1,7 @@
 Darkswarm.directive 'mapSearch', ($timeout, Search) ->
   # Install a basic search field in a map
   restrict: 'E'
-  require: ['^googleMap', 'ngModel']
+  require: ['^uiGmapGoogleMap', 'ngModel']
   replace: true
   template: '<input id="pac-input" ng-model="query" placeholder="' + t('location_placeholder') + '"></input>'
   scope: {}

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

@@ -50,7 +50,7 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer,
           false
 
     calculateDistance: (query, firstMatching) ->
-      if query?.length > 0
+      if query?.length > 0 and Geo.OK
         if firstMatching?
           @setDistanceFrom firstMatching
         else

app/assets/javascripts/darkswarm/services/geo.js.erb.coffee

@@ -1,6 +1,6 @@
 Darkswarm.service "Geo", ->
   new class Geo
-    OK: google.maps.GeocoderStatus.OK
+    OK: google?.maps?.GeocoderStatus?.OK
 
     # Usage:
     # Geo.geocode address, (results, status) ->

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

@@ -15,9 +15,11 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         if(response.error)
           Loading.clear()
           RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
+          @triggerAngularDigest()
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.token.id
-          secrets.cc_type = @mapCC(response.token.card.brand)
+          secrets.cc_type = @mapTokenApiCardBrand(response.token.card.brand)
           secrets.card = response.token.card
           submit()
 
@@ -32,15 +34,21 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         if(response.error)
           Loading.clear()
           RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
+          @triggerAngularDigest()
+          console.error(JSON.stringify(response.error))
         else
           secrets.token = response.paymentMethod.id
-          secrets.cc_type = response.paymentMethod.card.brand
+          secrets.cc_type = @mapPaymentMethodsApiCardBrand(response.paymentMethod.card.brand)
           secrets.card = response.paymentMethod.card
           submit()
 
-    # Maps the brand returned by Stripe to that required by activemerchant
-    mapCC: (ccType) ->
-      switch ccType
+    triggerAngularDigest: ->
+      # $evalAsync is improved way of triggering a digest without calling $apply
+      $rootScope.$evalAsync()
+
+    # Maps the brand returned by Stripe's tokenAPI to that required by activemerchant
+    mapTokenApiCardBrand: (cardBrand) ->
+      switch cardBrand
         when 'MasterCard' then return 'master'
         when 'Visa' then return 'visa'
         when 'American Express' then return 'american_express'
@@ -48,6 +56,14 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
         when 'JCB' then return 'jcb'
         when 'Diners Club' then return 'diners_club'
 
+    # Maps the brand returned by Stripe's paymentMethodsAPI to that required by activemerchant
+    mapPaymentMethodsApiCardBrand: (cardBrand) ->
+      switch cardBrand
+        when 'mastercard' then return 'master'
+        when 'amex' then return 'american_express'
+        when 'diners' then return 'diners_club'
+        else return cardBrand # a few brands are equal, for example, visa
+
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
       {'name': secrets.name,

app/assets/stylesheets/application.css.scss

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree .
-*/

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

@@ -1,103 +1,172 @@
 @import "typography";
 
-.darkswarm navigation {
-  display: block;
-  background: #f7f7f7;
+ordercycle {
+  float: right;
+  background: $grey-050;
+  color: $grey-800;
+  width: 100%;
+  border-radius: 0.5em 0.5em 0 0;
+  margin-top: 1em;
+  padding: 1em 1.25em 0;
 
-  distributor.details {
-    box-sizing: border-box;
-    display: block;
-    min-height: 150px;
-    padding: 30px 0 20px 0;
+  p {
+    max-width: 400px;
+  }
+
+  h4 i {
+    margin-right: 0.3rem;
+  }
+
+  @media all and (max-width: 1024px) {
+    float: none;
+    padding: 0.5em 1em;
+    width: 100%;
+    margin-top: 0;
+    display: inline-block;
+    border-radius: 0;
     position: relative;
+    right: 0;
+    height: auto;
+
+    p {
+      max-width: 100%;
+    }
+  }
+
+  @media all and (max-width: 480px) {
+    padding: 0.5em 1em 0.75em;
+  }
+
+  .order-cycle-select {
+    border: 1px solid $teal-300;
+    display: inline-block;
+    font-size: 1em;
+    border-radius: 0.25em;
+
+    .select-label {
+      background-color: rgba($teal-300, 0.5);
+      display: inline-block;
+      border-radius: 0.25em 0 0 0.25em;
+      float: left;
+      font-size: 1em;
+      line-height: 1.5em;
+      padding: 0.5em 0.75em;
+      height: 2.35em;
+
+      span {
+        width: max-content;
+        display: block;
+      }
+    }
+
     select {
-      width: 200px;
-    }
-    img {
-      display: block;
-      height: 100px;
-      width: 100px;
-      margin-right: 12px;
-    }
+      width: inherit;
+      display: inline-block;
+      color: $white;
+      background-color: transparent;
+      border: 0;
+      margin-bottom: 0;
+      font-size: 1em;
+      line-height: 1.5em;
+      padding: 0.5em 1.25em 0.5em 0.75em;
+      height: 2.35em;
+      background-image: url('/assets/white-caret.svg');
+      background-size: 30px auto;
+      border-radius: 0 0.25em 0.25em 0;
+      min-width: 13em;
 
-    location {
-      @include headingFont;
-    }
-    @media all and (max-width: 768px) {
-      location, location + small {
-        display: block;
-      }
-    }
-
-    #distributor_title h3 {
-      margin-top: 0;
-      @media all and (max-width: 768px) {
-          margin-bottom: 8px;
-      }
-    }
-
-
-
-    ordercycle {
-      text-align: right;
-      float: right;
-      p {
-        max-width: 400px;
-      }
-      h4 i {
-        margin-right: 0.3rem;
-      }
-      @media all and (max-width: 640px) {
-        float: left;
-        clear: left;
-        text-align: left;
-        padding: 12px 10px;
+      @media all and (max-width: 480px) {
         width: 100%;
-        margin-top: 10px;
-        background: #e5e5e5;
-        p {
-          max-width: 100%;
-        }
       }
-      form.custom {
-        text-align: right;
-        & > strong {
-          line-height: 2.5;
-          font-size: 1.29em;
-          padding-right: 14px;
-        }
-        select {
-          width: inherit;
-          display: inline-block;
-          border: 1px #999;
-          color: #666;
-          font-size: 1em;
-          margin-bottom: 0;
-          padding: 8px 20px 8px 12px;
-          @media all and (max-width: 768px) {
-            font-size: 0.875em;
-          }
-          @media screen and (-webkit-min-device-pixel-ratio: 0) {
-            font-size: 16px;
-          }
-        }
-      }
-      closing {
-        @include headingFont;
-        color: black;
-        font-size: 1.5em;
-        display: block;
-        padding-bottom: 12px;
-        @media all and (max-width: 768px) {
-          font-size: 1.2em;
-          padding-bottom: 10px;
-        }
-        span {
-          @media all and (max-width: 768px) {
-            font-size: 0.875em;
-          }
-        }
+    }
+
+    @media all and (max-width: 1024px) {
+      float: none;
+      margin-right: 1em;
+    }
+
+    @media all and (max-width: 768px) {
+      float: none;
+    }
+
+    @media all and (max-width: 480px) {
+      display: flex;
+    }
+  }
+
+  closing {
+    @include headingFont;
+    color: $grey-800;
+    font-size: 1.25rem;
+    display: block;
+    padding: 0.5em 0;
+
+    span {
+      @media all and (max-width: 768px) {
+        font-size: 0.875em;
       }
     }
   }
 }
+
+shop ordercycle {
+  background: $teal-400;
+  color: $white;
+
+  &.requires-selection {
+    background-color: $red-700;
+
+    .order-cycle-select {
+      border: 1px solid $red-500;
+
+      .select-label {
+        background-color: rgba($red-500, 0.5);
+      }
+
+      select {
+        background-color: $white;
+        background-image: url('/assets/black-caret.svg');
+        color: $grey-500;
+        font-style: italic;
+      }
+    }
+  }
+
+  closing {
+    color: $white;
+    padding: 0 0 12px;
+
+    @media all and (max-width: 1024px) {
+      float: none;
+      display: inline-block;
+      padding: 0.2em 0 0;
+      font-size: 1.2em;
+      margin-right: 1em;
+    }
+
+    @media all and (max-width: 768px) {
+      float: none;
+      padding: 0 0 10px;
+    }
+  }
+
+  form.custom {
+    text-align: center;
+  }
+}
+
+shop navigation ordercycle {
+  margin-top: 3em;
+  padding: 1em;
+  height: 7.6em;
+  position: absolute;
+  right: 1em;
+}
+
+.sub-header {
+  form {
+    p {
+      margin-bottom: 0.75em;
+    }
+  }
+}

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

@@ -1,31 +1,6 @@
 @import "mixins";
 @import "branding";
 
-// .darkswarm
-//   product
-
-ordercycle {
-  .joyride-tip-guide {
-    background-color: $clr-brick;
-
-    .joyride-nub.right {
-      border-color: $clr-brick !important;
-      border-top-color: transparent !important;
-      border-right-color: transparent !important;
-      border-bottom-color: transparent !important;
-    }
-
-    p {
-      margin: 0;
-      font-weight: 700;
-    }
-
-    @media all and (max-width: 768px) {
-      z-index: 10;
-    }
-  }
-}
-
 // Pop over
 // Foundation overrides
 .joyride-tip-guide.price_breakdown {

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

@@ -27,7 +27,7 @@
 }
 
 products .filter-box {
-  background: #f7f7f7;
+  background: $grey-050;
 }
 
 .filter-box {

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

@@ -1,5 +1,7 @@
 $ofn-brand: #f27052;
 
+$distributor-header-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), 0 8px 6px -6px rgba(0, 0, 0, 0.2);
+
 // e.g. australia, uk, norway specific color
 
 $ofn-grey: #808184;
@@ -38,3 +40,27 @@ $light-grey: #ddd;
 $light-grey-transparency: rgba(0, 0, 0, .1);
 $black: #000;
 $white: #fff;
+
+$grey-050: #f7f7f7;
+
+$grey-400: #bbb;
+$grey-500: #999;
+$grey-600: #777;
+$grey-700: #555;
+$grey-800: #333;
+
+$teal-300: #80d3df;
+$teal-400: #4cb5c5;
+$teal-500: #0096ad;
+
+$orange-400: #ff9466;
+$orange-500: #f27052;
+$orange-600: #d7583a;
+
+$red-500: #e54e47;
+$red-700: #c1122b;
+
+$social-facebook: #3b5998;
+$social-instagram: #e1306c;
+$social-linkedin: #0e76a8;
+$social-twitter: #00acee;

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

@@ -44,7 +44,7 @@ checkout {
   h5 {
     margin: 0;
     padding: 0.65em;
-    background: #f7f7f7;
+    background: $grey-050;
 
     .label {
       font-size: 1em;
@@ -109,9 +109,4 @@ checkout {
       }
     }
   }
-
-  .error {
-    color: #c82020;
-  }
 }
-

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

@@ -0,0 +1,52 @@
+@import 'typography';
+
+section {
+  :not(shop) navigation {
+    box-shadow: $distributor-header-shadow;
+  }
+}
+
+.darkswarm navigation {
+  display: block;
+  background: $white;
+  position: relative;
+  z-index: 2;
+
+  .details {
+    box-sizing: border-box;
+    display: block;
+    min-height: 150px;
+    padding: 30px 0 0;
+    position: relative;
+
+    select {
+      width: 200px;
+    }
+
+    img {
+      display: block;
+      height: 100px;
+      width: 100px;
+      margin-right: 12px;
+    }
+
+    location {
+      @include headingFont;
+    }
+
+    @media all and (max-width: 768px) {
+      location, location + small {
+        display: block;
+      }
+    }
+
+    #distributor_title h3 {
+      margin-top: 0;
+      padding-top: 0.45em;
+
+      @media all and (max-width: 768px) {
+        margin-bottom: 8px;
+      }
+    }
+  }
+}

app/assets/stylesheets/darkswarm/modal-enterprises.css.scss

@@ -111,6 +111,22 @@
 
   i {
     font-size: 2rem;
+
+    &.facebook {
+      color: $social-facebook;
+    }
+
+    &.twitter {
+      color: $social-twitter;
+    }
+
+    &.linkedin {
+      color: $social-linkedin;
+    }
+
+    &.instagram {
+      color: $social-instagram;
+    }
   }
 
   a {

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

@@ -3,22 +3,27 @@
 @import "branding";
 
 // Tabs styling
-.tabset-ctrl#shop-tabs {
+#shop-tabs {
 
   .tab-buttons {
-    background: url("/assets/gray_jean.png") top left repeat;
-
-    @include box-shadow(inset 0 2px 3px 0 rgba(0, 0, 0, 0.15));
-
     color: $dark-grey;
+    box-shadow: $distributor-header-shadow;
 
-    .row:first-child {
+    .columns {
       display: flex;
-      justify-content: space-between;
+
+      @media all and (max-width: 1024px) {
+        display: table;
+        width: 100%;
+      }
+
+      @media all and (max-width: 480px) {
+        padding: 0;
+      }
     }
   }
 
-  .tab {
+  .page {
     text-align: center;
     border-top: 4px solid transparent;
     display: inline-block;
@@ -27,8 +32,7 @@
     >a {
       outline: none;
       display: block;
-      background-color: #efefef;
-      color: #222;
+      color: $grey-500;
       font-family: "Oswald", sans-serif;
     }
 
@@ -39,12 +43,11 @@
       text-transform: uppercase;
       line-height: 1;
       font-size: 0.875em;
-      text-shadow: 0 -1px 1px #ffffff;
       padding: 1em 2em;
       border: none;
 
-      &:hover, &:focus, &:active {
-        color: $clr-brick-bright;
+      &:hover, &:active {
+        color: $teal-500;
       }
 
       &, &:hover {
@@ -53,29 +56,41 @@
 
       @media all and (max-width: 640px) {
         padding: 0.35em 0 0.65em 0;
-        text-shadow: none;
       }
     }
 
     &.selected {
-      border-bottom: 4px solid $clr-brick;
+      border-bottom: 4px solid $teal-500;
 
       a {
-        color: $clr-brick;
+        color: $teal-500;
       }
     }
+
+    @media all and (max-width: 1024px) {
+      display: table-cell;
+      width: auto;
+    }
   }
 
   // content revealed in accordion
 
-  .tab-view {
+  .page-view {
     margin-bottom: 5em;
     background: none;
     border: none;
 
     .content {
       padding: 1.25em 0;
-      background-color: $white;
+      background-color: transparent;
+
+      a {
+        color: $orange-500;
+
+        &:hover {
+          color: $orange-600;
+        }
+      }
 
       img {
         margin: 0px 0px 0px 40px;
@@ -83,6 +98,7 @@
 
       h5 {
         margin-bottom: 1em;
+        font-family: $body-font;
       }
 
       p {
@@ -100,13 +116,9 @@
 
       .header {
         text-align: center;
-        text-transform: uppercase;
-        color: $dark-grey;
-        border-bottom: 1px solid $disabled-dark;
+        color: $grey-600;
         margin-top: 0.75rem;
-        margin-bottom: 0.75rem;
-        padding-bottom: 0.25rem;
-        font-size: 0.875rem;
+        margin-bottom: 2px;
       }
     }
   }

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

@@ -9,7 +9,7 @@
 }
 
 $headingFont: "Oswald";
-$bodyFont: "Roboto";
+$body-font: "Roboto", Arial, sans-serif;
 
 body {
   @include bodyFont;
@@ -43,7 +43,7 @@ small, .small {
 .text-small {
   font-size: 0.875rem;
   margin-bottom: 0.5rem;
-  font-family: $bodyFont;
+  font-family: $body-font;
 
   &, & * {
     font-size: 0.875rem;
@@ -52,12 +52,12 @@ small, .small {
 
 .text-normal {
   font-weight: 400;
-  font-family: $bodyFont;
+  font-family: $body-font;
 }
 
 .text-skinny {
   font-weight: 300;
-  font-family: $bodyFont;
+  font-family: $body-font;
 }
 
 .word-wrap {
@@ -114,9 +114,9 @@ ul.bullet-list, ul.check-list {
   }
 
   li:before {
-    content: "";
+    content: "•";
     font-family: "OFN";
-    margin-left: -1.25em;
+    margin: 0 0.25em 0 -1.25em;
     display: inline-block;
     font-weight: normal;
     font-style: normal;

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

@@ -10,7 +10,7 @@
 
   @include border-radius(0.5em);
 
-  font-family: $bodyFont;
+  font-family: $body-font;
   background-color: transparent;
   border: 2px solid rgba(200, 200, 200, 1);
   color: #999;
@@ -63,7 +63,7 @@
 }
 
 .button.primary, button.primary {
-  font-family: $bodyFont;
+  font-family: $body-font;
   background: $clr-brick;
   color: white;
 }

app/controllers/admin/bulk_line_items_controller.rb

@@ -4,18 +4,17 @@ module Admin
     #
     def index
       order_params = params[:q].andand.delete :order
+      orders = order_permissions.editable_orders.ransack(order_params).result
 
-      order_permissions = ::Permissions::Order.new(spree_current_user)
-      orders = order_permissions.
-        editable_orders.ransack(order_params).result
-
-      line_items = order_permissions.
+      @line_items = order_permissions.
         editable_line_items.where(order_id: orders).
         includes(variant: { option_values: :option_type }).
         ransack(params[:q]).result.
         reorder('spree_line_items.order_id ASC, spree_line_items.id ASC')
 
-      render_as_json line_items
+      @line_items = @line_items.page(page).per(params[:per_page]) if using_pagination?
+
+      render json: { line_items: serialized_line_items, pagination: pagination_data }
     end
 
     # PUT /admin/bulk_line_items/:id.json
@@ -65,6 +64,12 @@ module Admin
       Api::Admin::LineItemSerializer
     end
 
+    def serialized_line_items
+      ActiveModel::ArraySerializer.new(
+        @line_items, each_serializer: serializer(nil)
+      )
+    end
+
     def authorize_update!
       authorize! :update, order
       authorize! :read, order
@@ -73,5 +78,28 @@ module Admin
     def order
       @line_item.order
     end
+
+    def order_permissions
+      ::Permissions::Order.new(spree_current_user)
+    end
+
+    def using_pagination?
+      params[:per_page]
+    end
+
+    def pagination_data
+      return unless using_pagination?
+
+      {
+        results: @line_items.total_count,
+        pages: @line_items.num_pages,
+        page: page.to_i,
+        per_page: params[:per_page].to_i
+      }
+    end
+
+    def page
+      params[:page] || 1
+    end
   end
 end

app/controllers/admin/enterprises_controller.rb

@@ -32,6 +32,12 @@ module Admin
       end
     end
 
+    def edit
+      @object = Enterprise.where(permalink: params[:id]).
+        includes(users: [:ship_address, :bill_address]).first
+      super
+    end
+
     def welcome
       render layout: "spree/layouts/bare_admin"
     end
@@ -172,12 +178,14 @@ module Admin
     end
 
     def load_methods_and_fees
+      enterprise_payment_methods = @enterprise.payment_methods.to_a
+      enterprise_shipping_methods = @enterprise.shipping_methods.to_a
       # rubocop:disable Style/TernaryParentheses
       @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).sort_by! do |pm|
-        [(@enterprise.payment_methods.include? pm) ? 0 : 1, pm.name]
+        [(enterprise_payment_methods.include? pm) ? 0 : 1, pm.name]
       end
       @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).sort_by! do |sm|
-        [(@enterprise.shipping_methods.include? sm) ? 0 : 1, sm.name]
+        [(enterprise_shipping_methods.include? sm) ? 0 : 1, sm.name]
       end
       # rubocop:enable Style/TernaryParentheses
 

app/controllers/api/customers_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class CustomersController < BaseController
+  class CustomersController < Api::BaseController
     skip_authorization_check only: :index
 
     def index

app/controllers/api/enterprise_attachment_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class EnterpriseAttachmentController < BaseController
+  class EnterpriseAttachmentController < Api::BaseController
     class MissingImplementationError < StandardError; end
     class UnknownEnterpriseAuthorizationActionError < StandardError; end
 

app/controllers/api/enterprise_fees_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class EnterpriseFeesController < BaseController
+  class EnterpriseFeesController < Api::BaseController
     respond_to :json
 
     def destroy

app/controllers/api/logos_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class LogosController < EnterpriseAttachmentController
+  class LogosController < Api::EnterpriseAttachmentController
     private
 
     def attachment_name

app/controllers/api/order_cycles_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class OrderCyclesController < BaseController
+  class OrderCyclesController < Api::BaseController
     include EnterprisesHelper
     respond_to :json
 

app/controllers/api/orders_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class OrdersController < BaseController
+  class OrdersController < Api::BaseController
     def show
       authorize! :read, order
       render json: order, serializer: Api::OrderDetailedSerializer, current_order: order

app/controllers/api/product_images_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class ProductImagesController < BaseController
+  class ProductImagesController < Api::BaseController
     respond_to :json
 
     def update_product_image

app/controllers/api/promo_images_controller.rb

@@ -1,5 +1,5 @@
 module Api
-  class PromoImagesController < EnterpriseAttachmentController
+  class PromoImagesController < Api::EnterpriseAttachmentController
     private
 
     def attachment_name

app/controllers/base_controller.rb

@@ -29,17 +29,19 @@ class BaseController < ApplicationController
       return
     end
 
-    @order_cycles = OrderCycle.with_distributor(@distributor).active
-      .order(@distributor.preferred_shopfront_order_cycle_order)
+    @order_cycles = Shop::OrderCyclesList.new(@distributor, current_customer).call
 
-    applicator = OpenFoodNetwork::TagRuleApplicator.new(@distributor,
-                                                        "FilterOrderCycles",
-                                                        current_customer.andand.tag_list)
-    applicator.filter!(@order_cycles)
+    set_order_cycle
+  end
 
-    # And default to the only order cycle if there's only the one
-    if @order_cycles.count == 1
-      current_order(true).set_order_cycle! @order_cycles.first
-    end
+  # Default to the only order cycle if there's only one
+  #
+  # Here we need to use @order_cycles.size not @order_cycles.count
+  #   because OrderCyclesList returns a modified ActiveRecord::Relation
+  #     and these modifications are not seen if it is reloaded with count
+  def set_order_cycle
+    return if @order_cycles.size != 1
+
+    current_order(true).set_order_cycle! @order_cycles.first
   end
 end

app/controllers/checkout_controller.rb

@@ -35,6 +35,8 @@ class CheckoutController < Spree::StoreController
   rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
 
   def edit
+    return handle_redirect_from_stripe if valid_payment_intent_provided?
+
     # This is only required because of spree_paypal_express. If we implement
     # a version of paypal that uses this controller, and more specifically
     # the #update_failed method, then we can remove this call
@@ -51,9 +53,8 @@ class CheckoutController < Spree::StoreController
   rescue Spree::Core::GatewayError => e
     rescue_from_spree_gateway_error(e)
   rescue StandardError => e
-    Bugsnag.notify(e)
     flash[:error] = I18n.t("checkout.failed")
-    update_failed
+    update_failed(e)
   end
 
   # Clears the cached order. Required for #current_order to return a new order
@@ -151,6 +152,23 @@ class CheckoutController < Spree::StoreController
     end
   end
 
+  def valid_payment_intent_provided?
+    params["payment_intent"]&.starts_with?("pi_") &&
+      @order.state == "payment" &&
+      @order.payments.last.state == "pending" &&
+      @order.payments.last.response_code == params["payment_intent"]
+  end
+
+  def handle_redirect_from_stripe
+    if advance_order_state(@order) && order_complete?
+      checkout_succeeded
+      redirect_to(order_path(@order)) && return
+    else
+      flash[:error] = order_error
+      checkout_failed
+    end
+  end
+
   def checkout_workflow(shipping_method_id)
     while @order.state != "complete"
       if @order.state == "payment"
@@ -161,15 +179,15 @@ class CheckoutController < Spree::StoreController
 
       next if advance_order_state(@order)
 
-      flash[:error] = order_workflow_error
       return update_failed
     end
 
-    update_result
+    update_response
   end
 
   def redirect_to_payment_gateway
-    redirect_path = Checkout::PaymentRedirect.new(params).path
+    redirect_path = Checkout::PaypalRedirect.new(params).path
+    redirect_path = Checkout::StripeRedirect.new(params, @order).path if redirect_path.blank?
     return if redirect_path.blank?
 
     render json: { path: redirect_path }, status: :ok
@@ -185,7 +203,7 @@ class CheckoutController < Spree::StoreController
     false
   end
 
-  def order_workflow_error
+  def order_error
     if @order.errors.present?
       @order.errors.full_messages.to_sentence
     else
@@ -193,27 +211,27 @@ class CheckoutController < Spree::StoreController
     end
   end
 
-  def update_result
-    if @order.state == "complete" || @order.completed?
-      save_order_addresses_as_user_default
-      ResetOrderService.new(self, current_order).call
-
-      update_succeeded
+  def update_response
+    if order_complete?
+      checkout_succeeded
+      update_succeeded_response
     else
-      update_failed
+      update_failed(RuntimeError.new("Order not complete after the checkout workflow"))
     end
   end
 
-  def save_order_addresses_as_user_default
-    user_default_address_setter = UserDefaultAddressSetter.new(@order, spree_current_user)
-    user_default_address_setter.set_default_bill_address if params[:order][:default_bill_address]
-    user_default_address_setter.set_default_ship_address if params[:order][:default_ship_address]
+  def order_complete?
+    @order.state == "complete" || @order.completed?
   end
 
-  def update_succeeded
+  def checkout_succeeded
+    Checkout::PostCheckoutActions.new(@order).success(self, params, spree_current_user)
+
     session[:access_token] = current_order.token
     flash[:notice] = t(:order_processed_successfully)
+  end
 
+  def update_succeeded_response
     respond_to do |format|
       format.html do
         respond_with(@order, location: order_path(@order))
@@ -224,10 +242,19 @@ class CheckoutController < Spree::StoreController
     end
   end
 
-  def update_failed
-    current_order.updater.shipping_address_from_distributor
-    RestartCheckout.new(@order).call
+  def update_failed(error = RuntimeError.new(order_error))
+    Bugsnag.notify(error)
 
+    flash[:error] = order_error if flash.empty?
+    checkout_failed
+    update_failed_response
+  end
+
+  def checkout_failed
+    Checkout::PostCheckoutActions.new(@order).failure
+  end
+
+  def update_failed_response
     respond_to do |format|
       format.html do
         render :edit

app/controllers/enterprises_controller.rb

@@ -96,8 +96,8 @@ class EnterprisesController < BaseController
   end
 
   def reset_order_cycle(order, distributor)
-    order_cycle_options = OrderCycle.active.with_distributor(distributor)
-    order.order_cycle = order_cycle_options.first if order_cycle_options.count == 1
+    order_cycles = Shop::OrderCyclesList.new(distributor, current_customer).call
+    order.order_cycle = order_cycles.first if order_cycles.size == 1
   end
 
   def shop_order_cycles

app/controllers/home_controller.rb

@@ -5,12 +5,23 @@ class HomeController < BaseController
 
   def index
     if ContentConfig.home_show_stats
-      @num_distributors = Enterprise.is_distributor.activated.visible.count
-      @num_producers = Enterprise.is_primary_producer.activated.visible.count
-      @num_users = Spree::Order.complete.count('DISTINCT user_id')
-      @num_orders = Spree::Order.complete.count
+      @num_distributors = cached_count('distributors', Enterprise.is_distributor.activated.visible)
+      @num_producers = cached_count('producers', Enterprise.is_primary_producer.activated.visible)
+      @num_orders = cached_count('orders', Spree::Order.complete)
+      @num_users = cached_count(
+        'users', Spree::Order.complete.select('DISTINCT spree_orders.user_id')
+      )
     end
   end
 
   def sell; end
+
+  private
+
+  # Cache the value of the query count for 24 hours
+  def cached_count(key, query)
+    Rails.cache.fetch("home_stats_count_#{key}", expires_in: 1.day, race_condition_ttl: 10) do
+      query.count
+    end
+  end
 end

app/controllers/producers_controller.rb

@@ -8,7 +8,7 @@ class ProducersController < BaseController
       .activated
       .visible
       .is_primary_producer
-      .includes(address: :state)
+      .includes(address: [:state, :country])
       .includes(:properties)
       .includes(supplied_products: :properties)
       .all

app/controllers/shops_controller.rb

@@ -8,7 +8,7 @@ class ShopsController < BaseController
       .activated
       .visible
       .is_distributor
-      .includes(address: :state)
+      .includes(address: [:state, :country])
       .includes(:properties)
       .includes(supplied_products: :properties)
       .all

app/controllers/spree/admin/orders_controller.rb

@@ -109,7 +109,10 @@ module Spree
       private
 
       def load_order
-        @order = Order.find_by_number!(params[:id], include: :adjustments) if params[:id]
+        if params[:id]
+          @order = Order.includes(:adjustments, :shipments, line_items: :adjustments).
+            find_by_number!(params[:id])
+        end
         authorize! action, @order
       end
 
@@ -128,7 +131,7 @@ module Spree
       def load_distribution_choices
         @shops = Enterprise.is_distributor.managed_by(spree_current_user).by_name
 
-        ocs = OrderCycle.managed_by(spree_current_user)
+        ocs = OrderCycle.includes(:suppliers, :distributors).managed_by(spree_current_user)
         @order_cycles = ocs.soonest_closing +
                         ocs.soonest_opening +
                         ocs.closed +

app/controllers/spree/admin/reports_controller.rb

@@ -217,11 +217,7 @@ module Spree
       end
 
       def render_report(header, table, create_csv, csv_file_name)
-        if create_csv
-          @csv_report = csv_report(header, table)
-          send_data @csv_report, filename: csv_file_name
-        end
-
+        send_data csv_report(header, table), filename: csv_file_name if create_csv
         @header = header
         @table = table
         # Rendering HTML is the default.

app/controllers/spree/admin/variants_controller.rb

@@ -59,7 +59,7 @@ module Spree
         @collection ||= if @deleted.blank?
                           super
                         else
-                          Variant.where(product_id: parent.id).deleted
+                          Variant.unscoped.where(product_id: parent.id).deleted
                         end
         @collection
       end

app/controllers/spree/credit_cards_controller.rb

@@ -59,6 +59,7 @@ module Spree
     # It destroys the whole customer object
     def destroy_at_stripe
       stripe_customer = Stripe::Customer.retrieve(@credit_card.gateway_customer_profile_id, {})
+
       stripe_customer.delete if stripe_customer
     end
 

app/helpers/application_helper.rb

@@ -1,6 +1,4 @@
 module ApplicationHelper
-  include FoundationRailsHelper::FlashHelper
-
   def feature?(feature)
     OpenFoodNetwork::FeatureToggle.enabled? feature
   end

app/helpers/injection_helper.rb

@@ -3,10 +3,10 @@ require 'open_food_network/enterprise_injection_data'
 module InjectionHelper
   include SerializerHelper
 
-  def inject_enterprises(enterprises = Enterprise.activated.includes(address: :state).all)
+  def inject_enterprises(enterprises = nil)
     inject_json_ams(
       "enterprises",
-      enterprises,
+      enterprises || default_enterprise_query,
       Api::EnterpriseSerializer,
       enterprise_injection_data
     )
@@ -17,7 +17,10 @@ module InjectionHelper
 
     inject_json_ams(
       "groups",
-      EnterpriseGroup.on_front_page.by_position.select(select_only).includes(address: :state).all,
+      EnterpriseGroup.on_front_page.by_position.select(select_only).
+        includes(enterprises: [:shipping_methods, { address: [:state, :country] }],
+                 address: :state).
+        all,
       Api::GroupListSerializer
     )
   end
@@ -35,13 +38,21 @@ module InjectionHelper
 
     inject_json_ams(
       "enterprises",
-      Enterprise.activated.visible.select(select_only).includes(address: :state).all,
+      Enterprise.activated.visible.select(select_only).includes(address: [:state, :country]).all,
       Api::EnterpriseShopfrontListSerializer
     )
   end
 
   def inject_enterprise_and_relatives
-    inject_json_ams "enterprises", current_distributor.relatives_including_self.activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data
+    enterprises_and_relatives = current_distributor.
+      relatives_including_self.
+      activated.
+      includes(address: [:state, :country]).
+      all
+
+    inject_json_ams "enterprises",
+                    enterprises_and_relatives,
+                    Api::EnterpriseSerializer, enterprise_injection_data
   end
 
   def inject_group_enterprises
@@ -138,6 +149,10 @@ module InjectionHelper
 
   private
 
+  def default_enterprise_query
+    Enterprise.activated.includes(address: [:state, :country]).all
+  end
+
   def enterprise_injection_data
     @enterprise_injection_data ||= OpenFoodNetwork::EnterpriseInjectionData.new
     { data: @enterprise_injection_data }

app/helpers/order_cycles_helper.rb

@@ -47,17 +47,6 @@ module OrderCyclesHelper
     end
   end
 
-  def order_cycle_options
-    @order_cycles.
-      with_distributor(current_distributor).
-      map { |oc| [order_cycle_close_to_s(oc.orders_close_at), oc.id] }
-  end
-
-  def order_cycle_close_to_s(orders_close_at)
-    "%s (%s)" % [orders_close_at.strftime("#{orders_close_at.day.ordinalize} %b"),
-                 distance_of_time_in_words_to_now(orders_close_at)]
-  end
-
   def active_order_cycle_for_distributor?(_distributor)
     OrderCycle.active.with_distributor(@distributor).present?
   end

app/helpers/shared_helper.rb

@@ -16,4 +16,8 @@ module SharedHelper
   def admin_user?
     spree_current_user.andand.has_spree_role? 'admin'
   end
+
+  def current_shop_products_path
+    "#{main_app.enterprise_shop_path(current_distributor)}#/shop"
+  end
 end

app/helpers/shop_helper.rb

@@ -8,6 +8,10 @@ module ShopHelper
     end
   end
 
+  def oc_select_options
+    @order_cycles.map { |oc| { time: pickup_time(oc), id: oc.id } }
+  end
+
   def require_customer?
     current_distributor.require_login? && !user_is_related_to_distributor?
   end
@@ -31,6 +35,10 @@ module ShopHelper
     ].select{ |tab| tab[:show] }
   end
 
+  def shop_tab_names
+    shop_tabs.map { |tab| tab[:name] }
+  end
+
   def show_home_tab?
     require_customer? || current_distributor.preferred_shopfront_message.present?
   end

app/helpers/spree/base_helper_decorator.rb

@@ -5,5 +5,21 @@ module Spree
     def variant_options(v, _options = {})
       v.options_text
     end
+
+    # Overriden to eager-load :states
+    def available_countries
+      checkout_zone = Zone.find_by_name(Spree::Config[:checkout_zone])
+
+      countries = if checkout_zone && checkout_zone.kind == 'country'
+                    checkout_zone.country_list
+                  else
+                    Country.includes(:states).all
+                  end
+
+      countries.collect do |country|
+        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
+        country
+      end.sort { |a, b| a.name <=> b.name }
+    end
   end
 end

app/models/calculator/weight.rb

@@ -54,6 +54,8 @@ module Calculator
     #    Customer ends up getting 350mL (line_item.final_weight_volume) of wine
     #      that represent 2.8 (quantity_implied_in_final_weight_volume) glasses of wine
     def quantity_implied_in_final_weight_volume(line_item)
+      return line_item.quantity if line_item.variant.unit_value.to_f.zero?
+
       (1.0 * line_item.final_weight_volume / line_item.variant.unit_value).round(3)
     end
 

app/models/product_import/entry_processor.rb

@@ -74,7 +74,7 @@ module ProductImport
       if settings.importing_into_inventory?
         InventoryResetStrategy
       else
-        ProductsResetStrategy
+        Catalog::ProductImport::ProductsResetStrategy
       end
     end
 

app/models/product_import/products_reset_strategy.rb

@@ -1,45 +0,0 @@
-module ProductImport
-  class ProductsResetStrategy
-    def initialize(excluded_items_ids)
-      @excluded_items_ids = excluded_items_ids
-    end
-
-    def reset(enterprise_ids)
-      @enterprise_ids = enterprise_ids
-
-      return 0 if enterprise_ids.blank?
-
-      reset_variants_on_hand(enterprise_variants_relation)
-    end
-
-    private
-
-    attr_reader :excluded_items_ids, :enterprise_ids
-
-    def enterprise_variants_relation
-      relation = Spree::Variant
-        .joins(:product)
-        .where(
-          spree_products: { supplier_id: enterprise_ids },
-          spree_variants: { is_master: false, deleted_at: nil }
-        )
-
-      return relation if excluded_items_ids.blank?
-
-      relation.where('spree_variants.id NOT IN (?)', excluded_items_ids)
-    end
-
-    def reset_variants_on_hand(variants)
-      updated_records_count = 0
-      variants.each do |variant|
-        updated_records_count += 1 if reset_variant_on_hand(variant)
-      end
-      updated_records_count
-    end
-
-    def reset_variant_on_hand(variant)
-      variant.on_hand = 0
-      variant.on_hand.zero?
-    end
-  end
-end

app/models/spree/calculator/per_item_decorator.rb

@@ -13,14 +13,15 @@ module Spree
     def compute(object = nil)
       return 0 if object.nil?
 
-      preferred_amount * line_items_for(object).reduce(0) do |sum, value|
-        value_to_add = if matching_products.blank? || matching_products.include?(value.product)
-                         value.quantity
+      number_of_line_items = line_items_for(object).reduce(0) do |sum, line_item|
+        value_to_add = if matching_products.blank? || matching_products.include?(line_item.product)
+                         line_item.quantity
                        else
                          0
                        end
         sum + value_to_add
       end
+      preferred_amount * number_of_line_items
     end
   end
 end

app/models/spree/gateway/stripe_sca.rb

@@ -2,6 +2,8 @@
 
 require 'stripe/profile_storer'
 require 'stripe/credit_card_cloner'
+require 'stripe/authorize_response_patcher'
+require 'stripe/payment_intent_validator'
 require 'active_merchant/billing/gateways/stripe_payment_intents'
 require 'active_merchant/billing/gateways/stripe_decorator'
 
@@ -32,9 +34,26 @@ module Spree
 
       # NOTE: the name of this method is determined by Spree::Payment::Processing
       def purchase(money, creditcard, gateway_options)
-        provider.purchase(*options_for_purchase_or_auth(money, creditcard, gateway_options))
+        begin
+          payment_intent_id = fetch_payment_intent(creditcard, gateway_options)
+        rescue Stripe::StripeError => e
+          return failed_activemerchant_billing_response(e.message)
+        end
+
+        options = basic_options(gateway_options)
+        options[:customer] = creditcard.gateway_customer_profile_id
+        provider.capture(money, payment_intent_id, options)
+      rescue Stripe::StripeError => e
+        failed_activemerchant_billing_response(e.message)
+      end
+
+      # NOTE: the name of this method is determined by Spree::Payment::Processing
+      def authorize(money, creditcard, gateway_options)
+        authorize_response = provider.authorize(*options_for_authorize(money,
+                                                                       creditcard,
+                                                                       gateway_options))
+        Stripe::AuthorizeResponsePatcher.new(authorize_response).call!
       rescue Stripe::StripeError => e
-        # This will be an error caused by generating a stripe token
         failed_activemerchant_billing_response(e.message)
       end
 
@@ -65,11 +84,17 @@ module Spree
         options.merge(login: Stripe.api_key)
       end
 
-      def options_for_purchase_or_auth(money, creditcard, gateway_options)
+      def basic_options(gateway_options)
         options = {}
         options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
         options[:currency] = gateway_options[:currency]
         options[:stripe_account] = stripe_account_id
+        options
+      end
+
+      def options_for_authorize(money, creditcard, gateway_options)
+        options = basic_options(gateway_options)
+        options[:return_url] = full_checkout_path
 
         customer_id, payment_method_id = Stripe::CreditCardCloner.new.clone(creditcard,
                                                                             stripe_account_id)
@@ -77,6 +102,19 @@ module Spree
         [money, payment_method_id, options]
       end
 
+      def fetch_payment_intent(creditcard, gateway_options)
+        payment = fetch_payment(creditcard, gateway_options)
+        raise Stripe::StripeError, I18n.t(:no_pending_payments) unless payment&.response_code
+
+        Stripe::PaymentIntentValidator.new.call(payment.response_code, stripe_account_id)
+      end
+
+      def fetch_payment(creditcard, gateway_options)
+        order_number = gateway_options[:order_id].split('-').first
+
+        Spree::Order.find_by_number(order_number).payments.merge(creditcard.payments).last
+      end
+
       def failed_activemerchant_billing_response(error_message)
         ActiveMerchant::Billing::Response.new(false, error_message)
       end
@@ -86,6 +124,16 @@ module Spree
 
         errors.add(:stripe_account_owner, I18n.t(:error_required))
       end
+
+      def full_checkout_path
+        URI.join(url_helpers.root_url, url_helpers.checkout_path).to_s
+      end
+
+      def url_helpers
+        # This is how we can get the helpers with a usable root_url outside the controllers
+        Rails.application.routes.default_url_options = ActionMailer::Base.default_url_options
+        Rails.application.routes.url_helpers
+      end
     end
   end
 end

app/models/spree/line_item_decorator.rb

@@ -36,6 +36,10 @@ Spree::LineItem.class_eval do
     end
   }
 
+  scope :in_orders, lambda { |orders|
+    where(order_id: orders)
+  }
+
   # Find line items that are from order sorted by variant name and unit value
   scope :sorted_by_name_and_unit_value, -> {
     joins(variant: :product).

app/models/spree/order_decorator.rb

@@ -77,10 +77,6 @@ Spree::Order.class_eval do
       joins('LEFT OUTER JOIN spree_products ON (spree_products.id = spree_variants.product_id)')
   }
 
-  scope :with_line_items_variants_and_products, lambda {
-    joins(line_items: { variant: :product })
-  }
-
   scope :not_state, lambda { |state|
     where("state != ?", state)
   }
@@ -121,6 +117,12 @@ Spree::Order.class_eval do
     end
   end
 
+  # "Checkout" is the initial state and, for card payments, "pending" is the state after authorization
+  # These are both valid states to process the payment
+  def pending_payments
+    (payments.select(&:pending?) + payments.select(&:processing?) + payments.select(&:checkout?)).uniq
+  end
+
   def remove_variant(variant)
     line_items(:reload)
     current_item = find_line_item_by_variant(variant)

app/models/spree/product_set.rb

@@ -1,6 +1,6 @@
 class Spree::ProductSet < ModelSet
   def initialize(attributes = {})
-    super(Spree::Product, [], attributes, proc { |attrs| attrs[:product_id].blank? })
+    super(Spree::Product, [], attributes)
   end
 
   def save
@@ -34,11 +34,9 @@ class Spree::ProductSet < ModelSet
     split_taxon_ids!(attributes)
 
     product = find_model(@collection, attributes[:id])
-    if product.nil?
-      @klass.new(attributes).save unless @reject_if.andand.call(attributes)
-    else
-      update_product(product, attributes)
-    end
+    return if product.nil?
+
+    update_product(product, attributes)
   end
 
   def split_taxon_ids!(attributes)

app/models/stock/package.rb

@@ -24,8 +24,10 @@ module Stock
     #
     # @return [Array<Spree::ShippingMethod>]
     def shipping_methods
-      super.delete_if do |shipping_method|
-        !ships_with?(order.distributor, shipping_method)
+      available_shipping_methods = super.to_a
+
+      available_shipping_methods.keep_if do |shipping_method|
+        ships_with?(order.distributor.shipping_methods.to_a, shipping_method)
       end
     end
 
@@ -33,11 +35,11 @@ module Stock
 
     # Checks whether the given distributor provides the specified shipping method
     #
-    # @param distributor [Spree::Enterprise]
+    # @param shipping_methods [Array<Spree::ShippingMethod>]
     # @param shipping_method [Spree::ShippingMethod]
     # @return [Boolean]
-    def ships_with?(distributor, shipping_method)
-      distributor.shipping_methods.include?(shipping_method)
+    def ships_with?(shipping_methods, shipping_method)
+      shipping_methods.include?(shipping_method)
     end
   end
 end

app/serializers/api/cached_enterprise_serializer.rb

@@ -107,7 +107,7 @@ module Api
     end
 
     def active
-      data.active_distributors.andand.include? enterprise
+      data.active_distributor_ids.andand.include? enterprise.id
     end
 
     # Map svg icons.

app/serializers/api/uncached_enterprise_serializer.rb

@@ -9,7 +9,7 @@ module Api
     end
 
     def active
-      options[:data].active_distributors.andand.include? object
+      options[:data].active_distributor_ids.andand.include? object.id
     end
   end
 end

app/services/checkout/paypal_redirect.rb

@@ -2,7 +2,7 @@
 
 # Provides the redirect path if a redirect to the payment gateway is needed
 module Checkout
-  class PaymentRedirect
+  class PaypalRedirect
     def initialize(params)
       @params = params
     end

app/services/checkout/post_checkout_actions.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Executes actions after checkout
+module Checkout
+  class PostCheckoutActions
+    def initialize(order)
+      @order = order
+    end
+
+    def success(controller, params, current_user)
+      save_order_addresses_as_user_default(params, current_user)
+      ResetOrderService.new(controller, @order).call
+    end
+
+    def failure
+      @order.updater.shipping_address_from_distributor
+      RestartCheckout.new(@order).call
+    end
+
+    private
+
+    def save_order_addresses_as_user_default(params, current_user)
+      return unless params[:order]
+
+      user_default_address_setter = UserDefaultAddressSetter.new(@order, current_user)
+      user_default_address_setter.set_default_bill_address if params[:order][:default_bill_address]
+      user_default_address_setter.set_default_ship_address if params[:order][:default_ship_address]
+    end
+  end
+end

app/services/checkout/stripe_redirect.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Provides the redirect path if a redirect to the payment gateway is needed
+module Checkout
+  class StripeRedirect
+    def initialize(params, order)
+      @params = params
+      @order = order
+    end
+
+    # Returns the path to the authentication form if a redirect is needed
+    def path
+      return unless stripe_payment_method?
+
+      payment = @order.pending_payments.last
+      return unless payment&.checkout?
+
+      payment.authorize!
+      raise unless payment.pending?
+
+      field_with_url(payment) if url?(field_with_url(payment))
+    end
+
+    private
+
+    def stripe_payment_method?
+      return unless @params[:order][:payments_attributes]
+
+      payment_method_id = @params[:order][:payments_attributes].first[:payment_method_id]
+      payment_method = Spree::PaymentMethod.find(payment_method_id)
+      payment_method.is_a?(Spree::Gateway::StripeSCA)
+    end
+
+    def url?(string)
+      return false if string.blank?
+
+      string.starts_with?("http")
+    end
+
+    # Stripe::AuthorizeResponsePatcher patches the Stripe authorization response
+    #   so that this field stores the redirect URL
+    def field_with_url(payment)
+      payment.cvv_response_message
+    end
+  end
+end

app/services/permissions/order.rb

@@ -2,24 +2,28 @@ require 'open_food_network/permissions'
 
 module Permissions
   class Order
-    def initialize(user)
+    def initialize(user, search_params = nil)
       @user = user
       @permissions = OpenFoodNetwork::Permissions.new(@user)
+      @search_params = search_params
     end
 
     # Find orders that the user can see
     def visible_orders
-      Spree::Order.
-        with_line_items_variants_and_products.
+      orders = Spree::Order.
+        with_line_items_variants_and_products_outer.
         where(visible_orders_where_values)
+
+      filtered_orders(orders)
     end
 
     # Any orders that the user can edit
     def editable_orders
-      Spree::Order.where(
-        managed_orders_where_values.
-          or(coordinated_orders_where_values)
-      )
+      orders = Spree::Order.
+        where(managed_orders_where_values.
+          or(coordinated_orders_where_values))
+
+      filtered_orders(orders)
     end
 
     def visible_line_items
@@ -35,6 +39,18 @@ module Permissions
 
     private
 
+    attr_reader :search_params
+
+    def filtered_orders(orders)
+      return orders unless filter_orders?
+
+      orders.complete.not_state(:canceled).search(search_params).result
+    end
+
+    def filter_orders?
+      search_params.present?
+    end
+
     def visible_orders_where_values
       # Grouping keeps the 2 where clauses from produced_orders_where_values inside parentheses
       #   This way it makes the OR work between the 3 types of orders:

app/services/shop/order_cycles_list.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Lists available order cycles for a given customer in a given distributor
+module Shop
+  class OrderCyclesList
+    def initialize(distributor, customer)
+      @distributor = distributor
+      @customer = customer
+    end
+
+    def call
+      order_cycles = OrderCycle.with_distributor(@distributor).active
+        .order(@distributor.preferred_shopfront_order_cycle_order)
+
+      apply_tag_rules!(order_cycles)
+    end
+
+    private
+
+    # order_cycles is a ActiveRecord::Relation that is modified with reject in the TagRuleApplicator
+    # If this relation is reloaded (for example by calling count on it), the modifications are lost
+    def apply_tag_rules!(order_cycles)
+      applicator = OpenFoodNetwork::TagRuleApplicator.new(@distributor,
+                                                          "FilterOrderCycles",
+                                                          @customer.andand.tag_list)
+      applicator.filter!(order_cycles)
+
+      order_cycles
+    end
+  end
+end

app/services/variants_stock_levels.rb

@@ -1,45 +1,46 @@
 # Report the stock levels of:
 #   - all variants in the order
 #   - all requested variant ids
+require 'open_food_network/scope_variant_to_hub'
+
 class VariantsStockLevels
   def call(order, requested_variant_ids)
     variant_stock_levels = variant_stock_levels(order.line_items)
 
-    # Variants are not scoped here and so the stock levels reported are incorrect
-    # See cart_controller_spec for more details and #3222
     order_variant_ids = variant_stock_levels.keys
     missing_variant_ids = requested_variant_ids - order_variant_ids
     missing_variant_ids.each do |variant_id|
-      variant = Spree::Variant.find(variant_id)
+      variant = scoped_variant(order.distributor, Spree::Variant.find(variant_id))
       variant_stock_levels[variant_id] = { quantity: 0, max_quantity: 0, on_hand: variant.on_hand, on_demand: variant.on_demand }
     end
 
-    # The code above is most probably dead code, this bugsnag notification will confirm it
-    notify_bugsnag(order, requested_variant_ids, order_variant_ids) if missing_variant_ids.present?
-
     variant_stock_levels
   end
 
   private
 
-  def notify_bugsnag(order, requested_variant_ids, order_variant_ids)
-    error_msg = "VariantsStockLevels.call with variants in the request that are not in the order"
-    Bugsnag.notify(RuntimeError.new(error_msg),
-                   requested_variant_ids: requested_variant_ids.as_json,
-                   order_variant_ids: order_variant_ids.as_json,
-                   order: order.as_json,
-                   line_items: order.line_items.as_json)
-  end
-
   def variant_stock_levels(line_items)
     Hash[
       line_items.map do |line_item|
-        [line_item.variant.id,
+        variant = scoped_variant(line_item.order.distributor, line_item.variant)
+
+        [variant.id,
          { quantity: line_item.quantity,
            max_quantity: line_item.max_quantity,
-           on_hand: line_item.variant.on_hand,
-           on_demand: line_item.variant.on_demand }]
+           on_hand: variant.on_hand,
+           on_demand: variant.on_demand }]
       end
     ]
   end
+
+  def scoped_variant(distributor, variant)
+    return variant if distributor.blank?
+
+    scoper(distributor).scope(variant)
+    variant
+  end
+
+  def scoper(distributor)
+    @scoper ||= OpenFoodNetwork::ScopeVariantToHub.new(distributor)
+  end
 end

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

@@ -3,7 +3,7 @@
     .three.columns.alpha
       = f.label "enterprise_preferred_shopfront_message", t('.shopfront_message')
     .eight.columns.omega
-      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_message', 'id' => 'enterprise_preferred_shopfront_message', 'name' => 'enterprise[preferred_shopfront_message]', 'class' => 'text-angular', "textangular-links-target-blank" => true,
+      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_message', 'id' => 'enterprise_preferred_shopfront_message', 'name' => 'enterprise[preferred_shopfront_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true,
         'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]",
         'placeholder' => t('.shopfront_message_placeholder')}
 .row
@@ -11,7 +11,7 @@
     .three.columns.alpha
       = f.label "enterprise_preferred_shopfront_closed_message", t('.shopfront_closed_message')
     .eight.columns.omega
-      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_closed_message', 'id' => 'enterprise_preferred_shopfront_closed_message', 'name' => 'enterprise[preferred_shopfront_closed_message]', 'class' => 'text-angular', "textangular-links-target-blank" => true,
+      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_closed_message', 'id' => 'enterprise_preferred_shopfront_closed_message', 'name' => 'enterprise[preferred_shopfront_closed_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true,
         'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]",
         'placeholder' => t('.shopfront_closed_message_placeholder')}
 .row

app/views/checkout/_form.html.haml

@@ -3,7 +3,7 @@
   = inject_available_payment_methods
   = inject_saved_credit_cards
 
-= f_form_for current_order,
+= form_for current_order,
   html: {name: "checkout",
     id: "checkout_form",
     novalidate: true,

app/views/checkout/_shipping.html.haml

@@ -52,7 +52,8 @@
 
       .row
         .small-12.columns
-          = f.text_area :special_instructions, label: t(:checkout_instructions), size: "60x4", "ng-model" => "order.special_instructions"
+          %label{ for: 'order_special_instructions'}= t(:checkout_instructions)
+          = f.text_area :special_instructions, size: "60x4", "ng-model" => "order.special_instructions"
 
       .row
         .small-12.columns.text-right

app/views/checkout/edit.html.haml

@@ -7,7 +7,6 @@
 
 .darkswarm.footer-pad
   - content_for :order_cycle_form do
-
     %closing
       = t :checkout_now
     %p
@@ -15,16 +14,23 @@
       %strong
         = pickup_time current_order_cycle
 
+  - content_for :ordercycle_sidebar do
+    .show-for-large-up.large-4.columns
+      = render partial: "shopping_shared/order_cycles"
+
   = render partial: "shopping_shared/header"
 
+  .sub-header.show-for-medium-down
+    = render partial: "shopping_shared/order_cycles"
+
   %accordion{"close-others" => "false"}
     %checkout.row{"ng-controller" => "CheckoutCtrl"}
-      .small-12.medium-8.large-9.columns
+      .small-12.medium-8.columns
         - unless spree_current_user
           = render partial: "checkout/authentication"
         %div{"ng-show" => "enabled", "ng-controller" => "AccordionCtrl"}
           = render partial: "checkout/form"
-      .small-12.medium-4.large-3.columns
+      .small-12.medium-4.columns
         = render partial: "checkout/summary"
 
 

app/views/enterprises/shop.html.haml

@@ -19,22 +19,28 @@
   - content_for :order_cycle_form do
 
     %div{"ng-controller" => "OrderCycleChangeCtrl", "ng-cloak" => true}
-      %closing{"ng-if" => "OrderCycle.selected()"}
-        = t :enterprises_next_closing
-        %strong {{ OrderCycle.orders_close_at() | date_in_words }}
+      %closing
+        %div{"ng-if" => "OrderCycle.selected()"}
+          = t :enterprises_next_closing
+          %strong {{ OrderCycle.orders_close_at() | date_in_words }}
+        %div{"ng-if" => "!OrderCycle.selected()"}
+          = t :enterprises_choose
 
-      %span
-        = t :enterprises_ready_for
+      .order-cycle-select
+        .select-label
+          %span= t :enterprises_ready_for
 
-      / Will this label should be a variable to reflect 'Ready for pickup / delivery' as appropriate
-
-      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id",
-              "ofn-change-order-cycle" => true,
-              "disabled" => require_customer?,
-              "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}",
-              "popover-placement" => "left", "popover" => t(:enterprises_choose), "popover-trigger" => "openTrigger"}
+        %select.select2.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id",
+          "ofn-change-order-cycle" => true,
+          "disabled" => require_customer?,
+          "ng-options" => "oc.id as oc.time for oc in #{oc_select_options.to_json}"}
 
+          - if oc_select_options.count > 1
+            %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select
 
+  - content_for :ordercycle_sidebar do
+    .show-for-large-up.large-4.columns
+      = render partial: "shopping_shared/order_cycles"
 
   = render partial: "shopping_shared/header"
   = render partial: "shopping_shared/tabs"

app/views/groups/show.html.haml

@@ -34,10 +34,10 @@
                 select: "select(\'map\')"}
               .map-container
                 %map{"ng-if" => "(isActive(\'/map\') && (mapShowed = true)) || mapShowed"}
-                  %google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
+                  %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
                     %map-osm-tiles
                     %map-search
-                    %markers{models: "mapMarkers", fit: "true",
+                    %ui-gmap-markers{models: "mapMarkers", fit: "true",
                     coords: "'self'", icon: "'icon'", click: "'reveal'"}
 
             %tab{heading: t(:groups_about),

app/views/home/_login.html.haml

@@ -1,19 +0,0 @@
-.row
-  .large-12.large-centered.columns
-    %h2
-      = t :label_login
-= form_for Spree::User.new, :remote => true, :html => {'data-type' => :json}, :as => :spree_user, :url => spree.spree_user_session_path do |f|
-  #password-credentials
-    #login-error-alert.alert-box.alert.hide
-      = t :login_invalid
-    %p
-      = f.label :email, t(:email)
-      = f.email_field :email, :class => 'title', :tabindex => 1, :id => "login_spree_user_email"
-    %p
-      = f.label :password, t(:password)
-      = f.password_field :password, :class => 'title', :tabindex => 2, :id => "login_spree_user_password"
-    %p
-      %label
-        = f.check_box :remember_me
-        = f.label :remember_me, t(:remember_me)
-    %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me"

app/views/home/_signup.html.haml

@@ -1,18 +0,0 @@
-.row
-  .large-12.large-centered.columns
-    %h2
-      = t :label_signup
-= form_for Spree::User.new, :as => :spree_user, :url => spree.spree_user_registration_path(@spree_user) do |f|
-  %p
-    = f.label :email, t(:email)
-    = f.email_field :email, :class => 'title', :id => "signup_spree_user_email"
-
-  #password-credentials
-    %p
-      = f.label :password, t(:password)
-      = f.password_field :password, :class => 'title', :id => "signup_spree_user_password"
-    %p
-      = f.label :password_confirmation, t(:confirm_password)
-      = f.password_field :password_confirmation, :class => 'title', :id => "signup_spree_user_password_confirmation"
-
-  = f.submit t(:create), :class => 'button'

app/views/layouts/_bugsnag_js.html.haml

@@ -0,0 +1,10 @@
+- bugsnag_js_key = ENV['BUGSNAG_JS_KEY'] || ENV['BUGSNAG_API_KEY']
+- if bugsnag_js_key.present?
+  %script{src: "//d2wy8f7a9ursnm.cloudfront.net/v6/bugsnag.min.js"}
+  :javascript
+    window.bugsnagClient = bugsnag({
+      apiKey: "#{bugsnag_js_key}",
+      beforeSend: function (report) {
+        report.app.releaseStage = "#{Rails.env}"
+      }
+    });

app/views/layouts/darkswarm.html.haml

@@ -37,6 +37,7 @@
           #footer
     %loading
 
+    = render "layouts/bugsnag_js"
     %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
     %script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
     = javascript_include_tag "darkswarm/all"

app/views/map/index.html.haml

@@ -6,10 +6,10 @@
 
 .map-container{"fill-vertical" => true}
   %map{"ng-controller" => "MapCtrl"}
-    %google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
+    %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
       %map-osm-tiles
       %map-search
-      %markers{models: "OfnMap.enterprises", fit: "true",
+      %ui-gmap-markers{models: "OfnMap.enterprises", fit: "true",
       coords: "'self'", icon: "'icon'", click: "'reveal'"}
 
 .map-footer

app/views/registration/steps/_finished.html.haml

@@ -9,4 +9,4 @@
             %p= t(".login")
     .row
       .small-12.columns.text-center
-        %a.button.primary{ type: "button", href: "/" }= "#{t(".action")} >"
+        %a.button.primary{ type: "button", href: spree.admin_dashboard_path }= t(".action")

app/views/shopping_shared/_header.html.haml

@@ -2,14 +2,12 @@
 
 %navigation
   %distributor.details.row
-    .small-12.medium-6.large-6.columns
+    .small-12.medium-12.large-8.columns
       #distributor_title
         - if distributor.logo?
           %img.left{src: distributor.logo.url(:thumb)}
         %h3
           = distributor.name
         %location= distributor.address.city
-        / Will this needs to be a drop-down to choose either pick-up point or delivery once shipping methods are implemented
 
-    .small-12.medium-6.large-6.columns
-      = render partial: "shopping_shared/order_cycles"
+    = yield :ordercycle_sidebar

app/views/shopping_shared/_last_order_cycle.html.haml

@@ -1,2 +1,4 @@
 - if most_recently_closed = OrderCycle.most_recently_closed_for(@distributor)
+  (
   = t :shopping_oc_last_closed, distance_of_time: distance_of_time_in_words_to_now(most_recently_closed.orders_close_at)
+  )

app/views/shopping_shared/_next_order_cycle.html.haml

@@ -1,2 +1,4 @@
 - if next_oc = OrderCycle.first_opening_for(@distributor)
+  (
   = t :shopping_oc_next_open, distance_of_time: distance_of_time_in_words_to_now(next_oc.orders_open_at)
+  )

app/views/shopping_shared/_order_cycles.html.haml

@@ -1,8 +1,8 @@
 - content_for :injection_data do
   = inject_current_order_cycle
 
-%ordercycle{"ng-controller" => "OrderCycleCtrl"}
-
-  - unless no_open_order_cycles?
+- unless no_open_order_cycles?
+  %ordercycle{"ng-controller" => "OrderCycleCtrl", "ng-cloak" => true,
+    "ng-class" => "{'requires-selection': !OrderCycle.selected()}"}
     %form.custom
       = yield :order_cycle_form

app/views/shopping_shared/_tabs.html.haml

@@ -3,11 +3,12 @@
   - shop_tabs.each do |tab|
     = render "shopping_shared/tabs/#{tab[:name]}"
 
-  .tabset-ctrl#shop-tabs{ navigate: 'true', alwaysopen: 'true', selected: shop_tabs.first[:name], prefix: 'shop', ng: { cloak: true } }
+  #shop-tabs{ ng: { controller: "PageSelectionCtrl", init: "whitelistPages(#{shop_tab_names.to_json})", cloak: true } }
     .tab-buttons
       .row
-        - shop_tabs.each do |tab|
-          .tab{ id: "tab_#{tab[:name]}", name: tab[:name] }
-            %a{ href: 'javascript:void(0)' }=tab[:title]
+        .columns.small-12.large-8
+          - shop_tabs.each do |tab|
+            .page{ "ng-class" => "{ selected: selectedPage() == '#{tab[:name]}' }" }
+              %a{ href: "##{tab[:name]}" }=tab[:title]
 
-    .tab-view
+    .page-view{ ng: {include: "'shop/' + selectedPage() + '.html'" } }

app/views/shopping_shared/tabs/_contact.html.haml

@@ -6,7 +6,7 @@
           %div.center
             .header
               = t :shopping_contact_address
-            %strong=current_distributor.name
+            %span= current_distributor.name
             %p
               = current_distributor.address.address1
               - unless current_distributor.address.address2.blank?
@@ -44,22 +44,19 @@
               - if current_distributor.twitter.present?
                 %span
                   %a{href: "http://twitter.com/#{current_distributor.twitter}", target: "_blank" }
-                    %i.ofn-i_041-twitter
+                    %i.twitter.ofn-i_041-twitter
 
               - if current_distributor.facebook.present?
                 %span
                   %a{href: "http://#{current_distributor.facebook}", target: "_blank" }
-                    %i.ofn-i_044-facebook
-                    / = current_distributor.facebook
+                    %i.facebook.ofn-i_044-facebook
 
               - if current_distributor.linkedin.present?
                 %span
                   %a{href: "http://#{current_distributor.linkedin}", target: "_blank" }
-                    %i.ofn-i_042-linkedin
-                    / = current_distributor.linkedin
+                    %i.linkedin.ofn-i_042-linkedin
 
               - if current_distributor.instagram.present?
                 %span
                   %a{href: "http://instagram.com/#{current_distributor.instagram}", target: "_blank" }
-                    %i.ofn-i_043-instagram
-                    / = current_distributor.instagram
+                    %i.instagram.ofn-i_043-instagram

app/views/shopping_shared/tabs/_groups.html.haml

@@ -1,12 +1,12 @@
 %script{ type: "text/ng-template", id: "shop/groups.html" }
   .content
     .row
-      .small-12.large-4.columns
+      .small-12.columns
         - if current_distributor.groups.length > 0
           %h5
             =current_distributor.name
             = t :shopping_groups_part_of
-          %ul.bullet-list
+          %ul.bullet-list.small-block-grid-1.medium-block-grid-2.large-block-grid-3
             - for group in current_distributor.groups
               %li
                 %a{href: main_app.groups_path + "/#{group.permalink}"}

app/views/shopping_shared/tabs/_home.html.haml

@@ -1,3 +1,6 @@
 %script{ type: "text/ng-template", id: "shop/home.html" }
+  .order-cycle-bar.hide-for-large-up
+    = render partial: "shopping_shared/order_cycles"
+
   .content
     = render partial: 'shop/messages'

app/views/shopping_shared/tabs/_producers.html.haml

@@ -4,7 +4,7 @@
       .small-12.columns
         %h5
           = t :shopping_producers_of_hub, hub: '{{ shopfront.name }}'
-        %ul.small-block-grid-2.large-block-grid-4
+        %ul.small-block-grid-1.medium-block-grid-2.large-block-grid-3
           %li{"ng-repeat" => "enterprise in shopfront.producers"}
             %enterprise-modal
               %i.ofn-i_036-producers

app/views/shopping_shared/tabs/_shop.html.haml

@@ -1,4 +1,7 @@
 %script{ type: "text/ng-template", id: "shop/shop.html" }
+  .order-cycle-bar.hide-for-large-up
+    = render partial: "shopping_shared/order_cycles"
+
   .row
     .small-12.columns
       - if no_open_order_cycles?
@@ -8,10 +11,8 @@
             = t :shopping_oc_closed
             %small
               %em
-                (
                 = render partial: "shopping_shared/next_order_cycle"
                 = render partial: "shopping_shared/last_order_cycle"
-                )
           %p
             = t :shopping_oc_closed_description
 

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

@@ -20,28 +20,28 @@
       %label{ :for => 'start_date_filter' }
         = t("admin.start_date")
       %br
-      %input{ :class => "two columns alpha", :type => "text", :id => 'start_date_filter', 'ng-model' => 'startDate', 'datepicker' => "startDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()' }
+      %input{ :class => "two columns alpha", :type => "text", :id => 'start_date_filter', 'ng-model' => 'startDate', 'datepicker' => "startDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' }
     .date_filter{ :class => "two columns" }
       %label{ :for => 'end_date_filter' }
         = t("admin.end_date")
       %br
-      %input{ :class => "two columns alpha", :type => "text", :id => 'end_date_filter', 'ng-model' => 'endDate', 'datepicker' => "endDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()' }
+      %input{ :class => "two columns alpha", :type => "text", :id => 'end_date_filter', 'ng-model' => 'endDate', 'datepicker' => "endDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' }
     .one.column  
     .filter_select{ :class => "three columns" }
       %label{ :for => 'supplier_filter' }
         = t("admin.producer")
       %br
-      %input#supplier_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'suppliers', blank: "{ id: 0, name: '#{t(:all)}' }", ng: { model: 'supplierFilter' } }
+      %input#supplier_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'suppliers', placeholder: "#{t(:all)}", blank: "{ id: '', name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'supplierFilter', change: 'refreshData()' } }
     .filter_select{ :class => "three columns" }
       %label{ :for => 'distributor_filter' }
         = t("admin.shop")
       %br
-      %input#distributor_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'distributors', blank: "{ id: 0, name: '#{t(:all)}' }", ng: { model: 'distributorFilter' } }
+      %input#distributor_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'distributors', placeholder: "#{t(:all)}", blank: "{ id: '', name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'distributorFilter', change: 'refreshData()' } }
     .filter_select{ :class => "three columns" }
       %label{ :for => 'order_cycle_filter' }
         = t("admin.order_cycle")
       %br
-      %input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', blank: "{ id: 0, name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter', change: 'refreshData()' } }
+      %input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', placeholder: "#{t(:all)}", blank: "{ id: '', name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter', change: 'refreshData()' } }
     .filter_clear{ :class => "two columns omega" }
       %label{ :for => 'clear_all_filters' }
       %br
@@ -94,7 +94,7 @@
 
   %hr.divider.sixteen.columns.alpha.omega
 
-  .controls.sixteen.columns.alpha.omega{ ng: { hide: 'RequestMonitor.loading || lineItems.length == 0' } }
+  .controls.sixteen.columns.alpha.omega{ ng: { hide: 'RequestMonitor.loading || line_items.length == 0' } }
     %div.three.columns.alpha
       %input.fullwidth{ :type => "text", :id => 'quick_search', 'ng-model' => 'quickSearch', :placeholder => 'Quick Search' }
     = render 'admin/shared/bulk_actions_dropdown'
@@ -157,7 +157,7 @@
               = t("admin.orders.bulk_management.ask")
               %input{ :type => 'checkbox', 'ng-model' => "confirmDelete" }
 
-        %tr.line_item{ ng: { repeat: "line_item in filteredLineItems = ( lineItems | filter:quickSearch | selectFilter:supplierFilter:distributorFilter:orderCycleFilter | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:sorting.predicate:sorting.reverse )", 'class-even' => "'even'", 'class-odd' => "'odd'", attr: { id: "li_{{line_item.id}}" } } }
+        %tr.line_item{ ng: { repeat: "line_item in filteredLineItems = ( line_items | filter:quickSearch | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:sorting.predicate:sorting.reverse )", 'class-even' => "'even'", 'class-odd' => "'odd'", attr: { id: "li_{{line_item.id}}" } } }
           %td.bulk
             %input{ :type => "checkbox", :name => 'bulk', 'ng-model' => 'line_item.checked', 'ignore-dirty' => true }
           %td.order_no{ 'ng-show' => 'columns.order_no.visible' } {{ line_item.order.number }}
@@ -175,7 +175,7 @@
             %span.error{ ng: { bind: 'line_item.errors.quantity' } }
           %td.max{ 'ng-show' => 'columns.max.visible' } {{ line_item.max_quantity }}
           %td.final_weight_volume{ 'ng-show' => 'columns.final_weight_volume.visible' }
-            %input.show-dirty{ :type => 'number', :name => 'final_weight_volume', :id => 'final_weight_volume', ng: { model: "line_item.final_weight_volume", readonly: "unitValueLessThanZero(line_item)", change: "weightAdjustedPrice(line_item)", required: "true", class: '{"update-error": line_item.errors.final_weight_volume}' }, min: 0, 'ng-pattern' => '/[1-9]+/' }
+            %input.show-dirty{ type: 'number', step: 'any', :name => 'final_weight_volume', :id => 'final_weight_volume', ng: { model: "line_item.final_weight_volume", readonly: "unitValueLessThanZero(line_item)", change: "weightAdjustedPrice(line_item)", required: "true", class: '{"update-error": line_item.errors.final_weight_volume}' }, min: 0, 'ng-pattern' => '/[0-9]*[.]?[0-9]+/' }
             %span.error{ ng: { bind: 'line_item.errors.final_weight_volume' } }
           %td.price{ 'ng-show' => 'columns.price.visible' }
             %input.show-dirty{ :type => 'text', :name => 'price', :id => 'price', :ng => { value: 'line_item.price * line_item.quantity | currency:""', readonly: "true", class: '{"update-error": line_item.errors.price}' } }

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

@@ -84,7 +84,7 @@
           %i.error.icon-remove-sign.with-tip{ng: {show: 'rowStatus[order.id] == "error"'}, 'ofn-with-tip' => t('.order_not_updated')}
         %a.icon_link.with-tip.icon-edit.no-text{'ng-href' => '{{order.edit_path}}', 'data-action' => 'edit', 'ofn-with-tip' => t('.edit')}
         %div{'ng-if' => 'order.ready_to_ship'}
-          %button.icon-road.icon_link.with-tip.no-text{'ng-click' => 'shipOrder(order)', 'data-confirm' => t(:are_you_sure), rel: 'nofollow', 'ofn-with-tip' => t('.ship')}
+          %button.icon-road.icon_link.with-tip.no-text{'ng-click' => 'shipOrder(order)', rel: 'nofollow', 'ofn-with-tip' => t('.ship')}
         %div{'ng-if' => 'order.ready_to_capture'}
           %button.icon-capture.icon_link.no-text{'ng-click' => 'capturePayment(order)', rel: 'nofollow', 'ofn-with-tip' => t('.capture')}
 

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

@@ -17,7 +17,7 @@
       %td{ :align => "right" }
         %h4= @order.order_cycle.andand.name
     %tr{ valign: "top" }
-      %td{ :align => "left" }
+      %td{ align: "left", colspan: 3 }
         %strong= "#{t('.from')}: #{@order.distributor.name}"
         - if @order.distributor.abn.present?
           %br
@@ -26,31 +26,43 @@
         = @order.distributor.address.full_address
         %br
         = @order.distributor.contact.email
-      %td{width: "10%" }
+    %tr{ valign: "top" }
+      %td{ colspan: 3 }
          
-      %td{ :align => "right" }
-        %strong= "#{t('.to')}: #{@order.ship_address.full_name}"
+    %tr{ valign: "top" }
+      %td{ align: "left" }
+        %strong= "#{t('.to')}:"
+        %br
+        = @order.bill_address.full_name
         - if @order.andand.customer.andand.code.present?
           %br
           = "#{t('.code')}: #{@order.customer.code}"
         %br
-        = @order.ship_address.full_address
+        = @order.bill_address.full_address
         %br
         - if @order.andand.customer.andand.email.present?
           = "#{@order.customer.email},"
         = "#{@order.bill_address.phone}"
+      %td
+         
+      %td{ align: "left", style: "border-left: .1em solid black; padding-left: 1em" }
+        %strong= "#{t('.shipping')}: #{@order.shipping_method&.name}"
+        - if @order.shipping_method&.require_ship_address
+          %br
+          = @order.ship_address.full_name
+          %br
+          = @order.ship_address.full_address
+          %br
+          = @order.ship_address.phone
+        - if @order.special_instructions.present?
+          %br
+          %br
+            %strong= t :customer_instructions
+          = @order.special_instructions
+
 
 = render 'spree/admin/orders/invoice_table'
 
-- if @order.special_instructions.present?
-  %p.callout
-    %strong
-      = t :customer_instructions
-  %p
-    %em= @order.special_instructions
-  %p
-     
-
 - if @order.distributor.invoice_text.present?
   %p
     = @order.distributor.invoice_text