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

Merge pull request #4630 from Matt-Yorkley/product_counts

Browse Source 
Show counts including all variants in order cycle exchanges
This commit is contained in:
Luis Ramos
2020-02-13 11:33:58 +00:00
committed by GitHub
parent 323ca906bc 140e0b9cb1
commit 9d8608f210
8 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,13 +48,15 @@ angular.module('admin.orderCycles')
return if enterprise.last_page_loaded? && enterprise.last_page_loaded >= page
enterprise.last_page_loaded = page
enterprise.loaded_variants ?= 0
incoming = true if $scope.view == 'incoming'
params = { exchange_id: exchange.id, enterprise_id: exchange.enterprise_id, order_cycle_id: $scope.order_cycle.id, incoming: incoming, page: page}
ExchangeProduct.index params, (products, num_of_pages, num_of_products) ->
ExchangeProduct.index params, (products, num_of_pages) ->
enterprise.num_of_pages = num_of_pages
enterprise.num_of_products = num_of_products
enterprise.supplied_products.push products...
angular.forEach products, (product) ->
enterprise.loaded_variants += product.variants.length
$scope.loadMoreExchangeProducts = (exchange) ->
$scope.loadExchangeProducts(exchange, $scope.enterprises[exchange.enterprise_id].last_page_loaded + 1)