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

merge with settings

Browse Source
This commit is contained in:
Yan
2017-06-19 19:14:58 +06:30
parent c95b0130dc 90be2b8d63
commit 7fe36e8ef4
18 changed files with 105 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/origami/redeem_payments/index.html.erb
View File

@@ -41,7 +41,7 @@
<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @food_prices %></span></p> -->
</div>
<div class="col-lg-7 col-md-7 col-sm-7">
<div class="col-lg-6 col-md-7 col-sm-7">
<div class="row">
<div class="col-lg-6 col-md-1 col-sm-1">
@@ -84,9 +84,15 @@
<div class="pay purple" id="redeem">Pay</div>
</div>
</div>
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
</div>
</div>
<div class="row">