fixed conflict

2017-06-04 13:12:02 +06:30
parent fa34d1db8f 89cbb59e7c
commit aa295c3a12
23 changed files with 250 additions and 43 deletions
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -25,7 +25,7 @@ class Order < ApplicationRecord
    if self.new_booking
      booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
-                                :booking_status => "new" })
+                                :booking_status => "assign" })
    else
      if (self.booking_id.to_i > 0 )
        booking = Booking.find(self.booking_id)