From 7eb2dfba48af677b8350a9f7ac8446a270eb4295 Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Tue, 4 Oct 2016 16:56:58 +0100 Subject: [PATCH] Update delivery report to use shipping address --- .../order_cycle_management_report.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index 8a9c6ba60f..b4fb9a6f32 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -55,15 +55,15 @@ module OpenFoodNetwork end def delivery_row(order) - ba = order.billing_address + sa = order.shipping_address da = order.distributor.andand.address - [ba.firstname, - ba.lastname, + [sa.firstname, + sa.lastname, order.distributor.andand.name, customer_code(order.email), - "#{ba.address1} #{ba.address2} #{ba.city}", - ba.zipcode, - ba.phone, + "#{sa.address1} #{sa.address2} #{sa.city}", + sa.zipcode, + sa.phone, order.shipping_method.andand.name, order.payments.first.andand.payment_method.andand.name, order.payments.first.amount,