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

11768: replace order_id with order

Browse Source
This commit is contained in:
Ahmed Ejaz
2024-01-10 15:00:58 +05:00
parent cb9c2963af
commit 3a8e4d203a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,12 +234,11 @@ module Reporting
def tax(query_result_row, all: false, included: nil)
order = order(query_result_row)
order_id = order.id
adjustment_ids = enterprise_fee_adjustment_ids(query_result_row)
query = Spree::Adjustment.tax
query = query.where(included: true) unless included.nil?
query = query.where(originator_id: tax_rate_id(query_result_row)) unless all == true
tax_amount = query.where(order_id:)
tax_amount = query.where(order:)
.where(adjustable_type: 'Spree::Adjustment')
.where(adjustable_id: adjustment_ids)
.pick("sum(amount)") || 0