Update all locales with the latest Transifex translations

Transifex

.codeclimate.yml

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -38,6 +38,5 @@ Add the link or remove this section. -->
 
 
 #### Documentation updates
-<!-- Are their any wiki pages that need updating after merging this PR?
+<!-- Are there any wiki pages that need updating after merging this PR?
 List them here or remove this section. -->
-

CODE_OF_CONDUCT.md

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

CONTRIBUTING.md

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

DOCKER.md

@@ -60,3 +60,6 @@ Check the app in the browser at `http://localhost:3000`.
 You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
 
 You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).
+
+### Troubleshooting
+If you are using Windows and having issues related to the ruby-build not finding a definition for the ruby version, you may need to follow these commands [here](https://stackoverflow.com/questions/2517190/how-do-i-force-git-to-use-lf-instead-of-crlf-under-windows/33424884#33424884) to fix your local git config related to line breaks.

Dockerfile

@@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBE
     echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
     rbenv install $(cat .ruby-version) && \
     rbenv global $(cat .ruby-version) && \
-    gem install bundler --version=1.17.2
+    gem install bundler --version=1.17.3
 
 # Install Postgres
 RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \

Gemfile

@@ -156,6 +156,7 @@ end
 
 group :test do
   gem 'simplecov', require: false
+  gem 'test-prof'
   gem 'webmock'
   # See spec/spec_helper.rb for instructions
   # gem 'perftools.rb'

Gemfile.lock

@@ -64,6 +64,7 @@ PATH
   remote: engines/dfc_provider
   specs:
     dfc_provider (0.0.1)
+      active_model_serializers (~> 0.8.4)
       jwt (~> 2.2)
       rspec (~> 3.9)
 
@@ -198,13 +199,13 @@ GEM
     css_parser (1.7.1)
       addressable
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     database_cleaner (1.8.5)
     db2fog (0.9.0)
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.40.0)
+    ddtrace (0.41.0)
       msgpack
     debugger-linecache (1.2.0)
     delayed_job (4.1.8)
@@ -411,7 +412,7 @@ GEM
     get_process_mem (0.2.5)
       ffi (~> 1.0)
     gmaps4rails (2.1.2)
-    haml (5.1.2)
+    haml (5.2.0)
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
@@ -444,7 +445,7 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.11.3)
-    knapsack (1.18.0)
+    knapsack (1.19.0)
       rake
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -509,7 +510,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (1.5.5)
     rack-mini-profiler (2.0.2)
       rack (>= 1.2.0)
@@ -658,8 +659,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
     state_machine (1.2.0)
     stringex (1.5.1)
-    stripe (5.22.0)
+    stripe (5.25.0)
     temple (0.8.2)
+    test-prof (0.7.5)
     test-unit (3.3.6)
       power_assert
     thor (0.20.3)
@@ -671,7 +673,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
-    unicorn (5.6.0)
+    unicorn (5.7.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -687,7 +689,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.3)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -810,6 +812,7 @@ DEPENDENCIES
   state_machine (= 1.2.0)
   stringex (~> 1.5.1)
   stripe
+  test-prof
   test-unit (~> 3.3)
   timecop
   truncate_html (= 0.9.2)

README.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/assets/stylesheets/admin/pages/enterprise_form.scss

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

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

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

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

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

app/assets/stylesheets/admin/typography.scss

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

app/assets/stylesheets/darkswarm/menu.scss

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

app/assets/stylesheets/darkswarm/mixins.scss

@@ -1,4 +1,5 @@
 // Note this mixin file is used in ADMIN and FRONTEND
+@import 'shared/variables/layout';
 
 @import "branding";
 
@@ -258,15 +259,15 @@
 
 @mixin breakpoint($point) {
   @if $point == desktop {
-    @media all and (max-width: 1024px) { @content; }
+    @media all and (max-width: $desktop_breakpoint) { @content; }
   }
   @else if $point == tablet {
-    @media all and (max-width: 768px) { @content; }
+    @media all and (max-width: $tablet_breakpoint) { @content; }
   }
   @else if $point == phablet {
-    @media all and (max-width: 640px)  { @content; }
+    @media all and (max-width: $phablet_breakpoint)  { @content; }
   }
   @else if $point == mobile {
-    @media all and (max-width: 480px)  { @content; }
+    @media all and (max-width: $mobile_breakpoint)  { @content; }
   }
 }

app/assets/stylesheets/darkswarm/shop_tabs.scss

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

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

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

app/controllers/api/base_controller.rb

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

app/controllers/api/order_cycles_controller.rb

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

app/controllers/api/states_controller.rb

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

app/controllers/api/terms_and_conditions_controller.rb

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

app/controllers/application_controller.rb

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

app/controllers/spree/admin/images_controller.rb

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

app/controllers/spree/admin/product_properties_controller.rb

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

app/controllers/spree/admin/products_controller.rb

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

app/controllers/spree/admin/tax_rates_controller.rb

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

app/controllers/spree/admin/variants_controller.rb

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

app/helpers/spree/base_helper.rb

@@ -1,12 +1,7 @@
+# frozen_string_literal: true
+
 module Spree
   module BaseHelper
-    # human readable list of variant options
-    # Override: Do not show out of stock text
-    def variant_options(variant, _options = {})
-      variant.options_text
-    end
-
-    # Overriden to eager-load :states
     def available_countries
       checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
 
@@ -21,5 +16,10 @@ module Spree
         country
       end.sort { |a, b| a.name <=> b.name }
     end
+
+    def pretty_time(time)
+      [I18n.l(time.to_date, format: :long),
+       time.strftime("%l:%M %p")].join(" ")
+    end
   end
 end

app/models/concerns/payment_method_distributors.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+# This concern is used to duplicate the associations distributors and distributor_ids
+#   across payment method and gateway
+#   this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
+module PaymentMethodDistributors
+  extend ActiveSupport::Concern
+
+  def self.included(base)
+    base.class_eval do
+      has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods',
+                                             class_name: 'Enterprise',
+                                             foreign_key: 'payment_method_id',
+                                             association_foreign_key: 'distributor_id'
+    end
+  end
+end

app/models/enterprise.rb

@@ -12,10 +12,7 @@ class Enterprise < ActiveRecord::Base
   preference :shopfront_order_cycle_order, :string, default: "orders_close_at"
   preference :show_customer_names_to_suppliers, :boolean, default: false
 
-  # This is hopefully a temporary measure, pending the arrival of multiple named inventories
-  # for shops. We need this here to allow hubs to restrict visible variants to only those in
-  # their inventory if they so choose
-  # TODO: delegate this to a separate model instead of abusing Preferences.
+  # Allow hubs to restrict visible variants to only those in their inventory
   preference :product_selection_from_inventory_only, :boolean, default: false
 
   has_paper_trail only: [:owner_id, :sells], on: [:update]
@@ -78,10 +75,16 @@ class Enterprise < ActiveRecord::Base
                     },
                     url: '/images/enterprises/promo_images/:id/:style/:basename.:extension',
                     path: 'public/images/enterprises/promo_images/:id/:style/:basename.:extension'
-
   validates_attachment_content_type :logo, content_type: %r{\Aimage/.*\Z}
   validates_attachment_content_type :promo_image, content_type: %r{\Aimage/.*\Z}
 
+  has_attached_file :terms_and_conditions,
+                    url: '/files/enterprises/terms_and_conditions/:id/:basename.:extension',
+                    path: 'public/files/enterprises/terms_and_conditions/:id/:basename.:extension'
+  validates_attachment_content_type :terms_and_conditions,
+                                    content_type: "application/pdf",
+                                    message: I18n.t(:enterprise_terms_and_conditions_type_error)
+
   include Spree::Core::S3Support
   supports_s3 :logo
   supports_s3 :promo_image

app/models/product_import/entry_validator.rb

@@ -159,7 +159,7 @@ module ProductImport
     end
 
     def unit_fields_validation(entry)
-      unit_types = ['g', 'kg', 't', 'ml', 'l', 'kl', '']
+      unit_types = ['g', 'oz', 'lb', 'kg', 't', 'ml', 'l', 'kl', '']
 
       unless entry.units&.present?
         mark_as_invalid(entry, attribute: 'units',
@@ -253,7 +253,7 @@ module ProductImport
 
       products.flat_map(&:variants).each do |existing_variant|
         unit_scale = existing_variant.product.variant_unit_scale
-        unscaled_units = entry.unscaled_units || 0
+        unscaled_units = entry.unscaled_units.to_f || 0
         entry.unit_value = unscaled_units * unit_scale unless unit_scale.nil?
 
         if entry_matches_existing_variant?(entry, existing_variant)

app/models/product_import/unit_converter.rb

@@ -32,6 +32,8 @@ module ProductImport
       {
         'g' => { scale: 1, unit: 'weight' },
         'kg' => { scale: 1000, unit: 'weight' },
+        'oz' => { scale: 28.35, unit: 'weight' },
+        'lb' => { scale: 453.6, unit: 'weight' },
         't' => { scale: 1_000_000, unit: 'weight' },
         'ml' => { scale: 0.001, unit: 'volume' },
         'l' => { scale: 1, unit: 'volume' },

app/models/spree/ability_decorator.rb

@@ -97,7 +97,9 @@ class AbilityDecorator
     end
 
     can [:admin, :index, :create], Enterprise
-    can [:read, :edit, :update, :remove_logo, :remove_promo_image, :bulk_update, :resend_confirmation], Enterprise do |enterprise|
+    can [:read, :edit, :update,
+         :remove_logo, :remove_promo_image, :remove_terms_and_conditions,
+         :bulk_update, :resend_confirmation], Enterprise do |enterprise|
       OpenFoodNetwork::Permissions.new(user).editable_enterprises.include? enterprise
     end
     can [:welcome, :register], Enterprise do |enterprise|

app/models/spree/address.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module Spree
+  class Address < ActiveRecord::Base
+    include AddressDisplay
+
+    belongs_to :country, class_name: "Spree::Country"
+    belongs_to :state, class_name: "Spree::State"
+
+    has_one :enterprise, dependent: :restrict_with_exception
+    has_many :shipments
+
+    validates :firstname, :lastname, :address1, :city, :country, presence: true
+    validates :zipcode, presence: true, if: :require_zipcode?
+    validates :phone, presence: true, if: :require_phone?
+
+    validate :state_validate
+
+    after_save :touch_enterprise
+
+    alias_attribute :first_name, :firstname
+    alias_attribute :last_name, :lastname
+    delegate :name, to: :state, prefix: true, allow_nil: true
+
+    geocoded_by :geocode_address
+
+    def self.default
+      country = begin
+                  Spree::Country.find(Spree::Config[:default_country_id])
+                rescue StandardError
+                  Spree::Country.first
+                end
+      new(country: country)
+    end
+
+    def full_name
+      "#{firstname} #{lastname}".strip
+    end
+
+    def state_text
+      state.try(:abbr) || state.try(:name) || state_name
+    end
+
+    def same_as?(other)
+      return false if other.nil?
+
+      attributes.except('id', 'updated_at', 'created_at') ==
+        other.attributes.except('id', 'updated_at', 'created_at')
+    end
+
+    alias same_as same_as?
+
+    def to_s
+      "#{full_name}: #{address1}"
+    end
+
+    def clone
+      self.class.new(attributes.except('id', 'updated_at', 'created_at'))
+    end
+
+    def ==(other)
+      self_attrs = attributes
+      other_attrs = other.respond_to?(:attributes) ? other.attributes : {}
+
+      [self_attrs, other_attrs].each { |attrs|
+        attrs.except!('id', 'created_at', 'updated_at', 'order_id')
+      }
+
+      self_attrs == other_attrs
+    end
+
+    def empty?
+      attributes.except('id', 'created_at', 'updated_at', 'order_id', 'country_id').all? { |_, v|
+        v.nil?
+      }
+    end
+
+    # Generates an ActiveMerchant compatible address hash
+    def active_merchant_hash
+      {
+        name: full_name,
+        address1: address1,
+        address2: address2,
+        city: city,
+        state: state_text,
+        zip: zipcode,
+        country: country.try(:iso),
+        phone: phone
+      }
+    end
+
+    def geocode_address
+      render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
+    end
+
+    def full_address
+      render_address([address1, address2, city, zipcode, state.andand.name])
+    end
+
+    def address_part1
+      render_address([address1, address2])
+    end
+
+    def address_part2
+      render_address([city, zipcode, state.andand.name])
+    end
+
+    private
+
+    def require_phone?
+      true
+    end
+
+    def require_zipcode?
+      true
+    end
+
+    def state_validate
+      # Skip state validation without country (also required)
+      # or when disabled by preference
+      return if country.blank? || !Spree::Config[:address_requires_state]
+      return unless country.states_required
+
+      # Ensure associated state belongs to country
+      if state.present?
+        if state.country == country
+          self.state_name = nil # not required as we have a valid state and country combo
+        elsif state_name.present?
+          self.state = nil
+        else
+          errors.add(:state, :invalid)
+        end
+      end
+
+      # Ensure state_name belongs to country without states,
+      #   or that it matches a predefined state name/abbr
+      if state_name.present?
+        if country.states.present?
+          states = country.states.find_all_by_name_or_abbr(state_name)
+
+          if states.size == 1
+            self.state = states.first
+            self.state_name = nil
+          else
+            errors.add(:state, :invalid)
+          end
+        end
+      end
+
+      # ensure at least one state field is populated
+      errors.add :state, :blank if state.blank? && state_name.blank?
+    end
+
+    def touch_enterprise
+      enterprise.andand.touch
+    end
+
+    def render_address(parts)
+      parts.select(&:present?).join(', ')
+    end
+  end
+end

app/models/spree/address_decorator.rb

@@ -1,38 +0,0 @@
-Spree::Address.class_eval do
-  include AddressDisplay
-
-  has_one :enterprise, dependent: :restrict_with_exception
-  belongs_to :country, class_name: "Spree::Country"
-
-  after_save :touch_enterprise
-
-  geocoded_by :geocode_address
-
-  delegate :name, to: :state, prefix: true, allow_nil: true
-
-  def geocode_address
-    render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
-  end
-
-  def full_address
-    render_address([address1, address2, city, zipcode, state.andand.name])
-  end
-
-  def address_part1
-    render_address([address1, address2])
-  end
-
-  def address_part2
-    render_address([city, zipcode, state.andand.name])
-  end
-
-  private
-
-  def touch_enterprise
-    enterprise.andand.touch
-  end
-
-  def render_address(parts)
-    parts.select(&:present?).join(', ')
-  end
-end

app/models/spree/classification.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spree
+  class Classification < ActiveRecord::Base
+    self.table_name = 'spree_products_taxons'
+    belongs_to :product, class_name: "Spree::Product", touch: true
+    belongs_to :taxon, class_name: "Spree::Taxon", touch: true
+
+    before_destroy :dont_destroy_if_primary_taxon
+
+    private
+
+    def dont_destroy_if_primary_taxon
+      return unless product.primary_taxon == taxon
+
+      errors.add :base, I18n.t(:spree_classification_primary_taxon_error, taxon: taxon.name,
+                                                                          product: product.name)
+      false
+    end
+  end
+end

app/models/spree/classification_decorator.rb

@@ -1,15 +0,0 @@
-Spree::Classification.class_eval do
-  belongs_to :product, class_name: "Spree::Product", touch: true
-  belongs_to :taxon, class_name: "Spree::Taxon", touch: true
-
-  before_destroy :dont_destroy_if_primary_taxon
-
-  private
-
-  def dont_destroy_if_primary_taxon
-    if product.primary_taxon == taxon
-      errors.add :base, I18n.t(:spree_classification_primary_taxon_error, taxon: taxon.name, product: product.name)
-      false
-    end
-  end
-end

app/models/spree/concerns/payment_method_distributors.rb

@@ -1,16 +0,0 @@
-require 'active_support/concern'
-
-# This concern is used to duplicate the associations distributors and distributor_ids
-#   across payment method and gateway
-#   this fixes the inheritance problem https://github.com/openfoodfoundation/openfoodnetwork/issues/2781
-module Spree
-  module PaymentMethodDistributors
-    extend ActiveSupport::Concern
-
-    def self.included(base)
-      base.class_eval do
-        has_and_belongs_to_many :distributors, join_table: 'distributors_payment_methods', class_name: 'Enterprise', foreign_key: 'payment_method_id', association_foreign_key: 'distributor_id'
-      end
-    end
-  end
-end

app/models/spree/gateway.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'spree/concerns/payment_method_distributors'
-
 module Spree
   class Gateway < PaymentMethod
-    include Spree::PaymentMethodDistributors
+    include PaymentMethodDistributors
 
     delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
 

app/models/spree/line_item_decorator.rb

@@ -1,8 +1,8 @@
 require 'open_food_network/scope_variant_to_hub'
-require 'open_food_network/variant_and_line_item_naming'
+require 'variant_units/variant_and_line_item_naming'
 
 Spree::LineItem.class_eval do
-  include OpenFoodNetwork::VariantAndLineItemNaming
+  include VariantUnits::VariantAndLineItemNaming
   include LineItemBasedAdjustmentHandling
   has_and_belongs_to_many :option_values, join_table: 'spree_option_values_line_items', class_name: 'Spree::OptionValue'
 

app/models/spree/log_entry.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  class LogEntry < ActiveRecord::Base
+    belongs_to :source, polymorphic: true
+
+    # Fix for Spree #1767
+    # If a payment fails, we want to make sure we keep the record of it failing
+    after_rollback :save_anyway
+
+    def save_anyway
+      log = Spree::LogEntry.new
+      log.source  = source
+      log.details = details
+      log.save!
+    end
+  end
+end

app/models/spree/order_decorator.rb

@@ -194,8 +194,6 @@ Spree::Order.class_eval do
   end
 
   # After changing line items of a completed order
-  # TODO: perhaps this should be triggered from a controller
-  # rather than an after_save callback?
   def update_shipping_fees!
     shipments.each do |shipment|
       next if shipment.shipped?
@@ -222,8 +220,6 @@ Spree::Order.class_eval do
   end
 
   # After changing line items of a completed order
-  # TODO: perhaps this should be triggered from a controller
-  # rather than an after_save callback?
   def update_payment_fees!
     payments.each do |payment|
       next if payment.completed?

app/models/spree/payment_method.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'spree/concerns/payment_method_distributors'
-
 module Spree
   class PaymentMethod < ActiveRecord::Base
     include Spree::Core::CalculatedAdjustments
-    include Spree::PaymentMethodDistributors
+    include PaymentMethodDistributors
 
     acts_as_taggable
     acts_as_paranoid

app/models/spree/role.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class Role < ActiveRecord::Base
+    has_and_belongs_to_many :users, join_table: 'spree_roles_users',
+                                    class_name: Spree.user_class.to_s
+  end
+end

app/models/spree/shipment.rb

@@ -90,7 +90,7 @@ module Spree
     end
 
     def selected_shipping_rate
-      shipping_rates.where(selected: true).first
+      shipping_rates.find_by(selected: true)
     end
 
     def selected_shipping_rate_id
@@ -294,7 +294,7 @@ module Spree
       record = true
       while record
         random = "H#{Array.new(11) { rand(9) }.join}"
-        record = self.class.where(number: random).first
+        record = self.class.find_by(number: random)
       end
       self.number = random
     end

app/models/spree/shipping_category.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingCategory < ActiveRecord::Base
+    validates :name, presence: true
+    has_many :products
+    has_many :shipping_method_categories
+    has_many :shipping_methods, through: :shipping_method_categories
+  end
+end

app/models/spree/shipping_method.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingMethod < ActiveRecord::Base
+    include Spree::Core::CalculatedAdjustments
+    DISPLAY = [:both, :front_end, :back_end].freeze
+
+    acts_as_taggable
+
+    default_scope -> { where(deleted_at: nil) }
+
+    has_many :shipments
+    has_many :shipping_method_categories
+    has_many :shipping_categories, through: :shipping_method_categories
+    has_many :shipping_rates
+    has_many :distributor_shipping_methods
+    has_many :distributors, through: :distributor_shipping_methods,
+                            class_name: 'Enterprise',
+                            foreign_key: 'distributor_id'
+
+    has_and_belongs_to_many :zones, join_table: 'spree_shipping_methods_zones',
+                                    class_name: 'Spree::Zone',
+                                    foreign_key: 'shipping_method_id'
+
+    validates :name, presence: true
+    validate :distributor_validation
+    validate :at_least_one_shipping_category
+
+    after_save :touch_distributors
+
+    scope :managed_by, lambda { |user|
+      if user.has_spree_role?('admin')
+        where(nil)
+      else
+        joins(:distributors).
+          where('distributors_shipping_methods.distributor_id IN (?)',
+                user.enterprises.select(&:id)).
+          select('DISTINCT spree_shipping_methods.*')
+      end
+    }
+
+    scope :for_distributors, ->(distributors) {
+      non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
+      where(id: non_unique_matches.map(&:id))
+    }
+    scope :for_distributor, lambda { |distributor|
+      joins(:distributors).
+        where('enterprises.id = ?', distributor)
+    }
+
+    scope :by_name, -> { order('spree_shipping_methods.name ASC') }
+    scope :display_on_checkout, -> {
+      where("spree_shipping_methods.display_on is null OR spree_shipping_methods.display_on = ''")
+    }
+
+    def adjustment_label
+      I18n.t('shipping')
+    end
+
+    # Here we allow checkout with shipping methods without zones (see issue #3928 for details)
+    #   and also checkout with addresses outside of the zones of the selected shipping method
+    # This method could be used, like in Spree, to validate shipping method zones on checkout.
+    def include?(address)
+      address.present?
+    end
+
+    def build_tracking_url(tracking)
+      tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
+    end
+
+    def self.calculators
+      spree_calculators.__send__ model_name_without_spree_namespace
+    end
+
+    # Some shipping methods are only meant to be set via backend
+    def frontend?
+      display_on != "back_end"
+    end
+
+    def has_distributor?(distributor)
+      distributors.include?(distributor)
+    end
+
+    # Checks whether the shipping method is of delivery type, meaning that it
+    # requires the user to specify a ship address at checkout.
+    #
+    # @return [Boolean]
+    def delivery?
+      require_ship_address
+    end
+
+    # Return the services (pickup, delivery) that different distributors provide, in the format:
+    # {distributor_id => {pickup: true, delivery: false}, ...}
+    def self.services
+      Hash[
+        Spree::ShippingMethod.
+          joins(:distributor_shipping_methods).
+          group('distributor_id').
+          select("distributor_id").
+          select("BOOL_OR(spree_shipping_methods.require_ship_address = 'f') AS pickup").
+          select("BOOL_OR(spree_shipping_methods.require_ship_address = 't') AS delivery").
+          map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup, delivery: sm.delivery }] }
+      ]
+    end
+
+    def self.on_backend_query
+      "#{table_name}.display_on != 'front_end' OR #{table_name}.display_on IS NULL"
+    end
+
+    def self.on_frontend_query
+      "#{table_name}.display_on != 'back_end' OR #{table_name}.display_on IS NULL"
+    end
+
+    private
+
+    def at_least_one_shipping_category
+      return unless shipping_categories.empty?
+
+      errors[:base] << "You need to select at least one shipping category"
+    end
+
+    def touch_distributors
+      distributors.each do |distributor|
+        distributor.touch if distributor.persisted?
+      end
+    end
+
+    def distributor_validation
+      validates_with DistributorsValidator
+    end
+  end
+end

app/models/spree/shipping_method_category.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingMethodCategory < ActiveRecord::Base
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
+  end
+end

app/models/spree/shipping_method_decorator.rb

@@ -1,90 +0,0 @@
-Spree::ShippingMethod.class_eval do
-  acts_as_taggable
-
-  has_many :distributor_shipping_methods
-  has_many :distributors, through: :distributor_shipping_methods, class_name: 'Enterprise', foreign_key: 'distributor_id'
-
-  after_save :touch_distributors
-
-  validate :distributor_validation
-
-  scope :managed_by, lambda { |user|
-    if user.has_spree_role?('admin')
-      where(nil)
-    else
-      joins(:distributors).
-        where('distributors_shipping_methods.distributor_id IN (?)', user.enterprises.select(&:id)).
-        select('DISTINCT spree_shipping_methods.*')
-    end
-  }
-
-  scope :for_distributors, ->(distributors) {
-    non_unique_matches = unscoped.joins(:distributors).where(enterprises: { id: distributors })
-    where(id: non_unique_matches.map(&:id))
-  }
-  scope :for_distributor, lambda { |distributor|
-    joins(:distributors).
-      where('enterprises.id = ?', distributor)
-  }
-
-  scope :by_name, -> { order('spree_shipping_methods.name ASC') }
-  scope :display_on_checkout, -> { where("spree_shipping_methods.display_on is null OR spree_shipping_methods.display_on = ''") }
-
-  # Return the services (pickup, delivery) that different distributors provide, in the format:
-  # {distributor_id => {pickup: true, delivery: false}, ...}
-  def self.services
-    Hash[
-      Spree::ShippingMethod.
-        joins(:distributor_shipping_methods).
-        group('distributor_id').
-        select("distributor_id").
-        select("BOOL_OR(spree_shipping_methods.require_ship_address = 'f') AS pickup").
-        select("BOOL_OR(spree_shipping_methods.require_ship_address = 't') AS delivery").
-        map { |sm| [sm.distributor_id.to_i, { pickup: sm.pickup, delivery: sm.delivery }] }
-    ]
-  end
-
-  # This method is overriden so that we can remove the restriction added in Spree
-  #   Spree restricts shipping method calculators to the ones that inherit from Spree::Shipping::ShippingCalculator
-  #   Spree::Shipping::ShippingCalculator makes sure that calculators are able to handle packages and not orders as input
-  #   This is not necessary in OFN because calculators in OFN are already customized to work with different types of input
-  def self.calculators
-    spree_calculators.send model_name_without_spree_namespace
-  end
-
-  # This is bypassing the validation of shipping method zones on checkout
-  # It allows checkout using shipping methods without zones (see issue #3928 for details)
-  #   and it allows checkout with addresses outside of the zones of the selected shipping method
-  def include?(address)
-    address.present?
-  end
-
-  def has_distributor?(distributor)
-    distributors.include?(distributor)
-  end
-
-  def adjustment_label
-    I18n.t('shipping')
-  end
-
-  # Checks whether the shipping method is of delivery type, meaning that it
-  # requires the user to specify a ship address at checkout. Note this is
-  # a setting we added onto the +spree_shipping_methods+ table.
-  #
-  # @return [Boolean]
-  def delivery?
-    require_ship_address
-  end
-
-  private
-
-  def touch_distributors
-    distributors.each do |distributor|
-      distributor.touch if distributor.persisted?
-    end
-  end
-
-  def distributor_validation
-    validates_with DistributorsValidator
-  end
-end

app/models/spree/shipping_rate.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Spree
+  class ShippingRate < ActiveRecord::Base
+    belongs_to :shipment, class_name: 'Spree::Shipment'
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
+
+    scope :frontend,
+          -> {
+            includes(:shipping_method).
+              where(ShippingMethod.on_frontend_query).
+              references(:shipping_method).
+              order("cost ASC")
+          }
+    scope :backend,
+          -> {
+            includes(:shipping_method).
+              where(ShippingMethod.on_backend_query).
+              references(:shipping_method).
+              order("cost ASC")
+          }
+
+    delegate :order, :currency, to: :shipment
+    delegate :name, to: :shipping_method
+
+    def display_price
+      price = if Spree::Config[:shipment_inc_vat]
+                (1 + Spree::TaxRate.default) * cost
+              else
+                cost
+              end
+
+      Spree::Money.new(price, { currency: currency })
+    end
+
+    alias_method :display_cost, :display_price
+  end
+end

app/models/spree/taxon.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module Spree
+  class Taxon < ActiveRecord::Base
+    acts_as_nested_set dependent: :destroy
+
+    belongs_to :taxonomy, class_name: 'Spree::Taxonomy', touch: true
+    has_many :classifications, dependent: :destroy
+    has_many :products, through: :classifications
+
+    before_create :set_permalink
+
+    validates :name, presence: true
+
+    has_attached_file :icon,
+                      styles: { mini: '32x32>', normal: '128x128>' },
+                      default_style: :mini,
+                      url: '/spree/taxons/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
+                      default_url: '/assets/default_taxon.png'
+
+    include Spree::Core::S3Support
+    supports_s3 :icon
+
+    # Indicate which filters should be used for this taxon
+    def applicable_filters
+      []
+    end
+
+    # Return meta_title if set otherwise generates from root name and/or taxon name
+    def seo_title
+      if meta_title
+        meta_title
+      else
+        root? ? name : "#{root.name} - #{name}"
+      end
+    end
+
+    # Creates permalink based on Stringex's .to_url method
+    def set_permalink
+      if parent.present?
+        self.permalink = [parent.permalink, permalink_end].join('/')
+      elsif permalink.blank?
+        self.permalink = name.to_url
+      end
+    end
+
+    # For #2759
+    def to_param
+      permalink
+    end
+
+    def active_products
+      scope = products.active
+      scope
+    end
+
+    def pretty_name
+      ancestor_chain = ancestors.inject("") do |name, ancestor|
+        name += "#{ancestor.name} -> "
+      end
+      ancestor_chain + name.to_s
+    end
+
+    # Find all the taxons of supplied products for each enterprise, indexed by enterprise.
+    # Format: {enterprise_id => [taxon_id, ...]}
+    def self.supplied_taxons
+      taxons = {}
+
+      Spree::Taxon.
+        joins(products: :supplier).
+        select('spree_taxons.*, enterprises.id AS enterprise_id').
+        each do |t|
+          taxons[t.enterprise_id.to_i] ||= Set.new
+          taxons[t.enterprise_id.to_i] << t.id
+        end
+
+      taxons
+    end
+
+    # Find all the taxons of distributed products for each enterprise, indexed by enterprise.
+    # May return :all taxons (distributed in open and closed order cycles),
+    # or :current taxons (distributed in an open order cycle).
+    #
+    # Format: {enterprise_id => [taxon_id, ...]}
+    def self.distributed_taxons(which_taxons = :all)
+      ents_and_vars = ExchangeVariant.joins(exchange: :order_cycle).merge(Exchange.outgoing)
+        .select("DISTINCT variant_id, receiver_id AS enterprise_id")
+
+      ents_and_vars = ents_and_vars.merge(OrderCycle.active) if which_taxons == :current
+
+      taxons = Spree::Taxon
+        .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id")
+        .joins(products: :variants_including_master)
+        .joins("
+          INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars
+          ON spree_variants.id = ents_and_vars.variant_id")
+
+      taxons.each_with_object({}) do |t, ts|
+        ts[t.enterprise_id.to_i] ||= Set.new
+        ts[t.enterprise_id.to_i] << t.id
+      end
+    end
+
+    private
+
+    def permalink_end
+      return name.to_url if permalink.blank?
+
+      permalink.split('/').last
+    end
+  end
+end

app/models/spree/taxon_decorator.rb

@@ -1,47 +0,0 @@
-Spree::Taxon.class_eval do
-  has_many :classifications, dependent: :destroy
-
-  # Indicate which filters should be used for this taxon
-  def applicable_filters
-    fs = []
-    # fs << Spree::ProductFilters.distributor_filter if Spree::ProductFilters.respond_to? :distributor_filter
-    fs
-  end
-
-  # Find all the taxons of supplied products for each enterprise, indexed by enterprise.
-  # Format: {enterprise_id => [taxon_id, ...]}
-  def self.supplied_taxons
-    taxons = {}
-
-    Spree::Taxon.
-      joins(products: :supplier).
-      select('spree_taxons.*, enterprises.id AS enterprise_id').
-      each do |t|
-        taxons[t.enterprise_id.to_i] ||= Set.new
-        taxons[t.enterprise_id.to_i] << t.id
-      end
-
-    taxons
-  end
-
-  # Find all the taxons of distributed products for each enterprise, indexed by enterprise.
-  # May return :all taxons (distributed in open and closed order cycles),
-  # or :current taxons (distributed in an open order cycle).
-  #
-  # Format: {enterprise_id => [taxon_id, ...]}
-  def self.distributed_taxons(which_taxons = :all)
-    ents_and_vars = ExchangeVariant.joins(exchange: :order_cycle).merge(Exchange.outgoing)
-      .select("DISTINCT variant_id, receiver_id AS enterprise_id")
-
-    ents_and_vars = ents_and_vars.merge(OrderCycle.active) if which_taxons == :current
-
-    taxons = Spree::Taxon
-      .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id").joins(products: :variants_including_master)
-      .joins("INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars ON spree_variants.id = ents_and_vars.variant_id")
-
-    taxons.each_with_object({}) do |t, ts|
-      ts[t.enterprise_id.to_i] ||= Set.new
-      ts[t.enterprise_id.to_i] << t.id
-    end
-  end
-end

app/models/spree/taxonomy.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Spree
+  class Taxonomy < ActiveRecord::Base
+    validates :name, presence: true
+
+    has_many :taxons
+    has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy
+
+    after_save :set_name
+
+    default_scope -> { order("#{table_name}.position") }
+
+    private
+
+    def set_name
+      if root
+        root.update_column(:name, name)
+      else
+        self.root = Taxon.create!(taxonomy_id: id, name: name)
+      end
+    end
+  end
+end

app/models/spree/user.rb

@@ -7,6 +7,13 @@ module Spree
     belongs_to :ship_address, foreign_key: 'ship_address_id', class_name: 'Spree::Address'
     belongs_to :bill_address, foreign_key: 'bill_address_id', class_name: 'Spree::Address'
 
+    has_and_belongs_to_many :spree_roles,
+                            join_table: 'spree_roles_users',
+                            foreign_key: "user_id",
+                            class_name: "Spree::Role"
+
+    has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
+
     before_validation :set_login
     before_destroy :check_completed_orders
 
@@ -41,6 +48,12 @@ module Spree
       User.admin.count > 0
     end
 
+    # Whether a user has a role or not.
+    def has_spree_role?(role_in_question)
+      spree_roles.where(name: role_in_question.to_s).any?
+    end
+
+    # Checks whether the specified user is a superadmin, with full control of the instance
     def admin?
       has_spree_role?('admin')
     end
@@ -107,14 +120,6 @@ module Spree
       end
     end
 
-    # Checks whether the specified user is a superadmin, with full control of the
-    # instance
-    #
-    # @return [Boolean]
-    def superadmin?
-      has_spree_role?('admin')
-    end
-
     def generate_spree_api_key!
       self.spree_api_key = SecureRandom.hex(24)
       save!
@@ -125,6 +130,10 @@ module Spree
       save!
     end
 
+    def last_incomplete_spree_order
+      spree_orders.incomplete.where(created_by_id: id).order('created_at DESC').first
+    end
+
     protected
 
     def password_required?

app/models/spree/variant_decorator.rb

@@ -1,5 +1,5 @@
 require 'open_food_network/enterprise_fee_calculator'
-require 'open_food_network/variant_and_line_item_naming'
+require 'variant_units/variant_and_line_item_naming'
 require 'concerns/variant_stock'
 
 Spree::Variant.class_eval do
@@ -8,7 +8,7 @@ Spree::Variant.class_eval do
   # This file may be double-loaded in delayed job environment, so we check before
   # removing the Spree method to prevent error.
   remove_method :options_text if instance_methods(false).include? :options_text
-  include OpenFoodNetwork::VariantAndLineItemNaming
+  include VariantUnits::VariantAndLineItemNaming
   include VariantStock
 
   has_many :exchange_variants

app/serializers/api/admin/enterprise_serializer.rb

@@ -6,7 +6,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
              :preferred_product_selection_from_inventory_only,
              :preferred_show_customer_names_to_suppliers, :owner, :contact, :users, :tag_groups,
              :default_tag_group, :require_login, :allow_guest_orders, :allow_order_changes,
-             :logo, :promo_image
+             :logo, :promo_image, :terms_and_conditions, :terms_and_conditions_file_name
 
   has_one :owner, serializer: Api::Admin::UserSerializer
   has_many :users, serializer: Api::Admin::UserSerializer
@@ -20,6 +20,12 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
     attachment_urls(object.promo_image, [:thumb, :medium, :large])
   end
 
+  def terms_and_conditions
+    return unless @object.terms_and_conditions.file?
+
+    @object.terms_and_conditions.url
+  end
+
   def tag_groups
     object.tag_rules.prioritised.reject(&:is_default).each_with_object([]) do |tag_rule, tag_groups|
       tag_group = find_match(tag_groups, tag_rule.preferred_customer_tags.

app/serializers/api/state_serializer.rb

@@ -1,3 +1,3 @@
 class Api::StateSerializer < ActiveModel::Serializer
-  attributes :id, :name, :abbr
+  attributes :id, :name, :abbr, :country_id
 end

app/services/order_tax_adjustments_fetcher.rb

@@ -32,7 +32,7 @@ class OrderTaxAdjustmentsFetcher
   end
 
   def line_item_adjustments
-    table[:adjustable_id].eq(order.line_item_ids.join(','))
+    table[:adjustable_id].eq_any(order.line_item_ids)
       .and(table[:adjustable_type].eq('Spree::LineItem'))
   end
 

app/services/permitted_attributes/enterprise.rb

@@ -25,7 +25,7 @@ module PermittedAttributes
       [
         :id, :name, :visible, :permalink, :owner_id, :contact_name, :email_address, :phone,
         :is_primary_producer, :sells, :website, :facebook, :instagram, :linkedin, :twitter,
-        :description, :long_description, :logo, :promo_image,
+        :description, :long_description, :logo, :promo_image, :terms_and_conditions,
         :allow_guest_orders, :allow_order_changes, :require_login, :enable_subscriptions,
         :abn, :acn, :charges_sales_tax, :display_invoice_logo, :invoice_text,
         :preferred_product_selection_from_inventory_only, :preferred_shopfront_message,

app/services/product_filters.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ProductFilters
+  PRODUCT_FILTERS = [
+    'query', 'producerFilter', 'categoryFilter', 'sorting', 'importDateFilter'
+  ].freeze
+
+  def extract(params)
+    params.select { |key, _value| PRODUCT_FILTERS.include?(key) }
+  end
+end

app/services/variant_units/option_value_namer.rb

@@ -2,7 +2,7 @@
 
 require "open_food_network/i18n_inflections"
 
-module OpenFoodNetwork
+module VariantUnits
   class OptionValueNamer
     def initialize(variant = nil)
       @variant = variant
@@ -39,7 +39,6 @@ module OpenFoodNetwork
       if @variant.unit_value.present?
         if %w(weight volume).include? @variant.product.variant_unit
           value, unit_name = option_value_value_unit_scaled
-
         else
           value = @variant.unit_value
           unit_name = pluralize(@variant.product.variant_unit_name, value)
@@ -63,21 +62,44 @@ module OpenFoodNetwork
     end
 
     def scale_for_unit_value
-      units = { 'weight' => { 1.0 => 'g', 1000.0 => 'kg', 1_000_000.0 => 'T' },
-                'volume' => { 0.001 => 'mL', 1.0 => 'L',  1000.0 => 'kL' } }
+      units = {
+        'weight' => {
+          1.0 => { 'name' => 'g', 'system' => 'metric' },
+          28.35 => { 'name' => 'oz', 'system' => 'imperial' },
+          453.6 => { 'name' => 'lb', 'system' => 'imperial' },
+          1000.0 => { 'name' => 'kg', 'system' => 'metric' },
+          1_000_000.0 => { 'name' => 'T', 'system' => 'metric' }
+        },
+        'volume' => {
+          0.001 => { 'name' => 'mL', 'system' => 'metric' },
+          1.0 => { 'name' => 'L', 'system' => 'metric' },
+          1000.0 => { 'name' => 'kL', 'system' => 'metric' }
+        }
+      }
 
-      # Find the largest available unit where unit_value comes to >= 1 when expressed in it.
-      # If there is none available where this is true, use the smallest available unit.
-      unit = units[@variant.product.variant_unit].select { |scale, _unit_name|
-        @variant.unit_value / scale >= 1
-      }.to_a.last
-      unit = units[@variant.product.variant_unit].first if unit.nil?
+      scales = units[@variant.product.variant_unit]
+      product_scale = @variant.product.variant_unit_scale
+      product_scale_system = scales[product_scale.to_f]['system']
 
-      unit
+      largest_unit = find_largest_unit(scales, product_scale_system)
+      [largest_unit[0], largest_unit[1]["name"]]
+    end
+
+    # Find the largest available and compatible unit where unit_value comes
+    #   to >= 1 when expressed in it.
+    # If there is none available where this is true, use the smallest available unit.
+    def find_largest_unit(scales, product_scale_system)
+      largest_unit = scales.select { |scale, unit_info|
+        unit_info['system'] == product_scale_system &&
+          @variant.unit_value / scale >= 1
+      }.max
+      return scales.first if largest_unit.nil?
+
+      largest_unit
     end
 
     def pluralize(unit_name, count)
-      I18nInflections.pluralize(unit_name, count)
+      OpenFoodNetwork::I18nInflections.pluralize(unit_name, count)
     end
   end
 end

app/services/variant_units/variant_and_line_item_naming.rb

@@ -2,9 +2,9 @@
 # It contains all of our logic for creating and naming option values (which are associated
 # with both models) and methods for printing human readable "names" for instances of these models.
 
-require 'open_food_network/option_value_namer'
+require 'variant_units/option_value_namer'
 
-module OpenFoodNetwork
+module VariantUnits
   module VariantAndLineItemNaming
     # Copied and modified from Spree::Variant
     def options_text
@@ -18,7 +18,24 @@ module OpenFoodNetwork
                    order("#{Spree::OptionType.table_name}.position asc")
                end
 
-      values.map(&:presentation).to_sentence(words_connector: ", ", two_words_connector: ", ")
+      values.map { |option_value|
+        presentation(option_value)
+      }.to_sentence(words_connector: ", ", two_words_connector: ", ")
+    end
+
+    def presentation(option_value)
+      return option_value.presentation unless option_value.option_type.name == "unit_weight"
+
+      return display_as if has_attribute?(:display_as) && display_as.present?
+
+      return variant.display_as if variant_display_as?
+
+      option_value.presentation
+    end
+
+    def variant_display_as?
+      respond_to?(:variant) && variant.present? &&
+        variant.respond_to?(:display_as) && variant.display_as.present?
     end
 
     def product_and_full_name
@@ -48,9 +65,11 @@ module OpenFoodNetwork
     end
 
     def unit_to_display
-      return options_text if !has_attribute?(:display_as) || display_as.blank?
+      return display_as if has_attribute?(:display_as) && display_as.present?
 
-      display_as
+      return variant.display_as if variant_display_as?
+
+      options_text
     end
 
     def update_units
@@ -84,7 +103,7 @@ module OpenFoodNetwork
       if has_attribute?(:display_as) && display_as.present?
         display_as
       else
-        option_value_namer = OpenFoodNetwork::OptionValueNamer.new self
+        option_value_namer = VariantUnits::OptionValueNamer.new self
         option_value_namer.name
       end
     end

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

@@ -31,3 +31,16 @@
     = f.label :invoice_text, t('.invoice_text')
   .omega.eight.columns
     = f.text_area :invoice_text, style: "width: 100%; height: 100px;"
+
+.row
+  .alpha.three.columns
+    = f.label :terms_and_conditions, t('.terms_and_conditions')
+
+  .omega.eight.columns
+    %a{ href: '{{ Enterprise.terms_and_conditions }}', ng: { if: 'Enterprise.terms_and_conditions' } }
+      = '{{ Enterprise.terms_and_conditions_file_name }}'
+    .pad-top
+      = f.file_field :terms_and_conditions
+    .pad-top
+      %a.button.red{ href: '', ng: {click: 'removeTermsAndConditions()', if: 'Enterprise.terms_and_conditions'} }
+        = t('.remove_terms_and_conditions')

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

@@ -7,7 +7,7 @@
     %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.logo.medium }}', if: 'Enterprise.logo' } }
     = f.file_field :logo
     %a.button.red{ href: '', ng: {click: 'removeLogo()', if: 'Enterprise.logo'} }
-      = t('admin.enterprises.remove_logo.remove')
+      = t('.remove_logo')
 
 .row.page-admin-enterprises-form__promo-image-field-group.image-field-group
   .alpha.three.columns
@@ -23,4 +23,4 @@
     %img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.promo_image.large }}', if: 'Enterprise.promo_image' } }
     = f.file_field :promo_image
     %a.button.red{ href: '', ng: {click: 'removePromoImage()', if: 'Enterprise.promo_image'} }
-      = t('admin.enterprises.remove_promo_image.remove')
+      = t('.remove_promo_image')

app/views/admin/order_cycles/new.html.haml

@@ -1,5 +1,5 @@
-%h1
-  =t'new_order_cycle'
+- content_for :page_title do
+  =t('new_order_cycle')
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
 = admin_inject_order_cycle_instance

app/views/checkout/_form.html.haml

@@ -14,6 +14,7 @@
   = render "checkout/shipping", f: f
   = render "checkout/payment", f: f
   = render "checkout/already_ordered", f: f if show_bought_items?
+  = render "checkout/terms_and_conditions", f: f
   %p
     %button.button.primary{type: :submit}
       = t :checkout_send

app/views/checkout/_payment.html.haml

@@ -13,8 +13,6 @@
       "ng-class" => "{valid: payment.$valid, open: accordion.payment}"}
       = render 'checkout/accordion_heading'
 
-      -# TODO render this in Angular instead of server-side
-      -# The problem being how to render the partials
       .row
         .small-12.medium-12.large-6.columns
           - available_payment_methods.each do |method|

app/views/checkout/_terms_and_conditions.html.haml

@@ -0,0 +1,2 @@
+%p.small
+  = t('.message_html', terms_and_conditions_link: link_to( t( '.link_text' ), current_order.distributor.terms_and_conditions.url, target: '_blank')) if current_order.distributor.terms_and_conditions.file?

app/views/home/_tagline.html.haml

@@ -2,7 +2,6 @@
   .row
     .small-12.text-center.columns
       %h1
-        / TODO: Rohan - logo asset & width is content manageable:
         %img{src: image_path("logo-white-notext.png"), title: Spree::Config.site_name}
         %br/
         %a.button.transparent{href: "/shops"}

app/views/layouts/_shopfront_script.html.haml

@@ -1,29 +1,34 @@
 :javascript
-  $(document).ready(function() {
-    var in_iframe = function(){
-      try {
-        return window.self !== window.top;
-      } catch (e) {
-        return true;
+  var isInIframe = function(){
+    try {
+      return window.self !== window.top;
+    } catch (e) {
+      return true;
+    }
+  };
+
+  document.addEventListener(
+    'DOMContentLoaded',
+    function() {
+      var inIframe = isInIframe();
+      var embedded_styles_active = $('body.off-canvas').hasClass('embedded');
+
+      var set_shopfront_styles = function (state) {
+        $.ajax({
+          url: '/embedded_shopfront/' + state,
+          type: 'POST'
+        });
+      };
+
+      if (inIframe && !embedded_styles_active){
+        $('body.off-canvas').addClass('embedded');
+        set_shopfront_styles('enable');
       }
-    };
 
-    var embedded_styles_active = $('body.off-canvas').hasClass('embedded');
-
-    var set_shopfront_styles = function(state) {
-      $.ajax({
-        url: '/embedded_shopfront/'+state,
-        type: 'POST'
-      });
-    };
-
-    if (in_iframe() && !embedded_styles_active){
-      $('body.off-canvas').addClass('embedded');
-      set_shopfront_styles('enable');
-    }
-
-    if (!in_iframe() && embedded_styles_active) {
-      $('body.off-canvas').removeClass('embedded');
-      set_shopfront_styles('disable');
-    }
-  });
+      if (!inIframe && embedded_styles_active) {
+        $('body.off-canvas').removeClass('embedded');
+        set_shopfront_styles('disable');
+      }
+    },
+    false
+  );

app/views/layouts/darkswarm.html.haml

@@ -18,14 +18,14 @@
     = stylesheet_link_tag "darkswarm/all"
     = csrf_meta_tags
 
-  %body{class: body_classes, "body-scroll" => true , ng: {app: "Darkswarm"}}
+  %body{ class: body_classes, "body-scroll" => true , ng: { app: 'Darkswarm' }}
     / [if lte IE 8]
       = render partial: "shared/ie_warning"
       = javascript_include_tag "iehack"
 
     = render "layouts/shopfront_script" if @shopfront_layout
 
-    .off-canvas-wrap{offcanvas: true}
+    .off-canvas-wrap{ offcanvas: true }
       .fixed.off-canvas-fixed
         = render "shared/menu/menu" unless @hide_menu
         = yield :page_alert
@@ -40,7 +40,8 @@
     = render "layouts/bugsnag_js"
 
     - if Spree::Config.stripe_connect_enabled
-      %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
+      = render "shared/stripe_js"
+
     - if !ContentConfig.open_street_map_enabled
       %script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
 

app/views/shared/_stripe_js.html.haml

@@ -0,0 +1,5 @@
+- if Rails.env.test?
+  %script{type: "text/javascript"}
+    = render file: "spec/support/fixtures/stripejs-mock.js"
+- else
+  %script{src: "https://js.stripe.com/v3/", type: "text/javascript"}

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

@@ -3,9 +3,9 @@
 = render partial: 'spree/shared/error_messages', locals: { target: @image }
 
 - content_for :page_actions do
-  %li= button_link_to t('spree.back_to_images_list'), admin_product_images_url(@product), icon: 'icon-arrow-left'
+  %li= button_link_to t('spree.back_to_images_list'), admin_product_images_url(@product, @url_filters), icon: 'icon-arrow-left'
 
-= form_for [:admin, @product, @image], html: { multipart: true } do |f|
+= form_for [:admin, @product, @image], url: admin_product_image_path(@product, @image, @url_filters), html: { multipart: true } do |f|
   %fieldset
     %legend{align: "center"}= @image.attachment_file_name
     .field.alpha.three.columns.align-center
@@ -18,4 +18,4 @@
     .form-buttons.filter-actions.actions
       = button t('spree.actions.update'), 'icon-refresh'
       %span.or= t('spree.or')
-      = link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button icon-remove'
+      = link_to t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'

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

@@ -2,7 +2,7 @@
 = render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images'}
 
 - content_for :page_actions do
-  %li= link_to_with_icon('icon-plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button')
+  %li= link_to_with_icon('icon-plus', t('spree.new_image'), new_admin_product_image_url(@product, @url_filters), id: 'new_image_link', class: 'button')
 
 #images
 
@@ -11,7 +11,7 @@
     = t('spree.no_images_found')
     \.
 - else
-  %table.index.sortable{ "data-sortable-link" => "#{update_positions_admin_product_images_url(@product)}" }
+  %table.index.sortable{ "data-sortable-link" => "#{update_positions_admin_product_images_url(@product, @url_filters)}" }
     %colgroup
       %col{ style: "width: 5%" }/
       %col{ style: "width: 10%" }/
@@ -36,5 +36,5 @@
           %td= options_text_for(image)
           %td= image.alt
           %td.actions
-            = link_to_with_icon 'icon-edit', t('spree.edit'), edit_admin_product_image_url(@product, image), no_text: true, data: { action: 'edit'}
-            = link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true }
+            = link_to_with_icon 'icon-edit', t('spree.edit'), edit_admin_product_image_url(@product, image, @url_filters), no_text: true, data: { action: 'edit'}
+            = link_to_delete image, { url: admin_product_image_url(@product, image, @url_filters), no_text: true }

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

@@ -1,10 +1,10 @@
-= form_for [:admin, @product, @image], html: { multipart: true } do |f|
+= form_for [:admin, @product, @image], url: admin_product_images_path(@product, @image, @url_filters), html: { multipart: true } do |f|
   %fieldset
     %legend{ align: "center" }= t('spree.new_image')
     = render partial: 'form', locals: { f: f }
     .form-buttons.filter-actions.actions
       = button t('spree.actions.update'), 'icon-refresh'
       %span.or= t('spree.or')
-      = link_to_with_icon 'icon-remove', t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button'
+      = link_to_with_icon 'icon-remove', t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button'
 
 = javascript_include_tag 'admin/spree/images/new.js'

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

@@ -0,0 +1,45 @@
+- if use_billing
+  .field{style: "position: absolute;margin-top: -15px;right: 0;"}
+    %span
+      = check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address))
+      = label_tag 'order[use_billing]', Spree.t(:use_billing_address)
+
+- is_shipping_address = name == Spree.t(:shipping_address)
+- s_or_b = is_shipping_address ? 's' : 'b'
+
+- display_style = (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address == @order.ship_address)) ? 'none' : 'block'
+
+%div{id: "#{is_shipping_address ? 'shipping' : 'billing'}", style: "display: #{display_style}"}
+  %div{class: "field"}
+    = f.label :firstname, Spree.t(:first_name) + ':'
+    = f.text_field :firstname, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :lastname, Spree.t(:last_name) + ':'
+    = f.text_field :lastname, class: 'fullwidth'
+  - if Spree::Config[:company]
+    %div{class: "field"}
+      = f.label :company, Spree.t(:company) + ':'
+      = f.text_field :company, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :address1, Spree.t(:street_address) + ':'
+    = f.text_field :address1, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :address2, Spree.t(:street_address_2) + ':'
+    = f.text_field :address2, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :city, Spree.t(:city) + ':'
+    = f.text_field :city, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :zipcode, Spree.t(:zip) + ':'
+    = f.text_field :zipcode, class: 'fullwidth'
+  %div{class: "field"}
+    = f.label :country_id, Spree.t(:country) + ':'
+    %span{id: "#{s_or_b}country"}
+      = f.collection_select :country_id, available_countries, :id, :name, {}, {class: 'select2 fullwidth', onchange: "update_state('#{s_or_b}')"}
+  %div{class: "field"}
+    = f.label :state_id, Spree.t(:state) + ':'
+    %span{id: "#{s_or_b}state"}
+      = f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth', disabled: f.object.country.states.empty?}
+  %div{class: "field"}
+    = f.label :phone, Spree.t(:phone) + ':'
+    = f.phone_field :phone, class: 'fullwidth'

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

@@ -11,13 +11,13 @@
     %fieldset.no-border-bottom
       %legend{:align => "center"}= Spree.t(:billing_address)
       = f.fields_for :bill_address do |ba_form|
-        = render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false }
+        = render :partial => 'address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false }
 
   .omega.six.columns{"data-hook" => "ship_address_wrapper"}
     %fieldset.no-border-bottom
       %legend{:align => "center"}= Spree.t(:shipping_address)
       = f.fields_for :ship_address do |sa_form|
-        = render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => Spree.t(:shipping_address), :use_billing => true }
+        = render :partial => 'address_form', :locals => { :f => sa_form, :name => Spree.t(:shipping_address), :use_billing => true }
 
   .clear
 
@@ -26,3 +26,4 @@
 
   - content_for :head do
     = javascript_include_tag 'admin/spree/orders/address_states.js'
+    = javascript_include_tag 'admin/spree/orders/use_billing.js'

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

@@ -11,7 +11,8 @@
       %col{style: "width: 13%"}
       %col{style: "width: 14%"}
       %col{style: "width: 32%"}
-      %col{style: "width: 14%"}
+      - if spree_current_user.admin?
+        %col{style: "width: 14%"}
       %col{style: "width:  8%"}
       %col{style: "width:  8%"}
       %col{style: "width: 11%"}
@@ -20,7 +21,8 @@
         %th= t('.name')
         %th= t('.products_distributor')
         %th= t('.provider')
-        %th= t('.environment')
+        - if spree_current_user.admin?
+          %th= t('.environment')
         %th= t('.display')
         %th= t('.active')
         %th.actions
@@ -33,7 +35,8 @@
               = distributor.name
               %br/
           %td= method.class.clean_name
-          %td.align-center= method.environment.to_s.titleize
+          - if spree_current_user.admin?
+            %td.align-center= method.environment.to_s.titleize
           %td.align-center= method.display_on.blank? ? t('.both') : t('.' + method.display_on.to_s)
           %td.align-center= method.active ? t('.active_yes') : t('.active_no')
           %td.actions

app/views/spree/admin/payments/source_forms/_stripe.html.haml

@@ -1,6 +1,7 @@
 -# = render "spree/admin/payments/source_forms/gateway", payment_method: payment_method
 .stripe
-  %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
+  = render "shared/stripe_js"
+
   - if Stripe.publishable_key
     :javascript
       angular.module('admin.payments').value("stripeObject", Stripe("#{Stripe.publishable_key}"))

app/views/spree/admin/payments/source_forms/_stripe_sca.html.haml

@@ -1,5 +1,6 @@
 .stripe
-  %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
+  = render "shared/stripe_js"
+
   - if Stripe.publishable_key
     :javascript
       angular.module('admin.payments').value("stripeObject", Stripe("#{Stripe.publishable_key}"))

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

@@ -11,4 +11,4 @@
     = f.text_field :value, class: 'autocomplete'
   %td.actions
     - if f.object.persisted?
-      = link_to_delete f.object, no_text: true
+      = link_to_delete f.object, { url: admin_product_product_property_url(@product, f.object, @url_filters), no_text: true } 

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

@@ -9,7 +9,7 @@
     %li
       = link_to_add_fields t('.add_product_properties'), 'tbody#product_properties', class: 'icon-plus button'
 
-= form_for @product, url: admin_product_url(@product), method: :put do |f|
+= form_for @product, url: admin_product_url(@product, @url_filters), method: :put do |f|
   %fieldset.no-border-top
     .add_product_properties
     = image_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator'
@@ -46,7 +46,10 @@
               %td.actions
 
 
-    = render partial: 'spree/admin/shared/edit_resource_links'
+    .form-buttons.filter-actions.actions
+      = button t('spree.actions.update'), 'icon-refresh'
+      %span.or= t('spree.or')
+      = link_to t('spree.actions.cancel'), admin_product_product_properties_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'
 
     = hidden_field_tag 'clear_product_properties', 'true'
 

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

@@ -1,5 +1,5 @@
 - content_for :page_actions do
-  %li= button_link_to t('admin.products.back_to_products_list'), admin_products_path, :icon => 'icon-arrow-left'
+  %li= button_link_to t('admin.products.back_to_products_list'), "#{admin_products_path}#{(@url_filters.empty? ? "" : "#?#{@url_filters.to_query}")}", :icon => 'icon-arrow-left'
   %li#new_product_link
     = button_link_to t(:new_product), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_product' }
 
@@ -8,7 +8,10 @@
 = render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' }
 = render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
 
-= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f|
+= form_for [:admin, @product], :url => admin_product_path(@product, @url_filters), :method => :put, :html => { :multipart => true } do |f|
   %fieldset.no-border-top{'ng-app' => 'admin.products'}
     = render :partial => 'form', :locals => { :f => f }
-    = render :partial => 'spree/admin/shared/edit_resource_links'
+    .form-buttons.filter-actions.actions
+      = button t(:update), 'icon-refresh'
+      %span.or= t(:or)
+      = button_link_to t(:cancel), "#{collection_url}#{(@url_filters.empty? ? "" : "#?#{@url_filters.to_query}")}", icon: 'icon-remove'

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

@@ -1,8 +1,11 @@
 = render partial: 'spree/admin/shared/product_sub_menu'
-= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Group Buy Options' }
-= render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
+= render partial: 'spree/admin/shared/product_tabs', locals: { :current => 'Group Buy Options' }
+= render partial: 'spree/shared/error_messages', locals: { :target => @product }
 
-= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f|
+= form_for [:admin, @product], url: admin_product_url(@product, @url_filters),  method: :put, html: { :multipart => true } do |f|
   %fieldset.no-border-top
-    = render :partial => 'group_buy_form', :locals => { :f => f }
-    = render :partial => 'spree/admin/shared/edit_resource_links'
+    = render partial: 'group_buy_form', locals: { f: f }
+    .form-buttons.filter-actions.actions
+      = button t('spree.actions.update'), 'icon-refresh'
+      %span.or= t('spree.or')
+      = link_to t('spree.actions.cancel'), edit_admin_product_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'

app/views/spree/admin/products/index/_filters.html.haml

@@ -5,22 +5,20 @@
     .quick_search.three.columns.alpha
       %label{ for: 'quick_filter' }
       %br
-      %input.quick-search.fullwidth{ ng: {model: 'query'}, name: "quick_filter", type: 'text', placeholder: t('admin.quick_search'), "ng-keypress" => "$event.keyCode === 13 && fetchProducts()" }
+      %input.quick-search.fullwidth{ ng: {model: 'q.query'}, name: "quick_filter", type: 'text', placeholder: t('admin.quick_search'), "ng-keypress" => "$event.keyCode === 13 && fetchProducts()" }
     .one.columns  
     .filter_select.three.columns
       %label{ for: 'producer_filter' }= t 'producer'
       %br
-      %select.fullwidth{ id: 'producer_filter', 'ofn-select2-min-search' => 5, ng: {model: 'producerFilter', options: 'producer.id as producer.name for producer in producers'} }
+      %select.fullwidth{ id: 'producer_filter', 'ofn-select2-min-search' => 5, ng: {model: 'q.producerFilter', options: 'producer.id as producer.name for producer in producers'} }
     .filter_select.three.columns
       %label{ for: 'category_filter' }= t 'category'
       %br
-      %select.fullwidth{ id: 'category_filter', 'ofn-select2-min-search' => 5, ng: {model: 'categoryFilter', options: 'taxon.id as taxon.name for taxon in taxons'} }
+      %select.fullwidth{ id: 'category_filter', 'ofn-select2-min-search' => 5, ng: {model: 'q.categoryFilter', options: 'taxon.id as taxon.name for taxon in taxons'} }
     .filter_select.three.columns
       %label{ for: 'import_filter' } Import Date
       %br
-      %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}"}}
-        %option{value: "{{date.id}}", ng: {repeat: "date in importDates" }}
-          {{date.name}}
+      %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'q.importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}", options: 'date.id as date.name for date in importDates'} }
 
     .filter_clear.three.columns.omega
       %label{ for: 'clear_all_filters' }

app/views/spree/admin/products/index/_indicators.html.haml

@@ -3,12 +3,12 @@
   %img.spinner{ src: image_path("spinning-circles.svg") }
   %h1= t('.title')
 
-%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && query.length==0' }
+%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length == 0' }
   %h1#no_results= t('.no_products')
 
-%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && query.length!=0' }
+%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length != 0' }
   %h1#no_results
     = t('.no_results')
     '
-    {{query}}
-    '
+    {{q.query}}
+    '