Updating translations for config/locales/sv.yml [skip ci]

Updating translations for config/locales/fr.yml [skip ci]
Updating translations for config/locales/es.yml [skip ci]
2026-02-27 01:43:22 +00:00 · 2017-04-30 23:38:53 +10:00 · 2017-04-20 22:05:19 +10:00 · 2017-04-08 01:22:10 +10:00
151 changed files with 1389 additions and 2804 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,3 @@
-See this here post on raising a github issue:
-https://community.openfoodnetwork.org/t/how-to-raise-a-github-issue/912
-
 # Contributing

 We love pull requests from everyone. Here are some instructions for
--- a/1
+++ b/1
@@ -115,6 +115,7 @@ end

 group :test do
  gem 'webmock'
+
  # See spec/spec_helper.rb for instructions
  #gem 'perftools.rb'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -643,8 +643,9 @@ GEM
    whenever (0.9.2)
      activesupport (>= 2.3.4)
      chronic (>= 0.6.3)
-    wicked_pdf (1.1.0)
-    wkhtmltopdf-binary (0.12.3.1)
+    wicked_pdf (0.11.0)
+      rails
+    wkhtmltopdf-binary (0.9.9.3)
    xml-simple (1.1.4)
    xpath (2.0.0)
      nokogiri (~> 1.3)
--- a/README.md
+++ b/README.md
@@ -98,14 +98,6 @@ The site is configured to use
 startup time while Rails loads. See the Zeus github page for
 usage instructions.

-Once [npm dependencies are
-installed](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma), AngularJS tests can be run with:
-
-    ./script/karma run
-
-If you want karma to automatically rerun the tests on file modification, use:
-
-    ./script/karma start

 ## Credits

--- a/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee
@@ -12,10 +12,7 @@ angular.module('admin.orderCycles')
    $scope.StatusMessage = StatusMessage

    $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
-
-    $scope.$watch 'order_cycle_form.$valid', (isValid) ->
-      StatusMessage.setValidation(isValid)
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue

    $scope.loaded = ->
      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -13,10 +13,7 @@ angular.module('admin.orderCycles')
    $scope.StatusMessage = StatusMessage

    $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
-
-    $scope.$watch 'order_cycle_form.$valid', (isValid) ->
-      StatusMessage.setValidation(isValid)
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue

    $scope.loaded = ->
      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -8,10 +8,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)

  $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
-
-  $scope.$watch 'order_cycle_form.$valid', (isValid) ->
-    StatusMessage.setValidation(isValid)
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue

  $scope.init = (enterprises) ->
    enterprise = enterprises[Object.keys(enterprises)[0]]
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -10,10 +10,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
    $scope.init()

  $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
-
-  $scope.$watch 'order_cycle_form.$valid', (isValid) ->
-    StatusMessage.setValidation(isValid)
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue

  $scope.loaded = ->
    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
--- a/app/assets/javascripts/admin/products/controllers/edit_units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/edit_units_controller.js.coffee
@@ -1,24 +0,0 @@
-angular.module("admin.products").controller "editUnitsCtrl", ($scope, VariantUnitManager) ->
-
-  $scope.product =
-    variant_unit: angular.element('#variant_unit').val()
-    variant_unit_scale: angular.element('#variant_unit_scale').val()
-
-  $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
-
-  if $scope.product.variant_unit == 'items'
-    $scope.variant_unit_with_scale = 'items'
-  else
-    $scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale
-
-  $scope.setFields = ->
-    if $scope.variant_unit_with_scale == 'items'
-      variant_unit = 'items'
-      variant_unit_scale = null
-    else
-      options = $scope.variant_unit_with_scale.split('_')
-      variant_unit = options[0]
-      variant_unit_scale = options[1]
-
-    $scope.product.variant_unit = variant_unit
-    $scope.product.variant_unit_scale = variant_unit_scale
--- a/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
+++ b/app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee
@@ -1,14 +0,0 @@
-angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout) ->
-
-  $scope.unitName = (scale, type) ->
-    VariantUnitManager.getUnitName(scale, type)
-
-  $scope.scale = angular.element('#product_variant_unit_scale').val()
-
-  $scope.updateValue = ->
-    unit_value_human = angular.element('#unit_value_human').val()
-    $scope.unit_value = unit_value_human * $scope.scale
-
-  variant_unit_value = angular.element('#variant_unit_value').val()
-  $scope.unit_value_human = variant_unit_value / $scope.scale
-  $timeout -> $scope.updateValue()
--- a/app/assets/javascripts/admin/utils/services/status_message.js.coffee
+++ b/app/assets/javascripts/admin/utils/services/status_message.js.coffee
@@ -11,14 +11,6 @@ angular.module("admin.utils").factory "StatusMessage", ($timeout) ->
      text: ""
      style: {}

-    invalidMessage: ""
-
-    setValidation: (isValid) ->
-      if isValid
-        StatusMessage.invalidMessage = ''
-      else
-        StatusMessage.invalidMessage = t("admin.form_invalid")
-
    active: ->
      @statusMessage.text != ''

--- a/app/assets/javascripts/darkswarm/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/cart.js.coffee
@@ -1,8 +1,8 @@
 $ ->
-  if $('form#update-cart').is('*') || $('form#update-order').is('*')
-    $('form#update-cart a.delete, form#update-order a.delete').show().one 'click', ->
-      $(this).parents('.line-item').first().find('input.line_item_quantity').val 0
-      $(this).parents('form').first().submit()
+  if ($ 'form#update-cart').is('*')
+    ($ 'form#update-cart a.delete').show().one 'click', ->
+      ($ this).parents('.line-item').first().find('input.line_item_quantity').val 0
+      ($ this).parents('form').first().submit()
      false

  ($ 'form#update-cart').submit ->
--- a/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
@@ -1,12 +0,0 @@
-Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, Cart) ->
-  $scope.showBought = false
-
-  $scope.deleteLineItem = (id) ->
-    params = {id: id}
-    success = (response) ->
-      $(".line-item-" + id).remove()
-      Cart.removeFinalisedLineItem(id)
-    fail = (error) ->
-      console.log error
-
-    $resource("/line_items/:id").delete(params, success, fail)
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -10,7 +10,7 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, $timeout, OrderCycle) ->
      $("#order_cycle_id").trigger("openTrigger")


-Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
+Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants, Cart) ->
  # Track previous order cycle id for use with revertOrderCycle()
  $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id
  $scope.$watch 'order_cycle.order_cycle_id', (newValue, oldValue)->
@@ -30,5 +30,3 @@ Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Prod
    Variants.clear()
    Cart.clear()
    Products.update()
-    Cart.reloadFinalisedLineItems()
-    ChangeableOrdersAlert.reload()
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -11,7 +11,8 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
  'angularFileUpload',
  'angularSlideables'
  ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
-  $httpProvider.defaults.headers['common']['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
+  $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
+  $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
  $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
  $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"

--- a/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
@@ -1,5 +0,0 @@
-Darkswarm.directive "changeableOrdersAlert", (ChangeableOrdersAlert) ->
-  restrict: "C"
-  scope: true
-  link: (scope, element, attrs) ->
-    scope.alert = ChangeableOrdersAlert
--- a/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee
@@ -1,9 +0,0 @@
-Darkswarm.directive "confirmLinkClick", ($window) ->
-  restrict: 'A'
-  scope:
-    confirmMsg: '@confirmLinkClick'
-  link: (scope, elem, attr) ->
-    elem.bind 'click', (event) ->
-      unless confirm(scope.confirmMsg)
-        event.preventDefault()
-        event.stopPropagation()
--- a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
@@ -6,11 +6,7 @@ Darkswarm.directive "ofnOnHand", ->
    # In cases where this field gets its value from the HTML element rather than the model,
    # initialise the model with the HTML value.
    if scope.$eval(attr.ngModel) == undefined
-      # Don't dirty the model when we do this
-      setDirty = ngModel.$setDirty
-      ngModel.$setDirty = angular.noop
-      ngModel.$setViewValue(elem.val())
-      ngModel.$setDirty = setDirty
+      ngModel.$setViewValue elem.val()

    ngModel.$parsers.push (viewValue) ->
      on_hand = parseInt(attr.ofnOnHand)
--- a/app/assets/javascripts/darkswarm/services/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/cart.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService) ->
+Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, localStorageService)->
  # Handles syncing of current cart/order state to server
  new class Cart
    dirty: false
@@ -6,15 +6,11 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
    update_enqueued: false
    order: CurrentOrder.order
    line_items: CurrentOrder.order?.line_items || []
-    line_items_finalised: CurrentOrder.order?.finalised_line_items || []

    constructor: ->
      for line_item in @line_items
        line_item.variant.line_item = line_item
        Variants.register line_item.variant
-      for line_item in @line_items_finalised
-        line_item.variant.line_item = line_item
-        Variants.extend line_item.variant

    adjust: (line_item) =>
      line_item.total_price = line_item.variant.price_with_fees * line_item.quantity
@@ -119,15 +115,3 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $roo
    clear: ->
      @line_items = []
      localStorageService.clearAll() # One day this will have to be moar GRANULAR
-
-    removeFinalisedLineItem: (id) =>
-      @line_items_finalised = @line_items_finalised.filter (item) ->
-        item.id != id
-
-    reloadFinalisedLineItems: =>
-      @line_items_finalised = []
-      $resource("/line_items/bought").query (items) =>
-        for line_item in items
-          line_item.variant.line_item = line_item
-          Variants.extend line_item.variant
-        @line_items_finalised = items
--- a/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
@@ -1,14 +0,0 @@
-Darkswarm.factory 'ChangeableOrdersAlert', ($http) ->
-  new class ChangeableOrdersAlert
-    html: ''
-    visible: true
-
-    constructor: ->
-      @reload()
-
-    reload: ->
-      $http.get('/shop/changeable_orders_alert').then (response) =>
-        @html = response.data.trim()
-
-    close: =>
-      @visible = false
--- a/app/assets/javascripts/darkswarm/services/orders.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/orders.js.coffee
@@ -3,12 +3,10 @@ Darkswarm.factory 'Orders', (orders_by_distributor, currencyConfig, CurrentHub,
    constructor: ->
      # Populate Orders.orders from json in page.
      @orders_by_distributor = orders_by_distributor
-      @changeable_orders = []
      @currency_symbol = currencyConfig.symbol

      for distributor in @orders_by_distributor
-        @findChangeableOrders(distributor.distributed_orders)
-        @updateRunningBalance(distributor.distributed_orders)
+        @updateRunningBalance(distributor.distributed_orders)  


    updateRunningBalance: (orders) ->
@@ -16,7 +14,3 @@ Darkswarm.factory 'Orders', (orders_by_distributor, currencyConfig, CurrentHub,
        balances = orders.slice(i,orders.length).map (o) -> parseFloat(o.outstanding_balance)
        running_balance = balances.reduce (a,b) -> a+b
        order.running_balance = running_balance.toFixed(2)
-
-    findChangeableOrders: (orders) ->
-      for order in orders when order.changes_allowed
-        @changeable_orders.push(order)
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,9 +1,6 @@
 #save-bar.animate-show{ ng: { show: 'dirty || persist || StatusMessage.active()' } }
  .container
    .eight.columns.alpha
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
+      %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
        {{ StatusMessage.statusMessage.text || "&nbsp;" }}
-      %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #da5354' }
-        {{ StatusMessage.invalidMessage || "&nbsp;" }}
    .eight.columns.omega.text-right{ ng: { transclude: true } }
-
--- a/app/assets/javascripts/templates/admin/show_more.html.haml
+++ b/app/assets/javascripts/templates/admin/show_more.html.haml
@@ -1,4 +1,4 @@
 %div{ ng: { show: "data.length > limit" } }
  %input{ type: 'button', value: t(:show_more), ng: { click: 'limit = limit + increment' } }
  or
-  %input{ type: 'button', value: t(:show_all_with_more, num: '{{ data.length - limit }}'), ng: { click: 'limit = data.length' } }
+  %input{ type: 'button', value: t(:show_more_with_more, num: '{{ data.length - limit }}'), ng: { click: 'limit = data.length' } }
--- a/app/assets/stylesheets/admin/enterprises.css.scss
+++ b/app/assets/stylesheets/admin/enterprises.css.scss
@@ -1,3 +0,0 @@
-form[name="enterprise_form"] div.row.warning {
-  color: #DA7F52;
-}
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -74,9 +74,6 @@ form.order_cycle {
      margin-bottom: 0.5em;
    }
  }
-  .icon-question-sign {
-    font-size: 18px;
-  }
  table.exchanges {
    tr td.active {
      width: 20px;
@@ -116,14 +113,6 @@ form.order_cycle {
        margin-right: 2em;
      }
    }
-    .collection-details {
-      input {
-        width: 90%
-      }
-      span {
-        font-size: 1rem
-      }
-    }
  }
  .coordinator-fees {
    margin-top: 1em;
--- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass
+++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass
@@ -19,7 +19,7 @@
        height: 100px
        width: 100px
        margin-right: 12px
-
+        
      location
        @include headingFont
      @media all and (max-width: 768px)
@@ -30,7 +30,7 @@
        margin-top: 0
        @media all and (max-width: 768px)
          margin-bottom: 8px
-
+        

      ordercycle
        text-align: right
@@ -47,26 +47,24 @@
          p
            max-width: 100%
        float: right
-        form.custom
+        form.custom 
          text-align: right
          & > strong
            line-height: 2.5
            font-size: 1.29em
            padding-right: 14px
            @media all and (max-width: 768px)
-          select
+          select            
            width: inherit
            display: inline-block
            border-width: 1px
            border-color: #999
            color: #666
-            font-size: 1em
+            font-size: 1em 
            margin-bottom: 0
            padding: 8px 20px 8px 12px
            @media all and (max-width: 768px)
              font-size: 0.875em
-            @media screen and (-webkit-min-device-pixel-ratio:0)
-              font-size: 16px
        closing
          @include headingFont
          @media all and (max-width: 768px)
--- a/app/assets/stylesheets/darkswarm/account.css.scss
+++ b/app/assets/stylesheets/darkswarm/account.css.scss
@@ -1,14 +1,16 @@
@import "branding";
@import "mixins";

-.account-summary {
-  color: #4a4a4a;
-}
-
-
 .orders {
-  margin-top: 50px;
-  margin-bottom: 100px;
+  @include sidepaddingSm;
+
+  @include panepadding;
+
+  padding-top: 10px;
+
+  h3 {
+    padding-top: 2em;
+  }

  a {
    color: $clr-brick;
@@ -24,12 +26,6 @@
    height: auto;
  }

-  .active_table_row {
-    h3 {
-      margin-top: 0.5em;
-    }
-  }
-
  i.ofn-i_059-producer, i.ofn-i_060-producer-reversed {
    font-size: 3rem;
    display: inline-block;
@@ -65,7 +61,6 @@
  .transaction-group {}

  table {
-    width: 100%;
    border-radius: 0.5em 0.5em 0 0;

    tr:nth-of-type(even) {
--- a/app/assets/stylesheets/darkswarm/animations.scss
+++ b/app/assets/stylesheets/darkswarm/animations.scss
@@ -33,9 +33,7 @@

@-webkit-keyframes slideOutUp {
  0% {
-    opacity: 1;
    -webkit-transform: translateY(0);
-    -ms-transform: translateY(0);
    transform: translateY(0);
  }

@@ -48,18 +46,10 @@

@keyframes slideOutUp {
  0% {
-    opacity: 1;
    -webkit-transform: translateY(0);
    -ms-transform: translateY(0);
    transform: translateY(0);
  }
-
-  100% {
-    opacity: 0;
-    -webkit-transform: translateY(-20px);
-    -ms-transform: translateY(-20px);
-    transform: translateY(-20px);
-  }
 }

@-webkit-keyframes fadeIn {
--- a/app/assets/stylesheets/darkswarm/checkout.css.sass
+++ b/app/assets/stylesheets/darkswarm/checkout.css.sass
@@ -6,25 +6,23 @@
  background-color: #e1f0f5
  padding: 1em
  width: 100%
-  border: none
-  color: inherit

 checkout
  display: block

-  @media all and (max-width: 640px)
-    &.row .row
+  @media all and (max-width: 640px) 
+    &.row .row 
      margin-left: 0
      margin-right: 0
-
+  
  orderdetails
    .button, table
      width: 100%
-    @media all and (max-width: 640px)
+    @media all and (max-width: 640px) 
      form.edit_order
        border: 1px solid $disabled-bright
        margin-bottom: 2rem
-
+  
  #details, #billing, #shipping, #payment
    border: 0
    margin: 1em 0
@@ -36,20 +34,20 @@ checkout
    margin: 0
    padding: 0.65em
    background: #f7f7f7
-
-    .label
+  
+    .label 
      font-size: 1em
      padding: 0.3rem 0.35rem 0.275rem

    // Logic to turn on & off the alerts for success against each fieldset

-    label, label.alert, label.success, &.valid label.alert, &.dirty label.success
+    label, label.alert, label.success, &.valid label.alert, &.dirty label.success 
      display: none

-    &.dirty label.alert
+    &.dirty label.alert 
      display: inline
-    &.dirty.valid label.alert
-      display: none
+    &.dirty.valid label.alert 
+      display: none 
    &.valid label.success
      display: inline

@@ -62,7 +60,7 @@ checkout
    text-align: left

  // Logic to swap out up / down accordion icons
-  //Foundation overrides
+  //Foundation overrides 
  dd > a
    @include csstrans
    background: $disabled-light !important
@@ -70,7 +68,7 @@ checkout
  dd > a:hover
    background: $disabled-v-dark !important
    color: white
-
+  
  dd
    span.accordion-up
      display: none
@@ -81,3 +79,4 @@ checkout
        display: inline
      span.accordion-down
        display: none
+
--- a/app/assets/stylesheets/darkswarm/shop.css.scss
+++ b/app/assets/stylesheets/darkswarm/shop.css.scss
@@ -110,10 +110,6 @@
    }
  }

-  .alert-box.changeable-orders-alert {
-    margin-bottom: 0px;
-  }
-
  .alert-box.shopfront-message {
    border: 2px solid $clr-turquoise;
    border-radius: 5px;
--- a/app/assets/stylesheets/darkswarm/shopping-cart.css.scss
+++ b/app/assets/stylesheets/darkswarm/shopping-cart.css.scss
@@ -72,35 +72,11 @@

 // Shopping cart
 #cart-detail {
-  .cart-item-delete, .bought-item-delete {
-    a {
+  .cart-item-delete {
+    a.delete {
      font-size: 1.125em;
    }
  }
-
-  .out-of-stock {
-    color: $clr-brick;
-  }
-
-  button, .button {
-    margin: 0;
-  }
-
-  .toggle-bought {
-    cursor: pointer;
-  }
-
-  tr.bought td {
-    color: $med-grey;
-
-    h5 {
-      color: $med-grey;
-    }
-
-    .already-confirmed {
-      float: right;
-    }
-  }
 }

 .item-thumb-image {
@@ -114,3 +90,9 @@
    height: 36px;
  }
 }
+
+#edit-cart {
+  button, .button {
+    margin: 0;
+  }
+}
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -23,11 +23,6 @@ class BaseController < ApplicationController
  private

  def set_order_cycles
-    unless @distributor.ready_for_checkout?
-      @order_cycles = OrderCycle.where('false')
-      return
-    end
-
    @order_cycles = OrderCycle.with_distributor(@distributor).active
    .order(@distributor.preferred_shopfront_order_cycle_order)

--- a/app/controllers/line_items_controller.rb
+++ b/app/controllers/line_items_controller.rb
@@ -1,48 +0,0 @@
-class LineItemsController < BaseController
-  respond_to :json
-
-  before_filter :load_line_item, only: :destroy
-
-  def bought
-    respond_with bought_items, each_serializer: Api::LineItemSerializer
-  end
-
-  def destroy
-    authorize! :destroy, @line_item
-    destroy_with_lock @line_item
-    respond_with(@line_item)
-  end
-
-  private
-
-  def load_line_item
-    @line_item = Spree::LineItem.find_by_id(params[:id])
-    not_found unless @line_item
-  end
-
-  # List all items the user already ordered in the current order cycle
-  def bought_items
-    return [] unless current_order_cycle && spree_current_user && current_distributor
-    current_order_cycle.items_bought_by_user(spree_current_user, current_distributor)
-  end
-
-  def unauthorized
-    status = spree_current_user ? 403 : 401
-    render nothing: true, status: status and return
-  end
-
-  def not_found
-    render nothing: true, status: 404 and return
-  end
-
-  def destroy_with_lock(item)
-    order = item.order
-    order.with_lock do
-      item.destroy
-      order.update_shipping_fees!
-      order.update_payment_fees!
-      order.update_distribution_charge!
-      order.create_tax_charge!
-    end
-  end
-end
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -37,10 +37,6 @@ class ShopController < BaseController
    end
  end

-  def changeable_orders_alert
-    render layout: false
-  end
-
  private

  def filtered_json(products_json)
--- a/app/controllers/spree/admin/orders_controller_decorator.rb
+++ b/app/controllers/spree/admin/orders_controller_decorator.rb
@@ -12,9 +12,6 @@ Spree::Admin::OrdersController.class_eval do

  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.
@@ -134,16 +131,4 @@ Spree::Admin::OrdersController.class_eval do
                    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
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -231,7 +231,7 @@ Spree::Admin::ReportsController.class_eval do
    @report_types = REPORT_TYPES[:orders_and_fulfillment]
    @report_type = params[:report_type]

-    @include_blank = I18n.t(:all)
+    @include_blank = 'All'

    # -- Build Report with Order Grouper
    @report = OpenFoodNetwork::OrdersAndFulfillmentsReport.new spree_current_user, params
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -8,12 +8,10 @@ Spree::OrdersController.class_eval do
  prepend_before_filter :require_order_cycle, only: :edit
  prepend_before_filter :require_distributor_chosen, only: :edit
  before_filter :check_hub_ready_for_checkout, only: :edit
-  before_filter :check_at_least_one_line_item, only: :update

  include OrderCyclesHelper
  layout 'darkswarm'

-  respond_to :json

  # Patching to redirect to shop if order is empty
  def edit
@@ -34,7 +32,7 @@ Spree::OrdersController.class_eval do

  def update
    @insufficient_stock_lines = []
-    @order = order_to_update
+    @order = current_order
    unless @order
      flash[:error] = t(:order_not_found)
      redirect_to root_path and return
@@ -45,19 +43,12 @@ Spree::OrdersController.class_eval do

      render :edit and return unless apply_coupon_code

-      if @order == current_order
-        fire_event('spree.order.contents_changed')
-      else
-        @order.update_distribution_charge!
-      end
-
+      fire_event('spree.order.contents_changed')
      respond_with(@order) do |format|
        format.html do
          if params.has_key?(:checkout)
            @order.next_transition.run_callbacks if @order.cart?
            redirect_to checkout_state_path(@order.checkout_steps.first)
-          elsif @order.complete?
-            redirect_to order_path(@order)
          else
            redirect_to cart_path
          end
@@ -171,18 +162,6 @@ Spree::OrdersController.class_eval do
    @order_cycle = OrderCycle.find session[:expired_order_cycle_id]
  end

-  def cancel
-    @order = Spree::Order.find_by_number!(params[:id])
-    authorize! :cancel, @order
-
-    if @order.cancel
-      flash[:success] = I18n.t(:orders_your_order_has_been_cancelled)
-    else
-      flash[:error] = I18n.t(:orders_could_not_cancel)
-    end
-    redirect_to request.referer || order_path(@order)
-  end
-

  private

@@ -223,30 +202,4 @@ Spree::OrdersController.class_eval do
  def wrap_json_infinity(n)
    n == Float::INFINITY ? 2147483647 : n
  end
-
-  def order_to_update
-    return @order_to_update if defined? @order_to_update
-    return @order_to_update = current_order unless params[:id]
-    @order_to_update = changeable_order_from_number
-  end
-
-  # If a specific order is requested, return it if it is COMPLETE and
-  # changes are allowed and the user has access. Return nil if not.
-  def changeable_order_from_number
-    order = Spree::Order.complete.find_by_number(params[:id])
-    return nil unless order.andand.changes_allowed? && can?(:update, order)
-    order
-  end
-
-  def check_at_least_one_line_item
-    return unless order_to_update.andand.complete?
-
-    items = params[:order][:line_items_attributes]
-    .andand.select{ |k,attrs| attrs["quantity"].to_i > 0 }
-
-    if items.empty?
-      flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)
-      redirect_to order_path(order_to_update)
-    end
-  end
 end
--- a/app/helpers/checkout_helper.rb
+++ b/app/helpers/checkout_helper.rb
@@ -16,7 +16,7 @@ module CheckoutHelper
    enterprise_fee_adjustments = adjustments.select { |a| a.originator_type == 'EnterpriseFee' && a.source_type != 'Spree::LineItem' }
    adjustments.reject! { |a| a.originator_type == 'EnterpriseFee' && a.source_type != 'Spree::LineItem' }
    unless exclude.include? :admin_and_handling
-      adjustments << Spree::Adjustment.new(label: I18n.t(:orders_form_admin), amount: enterprise_fee_adjustments.sum(&:amount))
+      adjustments << Spree::Adjustment.new(label: 'Admin & Handling', amount: enterprise_fee_adjustments.sum(&:amount))
    end

    adjustments
@@ -54,8 +54,12 @@ module CheckoutHelper
  end

  def display_adjustment_tax_rates(adjustment)
-    tax_rates = adjustment.tax_rates
-    tax_rates.map { |tr| number_to_percentage(tr.amount * 100, :precision => 1) }.join(", ")
+    tax_rate = (adjustment.included_tax / (adjustment.amount - adjustment.included_tax)).round(2)
+    if tax_rate == 0 || tax_rate.infinite?
+      ""
+    else
+      number_to_percentage(tax_rate * 100, :precision => 1)
+    end
  end

  def display_adjustment_amount(adjustment)
--- a/app/helpers/enterprises_helper.rb
+++ b/app/helpers/enterprises_helper.rb
@@ -88,12 +88,4 @@ module EnterprisesHelper
  def remaining_trial_days(enterprise)
    distance_of_time_in_words(Time.zone.now, enterprise.shop_trial_start_date + Spree::Config[:shop_trial_length_days].days)
  end
-
-  def order_changes_allowed?
-    current_order.andand.distributor.andand.allow_order_changes?
-  end
-
-  def show_bought_items?
-    order_changes_allowed? && current_order.finalised_line_items.present?
-  end
 end
--- a/app/helpers/spree/orders_helper.rb
+++ b/app/helpers/spree/orders_helper.rb
@@ -16,31 +16,5 @@ module Spree
    def cart_count
      current_order.andand.line_items.andand.count || 0
    end
-
-    def changeable_orders
-      # Only returns open order for the current user + shop + oc combo
-      return @changeable_orders unless @changeable_orders.nil?
-      return @changeable_orders = [] unless spree_current_user && current_distributor && current_order_cycle
-      return @changeable_orders = [] unless current_distributor.allow_order_changes?
-      @changeable_orders = Spree::Order.complete.where(
-        state: 'complete',
-        user_id: spree_current_user.id,
-        distributor_id: current_distributor.id,
-        order_cycle_id: current_order_cycle.id)
-    end
-
-    def changeable_orders_link_path
-      changeable_orders.one? ? spree.order_path(changeable_orders.first) : spree.account_path
-    end
-
-    def shop_changeable_orders_alert_html
-      return "" unless changeable_orders.any?
-      t(:shop_changeable_orders_alert_html,
-        count: changeable_orders.count,
-        path: changeable_orders_link_path,
-        order: changeable_orders.first.number,
-        shop: current_distributor.name,
-        oc_close: l(current_order_cycle.orders_close_at, format: "%A, %b %d, %Y @ %H:%M"))
-    end
  end
 end
--- a/app/models/open_food_network/calculator/weight.rb
+++ b/app/models/open_food_network/calculator/weight.rb
@@ -4,7 +4,7 @@ module OpenFoodNetwork
    attr_accessible :preferred_per_kg

    def self.description
-      I18n.t('spree.weight')
+      "Weight (per kg)"
    end

    def compute(object)
--- a/app/models/order_cycle.rb
+++ b/app/models/order_cycle.rb
@@ -250,13 +250,6 @@ class OrderCycle < ActiveRecord::Base
    OpenFoodNetwork::ProductsCache.order_cycle_changed self
  end

-  def items_bought_by_user(user, distributor)
-    # The Spree::Order.complete scope only checks for completed_at date, does not ensure state is "complete"
-    orders = Spree::Order.complete.where(state: "complete", user_id: user, distributor_id: distributor, order_cycle_id: self)
-    scoper = OpenFoodNetwork::ScopeVariantToHub.new(distributor)
-    items = Spree::LineItem.joins(:order).merge(orders)
-    items.each { |li| scoper.scope(li.variant) }
-  end

  private

--- a/app/models/spree/ability_decorator.rb
+++ b/app/models/spree/ability_decorator.rb
@@ -4,7 +4,6 @@ class AbilityDecorator
  # All abilites are allocated from this initialiser, currently in 5 chunks.
  # Spree also defines other abilities.
  def initialize(user)
-    add_shopping_abilities user
    add_base_abilities user if is_new_user? user
    add_enterprise_management_abilities user if can_manage_enterprises? user
    add_group_management_abilities user if can_manage_groups? user
@@ -51,16 +50,6 @@ class AbilityDecorator
    can_manage_enterprises? user
  end

-  def add_shopping_abilities(user)
-    can [:destroy], Spree::LineItem do |item|
-      user == item.order.user &&
-      item.order.changes_allowed?
-    end
-    can [:cancel], Spree::Order do |order|
-      order.user == user
-    end
-  end
-
  # New users can create an enterprise, and gain other permissions from doing this.
  def add_base_abilities(user)
    can [:create], Enterprise
@@ -195,7 +184,6 @@ class AbilityDecorator
    can [:admin , :for_line_items], Enterprise
    can [:admin, :index, :create], Spree::LineItem
    can [:destroy, :update], Spree::LineItem do |item|
-      order = item.order
      user.admin? || user.enterprises.include?(order.distributor) || order.order_cycle.andand.coordinated_by?(user)
    end

--- a/app/models/spree/adjustment_decorator.rb
+++ b/app/models/spree/adjustment_decorator.rb
@@ -34,34 +34,10 @@ module Spree
      included_tax > 0
    end

-    # @return [Array<Spree::TaxRate>]
-    def tax_rates
-      case originator
-      when Spree::TaxRate
-        [originator]
-      when EnterpriseFee
-        case source
-        when Spree::LineItem
-          tax_category = originator.inherits_tax_category? ? source.product.tax_category : originator.tax_category
-          return tax_category ? tax_category.tax_rates.match(source.order) : []
-        when Spree::Order
-          return originator.tax_category ? originator.tax_category.tax_rates.match(source) : []
-        end
-      else
-        find_closest_tax_rates_from_included_tax
-      end
+    def display_included_tax
+      Spree::Money.new(included_tax, { :currency => currency })
    end

-    # shipping fees and adjustments created from the admin panel have
-    # taxes set at creation in the included_tax field without relation
-    # to the corresponding TaxRate, so we look for the closest one
-    def find_closest_tax_rates_from_included_tax
-      approximation = (included_tax / (amount - included_tax))
-      return [] if approximation.infinite? or approximation.zero?
-      [Spree::TaxRate.order("ABS(amount - #{approximation})").first]
-    end
-
-
    def self.without_callbacks
      skip_callback :save, :after, :update_adjustable
      skip_callback :destroy, :after, :update_adjustable
--- a/app/models/spree/line_item_decorator.rb
+++ b/app/models/spree/line_item_decorator.rb
@@ -94,41 +94,8 @@ Spree::LineItem.class_eval do
    (final_weight_volume || 0) / quantity
  end

-  # MONKEYPATCH of Spree method
-  # Enables scoping of variant to hub/shop, stock drawn down from inventory
-  def update_inventory
-    return true unless order.completed?
-
-    scoper.scope(variant) # this line added
-
-    if new_record?
-      Spree::InventoryUnit.increase(order, variant, quantity)
-    elsif old_quantity = self.changed_attributes['quantity']
-      if old_quantity < quantity
-        Spree::InventoryUnit.increase(order, variant, (quantity - old_quantity))
-      elsif old_quantity > quantity
-        Spree::InventoryUnit.decrease(order, variant, (old_quantity - quantity))
-      end
-    end
-  end
-
-  # MONKEYPATCH of Spree method
-  # Enables scoping of variant to hub/shop, stock replaced to inventory
-  def remove_inventory
-    return true unless order.completed?
-
-    scoper.scope(variant) # this line added
-
-    Spree::InventoryUnit.decrease(order, variant, quantity)
-  end
-
  private

-  def scoper
-	  return @scoper unless @scoper.nil?
-	  @scoper = OpenFoodNetwork::ScopeVariantToHub.new(order.distributor)
-	end
-
  def calculate_final_weight_volume
    if final_weight_volume.present? && quantity_was > 0
      self.final_weight_volume = final_weight_volume * quantity / quantity_was
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -9,7 +9,7 @@ end

 Spree::Order.class_eval do
  belongs_to :order_cycle
-  belongs_to :distributor, class_name: 'Enterprise'
+  belongs_to :distributor, :class_name => 'Enterprise'
  belongs_to :cart
  belongs_to :customer

@@ -21,9 +21,6 @@ Spree::Order.class_eval do
  before_validation :associate_customer, unless: :customer_id?
  before_validation :ensure_customer, unless: :customer_is_valid?

-  before_save :update_shipping_fees!, if: :complete?
-  before_save :update_payment_fees!, if: :complete?
-
  checkout_flow do
    go_to_state :address
    go_to_state :delivery
@@ -42,6 +39,7 @@ Spree::Order.class_eval do
    remove_transition :from => :delivery, :to => :confirm
  end

+
  # -- Scopes
  scope :managed_by, lambda { |user|
    if user.has_spree_role?('admin')
@@ -90,7 +88,7 @@ Spree::Order.class_eval do
    unless self.order_cycle == order_cycle
      self.order_cycle = order_cycle
      self.distributor = nil unless order_cycle.nil? || order_cycle.has_distributor?(distributor)
-      empty!
+      self.empty!
      save!
    end
  end
@@ -101,6 +99,7 @@ Spree::Order.class_eval do
    current_item.andand.destroy
  end

+
  # Overridden to support max_quantity
  def add_variant(variant, quantity = 1, max_quantity = nil, currency = nil)
    line_items(:reload)
@@ -127,7 +126,7 @@ Spree::Order.class_eval do
      current_item.currency = currency unless currency.nil?
      current_item.save
    else
-      current_item = Spree::LineItem.new(quantity: quantity, max_quantity: max_quantity)
+      current_item = Spree::LineItem.new(:quantity => quantity, max_quantity: max_quantity)
      current_item.variant = variant
      if currency
        current_item.currency = currency unless currency.nil?
@@ -135,31 +134,13 @@ Spree::Order.class_eval do
      else
        current_item.price    = variant.price
      end
-      line_items << current_item
+      self.line_items << current_item
    end

-    reload
+    self.reload
    current_item
  end

-  # After changing line items of a completed order
-  def update_shipping_fees!
-    shipments.each do |shipment|
-      next if shipment.shipped?
-      update_adjustment! shipment.adjustment
-      shipment.save # updates included tax
-    end
-  end
-
-  # After changing line items of a completed order
-  def update_payment_fees!
-    payments.each do |payment|
-      next if payment.completed?
-      update_adjustment! payment.adjustment
-      payment.save
-    end
-  end
-
  def cap_quantity_at_stock!
    line_items.each &:cap_quantity_at_stock!
  end
@@ -177,10 +158,6 @@ Spree::Order.class_eval do
    save!
  end

-  def distribution_set?
-    distributor && order_cycle
-  end
-
  def update_distribution_charge!
    with_lock do
      EnterpriseFee.clear_all_adjustments_on_order self
@@ -218,12 +195,6 @@ Spree::Order.class_eval do
    line_items.map(&:variant)
  end

-  # Show already bought line items of this order cycle
-  def finalised_line_items
-    return [] unless order_cycle && user && distributor
-    order_cycle.items_bought_by_user(user, distributor)
-  end
-
  def admin_and_handling_total
    adjustments.eligible.where("originator_type = ? AND source_type != ?", 'EnterpriseFee', 'Spree::LineItem').sum(&:amount)
  end
@@ -234,26 +205,26 @@ Spree::Order.class_eval do

  # Does this order have shipments that can be shipped?
  def ready_to_ship?
-    shipments.any?(&:can_ship?)
+    self.shipments.any?{|s| s.can_ship?}
  end

  # Ship all pending orders
  def ship
-    shipments.each do |s|
+    self.shipments.each do |s|
      s.ship if s.can_ship?
    end
  end

  def shipping_tax
-    adjustments(:reload).shipping.sum(&:included_tax)
+    adjustments(:reload).shipping.sum &:included_tax
  end

  def enterprise_fee_tax
-    adjustments(:reload).enterprise_fee.sum(&:included_tax)
+    adjustments(:reload).enterprise_fee.sum &:included_tax
  end

  def total_tax
-    (adjustments + price_adjustments).sum(&:included_tax)
+    (adjustments + price_adjustments).sum &:included_tax
  end

  def tax_adjustments
@@ -263,12 +234,12 @@ Spree::Order.class_eval do

  def tax_adjustment_totals
    tax_adjustments.each_with_object(Hash.new) do |adjustment, hash|
-      tax_rates = adjustment.tax_rates
-      tax_rates_hash = Hash[tax_rates.collect do |tax_rate|
-        tax_amount = tax_rates.one? ? adjustment.included_tax : tax_rate.compute_tax(adjustment.amount)
-        [tax_rate.amount, tax_amount]
-      end]
-      hash.update(tax_rates_hash) { |_tax_rate, amount1, amount2| amount1 + amount2 }
+      if adjustment.originator_type == "Spree::TaxRate"
+        tax_rate = adjustment.originator.amount
+      else
+        tax_rate = (adjustment.included_tax / (adjustment.amount - adjustment.included_tax)).round(2)
+      end
+      hash.update({tax_rate => adjustment.included_tax}) { |_tax_rate, amount1, amount2| amount1 + amount2 }
    end
  end

@@ -283,12 +254,11 @@ Spree::Order.class_eval do
  # Overrride of Spree method, that allows us to send separate confirmation emails to user and shop owners
  # And separately, to skip sending confirmation email completely for user invoice orders
  def deliver_order_confirmation_email
-    Delayed::Job.enqueue ConfirmOrderJob.new(id) unless account_invoice?
+    unless account_invoice?
+      Delayed::Job.enqueue ConfirmOrderJob.new(id)
+    end
  end

-  def changes_allowed?
-    complete? && distributor.andand.allow_order_changes? && order_cycle.andand.open?
-  end

  private

@@ -302,9 +272,9 @@ Spree::Order.class_eval do
        self.ship_address = distributor.address.clone

        if bill_address
-          ship_address.firstname = bill_address.firstname
-          ship_address.lastname = bill_address.lastname
-          ship_address.phone = bill_address.phone
+          self.ship_address.firstname = bill_address.firstname
+          self.ship_address.lastname = bill_address.lastname
+          self.ship_address.phone = bill_address.phone
        end
      end
    end
@@ -316,11 +286,11 @@ Spree::Order.class_eval do
  end

  def product_distribution_for(line_item)
-    line_item.variant.product.product_distribution_for distributor
+    line_item.variant.product.product_distribution_for self.distributor
  end

  def require_customer?
-    return true unless new_record? || state == 'cart'
+    return true unless new_record? or state == 'cart'
  end

  def customer_is_valid?
@@ -343,11 +313,4 @@ Spree::Order.class_eval do
      self.customer = Customer.create(enterprise: distributor, email: email_for_customer, user: user, name: customer_name, bill_address: bill_address.andand.clone, ship_address: ship_address.andand.clone)
    end
  end
-
-  def update_adjustment!(adjustment)
-    locked = adjustment.locked
-    adjustment.locked = false
-    adjustment.update!(self)
-    adjustment.locked = locked
-  end
 end
--- a/app/models/spree/taxon_decorator.rb
+++ b/app/models/spree/taxon_decorator.rb
@@ -37,14 +37,13 @@ Spree::Taxon.class_eval do
  #
  # Format: {enterprise_id => [taxon_id, ...]}
  def self.distributed_taxons(which_taxons=:all)
-    ents_and_vars = ExchangeVariant.joins(exchange: :order_cycle).merge(Exchange.outgoing)
-    .select("DISTINCT variant_id, receiver_id AS enterprise_id")
+    # TODO: Why can't we merge(Spree::Product.with_order_cycles_inner) here?
+    taxons = Spree::Taxon.
+      joins(products: {variants_including_master: {exchanges: :order_cycle}}).
+      merge(Exchange.outgoing).
+      select('spree_taxons.*, exchanges.receiver_id AS enterprise_id')

-    ents_and_vars = ents_and_vars.merge(OrderCycle.active) if which_taxons == :current
-
-    taxons = Spree::Taxon
-    .select("DISTINCT spree_taxons.id, ents_and_vars.enterprise_id").joins(products: :variants_including_master)
-    .joins("INNER JOIN (#{ents_and_vars.to_sql}) AS ents_and_vars ON spree_variants.id = ents_and_vars.variant_id")
+    taxons = taxons.merge(OrderCycle.active) if which_taxons == :current

    taxons.inject({}) do |ts, t|
      ts[t.enterprise_id.to_i] ||= Set.new
--- a/app/models/variant_override.rb
+++ b/app/models/variant_override.rb
@@ -19,7 +19,7 @@ class VariantOverride < ActiveRecord::Base

  def self.indexed(hub)
    Hash[
-      for_hubs(hub).preload(:variant).map { |vo| [vo.variant, vo] }
+      for_hubs(hub).map { |vo| [vo.variant, vo] }
    ]
  end

@@ -58,14 +58,6 @@ class VariantOverride < ActiveRecord::Base
    end
  end

-  def increment_stock!(quantity)
-    if stock_overridden?
-      increment! :count_on_hand, quantity
-    else
-      Bugsnag.notify RuntimeError.new "Attempting to decrement stock level on a VariantOverride without a count_on_hand specified."
-    end
-  end
-
  def default_stock?
    default_stock.present?
  end
--- a/app/overrides/spree/admin/orders/_form/add_distribution_fields.html.haml.deface
+++ b/app/overrides/spree/admin/orders/_form/add_distribution_fields.html.haml.deface
@@ -1,3 +1,38 @@
 / insert_before "[data-hook='admin_order_form_buttons']"

-= render partial: 'spree/admin/orders/_form/distribution_fields'
+%fieldset.no-border-bottom
+  %legend{align: 'center'} Distribution
+
+  - if @order.complete?
+    .alpha.six.columns
+      %p
+        %b Distributor:
+        = f.object.distributor.andand.name || "None"
+        = f.hidden_field :distributor_id
+    .omega.six.columns
+      %p
+        %b Order cycle:
+        = f.object.order_cycle.andand.name || "None"
+        = f.hidden_field :order_cycle_id
+
+  - else
+    .alpha.six.columns
+      .field
+        %label{for: "order_distributor_id"} Distributor
+        %input.ofn-select2.fullwidth{id: "order_distributor_id",
+        type: 'number',
+        name: "order[distributor_id]",
+        "ng-model" => 'distributor_id',
+        data: "shops" }
+
+    .omega.six.columns
+      .field
+        %label{ for: "order_order_cycle_id"} Order Cycle
+        %input.ofn-select2.fullwidth{id: "order_order_cycle_id",
+        type: 'number',
+        name: "order[order_cycle_id]",
+        "ng-model" => 'order_cycle_id',
+        "ng-disabled" => "!distributor_id",
+        data: "orderCycles",
+        text: "name_and_status",
+        filter: "validOrderCycle" }
--- a/app/overrides/spree/admin/orders/_line_item/replace_variant_price.html.haml.deface
+++ b/app/overrides/spree/admin/orders/_line_item/replace_variant_price.html.haml.deface
@@ -1,3 +0,0 @@
-/ replace 'code[erb-loud]:contains(\'f.object.variant.display_amount\')'
-
-= f.object.single_money
--- a/app/overrides/spree/admin/orders/edit/suppress_errors.html.haml.deface
+++ b/app/overrides/spree/admin/orders/edit/suppress_errors.html.haml.deface
@@ -1,6 +0,0 @@
-/ replace "code[erb-loud]:contains(\'error_messages\')"
-
-# Suppress errors when manually creating a new order - needs to proceed to edit page
-# without having line items (which otherwise gives a validation error)
- unless params["suppress_error_msg"]
-  = render partial: "spree/shared/error_messages", :locals => { :target => @order }
--- a/app/overrides/spree/admin/products/_form/add_units_form.html.haml.deface
+++ b/app/overrides/spree/admin/products/_form/add_units_form.html.haml.deface
@@ -1,17 +1,16 @@
 / insert_top "[data-hook='admin_product_form_right']"

-.variant_units_form{ 'ng-app' => 'admin.products', 'ng-controller' => 'editUnitsCtrl' }
+= f.field_container :variant_unit do
+  = f.label :variant_unit, 'Variant unit'
+  = f.select :variant_unit, product_variant_unit_options, {:include_blank => true}, {:class => "select2 fullwidth"}
+  = f.error_message_on :variant_unit

-  = f.field_container :units do
-    = f.label :variant_unit_with_scale, :units
-    %select.select2.fullwidth{ id: 'product_variant_unit_with_scale', 'ng-model' => 'variant_unit_with_scale', 'ng-change' => 'setFields()', 'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options' }
-      %option{'value' => ''}
+= f.field_container :variant_unit_scale do
+  = f.label :variant_unit_scale, 'Variant unit scale'
+  = f.text_field :variant_unit_scale
+  = f.error_message_on :variant_unit_scale

-  = f.text_field :variant_unit, {'id' => 'variant_unit', 'ng-value' => 'product.variant_unit', 'hidden' => true}
-  = f.text_field :variant_unit_scale, {'id' => 'variant_unit_scale', 'ng-value' => 'product.variant_unit_scale', 'hidden' => true}
-
-  .variant_unit_name{'ng-show' => 'product.variant_unit == "items"'}
-    = f.field_container :variant_unit_name do
-      = f.label :variant_unit_name, 'Variant unit name'
-      = f.text_field :variant_unit_name, {placeholder: t('admin.products.unit_name_placeholder')}
-      = f.error_message_on :variant_unit_name
+= f.field_container :variant_unit_name do
+  = f.label :variant_unit_name, 'Variant unit name'
+  = f.text_field :variant_unit_name
+  = f.error_message_on :variant_unit_name
--- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
+++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
@@ -34,7 +34,7 @@
      .three.columns.omega{ 'ng-show' => "product.variant_unit_with_scale == 'items'" }
        = f.field_container :unit_name do
          = f.label :product_variant_unit_name, t(:unit_name)
-          %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => t('admin.products.unit_name_placeholder'), :type => 'text' }
+          %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => 'eg. bunches', :type => 'text' }
    .twelve.columns.alpha
      .six.columns.alpha
        = render 'spree/admin/products/primary_taxon_form', f: f
--- a/app/overrides/spree/admin/shared/_order_details/replace_item_price.html.haml.deface
+++ b/app/overrides/spree/admin/shared/_order_details/replace_item_price.html.haml.deface
@@ -1,3 +0,0 @@
-/ replace_contents 'tr[data-hook="order_details_line_item_row"] td.price'
-
-= item.single_display_amount
--- a/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface
+++ b/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface
@@ -1,3 +1,3 @@
 / insert_bottom "[data-hook='admin_product_sub_tabs']"

-= tab :variant_overrides, url: main_app.admin_inventory_path, match_path: '/inventory'
+= tab :variant_overrides, label: "Inventory", url: main_app.admin_inventory_path, match_path: '/inventory'
--- a/app/overrides/spree/admin/variants/_form/add_unit_value_and_description.html.haml.deface
+++ b/app/overrides/spree/admin/variants/_form/add_unit_value_and_description.html.haml.deface
@@ -1,13 +1,10 @@
 / insert_top "[data-hook='admin_variant_form_fields']"

 - if product_has_variant_unit_option_type?(@product)
-  - if @product.variant_unit != 'items'
-    .field{"data-hook" => "unit_value", 'ng-controller' => 'variantUnitsCtrl'}
-      = f.label :unit_value, "#{t('admin.'+@product.variant_unit)} ({{unitName(#{@product.variant_unit_scale}, '#{@product.variant_unit}')}})"
-      = hidden_field_tag 'product_variant_unit_scale', @product.variant_unit_scale
-      = text_field_tag :unit_value_human, nil, {class: "fullwidth", 'ng-model' => 'unit_value_human', 'ng-change' => 'updateValue()'}
-      = f.text_field :unit_value, {hidden: true, 'ng-value' => 'unit_value'}
+  .field{"data-hook" => "unit_value"}
+    = f.label :unit_value, "Unit Value"
+    = f.text_field :unit_value, class: "fullwidth"

-    .field{"data-hook" => "unit_description"}
-      = f.label :unit_description, "Unit Description"
-      = f.text_field :unit_description, class: "fullwidth", placeholder: t('admin.products.unit_name_placeholder')
+  .field{"data-hook" => "unit_description"}
+    = f.label :unit_description, "Unit Description"
+    = f.text_field :unit_description, class: "fullwidth"
--- a/app/overrides/spree/admin/variants/_form/replace_weight.html.haml.deface
+++ b/app/overrides/spree/admin/variants/_form/replace_weight.html.haml.deface
@@ -1,14 +0,0 @@
-/ replace "[data-hook='admin_variant_form_additional_fields']"
-
-.right.six.columns.omega.label-block{"data-hook" => "admin_variant_form_additional_fields"}
-  - if @product.variant_unit != 'weight'
-    .field{"data-hook" => 'weight'}
-      = f.label 'weight', t('weight')+' (kg)'
-      - value = number_with_precision(@variant.weight, :precision => 2)
-      = f.text_field 'weight', :value => value, :class => 'fullwidth'
-
-  - [:height, :width, :depth].each do |field|
-    .field{"data-hook" => field}
-      = f.label field, t(field)
-      - value = number_with_precision(@variant.send(field), :precision => 2)
-      = f.text_field field, :value => value, :class => 'fullwidth'
--- a/app/serializers/api/admin/enterprise_serializer.rb
+++ b/app/serializers/api/admin/enterprise_serializer.rb
@@ -4,7 +4,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
  attributes :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order
  attributes :preferred_product_selection_from_inventory_only
  attributes :owner, :users, :tag_groups, :default_tag_group
-  attributes :require_login, :allow_guest_orders, :allow_order_changes
+  attributes :require_login

  has_one :owner, serializer: Api::Admin::UserSerializer
  has_many :users, serializer: Api::Admin::UserSerializer
--- a/app/serializers/api/current_order_serializer.rb
+++ b/app/serializers/api/current_order_serializer.rb
@@ -1,12 +1,11 @@
 class Api::CurrentOrderSerializer < ActiveModel::Serializer
  attributes :id, :item_total, :email, :shipping_method_id,
-             :display_total, :payment_method_id
+    :display_total, :payment_method_id

  has_one :bill_address, serializer: Api::AddressSerializer
  has_one :ship_address, serializer: Api::AddressSerializer

  has_many :line_items, serializer: Api::LineItemSerializer
-  has_many :finalised_line_items, serializer: Api::LineItemSerializer

  def payment_method_id
    object.payments.first.andand.payment_method_id
--- a/app/serializers/api/order_serializer.rb
+++ b/app/serializers/api/order_serializer.rb
@@ -1,26 +1,11 @@
 module Api
  class OrderSerializer < ActiveModel::Serializer
-    attributes :number, :completed_at, :total, :state, :shipment_state, :payment_state
-    attributes :outstanding_balance, :payments, :path, :cancel_path, :changes_allowed, :changes_allowed_until
-    attributes :shop_name, :item_count
+    attributes :number, :completed_at, :total, :state, :shipment_state, :payment_state, :outstanding_balance, :payments, :path

    has_many :payments, serializer: Api::PaymentSerializer

-    def shop_name
-      object.distributor.andand.name
-    end
-
-    def item_count
-      object.line_items.sum(&:quantity)
-    end
-
    def completed_at
-      object.completed_at.blank? ? "" : I18n.l(object.completed_at, format: "%b %d, %Y %H:%M")
-    end
-
-    def changes_allowed_until
-      return I18n.t(:not_allowed) unless object.changes_allowed?
-      I18n.l(object.order_cycle.andand.orders_close_at, format: "%b %d, %Y %H:%M")
+      object.completed_at.blank? ? "" : I18n.l(object.completed_at, format: :long)
    end

    def total
@@ -40,16 +25,7 @@ module Api
    end

    def path
-      Spree::Core::Engine.routes_url_helpers.order_path(object)
-    end
-
-    def cancel_path
-      return nil unless object.changes_allowed?
-      Spree::Core::Engine.routes_url_helpers.cancel_order_path(object)
-    end
-
-    def changes_allowed
-      object.changes_allowed?
+      Spree::Core::Engine.routes_url_helpers.order_url(object.number, only_path: true)
    end
  end
 end
--- a/app/serializers/api/variant_serializer.rb
+++ b/app/serializers/api/variant_serializer.rb
@@ -1,6 +1,7 @@
 class Api::VariantSerializer < ActiveModel::Serializer
  attributes :id, :is_master, :count_on_hand, :name_to_display, :unit_to_display
  attributes :options_text, :on_demand, :price, :fees, :price_with_fees, :product_name
+  attributes :tag_list

  def price
    object.price
--- a/app/views/admin/account/show.html.haml
+++ b/app/views/admin/account/show.html.haml
@@ -25,7 +25,7 @@
    %col{ width: '62.5%' }
    %col{ width: '12.5%' }
    %thead
-      %th= t('admin.date')
+      %th Date
      %th= t(:description)
      %th= t(:charge)
    - if order = invoice.order
--- a/app/views/admin/customers/index.html.haml
+++ b/app/views/admin/customers/index.html.haml
@@ -20,7 +20,7 @@
      .filter_select.five.columns.alpha
        %label{ :for => 'quick_search', ng: {class: '{disabled: !shop_id}'} }=t('admin.quick_search')
        %br
-        %input.fullwidth{ :type => "text", :id => 'quick_search', ng: { model: 'quickSearch', disabled: '!shop_id' }, :placeholder => t('.search_by_email') }
+        %input.fullwidth{ :type => "text", :id => 'quick_search', ng: { model: 'quickSearch', disabled: '!shop_id' }, :placeholder => "Search by email/code..." }
      .filter_select.four.columns
        %label{ :for => 'hub_id', ng: { bind: "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" } }
        %br
@@ -94,6 +94,6 @@

      -# %show-more.text-center{ data: "filteredCustomers", limit: "customerLimit", increment: "20" }
      %div.text-center{ ng: { show: "filteredCustomers.length > customerLimit" } }
-        %input{ type: 'button', value: t(:show_more), ng: { click: 'customerLimit = customerLimit + 20' } }
+        %input{ type: 'button', value: 'Show More', ng: { click: 'customerLimit = customerLimit + 20' } }
        or
-        %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), ng: { click: 'customerLimit = filteredCustomers.length' } }
+        %input{ type: 'button', value: "Show All ({{ filteredCustomers.length - customerLimit }}  More)", ng: { click: 'customerLimit = filteredCustomers.length' } }
--- a/app/views/admin/enterprises/form/_business_details.html.haml
+++ b/app/views/admin/enterprises/form/_business_details.html.haml
@@ -23,11 +23,11 @@
    = f.label :charges_sales_tax, t(:say_no), value: 'false'
 .row
  .alpha.three.columns
-    = f.label :display_invoice_logo, t('.display_invoice_logo')
+    = f.label :display_invoice_logo, 'Display logo in invoices'
  .omega.eight.columns
    = f.check_box :display_invoice_logo
 .row
  .alpha.three.columns
-    = f.label :invoice_text, t('.invoice_text')
+    = f.label :invoice_text, 'Add customized text at the end of invoices'
  .omega.eight.columns
    = f.text_area :invoice_text, style: "width: 100%; height: 100px;"
--- a/app/views/admin/enterprises/form/_shipping_methods.html.haml
+++ b/app/views/admin/enterprises/form/_shipping_methods.html.haml
@@ -10,7 +10,7 @@
        %tr{ ng: { controller: 'shippingMethodsCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } }
          %td= shipping_method.name
          %td= f.check_box :shipping_method_ids, { :multiple => true, 'ng-model' => 'ShippingMethod.selected' }, shipping_method.id, nil
-          %td= link_to t(:edit), edit_admin_shipping_method_path(shipping_method)
+          %td= link_to "Edit", edit_admin_shipping_method_path(shipping_method)
  %br
  .row
    .six.columns.alpha
--- a/app/views/admin/enterprises/form/_shop_preferences.html.haml
+++ b/app/views/admin/enterprises/form/_shop_preferences.html.haml
@@ -1,7 +1,7 @@
 .row
  .alpha.eleven.columns
    .three.columns.alpha
-      = f.label "enterprise_preferred_shopfront_message", t('.shopfront_message')
+      = f.label "enterprise_preferred_shopfront_message", t(:shopfront_message)
    .eight.columns.omega
      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_message', 'id' => 'enterprise_preferred_shopfront_message', 'name' => 'enterprise[preferred_shopfront_message]', 'class' => 'text-angular',
        'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]",
@@ -9,7 +9,7 @@
 .row
  .alpha.eleven.columns
    .three.columns.alpha
-      = f.label "enterprise_preferred_shopfront_closed_message", t('.shopfront_closed_message')
+      = f.label "enterprise_preferred_shopfront_closed_message", t(:shopfront_closed_message)
    .eight.columns.omega
      %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_closed_message', 'id' => 'enterprise_preferred_shopfront_closed_message', 'name' => 'enterprise[preferred_shopfront_closed_message]', 'class' => 'text-angular',
        'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]",
@@ -17,7 +17,7 @@
 .row
  .alpha.eleven.columns
    .three.columns.alpha
-      = f.label "enterprise_preferred_shopfront_taxon_order", t('.shopfront_category_ordering')
+      = f.label "enterprise_preferred_shopfront_taxon_order", t(:shopfront_category_ordering)
      %br
      (top to bottom)
    .eight.columns.omega
@@ -51,27 +51,9 @@
      %label= t '.allow_guest_orders'
      %div{'ofn-with-tip' => t('.allow_guest_orders_tip')}
        %a= t 'admin.whats_this'
-    .eight.columns.omega
-      .row
-        .three.columns.alpha
-          = f.radio_button :allow_guest_orders, true, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "true"
-          = f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true
-        .five.columns.omega
-          = f.radio_button :allow_guest_orders, false, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "false"
-          = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
-      .row.warning{ng: {show: 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes'}}
-        .eight.columns.alpha.omega
-          %i.icon-warning-sign
-          = t '.recommend_require_login'
-.row
-  .alpha.eleven.columns
-    .three.columns.alpha
-      %label= t '.allow_order_changes'
-      %div{'ofn-with-tip' => t('.allow_order_changes_tip')}
-        %a= t 'admin.whats_this'
    .three.columns
-      = f.radio_button :allow_order_changes, false, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "false"
-      = f.label :allow_order_changes, t('.allow_order_changes_false'), value: :false
+      = f.radio_button :allow_guest_orders, true
+      = f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true
    .five.columns.omega
-      = f.radio_button :allow_order_changes, true, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "true"
-      = f.label :allow_order_changes, t('.allow_order_changes_true'), value: :true
+      = f.radio_button :allow_guest_orders, false
+      = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
--- a/app/views/admin/order_cycles/_exchange_form.html.haml
+++ b/app/views/admin/order_cycles/_exchange_form.html.haml
@@ -9,16 +9,14 @@
    selected
  - if type == 'supplier'
    %td.receival-details
-      = text_field_tag 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', '', 'id' => 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', 'placeholder' => t('.receival_instructions_placeholder'), 'ng-model' => 'exchange.receival_instructions'
+      = text_field_tag 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', '', 'id' => 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', 'placeholder' => 'Receival instructions', 'ng-model' => 'exchange.receival_instructions'
  - if type == 'distributor'
    %td.tags.panel-toggle.text-center{ name: "tags", ng: { if: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } }
      {{ exchange.tags.length }}
    %td.collection-details
-      = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', 'required' => 'required', 'placeholder' => t('.pickup_time_placeholder'), 'ng-model' => 'exchange.pickup_time', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator', 'maxlength' => 35
-      %span.icon-question-sign{'ofn-with-tip' => t('admin.order_cycles.edit.pickup_time_tip')}
+      = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', 'placeholder' => 'Ready for (ie. Date / Time)', 'ng-model' => 'exchange.pickup_time', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator'
      %br/
-      = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', 'placeholder' => t('.pickup_instructions_placeholder'), 'ng-model' => 'exchange.pickup_instructions', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator'
-      %span.icon-question-sign{'ofn-with-tip' => t('admin.order_cycles.edit.pickup_instructions_tip')}
+      = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', 'placeholder' => 'Pick-up instructions', 'ng-model' => 'exchange.pickup_instructions', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator'
  %td.fees
    %ol{ ng: { show: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } }
      %li{'ng-repeat' => 'enterprise_fee in exchange.enterprise_fees'}
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -4,13 +4,11 @@
  .alpha.two.columns
    = label_tag t('.ready_for')
  .six.columns
-    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_time', 'required' => 'required', 'placeholder' => t('.ready_for_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_time', 'size' => 30, 'maxlength' => 35
-    %span.icon-question-sign{'ofn-with-tip' => t('admin.order_cycles.edit.pickup_time_tip')}
+    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_time', 'placeholder' => t('.ready_for_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_time', 'size' => 30
  .two.columns
    = label_tag t('.customer_instructions')
  .six.columns.omega
    = text_field_tag 'order_cycle_outgoing_exchange_0_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_0_pickup_instructions', 'placeholder' => t('.customer_instructions_placeholder'), 'ng-model' => 'outgoing_exchange.pickup_instructions', 'size' => 30
-    %span.icon-question-sign{'ofn-with-tip' => t('admin.order_cycles.edit.pickup_instructions_tip')}

 = label_tag t('.products')
 %table.exchanges
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -28,8 +28,8 @@
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|

  %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
-    %input.red{ type: "button", value: t(:update), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
-    %input.red{ type: "button", value: t('.update_and_close'), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
+    %input.red{ type: "button", value: t(:update), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty" } }
+    %input.red{ type: "button", value: t('.update_and_close'), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty" } }
    %input{ type: "button", ng: { value: "order_cycle_form.$dirty ? 'Cancel' : 'Close'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }

  - if order_cycles_simple_form
--- a/app/views/admin/order_cycles/new.html.haml
+++ b/app/views/admin/order_cycles/new.html.haml
@@ -7,7 +7,7 @@
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|

  %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
-    %input.red{ type: "button", value: t(:create), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
+    %input.red{ type: "button", value: t(:create), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty" } }
    %input{ type: "button", ng: { value: "order_cycle_form.$dirty ? 'Cancel' : 'Close'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }

  - if order_cycles_simple_form
--- a/app/views/admin/variant_overrides/_filters.html.haml
+++ b/app/views/admin/variant_overrides/_filters.html.haml
@@ -11,7 +11,7 @@
  .filter_select.four.columns
    %label{ :for => 'producer_filter', ng: {class: '{disabled: !hub_id}'} }=t('admin.producer')
    %br
-    %input.ofn-select2.fullwidth{ :id => 'producer_filter', type: 'number', data: 'producers', blank: "{id: 0, name: '#{t(:all)}'}", ng: { model: 'producerFilter', disabled: '!hub_id' } }
+    %input.ofn-select2.fullwidth{ :id => 'producer_filter', type: 'number', data: 'producers', blank: "{id: 0, name: 'All'}", ng: { model: 'producerFilter', disabled: '!hub_id' } }
  -# .filter_select{ :class => "three columns" }
  -#   %label{ :for => 'distributor_filter' }Hub
  -#   %br
--- a/app/views/checkout/_already_ordered.html.haml
+++ b/app/views/checkout/_already_ordered.html.haml
@@ -1,2 +0,0 @@
-%p.alert-box.info
-  = t '.message_html', cart: link_to(t('.cart'), "#{cart_path}#bought-products")
--- a/app/views/checkout/_form.html.haml
+++ b/app/views/checkout/_form.html.haml
@@ -11,7 +11,6 @@
  = render "checkout/billing", f: f
  = render "checkout/shipping", f: f
  = render "checkout/payment", f: f
-  = render "checkout/already_ordered", f: f if show_bought_items?
  %p
    %button.button.primary{type: :submit}
      = t :checkout_send
--- a/app/views/enterprises/shop.html.haml
+++ b/app/views/enterprises/shop.html.haml
@@ -8,10 +8,6 @@
 = inject_shop_enterprises

 %shop.darkswarm
-  .alert-box.changeable-orders-alert.info.animate-show{ ng: { show: "alert.visible && alert.html", cloak: true } }
-    %span{ ng: { bind: { html: "alert.html" } } }
-    %a.close{ ng: { click: "alert.close()" } } &times;
-
  - content_for :order_cycle_form do

    %div{"ng-controller" => "OrderCycleChangeCtrl", "ng-cloak" => true}
--- a/app/views/producers/signup.html.haml
+++ b/app/views/producers/signup.html.haml
@@ -38,7 +38,7 @@
      .small-12.medium-6.medium-offset-3.columns.text-center
        %h2
          = t :producers_signup_cta_headline
-        %p.text-big= t('.start_free_profile')
+        %p.text-big Start with a free profile, and expand when you're ready!
        %a.button.transparent{href: "/register"}
          = t :producers_signup_cta_action

--- a/app/views/shared/menu/_cart.html.haml
+++ b/app/views/shared/menu/_cart.html.haml
@@ -15,7 +15,7 @@
        %a.button.secondary.tiny.add_to_cart{ href: cart_path, type: :submit, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }" }
          = "{{ Cart.dirty ? '#{t(:cart_updating)}' : (Cart.empty() ? '#{t(:cart_empty)}' : '#{t(:cart_edit)}' ) }}"
        %a.button.primary.tiny{href: checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"}
-          = t '.checkout'
+          = t 'checkout'
      %table
        %tr.product-cart{"ng-repeat" => "line_item in Cart.line_items", "id" => "cart-variant-{{ line_item.variant.id }}"}
          %td
@@ -47,25 +47,4 @@
        %a.button.secondary.tiny.add_to_cart{ href: cart_path, type: :submit, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }" }
          = "{{ Cart.dirty ? '#{t(:cart_updating)}' : (Cart.empty() ? '#{t(:cart_empty)}' : '#{t(:cart_edit)}' ) }}"
        %a.button.primary.tiny{href: checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"}
-          = t '.checkout'
-      - if order_changes_allowed?
-        %h5{"ng-if" => "Cart.line_items_finalised.length", style: 'margin-top: 1em'}
-          = t '.already_ordered_products'
-        %table
-          %tr.product-cart{"ng-repeat" => "line_item in Cart.line_items_finalised",
-          "id" => "cart-variant-{{ line_item.variant.id }}"}
-            %td
-              %small
-                %strong
-                  {{ line_item.variant.extended_name }}
-            %td.text-right
-              %small
-                %span.quantity {{ line_item.quantity }}
-                %i.ofn-i_009-close
-                %span.price {{ line_item.variant.price_with_fees | localizeCurrency }}
-
-            %td
-              %small
-                \=
-                %strong
-                  .total-price.right {{ line_item.total_price | localizeCurrency }}
+          = t 'checkout'
--- a/app/views/shop/changeable_orders_alert.html.haml
+++ b/app/views/shop/changeable_orders_alert.html.haml
@@ -1 +0,0 @@
-= shop_changeable_orders_alert_html
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -6,7 +6,7 @@
 .row.summary
  .small-10.medium-10.large-11.columns.summary-header
    %h3
-      %a{"ng-click" => "triggerProductModal()", href: 'javascript:void(0)'}
+      %a{"ng-click" => "triggerProductModal()"}
        %span{"ng-bind" => "::product.name"}
        %i.ofn-i_057-expand
    %small
--- a/app/views/shopping_shared/_details.html.haml
+++ b/app/views/shopping_shared/_details.html.haml
@@ -1,18 +1,14 @@
- distributor = @order.andand.distributor || current_distributor
-
 %navigation
  %distributor.details.row
    .small-12.medium-6.large-6.columns
      #distributor_title
-        - if distributor.logo?
-          %img.left{src: distributor.logo.url(:thumb)}
+        - if current_distributor.logo?
+          %img.left{src: current_distributor.logo.url(:thumb)}
        %h3
-          = distributor.name
-        %location= distributor.address.city
+          = current_distributor.name
+        %location= current_distributor.address.city
        / Will this needs to be a drop-down to choose either pick-up point or delivery once shipping methods are implemented
-
    .small-12.medium-6.large-6.columns
      = render partial: "shopping_shared/order_cycles"

-
-= render partial: "shopping_shared/tabs" if distributor == current_distributor
+= render partial: "shopping_shared/tabs"
--- a/app/views/spree/admin/orders/_form/_distribution_fields.html.haml
+++ b/app/views/spree/admin/orders/_form/_distribution_fields.html.haml
@@ -1,35 +0,0 @@
-%fieldset.no-border-bottom
-  %legend{align: 'center'} Distribution
-
-  - if @order.complete?
-    .alpha.six.columns
-      %p
-        %b Distributor:
-        = @order.distributor.andand.name || "None"
-        %input{type: "hidden", id: "order_distributor_id", value: @order.distributor.andand.id}
-    .omega.six.columns
-      %p
-        %b Order cycle:
-        = @order.order_cycle.andand.name || "None"
-        %input{type: "hidden", id: "order_order_cycle_id", value: @order.order_cycle.andand.id}
-  - else
-    .alpha.six.columns
-      .field
-        %label{for: "order_distributor_id"} Distributor
-        %input.ofn-select2.fullwidth{id: "order_distributor_id",
-        type: 'number',
-        name: "order[distributor_id]",
-        "ng-model" => 'distributor_id',
-        data: "shops" }
-
-    .omega.six.columns
-      .field
-        %label{ for: "order_order_cycle_id"} Order Cycle
-        %input.ofn-select2.fullwidth{id: "order_order_cycle_id",
-        type: 'number',
-        name: "order[order_cycle_id]",
-        "ng-model" => 'order_cycle_id',
-        "ng-disabled" => "!distributor_id",
-        data: "orderCycles",
-        text: "name_and_status",
-        filter: "validOrderCycle" }
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -31,21 +31,21 @@
      %label{ :for => 'supplier_filter' }
        = t("admin.producer")
      %br
-      %input#supplier_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'suppliers', blank: "{ id: 0, name: '#{t(:all)}' }", ng: { model: 'supplierFilter' } }
+      %input#supplier_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'suppliers', blank: "{ id: 0, name: 'All' }", ng: { model: 'supplierFilter' } }
    .filter_select{ :class => "three columns" }
      %label{ :for => 'distributor_filter' }
        = t("admin.shop")
      %br
-      %input#distributor_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'distributors', blank: "{ id: 0, name: '#{t(:all)}' }", ng: { model: 'distributorFilter' } }
+      %input#distributor_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'distributors', blank: "{ id: 0, name: 'All' }", ng: { model: 'distributorFilter' } }
    .filter_select{ :class => "three columns" }
      %label{ :for => 'order_cycle_filter' }
        = t("admin.order_cycle")
      %br
-      %input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', blank: "{ id: 0, name: '#{t(:all)}' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter', change: 'refreshData()' } }
+      %input#order_cycle_filter.ofn-select2.fullwidth{ type: 'number', 'min-search' => 5, data: 'orderCycles', blank: "{ id: 0, name: 'All' }", on: { selecting: "confirmRefresh" }, ng: { model: 'orderCycleFilter', change: 'refreshData()' } }
    .filter_clear{ :class => "two columns omega" }
      %label{ :for => 'clear_all_filters' }
      %br
-      %input.red.fullwidth{ :type => 'button', :id => 'clear_all_filters', :value => t('admin.clear_all'), 'ng-click' => "resetSelectFilters()" }
+      %input.red.fullwidth{ :type => 'button', :id => 'clear_all_filters', :value => "Clear All", 'ng-click' => "resetSelectFilters()" }

  %hr.divider.sixteen.columns.alpha.omega{ ng: { show: 'unitsVariantSelected()' } }

@@ -59,7 +59,7 @@
      %h6{ :class => "eight columns alpha", 'ng-hide' => 'sharedResource', style: 'text-align: center;' } {{ selectedUnitsVariant.full_name }}
    %div{ :class => "four columns omega" }
      %h6{ :class => "four columns alpha", :style => 'text-align: right;' }
-        %a{ :href => '#', 'ng-click' => 'selectedUnitsVariant = {};selectedUnitsProduct = {};sharedResource=false;' }= t('admin.clear')
+        %a{ :href => '#', 'ng-click' => 'selectedUnitsVariant = {};selectedUnitsProduct = {};sharedResource=false;' } Clear
    %hr
    .row
      .one.column.alpha &nbsp;
--- a/app/views/spree/admin/orders/set_distribution.html.haml
+++ b/app/views/spree/admin/orders/set_distribution.html.haml
@@ -1,24 +0,0 @@
- content_for :page_title do
-  = t(:new)
-
- content_for :page_actions do
-  %li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left'
-
-= admin_inject_shops 'admin.orders'
-= admin_inject_order_cycles
-
-= render 'spree/admin/shared/order_tabs', :current => 'Order Details'
-
-= csrf_meta_tags
-
-%div{"data-hook" => "admin_order_new_header"}
-  = render 'spree/shared/error_messages', :target => @order
-
-%div{"ng-app" => "admin.orders", "ng-controller" => "ordersCtrl"}
-  = form_for @order, url: admin_order_url(@order), method: :put do |f|
-    = render 'spree/admin/orders/_form/distribution_fields'
-    -# This param passed to stop validation error in next page due to no line items in order yet:
-    = hidden_field_tag 'suppress_error_msg', "true"
-    = button_tag :class => 'secondary radius expand small', :id => 'update-button' do
-      %i.icon-arrow-right
-      = t(:next)
--- a/app/views/spree/admin/orders/ticket.html.haml
+++ b/app/views/spree/admin/orders/ticket.html.haml
@@ -13,24 +13,24 @@
      '\x1B' + '\x74' + '\x10',
      '\x1B' + '\x61' + '\x31', // center align
      '\x1B' + '\x21' + '\x30', // em mode on
-      '#{j(@order.distributor.name)}' + '\x0A',
+      '#{@order.distributor.name}' + '\x0A',
      '\x1B' + '\x21' + '\x0A' + '\x1B' + '\x45' + '\x0A', // em mode off
      '\x0A',
-      '#{j(@order.distributor.address.address_part1)}' + '\x0A',     // text and line break
-      '#{j(@order.distributor.address.address_part2)}' + '\x0A',
-      '#{j(@order.distributor.email)}' + '\x0A',
+      '#{@order.distributor.address.address_part1}' + '\x0A',     // text and line break
+      '#{@order.distributor.address.address_part2}' + '\x0A',
+      '#{@order.distributor.email}' + '\x0A',
      '\x0A',                   // line break    
      '\x1B' + '\x61' + '\x32', // right align
-      '#{j(l(Time.zone.now.to_date))}' + '\x0A',
-      '#{j(@order.number)}' + '\x0A',
+      '#{l Time.zone.now.to_date}' + '\x0A',
+      '#{@order.number}' + '\x0A',
      '\x1B' + '\x61' + '\x30', // left align
      '\x0A',
      '\x1B' + '\x4D' + '\x31', // small text
-      "#{'%6s   %-26s%10s%10s' %
-      [j(t(:ticket_column_qty)),
-      j(t(:ticket_column_item)),
-      j(t(:ticket_column_unit_price)),
-      j(t(:ticket_column_total_price))]}",
+      "#{'%6s   %-23s%12s%12s' %
+      [t(:ticket_column_qty),
+      t(:ticket_column_item),
+      t(:ticket_column_unit_price),
+      t(:ticket_column_total_price)]}",
      '\x0A',
      '\x1B' + '\x4D' + '\x30', // normal text
      '__________________________________________' + '\x0A',
@@ -38,34 +38,36 @@
      .sort_by{ |line_item| line_item.product.name }
      .map { |line_item| '%5d %-19.19s%8.8s%8.8s' %
      [line_item.quantity,
-      j(line_item.product.name),
-      j(line_item.single_display_amount_with_adjustments.format(symbol: false, with_currency: false)),
-      j(line_item.display_amount_with_adjustments.format(symbol: false, with_currency: false))] }
+      line_item.product.name,
+      line_item.single_display_amount_with_adjustments.money.format(symbol: false),
+      line_item.display_amount_with_adjustments.money.format(symbol: false)] }
      .join('" + \'\x0A\' + "')}",
      '\x0A',
      "#{checkout_adjustments_for(@order, exclude: [:line_item])
      .reject{ |a| a.amount == 0 }
      .reverse.map { |adjustment| '%5s %-27.27s%8.8s' %
      ["",
-      j(raw(adjustment.label)),
-      j(display_adjustment_amount(adjustment).format(symbol: false, with_currency: false))] +
-      '" + \'\x0A\' + "'}.join }",
+      raw(adjustment.label),
+      display_adjustment_amount(adjustment).money.format(symbol: false)] }
+      .join('" + \'\x0A\' + "')}",
+      '\x0A',
      '__________________________________________' + '\x0A',
      '\x0A',
      '\x1B' + '\x45' + '\x0D', // bold on
      "#{'%31s%10s' %
-      [j(t(:total_incl_tax)),
-      j(@order.display_total.format(with_currency: false))]}",
+      [t(:total_incl_tax),
+      @order.display_total]}",
      '\x1B' + '\x45' + '\x0A', // bold off
      '\x0A',
      "#{display_checkout_taxes_hash(@order).map { |tax_rate, tax_value|
      '%31s%10s' %
-      [j(t(:tax_total, rate: tax_rate)),
-      j(tax_value.format(with_currency: false))] +
-      '" + \'\x0A\' + "'}.join }",
+      [t(:tax_total, rate: tax_rate),
+      tax_value] }
+      .join('" + \'\x0A\' + "')}",
+      '\x0A',
      "#{'%31s%10s' %
-      [j(t(:total_excl_tax)),
-      j(display_checkout_total_less_tax(@order).format(with_currency: false))]}",
+      [t(:total_excl_tax),
+      display_checkout_total_less_tax(@order)]}",
      '\x0A',
      '\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A' + '\x0A',
      '\x1B' + '\x69',          // cut paper
--- a/app/views/spree/admin/products/bulk_edit/_filters.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_filters.html.haml
@@ -15,4 +15,4 @@
  .filter_clear.three.columns.omega
    %label{ :for => 'clear_all_filters' }
    %br
-    %input.fullwidth.red{ :type => 'button', :id => 'clear_all_filters', :value => t('admin.clear_filters'), 'ng-click' => "resetSelectFilters()" }
+    %input.fullwidth.red{ :type => 'button', :id => 'clear_all_filters', :value => "Clear Filters", 'ng-click' => "resetSelectFilters()" }
--- a/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
@@ -20,7 +20,7 @@
  %tr{ ng: { controller: "ColumnsCtrl" } }
    %th.left-actions
      %a{ 'ng-click' => 'toggleShowAllVariants()', :style => 'color: red' }
-        = t(:expand_all)
+        Expand All
    %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('admin.name')
--- a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
@@ -26,7 +26,7 @@
    %input.fullwidth{ :type => 'text', id: "p{{product.id}}_category_id", 'ng-model' => 'product.category_id', 'ofn-taxon-autocomplete' => '', 'ofn-track-product' => 'category_id', 'multiple-selection' => 'false', placeholder: 'Category' }
  %td.tax_category{ 'ng-if' => 'columns.tax_category.visible' }
    %select.select2{ name: 'product_tax_category_id', 'ofn-track-product' => 'tax_category_id', ng: {model: 'product.tax_category_id', options: 'tax_category.id as tax_category.name for tax_category in tax_categories'} }
-      %option{value: ''}= t(:none)
+      %option{value: ''} None
  %td.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' }
    %input{ 'ng-model' => 'product.inherits_properties', :name => 'inherits_properties', 'ofn-track-product' => 'inherits_properties', type: "checkbox" }
  %td.available_on{ 'ng-show' => 'columns.available_on.visible' }
--- a/app/views/spree/admin/products/bulk_edit/_save_button_row.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_save_button_row.html.haml
@@ -1,3 +1,3 @@
 %div.sixteen.columns.alpha{ 'ng-hide' => 'loading || products.length == 0', style: "margin-bottom: 10px" }
  %div.four.columns.alpha
-    %input.four.columns.alpha{ :type => 'button', :value => t(:save_changes), 'ng-click' => 'submitProducts()'}
+    %input.four.columns.alpha{ :type => 'button', :value => 'Save Changes', 'ng-click' => 'submitProducts()'}
--- a/app/views/spree/admin/reports/bulk_coop.html.haml
+++ b/app/views/spree/admin/reports/bulk_coop.html.haml
@@ -4,7 +4,7 @@
  .row
    .four.columns.alpha
      = label_tag nil, "Distributor: "
-      = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => t(:all)}, {:class => "select2 fullwidth"})
+      = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => 'All'}, {:class => "select2 fullwidth"})
  = label_tag nil, "Report Type: "
  %br
  = select_tag(:report_type, options_for_select([['Bulk Co-op - Totals by Supplier',:bulk_coop_supplier_report],['Bulk Co-op - Allocation',:bulk_coop_allocation],['Bulk Co-op - Packing Sheets',:bulk_coop_packing_sheets],['Bulk Co-op - Customer Payments',:bulk_coop_customer_payments]], @report_type))
--- a/app/views/spree/admin/reports/sales_tax.html.haml
+++ b/app/views/spree/admin/reports/sales_tax.html.haml
@@ -4,7 +4,7 @@
  .row
    .four.columns.alpha
      = label_tag nil, t(:report_distributor)
-      = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => t(:all)}, {:class => "select2 fullwidth"})
+      = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => 'All'}, {:class => "select2 fullwidth"})
  = label_tag nil, t(:report_customers_type)
  %br
  = select_tag(:report_type, options_for_select([[t(:report_tax_types),:tax_types],[t(:report_tax_rates),:tax_rates]], @report_type))
--- a/app/views/spree/orders/_bought.html.haml
+++ b/app/views/spree/orders/_bought.html.haml
@@ -1,35 +0,0 @@
-%tbody{ ng: { controller: 'EditBoughtOrderController' } }
-  %tr
-    %td.toggle-bought{ colspan: 2, ng: { click: 'showBought=!showBought' } }
-      %h5.brick
-        %i{ ng: { class: "{ 'ofn-i_007-caret-right': !showBought, 'ofn-i_005-caret-down': showBought}"} }
-        = t(:orders_bought_items_notice, count: @order.finalised_line_items.sum(&:quantity))
-    %td.text-right{ colspan: 3 }
-      %a.edit-finalised.button.radius.expand.small{ href: changeable_orders_link_path, ng: { class: "{secondary: !showBought, primary: showBought}" } }
-        = t(:orders_bought_edit_button)
-        %i.ofn-i_007-caret-right
-
-
-  - @order.finalised_line_items.each do |line_item|
-    - variant = line_item.variant
-    %tr.bought.line-item{class: "line-item-#{line_item.id} variant-#{variant.id}", ng: { show: 'showBought'} }
-      %td.cart-item-description
-
-        %div.item-thumb-image
-          - if variant.images.length == 0
-            = link_to mini_image(variant.product), variant.product
-          - else
-            = link_to image_tag(variant.images.first.attachment.url(:mini)), variant.product
-
-        = render 'spree/shared/line_item_name', line_item: line_item
-        %span.already-confirmed= t(:orders_bought_already_confirmed)
-      %td.text-right.cart-item-price
-        = line_item.single_display_amount_with_adjustments.to_html
-      %td.text-center.cart-item-quantity
-        = line_item.quantity
-      %td.cart-item-total.text-right
-        = line_item.display_amount_with_adjustments.to_html unless line_item.quantity.nil?
-
-      %td.bought-item-delete.text-center
-        %a{ng: {click: "deleteLineItem(#{line_item.id})"}}
-          %i.ofn-i_026-trash
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -20,10 +20,19 @@
        = order_form.fields_for :line_items do |item_form|
          = render :partial => 'line_item', :locals => { :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form }

-      = render 'bought' if show_bought_items? && @order.cart?
-
      %tfoot#edit-cart
-        = render 'spree/orders/form/cart_actions_row' if @order.cart?
+        %tr
+          %td{colspan:"2"}
+          %td
+            = button_tag :class => 'secondary radius expand small', :id => 'update-button' do
+              %i.ofn-i_023-refresh
+              = t(:update)
+          %td
+          %td#empty-cart.text-center
+            %span#clear_cart_link{"data-hook" => ""}
+              = link_to t(:orders_form_empty_cart), empty_cart_path, method: :put, :class => 'not-bold small'
+              -#= form_tag empty_cart_path, :method => :put do
+                -#= submit_tag t(:empty_cart), :class => 'button alert expand small'

        / This is the fees row which we want to replace with the pop-over
        -# - unless @order.adjustments.eligible.blank?
@@ -43,14 +52,6 @@
            %span.order-total.distribution-total= display_checkout_admin_and_handling_adjustments_total_for(@order)
          %td

-        - checkout_adjustments_for(@order, exclude: [:line_item, :admin_and_handling]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
-          %tr.order-adjustment
-            %td.text-right{:colspan => "3"}
-              = adjustment.label
-            %td.text-right.total
-              %span= adjustment.display_amount.to_html
-            %td
-
        %tr
          %td.text-right{colspan:"3"}
            %h5
--- a/app/views/spree/orders/_line_item.html.haml
+++ b/app/views/spree/orders/_line_item.html.haml
@@ -17,7 +17,7 @@

    = render 'spree/shared/line_item_name', line_item: line_item

-    - if @insufficient_stock_lines.andand.include? line_item
+    - if @insufficient_stock_lines.include? line_item
      %span.out-of-stock
        = variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock)
        %br/
@@ -35,5 +35,6 @@
    = line_item.display_amount_with_adjustments.to_html unless line_item.quantity.nil?

  %td.cart-item-delete.text-center{"data-hook" => "cart_item_delete"}
+    {{ quantity }}
    %a.delete{href: "#", id: "delete_#{dom_id(line_item)}"}
      %i.delete.ofn-i_026-trash
--- a/app/views/spree/orders/_summary.html.haml
+++ b/app/views/spree/orders/_summary.html.haml
@@ -1,65 +0,0 @@
-%table#line-items{"data-hook" => "order_details"}
-  %col{valign: "middle"}/
-  %col{halign: "center", valign: "middle", width: "5%"}/
-  %col{halign: "center", valign: "middle", width: "5%"}/
-  %col{halign: "center", valign: "middle", width: "5%"}/
-  %thead{"data-hook" => ""}
-    %tr{"data-hook" => "order_details_line_items_headers"}
-      %th= t(:item)
-      %th.price= t(:price)
-      %th.text-center.qty= t(:qty)
-      %th.text-right.total
-        %span= t(:total)
-  %tbody{"data-hook" => ""}
-    - order.line_items.each do |item|
-      %tr.line_item{"data-hook" => "order_details_line_item_row", class: "variant-#{item.variant.id}" }
-        %td(data-hook = "order_item_description")
-
-          %div.item-thumb-image{"data-hook" => "order_item_image"}
-            - if item.variant.images.length == 0
-              = link_to mini_image(item.variant.product), item.variant.product
-            - else
-              = link_to image_tag(item.variant.images.first.attachment.url(:mini)), item.variant.product
-
-
-          = render 'spree/shared/line_item_name', line_item: item
-
-        %td.text-right.price{"data-hook" => "order_item_price"}
-          %span= item.single_display_amount_with_adjustments.to_html
-        %td.text-center{"data-hook" => "order_item_qty"}= item.quantity
-        %td.text-right.total{"data-hook" => "order_item_total"}
-          %span= item.display_amount_with_adjustments.to_html
-
-  %tfoot
-    #subtotal{"data-hook" => "order_details_subtotal"}
-      %tr#subtotal-row.total
-        %td.text-right{colspan: "3"}
-          %strong
-            = t :order_produce
-        %td.text-right.total
-          %span= display_checkout_subtotal(order)
-
-    #order-charges{"data-hook" => "order_details_adjustments"}
-      - checkout_adjustments_for(order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
-        %tr.total
-          %td.text-right{:colspan => "3"}
-            %strong
-              = adjustment.label
-          %td.text-right.total
-            %span= adjustment.display_amount.to_html
-
-    #order-total{"data-hook" => "order_details_total"}
-      %tr.total
-        %td.text-right{colspan: "3"}
-          %h5
-            = t :order_total_price
-        %td.text-right.total
-          %h5#order_total= order.display_total.to_html
-
-    - if order.total_tax > 0
-      #tax{"data-hook" => "order_details_tax"}
-        %tr#tax-row.total
-          %td.text-right{colspan: "3"}
-            = t :order_includes_tax
-          %td.text-right.total
-            %span= display_checkout_tax_total(order)
--- a/app/views/spree/orders/edit.html.haml
+++ b/app/views/spree/orders/edit.html.haml
@@ -31,6 +31,17 @@
              .row
                = render :partial => 'form', :locals => { :order_form => order_form }

-        = render "spree/orders/form/cart_links"
+
+        .links{'data-hook' => "cart_buttons"}
+          .row
+            .columns.large-8{"data-hook" => ""}
+
+              %a.button.large.secondary{href: main_app.shop_path}
+                %i.ofn-i_008-caret-left
+                = t :orders_edit_continue
+            .columns.large-4.text-right
+              %a#checkout-link.button.large.primary{href: main_app.checkout_path}
+                = t :orders_edit_checkout
+                %i.ofn-i_007-caret-right

 = render partial: "shared/footer"
--- a/app/views/spree/orders/form/_cart_actions_row.html.haml
+++ b/app/views/spree/orders/form/_cart_actions_row.html.haml
@@ -1,10 +0,0 @@
-%tr
-  %td{colspan:"2"}
-  %td
-    = button_tag :class => 'secondary radius expand small', :id => 'update-button' do
-      %i.ofn-i_023-refresh
-      = t(:update)
-  %td
-  %td#empty-cart.text-center
-    %span#clear_cart_link{"data-hook" => ""}
-      = link_to t(:orders_form_empty_cart), empty_cart_path, method: :put, :class => 'not-bold small'
--- a/app/views/spree/orders/form/_cart_links.html.haml
+++ b/app/views/spree/orders/form/_cart_links.html.haml
@@ -1,9 +0,0 @@
-.row.links{'data-hook' => "cart_buttons"}
-  .columns.large-8{"data-hook" => ""}
-    %a.button.large.secondary{href: main_app.shop_path}
-      %i.ofn-i_008-caret-left
-      = t :orders_edit_continue
-  .columns.large-4.text-right
-    %a#checkout-link.button.large.primary{href: main_app.checkout_path}
-      = t :orders_edit_checkout
-      %i.ofn-i_007-caret-right
--- a/app/views/spree/orders/form/_update_buttons.html.haml
+++ b/app/views/spree/orders/form/_update_buttons.html.haml
@@ -1,24 +0,0 @@
-.row
-  .columns.small-12.medium-3
-    - if current_order.andand.distributor == @order.distributor
-      - if current_order.line_items.present?
-        = link_to spree.cart_path, :class => "button expand" do
-          %i.ofn-i_008-caret-left
-          = t(:order_back_to_cart)
-      - else
-        = link_to main_app.shop_path, :class => "button expand" do
-          %i.ofn-i_008-caret-left
-          = t(:order_back_to_store)
-    - else
-      &nbsp;
-  - if order.changes_allowed?
-    .columns.show-for-medium-up.medium-3 &nbsp;
-    .columns.small-12.medium-3
-      = link_to spree.cancel_order_path(@order), method: :put, :class => "button secondary expand", "confirm-link-click" => t('orders_confirm_cancel') do
-        %i.ofn-i_009-close
-        = t(:cancel_order)
-    .columns.small-12.medium-3
-      = button_tag :class => 'button primary radius expand', :id => 'update-button', "ng-disabled" => 'update_order_form.$pristine' do
-        %i.ofn-i_051-check-big
-        %span{ ng: { show: 'update_order_form.$dirty' } }= t(:save_changes)
-        %span{ ng: { hide: 'update_order_form.$dirty' } }= t(:order_saved)
--- a/app/views/spree/orders/show.html.haml
+++ b/app/views/spree/orders/show.html.haml
@@ -10,15 +10,8 @@
    .row
      .columns.large-12.text-center
        %h2
-          = t(:orders_show_order_number, number: @order.number)
-          - if @order.canceled?
-            %span.brick
-              = t(:orders_show_cancelled)
-              %i.ofn-i_009-close
-          - elsif @order.complete?
-            %span.turquoise
-              = t(:orders_show_confirmed)
-              %i.ofn-i_051-check-big
+          = t :orders_show_number
+          = " #" + @order.number

    #order{"data-hook" => ""}
      - if params.has_key? :checkout_complete
@@ -26,5 +19,12 @@

      = render 'spree/shared/order_details', order: @order

+      .row
+        .columns.large-12
+          = link_to t(:back_to_store), main_app.shop_path, :class => "button"
+          - unless params.has_key? :checkout_complete
+            - if try_spree_current_user && respond_to?(:spree_account_path)
+              = link_to t(:my_account), spree_account_path, :class => "button"
+

 = render partial: "shared/footer"
--- a/app/views/spree/products/_source.html.haml
+++ b/app/views/spree/products/_source.html.haml
@@ -1,5 +1,5 @@
 %div{:data-hook => "product_source"}
-  %h6.product-section-title= t(:supplier)
+  %h6.product-section-title SUPPLIER
  %table#product-source.table-display{:width => "100%"}
    %tbody
      - if @product.supplier
@@ -7,7 +7,7 @@
          %td= link_to @product.supplier.name, [main_app, @product.supplier]
  - if false
    %br/
-    %h6.product-section-title= t(:distributors)
+    %h6.product-section-title DISTRIBUTORS
    %table#product-source.table-display{:width => "100%"}
      %tbody
        - order = current_order(false)
@@ -18,11 +18,11 @@
              %td
                %b= link_to(distributor.name, [main_app, distributor])
              %td
-                %b= t(:current)
+                %b Current
          - elsif order.nil? || validator.can_change_to_distributor?(distributor)
            %tr.even
              %td= link_to distributor.name, [main_app, distributor]
-              %td= t(:available)
+              %td Available
          - else
            %tr.even
              %td= link_to distributor.name, [main_app, distributor]
--- a/app/views/spree/shared/_order_details.html.haml
+++ b/app/views/spree/shared/_order_details.html.haml
@@ -86,14 +86,68 @@
 %br
 .row
  .columns.large-12
-    - if order.changes_allowed?
-      .alert-box.order-summary{ "ofn-inline-alert" => true, "ng-show" => "visible" }
-        = t(:orders_changeable_orders_alert_html, oc_close: l(order.order_cycle.orders_close_at, format: "%b %d, %Y %H:%M"))
-        %a.close{ "ng-click" => "close()" } &times;
+    %table#line-items{"data-hook" => "order_details"}
+      %col{valign: "middle"}/
+      %col{halign: "center", valign: "middle", width: "5%"}/
+      %col{halign: "center", valign: "middle", width: "5%"}/
+      %col{halign: "center", valign: "middle", width: "5%"}/
+      %thead{"data-hook" => ""}
+        %tr{"data-hook" => "order_details_line_items_headers"}
+          %th= t(:item)
+          %th.price= t(:price)
+          %th.text-center.qty= t(:qty)
+          %th.text-right.total
+            %span= t(:total)
+      %tbody{"data-hook" => ""}
+        - order.line_items.each do |item|
+          %tr{"data-hook" => "order_details_line_item_row"}
+            %td(data-hook = "order_item_description")

-    = form_for order, html: {id: 'update-order', name: 'update_order_form' } do |order_form|
-      - if order.changes_allowed?
-        = render 'spree/orders/form', order_form: order_form
-      -else
-        = render 'spree/orders/summary', order: order
-      = render 'spree/orders/form/update_buttons', order: order
+              %div.item-thumb-image{"data-hook" => "order_item_image"}
+                - if item.variant.images.length == 0
+                  = link_to mini_image(item.variant.product), item.variant.product
+                - else
+                  = link_to image_tag(item.variant.images.first.attachment.url(:mini)), item.variant.product
+
+
+              = render 'spree/shared/line_item_name', line_item: item
+
+            %td.text-right.price{"data-hook" => "order_item_price"}
+              %span= item.single_display_amount_with_adjustments.to_html
+            %td.text-center{"data-hook" => "order_item_qty"}= item.quantity
+            %td.text-right.total{"data-hook" => "order_item_total"}
+              %span= item.display_amount_with_adjustments.to_html
+
+      %tfoot
+        #subtotal{"data-hook" => "order_details_subtotal"}
+          %tr#subtotal-row.total
+            %td.text-right{colspan: "3"}
+              %strong
+                = t :order_produce
+            %td.text-right.total
+              %span= display_checkout_subtotal(order)
+
+        #order-charges{"data-hook" => "order_details_adjustments"}
+          - checkout_adjustments_for(order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+            %tr.total
+              %td.text-right{:colspan => "3"}
+                %strong
+                  = adjustment.label
+              %td.text-right.total
+                %span= adjustment.display_amount.to_html
+
+        #order-total{"data-hook" => "order_details_total"}
+          %tr.total
+            %td.text-right{colspan: "3"}
+              %h5
+                = t :order_total_price
+            %td.text-right.total
+              %h5#order_total= order.display_total.to_html
+
+        - if order.total_tax > 0
+          #tax{"data-hook" => "order_details_tax"}
+            %tr#tax-row.total
+              %td.text-right{colspan: "3"}
+                = t :order_includes_tax
+              %td.text-right.total
+                %span= display_checkout_tax_total(order)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Transifex-Openfoodnetwork	6a5e4bb592	Updating translations for config/locales/sv.yml [skip ci]	2017-04-30 23:38:53 +10:00
Transifex-Openfoodnetwork	507e12adba	Updating translations for config/locales/fr.yml [skip ci]	2017-04-20 22:05:19 +10:00
Transifex-Openfoodnetwork	5fa45c0716	Updating translations for config/locales/es.yml [skip ci]	2017-04-08 01:22:10 +10:00