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

Merge pull request #7994 from jibees/5472-add-OC-coordinator-to-list-of-enterprises-fees

Browse Source 
Add order cycle coordinator to the list of enterprises with fees for order cycle incoming products form
This commit is contained in:
Matt-Yorkley
2021-07-29 19:29:00 +02:00
committed by GitHub
parent b22bcd46ff 2116779527
commit f18d075220
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee
View File

@@ -18,7 +18,7 @@ angular.module('admin.orderCycles')
OrderCycle.exchangeDirection(exchange)
$scope.enterprisesWithFees = ->
$scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
$scope.enterprises[id] for id in [OrderCycle.participatingEnterpriseIds()..., [OrderCycle.order_cycle.coordinator_id]...] when $scope.enterpriseFeesForEnterprise(id).length > 0
$scope.removeExchange = ($event, exchange) ->
$event.preventDefault()

6
spec/javascripts/unit/admin/order_cycles/controllers/order_cycle_exchanges_controller_spec.js.coffee
View File

@@ -17,6 +17,8 @@ describe 'AdminOrderCycleExchangesCtrl', ->
absUrl: ->
'example.com/admin/order_cycles/27/edit'
OrderCycle =
order_cycle:
coordinator_id: 4
exchangeSelectedVariants: jasmine.createSpy('exchangeSelectedVariants').and.returnValue('variants selected')
exchangeDirection: jasmine.createSpy('exchangeDirection').and.returnValue('exchange direction')
removeExchange: jasmine.createSpy('removeExchange')
@@ -48,10 +50,12 @@ describe 'AdminOrderCycleExchangesCtrl', ->
1: {id: 1, name: 'Eaterprises'}
2: {id: 2, name: 'Pepper Tree Place'}
3: {id: 3, name: 'South East'}
4: {id: 4, name: 'coordinator'}
OrderCycle.participatingEnterpriseIds = jasmine.createSpy('participatingEnterpriseIds').and.returnValue([2])
EnterpriseFee.enterprise_fees = [ {enterprise_id: 2} ] # Pepper Tree Place has a fee
expect(scope.enterprisesWithFees()).toEqual([
{id: 2, name: 'Pepper Tree Place'}
{id: 2, name: 'Pepper Tree Place'},
{id: 4, name: 'coordinator'}
])
it 'Removes order cycle exchanges', ->