diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 4b7559b1..7feceac9 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -43,7 +43,7 @@ class OrderItemPdf < Prawn::Document move_down 5 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Date: #{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 176749b8..afc216c9 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -43,7 +43,7 @@ class OrderSummaryPdf < Prawn::Document move_down 5 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Date: #{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 3cc24ce9..d41f9f1b 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -55,7 +55,7 @@

Order at - <%= qid.created_at.strftime("%Y %m %d") %> + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - <%= qid.item_order_by %> @@ -105,7 +105,7 @@

Order at - <%= qid.created_at.getlocal.strftime("%Y-%m-%d") %> + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> - <%= qid.item_order_by %>