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

update sale audit

Browse Source
This commit is contained in:
Aung Myo
2018-07-12 13:55:27 +06:30
parent 7945da99ed
commit eef4af4cc6
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/alipay_controller.rb
View File

@@ -65,7 +65,7 @@ class Origami::AlipayController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new 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
end end

3
app/controllers/origami/credit_payments_controller.rb
View File

@@ -42,8 +42,9 @@ class Origami::CreditPaymentsController < BaseOrigamiController
end end
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
remark = "credit payment for Receipt No #{saleObj.receipt_no}"
sale_payment = SalePayment.new 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
end end

2
app/controllers/origami/paypar_payments_controller.rb
View File

@@ -17,7 +17,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
end end
sale_payment = SalePayment.new 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 if status == true
@out = true, "Success!" @out = true, "Success!"
else else

2
app/controllers/origami/voucher_controller.rb
View File

@@ -73,7 +73,7 @@ class Origami::VoucherController < BaseOrigamiController
if( response["status"]==true ) if( response["status"]==true )
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new 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 end
end end