From aa170ef5f6dc29d01ee3e2d3d583d3d89e280d9b Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Fri, 27 Mar 2015 11:29:02 +1100
Subject: [PATCH] Order cycle simple create controller uses 'new' method on OC
 service to initialise

---
 .../order_cycles/controllers/simple_create.js.coffee   |  3 ++-
 .../order_cycles/controllers/simple_create.js.coffee   | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
index 42b3b69fdc..cd61fffa1b 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -1,8 +1,9 @@
 angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
+  # TODO: make this a get method, which only fetches one enterprise
   $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
     $scope.init(enterprises)
   $scope.enterprise_fees = EnterpriseFee.index()
-  $scope.order_cycle = OrderCycle.order_cycle
+  $scope.order_cycle = OrderCycle.new({coordinator_id: ocInstance.coordinator_id})
 
   $scope.init = (enterprises) ->
     enterprise = enterprises[Object.keys(enterprises)[0]]
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
index d2111ca010..0f1e043467 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
@@ -9,14 +9,18 @@ describe "AdminSimpleCreateOrderCycleCtrl", ->
 
   beforeEach ->
     scope = {}
+    order_cycle =
+      coordinator_id: 123
+      incoming_exchanges: [incoming_exchange]
+      outgoing_exchanges: [outgoing_exchange]
     OrderCycle =
-      order_cycle:
-        incoming_exchanges: [incoming_exchange]
-        outgoing_exchanges: [outgoing_exchange]
+      order_cycle: order_cycle
       addSupplier: jasmine.createSpy()
       addDistributor: jasmine.createSpy()
       setExchangeVariants: jasmine.createSpy()
+      new: jasmine.createSpy().andReturn order_cycle
     Enterprise =
+      get: jasmine.createSpy().andReturn {id: 123}
       index: jasmine.createSpy()
       suppliedVariants: jasmine.createSpy().andReturn('supplied variants')
     EnterpriseFee =