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

This commit is contained in:
Yan
2017-06-03 13:27:11 +06:30
4 changed files with 7 additions and 7 deletions

View File

@@ -201,7 +201,7 @@ class Order < ApplicationRecord
#Process order items and send to order queue
def process_order_queue
#Send to background job for processing
#Send to background job for processing
OrderQueueProcessorJob.perform_later(self.id)
end
@@ -221,7 +221,7 @@ class Order < ApplicationRecord
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
.group("orders.id")
.group("orders.id")
end
#Origami: Cashier : to view order type Room
def self.get_order_rooms