raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-04 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display only per_item fees for oc incoming exchange #11326

Browse Source 
Add per_item param to EnterpriseFee angular service and rails controller
This commit is contained in:
Abdul Aziz Ali
2024-06-12 08:29:34 +08:00
parent 94e3eee793
commit e537bda9b7
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
View File

@@ -5,7 +5,7 @@ angular.module('admin.orderCycles')
order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
$scope.order_cycle = OrderCycle.load(order_cycle_id)
$scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
$scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
$scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id, per_item: true)
$scope.removeCoordinatorFee = ($event, index) ->
$event.preventDefault()
@@ -25,4 +25,4 @@ angular.module('admin.orderCycles')
if $scope.order_cycle_form?.$dirty
t('admin.unsaved_confirm_leave')
NavigationCheck.register(warnAboutUnsavedChanges)
NavigationCheck.register(warnAboutUnsavedChanges)

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

@@ -6,6 +6,8 @@ angular.module('admin.orderCycles').factory('EnterpriseFee', ($resource) ->
params:
order_cycle_id: '@order_cycle_id'
coordinator_id: '@coordinator_id'
per_item: '@per_item'
per_order: '@per_order'
})
{

6
app/controllers/admin/enterprise_fees_controller.rb
View File

@@ -65,7 +65,11 @@ module Admin
order_cycle ||= OrderCycle.new(coordinator:) if coordinator.present?
enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user,
order_cycle).visible_enterprises
EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')
EnterpriseFee.for_enterprises(enterprises)
.order('enterprise_id', 'fee_type', 'name')
.yield_self { |fees| params[:per_item] ? fees.per_item : fees }
.yield_self { |fees| params[:per_order] ? fees.per_order : fees }
else
collection = EnterpriseFee.managed_by(spree_current_user).order('enterprise_id',
'fee_type', 'name')