git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-01-03 18:18:40 +06:30
parent b3a828f709
commit fab750c53a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/cash_ins_controller.rb
View File

@@ -15,7 +15,7 @@ class Origami::CashInsController < BaseOrigamiController
p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user) p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user)
shift = ShiftSale.current_open_shift(current_user) shift = ShiftSale.current_open_shift(current_user)
current_shift = ShiftSale.current_shift(@shop.shop_code) current_shift = ShiftSale.current_shift
# set cashier # set cashier
if shift != nil if shift != nil
shift = shift shift = shift

2
app/controllers/origami/cash_outs_controller.rb
View File

@@ -10,7 +10,7 @@ class Origami::CashOutsController < BaseOrigamiController
p_jour.cash_out(reference, remark, amount, current_user) p_jour.cash_out(reference, remark, amount, current_user)
shift = ShiftSale.current_open_shift(current_user) shift = ShiftSale.current_open_shift(current_user)
current_shift = ShiftSale.current_shift(@shop.shop_code) current_shift = ShiftSale.current_shift
# set cashier # set cashier
if shift != nil if shift != nil

2
app/controllers/origami/shifts_controller.rb
View File

@@ -130,7 +130,7 @@ class Origami::ShiftsController < BaseOrigamiController
end end
end end
end end
Employee.logout(@shop,session[:session_token]) Employee.logout(session[:session_token])
session[:session_token] = nil session[:session_token] = nil
end end