update shift only if sales completed
This commit is contained in:
@@ -117,7 +117,7 @@ class SalePayment < ApplicationRecord
|
||||
when "foc"
|
||||
payment_status = foc_payment
|
||||
when "paymal"
|
||||
payment_status,membership_data = paymal_payment
|
||||
payment_status, membership_data = paymal_payment
|
||||
when "JunctionPay"
|
||||
payment_status = junction_pay_payment
|
||||
when "dinga"
|
||||
@@ -544,7 +544,7 @@ class SalePayment < ApplicationRecord
|
||||
remark = "#{membership_data} PayMal Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
|
||||
sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
|
||||
|
||||
if membership_data["status"]==true
|
||||
if membership_data["status"] == true
|
||||
self.payment_method = "paymal"
|
||||
self.payment_amount = self.received_amount
|
||||
# self.payment_reference = self.voucher_no
|
||||
@@ -553,7 +553,6 @@ class SalePayment < ApplicationRecord
|
||||
payment_status = self.save!
|
||||
# SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
|
||||
sale_update_payment_status(self.received_amount.to_f)
|
||||
|
||||
else
|
||||
sale_update_payment_status(0)
|
||||
end
|
||||
@@ -603,7 +602,6 @@ class SalePayment < ApplicationRecord
|
||||
payment_status = self.save!
|
||||
SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
|
||||
sale_update_payment_status(self.received_amount.to_f)
|
||||
|
||||
else
|
||||
sale_update_payment_status(0)
|
||||
end
|
||||
@@ -677,8 +675,11 @@ class SalePayment < ApplicationRecord
|
||||
end
|
||||
end
|
||||
sale.save!
|
||||
table_update_status(sale)
|
||||
update_shift
|
||||
|
||||
if sale.sale_status == 'completed'
|
||||
table_update_status(sale)
|
||||
update_shift
|
||||
end
|
||||
end
|
||||
|
||||
# update for cashier shift
|
||||
|
||||
Reference in New Issue
Block a user