From 43e6d1b933f6036aea4b933fe487f56afa93adcc Mon Sep 17 00:00:00 2001 From: Nihal Date: Thu, 9 Sep 2021 16:32:45 +0530 Subject: [PATCH] Show order total in Delivery/Payment Method reports instead of first payment --- lib/open_food_network/order_cycle_management_report.rb | 4 ++-- .../open_food_network/order_cycle_management_report_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index 1fa9b7a462..b08dec9726 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -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] diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb index 25f848dbf9..435b799ceb 100644 --- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb +++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb @@ -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