raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add order number and date/time to order cycles customer report

Browse Source
This commit is contained in:
Rob H
2020-04-29 21:20:14 +10:00
parent 9e43661127
commit 6405c34428
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,9 @@ module OpenFoodNetwork
I18n.t(:report_header_customer_code), I18n.t(:report_header_tags),
I18n.t(:report_header_billing_street), I18n.t(:report_header_billing_street_2),
I18n.t(:report_header_billing_city), I18n.t(:report_header_billing_postcode),
I18n.t(:report_header_billing_state)]
I18n.t(:report_header_billing_state),
I18n.t(:report_header_order_number),
I18n.t(:report_header_date)]
end
# rubocop:enable Metrics/AbcSize
# rubocop:enable Metrics/MethodLength
@@ -92,7 +94,9 @@ module OpenFoodNetwork
proc { |_line_items| "" },
proc { |_line_items| "" },
proc { |_line_items| "" },
proc { |_line_items| "" }
proc { |_line_items| "" },
proc { |line_items| line_items.first.order.number },
proc { |line_items| line_items.first.order.completed_at.strftime("%F %T") },
]
},
{
@@ -187,7 +191,9 @@ module OpenFoodNetwork
proc { |line_items| line_items.first.order.bill_address.andand.address2 },
proc { |line_items| line_items.first.order.bill_address.andand.city },
proc { |line_items| line_items.first.order.bill_address.andand.zipcode },
proc { |line_items| line_items.first.order.bill_address.andand.state }
proc { |line_items| line_items.first.order.bill_address.andand.state },
proc { |line_items| line_items.first.order.number },
proc { |line_items| line_items.first.order.completed_at.strftime("%F %T") },
]
end
# rubocop:enable Metrics/AbcSize

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

@@ -35,6 +35,22 @@ RSpec.describe OpenFoodNetwork::OrdersAndFulfillmentsReport::CustomerTotalsRepor
total_field = report_table.last[5]
expect(total_field).to eq I18n.t("admin.reports.total")
end
it 'includes the order number and date in item rows' do
order_number_and_date_fields = report_table.first[33..34]
expect(order_number_and_date_fields).to eq([
order.number,
order.completed_at.strftime("%F %T"),
])
end
it 'includes the order number and date in total rows' do
order_number_and_date_fields = report_table.last[33..34]
expect(order_number_and_date_fields).to eq([
order.number,
order.completed_at.strftime("%F %T"),
])
end
end
context "loading shipping methods" do