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

merge with master

Browse Source
This commit is contained in:
Yan
2017-06-14 19:43:05 +06:30
parent 8cfa2bc5c5 39e03fab25
commit 17c5a6cdf8
15 changed files with 284 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,9 @@ class Origami::PaymentsController < BaseOrigamiController
@cash = 0.0
@other = 0.0
@ppamount = 0.0
@visacount= 0.0
@jcbcount= 0.0
@mastercount = 0.0
@sale_data = Sale.find_by_sale_id(sale_id)
#get customer amount
@@ -64,6 +67,12 @@ class Origami::PaymentsController < BaseOrigamiController
@other += spay.payment_amount
elsif spay.payment_method == "paypar"
@ppamount += spay.payment_amount
elsif spay.payment_method == "visa"
@visacount += spay.payment_amount
elsif spay.payment_method == "jcb"
@jcbcount += spay.payment_amount
elsif spay.payment_method == "master"
@mastercount += spay.payment_amount
end
end
end