Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

app/controllers/api/authenticate_controller.rb

@@ -1,13 +1,13 @@
 class Api::AuthenticateController < Api::ApiController
   skip_before_action  :authenticate
-  before_action :find_shop
+  # before_action :find_shop
 
   def create
     emp_id = params[:emp_id]
     password = params[:password]
 
     if emp_id && password
-      @employee = Employee.login(@shop, emp_id, password)
+      @employee = Employee.login(emp_id, password)
       if @employee && @employee.role == "waiter"
         render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
       else