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

Add load all prouducts button to list of exchange products

Browse Source
This commit is contained in:
luisramos0
2019-11-21 13:14:30 +00:00
parent cfe3f72d0e
commit 0416521772
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,12 +44,18 @@ angular.module('admin.orderCycles')
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) ->
ExchangeProduct.index params, (products, last_page) ->
enterprise.last_page = last_page
enterprise.supplied_products = [] unless enterprise.supplied_products?
enterprise.supplied_products.push products...
$scope.loadMoreExchangeProducts = ->
$scope.loadExchangeProducts(this.exchange, this.enterprises[this.exchange.enterprise_id].last_page_loaded + 1)
$scope.loadExchangeProducts(this.exchange, $scope.enterprises[this.exchange.enterprise_id].last_page_loaded + 1)
$scope.loadAllExchangeProducts = ->
enterprise = $scope.enterprises[this.exchange.enterprise_id]
for page_to_load in [(enterprise.last_page_loaded + 1)..enterprise.last_page]
$scope.loadExchangeProducts(this.exchange, page_to_load)
# initialize exchange products panel if not yet done
$scope.exchangeProdutsPanelInitialized = []

2
app/assets/javascripts/admin/order_cycles/services/exchange_product.js.coffee
View File

@@ -10,7 +10,7 @@ angular.module('admin.orderCycles').factory('ExchangeProduct', ($resource) ->
index: (params={}, callback=null) ->
ExchangeProductResource.index params, (data) =>
@loaded = true
(callback || angular.noop)(data.products)
(callback || angular.noop)(data.products, data.pagination.pages)
countVariants: (params={}, callback=null) ->
ExchangeProductResource.variant_count params, (data) =>

2
app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
View File

@@ -29,3 +29,5 @@
.pagination
.button{ 'ng-click' => 'loadMoreExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_more_products' | t }}
.button{ 'ng-click' => 'loadAllExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_all_products' | t }}

2
app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml
View File

@@ -30,3 +30,5 @@
.pagination
.button{ 'ng-click' => 'loadMoreExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_more_products' | t }}
.button{ 'ng-click' => 'loadAllExchangeProducts()' }
{{ 'js.admin.panels.exchange_products.load_all_products' | t }}

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

@@ -35,10 +35,10 @@
- if type == 'supplier'
%tr.panel-row{ object: "exchange",
panels: "{products: 'exchange_supplied_products'}",
locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts",
locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts",
colspan: 4 }
- if type == 'distributor'
%tr.panel-row{ object: "exchange",
panels: "{products: 'exchange_distributed_products', tags: 'exchange_tags'}",
locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts",
locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts",
colspan: 5 }

1
config/locales/en.yml
View File

@@ -2562,6 +2562,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
resolve: Resolve
exchange_products:
load_more_products: "Load More Products"
load_all_products: "Load All Products"
tag_rules:
shipping_method_tagged_top: "Shipping methods tagged"
shipping_method_tagged_bottom: "are:"