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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging

Browse Source
This commit is contained in:
Yan
2017-06-14 14:13:45 +06:30
parent 1565b054df 2d0d962677
commit ff65f4f480
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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">