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

Update shift for credit payment

Browse Source
This commit is contained in:
yarzar_code
2020-01-10 11:27:47 +06:30
parent f7305fe58b
commit f1c74f9789
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/sale_payment.rb
View File

@@ -721,7 +721,8 @@ 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 = 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)
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"
@@ -739,9 +740,12 @@ class SalePayment < ApplicationRecord
shift.other_sales = shift.other_sales.to_f + self.received_amount.to_f shift.other_sales = shift.other_sales.to_f + self.received_amount.to_f
end end
if credit_payment_left == 0 || credit_payment_left >= self.received_amount.to_f if credit_payment_left == 0 || credit_payment_left >= self.received_amount.to_f
shift.credit_sales = shift.credit_sales.to_f - self.received_amount.to_f if shift.id == shift_credit.id
shift.credit_sales = shift_credit.credit_sales.to_f - self.received_amount.to_f
end
else else
shift.credit_sales = shift.credit_sales.to_f - (self.received_amount.to_f + credit_payment_left) shift.credit_sales = shift_credit.credit_sales.to_f - (self.received_amount.to_f + credit_payment_left)
end end
shift.save shift.save
end end

22
config/puma_backup.rb
View File

@@ -1,11 +1,11 @@
# application_path="#{File.expand_path("../..", __FILE__)}" application_path="#{File.expand_path("../..", __FILE__)}"
# directory application_path directory application_path
# #environment ENV.fetch("RAILS_ENV") { "production" } #environment ENV.fetch("RAILS_ENV") { "production" }
# environment "production" environment "production"
# pidfile "#{application_path}/tmp/puma/pid" pidfile "#{application_path}/tmp/puma/pid"
# state_path "#{application_path}/tmp/puma/state" state_path "#{application_path}/tmp/puma/state"
# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
# port ENV.fetch("PORT") { 62158 } port ENV.fetch("PORT") { 62158 }
# workers 2 workers 2
# preload_app! preload_app!
# threads 1,1 threads 1,1