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

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -63,7 +63,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation = params
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
 
-			if flag #&& ENV["SERVER_MODE"] != 'cloud'
+			if flag
 				shop = Shop.find_by_id(1)
 				if !shop.shop_code.nil?
 					shop_code = shop.shop_code

app/controllers/api/orders_controller.rb

@@ -117,6 +117,9 @@ class Api::OrdersController <  Api::ApiController
         end
 
         @status, @booking = @order.generate
+        if @status && @booking
+            Order.process_order_queue(@order.order_id,@order.table_id,@order.source)
+        end 
        # # for parallel order     
        #  remoteIP = ""
        #  begin

app/controllers/api/survey_controller.rb

@@ -18,8 +18,8 @@ class Api::SurveyController < Api::ApiController
 		cashier_zone      = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id)
 		shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil)
 		
-		if params[:id]
-			survey = Survey.find(params[:id])
+		if params[:survey][:id]
+			survey = Survey.find(params[:survey][:id])
 		else
 			survey = Survey.new
 		end