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

.gitignore

@@ -43,5 +43,5 @@ config/deploy/config/*
 .byebug_history
 
 # Gem files
-Gemfile
-Gemfile.lock
+#Gemfile
+#Gemfile.lock

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-#gem 'pg'
+gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'

app/controllers/api/orders_controller.rb

@@ -39,8 +39,8 @@ class Api::OrdersController <  Api::ApiController
 
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil? && params[:booking_id].to_i > 0
-        @order.new_booking = false
-        # @order.new_booking = true
+         #@order.new_booking = false
+         @order.new_booking = true
         @order.booking_id = params[:booking_id]
       end
 

app/models/order.rb

@@ -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