diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index ac3c0648..2dbd3796 100755
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -15,7 +15,7 @@ class Origami::CashInsController < BaseOrigamiController
     p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user)
     shift = ShiftSale.current_open_shift(current_user)
 
-    current_shift = ShiftSale.current_shift(@shop.shop_code)
+    current_shift = ShiftSale.current_shift
       # set cashier
       if shift != nil
         shift = shift
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index e576bfc5..98f82ade 100755
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -10,7 +10,7 @@ class Origami::CashOutsController < BaseOrigamiController
     p_jour.cash_out(reference, remark, amount, current_user)
     shift = ShiftSale.current_open_shift(current_user)
 
-    current_shift = ShiftSale.current_shift(@shop.shop_code)
+    current_shift = ShiftSale.current_shift
 
        # set cashier
       if shift != nil
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 96ae85fe..7c70ea89 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -130,7 +130,7 @@ class Origami::ShiftsController < BaseOrigamiController
           end
       end
     end
-    Employee.logout(@shop,session[:session_token])
+    Employee.logout(session[:session_token])
     session[:session_token] = nil
   end