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

optimize total_excl_tax & enterprise_fee_adjustemnt_ids

Browse Source
This commit is contained in:
Mohamed ABDELLANI
2023-06-15 09:49:55 +01:00
parent 10fc816bba
commit 3e61830b40
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb
View File

@@ -222,11 +222,9 @@ module Reporting
end
def total_excl_tax(query_result_row)
order_id = order(query_result_row).id
enterpise_fee_id = enterprise_fee_id(query_result_row)
amount = Spree::Adjustment.enterprise_fee
.where(order_id: order_id)
.where(originator_id: enterpise_fee_id)
.where(order: order(query_result_row))
.where(originator_id: enterprise_fee_id(query_result_row))
.pick("sum(amount)") || 0
amount - tax(query_result_row, all: true, included: true)
end
@@ -264,11 +262,9 @@ module Reporting
end
def enterprise_fee_adjustemnt_ids(query_result_row)
order_id = order(query_result_row).id
enterpise_fee_id = enterprise_fee_id(query_result_row)
Spree::Adjustment.enterprise_fee
.where(order_id: order_id)
.where(originator_id: enterpise_fee_id)
.where(order: order(query_result_row))
.where(originator_id: enterprise_fee_id(query_result_row))
.pluck(:id)
end