raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5033 from luisramos0/ent_fees_data_types

Browse Source 
[Spree 2.1] Adapt EnterpriseFeeSummary report code to slightly different rails 4 sql data conversion
This commit is contained in:
Pau Pérez Fabregat
2020-03-26 11:20:44 +01:00
committed by GitHub
parent 9daa40ce9c b33969e6a2
commit b3a47964e6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engines/order_management/app/services/order_management/reports/enterprise_fee_summary/data_representations/coordinator_fee.rb
View File

@@ -19,7 +19,7 @@ module OrderManagement
end
def inherits_tax_category?
data["enterprise_fee_inherits_tax_category"] == "t"
data["enterprise_fee_inherits_tax_category"]
end
end
end

2
engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
View File

@@ -364,7 +364,7 @@ module OrderManagement
chain_to_scope do
select(
<<-JOIN_STRING.strip_heredoc
SUM(spree_adjustments.amount) AS total_amount,
SUM(spree_adjustments.amount)::TEXT AS total_amount,
spree_payment_methods.name AS payment_method_name,
spree_shipping_methods.name AS shipping_method_name,
hubs.name AS hub_name,