diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 59cee9a6..0bf80955 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -55,7 +55,7 @@ class SalePayment < ApplicationRecord sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by) # update complete order items in oqs - SaleOrder.where("sale_id = '#{ invoice.sale_id }'").find_each do |sodr| + SaleOrder.where("sale_id = '#{ invoice.sale_id }'").find_each do |sodr| AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi| aoi.delivery_status = 1 aoi.save @@ -314,7 +314,7 @@ class SalePayment < ApplicationRecord # overall_dis = SaleItem.get_overall_discount(sObj.id) overall_dis = sObj.total_discount - total_amount = rebate_prices - payparcost + overall_dis + total_amount = rebate_prices - payparcost - overall_dis if total_amount > 0 receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url")