From 9bd76df11695c99d1b01672b6d3626fcfece2cde Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 2 May 2014 12:52:51 +1000 Subject: [PATCH] That wasn't actually a bug! Sorry --- app/controllers/shop/shop_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shop/shop_controller.rb b/app/controllers/shop/shop_controller.rb index 7b9956cbee..95d18a0e2e 100644 --- a/app/controllers/shop/shop_controller.rb +++ b/app/controllers/shop/shop_controller.rb @@ -34,7 +34,7 @@ class Shop::ShopController < BaseController @order_cycles = OrderCycle.with_distributor(@distributor).active # And default to the only order cycle if there's only the one - if @order_cycles.count == 1 and current_order_cycle.nil? + if @order_cycles.count == 1 current_order(true).set_order_cycle! @order_cycles.first end end