Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001

2018-05-16 09:57:44 +06:30
parent 086ddd2ab5 e679160e41
commit 33d5a0ad80
3 changed files with 47 additions and 2 deletions
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -62,7 +62,7 @@ class OrderReservation < ApplicationRecord
 			end
 			if order_reserve[:reservation_info]
 				order_reservation.total_customer = order_reserve[:reservation_info][:total_user]
-				order_reservation.order_remark = order_reserve[:reservation_info][:reservation_note]
+				# order_reservation.order_remark = order_reserve[:reservation_info][:reservation_note]
 			end
 			order_reservation.save!
 			if order_reserve[:order_info][:items]