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

Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report

Browse Source 
Change date displayed on sales_tax reports
This commit is contained in:
Matt-Yorkley
2020-05-11 09:56:38 +02:00
committed by GitHub
parent 3ca491683a 6e5cbebf4a
commit ab143ceaed
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/open_food_network/order_and_distributor_report.rb
View File

@@ -92,7 +92,7 @@ module OpenFoodNetwork
# @return [Array]
def row_for(line_item, order)
[
order.created_at,
order.completed_at.strftime("%F %T"),
order.id,
order.bill_address.full_name,
order.email,

2
lib/open_food_network/sales_tax_report.rb
View File

@@ -57,7 +57,7 @@ module OpenFoodNetwork
totals = totals_of order.line_items
shipping_cost = shipping_cost_for order
[order.number, order.created_at, totals[:items], totals[:items_total],
[order.number, order.completed_at.strftime("%F %T"), totals[:items], totals[:items_total],
totals[:taxable_total], totals[:sales_tax], shipping_cost, order.shipping_tax, order.enterprise_fee_tax, order.total_tax,
order.bill_address.full_name, order.distributor.andand.name]
end

2
spec/lib/open_food_network/order_and_distributor_report_spec.rb
View File

@@ -38,7 +38,7 @@ module OpenFoodNetwork
table = subject.table
expect(table[0]).to eq([
order.reload.created_at,
order.reload.completed_at.strftime("%F %T"),
order.id,
bill_address.full_name,
order.email,