fixed conflict after merge with dev

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -96,9 +96,6 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 				result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
 			end
 		end
-		
-		# puts "!!! send doemal ::"
-		# puts result
 
 		Rails.logger.debug "send status to doemal"
 		Rails.logger.debug result

app/controllers/api/orders_controller.rb

@@ -46,9 +46,6 @@ class Api::OrdersController <  Api::ApiController
       @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
     # end
 
-    # @shop = Shop.first
-    puts "Hello world"
-    puts @shop.to_json
     return @shop.to_json
   end
 
@@ -150,7 +147,6 @@ class Api::OrdersController <  Api::ApiController
     table =  DiningFacility.find(table_id)
     if table
        booking = table.get_current_booking
-       # puts booking
        if booking
         if !booking.sale_id.nil?
           if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"

app/controllers/api/survey_controller.rb

@@ -15,10 +15,6 @@ class Api::SurveyController < Api::ApiController
 
 	def create
 		dining_facility  = DiningFacility.find(params[:id])
-		# 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)
-		# puts params.to_json
-		# set cashier
 		open_cashier = Employee.where("shop_code='#{@shop.shop_code}' and role = 'cashier' AND token_session <> ''")
 		current_shift = ShiftSale.current_shift(@shop.shop_code)
 		current_shift_user =Employee.find_by_id(current_shift.employee_id)