From 0874f12797fc6fe2982fbaed7a98dec8cf091e46 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 5 Apr 2013 14:30:11 +1100 Subject: [PATCH] Controllers provide current order cycle for product splitting --- app/controllers/spree/home_controller_decorator.rb | 3 ++- app/controllers/spree/products_controller_decorator.rb | 3 ++- app/controllers/spree/taxons_controller_decorator.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/spree/home_controller_decorator.rb b/app/controllers/spree/home_controller_decorator.rb index ba605ceca0..73a5285a42 100644 --- a/app/controllers/spree/home_controller_decorator.rb +++ b/app/controllers/spree/home_controller_decorator.rb @@ -2,9 +2,10 @@ require 'open_food_web/split_products_by_distribution' Spree::HomeController.class_eval do include EnterprisesHelper + include OrderCyclesHelper include OpenFoodWeb::SplitProductsByDistribution respond_override :index => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor, current_order_cycle } } } end diff --git a/app/controllers/spree/products_controller_decorator.rb b/app/controllers/spree/products_controller_decorator.rb index e9a99b7a5d..e0bd97806f 100644 --- a/app/controllers/spree/products_controller_decorator.rb +++ b/app/controllers/spree/products_controller_decorator.rb @@ -2,10 +2,11 @@ require 'open_food_web/split_products_by_distribution' Spree::ProductsController.class_eval do include EnterprisesHelper + include OrderCyclesHelper include OpenFoodWeb::SplitProductsByDistribution respond_override :index => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor, current_order_cycle } } } end diff --git a/app/controllers/spree/taxons_controller_decorator.rb b/app/controllers/spree/taxons_controller_decorator.rb index 9577df246e..7077f2b604 100644 --- a/app/controllers/spree/taxons_controller_decorator.rb +++ b/app/controllers/spree/taxons_controller_decorator.rb @@ -2,9 +2,10 @@ require 'open_food_web/split_products_by_distribution' Spree::TaxonsController.class_eval do include EnterprisesHelper + include OrderCyclesHelper include OpenFoodWeb::SplitProductsByDistribution respond_override :show => { :html => { :success => lambda { - @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor + @products, @products_local, @products_remote = split_products_by_distribution @products, current_distributor, current_order_cycle } } } end