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

Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees.

Browse Source
This commit is contained in:
Rohan Mitchell
2013-07-30 11:33:40 +10:00
parent dc7f8986a0
commit 24b957dc57
3 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,9 +171,7 @@ angular.module('order_cycle', ['ngResource'])
this.order_cycle
create: ->
this.removeInactiveExchanges()
oc = new OrderCycle({order_cycle: this.order_cycle})
oc = new OrderCycle({order_cycle: this.dataForSubmit()})
oc.$create (data) ->
if data['success']
$window.location = '/admin/order_cycles'
@@ -181,20 +179,30 @@ angular.module('order_cycle', ['ngResource'])
console.log('fail')
update: ->
this.removeInactiveExchanges()
oc = new OrderCycle({order_cycle: this.order_cycle})
oc = new OrderCycle({order_cycle: this.dataForSubmit()})
oc.$update {order_cycle_id: this.order_cycle.id}, (data) ->
if data['success']
$window.location = '/admin/order_cycles'
else
console.log('fail')
removeInactiveExchanges: ->
this.order_cycle.incoming_exchanges =
(exchange for exchange in this.order_cycle.incoming_exchanges when exchange.active)
this.order_cycle.outgoing_exchanges =
(exchange for exchange in this.order_cycle.outgoing_exchanges when exchange.active)
dataForSubmit: ->
data = angular.extend({}, this.order_cycle)
data = this.removeInactiveExchanges(data)
data = this.translateCoordinatorFees(data)
data
removeInactiveExchanges: (order_cycle)->
order_cycle.incoming_exchanges =
(exchange for exchange in order_cycle.incoming_exchanges when exchange.active)
order_cycle.outgoing_exchanges =
(exchange for exchange in order_cycle.outgoing_exchanges when exchange.active)
order_cycle
translateCoordinatorFees: (order_cycle)->
order_cycle.coordinator_fee_ids = (fee.id for fee in order_cycle.coordinator_fees)
delete order_cycle.coordinator_fees
order_cycle
}])
.factory('Enterprise', ['$resource', ($resource) ->