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

Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

Browse Source
This commit is contained in:
NyanLinHtut
2019-08-09 14:22:08 +06:30
parent 5e344dc4a6 78af4188d1
commit 67793b282e
14 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ class Origami::PaymentsController < BaseOrigamiController
sale_payment = SalePayment.new
sale_payment.process_kbz_payment(sale_id, sale_data.grand_total, 0, 'pending')
status, qr = KbzPay.pay(sale_data.grand_total, sale_payment.sale_payment_id, kbz_pay_method.gateway_url, kbz_pay_method.auth_token, kbz_pay_method.merchant_account_id, kbz_pay_method.additional_parameters)
status, qr = KbzPay.pay(sale_data.grand_total.to_i, sale_payment.sale_payment_id, kbz_pay_method.gateway_url, kbz_pay_method.auth_token, kbz_pay_method.merchant_account_id, kbz_pay_method.additional_parameters)
end
end

2
app/controllers/reports/receipt_no_controller.rb
View File

@@ -86,7 +86,7 @@ authorize_resource :class => false
:body => { :orders => @orders,
:order_items => @order_items,
:sale_orders => @sale_orders,
:sale => @sales,
:sales => @sales,
:sale_items => @sale_items,
:sale_audits => @sale_audits,
:sale_payments => @sale_payments,