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

app/controllers/application_controller.rb

@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first