Update shift credit with current user

This commit is contained in:
yarzar_code
2020-01-10 15:05:02 +06:30
parent 2d57faf7cf
commit 7afb4cf0eb
3 changed files with 20 additions and 17 deletions

View File

@@ -42,17 +42,17 @@ class Printer::PrinterWorker
end end
def print(file_path, printer_destination = nil ) def print(file_path, printer_destination = nil )
if printer_destination.nil? # if printer_destination.nil?
printer_destination = self.printer_destination # printer_destination = self.printer_destination
end # end
copy = self.print_copies # copy = self.print_copies
#Print only when printer information is not null # #Print only when printer information is not null
if !self.printer_destination.nil? # if !self.printer_destination.nil?
(1..copy).each do # (1..copy).each do
page = Cups::PrintJob.new(file_path, printer_destination) # page = Cups::PrintJob.new(file_path, printer_destination)
page.print # page.print
end # end
end # end
end end
end end

View File

@@ -722,7 +722,10 @@ class SalePayment < ApplicationRecord
# update for shift with credit payment # update for shift with credit payment
def update_shift_for_credit_payment def update_shift_for_credit_payment
shift_credit = ShiftSale.find_by_id(self.sale.shift_sale_id) shift_credit = ShiftSale.find_by_id(self.sale.shift_sale_id)
shift = ShiftSale.find_by_id(ShiftSale.current_shift) shift = self.action_by.current_shift
if !shift.nil?
shift = ShiftSale.current_shift
end
if !shift.nil? if !shift.nil?
credit_payment_left = get_credit_payment_left[0].payment_amount.to_f credit_payment_left = get_credit_payment_left[0].payment_amount.to_f
if self.payment_method == "cash" if self.payment_method == "cash"

View File

@@ -20,11 +20,11 @@ class ActionController::Base
end end
else else
# check for license file # check for license file
if check_license # if check_license
current_license(ENV["SX_PROVISION_URL"]) # current_license(ENV["SX_PROVISION_URL"])
else # else
redirect_to activate_path # redirect_to activate_path
end # end
end end
end end