From 295da25dd23aef786b845eee8ecf26025bee2e2c Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 30 Apr 2015 17:17:28 +1000
Subject: [PATCH 01/15] insert clone after cloned product

---
 .../javascripts/admin/services/bulk_products.js.coffee      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/services/bulk_products.js.coffee b/app/assets/javascripts/admin/services/bulk_products.js.coffee
index d898356846..6085d48fcc 100644
--- a/app/assets/javascripts/admin/services/bulk_products.js.coffee
+++ b/app/assets/javascripts/admin/services/bulk_products.js.coffee
@@ -19,7 +19,7 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher)
         # when a respond_overrride for the clone action is used.
         id = data.product.id
         dataFetcher("/api/products/" + id + "?template=bulk_show").then (newProduct) =>
-          @addProducts [newProduct]
+          @insertProductAfter(product, newProduct)
 
     updateVariantLists: (serverProducts, productsWithUnsavedVariants) ->
       for product in productsWithUnsavedVariants
@@ -39,6 +39,10 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher)
         @unpackProduct product
         @products.push product
 
+    insertProductAfter: (product, newProduct) ->
+      index = @products.indexOf(product)
+      @products.splice(index + 1, 0, newProduct)
+
     unpackProduct: (product) ->
       #$scope.matchProducer product
       @loadVariantUnit product

From 66f847f673cd47c82238b094f7620a7c4ab1e983 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 30 Apr 2015 17:22:54 +1000
Subject: [PATCH 02/15] showing save button at the bottom as well

---
 app/views/spree/admin/products/bulk_edit.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index f230d1c331..383e080177 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -8,3 +8,4 @@
   = render 'spree/admin/products/bulk_edit/actions'
   = render 'spree/admin/products/bulk_edit/indicators'
   = render 'spree/admin/products/bulk_edit/products'
+  = render 'spree/admin/products/bulk_edit/actions'

From baabb5c07fa11d94a9ddbff464bdcf929152e823 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Fri, 1 May 2015 11:30:26 +1000
Subject: [PATCH 03/15] fixing BPE feature spec

---
 .../spree/admin/products/bulk_edit.html.haml  |  2 +-
 .../bulk_edit/_save_button_row.html.haml      |  3 ++
 .../admin/bulk_product_update_spec.rb         | 28 +++++++++----------
 3 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 app/views/spree/admin/products/bulk_edit/_save_button_row.html.haml

diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 383e080177..22b0a195da 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -8,4 +8,4 @@
   = render 'spree/admin/products/bulk_edit/actions'
   = render 'spree/admin/products/bulk_edit/indicators'
   = render 'spree/admin/products/bulk_edit/products'
-  = render 'spree/admin/products/bulk_edit/actions'
+  = render 'spree/admin/products/bulk_edit/save_button_row'
diff --git 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
new file mode 100644
index 0000000000..a5f18986c0
--- /dev/null
+++ b/app/views/spree/admin/products/bulk_edit/_save_button_row.html.haml
@@ -0,0 +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 => 'Save Changes', 'ng-click' => 'submitProducts()'}
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index ac101da5d9..089f3188f7 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -266,7 +266,7 @@ feature %q{
     fill_in "variant_display_as", with: "Case"
     fill_in "variant_price", with: "4.0"
     fill_in "variant_on_hand", with: "10"
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     updated_variant = Spree::Variant.where(deleted_at: nil).last
@@ -325,7 +325,7 @@ feature %q{
       fill_in "product_sku", with: "NEW SKU"
     end
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     p.reload
@@ -354,7 +354,7 @@ feature %q{
     select "Items", from: "variant_unit_with_scale"
     fill_in "variant_unit_name", with: "loaf"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     p.reload
@@ -377,7 +377,7 @@ feature %q{
     first("a.view-variants").trigger('click')
     fill_in "variant_unit_value_with_description", with: '123 abc'
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     p.reload
@@ -402,7 +402,7 @@ feature %q{
       select "Weight (kg)", from: "variant_unit_with_scale"
       fill_in "master_unit_value_with_description", with: '123 abc'
 
-      click_button 'Save Changes'
+      first(:button, 'Save Changes').click
       expect(page.find("#status-message")).to have_content "Changes saved."
 
       p.reload
@@ -450,7 +450,7 @@ feature %q{
 
     expect(page).to have_selector "span[name='on_hand']", text: "10"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     v.reload
@@ -474,7 +474,7 @@ feature %q{
 
     fill_in "variant_price", with: "10.0"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
 
     v.reload
@@ -491,21 +491,21 @@ feature %q{
 
     fill_in "product_name", with: "new name 1"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
     p.reload
     expect(p.name).to eq "new name 1"
 
     fill_in "product_name", with: "new name 2"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
     p.reload
     expect(p.name).to eq "new name 2"
 
     fill_in "product_name", with: "original name"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
     p.reload
     expect(p.name).to eq "original name"
@@ -521,7 +521,7 @@ feature %q{
 
     fill_in "product_name", :with => "new product name"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
     p.reload
     expect(p.name).to eq "new product name"
@@ -534,7 +534,7 @@ feature %q{
 
       visit '/admin/products/bulk_edit'
 
-      click_button 'Save Changes'
+      first(:button, 'Save Changes').click
       expect(page.find("#status-message")).to have_content "No changes to save."
     end
   end
@@ -553,7 +553,7 @@ feature %q{
     expect(page).to have_no_field "product_name", with: p2.name
     fill_in "product_name", :with => "new product1"
 
-    click_button 'Save Changes'
+    first(:button, 'Save Changes').click
     expect(page.find("#status-message")).to have_content "Changes saved."
     p1.reload
     expect(p1.name).to eq "new product1"
@@ -829,7 +829,7 @@ feature %q{
         fill_in "display_as", with: "Big Bag"
       end
 
-      click_button 'Save Changes'
+      first(:button, 'Save Changes').click
       expect(page.find("#status-message")).to have_content "Changes saved."
 
       p.reload

From 993183f2f57b79c8d3d981e60a4d47fde759df60 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Fri, 1 May 2015 15:04:12 +1000
Subject: [PATCH 04/15] updating js spec: cloning product calls
 insertProductAfter now

---
 .../unit/admin/services/bulk_products_spec.js.coffee            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee b/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
index 70c22c80e0..0b3c0841a6 100644
--- a/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
+++ b/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
@@ -61,7 +61,7 @@ describe "BulkProducts service", ->
       clonedProduct =
         id: 17
 
-      spyOn(BulkProducts, "addProducts")
+      spyOn(BulkProducts, "insertProductAfter")
       BulkProducts.products = [originalProduct]
       $httpBackend.expectGET("/admin/products/oranges/clone.json").respond 200,
         product: clonedProduct

From 6b956a8a38c904347fd95a482b80f12eed3a1377 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 20 May 2015 10:19:37 +1000
Subject: [PATCH 05/15] Updating product clone spec

---
 .../unit/admin/services/bulk_products_spec.js.coffee            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee b/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
index 0b3c0841a6..54b57aed48 100644
--- a/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
+++ b/spec/javascripts/unit/admin/services/bulk_products_spec.js.coffee
@@ -68,7 +68,7 @@ describe "BulkProducts service", ->
       $httpBackend.expectGET("/api/products/17?template=bulk_show").respond 200, clonedProduct
       BulkProducts.cloneProduct BulkProducts.products[0]
       $httpBackend.flush()
-      expect(BulkProducts.addProducts).toHaveBeenCalledWith [clonedProduct]
+      expect(BulkProducts.insertProductAfter).toHaveBeenCalledWith originalProduct, clonedProduct
 
 
   describe "preparing products", ->

From 828456118b23429d9c48696fb88e4fdc08d5f697 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 20 May 2015 11:15:18 +1000
Subject: [PATCH 06/15] Remove forgotten binding.pry

---
 app/models/spree/ability_decorator.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/spree/ability_decorator.rb b/app/models/spree/ability_decorator.rb
index 7bc6fb6535..e652825911 100644
--- a/app/models/spree/ability_decorator.rb
+++ b/app/models/spree/ability_decorator.rb
@@ -154,7 +154,6 @@ class AbilityDecorator
     can [:admin, :index, :read, :create, :edit, :update, :fire], Spree::ReturnAuthorization
     can [:destroy], Spree::Adjustment do |adjustment|
       # Sharing code with destroying a line item. This should be unified and probably applied for other actions as well.
-      binding.pry
       if user.admin?
         true
       elsif adjustment.adjustable.instance_of? Spree::Order

From 0a0bb67277ed6ee1572b71fe6317320ad4663444 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 20 May 2015 14:05:14 +1000
Subject: [PATCH 07/15] No SKU for cloned products. Community topic 175

---
 app/models/spree/product_decorator.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 7846a0c1e1..fcaf30c44c 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -108,6 +108,12 @@ Spree::Product.class_eval do
 
   # -- Methods
 
+  # Called by Spree::Product::duplicate before saving.
+  def duplicate_extra(parent)
+    # Spree sets the SKU to "COPY OF #{parent sku}".
+    self.master.sku = ''
+  end
+
   def properties_including_inherited
     # Product properties override producer properties
     ps = product_properties.all

From 6953f6193974f404ee6058a195e73f4100675b1c Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 20 May 2015 15:07:22 +1000
Subject: [PATCH 08/15] bulk product edit: new col "on demand"

---
 app/assets/javascripts/admin/bulk_product_update.js.coffee    | 4 ++++
 .../spree/admin/products/bulk_edit/_products_head.html.haml   | 2 ++
 .../admin/products/bulk_edit/_products_product.html.haml      | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 8cac0abeda..673197ae6d 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -10,6 +10,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       unit:                 {name: "Unit",                  visible: true}
       price:                {name: "Price",                 visible: true}
       on_hand:              {name: "On Hand",               visible: true}
+      on_demand:            {name: "On Demand",             visible: false}
       category:             {name: "Category",              visible: false}
       inherits_properties:  {name: "Inherits Properties?",  visible: false}
       available_on:         {name: "Available On",          visible: false}
@@ -309,6 +310,9 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
+        if product.hasOwnProperty("on_demand")
+          filteredProduct.on_demand = product.on_demand
+          hasUpdatableProperty = true
         if product.hasOwnProperty("category_id")
           filteredProduct.primary_taxon_id = product.category_id
           hasUpdatableProperty = true
diff --git a/app/views/spree/admin/products/bulk_edit/_products_head.html.haml b/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
index 2e37da2bc8..18bd000473 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
@@ -7,6 +7,7 @@
   %col.display_as{ ng: { show: 'columns.unit.visible' } }
   %col.price{ ng: { show: 'columns.price.visible'} }
   %col.on_hand{ ng: { show: 'columns.on_hand.visible' } }
+  %col.on_demand{ ng: { show: 'columns.on_demand.visible' } }
   %col.category{ ng: { show: 'columns.category.visible' } }
   %col.inherits_properties{ ng: { show: 'columns.inherits_properties.visible' } }
   %col.available_on{ ng: { show: 'columns.available_on.visible' } }
@@ -24,6 +25,7 @@
     %th.display_as{ 'ng-show' => 'columns.unit.visible' } Display As
     %th.price{ 'ng-show' => 'columns.price.visible' } Price
     %th.on_hand{ 'ng-show' => 'columns.on_hand.visible' } On Hand
+    %th.on_demand{ 'ng-show' => 'columns.on_demand.visible' } On Demand
     %th.category{ 'ng-show' => 'columns.category.visible' } Category
     %th.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' } Inherits Properties?
     %th.available_on{ 'ng-show' => 'columns.available_on.visible' } Av. On
diff --git a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
index 0eb9ff5f58..48564991dd 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
@@ -20,6 +20,8 @@
   %td.on_hand{ 'ng-show' => 'columns.on_hand.visible' }
     %span{ 'ng-bind' => 'product.on_hand', :name => 'on_hand', 'ng-show' => '!hasOnDemandVariants(product) && (hasVariants(product) || product.on_demand)' }
     %input.field{ 'ng-model' => 'product.on_hand', :name => 'on_hand', 'ofn-track-product' => 'on_hand', 'ng-hide' => 'hasVariants(product) || product.on_demand', :type => 'number' }
+  %td.on_demand{ 'ng-show' => 'columns.on_demand.visible' }
+    %input.field{ 'ng-model' => 'product.on_demand', :name => 'on_demand', 'ofn-track-product' => 'on_demand', :type => 'checkbox' }
   %td.category{ 'ng-if' => 'columns.category.visible' }
     %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.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' }

From 1e26466d119134a48cf73c5bee87d4215bbb47ee Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 20 May 2015 15:29:35 +1000
Subject: [PATCH 09/15] bulk product edit: "on demand" for new product

---
 .../admin/products/new/replace_form.html.haml.deface   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
index 33c70b728e..3fd5a74cb1 100644
--- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
+++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
@@ -38,20 +38,26 @@
     .twelve.columns.alpha
       .six.columns.alpha
         = render 'spree/admin/products/primary_taxon_form', f: f
-      .three.columns
+      .two.columns
         = f.field_container :price do
           = f.label :price, t(:price)
           %span.required *
           %br/
           = f.text_field :price, class: 'fullwidth'
           = f.error_message_on :price
-      .three.columns.omega
+      .two.columns
         = f.field_container :on_hand do
           = f.label :on_hand, t(:on_hand)
           %span.required *
           %br/
           = f.text_field :on_hand, class: 'fullwidth'
           = f.error_message_on :on_hand
+      .two.columns.omega
+        = f.field_container :on_demand do
+          = f.label :on_demand, t(:on_demand)
+          %br/
+          = f.check_box :on_demand
+          = f.error_message_on :on_demand
     .twelve.columns.alpha
       .six.columns.alpha &nbsp;
       .three.columns

From 19367670845a9bc63a619bee11dd27af6be283bd Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 21 May 2015 11:06:08 +1000
Subject: [PATCH 10/15] BPE: new col for tax category

---
 app/assets/javascripts/admin/bulk_product_update.js.coffee | 7 ++++++-
 app/helpers/admin/injection_helper.rb                      | 4 ++++
 app/serializers/api/admin/product_serializer.rb            | 2 +-
 app/serializers/api/admin/tax_category_serializer.rb       | 3 +++
 app/views/spree/admin/products/bulk_edit/_data.html.haml   | 1 +
 .../admin/products/bulk_edit/_products_head.html.haml      | 2 ++
 .../admin/products/bulk_edit/_products_product.html.haml   | 3 +++
 7 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/serializers/api/admin/tax_category_serializer.rb

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 673197ae6d..5098152551 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, tax_categories) ->
     $scope.loading = true
 
     $scope.StatusMessage = StatusMessage
@@ -12,6 +12,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       on_hand:              {name: "On Hand",               visible: true}
       on_demand:            {name: "On Demand",             visible: false}
       category:             {name: "Category",              visible: false}
+      tax_category:         {name: "Tax Category",          visible: false}
       inherits_properties:  {name: "Inherits Properties?",  visible: false}
       available_on:         {name: "Available On",          visible: false}
 
@@ -33,6 +34,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
     $scope.producers = producers
     $scope.taxons = Taxons.taxons
+    $scope.tax_categories = tax_categories
     $scope.filterProducers = [{id: "0", name: ""}].concat $scope.producers
     $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons
     $scope.producerFilter = "0"
@@ -316,6 +318,9 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("category_id")
           filteredProduct.primary_taxon_id = product.category_id
           hasUpdatableProperty = true
+        if product.hasOwnProperty("tax_category_id")
+          filteredProduct.tax_category_id = product.tax_category_id
+          hasUpdatableProperty = true
         if product.hasOwnProperty("inherits_properties")
           filteredProduct.inherits_properties = product.inherits_properties
           hasUpdatableProperty = true
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 36ddccdb9a..961bc60afb 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -50,6 +50,10 @@ module Admin
       admin_inject_json_ams_array "ofn.admin", "products", @products, Api::Admin::ProductSerializer
     end
 
+    def admin_inject_tax_categories
+      admin_inject_json_ams_array "ofn.admin", "tax_categories", @tax_categories, Api::Admin::TaxCategorySerializer
+    end
+
     def admin_inject_taxons
       admin_inject_json_ams_array "admin.taxons", "taxons", @taxons, Api::Admin::TaxonSerializer
     end
diff --git a/app/serializers/api/admin/product_serializer.rb b/app/serializers/api/admin/product_serializer.rb
index b1f233c044..65dd34ba6b 100644
--- a/app/serializers/api/admin/product_serializer.rb
+++ b/app/serializers/api/admin/product_serializer.rb
@@ -1,7 +1,7 @@
 class Api::Admin::ProductSerializer < ActiveModel::Serializer
   attributes :id, :name, :sku, :variant_unit, :variant_unit_scale, :variant_unit_name, :on_demand, :inherits_properties
 
-  attributes :on_hand, :price, :available_on, :permalink_live
+  attributes :on_hand, :price, :available_on, :permalink_live, :tax_category_id
 
   has_one :supplier, key: :producer_id, embed: :id
   has_one :primary_taxon, key: :category_id, embed: :id
diff --git a/app/serializers/api/admin/tax_category_serializer.rb b/app/serializers/api/admin/tax_category_serializer.rb
new file mode 100644
index 0000000000..37e99578b8
--- /dev/null
+++ b/app/serializers/api/admin/tax_category_serializer.rb
@@ -0,0 +1,3 @@
+class Api::Admin::TaxCategorySerializer < ActiveModel::Serializer
+  attributes :id, :name
+end
diff --git a/app/views/spree/admin/products/bulk_edit/_data.html.haml b/app/views/spree/admin/products/bulk_edit/_data.html.haml
index 8b727be3eb..3624421870 100644
--- a/app/views/spree/admin/products/bulk_edit/_data.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_data.html.haml
@@ -1,3 +1,4 @@
 = admin_inject_producers
 = admin_inject_taxons
+= admin_inject_tax_categories
 = admin_inject_spree_api_key
diff --git a/app/views/spree/admin/products/bulk_edit/_products_head.html.haml b/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
index 18bd000473..6e22aef8ff 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_head.html.haml
@@ -9,6 +9,7 @@
   %col.on_hand{ ng: { show: 'columns.on_hand.visible' } }
   %col.on_demand{ ng: { show: 'columns.on_demand.visible' } }
   %col.category{ ng: { show: 'columns.category.visible' } }
+  %col.tax_category{ ng: { show: 'columns.tax_category.visible' } }
   %col.inherits_properties{ ng: { show: 'columns.inherits_properties.visible' } }
   %col.available_on{ ng: { show: 'columns.available_on.visible' } }
   %col.actions
@@ -27,6 +28,7 @@
     %th.on_hand{ 'ng-show' => 'columns.on_hand.visible' } On Hand
     %th.on_demand{ 'ng-show' => 'columns.on_demand.visible' } On Demand
     %th.category{ 'ng-show' => 'columns.category.visible' } Category
+    %th.tax_category{ 'ng-show' => 'columns.tax_category.visible' } Tax Category
     %th.inherits_properties{ 'ng-show' => 'columns.inherits_properties.visible' } Inherits Properties?
     %th.available_on{ 'ng-show' => 'columns.available_on.visible' } Av. On
     %th.actions
diff --git a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
index 48564991dd..eab9936558 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
@@ -24,6 +24,9 @@
     %input.field{ 'ng-model' => 'product.on_demand', :name => 'on_demand', 'ofn-track-product' => 'on_demand', :type => 'checkbox' }
   %td.category{ 'ng-if' => 'columns.category.visible' }
     %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: ''} 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' }

From 2ed519ef50b93d1b6c6d0c743533cd6da8fa981b Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 21 May 2015 12:37:10 +1000
Subject: [PATCH 11/15] on_demand checkbox for variants

---
 app/assets/javascripts/admin/bulk_product_update.js.coffee   | 5 ++++-
 .../admin/products/bulk_edit/_products_product.html.haml     | 2 +-
 .../admin/products/bulk_edit/_products_variant.html.haml     | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 5098152551..c902328af4 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -312,7 +312,7 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
-        if product.hasOwnProperty("on_demand")
+        if product.hasOwnProperty("on_demand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_demand = product.on_demand
           hasUpdatableProperty = true
         if product.hasOwnProperty("category_id")
@@ -346,6 +346,9 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("on_hand")
       filteredVariant.on_hand = variant.on_hand
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("on_demand")
+      filteredVariant.on_demand = variant.on_demand
+      hasUpdatableProperty = true
     if variant.hasOwnProperty("price")
       filteredVariant.price = variant.price
       hasUpdatableProperty = true
diff --git a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
index eab9936558..376e88071a 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_product.html.haml
@@ -21,7 +21,7 @@
     %span{ 'ng-bind' => 'product.on_hand', :name => 'on_hand', 'ng-show' => '!hasOnDemandVariants(product) && (hasVariants(product) || product.on_demand)' }
     %input.field{ 'ng-model' => 'product.on_hand', :name => 'on_hand', 'ofn-track-product' => 'on_hand', 'ng-hide' => 'hasVariants(product) || product.on_demand', :type => 'number' }
   %td.on_demand{ 'ng-show' => 'columns.on_demand.visible' }
-    %input.field{ 'ng-model' => 'product.on_demand', :name => 'on_demand', 'ofn-track-product' => 'on_demand', :type => 'checkbox' }
+    %input.field{ 'ng-model' => 'product.on_demand', :name => 'on_demand', 'ofn-track-product' => 'on_demand', :type => 'checkbox', 'ng-hide' => 'hasVariants(product)' }
   %td.category{ 'ng-if' => 'columns.category.visible' }
     %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' }
diff --git a/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml b/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
index 7e60cbfd4c..757b64e781 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
@@ -15,7 +15,10 @@
   %td{ 'ng-show' => 'columns.on_hand.visible' }
     %input.field{ 'ng-model' => 'variant.on_hand', 'ng-change' => 'updateOnHand(product)', :name => 'variant_on_hand', 'ng-hide' => 'variant.on_demand', 'ofn-track-variant' => 'on_hand', :type => 'number' }
     %span{ 'ng-bind' => 'variant.on_hand', :name => 'variant_on_hand', 'ng-show' => 'variant.on_demand' }
+  %td{ 'ng-show' => 'columns.on_demand.visible' }
+    %input.field{ 'ng-model' => 'variant.on_demand', :name => 'variant_on_demand', 'ofn-track-variant' => 'on_demand', :type => 'checkbox' }
   %td{ 'ng-show' => 'columns.category.visible' }
+  %td{ 'ng-show' => 'columns.tax_category.visible' }
   %td{ 'ng-show' => 'columns.inherits_properties.visible' }
   %td{ 'ng-show' => 'columns.available_on.visible' }
   %td.actions

From 73884d4f019bebb3ffc0a3df94e1341f1fc81645 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 21 May 2015 13:01:28 +1000
Subject: [PATCH 12/15] BPE: Display notice about variant overrides

---
 app/models/spree/variant_decorator.rb                            | 1 +
 app/serializers/api/admin/variant_serializer.rb                  | 1 +
 .../spree/admin/products/bulk_edit/_products_variant.html.haml   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb
index 03543793b2..f35927ccf7 100644
--- a/app/models/spree/variant_decorator.rb
+++ b/app/models/spree/variant_decorator.rb
@@ -7,6 +7,7 @@ Spree::Variant.class_eval do
 
   has_many :exchange_variants, dependent: :destroy
   has_many :exchanges, through: :exchange_variants
+  has_many :variant_overrides
 
   attr_accessible :unit_value, :unit_description, :images_attributes, :display_as, :display_name
   accepts_nested_attributes_for :images
diff --git a/app/serializers/api/admin/variant_serializer.rb b/app/serializers/api/admin/variant_serializer.rb
index 26ad2d7f37..510f7af333 100644
--- a/app/serializers/api/admin/variant_serializer.rb
+++ b/app/serializers/api/admin/variant_serializer.rb
@@ -1,6 +1,7 @@
 class Api::Admin::VariantSerializer < ActiveModel::Serializer
   attributes :id, :options_text, :unit_value, :unit_description, :unit_to_display, :on_demand, :display_as, :display_name, :name_to_display
   attributes :on_hand, :price
+  has_many :variant_overrides
 
   def on_hand
     object.on_hand.nil? ? 0 : ( object.on_hand.to_f.finite? ? object.on_hand : "On demand" )
diff --git a/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml b/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
index 757b64e781..853d8e1520 100644
--- a/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
+++ b/app/views/spree/admin/products/bulk_edit/_products_variant.html.haml
@@ -24,5 +24,6 @@
   %td.actions
     %a{ 'ng-click' => 'editWarn(product,variant)', :class => "edit-variant icon-edit no-text", 'ng-show' => "variantSaved(variant)" }
   %td.actions
+    %span.icon-warning-sign.with-tip{ 'ng-if' => 'variant.variant_overrides', title: "This variant has {{variant.variant_overrides.length}} override(s)" }
   %td.actions
     %a{ 'ng-click' => 'deleteVariant(product,variant)', :class => "delete-variant icon-trash no-text" }

From f017197221121b65866b7d7c560c0390b39a9aa6 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 21 May 2015 18:00:14 +1000
Subject: [PATCH 13/15] orders list: filter by distributor and order cycle

---
 .../spree/admin/orders_controller_decorator.rb      |  7 +++++++
 ...r_and_order_cycle_filter_inputs.html.haml.deface | 13 +++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 app/overrides/spree/admin/orders/index/add_distributor_and_order_cycle_filter_inputs.html.haml.deface

diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb
index 42e7068afc..ac3d0fa9e0 100644
--- a/app/controllers/spree/admin/orders_controller_decorator.rb
+++ b/app/controllers/spree/admin/orders_controller_decorator.rb
@@ -23,6 +23,13 @@ Spree::Admin::OrdersController.class_eval do
         distributed_by_user(spree_current_user).
         page(params[:page]).
         per(params[:per_page] || Spree::Config[:orders_per_page])
+      # Filter orders by distributor
+      if params[:distributor_ids]
+        @orders = @orders.where(distributor_id: params[:distributor_ids])
+      end
+      if params[:order_cycle_ids]
+        @orders = @orders.where(order_cycle_id: params[:order_cycle_ids])
+      end
     } } }
 
   # Overwrite to use confirm_email_for_customer instead of confirm_email.
diff --git a/app/overrides/spree/admin/orders/index/add_distributor_and_order_cycle_filter_inputs.html.haml.deface b/app/overrides/spree/admin/orders/index/add_distributor_and_order_cycle_filter_inputs.html.haml.deface
new file mode 100644
index 0000000000..f9e5e54e88
--- /dev/null
+++ b/app/overrides/spree/admin/orders/index/add_distributor_and_order_cycle_filter_inputs.html.haml.deface
@@ -0,0 +1,13 @@
+/ insert_before "div.clearfix"
+
+.field-block.alpha.eight.columns
+  = label_tag nil, t(:distributors)
+  = select_tag(:distributor_ids,
+    options_for_select(Enterprise.is_distributor.managed_by(spree_current_user).map {|e| [e.name, e.id]}, params[:distributor_ids]),
+    {class: "select2 fullwidth", multiple: true})
+
+.field-block.alpha.eight.columns
+  = label_tag nil, t(:order_cycles)
+  = select_tag(:order_cycle_ids,
+    options_for_select(OrderCycle.managed_by(spree_current_user).map {|oc| [oc.name, oc.id]}, params[:order_cycle_ids]),
+    {class: "select2 fullwidth", multiple: true})

From 7e4751cb3ae549fd3d1ad7bac8fd550ad38e9cbb Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Thu, 21 May 2015 22:30:23 +1000
Subject: [PATCH 14/15] updating bulk product js spec

---
 spec/javascripts/unit/bulk_product_update_spec.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index a6fb0fa432..6048814505 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -215,6 +215,7 @@ describe "filtering products for submission to database", ->
       variant_unit_scale: 1
       variant_unit_name: 'loaf'
       available_on: available_on
+      tax_category_id: null
       master_attributes:
         id: 2
         unit_value: 250

From 9c137ccf0faafde9f0c26fd9ad8a1b373dc7220f Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Fri, 22 May 2015 11:03:21 +1000
Subject: [PATCH 15/15] provide tax_categories in spec

---
 spec/javascripts/unit/bulk_product_update_spec.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index 6048814505..fb439f1c0c 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -239,6 +239,7 @@ describe "AdminProductEditCtrl", ->
     module ($provide)->
       $provide.value "producers", []
       $provide.value "taxons", []
+      $provide.value "tax_categories", []
       $provide.value 'SpreeApiKey', 'API_KEY'
       null