git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove git conflict

Browse Source
This commit is contained in:
phyusin
2018-09-07 17:44:57 +06:30
parent aecccffa1e
commit fa421ee718
7 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/order_reservation.rb
View File

@@ -57,6 +57,9 @@ class OrderReservation < ApplicationRecord
order_reservation.order_reservation_type = order_reserve[:order_type]
order_reservation.customer_id = order_reserve[:cus_info]
order_reservation.requested_time = Time.zone.parse(order_reserve[:requested_time]).utc
if order_reserve[:pickup_time]
order_reservation.pickup_time = Time.zone.parse(order_reserve[:pickup_time]).utc
end
order_reservation.callback_url = order_reserve[:callback_url]
order_reservation.transaction_ref = order_reserve[:reference]
if order_reserve[:order_info]