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

fixed conflict

Browse Source
This commit is contained in:
Nweni
2019-11-25 09:26:21 +06:30
parent 3b468b78f4 d1ab2c194d
commit 6fbf30c950
109 changed files with 1082 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,35 +11,34 @@ class Origami::CashInsController < BaseOrigamiController
type = params[:type]
p_jour = PaymentJournal.new
p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user.id)
shift = ShiftSale.current_open_shift(current_user.id)
current_shift = ShiftSale.current_shift
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)
# set cashier
if shift != nil
shift = shift
else
open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
if open_cashier.count > 0
shift = ShiftSale.current_open_shift(open_cashier[0].id)
open_cashier = Employee.where("shop_code='#{@shop.shop_code}' and role = 'cashier' AND token_session <> ''")
if open_cashier.count>0
shift = ShiftSale.current_open_shift(open_cashier[0])
if shift
shift = ShiftSale.current_open_shift(shift.id)
emp = Employee.find_by_id(shift.employee_id)
shift = ShiftSale.current_open_shift(emp)
else
shift = ShiftSale.current_open_shift(current_shift.id)
shift = ShiftSale.current_open_shift(current_shift)
end
else
shift = Employee.find(current_shift.employee_id).name
#shift = current_shift
# shift = Employee.find(current_shift.employee_id).name
shift =current_shift
end
end
puts shift.to_json
shift.cash_in = shift.cash_in + amount.to_f
shift.save
end
end