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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Moe Su
2017-06-12 13:58:24 +06:30
parent a2111f1635 917ccd0294
commit 228ff44e5c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/order.rb
View File

@@ -25,6 +25,7 @@ class Order < ApplicationRecord
booking = nil booking = nil
if self.new_booking if self.new_booking
puts "a"
booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
:checkin_at => Time.now.utc, :checkin_by => self.employee_name, :checkin_at => Time.now.utc, :checkin_by => self.employee_name,
:booking_status => "assign" }) :booking_status => "assign" })
@@ -32,9 +33,10 @@ class Order < ApplicationRecord
table.status = "occupied" table.status = "occupied"
table.save table.save
else else
if (self.booking_id.to_i > 0 ) puts "b"
booking = Booking.find(self.booking_id) booking = Booking.find(self.booking_id)
end
end end
booking.save! booking.save!