Pull from master

This commit is contained in:
San Wai Lwin
2018-05-21 11:12:12 +06:30
parent 85625b7090
commit cfc672dc31
11 changed files with 129 additions and 110 deletions

View File

@@ -53,7 +53,7 @@ class OrderReservation < ApplicationRecord
order_reservation = OrderReservation.new
order_reservation.order_reservation_type = order_reserve[:order_type]
order_reservation.customer_id = order_reserve[:cus_info]
order_reservation.requested_time = Time.parse(order_reserve[:requested_time]).utc
order_reservation.requested_time = Time.zone.parse(order_reserve[:requested_time]).utc
order_reservation.callback_url = order_reserve[:callback_url]
order_reservation.transaction_ref = order_reserve[:reference]
if order_reserve[:order_info]