diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb
index c3d7bb4a..e4fffbaf 100644
--- a/app/controllers/api/survey_controller.rb
+++ b/app/controllers/api/survey_controller.rb
@@ -15,9 +15,18 @@ 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
+		# 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("role = 'cashier' AND token_session <> ''")
+		current_shift = ShiftSale.current_shift
+		if open_cashier.count>0
+			shift_by_terminal = ShiftSale.current_open_shift(open_cashier[0].id)
+        else
+          	shift_by_terminal = ShiftSale.current_open_shift(current_shift.employee_id)
+        end
+        
 		if params[:survey][:id]>0
 			survey = Survey.find(params[:survey][:id])
 		else
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 663fa805..2c56a64c 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -40,11 +40,24 @@ class Origami::SurveysController < BaseOrigamiController
 	def create
 		@type = params[:cashier_type]
 		@sale_id = params[:sale_id]
-
 		if params[:table_id].to_i>0
-		  @dining_facility  = DiningFacility.find(params[:table_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)
+		  	@dining_facility  = DiningFacility.find(params[:table_id])
+		  	if params[:sale_id].to_i > 0
+			  # 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)
+				# set cashier
+				open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+				current_shift = ShiftSale.current_shift
+				if open_cashier.count>0
+					shift_by_terminal = ShiftSale.current_open_shift(open_cashier[0].id)
+		        else
+		          	shift_by_terminal = ShiftSale.current_open_shift(current_shift.employee_id)
+		        end
+			else
+			  sale     = Sale.find(@sale_id)
+	          shift = ShiftSale.find(sale.shift_sale_id)
+			  shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(shift.cashier_terminal_id,nil)
+			end
 		else
 		  sale     = Sale.find(@sale_id)
           shift = ShiftSale.find(sale.shift_sale_id)