raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load enterprise fees in controllers

Browse Source
This commit is contained in:
Rohan Mitchell
2013-07-29 17:33:05 +10:00
parent 93e7ac53ad
commit 13a1809d6c
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/order_cycle.js.erb.coffee
View File

@@ -1,7 +1,8 @@
angular.module('order_cycle', ['ngResource'])
.controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', ($scope, OrderCycle, Enterprise) ->
.controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
$scope.enterprises = Enterprise.index()
$scope.supplied_products = Enterprise.supplied_products
$scope.enterprise_fees = EnterpriseFee.index()
$scope.order_cycle = OrderCycle.order_cycle
@@ -36,9 +37,10 @@ angular.module('order_cycle', ['ngResource'])
OrderCycle.create()
])
.controller('AdminEditOrderCycleCtrl', ['$scope', '$location', 'OrderCycle', 'Enterprise', ($scope, $location, OrderCycle, Enterprise) ->
.controller('AdminEditOrderCycleCtrl', ['$scope', '$location', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
$scope.enterprises = Enterprise.index()
$scope.supplied_products = Enterprise.supplied_products
$scope.enterprise_fees = EnterpriseFee.index()
order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
$scope.order_cycle = OrderCycle.load(order_cycle_id)

4
app/views/admin/order_cycles/_form.html.haml
View File

@@ -58,5 +58,9 @@
%h2 Debug information
%pre order_cycle = {{ order_cycle | json }}
%hr/
%pre enterprises = {{ enterprises | json }}
%hr/
%pre enterprise_fees = {{ enterprise_fees | json }}
%hr/
%pre supplied_products = {{ supplied_products | json }}

18
spec/javascripts/unit/order_cycle_spec.js.coffee
View File

@@ -6,6 +6,7 @@ describe 'OrderCycle controllers', ->
event = null
OrderCycle = null
Enterprise = null
EnterpriseFee = null
beforeEach ->
scope = {}
@@ -24,10 +25,12 @@ describe 'OrderCycle controllers', ->
index: jasmine.createSpy('index').andReturn('enterprises list')
supplied_products: 'supplied products'
totalVariants: jasmine.createSpy('totalVariants').andReturn('variants total')
EnterpriseFee =
index: jasmine.createSpy('index').andReturn('enterprise fees list')
module('order_cycle')
inject ($controller) ->
ctrl = $controller 'AdminCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise}
ctrl = $controller 'AdminCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee}
it 'Loads enterprises and supplied products', ->
@@ -35,6 +38,10 @@ describe 'OrderCycle controllers', ->
expect(scope.enterprises).toEqual('enterprises list')
expect(scope.supplied_products).toEqual('supplied products')
it 'Loads enterprise fees', ->
expect(EnterpriseFee.index).toHaveBeenCalled()
expect(scope.enterprise_fees).toEqual('enterprise fees list')
it 'Loads order cycles', ->
expect(scope.order_cycle).toEqual('my order cycle')
@@ -82,6 +89,7 @@ describe 'OrderCycle controllers', ->
location = null
OrderCycle = null
Enterprise = null
EnterpriseFee = null
beforeEach ->
scope = {}
@@ -103,16 +111,22 @@ describe 'OrderCycle controllers', ->
index: jasmine.createSpy('index').andReturn('enterprises list')
supplied_products: 'supplied products'
totalVariants: jasmine.createSpy('totalVariants').andReturn('variants total')
EnterpriseFee =
index: jasmine.createSpy('index').andReturn('enterprise fees list')
module('order_cycle')
inject ($controller) ->
ctrl = $controller 'AdminEditOrderCycleCtrl', {$scope: scope, $location: location, OrderCycle: OrderCycle, Enterprise: Enterprise}
ctrl = $controller 'AdminEditOrderCycleCtrl', {$scope: scope, $location: location, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee}
it 'Loads enterprises and supplied products', ->
expect(Enterprise.index).toHaveBeenCalled()
expect(scope.enterprises).toEqual('enterprises list')
expect(scope.supplied_products).toEqual('supplied products')
it 'Loads enterprise fees', ->
expect(EnterpriseFee.index).toHaveBeenCalled()
expect(scope.enterprise_fees).toEqual('enterprise fees list')
it 'Loads order cycles', ->
expect(OrderCycle.load).toHaveBeenCalledWith('27')