raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show order total in Delivery/Payment Method reports instead of first payment

Browse Source
This commit is contained in:
Nihal
2021-09-09 16:32:45 +05:30
parent 9affc6a945
commit 43e6d1b933
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/open_food_network/order_cycle_management_report.rb
View File

@@ -95,7 +95,7 @@ module OpenFoodNetwork
ba&.phone,
order.shipping_method&.name,
order.payments.first&.payment_method&.name,
order.payments.first&.amount,
order.total,
balance(order)]
end
@@ -110,7 +110,7 @@ module OpenFoodNetwork
sa.phone,
order.shipping_method&.name,
order.payments.first&.payment_method&.name,
order.payments.first&.amount,
order.total,
balance(order),
has_temperature_controlled_items?(order),
order.special_instructions]

4
spec/lib/open_food_network/order_cycle_management_report_spec.rb
View File

@@ -173,7 +173,7 @@ module OpenFoodNetwork
order.billing_address.phone,
order.shipment.shipping_method.name,
nil,
nil,
order.total,
-order.total
]])
end
@@ -200,7 +200,7 @@ module OpenFoodNetwork
order.ship_address.phone,
order.shipment.shipping_method.name,
nil,
nil,
order.total,
-order.total,
false,
order.special_instructions