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

Fix shipping_method querying in customer totals reports

Browse Source
This commit is contained in:
Matt-Yorkley
2019-11-18 15:07:31 +00:00
committed by luisramos0
parent 53fb00ce0c
commit 159bbe18e6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/open_food_network/orders_and_fulfillments_report/customer_totals_report.rb
View File

@@ -198,8 +198,13 @@ module OpenFoodNetwork
private
def shipping_method(line_items)
line_items.first.order.shipments.first.
andand.shipping_rates.andand.first.andand.shipping_method
shipping_rates = line_items.first.order.shipments.first.
andand.shipping_rates
return unless shipping_rates
shipping_rate = shipping_rates.find(&:selected) || shipping_rates.first
shipping_rate.try(:shipping_method)
end
end
end

2
spec/lib/open_food_network/orders_and_fulfillments_report/customer_totals_report_spec.rb
View File

@@ -57,7 +57,7 @@ RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsRepor
order.select_shipping_method(shipping_method2.id)
end
xit "displays the correct shipping_method" do
it "displays the correct shipping_method" do
shipping_method_name_field = report_table.first[15]
expect(shipping_method_name_field).to eq shipping_method2.name
end