Update translations from Transifex

Transifex

.codeclimate.yml

@@ -2,7 +2,7 @@ version: "2"
 plugins:
   rubocop:
     enabled: true
-    channel: "rubocop-0-57"
+    channel: "rubocop-0-76"
     config:
       file: ".rubocop_styleguide.yml"
   scss-lint:

.github/ISSUE_TEMPLATE/release.md

@@ -1,7 +1,7 @@
 ---
 name: Release task
 about: Track the process of a new release
-title: ''
+title: 'Release v'
 labels: ''
 assignees: ''
 
@@ -10,10 +10,13 @@ assignees: ''
 Steps: 
 
 - [ ] Include translations
-- [ ] Draft: https://github.com/openfoodfoundation/openfoodnetwork/releases/new <!-- replace the URL -->
+- [ ] [Draft new release]
+- [ ] Notify #instance-managers of user-facing changes.
 - [ ] Test: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master <!-- replace the URL -->
 - [ ] Publish and notify #global-community
 - [ ] Deploy and notify #instance-managers
 - [ ] Nudge next release manager
 
 The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
+
+[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A

.rubocop_manual_todo.yml

@@ -39,11 +39,8 @@ Layout/LineLength:
   - app/controllers/admin/variant_overrides_controller.rb
   - app/controllers/api/enterprise_attachment_controller.rb
   - app/controllers/api/product_images_controller.rb
-  - app/controllers/application_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/adjustments_controller_decorator.rb
   - app/controllers/spree/admin/orders_controller_decorator.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/paypal_controller_decorator.rb
   - app/controllers/stripe/callbacks_controller.rb
@@ -356,24 +353,22 @@ Metrics/AbcSize:
   - app/controllers/api/variants_controller.rb
   - app/controllers/base_controller.rb
   - app/controllers/cart_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/discourse_sso_controller.rb
   - app/controllers/enterprises_controller.rb
   - app/controllers/spree/admin/adjustments_controller_decorator.rb
   - app/controllers/spree/admin/image_settings_controller.rb
-  - app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
-  - app/controllers/spree/admin/orders_controller_decorator.rb
+  - app/controllers/spree/admin/orders/customer_details_controller.rb
+  - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/overview_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller.rb
+  - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/resource_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/search_controller_decorator.rb
+  - app/controllers/spree/admin/search_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
   - app/controllers/spree/admin/variants_controller.rb
-  - app/controllers/spree/checkout_controller.rb
   - app/controllers/spree/credit_cards_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/controllers/spree/user_passwords_controller.rb
@@ -495,8 +490,6 @@ Metrics/CyclomaticComplexity:
   Exclude:
   - app/controllers/admin/enterprise_fees_controller.rb
   - app/controllers/admin/enterprises_controller.rb
-  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -526,8 +519,6 @@ Metrics/PerceivedComplexity:
   Exclude:
   - app/controllers/admin/enterprises_controller.rb
   - app/controllers/api/variants_controller.rb
-  - app/controllers/checkout_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/orders_controller.rb
   - app/helpers/checkout_helper.rb
@@ -564,16 +555,15 @@ Metrics/MethodLength:
   - app/controllers/api/variants_controller.rb
   - app/controllers/base_controller.rb
   - app/controllers/cart_controller.rb
-  - app/controllers/checkout_controller.rb
   - app/controllers/shop_controller.rb
   - app/controllers/spree/admin/image_settings_controller.rb
-  - app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
+  - app/controllers/spree/admin/orders/customer_details_controller.rb
+  - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
-  - app/controllers/spree/admin/payments_controller_decorator.rb
+  - app/controllers/spree/admin/payments_controller.rb
+  - app/controllers/spree/admin/products_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/resource_controller.rb
-  - app/controllers/spree/admin/products_controller.rb
-  - app/controllers/spree/admin/search_controller_decorator.rb
   - app/controllers/spree/admin/tax_categories_controller.rb
   - app/controllers/spree/admin/taxons_controller.rb
   - app/controllers/spree/admin/users_controller.rb
@@ -652,8 +642,10 @@ Metrics/ClassLength:
   - app/controllers/admin/order_cycles_controller.rb
   - app/controllers/admin/subscriptions_controller.rb
   - app/controllers/api/products_controller.rb
+  - app/controllers/application_controller.rb
   - app/controllers/checkout_controller.rb
   - app/controllers/spree/admin/base_controller.rb
+  - app/controllers/spree/admin/orders_controller.rb
   - app/controllers/spree/admin/payment_methods_controller.rb
   - app/controllers/spree/admin/reports_controller.rb
   - app/controllers/spree/admin/resource_controller.rb

.rubocop_todo.yml

@@ -335,6 +335,7 @@ Rails/OutputSafety:
     - 'app/helpers/spree/admin/zones_helper.rb'
     - 'app/helpers/spree/reports_helper.rb'
     - 'app/helpers/spree/admin/navigation_helper.rb'
+    - 'app/helpers/spree/admin/orders_helper.rb'
     - 'app/serializers/api/product_serializer.rb'
     - 'lib/spree/money_decorator.rb'
     - 'spec/features/admin/orders_spec.rb'

Gemfile

@@ -39,7 +39,7 @@ gem 'activemerchant', '~> 1.78'
 gem 'devise', '~> 2.2.5'
 gem 'devise-encryptable', '0.2.0'
 gem 'jwt', '~> 2.2'
-gem 'oauth2', '~> 1.4.2' # Used for Stripe Connect
+gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
 
 gem 'daemons'
 gem 'delayed_job_active_record'
@@ -93,7 +93,7 @@ gem 'wkhtmltopdf-binary'
 
 gem 'foreigner'
 gem 'immigrant'
-gem 'roo', '~> 2.8.2'
+gem 'roo', '~> 2.8.3'
 
 gem 'whenever', require: false
 

Gemfile.lock

@@ -166,7 +166,7 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.5.0)
-    bugsnag (6.12.2)
+    bugsnag (6.13.0)
       concurrent-ruby (~> 1.0)
     builder (3.0.4)
     byebug (9.0.6)
@@ -261,7 +261,7 @@ GEM
     factory_bot_rails (4.10.0)
       factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffaker (1.22.1)
     ffi (1.11.3)
@@ -458,7 +458,7 @@ GEM
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.11.2)
+    kgio (2.11.3)
     knapsack (1.18.0)
       rake
     launchy (2.4.3)
@@ -486,13 +486,13 @@ GEM
     newrelic_rpm (3.18.1.330)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    oauth2 (1.4.2)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.10.1)
+    oj (3.10.2)
     orm_adapter (0.5.0)
     paper_trail (5.2.3)
       activerecord (>= 3.0, < 6.0)
@@ -530,7 +530,7 @@ GEM
     rack (1.4.7)
     rack-cache (1.9.0)
       rack (>= 0.4)
-    rack-mini-profiler (1.1.4)
+    rack-mini-profiler (1.1.6)
       rack (>= 1.2.0)
     rack-protection (1.5.5)
       rack
@@ -559,7 +559,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.0)
+    raindrops (0.19.1)
     rake (13.0.0)
     ransack (0.7.2)
       actionpack (~> 3.0)
@@ -584,9 +584,9 @@ GEM
     roadie-rails (1.3.0)
       railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
-    roo (2.8.2)
+    roo (2.8.3)
       nokogiri (~> 1)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -620,7 +620,6 @@ GEM
     rubocop-rails (2.4.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    ruby-ole (1.2.12.1)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
     rubyzip (1.3.0)
@@ -677,7 +676,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.1)
-    unicorn (5.5.2)
+    unicorn (5.5.3)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-rails (2.2.1)
@@ -694,7 +693,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.8.0)
+    webmock (3.8.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -767,7 +766,7 @@ DEPENDENCIES
   momentjs-rails
   newrelic_rpm (~> 3.0)
   nokogiri (>= 1.6.7.1)
-  oauth2 (~> 1.4.2)
+  oauth2 (~> 1.4.4)
   ofn-qz!
   oj
   order_management!
@@ -784,7 +783,7 @@ DEPENDENCIES
   rails_safe_tasks (~> 1.0)
   redcarpet
   roadie-rails (~> 1.3.0)
-  roo (~> 2.8.2)
+  roo (~> 2.8.3)
   rspec-rails (>= 3.5.2)
   rspec-retry
   rubocop

app/assets/javascripts/admin/all.js

@@ -12,6 +12,10 @@
 //= require jquery.ui.all
 //= require jquery-ui-timepicker-addon
 //= require jquery.powertip
+//= require jquery.cookie
+//= require jquery.jstree/jquery.jstree
+//= require jquery.vAlign
+//= require jquery.horizontalNav
 //= require angular
 //= require angular-resource
 //= require angular-animate
@@ -23,8 +27,13 @@
 //= require lodash.underscore.js
 
 // spree
+//= require spree
+//= require admin/spree-select2
 //= require admin/spree_backend
 //= require modernizr
+//= require spin
+//= require jquery.adaptivemenu
+//= require equalize
 //= require css_browser_selector_dev
 //= require responsive-tables
 //= require admin/spree_paypal_express

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) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -38,6 +38,8 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
+  $scope.sortOptions = SortOptions
+
   $scope.initialise = ->
     $scope.fetchProducts()
 
@@ -54,6 +56,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       'q[name_cont]': $scope.query,
       'q[supplier_id_eq]': $scope.producerFilter,
       'q[primary_taxon_id_eq]': $scope.categoryFilter,
+      'q[s]': $scope.sorting,
       import_date: $scope.importDateFilter,
       page: $scope.page,
       per_page: $scope.per_page
@@ -103,9 +106,16 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.categoryFilter = "0"
     $scope.importDateFilter = "0"
 
+  $scope.$watch 'sortOptions', (sort) ->
+    return unless sort && sort.predicate != ""
+
+    $scope.sorting = sort.getSortingExpr()
+    $scope.fetchProducts()
+  , true
+
   confirm_unsaved_changes = () ->
     (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
-  
+
   editProductUrl = (product, variant) ->
     "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 

app/assets/javascripts/admin/index_utils/services/sort_options.js.coffee

@@ -3,6 +3,11 @@ angular.module("admin.indexUtils").factory 'SortOptions', ->
     predicate: ""
     reverse: true
 
+    getSortingExpr: () ->
+      sortingExpr = this.predicate + ' desc' if this.reverse
+      sortingExpr = this.predicate + ' asc' if !this.reverse
+      sortingExpr
+
     toggle: (predicate) ->
       @reverse = (@predicate == predicate) && !@reverse
       @predicate = predicate

app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee

@@ -48,13 +48,15 @@ angular.module('admin.orderCycles')
 
       return if enterprise.last_page_loaded? && enterprise.last_page_loaded >= page
       enterprise.last_page_loaded = page
+      enterprise.loaded_variants ?= 0
 
       incoming = true if $scope.view == 'incoming'
       params = { exchange_id: exchange.id, enterprise_id: exchange.enterprise_id, order_cycle_id: $scope.order_cycle.id, incoming: incoming, page: page}
-      ExchangeProduct.index params, (products, num_of_pages, num_of_products) ->
+      ExchangeProduct.index params, (products, num_of_pages) ->
         enterprise.num_of_pages = num_of_pages
-        enterprise.num_of_products = num_of_products
         enterprise.supplied_products.push products...
+        angular.forEach products, (product) ->
+          enterprise.loaded_variants += product.variants.length
 
     $scope.loadMoreExchangeProducts = (exchange) ->
       $scope.loadExchangeProducts(exchange, $scope.enterprises[exchange.enterprise_id].last_page_loaded + 1)

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -64,10 +64,10 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
       $scope.selected_orders.push order.id if $scope.select_all
 
   $scope.$watch 'sortOptions', (sort) ->
-    if sort && sort.predicate != ""
-      $scope.sorting = sort.predicate + ' desc' if sort.reverse
-      $scope.sorting = sort.predicate + ' asc' if !sort.reverse
-      $scope.fetchResults()
+    return unless sort && sort.predicate != ""
+
+    $scope.sorting = sort.getSortingExpr()
+    $scope.fetchProducts()
   , true
 
   $scope.capturePayment = (order) ->

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

@@ -21,9 +21,7 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
 
         else
           value = @variant.unit_value
-          unit_name = @variant.product.variant_unit_name
-          # TODO needs to add pluralize to line below
-          # unit_name = unit_name if value > 1
+          unit_name = @pluralize(@variant.product.variant_unit_name, value)
 
         value = parseInt(value, 10) if value == parseInt(value, 10)
 
@@ -32,6 +30,21 @@ angular.module("admin.products").factory "OptionValueNamer", (VariantUnitManager
 
       [value, unit_name]
 
+    pluralize: (unit_name, count) ->
+      return unit_name if count == undefined
+      unit_key = @unit_key(unit_name)
+      return unit_name unless unit_key
+      I18n.t(["inflections", unit_key], {count: count, defaultValue: unit_name})
+
+    unit_key: (unit_name) ->
+      unless I18n.unit_keys
+        I18n.unit_keys = {}
+        for key, translations of I18n.t("inflections")
+          for quantifier, translation of translations
+            I18n.unit_keys[translation.toLowerCase()] = key
+
+      I18n.unit_keys[unit_name.toLowerCase()]
+
     option_value_value_unit_scaled: ->
       [unit_scale, unit_name] = @scale_for_unit_value()
 

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

@@ -0,0 +1,228 @@
+//= require_self
+//= require admin/handlebar_extensions
+//= require admin/variant_autocomplete
+
+/**
+This is a collection of javascript functions and whatnot
+under the spree namespace that do stuff we find helpful.
+Hopefully, this will evolve into a propper class.
+**/
+
+jQuery(function($) {
+  // Make main menu use full width
+  mainMenu = $('.fullwidth-menu')
+  if (typeof mainMenu.horizontalNav === 'function' )
+    mainMenu.horizontalNav({
+      tableDisplay: false,
+      responsiveDelay: 0
+    });
+
+  // Vertical align of checkbox fields
+  if (typeof $('.field.checkbox label').vAlign === 'function' )
+    $('.field.checkbox label').vAlign()
+
+  // if (typeof Spree !== 'undefined') {
+  // $('.main-menu-wrapper ul').AdaptiveMenu({
+  //     text: "<a href='#'><i class='icon-chevron-down'></i> " + Spree.translations.more + "</a>",
+  //     klass: "dropdown"
+  //   });
+  // }
+
+  // Add some tips
+  if (typeof $('.with-tip').powerTip === 'function' ) {
+    $('.with-tip').powerTip({
+       smartPlacement: true,
+       fadeInTime: 50,
+       fadeOutTime: 50,
+       intentPollInterval: 300
+     });
+
+    $('.with-tip').on({
+      powerTipPreRender: function(){
+        $('#powerTip').addClass($(this).attr("data-action"));
+        $('#powerTip').addClass($(this).attr("data-tip-color"));
+      },
+      powerTipClose: function(){
+        $('#powerTip').removeClass($(this).attr("data-action"))
+      }
+    });
+  }
+
+  // Make flash messages dissapear
+  setTimeout('$(".flash").fadeOut()', 5000);
+
+  // Highlight hovered table column
+  $('table tbody tr td.actions a').hover(function(){
+    var tr = $(this).closest('tr');
+    var klass = 'highlight action-' + $(this).attr('data-action')
+    tr.addClass(klass)
+    tr.prev().addClass('before-' + klass);
+  }, function(){
+    var tr = $(this).closest('tr');
+    var klass = 'highlight action-' + $(this).attr('data-action')
+    tr.removeClass(klass)
+    tr.prev().removeClass('before-' + klass);
+  });
+
+  // Trunkate text in page_title that didn't fit
+  var truncate_elements = $('.truncate');
+
+  truncate_elements.each(function(){
+    $(this).trunk8();
+  });
+  $(window).resize(function (event) {
+    truncate_elements.each(function(){
+      $(this).trunk8();
+    })
+  });
+
+  // Make height of dt/dd elements the same
+  if (typeof $("dl").equalize === 'function' )
+    $("dl").equalize('outerHeight');
+});
+
+
+$.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
+
+// Overriding a broken function in Spree. Bug report at
+// https://github.com/spree/spree/issues/4032
+show_flash_error = function(message) {
+  error_div = $('.flash.error');
+  if (error_div.length > 0) {
+    error_div.html(message);
+    error_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
+    } else {
+      $("#progress").before('<div class="flash error">' + message + '</div>');
+    }
+  }
+}
+
+// Apply to individual radio button that makes another element visible when checked
+$.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
+  if(!this.get(0)){ return  }
+  showValue = this.get(0).value;
+  radioGroup = $("input[name='" + this.get(0).name + "']");
+  radioGroup.each(function(){
+    $(this).click(function(){
+      $(dependentElementSelector).visible(this.checked && this.value == showValue)
+    });
+    if(this.checked){ this.click() }
+  });
+}
+
+$(document).ready(function() {
+  if (typeof Spree !== 'undefined') {
+    handle_date_picker_fields = function(){
+      $('.datepicker').datepicker({
+        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: "focus"
+      });
+
+      // Correctly display range dates
+      $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
+        $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );
+      });
+      $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function(selectedDate) {
+        $(".date-range-filter .datepicker-from" ).datepicker( "option", "maxDate", selectedDate );
+      });
+    }
+
+    handle_date_picker_fields();
+  }
+
+  $(".observe_field").on('change', function() {
+    target = $(this).attr("data-update");
+    ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
+    $(target).hide();
+    $(ajax_indicator).show();
+    $.ajax({ dataType: 'html',
+             url: $(this).attr("data-base-url")+encodeURIComponent($(this).val()),
+             type: 'get',
+             success: function(data){
+               $(target).html(data);
+               $(ajax_indicator).hide();
+               $(target).show();
+             }
+    });
+  });
+
+  $('.spree_add_fields').click(function() {
+    var target = $(this).data("target");
+    var new_table_row = $(target + ' tr:visible:last').clone();
+    var new_id = new Date().getTime();
+    new_table_row.find("input, select").each(function () {
+      var el = $(this);
+      el.val("");
+      if (typeof el.attr("id") !== 'undefined') el.attr("id", el.attr("id").replace(/\d+/, new_id))
+      if (typeof el.attr("name") !== 'undefined') el.attr("name", el.attr("name").replace(/\d+/, new_id))
+    })
+    // When cloning a new row, set the href of all icons to be an empty "#"
+    // This is so that clicking on them does not perform the actions for the
+    // duplicated row
+    new_table_row.find("a").each(function () {
+      var el = $(this);
+      el.attr('href', '#');
+    })
+    $(target).prepend(new_table_row);
+  })
+
+  // Fix sortable helper
+  var fixHelper = function(e, ui) {
+      ui.children().each(function() {
+          $(this).width($(this).width());
+      });
+      return ui;
+  };
+
+  $('table.sortable').ready(function(){
+    var td_count = $(this).find('tbody tr:first-child td').length
+
+    if (typeof $('table.sortable tbody').sortable !== 'function' )
+      return
+
+    $('table.sortable tbody').sortable(
+      {
+        handle: '.handle',
+        helper: fixHelper,
+        placeholder: 'ui-sortable-placeholder',
+        update: function(event, ui) {
+          $("#progress").show();
+          positions = {};
+          $.each($('table.sortable tbody tr'), function(position, obj){
+            reg = /spree_(\w+_?)+_(\d+)/;
+            parts = reg.exec($(obj).attr('id'));
+            if (parts) {
+              positions['positions['+parts[2]+']'] = position;
+            }
+          });
+          $.ajax({
+            type: 'POST',
+            dataType: 'script',
+            url: $(ui.item).closest("table.sortable").data("sortable-link"),
+            data: positions,
+            success: function(data){ $("#progress").hide(); }
+          });
+        },
+        start: function (event, ui) {
+          // Set correct height for placehoder (from dragged tr)
+          ui.placeholder.height(ui.item.height())
+          // Fix placeholder content to make it correct width
+          ui.placeholder.html("<td colspan='"+(td_count-1)+"'></td><td class='actions'></td>")
+        },
+        stop: function (event, ui) {
+          // Fix odd/even classes after reorder
+          $("table.sortable tr:even").removeClass("odd even").addClass("even");
+          $("table.sortable tr:odd").removeClass("odd even").addClass("odd");
+        }
+
+      });
+  });
+});

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

@@ -0,0 +1,27 @@
+$(document).ready ->
+  opts =
+    lines: 11
+    length: 2
+    width: 3
+    radius: 9
+    corners: 1
+    rotate: 0
+    color: '#fff'
+    speed: 0.8
+    trail: 48
+    shadow: false
+    hwaccel: true
+    className: 'spinner'
+    zIndex: 2e9
+    top: 'auto'
+    left: 'auto'
+
+  target = document.getElementById("spinner")  
+
+  $(document).ajaxStart ->
+    $("#progress").fadeIn()
+    spinner = new Spinner(opts).spin(target)    
+
+  $(document).ajaxStop ->
+    $("#progress").fadeOut()    
+

app/assets/javascripts/admin/spree/spree-select2.js.erb

@@ -0,0 +1,8 @@
+//= require select2
+jQuery(function($) {
+  // Make select beautiful
+  if (typeof $('select.select2').select2 === 'function' )
+    $('select.select2').select2({
+       allowClear: true
+    });
+})

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

@@ -0,0 +1,22 @@
+root = exports ? this
+
+root.taxon_tree_menu = (obj, context) ->
+
+  base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
+  admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons_path)
+  edit_url = admin_base_url.clone()
+  edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
+
+  create:
+    label: "<i class='icon-plus'></i> " + Spree.translations.add,
+    action: (obj) -> context.create(obj)
+  rename:
+    label: "<i class='icon-pencil'></i> " + Spree.translations.rename,
+    action: (obj) -> context.rename(obj)
+  remove:
+    label: "<i class='icon-trash'></i> " + Spree.translations.remove,
+    action: (obj) -> context.remove(obj)
+  edit:
+    separator_before: true,
+    label: "<i class='icon-edit'></i> " + Spree.translations.edit,
+    action: (obj) -> window.location = edit_url.toString()

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

@@ -0,0 +1,127 @@
+handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
+  $.jstree.rollback(last_rollback)
+  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br />" + taxonomy_tree_error)
+
+handle_move = (e, data) ->
+  last_rollback = data.rlbk
+  position = data.rslt.cp
+  node = data.rslt.o
+  new_parent = data.rslt.np
+
+  url = Spree.url(base_url).clone()
+  url.setPath url.path() + '/' + node.attr("id")
+  $.ajax
+    type: "POST",
+    dataType: "json",
+    url: url.toString(),
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    error: handle_ajax_error
+
+  true
+
+handle_create = (e, data) ->
+  last_rollback = data.rlbk
+  node = data.rslt.obj
+  name = data.rslt.name
+  position = data.rslt.position
+  new_parent = data.rslt.parent
+
+  $.ajax
+    type: "POST",
+    dataType: "json",
+    url: base_url.toString(),
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
+    error: handle_ajax_error,
+    success: (data,result) ->
+      node.attr('id', data.id)
+
+handle_rename = (e, data) ->
+  last_rollback = data.rlbk
+  node = data.rslt.obj
+  name = data.rslt.new_name
+
+  url = Spree.url(base_url).clone()
+  url.setPath(url.path() + '/' + node.attr("id"))
+
+  $.ajax
+    type: "POST",
+    dataType: "json",
+    url: url.toString(),
+    data: {_method: "put", "taxon[name]": name },
+    error: handle_ajax_error
+
+handle_delete = (e, data) ->
+  last_rollback = data.rlbk
+  node = data.rslt.obj
+  delete_url = base_url.clone()
+  delete_url.setPath delete_url.path() + '/' + node.attr("id")
+  if confirm(Spree.translations.are_you_sure_delete)
+    $.ajax
+      type: "POST",
+      dataType: "json",
+      url: delete_url.toString(),
+      data: {_method: "delete"},
+      error: handle_ajax_error
+  else
+    $.jstree.rollback(last_rollback)
+    last_rollback = null
+
+root = exports ? this
+root.setup_taxonomy_tree = (taxonomy_id) ->
+  if taxonomy_id != undefined
+    # this is defined within admin/taxonomies/edit
+    root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
+
+    $.ajax
+      url: base_url.path().replace("/taxons", "/jstree"),
+      success: (taxonomy) ->
+        last_rollback = null
+
+        conf =
+          json_data:
+            data: taxonomy,
+            ajax:
+              url: (e) ->
+                base_url.path() + '/' + e.attr('id') + '/jstree'
+          themes:
+            theme: "apple",
+            url: "/assets/jquery.jstree/themes/apple/style.css"
+          strings:
+            new_node: new_taxon,
+            loading: Spree.translations.loading + "..."
+          crrm:
+            move:
+              check_move: (m) ->
+                position = m.cp
+                node = m.o
+                new_parent = m.np
+
+                # no parent or cant drag and drop
+                if !new_parent || node.attr("rel") == "root"
+                  return false
+
+                # can't drop before root
+                if new_parent.attr("id") == "taxonomy_tree" && position == 0
+                  return false
+
+                true
+          contextmenu:
+            items: (obj) ->
+              taxon_tree_menu(obj, this)
+          plugins: ["themes", "json_data", "dnd", "crrm", "contextmenu"]
+
+        $("#taxonomy_tree").jstree(conf)
+          .bind("move_node.jstree", handle_move)
+          .bind("remove.jstree", handle_delete)
+          .bind("create.jstree", handle_create)
+          .bind("rename.jstree", handle_rename)
+          .bind "loaded.jstree", ->
+            $(this).jstree("core").toggle_node($('.jstree-icon').first())
+
+    $("#taxonomy_tree a").on "dblclick", (e) ->
+      $("#taxonomy_tree").jstree("rename", this)
+
+    # surpress form submit on enter/return
+    $(document).keypress (e) ->
+      if e.keyCode == 13
+        e.preventDefault()

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

@@ -16,22 +16,6 @@ $(document).ready(function() {
   });
 });
 
-// Overriding a broken function in Spree. Bug report at
-// https://github.com/spree/spree/issues/4032
-show_flash_error = function(message) {
-  error_div = $('.flash.error');
-  if (error_div.length > 0) {
-    error_div.html(message);
-    error_div.show();
-  } else {
-    if ($("#content .toolbar").length > 0) {
-      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
-    } else {
-      $("#progress").before('<div class="flash error">' + message + '</div>');
-    }
-  }
-}
-
 $(document).ready(function(){
   $('a.close').click(function(event){
     event.preventDefault();

app/assets/javascripts/templates/admin/panels/exchange_products_distributed.html.haml

@@ -9,7 +9,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'setExchangeVariants(exchange, incomingExchangeVariantsFor(exchange.enterprise_id), exchange.select_all_variants)',
           'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants' }
-        {{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+        {{ 'js.admin.panels.exchange_products.select_all_variants' | t:{ total_number_of_variants: exchangeTotalVariants(exchange) } }}
 
     .exchange-products{ 'ng-hide' => 'productsLoading()' }
       .exchange-product{'ng-repeat' => 'product in enterprises[exchange.enterprise_id].supplied_products | filter:visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges' }

app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml

@@ -1,11 +1,11 @@
 .pagination{ 'ng-show' => 'enterprises[exchange.enterprise_id].last_page_loaded < enterprises[exchange.enterprise_id].num_of_pages && !productsLoading()'}
   .button{ 'ng-click' => 'loadMoreExchangeProducts(exchange)' }
-    {{ 'js.admin.panels.exchange_products.load_more_products' | t }}
+    {{ 'js.admin.panels.exchange_products.load_more_variants' | t }}
   .button{ 'ng-click' => 'loadAllExchangeProducts(exchange)' }
-    {{ 'js.admin.panels.exchange_products.load_all_products' | t }}
+    {{ 'js.admin.panels.exchange_products.load_all_variants' | t }}
 
 .sixteen.columns.alpha#loading{ 'ng-show' => 'productsLoading()' }
   %br
   %img.spinner{ src: "/assets/spinning-circles.svg" }
   %h1
-    {{ 'js.admin.panels.exchange_products.loading_products' | t }}
+    {{ 'js.admin.panels.exchange_products.loading_variants' | t }}

app/assets/javascripts/templates/admin/panels/exchange_products_panel_header.html.haml

@@ -1,5 +1,5 @@
 .exchange-load-all-variants
   %div
-    {{ 'js.admin.panels.exchange_products.products_loaded' | t:{ num_of_products_loaded: enterprises[exchange.enterprise_id].supplied_products.length, total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+    {{ 'js.admin.panels.exchange_products.variants_loaded' | t:{ num_of_variants_loaded: enterprises[exchange.enterprise_id].loaded_variants, total_number_of_variants: exchangeTotalVariants(exchange) } }}
     %a{ 'ng-click' => 'loadAllExchangeProducts(exchange)', 'ng-show' => 'enterprises[exchange.enterprise_id].last_page_loaded < enterprises[exchange.enterprise_id].num_of_pages' }
-      {{ 'js.admin.panels.exchange_products.load_all_products' | t }}
+      {{ 'js.admin.panels.exchange_products.load_all_variants' | t }}

app/assets/javascripts/templates/admin/panels/exchange_products_supplied.html.haml

@@ -9,7 +9,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'selectAllVariants(exchange, exchange.select_all_variants)',
           'id' => 'order_cycle_incoming_exchange_{{ $index }}_select_all_variants' }
-        {{ 'js.admin.panels.exchange_products.select_all_products' | t:{ total_number_of_products: enterprises[exchange.enterprise_id].num_of_products } }}
+        {{ 'js.admin.panels.exchange_products.select_all_variants' | t:{ total_number_of_variants: exchangeTotalVariants(exchange) } }}
 
     %div{ 'ng-include' => "'admin/panels/exchange_products_supplied_list.html'" }
 

app/assets/stylesheets/admin/all.scss

@@ -7,6 +7,9 @@
  *= require admin/spree_backend
  *= require jquery.powertip
  *= require responsive-tables
+ *= require normalize
+ *= require skeleton
+ *= require jquery.ui.datepicker
  *= require jquery-ui-timepicker-addon
  *= require shared/textAngular
  *= require shared/ng-tags-input.min
@@ -14,15 +17,27 @@
  *= require_self
 */
 
+//************************************************************************//
+//************************************************************************//
+@import 'globals/functions';
+@import 'globals/variables';
+@import 'variables';
+@import 'globals/mixins';
+
+@import 'shared/typography';
+@import 'shared/tables';
+@import 'shared/icons';
+@import 'shared/forms';
+@import 'shared/layout';
+
 @import 'plugins/powertip';
+@import 'plugins/jstree';
+@import 'plugins/font-awesome';
 
 @import 'hacks/mozilla';
 @import 'hacks/opera';
 @import 'hacks/ie';
 
-@import 'variables';
 @import 'components/*';
-@import 'plugins/font-awesome';
 @import 'pages/*';
-
 @import '*';

app/assets/stylesheets/admin/components/actions.scss

@@ -0,0 +1,33 @@
+@import 'admin/globals/variables';
+
+table tbody tr {
+  &.highlight {
+
+    @each $action in $actions {
+      &.action-#{$action} td {
+        background-color: get-value($actions, $actions-bg-colors, $action);
+        border-color: get-value($actions, $actions-brd-colors, $action);
+      }
+    }
+
+    &.action-remove td, &.action-void td {
+      text-decoration: line-through;
+
+      &.actions {
+        text-decoration: none;
+      }
+    }
+  }
+
+  &.before-highlight {
+    @each $action in $actions {
+      &.action-#{$action} td {
+        border-bottom-color: get-value($actions, $actions-brd-colors, $action);
+      }
+    }
+  }
+
+  td.actions {
+    background-color: transparent !important;
+  }
+}

app/assets/stylesheets/admin/components/admin-menu.css.scss

@@ -1,12 +0,0 @@
-#admin-menu {
-  li {
-    a {
-      font-weight: 600;
-    }
-
-    a::before {
-      font-weight: normal;
-      padding-top: 0;
-    }
-  }
-}

app/assets/stylesheets/admin/components/date-picker.scss

@@ -0,0 +1,158 @@
+@import 'admin/globals/variables';
+@import 'admin/globals/mixins';
+@import 'admin/plugins/font-awesome';
+
+.date-range-filter {
+  .range-divider {
+    padding: 0;
+  }
+  input.datepicker {
+    width: 96px !important;
+  }
+}
+
+#ui-datepicker-div {
+  @include border-radius($border-radius);
+  border-color: $color-3;
+  padding: 0;
+  margin-top: 10px;
+
+  &:before {
+    content: '';
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-bottom: 10px solid $color-3;
+    top: 0px;
+    margin-top: -10px;
+    left: 25px;
+    z-index: 1;
+  }
+
+  .ui-datepicker-header {
+    padding: 0;
+    background-image: none;
+    background-color: $color-3;
+    border: none;
+    border-bottom: none;
+    border-radius: 0;
+    height: 32px;
+
+    .ui-datepicker-prev, .ui-datepicker-next {
+      border-radius: 0;      
+      top: 0;
+      height: 32px;
+
+      &:hover {
+        border: none;
+        background-image: none;
+        background-color: $color-3;
+        cursor: pointer;
+      }
+
+      .ui-icon {
+        background-image: none;
+        text-indent: 0;
+        color: $color-1;
+        width: 10px;
+        margin-left: -5px;
+        @extend [class^="icon-"]:before;
+
+        &:hover {
+          color: very-light($color-2, 25);
+        }
+      }
+    }
+    .ui-datepicker-prev {
+      left: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-left;        
+      }
+    }
+    .ui-datepicker-next {
+      right: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-right;
+      }
+
+      &:hover {
+        .ui-icon {
+          margin-left: -5px;
+        }        
+      }
+    }
+
+    .ui-datepicker-title {
+      color: $color-1;
+      text-transform: uppercase;
+      font-size: 85% !important;
+      padding: 6px 10px;
+    }
+  }
+
+  table.ui-datepicker-calendar {
+    border: none;
+
+    thead {
+      th { 
+        border-bottom: 1px solid $color-border;
+        border-right: 1px solid $color-border;
+        color: $color-body-text;
+        width: 33px;
+
+        &:last-child {
+          border-right: none;
+        }
+      }
+    }
+    tbody {
+      tr:hover {
+        td {
+          background-color: transparent !important;
+        }
+      }
+      &:last-child tr:last-child td {
+        border-bottom: none;
+      }
+      td {
+        a {
+          border: 1px solid transparent;
+          background-color: $color-1;
+          background-image: none;
+          font-size: 85%;
+          color: $color-body-text;
+
+          &.ui-state-active {
+            background-color: $color-2;
+            color: $color-1;
+          }
+
+          &:hover {
+            background-color: $color-2;
+            color: $color-1;
+            border-color: darken($color-2, 5);
+
+          }
+        }
+
+        &.ui-state-disabled {
+          .ui-state-default {
+            border: none;
+            background-image: none;
+            background-color: transparent;
+          }
+        }
+
+        &.ui-datepicker-today {
+          a {
+            background-color: $color-6;
+            color: $color-1;
+            border: 1px solid darken($color-6, 5);
+          }
+        }
+      }      
+    }
+  }
+}

app/assets/stylesheets/admin/components/messages.scss

@@ -0,0 +1,45 @@
+@import 'admin/globals/variables';
+
+.errorExplanation {
+  padding: 5px;
+  border: 1px solid very-light($color-error, 12);
+  background-color: very-light($color-error, 6);
+  border-radius: 3px;
+  color: very-light($color-error, 30);
+  margin-bottom: 15px;
+
+  h2 {
+    font-size: 140%;
+    color: very-light($color-error, 30);
+    margin-bottom: 5px;
+  }
+
+  p {
+    padding: 10px 0;
+  }
+
+  ul {
+    list-style-position: inside;
+
+    li {
+      font-weight: $font-weight-bold;
+    }
+  }
+}
+
+.flash {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  padding: 16px;
+  text-align: center;
+  z-index: 1000;
+  font-size: 120%;
+  color: $color-1;
+  font-weight: 600;
+
+  &.notice  { background-color: rgba($color-notice,  0.8) }
+  &.success { background-color: rgba($color-success, 0.8) }
+  &.error   { background-color: rgba($color-error,   0.8) }
+}

app/assets/stylesheets/admin/components/navigation.scss

@@ -0,0 +1,162 @@
+@import 'admin/globals/variables';
+
+// Navigation
+//---------------------------------------------------
+.inline-menu {
+  margin: 0;
+  -webkit-margin-before: 0;
+  -webkit-padding-start: 0;
+}
+
+nav.menu {
+  ul {
+    list-style: none;
+
+    li {
+      a {
+        padding: 10px 0;
+        display: block;
+        position: relative;
+        text-align: left;
+        border: 1px solid transparent;
+        text-transform: uppercase;
+        font-weight: 600;
+        font-size: 90%;
+      }
+
+      &.active a {
+        color: $color-2;
+        border-left-width: 0;
+        border-bottom-color: $color-2;
+      }
+
+      &:hover a {
+        color: $color-2;
+      }
+    }
+  }
+}
+
+[data-hook="admin_login_navigation_bar"] {
+  ul {
+    text-align: right;
+
+    li {
+      padding: 5px 0 5px 10px;
+      text-align: right;
+      font-size: 90%;
+      color: $color-link;
+      margin-top: 8px;
+
+      &[data-hook="user-logged-in-as"] {
+        width: 50%;
+        color: $color-body-text;
+      }
+
+      &:hover {
+        i {
+          color: $color-2;
+        }
+      }
+    }
+  }
+}
+
+#admin-menu {
+  background-color: $color-3;
+
+  li {
+    min-width: 90px;
+
+    a {
+      display: block;
+      padding: 25px 20px;
+      color: $color-1 !important;
+      text-transform: uppercase;
+      position: relative;
+      text-align: center;
+      font-weight: 600;      
+
+      i {
+        display: inline;
+      }
+
+      &:hover {
+        background-color: $color-2;
+
+        &:after {
+          content: '';
+          position: absolute;
+          border-left: 10px solid transparent;
+          border-right: 10px solid transparent;
+          border-top: 5px solid $color-2;
+          bottom: 0px;
+          margin-bottom: -5px;
+          left: 50%;
+          margin-left: -10px;
+          z-index: 1;
+        }
+      }
+
+      span.text {
+        font-weight: 600;
+      }
+    }
+
+    a::before {
+      font-weight: normal;
+      padding-top: 0;
+    }
+
+    .dropdown {
+      width: 300px;
+      background-color: $color-3;
+      width: 200px;
+      z-index: 100000;
+
+      > li {
+        width: 200px !important;
+
+        a:after {
+          display: none;
+        }
+      }
+    }
+
+    &.selected a {
+      @extend a:hover;
+    }
+  }
+}
+
+#sub-menu {
+  background-color: $color-2;
+  padding-bottom: 0;
+
+  li {
+    a {
+      display: block;
+      padding: 12px 20px;
+      color: $color-1;
+      text-align: center;
+      text-transform: uppercase;
+      position: relative;
+      font-size: 85%;
+    }
+
+    &.selected a, a:hover {
+      &:after {
+        content: '';
+        position: absolute;
+        border-left: 10px solid transparent;
+        border-right: 10px solid transparent;
+        border-top: 5px solid $color-2;
+        bottom: 0px;
+        margin-bottom: -5px;
+        left: 50%;
+        margin-left: -10px;
+        z-index: 1;
+      }
+    }
+  }
+}

app/assets/stylesheets/admin/components/pagination.scss

@@ -1,8 +1,23 @@
+@import 'admin/globals/variables';
 @import "admin/variables";
 
 .pagination {
   text-align: center;
   margin: 2em 0 1em;
+  padding: 10px 0;
+
+  .page {
+    padding: 5px 8px;
+    text-align: center;
+    display: inline-block;
+    text-align: center;
+
+    &.current {
+      background-color: $color-2;
+      border-radius: 3px;
+      color: $color-1;
+    }
+  }
 
   button {
     margin: 0 0.35em;

app/assets/stylesheets/admin/components/progress.scss

@@ -0,0 +1,38 @@
+@import 'admin/globals/variables';
+@import 'admin/globals/mixins';
+
+#progress { 
+  display: none;
+  position: fixed;
+  top: 0;  
+  z-index: 1000;
+  opacity: 0.8;
+  width: 100%;
+
+  .wrapper {
+    @include border-radius(10px);
+    top: -10px;
+    position: absolute;
+    left: 50%;
+    width: 200px;
+    margin-left: -100px;
+    padding: 11px 0;
+    background-color: $color-3;
+    color: $color-1;
+    text-align: center;
+  }
+
+  #spinner {    
+    position: absolute;
+    top: 10px;
+    left: 50%;
+    margin-left: -5px;
+  }
+
+  .progress-message {
+    font-size: 120%;
+    font-weight: $font-weight-bold;
+    margin-top: 20px;
+    text-transform: uppercase;
+  }
+}

app/assets/stylesheets/admin/components/sidebar.scss

@@ -0,0 +1,28 @@
+@import 'admin/globals/variables';
+
+// Sidebar
+//---------------------------------------------------
+#sidebar {
+  overflow: visible;
+  border-top: 1px solid $color-border;
+  margin-top: 17px;
+
+  .sidebar-title {
+    color: $color-2;
+    text-transform: uppercase;
+    text-align: center;
+    font-size: 14px;
+    font-weight: 600;
+
+    > span {
+      display: inline;
+      background: #fff;
+      padding: 5px 10px;
+      position: relative;
+      top: -14px;
+
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+    }
+  }
+}

app/assets/stylesheets/admin/components/states.scss

@@ -0,0 +1,36 @@
+@import 'admin/globals/variables';
+
+.state {
+  text-transform: uppercase;
+  font-size: 80%;
+  font-weight: 600;
+
+  &:before {
+    content: '';
+    position: relative;
+    display: inline-block;
+    margin-right: 3px;
+    border-radius: $body-font-size/2;
+    width: $body-font-size - 4px;
+    height: $body-font-size - 4px;
+  }
+
+  @each $state in $states {
+    &.#{$state}:before {
+      background-color: get-value($states, $states-bg-colors, $state);
+
+      // &, a {
+      //   color: get-value($states, $states-text-colors, $state);
+      // }
+    }
+  }
+}
+
+table tbody tr {
+  &[class*="state"] td:first-child {
+    border-left-width: 3px;
+  }
+  &.state-complete td:first-child { border-left-color: $color-success }
+  &.state-cart     td:first-child { border-left-color: very-light($color-notice, 6) }
+  &.state-canceled td:first-child { border-left-color: $color-error }
+}

app/assets/stylesheets/admin/components/table-filter.scss

@@ -0,0 +1,14 @@
+#table-filter {
+
+  .field {
+    input[type="text"], input[type="phone"],
+    input[type="email"], input[type="number"],
+    input[type="url"] {
+      width: 100%;
+    }
+  }
+
+  .actions {
+    text-align: center;
+  }
+}

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

@@ -0,0 +1,25 @@
+// Make color very close to white
+@function very-light($color, $adjust: 3){  
+  @if type-of($adjust) == 'number' and $adjust > 0 {
+    @for $i from 0 through 100 {
+      @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
+        @return lighten($color, $i - $adjust);
+      }
+    }
+  }
+  @else {
+    @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
+  }
+};
+
+// Quick fix for dynamic variables missing in SASS
+@function get-value($prop, $val, $search) {
+  $n1: index($prop, $search);
+  $n2: index($val, $search);
+
+  @if($n1) {
+    @return nth($val, $n1);
+  } @else {
+    @return nth($prop, $n2);
+  }
+}

app/assets/stylesheets/admin/plugins/jstree.scss

@@ -0,0 +1,135 @@
+@import 'admin/globals/variables';
+@import 'admin/globals/mixins';
+@import 'admin/plugins/font-awesome';
+
+#taxonomy_tree {
+  > ul, .jstree-icon {
+    background-image: none;
+  }
+  
+  .jstree-icon {
+    @extend [class^="icon-"]:before;
+  }
+
+  .jstree-open > .jstree-icon {    
+    @extend .icon-caret-down;
+  }
+  .jstree-closed > .jstree-icon {    
+    @extend .icon-caret-right;
+  }
+
+  li {
+    background-image: none;
+
+    a {
+      background-color: very-light($color-3);
+      border: 1px solid $color-border;
+      color: $color-body-text;
+      font-weight: $font-weight-bold;
+      text-shadow: none;
+      width: 90%;
+      height: auto;
+      line-height: inherit;
+      padding: 5px 0 5px 10px;
+      margin-bottom: 10px;
+
+      .jstree-icon {
+        padding-left: 0px;
+        @extend .icon-move;   
+      }
+    }
+  }
+}
+
+#vakata-dragged.jstree-apple .jstree-invalid, 
+#vakata-dragged.jstree-apple .jstree-ok,
+#jstree-marker {
+  background-image: none !important;
+  background-color: transparent !important;
+  @extend [class^="icon-"]:before;   
+}
+#vakata-dragged.jstree-apple .jstree-invalid {
+  @extend .icon-remove;  
+  color: $color-5;
+}
+#vakata-dragged.jstree-apple .jstree-ok {
+  @extend .icon-ok;
+  color: $color-2;
+}
+
+#jstree-marker {
+  @extend .icon-caret-right;
+  color: $color-body-text !important;
+  width: 4px !important;
+}
+
+#jstree-marker-line {
+  @include border-radius($border-radius !important);
+  height: 0px !important;
+  margin-left: 5px !important;
+  margin-top: -2px !important;
+  border: none !important;
+  border-bottom: 1px solid $color-body-text !important;
+  background-color:  very-light($color-3) !important;
+
+  -webkit-box-shadow: none !important;
+     -moz-box-shadow: none !important;
+          box-shadow: none !important;
+  
+}
+
+#vakata-contextmenu {
+  background-color: $color-3 !important;
+  -moz-box-shadow: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+  border: none !important;
+  @include border-radius($border-radius !important);
+
+  &:before {
+    content: '';
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-bottom: 10px solid $color-3;
+    top: 0px;
+    margin-top: -10px;
+    left: 25px;
+    z-index: 1;
+  }
+
+  a {
+    color: $color-1 !important;
+    line-height: inherit !important;
+    padding: 5px 10px !important;
+    margin: 0 !important;
+    font-size: 90% !important;
+
+    &:hover {
+      @include border-radius($border-radius !important);
+      background-color: $color-2 !important;
+      border: none !important;
+      -moz-box-shadow: none !important;
+      -webkit-box-shadow: none !important;
+      line-height: inherit !important;
+      padding: 5px 10px !important;
+      margin: 0 !important;      
+    }
+  }
+
+  li:first-child a:hover:before {
+    content: '';
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-bottom: 10px solid $color-2;
+    top: 0px;
+    margin-top: -10px;
+    left: 25px;
+    z-index: 1;
+  }
+
+  li.vakata-separator {
+    display: none;
+  }
+}

app/assets/stylesheets/admin/plugins/select2.scss

@@ -0,0 +1,193 @@
+@import 'admin/globals/functions';
+@import 'admin/globals/variables';
+@import 'admin/globals/mixins';
+
+@import 'admin/shared/forms';
+
+@import 'admin/plugins/font-awesome';
+
+.select2-container {
+  &:hover .select2-choice, &.select2-container-active .select2-choice {
+    background-color: $color-sel-hover-bg !important;
+    border-color: $color-sel-hover-bg !important;
+  }
+  .select2-choice {
+    background-image: none !important;
+    background-color: $color-sel-bg;
+    border: none !important;
+    box-shadow: none !important;
+    @include border-radius($border-radius);
+    color: $color-1 !important;
+    font-size: 90%;
+    height: 31px;
+    line-height: inherit !important;
+    padding: 5px 15px 7px;
+
+    span {
+      display: block;
+      padding: 2px;
+    }
+
+    .select2-search-choice-close {
+      background-image: none !important;
+      font-size: 100% !important;
+      @extend .icon-remove;
+      @extend [class^="icon-"]:before;
+      margin-top: 2px;
+    }
+  }
+
+  &.select2-container-active {
+    .select2-choice {
+      box-shadow: none !important;
+    }
+
+    &.select2-dropdown-open .select2-choice div b {
+      @extend .icon-caret-up
+    }
+  }
+}
+
+.select2-drop {
+  border-color: $color-sel-hover-bg;
+  box-shadow: none !important;
+  z-index: 1000000;
+
+  &.select2-drop-above {
+    border-color: $color-sel-hover-bg;
+  }
+}
+
+.select2-search {
+  @extend .icon-search;
+
+  font-size: 100%;
+  color: darken($color-border, 15);
+  padding: 0 9px 0 0;
+
+  &:before {
+    @extend [class^="icon-"]:before;
+
+    position: absolute;
+    top: 13px;
+    left: 13px;
+  }
+
+  input {
+    @extend input[type="text"];
+
+    padding: 6px 0 6px 25px;
+    margin: 5px 0 0 5px;
+    font-family: $base-font-family;
+    font-size: 90%;
+    box-shadow: none;
+    background-image: none;
+  }
+}
+
+.select2-container .select2-choice .select2-arrow {
+  background-image: none;
+  background: transparent;
+  border: 0;
+
+  b {
+    padding-top: 7px;
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: none;
+    font-family: FontAwesome;
+    font-weight: 200 !important;
+
+    &:before {
+      content: "\f0d7";
+    }
+  }
+}
+
+.select2-results {
+  padding-left: 0 !important;
+
+  li {
+    font-size: 85% !important;
+
+    &.select2-highlighted {
+      .select2-result-label {
+        &, h6 {
+          color: $color-1 !important;
+        }
+      }
+    }
+
+    .select2-result-label {
+      color: $color-body-text;
+      min-height: 22px;
+      clear: both;
+      overflow: auto;
+    }
+
+    &.select2-no-results, &.select2-searching {
+      padding: 5px;
+      background-color: transparent;
+      color: $color-body-text;
+      text-align: center;
+      font-weight: $font-weight-bold;
+      text-transform: uppercase;
+    }
+  }
+
+  .select2-highlighted {
+    background-color: $color-sel-bg;
+  }
+}
+
+.select2-container-multi {
+  &.select2-container-active, &.select2-dropdown-open {
+    .select2-choices {
+      border-color: $color-sel-hover-bg !important;
+      box-shadow: none;
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
+  .select2-choices {
+    @extend input[type="text"];
+    padding: 6px 3px 3px 3px;
+    box-shadow: none;
+    background-image: none !important;
+
+    .select2-search-choice {
+      @include border-radius($border-radius);
+      margin: 0 0 3px 3px;
+      background-image: none;
+      background-color: $color-sel-bg;
+      border: none;
+      box-shadow: none;
+      color: $color-1 !important;
+      font-size: 85%;
+
+      &:hover {
+        background-color: $color-sel-hover-bg;
+      }
+
+      .select2-search-choice-close {
+        background-image: none !important;
+        font-size: 85% !important;
+        @extend .icon-remove;
+        @extend [class^="icon-"]:before;
+        margin-left: 2px;
+        color: $color-1;
+      }
+    }
+  }
+}
+
+label .select2-container {
+  margin-top: -6px;
+  .select2-choice {
+    span {
+      text-transform: none;
+      font-weight: normal;
+    }
+  }
+}

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

@@ -0,0 +1,270 @@
+@import 'admin/globals/variables';
+@import 'admin/globals/mixins';
+
+input[type="text"],
+input[type="password"],
+input[type="email"],
+input[type="date"],
+input[type="datetime"],
+input[type="time"],
+input[type="url"],
+input[type="number"],
+input[type="tel"],
+textarea, fieldset {
+  @include border-radius($border-radius);
+  padding: 7px 10px;
+  border: 1px solid $color-txt-brd;
+  color: $color-txt-text;
+  font-size: 90%;
+
+  &:focus {
+    outline: none;
+    border-color: $color-txt-hover-brd;
+  }
+
+  &[disabled] {
+    opacity: 0.7;
+  }
+}
+
+textarea {
+  line-height: 19px;
+}
+
+.fullwidth {
+  width: 100%;
+}
+
+label {
+  font-weight: 600;
+  text-transform: uppercase;
+  font-size: 85%;
+  display: inline;
+  margin-bottom: 5px;
+  color: $color-4;
+
+  &.inline {
+    display: inline-block !important;
+  }
+
+  &.block {
+    display: block !important;
+  }
+}
+
+.label-block label { display: block }
+
+input[type="submit"],
+input[type="button"],
+button, .button {
+  @include border-radius($border-radius);
+  display: inline-block;
+  padding: 8px 15px;
+  border: none;
+  background-color: $color-btn-bg;
+  color: $color-btn-text;
+  text-transform: uppercase;
+  font-weight: 600 !important;
+
+  &:before {
+    font-weight: normal !important;
+  }
+
+  &:visited, &:active, &:focus { color: $color-btn-text }
+
+  &:hover {
+    background-color: $color-btn-hover-bg;
+    color: $color-btn-hover-text;
+  }
+
+  &:active:focus {
+    box-shadow: 0 0 8px 0 darken($color-btn-hover-bg, 5) inset;
+  }
+
+  &.fullwidth {
+    width: 100%;
+    text-align: center;
+  }
+}
+
+span.info {
+  font-style: italic;
+  font-size: 85%;
+  color: lighten($color-body-text, 15);
+  display: block;
+  line-height: 20px;
+  margin: 5px 0;
+}
+
+.field {
+  padding: 10px 0;
+
+  &.checkbox {
+    min-height: 73px;
+
+    input[type="checkbox"] {
+      display: inline-block;
+      width: auto;
+    }
+
+    label {
+      cursor: pointer;
+      display: block;
+    }
+  }
+
+  ul {
+    border-top: 1px solid $color-border;
+    list-style: none;
+    padding-top: 5px;
+
+    li {
+      display: inline-block;
+      padding-right: 10px;
+
+
+      label {
+        font-weight: normal;
+        text-transform: none;
+      }
+      &.white-space-nowrap {
+        white-space: nowrap;
+      }
+    }
+  }
+
+  &.withError {
+    .field_with_errors {
+      label {
+        color: very-light($color-error, 30);
+      }
+
+      input {
+        border-color: very-light($color-error, 15);
+      }
+    }
+    .formError {
+      color: very-light($color-error, 30);
+      font-style: italic;
+      font-size: 85%;
+    }
+  }
+}
+
+fieldset {
+  box-shadow: none;
+  box-sizing: border-box;
+  border-color: $color-border;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  margin-left: 0;
+  margin-right: 0;
+  position: relative;
+  margin-bottom: 35px;
+  padding: 10px 0 15px 0;
+  background-color: transparent;
+  border-left: none;
+  border-right: none;
+  border-radius: 0;
+
+  &.no-border-bottom {
+    border-bottom: none;
+    margin-bottom: 0;
+  }
+
+  &.no-border-top {
+    border-top: none;
+    padding-top: 0;
+  }
+
+  legend {
+    background-color: $color-1;
+    color: $color-2;
+    font-size: 14px;
+    font-weight: 600;
+    text-transform: uppercase;
+    text-align: center;
+    padding: 8px 15px;
+
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+
+    i {
+      color: $color-link;
+    }
+  }
+
+  label {
+    color: lighten($color-body-text, 8);
+  }
+
+  .filter-actions {
+    margin-bottom: -32px;
+    margin-top: 15px;
+    text-align: center;
+
+    form {
+      display: inline-block;
+    }
+
+    button, .button, input[type="submit"], input[type="button"], span.or {
+      @include border-radius($border-radius);
+
+      -webkit-box-shadow: 0 0 0 15px $color-1;
+         -moz-box-shadow: 0 0 0 15px $color-1;
+          -ms-box-shadow: 0 0 0 15px $color-1;
+           -o-box-shadow: 0 0 0 15px $color-1;
+              box-shadow: 0 0 0 15px $color-1;
+
+      &:hover {
+        border-color: $color-1;
+      }
+    }
+
+    span.or {
+      background-color: $color-1;
+      border-width: 5px;
+      margin-left: 5px;
+      margin-right: 5px;
+      position: relative;
+
+      -webkit-box-shadow: 0 0 0 5px $color-1;
+         -moz-box-shadow: 0 0 0 5px $color-1;
+          -ms-box-shadow: 0 0 0 5px $color-1;
+           -o-box-shadow: 0 0 0 5px $color-1;
+              box-shadow: 0 0 0 5px $color-1;
+    }
+  }
+
+  &.labels-inline {
+    .field {
+      margin-bottom: 0;
+      display: table;
+      width: 100%;
+
+      label, input {
+        display: table-cell !important;
+      }
+      input {
+        width: 100%;
+      }
+
+      &.checkbox {
+        input {
+          width: auto !important
+        }
+      }
+    }
+    .actions {
+      padding: 0;
+      text-align: right;
+    }
+  }
+}
+
+.form-actions {
+  margin-top: 18px;
+}
+.form-buttons {
+  text-align: center;
+}

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

@@ -0,0 +1,25 @@
+@import 'admin/plugins/font-awesome';
+
+// Some fixes for fontwesome stylesheets
+[class^="icon-"], [class*=" icon-"] {
+  &:before {
+    padding-right: 5px;
+  }
+
+  &.button, &.icon_link {
+    width: auto;
+
+    &:before {
+      padding-top: 3px;
+    }
+  }
+}
+
+.icon-email:before    { @extend .icon-envelope:before }
+.icon-resume:before   { @extend .icon-refresh:before  }
+
+.icon-cancel:before,
+.icon-void:before     { @extend .icon-remove:before   }
+
+.icon-capture:before  { @extend .icon-ok:before       }
+.icon-credit:before   { @extend .icon-ok:before       }

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

@@ -0,0 +1,92 @@
+@import 'admin/globals/variables';
+
+// Basics
+//---------------------------------------------------
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+// Helpers
+.block-table {
+  display: table;
+  width: 100%;
+
+  .table-cell {
+    display: table-cell;
+    vertical-align: middle;
+    padding: 0 10px;
+
+    &:first-child {
+      padding-left: 0;
+    }
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+}
+
+.hidden {
+  display: none;
+}
+
+// For block grids
+.frameless {
+  margin-left: -10px;
+  margin-right: -10px;
+}
+
+// Header
+//---------------------------------------------------
+#header {
+  background-color: $color-1;
+  padding: 5px 0;
+}
+
+#logo { height: 40px }
+
+[data-hook="admin-title"] { font-size: 14px }
+
+.page-title {
+  i {
+    color: $color-2;
+  }
+}
+
+// Content
+//---------------------------------------------------
+#content {
+  background-color: $color-1;
+  position: relative;
+  z-index: 0;
+  padding: 0;
+  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 {
+  margin-top: 15px;
+  border-top: 1px solid $color-border;
+  padding: 10px 0;
+}

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

@@ -0,0 +1,208 @@
+@import 'admin/globals/variables';
+@import 'admin/plugins/font-awesome';
+
+table {
+  width: 100%;
+  margin-bottom: 15px;
+  border-collapse: separate;
+
+  th, td {
+    padding: 7px 5px;
+    border-right: 1px solid $color-border;
+    border-bottom: 1px solid $color-border;
+    vertical-align: middle;
+    text-overflow: ellipsis;
+
+    img {
+      border: 1px solid transparent;
+    }
+
+    &:first-child {
+      border-left: 1px solid $color-border;
+    }
+
+    a {
+      border-bottom: 1px dotted lighten($color-link, 10);
+
+      &:hover {
+        border-color: lighten($color-link-hover, 10);
+      }
+    }
+
+    .handle {
+      display: block !important;
+      text-align: center;
+      padding-right: 0;
+    }
+
+    &.actions {
+      background-color: transparent;
+      border: none !important;
+      text-align: center;
+
+      span.text {
+        font-size: $body-font-size;
+      }
+
+      [class*='icon-'].no-text {
+        font-size: 120%;
+        background-color: very-light($color-3);
+        border: 1px solid $color-border;
+        border-radius: 15px;
+        width: 29px;
+        height: 29px;
+        display: inline-block;
+        padding-top: 2px;
+
+        &:before {
+          text-align: center !important;
+          width: 27px;
+          display: inline-block;
+        }
+
+        &:hover {
+          border-color: transparent;
+        }
+      }
+
+      button[class*='icon-'] {
+        color: $color-link;
+        padding: 0 !important;
+      }
+
+      .icon-envelope-alt, .icon-eye-open {
+        color: $color-link;
+        padding-left: 0px;
+
+        &:hover {
+          background-color: $color-3;
+          color: $color-1;
+        }
+      }
+      .icon-trash:hover, .icon-void:hover {
+        background-color: $color-error;
+        color: $color-1;
+      }
+      .icon-cancel:hover {
+        background-color: $color-notice;
+        color: $color-1;
+      }
+      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover {
+        background-color: $color-success;
+        color: $color-1;
+      }
+      .icon-copy:hover {
+        background-color: $color-notice;
+        color: $color-1;
+      }
+    }
+
+    input[type="number"],
+    input[type="text"] {
+      width: 100%;
+    }
+
+    &.no-border {
+      border-right: none;
+    }
+
+    .handle {
+      @extend [class^="icon-"]:before;
+      @extend .icon-reorder;
+      cursor: move;
+    }
+
+  }
+
+  &.no-borders {
+    td, th {
+      border: none !important;
+    }
+
+  }
+
+  thead {
+    th {
+      padding: 10px;
+      border-top: 1px solid $color-border;
+      border-bottom: none;
+      background-color: $color-tbl-thead;
+      text-transform: uppercase;
+      font-size: 85%;
+      font-weight: $font-weight-bold;
+    }
+  }
+
+  tbody {
+    tr {
+      &:first-child th,
+      &:first-child td {
+        border-top: 1px solid $color-border;
+      }
+      &.even td {
+        background-color: $color-tbl-even;
+
+        img {
+          border: 1px solid very-light($color-3, 6);
+        }
+      }
+
+      &:hover td {
+        background-color: very-light($color-3, 5);
+
+        img {
+          border: 1px solid $color-border;
+        }
+      }
+
+      &.deleted td {
+        background-color: very-light($color-error, 6);
+        border-color: very-light($color-error, 15);
+      }
+
+      &.ui-sortable-placeholder td {
+        border: 1px solid $color-2 !important;
+        visibility: visible !important;
+
+        &.actions {
+          background-color: transparent;
+          border-right: none !important;
+          border-top: none !important;
+          border-bottom: none !important;
+          border-left: 1px solid $color-2 !important;
+        }
+      }
+
+      &.ui-sortable-helper {
+        width: 100%;
+
+        td {
+          background-color: lighten($color-3, 33);
+          border-bottom: 1px solid $color-border;
+
+          &.actions {
+            display: none;
+          }
+        }
+      }
+    }
+
+    &.no-border-top tr:first-child td {
+      border-top: none;
+    }
+
+    &.grand-total {
+      td {
+        border-color: $color-2 !important;
+        text-transform: uppercase;
+        font-size: 110%;
+        font-weight: 600;
+        background-color: lighten($color-2, 50);
+      }
+      .total {
+        background-color: $color-2;
+        color: $color-1;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,134 @@
+@import 'admin/globals/variables';
+
+// Base
+//--------------------------------------------------------------
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, p, blockquote, th, td { margin: 0; padding: 0; font-size: 13px; }
+
+body {
+  font-family: $base-font-family;
+  font-size: $body-font-size;
+  font-weight: 400;
+  color: $color-body-text;
+  text-rendering: optimizeLegibility;
+}
+
+hr {
+  border-top: 1px solid $color-border;
+  border-bottom: 1px solid white;
+  border-left: none;
+}
+
+strong, b {
+  font-weight: 600;
+}
+
+// links
+//--------------------------------------------------------------
+a {
+  color: $color-link;
+  text-decoration: none;
+  line-height: inherit;
+
+  &, &:hover, &:active, &:visited, &:focus {
+    outline: none;
+  }
+
+  &:visited {
+    color: $color-link-visited;
+  }
+  &:focus {
+    color: $color-link-focus;
+  }
+  &:active {
+    color: $color-link-active;
+  }
+  &:hover {
+    color: $color-link-hover;
+  }
+}
+
+// Headings
+//--------------------------------------------------------------
+
+h1,h2,h3,h4,h5,h6 {
+  font-weight: 600;
+  color: $color-headers;
+  line-height: 1.1;
+}
+
+h1 { font-size: $h1-size; line-height: $h1-size + 6 }
+h2 { font-size: $h2-size; line-height: $h1-size + 4 }
+h3 { font-size: $h3-size; line-height: $h1-size + 2 }
+h4 { font-size: $h4-size; line-height: $h1-size }
+h5 { font-size: $h5-size; line-height: $h1-size }
+h6 { font-size: $h6-size; line-height: $h1-size }
+
+
+// Lists
+//--------------------------------------------------------------
+ul {
+  &.inline-menu {
+    li {
+      display: inline-block;
+    }
+  }
+  &.fields {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+}
+
+dl {
+  width: 100%;
+  overflow: hidden;
+  margin: 5px 0;
+  color: lighten($color-body-text, 15);
+
+  dt, dd {
+    float: left;
+    line-height: 16px;
+    padding: 5px;
+    text-align: justify;
+  }
+
+  dt {
+    width: 40%;
+    font-weight: 600;
+    padding-left: 0;
+    text-transform: uppercase;
+    font-size: 85%;
+  }
+
+  dd {
+    width: 60%;
+    padding-right: 0;
+  }
+
+  dd:after {
+    content: '';
+    clear: both;
+  }
+
+}
+
+// Helpers
+.align-center  { text-align: center  }
+.align-right   { text-align: right   }
+.align-left    { text-align: left    }
+.align-justify { text-align: justify }
+
+.uppercase     { text-transform: uppercase }
+
+.green  { color: $color-2 }
+.blue   { color: $color-3 }
+.red    { color: $color-5 }
+.yellow { color: $color-6 }
+
+.no-objects-found {
+  text-align: center;
+  font-size: 120%;
+  text-transform: uppercase;
+  padding: 40px 0px;
+  color: lighten($color-body-text, 15);
+}

app/controllers/api/products_controller.rb

@@ -48,16 +48,22 @@ module Api
     end
 
     def bulk_products
-      product_query = OpenFoodNetwork::Permissions.new(current_api_user).
-        editable_products.merge(product_scope)
+      product_query = OpenFoodNetwork::Permissions.
+        new(current_api_user).
+        editable_products.
+        merge(product_scope)
 
       if params[:import_date].present?
-        product_query = product_query.imported_on(params[:import_date]).group_by_products_id
+        product_query = product_query.
+          imported_on(params[:import_date]).
+          group_by_products_id
       end
 
-      @products = product_query.order('created_at DESC').
-        ransack(params[:q]).result.
-        page(params[:page] || DEFAULT_PAGE).per(params[:per_page] || DEFAULT_PER_PAGE)
+      @products = product_query.
+        ransack(query_params_with_defaults).
+        result.
+        page(params[:page] || DEFAULT_PAGE).
+        per(params[:per_page] || DEFAULT_PER_PAGE)
 
       render_paged_products @products
     end
@@ -136,6 +142,10 @@ module Api
       }.to_json
     end
 
+    def query_params_with_defaults
+      params[:q].to_h.reverse_merge(s: 'created_at desc')
+    end
+
     def pagination_data(results)
       {
         results: results.total_count,

app/controllers/application_controller.rb

@@ -23,7 +23,11 @@ class ApplicationController < ActionController::Base
     referer_path = OpenFoodNetwork::RefererParser.path(request.referer)
     if referer_path
       is_checkout_path_the_referer = [main_app.checkout_path].include?(referer_path)
-      session["spree_user_return_to"] = is_checkout_path_the_referer ? referer_path : root_path
+      session["spree_user_return_to"] = if is_checkout_path_the_referer
+                                          referer_path
+                                        else
+                                          main_app.root_path
+                                        end
     end
   end
 
@@ -48,11 +52,11 @@ class ApplicationController < ActionController::Base
   def after_sign_in_path_for(resource_or_scope)
     return session[:shopfront_redirect] if session[:shopfront_redirect]
 
-    stored_location_for(resource_or_scope) || signed_in_root_path(resource_or_scope)
+    stored_location_for(resource_or_scope) || main_app.root_path
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    session[:shopfront_redirect] || root_path
+    session[:shopfront_redirect] || main_app.root_path
   end
 
   private
@@ -74,7 +78,7 @@ class ApplicationController < ActionController::Base
 
   def require_distributor_chosen
     unless @distributor = current_distributor
-      redirect_to spree.root_path
+      redirect_to main_app.root_path
       false
     end
   end
@@ -86,26 +90,29 @@ class ApplicationController < ActionController::Base
   end
 
   def check_hub_ready_for_checkout
-    # This condition is more rigourous than required by development to avoid coupling this
-    # condition to every controller spec
-    if current_distributor && current_order &&
-       current_distributor.respond_to?(:ready_for_checkout?) &&
-       !current_distributor.ready_for_checkout?
-
+    if current_distributor_closed?
       current_order.empty!
       current_order.set_distribution! nil, nil
-      flash[:info] = "The hub you have selected is temporarily closed for orders. Please try again later."
-      redirect_to root_url
+      flash[:info] = "The hub you have selected is temporarily closed for orders. "\
+        "Please try again later."
+      redirect_to main_app.root_url
     end
   end
 
+  def current_distributor_closed?
+    current_distributor &&
+      current_order &&
+      current_distributor.respond_to?(:ready_for_checkout?) &&
+      !current_distributor.ready_for_checkout?
+  end
+
   def check_order_cycle_expiry
     if current_order_cycle.andand.closed?
       session[:expired_order_cycle_id] = current_order_cycle.id
       current_order.empty!
       current_order.set_order_cycle! nil
       flash[:info] = "The order cycle you've selected has just closed. Please try again!"
-      redirect_to root_url
+      redirect_to main_app.root_url
     end
   end
 

app/controllers/checkout_controller.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 require 'open_food_network/address_finder'
 
-class CheckoutController < Spree::CheckoutController
+class CheckoutController < Spree::StoreController
   layout 'darkswarm'
 
+  include CheckoutHelper
+  include OrderCyclesHelper
+  include EnterprisesHelper
+
+  ssl_required
+
   # We need pessimistic locking to avoid race conditions.
   # Otherwise we fail on duplicate indexes or end up with negative stock.
   prepend_around_filter CurrentOrderLocker, only: :update
@@ -12,10 +20,19 @@ class CheckoutController < Spree::CheckoutController
   prepend_before_filter :require_order_cycle
   prepend_before_filter :require_distributor_chosen
 
+  before_filter :load_order
+
+  before_filter :ensure_order_not_completed
+  before_filter :ensure_checkout_allowed
+  before_filter :ensure_sufficient_stock_lines
+
+  before_filter :associate_user
+  before_filter :check_authorization
   before_filter :enable_embedded_shopfront
 
-  include OrderCyclesHelper
-  include EnterprisesHelper
+  helper 'spree/orders'
+
+  rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
 
   def edit
     # This is only required because of spree_paypal_express. If we implement
@@ -25,54 +42,16 @@ class CheckoutController < Spree::CheckoutController
   end
 
   def update
-    shipping_method_id = object_params.delete(:shipping_method_id)
+    params_adapter = Checkout::FormDataAdapter.new(params, @order, spree_current_user)
+    return update_failed unless @order.update_attributes(params_adapter.order_params)
 
-    return update_failed unless @order.update_attributes(object_params)
-
-    check_order_for_phantom_fees
     fire_event('spree.checkout.update')
 
-    while @order.state != "complete"
-      if @order.state == "payment"
-        return if redirect_to_paypal_express_form_if_needed
-      end
-
-      if @order.state == "delivery"
-        @order.select_shipping_method(shipping_method_id)
-      end
-
-      next if advance_order_state(@order)
-
-      flash[:error] = if @order.errors.present?
-                        @order.errors.full_messages.to_sentence
-                      else
-                        t(:payment_processing_failed)
-                      end
-      update_failed
-      return
-    end
-    return update_failed unless @order.state == "complete" || @order.completed?
-
-    set_default_bill_address
-    set_default_ship_address
-
-    ResetOrderService.new(self, current_order).call
-    session[:access_token] = current_order.token
-
-    flash[:notice] = t(:order_processed_successfully)
-    respond_to do |format|
-      format.html do
-        respond_with(@order, location: order_path(@order))
-      end
-      format.json do
-        render json: { path: order_path(@order) }, status: :ok
-      end
-    end
-  rescue Spree::Core::GatewayError => error
-    # This is done for all actions in the Spree::CheckoutController.
-    rescue_from_spree_gateway_error(error)
-  rescue StandardError => error
-    Bugsnag.notify(error)
+    checkout_workflow(params_adapter.shipping_method_id)
+  rescue Spree::Core::GatewayError => e
+    rescue_from_spree_gateway_error(e)
+  rescue StandardError => e
+    Bugsnag.notify(e)
     flash[:error] = I18n.t("checkout.failed")
     update_failed
   end
@@ -87,111 +66,38 @@ class CheckoutController < Spree::CheckoutController
 
   private
 
-  def set_default_bill_address
-    if params[:order][:default_bill_address]
-      new_bill_address = @order.bill_address.clone.attributes
-
-      user_bill_address_id = spree_current_user.bill_address.andand.id
-      spree_current_user.update_attributes(
-        bill_address_attributes: new_bill_address.merge('id' => user_bill_address_id)
-      )
-
-      customer_bill_address_id = @order.customer.bill_address.andand.id
-      @order.customer.update_attributes(
-        bill_address_attributes: new_bill_address.merge('id' => customer_bill_address_id)
-      )
-    end
+  def check_authorization
+    authorize!(:edit, current_order, session[:access_token])
   end
 
-  def set_default_ship_address
-    if params[:order][:default_ship_address]
-      new_ship_address = @order.ship_address.clone.attributes
-
-      user_ship_address_id = spree_current_user.ship_address.andand.id
-      spree_current_user.update_attributes(
-        ship_address_attributes: new_ship_address.merge('id' => user_ship_address_id)
-      )
-
-      customer_ship_address_id = @order.customer.ship_address.andand.id
-      @order.customer.update_attributes(
-        ship_address_attributes: new_ship_address.merge('id' => customer_ship_address_id)
-      )
-    end
+  def ensure_checkout_allowed
+    redirect_to main_app.cart_path unless @order.checkout_allowed?
   end
 
-  def check_order_for_phantom_fees
-    phantom_fees = @order.adjustments.
-      joins("LEFT OUTER JOIN spree_line_items"\
-        " ON spree_line_items.id = spree_adjustments.source_id").
-      where("originator_type = 'EnterpriseFee'"\
-        " AND source_type = 'Spree::LineItem' AND spree_line_items.id IS NULL")
-
-    if phantom_fees.any?
-      Bugsnag.notify(RuntimeError.new("Phantom Fees"),
-                     phantom_fees: {
-                       phantom_total: phantom_fees.sum(&:amount).to_s,
-                       phantom_fees: phantom_fees.as_json
-                     })
-    end
+  def ensure_order_not_completed
+    redirect_to main_app.cart_path if @order.completed?
   end
 
-  # Copied and modified from spree. Remove check for order state, since the state machine is
-  # progressed all the way in one go with the one page checkout.
-  def object_params
-    # For payment step, filter order parameters to produce the expected
-    #   nested attributes for a single payment and its source,
-    #   discarding attributes for payment methods other than the one selected
-    if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
-      params[:order][:payments_attributes].first[:source_attributes] = source_params
-    end
-    if params[:order][:payments_attributes]
-      params[:order][:payments_attributes].first[:amount] = @order.total
-    end
-    if params[:order][:existing_card_id]
-      construct_saved_card_attributes
-    end
-    params[:order]
-  end
-
-  # Perform order.next, guarding against StaleObjectErrors
-  def advance_order_state(order)
-    tries ||= 3
-    order.next
-  rescue ActiveRecord::StaleObjectError
-    retry unless (tries -= 1).zero?
-    false
-  end
-
-  def update_failed
-    current_order.updater.shipping_address_from_distributor
-    RestartCheckout.new(@order).call
-
-    respond_to do |format|
-      format.html do
-        render :edit
-      end
-      format.json do
-        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
-      end
+  def ensure_sufficient_stock_lines
+    if @order.insufficient_stock_lines.present?
+      flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
+      redirect_to main_app.cart_path
     end
   end
 
   def load_order
     @order = current_order
-    redirect_to(main_app.shop_path) && return unless @order && @order.checkout_allowed?
+
+    redirect_to(main_app.shop_path) && return if redirect_to_shop?
     redirect_to_cart_path && return unless valid_order_line_items?
-    redirect_to(main_app.shop_path) && return if @order.completed?
     before_address
     setup_for_current_state
   end
 
-  def before_address
-    associate_user
-
-    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
-
-    @order.bill_address = finder.bill_address
-    @order.ship_address = finder.ship_address
+  def redirect_to_shop?
+    !@order ||
+      !@order.checkout_allowed? ||
+      @order.completed?
   end
 
   def valid_order_line_items?
@@ -212,32 +118,29 @@ class CheckoutController < Spree::CheckoutController
     end
   end
 
-  def redirect_to_paypal_express_form_if_needed
-    return unless params[:order][:payments_attributes]
-
-    payment_method_id = params[:order][:payments_attributes].first[:payment_method_id]
-    payment_method = Spree::PaymentMethod.find(payment_method_id)
-    return unless payment_method.is_a?(Spree::Gateway::PayPalExpress)
-
-    render json: { path: spree.paypal_express_path(payment_method_id: payment_method.id) },
-           status: :ok
-    true
+  def setup_for_current_state
+    method_name = :"before_#{@order.state}"
+    __send__(method_name) if respond_to?(method_name, true)
   end
 
-  def construct_saved_card_attributes
-    existing_card_id = params[:order].delete(:existing_card_id)
-    return if existing_card_id.blank?
+  def before_address
+    associate_user
 
-    credit_card = Spree::CreditCard.find(existing_card_id)
-    if credit_card.try(:user_id).blank? || credit_card.user_id != spree_current_user.try(:id)
-      raise Spree::Core::GatewayError, I18n.t(:invalid_credit_card)
-    end
+    finder = OpenFoodNetwork::AddressFinder.new(@order.email, @order.customer, spree_current_user)
 
-    # Not currently supported but maybe we should add it...?
-    credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
+    @order.bill_address = finder.bill_address
+    @order.ship_address = finder.ship_address
+  end
 
-    params[:order][:payments_attributes].first[:source] = credit_card
-    params[:order][:payments_attributes].first.delete :source_attributes
+  def before_delivery
+    return if params[:order].present?
+
+    packages = @order.shipments.map(&:to_package)
+    @differentiator = Spree::Stock::Differentiator.new(@order, packages)
+  end
+
+  def before_payment
+    current_order.payments.destroy_all if request.put?
   end
 
   def rescue_from_spree_gateway_error(error)
@@ -247,4 +150,91 @@ class CheckoutController < Spree::CheckoutController
       format.json { render json: { flash: flash.to_hash }, status: :bad_request }
     end
   end
+
+  def checkout_workflow(shipping_method_id)
+    while @order.state != "complete"
+      if @order.state == "payment"
+        return if redirect_to_payment_gateway
+      end
+
+      @order.select_shipping_method(shipping_method_id) if @order.state == "delivery"
+
+      next if advance_order_state(@order)
+
+      flash[:error] = order_workflow_error
+      return update_failed
+    end
+
+    update_result
+  end
+
+  def redirect_to_payment_gateway
+    redirect_path = Checkout::PaymentRedirect.new(params).path
+    return if redirect_path.blank?
+
+    render json: { path: redirect_path }, status: :ok
+    true
+  end
+
+  # Perform order.next, guarding against StaleObjectErrors
+  def advance_order_state(order)
+    tries ||= 3
+    order.next
+  rescue ActiveRecord::StaleObjectError
+    retry unless (tries -= 1).zero?
+    false
+  end
+
+  def order_workflow_error
+    if @order.errors.present?
+      @order.errors.full_messages.to_sentence
+    else
+      t(:payment_processing_failed)
+    end
+  end
+
+  def update_result
+    if @order.state == "complete" || @order.completed?
+      save_order_addresses_as_user_default
+      ResetOrderService.new(self, current_order).call
+
+      update_succeeded
+    else
+      update_failed
+    end
+  end
+
+  def save_order_addresses_as_user_default
+    user_default_address_setter = UserDefaultAddressSetter.new(@order, spree_current_user)
+    user_default_address_setter.set_default_bill_address if params[:order][:default_bill_address]
+    user_default_address_setter.set_default_ship_address if params[:order][:default_ship_address]
+  end
+
+  def update_succeeded
+    session[:access_token] = current_order.token
+    flash[:notice] = t(:order_processed_successfully)
+
+    respond_to do |format|
+      format.html do
+        respond_with(@order, location: order_path(@order))
+      end
+      format.json do
+        render json: { path: order_path(@order) }, status: :ok
+      end
+    end
+  end
+
+  def update_failed
+    current_order.updater.shipping_address_from_distributor
+    RestartCheckout.new(@order).call
+
+    respond_to do |format|
+      format.html do
+        render :edit
+      end
+      format.json do
+        render json: { errors: @order.errors, flash: flash.to_hash }.to_json, status: :bad_request
+      end
+    end
+  end
 end

app/controllers/spree/admin/base_controller.rb

@@ -15,11 +15,10 @@ module Spree
       # Warn the user when they have an active order cycle with hubs that are not ready
       # for checkout (ie. does not have valid shipping and payment methods).
       def warn_invalid_order_cycles
-        distributors = active_distributors_not_ready_for_checkout
+        return if flash[:notice].present?
 
-        return if distributors.empty? || flash[:notice].present?
-
-        flash[:notice] = active_distributors_not_ready_for_checkout_message(distributors)
+        warning = OrderCycleWarning.new(spree_current_user).call
+        flash[:notice] = warning if warning.present?
       end
 
       # This is in Spree::Core::ControllerHelpers::Auth
@@ -30,7 +29,7 @@ module Spree
           redirect_to '/unauthorized'
         else
           store_location
-          redirect_to root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
+          redirect_to main_app.root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
         end
       end
 
@@ -93,24 +92,6 @@ module Spree
 
       private
 
-      def active_distributors_not_ready_for_checkout
-        ocs = OrderCycle.managed_by(spree_current_user).active
-        distributors = ocs.includes(:distributors).map(&:distributors).flatten.uniq
-        Enterprise.where('enterprises.id IN (?)', distributors).not_ready_for_checkout
-      end
-
-      def active_distributors_not_ready_for_checkout_message(distributors)
-        distributor_names = distributors.map(&:name).join ', '
-
-        if distributors.count > 1
-          I18n.t(:active_distributors_not_ready_for_checkout_message_plural,
-                 distributor_names: distributor_names)
-        else
-          I18n.t(:active_distributors_not_ready_for_checkout_message_singular,
-                 distributor_names: distributor_names)
-        end
-      end
-
       def html_request?
         request.format.html?
       end
@@ -121,13 +102,17 @@ module Spree
 
       def render_as_json(data, options = {})
         ams_prefix = options.delete :ams_prefix
-        if [Array, ActiveRecord::Relation].include? data.class
+        if each_serializer_required?(data)
           render options.merge(json: data, each_serializer: serializer(ams_prefix))
         else
           render options.merge(json: data, serializer: serializer(ams_prefix))
         end
       end
 
+      def each_serializer_required?(data)
+        ['Array', 'ActiveRecord::Relation'].include?(data.class.name)
+      end
+
       def serializer(ams_prefix)
         unless ams_prefix.nil? || ams_prefix_whitelist.include?(ams_prefix.to_sym)
           raise "Suffix '#{ams_prefix}' not found in ams_prefix_whitelist for #{self.class.name}."

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

@@ -0,0 +1,71 @@
+module Spree
+  module Admin
+    module Orders
+      class CustomerDetailsController < Spree::Admin::BaseController
+        before_filter :load_order
+        before_filter :check_authorization
+        before_filter :set_guest_checkout_status, only: :update
+
+        def show
+          edit
+          render action: :edit
+        end
+
+        def edit
+          country_id = Address.default.country.id
+          @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
+          @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
+        end
+
+        def update
+          if @order.update_attributes(params[:order])
+            if params[:guest_checkout] == "false"
+              @order.associate_user!(Spree.user_class.find_by_email(@order.email))
+            end
+
+            AdvanceOrderService.new(@order).call
+
+            @order.shipments.map(&:refresh_rates)
+            flash[:success] = Spree.t('customer_details_updated')
+            redirect_to admin_order_customer_path(@order)
+          else
+            render action: :edit
+          end
+        end
+
+        # Inherit CanCan permissions for the current order
+        def model_class
+          load_order unless @order
+          @order
+        end
+
+        private
+
+        def load_order
+          @order = Order.find_by_number!(params[:order_id], include: :adjustments)
+        end
+
+        def check_authorization
+          load_order
+          session[:access_token] ||= params[:token]
+
+          resource = @order
+          action = params[:action].to_sym
+          action = :edit if action == :show # show route renders :edit for this controller
+
+          authorize! action, resource, session[:access_token]
+        end
+
+        def set_guest_checkout_status
+          registered_user = Spree::User.find_by_email(params[:order][:email])
+
+          params[:order][:guest_checkout] = registered_user.nil?
+
+          return unless registered_user
+
+          @order.user_id = registered_user.id
+        end
+      end
+    end
+  end
+end

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

@@ -1,49 +0,0 @@
-Spree::Admin::Orders::CustomerDetailsController.class_eval do
-  before_filter :check_authorization
-  before_filter :set_guest_checkout_status, only: :update
-
-  def update
-    if @order.update_attributes(params[:order])
-      if params[:guest_checkout] == "false"
-        @order.associate_user!(Spree.user_class.find_by_email(@order.email))
-      end
-
-      AdvanceOrderService.new(@order).call
-
-      @order.shipments.map &:refresh_rates
-      flash[:success] = Spree.t('customer_details_updated')
-      redirect_to admin_order_customer_path(@order)
-    else
-      render action: :edit
-    end
-  end
-
-  # Inherit CanCan permissions for the current order
-  def model_class
-    load_order unless @order
-    @order
-  end
-
-  private
-
-  def check_authorization
-    load_order
-    session[:access_token] ||= params[:token]
-
-    resource = @order
-    action = params[:action].to_sym
-    action = :edit if action == :show # show route renders :edit for this controller
-
-    authorize! action, resource, session[:access_token]
-  end
-
-  def set_guest_checkout_status
-    registered_user = Spree::User.find_by_email(params[:order][:email])
-
-    params[:order][:guest_checkout] = registered_user.nil?
-
-    return unless registered_user
-
-    @order.user_id = registered_user.id
-  end
-end

app/controllers/spree/admin/orders_controller.rb

@@ -0,0 +1,150 @@
+require 'open_food_network/spree_api_key_loader'
+
+module Spree
+  module Admin
+    class OrdersController < Spree::Admin::BaseController
+      require 'spree/core/gateway_error'
+      include OpenFoodNetwork::SpreeApiKeyLoader
+      helper CheckoutHelper
+
+      before_filter :load_order, only: [:edit, :update, :fire, :resend,
+                                        :invoice, :print, :print_ticket]
+      before_filter :load_distribution_choices, only: [:new, :edit, :update]
+
+      # Ensure that the distributor is set for an order when
+      before_filter :ensure_distribution, only: :new
+
+      # After updating an order, the fees should be updated as well
+      # Currently, adding or deleting line items does not trigger updating the
+      # fees! This is a quick fix for that.
+      # TODO: update fees when adding/removing line items
+      # instead of the update_distribution_charge method.
+      after_filter :update_distribution_charge, only: :update
+
+      before_filter :require_distributor_abn, only: :invoice
+
+      respond_to :html, :json
+
+      def new
+        @order = Order.create
+        @order.created_by = try_spree_current_user
+        @order.save
+        redirect_to edit_admin_order_url(@order)
+      end
+
+      def edit
+        @order.shipments.map(&:refresh_rates)
+
+        AdvanceOrderService.new(@order).call
+
+        # The payment step shows an error of 'No pending payments'
+        # Clearing the errors from the order object will stop this error
+        # appearing on the edit page where we don't want it to.
+        @order.errors.clear
+      end
+
+      def update
+        unless @order.update_attributes(params[:order]) && @order.line_items.present?
+          if @order.line_items.empty?
+            @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
+          end
+          return redirect_to(edit_admin_order_path(@order),
+                             flash: { error: @order.errors.full_messages.join(', ') })
+        end
+
+        @order.update!
+        if @order.complete?
+          redirect_to edit_admin_order_path(@order)
+        else
+          # Jump to next step if order is not complete
+          redirect_to admin_order_customer_path(@order)
+        end
+      end
+
+      def bulk_management
+        load_spree_api_key
+      end
+
+      def fire
+        event = params[:e]
+        if @order.public_send(event.to_s)
+          flash[:success] = Spree.t(:order_updated)
+        else
+          flash[:error] = Spree.t(:cannot_perform_operation)
+        end
+      rescue Spree::Core::GatewayError => e
+        flash[:error] = e.message.to_s
+      ensure
+        redirect_to :back
+      end
+
+      def resend
+        Spree::OrderMailer.confirm_email_for_customer(@order.id, true).deliver
+        flash[:success] = t(:order_email_resent)
+
+        respond_with(@order) { |format| format.html { redirect_to :back } }
+      end
+
+      def invoice
+        pdf = InvoiceRenderer.new.render_to_string(@order)
+
+        Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
+        flash[:success] = t('admin.orders.invoice_email_sent')
+
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
+      end
+
+      def print
+        render InvoiceRenderer.new.args(@order)
+      end
+
+      def print_ticket
+        render template: "spree/admin/orders/ticket", layout: false
+      end
+
+      def update_distribution_charge
+        @order.update_distribution_charge!
+      end
+
+      private
+
+      def load_order
+        @order = Order.find_by_number!(params[:id], include: :adjustments) if params[:id]
+        authorize! action, @order
+      end
+
+      def model_class
+        Spree::Order
+      end
+
+      def require_distributor_abn
+        return if @order.distributor.abn.present?
+
+        flash[:error] = t(:must_have_valid_business_number,
+                          enterprise_name: @order.distributor.name)
+        respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
+      end
+
+      def load_distribution_choices
+        @shops = Enterprise.is_distributor.managed_by(spree_current_user).by_name
+
+        ocs = OrderCycle.managed_by(spree_current_user)
+        @order_cycles = ocs.soonest_closing +
+                        ocs.soonest_opening +
+                        ocs.closed +
+                        ocs.undated
+      end
+
+      def ensure_distribution
+        unless @order
+          @order = Spree::Order.new
+          @order.generate_order_number
+          @order.save!
+        end
+        return if @order.distribution_set?
+
+        render 'set_distribution', locals: { order: @order }
+      end
+    end
+  end
+end

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -1,120 +0,0 @@
-require 'open_food_network/spree_api_key_loader'
-
-Spree::Admin::OrdersController.class_eval do
-  include OpenFoodNetwork::SpreeApiKeyLoader
-  helper CheckoutHelper
-  before_filter :load_order, only: %i[show edit update fire resend invoice print print_ticket]
-
-  before_filter :load_distribution_choices, only: [:new, :edit, :update]
-
-  # Ensure that the distributor is set for an order when
-  before_filter :ensure_distribution, only: :new
-
-  # After updating an order, the fees should be updated as well
-  # Currently, adding or deleting line items does not trigger updating the
-  # fees! This is a quick fix for that.
-  # TODO: update fees when adding/removing line items
-  # instead of the update_distribution_charge method.
-  after_filter :update_distribution_charge, only: :update
-
-  before_filter :require_distributor_abn, only: :invoice
-
-  respond_to :html, :json
-
-  def index
-    # Overriding the action so we only render the page template. An angular request
-    # within the page then fetches the data it needs from Api::OrdersController
-  end
-
-  def bulk_management
-    load_spree_api_key
-  end
-
-  def edit
-    @order.shipments.map &:refresh_rates
-
-    AdvanceOrderService.new(@order).call
-
-    # The payment step shows an error of 'No pending payments'
-    # Clearing the errors from the order object will stop this error
-    # appearing on the edit page where we don't want it to.
-    @order.errors.clear
-  end
-
-  # Re-implement spree method so that it redirects to edit instead of rendering edit
-  #   This allows page reloads while adding variants to the order (/edit), without being redirected to customer details page (/update)
-  def update
-    unless @order.update_attributes(params[:order]) && @order.line_items.present?
-      @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
-      return redirect_to edit_admin_order_path(@order), flash: { error: @order.errors.full_messages.join(', ') }
-    end
-
-    @order.update!
-    if @order.complete?
-      redirect_to edit_admin_order_path(@order)
-    else
-      # Jump to next step if order is not complete
-      redirect_to admin_order_customer_path(@order)
-    end
-  end
-
-  # Overwrite to use confirm_email_for_customer instead of confirm_email.
-  # This uses a new template. See mailers/spree/order_mailer_decorator.rb.
-  def resend
-    Spree::OrderMailer.confirm_email_for_customer(@order.id, true).deliver
-    flash[:success] = t(:order_email_resent)
-
-    respond_with(@order) { |format| format.html { redirect_to :back } }
-  end
-
-  def invoice
-    pdf = InvoiceRenderer.new.render_to_string(@order)
-
-    Spree::OrderMailer.invoice_email(@order.id, pdf).deliver
-    flash[:success] = t('admin.orders.invoice_email_sent')
-
-    respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
-  end
-
-  def print
-    render InvoiceRenderer.new.args(@order)
-  end
-
-  def print_ticket
-    render template: "spree/admin/orders/ticket", layout: false
-  end
-
-  def update_distribution_charge
-    @order.update_distribution_charge!
-  end
-
-  private
-
-  def require_distributor_abn
-    if @order.distributor.abn.blank?
-      flash[:error] = t(:must_have_valid_business_number, enterprise_name: @order.distributor.name)
-      respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } }
-    end
-  end
-
-  def load_distribution_choices
-    @shops = Enterprise.is_distributor.managed_by(spree_current_user).by_name
-
-    ocs = OrderCycle.managed_by(spree_current_user)
-    @order_cycles = ocs.soonest_closing +
-                    ocs.soonest_opening +
-                    ocs.closed +
-                    ocs.undated
-  end
-
-  def ensure_distribution
-    unless @order
-      @order = Spree::Order.new
-      @order.generate_order_number
-      @order.save!
-    end
-    unless @order.distribution_set?
-      render 'set_distribution', locals: { order: @order }
-    end
-  end
-end

app/controllers/spree/admin/payments_controller.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class PaymentsController < Spree::Admin::BaseController
+      before_filter :load_order, except: [:show]
+      before_filter :load_payment, only: [:fire, :show]
+      before_filter :load_data
+      before_filter :can_transition_to_payment
+
+      respond_to :html
+
+      def index
+        @payments = @order.payments
+        redirect_to new_admin_order_payment_url(@order) if @payments.empty?
+      end
+
+      def new
+        @payment = @order.payments.build
+      end
+
+      def create
+        @payment = @order.payments.build(object_params)
+        load_payment_source
+
+        begin
+          unless @payment.save
+            redirect_to admin_order_payments_path(@order)
+            return
+          end
+
+          if @order.completed?
+            @payment.process!
+            flash[:success] = flash_message_for(@payment, :successfully_created)
+
+            redirect_to admin_order_payments_path(@order)
+          else
+            AdvanceOrderService.new(@order).call!
+
+            flash[:success] = Spree.t(:new_order_completed)
+            redirect_to edit_admin_order_url(@order)
+          end
+        rescue Spree::Core::GatewayError => e
+          flash[:error] = e.message.to_s
+          redirect_to new_admin_order_payment_path(@order)
+        end
+      end
+
+      # When a user fires an event, take them back to where they came from
+      # (we can't use respond_override because Spree no longer uses respond_with)
+      def fire
+        event = params[:e]
+        return unless event && @payment.payment_source
+
+        # Because we have a transition method also called void, we do this to avoid conflicts.
+        event = "void_transaction" if event == "void"
+        if @payment.public_send("#{event}!")
+          flash[:success] = t(:payment_updated)
+        else
+          flash[:error] = t(:cannot_perform_operation)
+        end
+      rescue Spree::Core::GatewayError => e
+        flash[:error] = e.message
+      ensure
+        redirect_to request.referer
+      end
+
+      private
+
+      def load_payment_source
+        if @payment.payment_method.is_a?(Spree::Gateway) &&
+           @payment.payment_method.payment_profiles_supported? &&
+           params[:card].present? &&
+           (params[:card] != 'new')
+          @payment.source = CreditCard.find_by_id(params[:card])
+        end
+      end
+
+      def object_params
+        if params[:payment] &&
+           params[:payment_source] &&
+           source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
+          params[:payment][:source_attributes] = source_params
+        end
+        params[:payment]
+      end
+
+      def load_data
+        @amount = params[:amount] || load_order.total
+
+        # Only show payments for the order's distributor
+        @payment_methods = PaymentMethod.
+          available(:back_end).
+          select{ |pm| pm.has_distributor? @order.distributor }
+
+        @payment_method = if @payment && @payment.payment_method
+                            @payment.payment_method
+                          else
+                            @payment_methods.first
+                          end
+
+        @previous_cards = @order.credit_cards.with_payment_profile
+      end
+
+      # At this point admin should have passed through Customer Details step
+      # where order.next is called which leaves the order in payment step
+      #
+      # Orders in complete step also allows to access this controller
+      #
+      # Otherwise redirect user to that step
+      def can_transition_to_payment
+        return if @order.payment? || @order.complete?
+
+        flash[:notice] = Spree.t(:fill_in_customer_info)
+        redirect_to edit_admin_order_customer_url(@order)
+      end
+
+      def load_order
+        @order = Order.find_by_number!(params[:order_id])
+        authorize! action, @order
+        @order
+      end
+
+      def load_payment
+        @payment = Payment.find(params[:id])
+      end
+    end
+  end
+end

app/controllers/spree/admin/payments_controller_decorator.rb

@@ -1,59 +0,0 @@
-Spree::Admin::PaymentsController.class_eval do
-  append_before_filter :filter_payment_methods
-
-  def create
-    @payment = @order.payments.build(object_params)
-    if @payment.payment_method.is_a?(Spree::Gateway) && @payment.payment_method.payment_profiles_supported? && params[:card].present? && (params[:card] != 'new')
-      @payment.source = CreditCard.find_by_id(params[:card])
-    end
-
-    begin
-      unless @payment.save
-        redirect_to admin_order_payments_path(@order)
-        return
-      end
-
-      if @order.completed?
-        @payment.process!
-        flash[:success] = flash_message_for(@payment, :successfully_created)
-
-        redirect_to admin_order_payments_path(@order)
-      else
-        AdvanceOrderService.new(@order).call!
-
-        flash[:success] = Spree.t(:new_order_completed)
-        redirect_to edit_admin_order_url(@order)
-      end
-    rescue Spree::Core::GatewayError => e
-      flash[:error] = e.message.to_s
-      redirect_to new_admin_order_payment_path(@order)
-    end
-  end
-
-  # When a user fires an event, take them back to where they came from
-  # (we can't use respond_override because Spree no longer uses respond_with)
-  def fire
-    event = params[:e]
-    return unless event && @payment.payment_source
-
-    # Because we have a transition method also called void, we do this to avoid conflicts.
-    event = "void_transaction" if event == "void"
-    if @payment.public_send("#{event}!")
-      flash[:success] = t(:payment_updated)
-    else
-      flash[:error] = t(:cannot_perform_operation)
-    end
-  rescue Spree::Core::GatewayError => e
-    flash[:error] = e.message
-  ensure
-    redirect_to request.referer
-  end
-
-  private
-
-  # Only show payments for the order's distributor
-  def filter_payment_methods
-    @payment_methods = @payment_methods.select{ |pm| pm.has_distributor? @order.distributor }
-    @payment_method ||= @payment_methods.first
-  end
-end

app/controllers/spree/admin/search_controller.rb

@@ -0,0 +1,43 @@
+module Spree
+  module Admin
+    class SearchController < Spree::Admin::BaseController
+      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
+      before_filter :check_json_authenticity, only: :index
+      respond_to :json
+
+      def known_users
+        @users = if exact_match = Spree.user_class.find_by_email(params[:q])
+                   [exact_match]
+                 else
+                   spree_current_user.known_users.ransack(ransack_hash).result.limit(10)
+                 end
+
+        render json: @users, each_serializer: ::Api::Admin::UserSerializer
+      end
+
+      def customers
+        @customers = []
+        if spree_current_user.enterprises.pluck(:id).include? params[:distributor_id].to_i
+          @customers = Customer.
+            ransack(m: 'or', email_start: params[:q], name_start: params[:q]).
+            result.
+            where(enterprise_id: params[:distributor_id])
+        end
+        render json: @customers, each_serializer: ::Api::Admin::CustomerSerializer
+      end
+
+      private
+
+      def ransack_hash
+        {
+          m: 'or',
+          email_start: params[:q],
+          ship_address_firstname_start: params[:q],
+          ship_address_lastname_start: params[:q],
+          bill_address_firstname_start: params[:q],
+          bill_address_lastname_start: params[:q]
+        }
+      end
+    end
+  end
+end

app/controllers/spree/admin/search_controller_decorator.rb

@@ -1,36 +0,0 @@
-Spree::Admin::SearchController.class_eval do
-  def known_users
-    @users = if exact_match = Spree.user_class.find_by_email(params[:q])
-               [exact_match]
-             else
-               spree_current_user.known_users.ransack(
-                 m: 'or',
-                 email_start: params[:q],
-                 ship_address_firstname_start: params[:q],
-                 ship_address_lastname_start: params[:q],
-                 bill_address_firstname_start: params[:q],
-                 bill_address_lastname_start: params[:q]
-               ).result.limit(10)
-             end
-
-    render json: @users, each_serializer: Api::Admin::UserSerializer
-  end
-
-  def customers
-    @customers = if spree_current_user.enterprises.pluck(:id).include? params[:distributor_id].to_i
-                   Customer.ransack(m: 'or', email_start: params[:q], name_start: params[:q])
-                     .result.where(enterprise_id: params[:distributor_id])
-                 else
-                   []
-                 end
-
-    render json: @customers, each_serializer: Api::Admin::CustomerSerializer
-  end
-
-  def users_with_ams
-    users_without_ams
-    render json: @users, each_serializer: Api::Admin::UserSerializer
-  end
-
-  alias_method_chain :users, :ams
-end

app/controllers/spree/checkout_controller.rb

@@ -1,93 +1,16 @@
-require 'open_food_network/address_finder'
+# frozen_string_literal: true
 
+# This controller (and respective route in the Spree engine)
+#   is only needed for the spree_paypal_express gem that redirects here explicitly.
+#
+# According to the rails docs it would be possible to redirect
+#   to CheckoutController directly in the routes
+#   with a slash like "to: '/checkout#edit'", but it does not work in this case.
 module Spree
   class CheckoutController < Spree::StoreController
-    include CheckoutHelper
-
-    ssl_required
-
-    before_filter :load_order
-
-    before_filter :ensure_order_not_completed
-    before_filter :ensure_checkout_allowed
-    before_filter :ensure_sufficient_stock_lines
-
-    before_filter :associate_user
-    before_filter :check_authorization
-    before_filter :enable_embedded_shopfront
-
-    helper 'spree/orders'
-
-    rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
-
     def edit
       flash.keep
       redirect_to main_app.checkout_path
     end
-
-    private
-
-    def load_order
-      @order = current_order
-      redirect_to(main_app.cart_path) && return unless @order
-
-      if params[:state]
-        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state])
-        @order.state = params[:state]
-      end
-      setup_for_current_state
-    end
-
-    def ensure_checkout_allowed
-      redirect_to main_app.cart_path unless @order.checkout_allowed?
-    end
-
-    def ensure_order_not_completed
-      redirect_to main_app.cart_path if @order.completed?
-    end
-
-    def ensure_sufficient_stock_lines
-      if @order.insufficient_stock_lines.present?
-        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
-        redirect_to main_app.cart_path
-      end
-    end
-
-    def setup_for_current_state
-      method_name = :"before_#{@order.state}"
-      send(method_name) if respond_to?(method_name, true)
-    end
-
-    # Adapted from spree_last_address gem: https://github.com/TylerRick/spree_last_address
-    # Originally, we used a forked version of this gem, but encountered strange errors where
-    # it worked in dev but only intermittently in staging/prod.
-    def before_address
-      associate_user
-
-      finder = OpenFoodNetwork::AddressFinder.new(@order.email)
-
-      @order.bill_address = finder.bill_address
-      @order.ship_address = finder.ship_address
-    end
-
-    def before_delivery
-      return if params[:order].present?
-
-      packages = @order.shipments.map(&:to_package)
-      @differentiator = Spree::Stock::Differentiator.new(@order, packages)
-    end
-
-    def before_payment
-      current_order.payments.destroy_all if request.put?
-    end
-
-    def rescue_from_spree_gateway_error
-      flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
-      render :edit
-    end
-
-    def check_authorization
-      authorize!(:edit, current_order, session[:access_token])
-    end
   end
 end

app/controllers/spree/orders_controller.rb

@@ -71,7 +71,7 @@ module Spree
       @order = order_to_update
       unless @order
         flash[:error] = t(:order_not_found)
-        redirect_to(root_path) && return
+        redirect_to(main_app.root_path) && return
       end
 
       if @order.update_attributes(params[:order])

app/controllers/spree/users_controller.rb

@@ -32,7 +32,7 @@ module Spree
           session[:guest_token] = nil
         end
 
-        redirect_back_or_default(root_url)
+        redirect_back_or_default(main_app.root_url)
       else
         render :new
       end

app/helpers/spree/admin/orders_helper.rb

@@ -1,6 +1,17 @@
 module Spree
   module Admin
     module OrdersHelper
+      def event_links
+        links = []
+        links << event_link("cancel") if @order.can_cancel?
+        links << event_link("resume") if @order.can_resume?
+        links.join('&nbsp;').html_safe
+      end
+
+      def line_item_shipment_price(line_item, quantity)
+        Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
+      end
+
       def order_links(order)
         @order ||= order
         links = []
@@ -100,6 +111,14 @@ module Spree
           icon: 'icon-trash',
           confirm: t(:are_you_sure) }
       end
+
+      def event_link(event)
+        button_link_to(Spree.t(event),
+                       fire_admin_order_url(@order, e: event),
+                       method: :put,
+                       icon: "icon-#{event}",
+                       data: { confirm: Spree.t(:order_sure_want_to, event: Spree.t(event)) })
+      end
     end
   end
 end

app/helpers/spree/admin/payments_helper.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Admin
+    module PaymentsHelper
+      def payment_method_name(payment)
+        # hack to allow us to retrieve the name of a "deleted" payment method
+        id = payment.payment_method_id
+        Spree::PaymentMethod.find_with_destroyed(id).name
+      end
+    end
+  end
+end

app/mailers/spree/base_mailer_decorator.rb

@@ -9,6 +9,6 @@ Spree::BaseMailer.class_eval do
 
   def roadie_options
     # This lets us specify assets using relative paths in email templates
-    super.merge(url_options: { host: URI(spree.root_url).host })
+    super.merge(url_options: { host: URI(main_app.root_url).host })
   end
 end

app/models/enterprise.rb

@@ -25,7 +25,8 @@ class Enterprise < ActiveRecord::Base
   has_many :relationships_as_child, class_name: 'EnterpriseRelationship',
                                     foreign_key: 'child_id',
                                     dependent: :destroy
-  has_and_belongs_to_many :groups, class_name: 'EnterpriseGroup'
+  has_and_belongs_to_many :groups, join_table: 'enterprise_groups_enterprises',
+                                   class_name: 'EnterpriseGroup'
   has_many :producer_properties, foreign_key: 'producer_id'
   has_many :properties, through: :producer_properties
   has_many :supplied_products, class_name: 'Spree::Product',
@@ -115,7 +116,10 @@ class Enterprise < ActiveRecord::Base
   scope :not_ready_for_checkout, lambda {
     # When ready_for_checkout is empty, return all rows when there are no enterprises ready for
     # checkout.
-    ready_enterprises = Enterprise.ready_for_checkout.select('enterprises.id')
+    ready_enterprises = Enterprise.ready_for_checkout.
+      except(:select).
+      select('DISTINCT enterprises.id')
+
     if ready_enterprises.present?
       where("enterprises.id NOT IN (?)", ready_enterprises)
     else

app/models/enterprise_group.rb

@@ -5,7 +5,7 @@ class EnterpriseGroup < ActiveRecord::Base
   include PermalinkGenerator
   acts_as_list
 
-  has_and_belongs_to_many :enterprises
+  has_and_belongs_to_many :enterprises, join_table: 'enterprise_groups_enterprises'
   belongs_to :owner, class_name: 'Spree::User', foreign_key: :owner_id, inverse_of: :owned_groups
   belongs_to :address, class_name: 'Spree::Address'
   accepts_nested_attributes_for :address

app/models/order_cycle.rb

@@ -63,7 +63,7 @@ class OrderCycle < ActiveRecord::Base
     if user.has_spree_role?('admin')
       scoped
     else
-      where('coordinator_id IN (?)', user.enterprises.map(&:id))
+      where(coordinator_id: user.enterprises)
     end
   }
 

app/services/checkout/form_data_adapter.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# Adapts checkout form data (params) so that the order can be directly saved to the database
+module Checkout
+  class FormDataAdapter
+    attr_reader :shipping_method_id
+
+    def initialize(params, order, current_user)
+      @params = params.dup
+      @order = order
+      @current_user = current_user
+
+      move_payment_source_to_payment_attributes!
+
+      set_amount_in_payments_attributes
+
+      construct_saved_card_attributes if @params[:order][:existing_card_id]
+
+      @shipping_method_id = @params[:order].delete(:shipping_method_id)
+    end
+
+    def order_params
+      @params[:order]
+    end
+
+    private
+
+    # For payment step, filter order parameters to produce the expected
+    #   nested attributes for a single payment and its source,
+    #   discarding attributes for payment methods other than the one selected
+    def move_payment_source_to_payment_attributes!
+      return unless @params[:payment_source].present? &&
+                    payment_source_params = delete_payment_source_params!
+
+      @params[:order][:payments_attributes].first[:source_attributes] = payment_source_params
+    end
+
+    def delete_payment_source_params!
+      @params.delete(:payment_source)[
+        @params[:order][:payments_attributes].first[:payment_method_id].underscore
+      ]
+    end
+
+    def set_amount_in_payments_attributes
+      return unless @params[:order][:payments_attributes]
+
+      @params[:order][:payments_attributes].first[:amount] = @order.total
+    end
+
+    def construct_saved_card_attributes
+      existing_card_id = @params[:order].delete(:existing_card_id)
+      return if existing_card_id.blank?
+
+      add_to_payment_attributes(existing_card_id)
+
+      @params[:order][:payments_attributes].first.delete :source_attributes
+    end
+
+    def add_to_payment_attributes(existing_card_id)
+      credit_card = Spree::CreditCard.find(existing_card_id)
+      if credit_card.try(:user_id).blank? || credit_card.user_id != @current_user.try(:id)
+        raise Spree::Core::GatewayError, I18n.t(:invalid_credit_card)
+      end
+
+      @params[:order][:payments_attributes].first[:source] = credit_card
+    end
+  end
+end

app/services/checkout/payment_redirect.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Provides the redirect path if a redirect to the payment gateway is needed
+module Checkout
+  class PaymentRedirect
+    def initialize(params)
+      @params = params
+    end
+
+    # Returns the path to the Paypal Express form if a redirect is needed
+    def path
+      return unless @params[:order][:payments_attributes]
+
+      payment_method_id = @params[:order][:payments_attributes].first[:payment_method_id]
+      payment_method = Spree::PaymentMethod.find(payment_method_id)
+      return unless payment_method.is_a?(Spree::Gateway::PayPalExpress)
+
+      spree_routes_helper.paypal_express_path(payment_method_id: payment_method.id)
+    end
+
+    private
+
+    def spree_routes_helper
+      Spree::Core::Engine.routes_url_helpers
+    end
+  end
+end

app/services/order_cycle_warning.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class OrderCycleWarning
+  def initialize(current_user)
+    @current_user = current_user
+  end
+
+  def call
+    distributors = active_distributors_not_ready_for_checkout
+
+    return if distributors.empty?
+
+    active_distributors_not_ready_for_checkout_message(distributors)
+  end
+
+  private
+
+  attr_reader :current_user
+
+  def active_distributors_not_ready_for_checkout
+    ocs = OrderCycle.managed_by(current_user).active
+    distributors = ocs.includes(:distributors).map(&:distributors).flatten.uniq
+    Enterprise.where(id: distributors.map(&:id)).not_ready_for_checkout
+  end
+
+  def active_distributors_not_ready_for_checkout_message(distributors)
+    distributor_names = distributors.map(&:name).join ', '
+
+    if distributors.count > 1
+      I18n.t(:active_distributors_not_ready_for_checkout_message_plural,
+             distributor_names: distributor_names)
+    else
+      I18n.t(:active_distributors_not_ready_for_checkout_message_singular,
+             distributor_names: distributor_names)
+    end
+  end
+end

app/services/user_default_address_setter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Sets the order addresses as the user default addresses
+class UserDefaultAddressSetter
+  def initialize(order, current_user)
+    @order = order
+    @current_user = current_user
+  end
+
+  # Sets the order bill address as the user default bill address
+  def set_default_bill_address
+    new_bill_address = @order.bill_address.clone.attributes
+
+    set_bill_address_attributes(@current_user, new_bill_address)
+    set_bill_address_attributes(@order.customer, new_bill_address)
+  end
+
+  # Sets the order ship address as the user default ship address
+  def set_default_ship_address
+    new_ship_address = @order.ship_address.clone.attributes
+
+    set_ship_address_attributes(@current_user, new_ship_address)
+    set_ship_address_attributes(@order.customer, new_ship_address)
+  end
+
+  private
+
+  def set_bill_address_attributes(object, new_address)
+    object.update_attributes(
+      bill_address_attributes: new_address.merge('id' => object.bill_address.andand.id)
+    )
+  end
+
+  def set_ship_address_attributes(object, new_address)
+    object.update_attributes(
+      ship_address_attributes: new_address.merge('id' => object.ship_address.andand.id)
+    )
+  end
+end

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

@@ -54,7 +54,7 @@
   .row{ ng: { show: "Enterprise.sells == 'own' || Enterprise.sells == 'any'" } }
     .three.columns.alpha
       = f.label :permalink, t('.permalink')
-      %div{'ofn-with-tip' => t('.permalink_tip', link: spree.root_url)}
+      %div{'ofn-with-tip' => t('.permalink_tip', link: main_app.root_url)}
         %a= t('admin.whats_this')
     .six.columns
       = f.text_field :permalink, { 'ng-model' => "Enterprise.permalink", placeholder: "eg. your-shop-name", 'ng-model-options' => "{ updateOn: 'default blur', debounce: {'default': 300, 'blur': 0} }" }
@@ -69,7 +69,7 @@
       %div{'ofn-with-tip' => t('.link_to_front_tip')}
         %a= t('admin.whats_this')
     .eight.columns.omega
-      = surround spree.root_url, "/shop" do
+      = surround main_app.root_url, "/shop" do
         {{Enterprise.permalink}}
   .row
     .three.columns.alpha

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

@@ -31,10 +31,10 @@
 - if type == 'supplier'
   %tr.panel-row{ object: "exchange",
     panels: "{products: 'exchange_products_supplied'}",
-    locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
+    locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
     colspan: 4 }
 - if type == 'distributor'
   %tr.panel-row{ object: "exchange",
     panels: "{products: 'exchange_products_distributed', tags: 'exchange_tags'}",
-    locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
+    locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
     colspan: 5 }

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

@@ -33,8 +33,8 @@
       = t('.variants')
 
   %td.actions
-    %a.edit-order-cycle.icon-edit.no-text{ ng: { href: '{{orderCycle.edit_path}}'} }
+    %a.edit-order-cycle.icon-edit.no-text{ ng: { href: '{{orderCycle.edit_path}}'}, 'ofn-with-tip' => t(:edit) }
   %td.actions{ ng: { if: 'orderCycle.viewing_as_coordinator' } }
-    %a.clone-order-cycle.icon-copy.no-text{ ng: { href: '{{orderCycle.clone_path}}'} }
-  %td.actions{ ng: { if: 'orderCycle.deletable && orderCycle.viewing_as_coordinator' } }
-    %a.delete-order-cycle.icon-trash.no-text{ ng: { href: '{{orderCycle.delete_path}}'}, data: { method: 'delete', confirm: t(:are_you_sure) } }
+    %a.clone-order-cycle.icon-copy.no-text{ ng: { href: '{{orderCycle.clone_path}}'}, 'ofn-with-tip' => t(:clone) }
+  %td.actions{ ng: { if: 'orderCycle.deletable && orderCycle.viewing_as_coordinator' }}
+    %a.delete-order-cycle.icon-trash.no-text{ ng: { href: '{{orderCycle.delete_path}}'}, data: { method: 'delete', confirm: t(:are_you_sure) }, 'ofn-with-tip' => t(:remove) }

app/views/layouts/mailer.html.haml

@@ -42,10 +42,10 @@
               %tr
                 %td{:align => "center"}
                   %p
-                    %a{:href => "#{ URI.join(spree.root_url, Spree::Config.footer_tos_url).to_s }", :target => "_blank"}
+                    %a{:href => "#{ URI.join(main_app.root_url, Spree::Config.footer_tos_url).to_s }", :target => "_blank"}
                       = t :terms_of_service
                     |
-                    %a{:href => "#{ spree.root_url }"}
+                    %a{:href => "#{ main_app.root_url }"}
                       = Spree::Config[:site_name]
                     / | <a href="#"><unsubscribe>Unsubscribe</unsubscribe></a>
         %td

app/views/shared/_footer.html.haml

@@ -94,7 +94,7 @@
 
     .row
       .small-12.medium-3.medium-offset-2.columns.text-left
-        %a{href: root_path}
+        %a{href: main_app.root_path}
           %img{src: ContentConfig.footer_logo.url, width: "220"}
       .small-12.medium-5.columns.text-left
         %p.text-small

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

@@ -2,7 +2,7 @@
   %section.top-bar-section
     %ul.left
       %li.ofn-logo
-        %a{href: root_path}
+        %a{href: main_app.root_path}
           %img{src: ContentConfig.logo.url}
       %li.powered-by
         %img{src: '/favicon.ico'}

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

@@ -5,7 +5,7 @@
 
   %section.left
     .ofn-logo
-      %a{href: root_path}
+      %a{href: main_app.root_path}
         %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"}
 
   %section.right{"ng-cloak" => true}

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

@@ -1,7 +1,7 @@
 %aside.left-off-canvas-menu.show-for-medium-down{ ng: { controller: "OffcanvasCtrl" } }
   %ul.off-canvas-list
     %li.ofn-logo
-      %a{href: root_path}
+      %a{href: main_app.root_path}
         %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"}
     - [*1..7].each do |menu_number|
       - menu_name = "menu_#{menu_number}"

app/views/shop/_blocked_cookies.html.haml

@@ -9,6 +9,6 @@
 .alert-box.blocked-cookies.hidden
   %p= t('blocked_cookies_alert')
 
-  %a.button.allow{target: '_blank', href: "#{spree.root_url}embedded_shopfront/shopfront_session/"}
+  %a.button.allow{target: '_blank', href: "#{main_app.root_url}embedded_shopfront/shopfront_session/"}
     = t('allow_cookies')
     

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

@@ -1,5 +1,5 @@
 %div{"data-hook" => "admin_orders_index_search"}
-  = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
+  = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
     .field-block.alpha.four.columns
       .date-range-filter.field
         = label_tag nil, t(:date_range)

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

@@ -43,7 +43,7 @@
 
       - ['number', 'state', 'payment_state', 'shipment_state', 'email', 'total'].each do |column_name|
         %th
-          = render partial: 'sortable_header', locals: {column_name: column_name}
+          = render partial: 'spree/admin/shared/sortable_header', locals: {column_name: column_name}
 
       %th.actions
   %tbody

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

@@ -26,7 +26,8 @@
     %th.image{ 'ng-show' => 'columns.image.visible' }
     %th.producer{ 'ng-show' => 'columns.producer.visible' }=t('admin.producer')
     %th.sku{ 'ng-show' => 'columns.sku.visible' }=t('admin.sku')
-    %th.name{ 'ng-show' => 'columns.name.visible' }=t('.name')
+    %th.name{ 'ng-show' => 'columns.name.visible' }
+      = render partial: 'spree/admin/shared/sortable_header', locals: {column_name: 'name'}
     %th.unit{ 'ng-show' => 'columns.unit.visible' }=t('.unit')
     %th.display_as{ 'ng-show' => 'columns.unit.visible' }=t('.display_as')
     %th.price{ 'ng-show' => 'columns.price.visible' }=t('admin.price')

app/views/spree/admin/shared/_address_form.html.erb

@@ -0,0 +1,72 @@
+<% if use_billing %>
+  <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
+    <span data-hook="use_billing">
+      <%= 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) %>
+    </span>
+  </div>
+<% end %>
+
+<% is_shipping_address = name == Spree.t(:shipping_address) %>
+<% shipping_or_billing = is_shipping_address ? 'shipping' : 'billing' %>
+<% s_or_b = is_shipping_address ? 's' : 'b' %>
+
+<div id="<%= is_shipping_address ? 'shipping' : 'billing' %>" style="display: <%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block' %>" data-hook="address_fields">
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :firstname, Spree.t(:first_name) + ':' %>
+    <%= f.text_field :firstname, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :lastname, Spree.t(:last_name) + ':' %>
+    <%= f.text_field :lastname, :class => 'fullwidth' %>
+  </div>
+  <% if Spree::Config[:company] %>
+    <div class="field <%= "#{shipping_or_billing}-row" %>">
+      <%= f.label :company, Spree.t(:company) + ':' %>
+      <%= f.text_field :company, :class => 'fullwidth' %>
+    </div>
+  <% end %>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :address1, Spree.t(:street_address) + ':' %>
+    <%= f.text_field :address1, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :address2, Spree.t(:street_address_2) + ':' %>
+    <%= f.text_field :address2, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :city, Spree.t(:city) + ':' %>
+    <%= f.text_field :city, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :zipcode, Spree.t(:zip) + ':' %>
+    <%= f.text_field :zipcode, :class => 'fullwidth' %>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= 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'} %>
+    </span>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :state_id, Spree.t(:state) + ':' %>
+    <span id="<%= s_or_b %>state">
+      <%= f.text_field :state_name, 
+            :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
+           :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
+      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+    </span>
+  </div>
+  <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <%= f.label :phone, Spree.t(:phone) + ':' %>
+    <%= f.phone_field :phone, :class => 'fullwidth' %>
+  </div>
+</div>
+
+<% content_for :head do %>
+  <%= javascript_tag do -%>
+    $(document).ready(function(){
+      $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
+    });
+  <% end -%>
+<% end %>

app/views/spree/admin/shared/_new_resource_links.html.erb

@@ -1,5 +0,0 @@
-<div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'icon-ok' %>
-  <span class="or"><%= Spree.t(:or) %></span>
-  <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
-</div>

app/views/spree/admin/shared/_new_resource_links.html.haml

@@ -0,0 +1,4 @@
+.form-buttons.filter-actions.actions
+  = button t('actions.create'), 'icon-ok'
+  %span.or= t(:or)
+  = button_link_to t('actions.cancel'), collection_url, icon: 'icon-remove'

app/views/spree/admin/shared/_routes.html.erb

@@ -2,7 +2,6 @@
   Spree.routes = <%== {
     :variants_search       => spree.admin_search_variants_path(:format => 'json'),
     :taxons_search         => main_app.api_taxons_path(:format => 'json'),
-    :user_search           => spree.admin_search_users_path(:format => 'json'),
     :orders_api            => main_app.api_orders_path
   }.to_json %>;
 </script>

app/views/spree/admin/shared/_update_order_state.js

@@ -0,0 +1,7 @@
+$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, :scope => :order_state) %>');
+$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
+
+<% if @order.completed? %>
+  $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>');
+  $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %>');
+<% end %>

app/views/spree/layouts/admin/_login_nav.html.haml

@@ -8,7 +8,7 @@
       = link_to t(:account), account_path
     %li{"data-hook" => "user-logout-link"}
       %i.icon-signout
-      = link_to t(:logout), spree.logout_path
+      = link_to t(:logout), logout_path
     %li{"data-hook" => "store-frontend-link"}
       %i.icon-external-link
-      = link_to t(".header.store"), spree.root_path, target: "_blank"
+      = link_to t(".header.store"), main_app.root_path, target: "_blank"

app/views/spree/layouts/bare_admin.html.haml

@@ -1,6 +1,6 @@
 %html{ lang: "en" }
   %head{"data-hook" => "admin_inside_head"}= render :partial => 'spree/admin/shared/head'
-  %body.admin{"data-ajax-root-path" => spree.root_path}
+  %body.admin{"data-ajax-root-path" => main_app.root_path}
     #wrapper{"data-hook" => ""}
       - if flash[:error]
         .flash.error= flash[:error]

app/views/spree/user_mailer/signup_confirmation.html.haml

@@ -9,7 +9,7 @@
   = t :email_signup_confirmed_email
 %p
   -# Remove http:// and trailing slashes from root url if they exist
-  = t :email_signup_shop_html, link: link_to(spree.root_url.sub(/http:\/\//,"").sub(/\/$/,""), spree.root_url, target: '_blank')
+  = t :email_signup_shop_html, link: link_to(main_app.root_url.sub(/http:\/\//,"").sub(/\/$/,""), main_app.root_url, target: '_blank')
 %p  
 %hr/
 %p  

config/environments/production.rb

@@ -34,10 +34,14 @@ Openfoodnetwork::Application.configure do
   config.action_mailer.default_url_options = { protocol: 'https' }
 
   # See everything in the log (default is :info)
-  config.log_level = :info
+  # config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Configure logging for Rails 3.2:
+  config.logger = ActiveSupport::TaggedLogging.new(Logger.new(Rails.root.join("log", "#{Rails.env}.log")))
+  config.logger.formatter = Logger::Formatter.new
+  config.logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+  # Once we get to Rails 4.0, we can replace the above with:
+  #config.log_formatter = Logger::Formatter.new.tap { |f| f.datetime_format = "%Y-%m-%d %H:%M:%S" }
 
   # Use a different cache store in production
   memcached_value_max_megabytes = ENV.fetch("MEMCACHED_VALUE_MAX_MEGABYTES", 1).to_i

config/environments/staging.rb

@@ -36,8 +36,12 @@ Openfoodnetwork::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Configure logging for Rails 3.2:
+  config.logger = ActiveSupport::TaggedLogging.new(Logger.new(Rails.root.join("log", "#{Rails.env}.log")))
+  config.logger.formatter = Logger::Formatter.new
+  config.logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+  # Once we get to Rails 4.0, we can replace the above with:
+  #config.log_formatter = Logger::Formatter.new.tap { |f| f.datetime_format = "%Y-%m-%d %H:%M:%S" }
 
   # Use a different cache store in production
   memcached_value_max_megabytes = ENV.fetch("MEMCACHED_VALUE_MAX_MEGABYTES", 1).to_i

config/locales/ar.yml

@@ -1281,6 +1281,7 @@ ar:
   saving_credit_card: جارٍ حفظ بطاقة الائتمان ...
   card_has_been_removed: "تمت إزالة بطاقتك (الرقم: %{number})"
   card_could_not_be_removed: عذرًا ، تعذرت إزالة البطاقة
+  invalid_credit_card: "بطاقة الائتمان غير صالحة"
   ie_warning_headline: "متصفحك غير محدث :-("
   ie_warning_text: "للحصول على أفضل تجربة لشبكة الغذاء المفتوح ، نوصي بشدة بترقية متصفحك:"
   ie_warning_chrome: تحميل متصفح كروم
@@ -2425,11 +2426,11 @@ ar:
           description: وصف
           resolve: حل
         exchange_products:
-          load_more_products: "تحميل المزيد من المنتجات"
-          load_all_products: "تحميل جميع المنتجات"
-          select_all_products: "حدد جميع المنتجات %{total_number_of_products}"
-          products_loaded: "%{num_of_products_loaded} من %{total_number_of_products} المنتجات المحملة"
-          loading_products: "تحميل المنتجات"
+          load_more_variants: "تحميل المزيد من المتغيرات"
+          load_all_variants: "تحميل جميع المتغيرات"
+          select_all_variants: "حدد كل %{total_number_of_variants} المتغيرات"
+          variants_loaded: "%{num_of_variants_loaded} من %{total_number_of_variants} تم تحميل المتغيرات"
+          loading_variants: "تحميل المتغيرات"
       tag_rules:
         shipping_method_tagged_top: "طرق الشحن الموسومة"
         shipping_method_tagged_bottom: "هي:"
@@ -2830,6 +2831,8 @@ ar:
     zipcode: الرمز البريدي
     weight: الوزن (لكل كجم)
     error_user_destroy_with_orders: "لا يمكن حذف المستخدمين الذين لديهم طلبات مكتملة"
+    cannot_create_payment_without_payment_methods: "لا يمكنك إنشاء دفعة لطلب بدون تحديد طرقة الدفع."
+    please_define_payment_methods: "يرجى تحديد بعض طرق الدفع أولاً."
     options: "خيارات"
     actions:
       update: "تحديث"

config/locales/ca.yml

@@ -50,6 +50,8 @@ ca:
         shipping_method_ids: "Mètodes d'enviament"
         payment_method_ids: "Mètodes de Pagament"
     errors:
+      messages:
+        inclusion: "no està inclòs a la llista"
       models:
         subscription_validator:
           attributes:
@@ -700,6 +702,11 @@ ca:
           enable_subscriptions_false: "Deshabilitat"
           enable_subscriptions_true: "Habilitat"
           shopfront_message: "Missatge de la botiga"
+          shopfront_message_placeholder: >
+              Un missatge opcional per donar la benvinguda als clients i explicar
+              com comprar amb vosaltres. Si s'introdueix text aquí, es mostrarà a
+              la pestanya d'inici quan els clients arribin per primera vegada a la
+              vostra botiga.
           shopfront_message_link_tooltip: "Inserir / editar enllaç"
           shopfront_message_link_prompt: "Introduïu un URL per inserir"
           shopfront_closed_message: "Missatge de tancament de la botiga"
@@ -1101,10 +1108,13 @@ ca:
       destroy_attachment_does_not_exist: "El logotip no existeix"
     enterprise_promo_image:
       destroy_attachment_does_not_exist: "La imatge promocional no existeix"
+    orders:
+      failed_to_update: "No s'ha pogut actualitzar la comanda"
   checkout:
     already_ordered:
       cart: "cistella"
       message_html: "Ja teniu una comanda per a aquest cicle de comanda. Consulteu %{cart} per veure els articles que heu demanat anteriorment. També podeu cancel·lar articles sempre que el cicle de comanda estigui obert."
+    failed: "La comanda ha fallat. Informeu-nos perquè puguem processar la vostra comanda."
   shops:
     hubs:
       show_closed_shops: "Mostra les botigues tancades"
@@ -1935,6 +1945,7 @@ ca:
   tax_category: "Categoria d'impostos"
   calculator: "Calculadora"
   calculator_values: "Valors de la calculadora"
+  calculator_settings_warning: "Si canvieu el tipus de calculadora, primer heu de desar abans de poder editar la configuració de la calculadora"
   flat_percent_per_item: "Percentatge fixe (per article)"
   flat_rate_per_item: "Tarifa fixa (per article)"
   flat_rate_per_order: "Tarifa fixa (per comanda)"
@@ -2501,6 +2512,7 @@ ca:
           customer_placeholder: "consumidora@example.org"
           valid_email_error: "siusplau, introduïu una adreça de correu electrònic vàlida"
       subscriptions:
+        error_saving: "S'ha produït un error en desar la subscripció"
         new:
           please_select_a_shop: "Si us plau, seleccioneu una botiga"
     insufficient_stock: "No hi ha prou estoc disponible, només queda %{on_hand}"
@@ -2818,6 +2830,8 @@ ca:
     zipcode: Codi postal
     weight: Pes (per kg)
     error_user_destroy_with_orders: "No es poden esborrar usuaris amb comandes completades"
+    cannot_create_payment_without_payment_methods: "No podeu crear un pagament per a una comanda sense que hi hagi definit cap mètode de pagament."
+    please_define_payment_methods: "Primer definiu alguns mètodes de pagament."
     options: "Opcions"
     actions:
       update: "Actualitzar"
@@ -2904,6 +2918,7 @@ ca:
           capture: "Captura"
           ship: "Enviament"
           edit: "Editar"
+          order_not_updated: "La comanda no s'ha pogut actualitzar"
           note: "Nota"
           first: "Primer"
           last: "Últim"

config/locales/en.yml

@@ -1364,6 +1364,7 @@ en:
   saving_credit_card: Saving credit card...
   card_has_been_removed: "Your card has been removed (number: %{number})"
   card_could_not_be_removed: Sorry, the card could not be removed
+  invalid_credit_card: "Invalid credit card"
 
   ie_warning_headline: "Your browser is out of date :-("
   ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:"
@@ -2557,11 +2558,11 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           description: Description
           resolve: Resolve
         exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products} Products"
-          products_loaded: "%{num_of_products_loaded} of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
+          load_more_variants: "Load More Variants"
+          load_all_variants: "Load All Variants"
+          select_all_variants: "Select All %{total_number_of_variants} Variants"
+          variants_loaded: "%{num_of_variants_loaded} of %{total_number_of_variants} Variants Loaded"
+          loading_variants: "Loading Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2721,6 +2722,90 @@ See the %{link} to find out more about %{sitename}'s features and to start using
       have_an_account: "Already have an account?"
       action_login: "Log in now."
 
+  # Singular and plural forms of commonly used words.
+  # We use these entries to pluralize unit names in every language.
+  #
+  # Extracted with the following query:
+  # Spree::Product.group(:variant_unit_name).order("count_all DESC").count.each { |name, count|
+  #   puts "    # Used #{count} times."
+  #   puts "    #{name&.parameterize('_')}:"
+  #   puts "      one: \"#{name}\""
+  #   puts "      other: \"#{name}s\"";
+  # }
+  inflections:
+    each:
+      one: "each"
+      other: "each"
+    bunch:
+      one: "bunch"
+      other: "bunches"
+    pack:
+      one: "pack"
+      other: "packs"
+    box:
+      one: "box"
+      other: "boxes"
+    bottle:
+      one: "bottle"
+      other: "bottles"
+    jar:
+      one: "jar"
+      other: "jars"
+    head:
+      one: "head"
+      other: "heads"
+    bag:
+      one: "bag"
+      other: "bags"
+    loaf:
+      one: "loaf"
+      other: "loaves"
+    single:
+      one: "single"
+      other: "singles"
+    tub:
+      one: "tub"
+      other: "tubs"
+    punnet:
+      one: "punnet"
+      other: "punnets"
+    packet:
+      one: "packet"
+      other: "packets"
+    item:
+      one: "item"
+      other: "items"
+    dozen:
+      one: "dozen"
+      other: "dozens"
+    unit:
+      one: "unit"
+      other: "units"
+    serve:
+      one: "serve"
+      other: "serves"
+    tray:
+      one: "tray"
+      other: "trays"
+    piece:
+      one: "piece"
+      other: "pieces"
+    pot:
+      one: "pot"
+      other: "pots"
+    bundle:
+      one: "bundle"
+      other: "bundles"
+    flask:
+      one: "flask"
+      other: "flasks"
+    basket:
+      one: "basket"
+      other: "baskets"
+    sack:
+      one: "sack"
+      other: "sacks"
+
   producers:
     signup:
       start_free_profile: "Start with a free profile, and expand when you're ready!"
@@ -2988,6 +3073,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
 
     actions:

config/locales/en_AU.yml

@@ -782,7 +782,14 @@ en_AU:
         producer_shop_description_text2: A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, select 'Producer Hub'.
         producer_hub: Producer Hub
         producer_hub_text: Sell produce from self and others
-        producer_hub_description_text: Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+        producer_hub_description_text: 'You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+
+
+          Free to use for shopfronts with turnover of less than $500 a month. 
+
+          1% of turnover for shopfronts with turnover of more than $500 a month.
+
+          2-3% of turnover for solidarity partners who choose to collaborate on growing a new food system.'
         profile: Profile Only
         get_listing: Get a listing
         profile_description_text: People can find and contact you on the Open Food Network. Your enterprise will be visible on the map, and will be searchable in listings.
@@ -1617,7 +1624,7 @@ en_AU:
   sell_groups_detail: "Set up a tailored directory of enterprises (producers and other food enterprises) for your region or for your organisation."
   sell_user_guide: "Find out more in our user guide."
   sell_listing_price: "Listing on the OFN is free. Opening and running a shop on OFN is free up to $500 of monthly sales. If you sell more you can choose your community contribution between 1% and 3% of sales. For more detail on pricing visit the Software Platform section via the About link in the top menu."
-  sell_embed: "We can also embed an OFN shop in your own customised website or build a customised local food network website for your region."
+  sell_embed: "In addition to the Open Food Network platform, our social enterprise consultancy offers a range of services that help power a better, fairer food system. We can help with customised business and online solutions for your farm or food enterprise, lean enterprise support, regional food system development as well as food systems research and consulting."
   sell_ask_services: "Ask us about OFN services."
   shops_title: Shops
   shops_headline: Shopping, transformed.

config/locales/en_CA.yml

@@ -701,6 +701,10 @@ en_CA:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
+          shopfront_message_placeholder: >
+              An optional message to welcome customers and explain how to shop with
+              you. If text is entered here it will be displayed in a home tab when
+              customers first arrive at your shopfront.
           shopfront_message_link_tooltip: "Insert/edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -1107,6 +1111,7 @@ en_CA:
     already_ordered:
       cart: "cart"
       message_html: "You have an order for this order cycle already. Check the %{cart} to see the items you ordered before. You can also cancel items as long as the order cycle is open."
+    failed: "The checkout failed. Please let us know so that we can process your order."
   shops:
     hubs:
       show_closed_shops: "Show closed shops"
@@ -1937,6 +1942,7 @@ en_CA:
   tax_category: "Tax Category"
   calculator: "Calculator"
   calculator_values: "Calculator values"
+  calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
   flat_percent_per_item: "Flat Percent (per item)"
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -2417,12 +2423,6 @@ en_CA:
           severity: Severity
           description: Description
           resolve: Resolve
-        exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products}Products"
-          products_loaded: "%{num_of_products_loaded}of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"

config/locales/en_FR.yml

@@ -1282,6 +1282,7 @@ en_FR:
   saving_credit_card: Saving credit card...
   card_has_been_removed: "Your card has been removed (number: %{number})"
   card_could_not_be_removed: Sorry, the card could not be removed
+  invalid_credit_card: "Invalid credit card"
   ie_warning_headline: "Your browser is out of date :-("
   ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:"
   ie_warning_chrome: Download Chrome
@@ -2425,11 +2426,11 @@ en_FR:
           description: Description
           resolve: Resolve
         exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products} Products"
-          products_loaded: "%{num_of_products_loaded}of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
+          load_more_variants: "Load All Variants"
+          load_all_variants: "Load All Variants"
+          select_all_variants: "Select All %{total_number_of_variants} Variants"
+          variants_loaded: "%{num_of_variants_loaded} of %{total_number_of_variants} Variants Loaded"
+          loading_variants: "Loading Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2830,6 +2831,8 @@ en_FR:
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
     actions:
       update: "Update"

config/locales/en_GB.yml

@@ -701,6 +701,10 @@ en_GB:
           enable_subscriptions_false: "Disabled"
           enable_subscriptions_true: "Enabled"
           shopfront_message: "Shopfront Message"
+          shopfront_message_placeholder: >
+              An optional message to welcome customers and explain how to shop with
+              you. If text is entered here it will be displayed in a home tab when
+              customers first arrive at your shopfront.
           shopfront_message_link_tooltip: "Insert / edit link"
           shopfront_message_link_prompt: "Please enter a URL to insert"
           shopfront_closed_message: "Shopfront Closed Message"
@@ -1107,6 +1111,7 @@ en_GB:
     already_ordered:
       cart: "cart"
       message_html: "You have an order for this order cycle already. Check the %{cart} to see the items you ordered before. You can also cancel items as long as the order cycle is open."
+    failed: "The checkout failed. Please let us know so that we can process your order."
   shops:
     hubs:
       show_closed_shops: "Show closed shops"
@@ -1277,6 +1282,7 @@ en_GB:
   saving_credit_card: Saving credit card...
   card_has_been_removed: "Your card has been removed (number: %{number})"
   card_could_not_be_removed: Sorry, the card could not be removed
+  invalid_credit_card: "Invalid credit card"
   ie_warning_headline: "Your browser is out of date :-("
   ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:"
   ie_warning_chrome: Download Chrome
@@ -2183,8 +2189,8 @@ en_GB:
   report_header_temp_controlled: TempControlled?
   report_header_is_producer: Producer?
   report_header_not_confirmed: Not Confirmed
-  report_header_gst_on_income: VAT on Income
-  report_header_gst_free_income: VAT Free Income
+  report_header_gst_on_income: 20%(VAT on Income)
+  report_header_gst_free_income: Zero Rated Income
   report_header_total_untaxable_produce: Total untaxable produce (no tax)
   report_header_total_taxable_produce: Total taxable produce (tax inclusive)
   report_header_total_untaxable_fees: Total untaxable fees (no tax)
@@ -2426,11 +2432,11 @@ en_GB:
           description: Description
           resolve: Resolve
         exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products} Products"
-          products_loaded: "%{num_of_products_loaded} of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
+          load_more_variants: "Load More Variants"
+          load_all_variants: "Load All Variants"
+          select_all_variants: "Select All %{total_number_of_variants} Variants"
+          variants_loaded: "%{num_of_variants_loaded} of %{total_number_of_variants} Variants Loaded"
+          loading_variants: "Loading Variants"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2831,6 +2837,8 @@ en_GB:
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
     actions:
       update: "Update"

config/locales/en_NZ.yml

@@ -2424,12 +2424,6 @@ en_NZ:
           severity: Severity
           description: Description
           resolve: Resolve
-        exchange_products:
-          load_more_products: "Load More Products"
-          load_all_products: "Load All Products"
-          select_all_products: "Select All %{total_number_of_products} Products"
-          products_loaded: "%{num_of_products_loaded} of %{total_number_of_products} Products Loaded"
-          loading_products: "Loading Products"
       tag_rules:
         shipping_method_tagged_top: "Shipping methods tagged"
         shipping_method_tagged_bottom: "are:"
@@ -2830,6 +2824,8 @@ en_NZ:
     zipcode: Postcode
     weight: Weight (per kg)
     error_user_destroy_with_orders: "Users with completed orders may not be deleted"
+    cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined."
+    please_define_payment_methods: "Please define some payment methods first."
     options: "Options"
     actions:
       update: "Update"

config/locales/fr.yml

@@ -1284,6 +1284,7 @@ fr:
   saving_credit_card: Enregistrement de la carte de crédit...
   card_has_been_removed: "Votre carte a été supprimée (numéro : %{number})"
   card_could_not_be_removed: Désolée, la carte n'a pas pu être supprimée :-(
+  invalid_credit_card: "Cette carte de crédit n'est pas valide"
   ie_warning_headline: "Votre navigateur n'est pas à jour :-("
   ie_warning_text: "Pour une expérience optimale sur Open Food France, nous vous recommandons fortement de mettre à jour votre navigateur:"
   ie_warning_chrome: Télécharger Chrome
@@ -2454,11 +2455,11 @@ fr:
           description: Description
           resolve: Résoudre
         exchange_products:
-          load_more_products: "Voir plus de produits"
-          load_all_products: "Voir tous les produits"
-          select_all_products: "Sélectionner tous les %{total_number_of_products}produits"
-          products_loaded: "%{num_of_products_loaded}sur %{total_number_of_products}produits affichés"
-          loading_products: "Produits en cours de chargement"
+          load_more_variants: "Afficher plus de variantes"
+          load_all_variants: "Afficher toutes les variantes"
+          select_all_variants: "Sélectionnez toutes les %{total_number_of_variants} variantes"
+          variants_loaded: " %{num_of_variants_loaded}sur %{total_number_of_variants} variantes"
+          loading_variants: "Chargement des variantes"
       tag_rules:
         shipping_method_tagged_top: "Les méthodes de livraison taguées"
         shipping_method_tagged_bottom: "sont:"
@@ -2860,6 +2861,8 @@ fr:
     zipcode: Code postal
     weight: Poids (au kg)
     error_user_destroy_with_orders: "Les utilisateurs avec des commandes finalisées pourraient ne pas être supprimés"
+    cannot_create_payment_without_payment_methods: "Vous ne pouvez pas ajouter un paiement pour une commande sans avoir défini de méthode de paiement au préalable."
+    please_define_payment_methods: "Il faut que vous définissiez une méthode de paiement avant tout !"
     options: "Options"
     actions:
       update: "Mettre à jour"