raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 'All' option to supplier and distributor filters

Browse Source
This commit is contained in:
Rob H
2014-01-18 14:26:07 +08:00
parent 79631ebb8e
commit 701b5aceb4
5 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/admin/bulk_order_management.js.coffee
View File

@@ -6,9 +6,12 @@ orderManagementModule.config [
provider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
]
orderManagementModule.value "blankEnterprise", ->
{ id: "", name: "All" }
orderManagementModule.controller "AdminOrderMgmtCtrl", [
"$scope", "$http", "dataFetcher"
($scope, $http, dataFetcher) ->
"$scope", "$http", "dataFetcher", "blankEnterprise"
($scope, $http, dataFetcher, blankEnterprise) ->
$scope.updateStatusMessage =
text: ""
style: {}
@@ -24,8 +27,12 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [
$http.defaults.headers.common["X-Spree-Token"] = spree_api_key
dataFetcher("/api/enterprises/managed?template=bulk_index&q[is_primary_producer_eq]=true").then (data) ->
$scope.suppliers = data
$scope.suppliers.unshift blankEnterprise()
$scope.supplierFilter = $scope.suppliers[0]
dataFetcher("/api/enterprises/managed?template=bulk_index&q[is_distributor_eq]=true").then (data) ->
$scope.distributors = data
$scope.distributors.unshift blankEnterprise()
$scope.distributorFilter = $scope.distributors[0]
$scope.fetchOrders()
else if authorise_api_reponse.hasOwnProperty("error")
$scope.api_error_msg = authorise_api_reponse("error")
@@ -62,9 +69,12 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [
break
]
orderManagementModule.filter "selectFilter", ->
return (lineItems,selectedSupplier,selectedDistributor) ->
filtered = []
filtered.push line_item for line_item in lineItems when (selectedSupplier == undefined || line_item.supplier == selectedSupplier) &&
(selectedDistributor == undefined || line_item.order.distributor == selectedDistributor)
filtered
orderManagementModule.filter "selectFilter", [
"blankEnterprise"
(blankEnterprise) ->
return (lineItems,selectedSupplier,selectedDistributor) ->
filtered = []
filtered.push line_item for line_item in lineItems when (angular.equals(selectedSupplier,blankEnterprise()) || line_item.supplier == selectedSupplier) &&
(angular.equals(selectedDistributor,blankEnterprise()) || line_item.order.distributor == selectedDistributor)
filtered
]