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

Other Payment shown by type

Browse Source
This commit is contained in:
Phyo
2017-06-14 12:02:52 +06:30
parent 7b2d2731c1
commit 5cff9c891b
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ class Origami::PaymentsController < BaseOrigamiController
if Sale.exists?(sale_id)
@cash = 0.0
@other = 0.0
@ppamount = 0.0
@sale_data = Sale.find_by_sale_id(sale_id)
#get customer amount
@@ -55,8 +56,10 @@ class Origami::PaymentsController < BaseOrigamiController
if spay.payment_method == "cash"
@cash = spay.payment_amount
end
if spay.payment_method == "mpu" || spay.payment_method == "paypar"
if spay.payment_method == "mpu"
@other += spay.payment_amount
elsif spay.payment_method == "paypar"
@ppamount += spay.payment_amount
end
end
end

20
app/views/origami/payments/show.html.erb
View File

@@ -102,8 +102,24 @@
</div>
<hr>
<div class="row" id="card_payment">
<div class="col-md-8">Others Payment</div>
<div class="col-md-4" id="others"><%= @other %></div>
<div class="container">
<% if @other != 0.0 %>
<div class="row">
<div class="col-md-8">MPU</div>
<div class="col-md-4" id="others"><%= @other %></div>
</div>
<% elsif @ppamount != 0.0 %>
<div class="row">
<div class="col-md-8">Paypar</div>
<div class="col-md-4" id="others"><%= @ppamount %></div>
</div>
<% else %>
<div class="row">
<div class="col-md-8">Others Payment</div>
<div class="col-md-4" id="others"><%= @ppamount %></div>
</div>
<% end %>
</div>
</div>
<hr>
<div class="row">