From eef4af4cc67dfac5d80a73557514ce9e9265bdda Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 12 Jul 2018 13:55:27 +0630
Subject: [PATCH] update sale audit

---
 app/controllers/origami/alipay_controller.rb          | 2 +-
 app/controllers/origami/credit_payments_controller.rb | 3 ++-
 app/controllers/origami/paypar_payments_controller.rb | 2 +-
 app/controllers/origami/voucher_controller.rb         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/alipay_controller.rb b/app/controllers/origami/alipay_controller.rb
index d3b7c488..6bf943c8 100644
--- a/app/controllers/origami/alipay_controller.rb
+++ b/app/controllers/origami/alipay_controller.rb
@@ -65,7 +65,7 @@ class Origami::AlipayController < BaseOrigamiController
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no)
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "alipay",ref_no)
     end
   end
 
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 88982a94..61030632 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -42,8 +42,9 @@ class Origami::CreditPaymentsController < BaseOrigamiController
       end
 
       saleObj = Sale.find(sale_id)
+      remark = "credit payment for Receipt No #{saleObj.receipt_no}"
       sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "creditnote")
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "creditnote",remark)
     end
   end
 
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index e6e8d14a..aa90bb59 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -17,7 +17,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 			end
 			
       		sale_payment = SalePayment.new
-      		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
+      		status,msg =sale_payment.process_payment(saleObj, current_user.name, redeem_amount,payment_method)
       		if status == true
       			@out = true, "Success!"
       		else
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 079e045d..c03bd198 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -73,7 +73,7 @@ class Origami::VoucherController < BaseOrigamiController
       if( response["status"]==true )
         saleObj = Sale.find(sale_id)
         sale_payment = SalePayment.new
-        @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "voucher")
+        @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "voucher")
       end
     end
   end