diff --git a/lib/reporting/reports/suppliers/helpers/columns_helper.rb b/lib/reporting/reports/suppliers/helpers/columns_helper.rb index d7a56e78e5..eaa1e84006 100644 --- a/lib/reporting/reports/suppliers/helpers/columns_helper.rb +++ b/lib/reporting/reports/suppliers/helpers/columns_helper.rb @@ -44,7 +44,7 @@ module Reporting end def order_date - proc { |line_items| order(line_items).completed_at.strftime("%d/%m/%Y") } + proc { |line_items| order(line_items).completed_at.to_date } end def order_cycle @@ -52,11 +52,11 @@ module Reporting end def order_cycle_start_date - proc { |line_items| item_order_cycle(line_items).orders_open_at.strftime("%d/%m/%Y") } + proc { |line_items| item_order_cycle(line_items).orders_open_at.to_date } end def order_cycle_end_date - proc { |line_items| item_order_cycle(line_items).orders_close_at.strftime("%d/%m/%Y") } + proc { |line_items| item_order_cycle(line_items).orders_close_at.to_date } end def product diff --git a/spec/lib/reports/suppliers/pay_your_suppliers_report_spec.rb b/spec/lib/reports/suppliers/pay_your_suppliers_report_spec.rb index 4ad3e944a5..fc0370ff00 100644 --- a/spec/lib/reports/suppliers/pay_your_suppliers_report_spec.rb +++ b/spec/lib/reports/suppliers/pay_your_suppliers_report_spec.rb @@ -29,12 +29,12 @@ RSpec.describe "Pay Your Suppliers Report" do expect(table_row.hub_address).to eq(hub.address.full_address) expect(table_row.hub_contact_email).to eq("none") expect(table_row.order_number).to eq(order.number) - expect(table_row.order_date).to eq(order.completed_at.strftime("%d/%m/%Y")) + expect(table_row.order_date).to eq(order.completed_at.to_date.to_s) expect(table_row.order_cycle).to eq(order_cycle.name) expect(table_row.order_cycle_start_date).to eq( - order_cycle.orders_open_at.strftime("%d/%m/%Y") + order_cycle.orders_open_at.to_date.to_s ) - expect(table_row.order_cycle_end_date).to eq(order_cycle.orders_close_at.strftime("%d/%m/%Y")) + expect(table_row.order_cycle_end_date).to eq(order_cycle.orders_close_at.to_date.to_s) expect(table_row.product).to eq(product.name) expect(table_row.variant_unit_name).to eq(variant.full_name) expect(table_row.quantity).to eq(1) diff --git a/spec/system/admin/reports/pay_your_suppliers_spec.rb b/spec/system/admin/reports/pay_your_suppliers_spec.rb index 09a2d470fc..8bc1760c9b 100644 --- a/spec/system/admin/reports/pay_your_suppliers_spec.rb +++ b/spec/system/admin/reports/pay_your_suppliers_spec.rb @@ -63,10 +63,10 @@ RSpec.describe "Pay Your Suppliers Report" do hub.address.full_address, "none", order.number, - order.completed_at.strftime("%d/%m/%Y"), + order.completed_at.to_date.to_s, order_cycle.name, - order_cycle.orders_open_at.strftime("%d/%m/%Y"), - order_cycle.orders_close_at.strftime("%d/%m/%Y"), + order_cycle.orders_open_at.to_date.to_s, + order_cycle.orders_close_at.to_date.to_s, product.name, variant.full_name, '1',