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

update fixed conflict

Browse Source
This commit is contained in:
Aung Myo
2017-06-28 16:44:31 +06:30
parent 20f89a65f8 d35aa23e34
commit e9e184894d
13 changed files with 175 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,13 +136,13 @@
<% if @ppamount != 0.0 %>
<div class="row payment other-payment-color" style="line-height:30px;height: 30px;margin-bottom: 0px;">
<div class="col-md-5"></div>
<div class="col-md-3">Paypar</div>
<div class="col-md-3">Redeem</div>
<div class="col-md-4" id="ppamount"><%= @ppamount %></div>
</div>
<% else %>
<div class="row" style="display:none">
<div class="col-md-5"></div>
<div class="col-md-3">Paypar</div>
<div class="col-md-3">Redeem</div>
<div class="col-md-4" id="ppamount">0.0</div>
</div>
<% end %>