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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-04-30 09:45:37 +06:30
parent 11473c7fcd ec8645d0fc
commit 929919ba0f
19 changed files with 189 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/order_reservation.rb
View File

@@ -5,9 +5,9 @@ class OrderReservation < ApplicationRecord
before_create :generate_custom_id
has_many :order_reservation_items
belongs_to :delivery
has_one :delivery
scope :latest_order, -> { order("order_reservation_id desc, requested_time asc") }
scope :latest_order, -> { order("order_reservation_id desc, created_at desc") }
SEND_TO_KITCHEN = "send_to_kitchen"
READY_TO_DELIVERY = "ready_to_deliver"
@@ -21,7 +21,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 = DateTime.parse(order_reserve[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
order_reservation.requested_time = DateTime.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]