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

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

Browse Source
This commit is contained in:
Yan
2017-06-20 14:21:58 +06:30
parent e43818fdf5 80362f87fe
commit dd2a2e54a4
4 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
<div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12">
<label class="col-lg-4 col-md-4 col-sm-4">You can redeem upto </label>
<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @food_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%= @redeem_prices %>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
</div>
<hr>
</div>
@@ -38,7 +38,7 @@
<!-- <% if @payparcount > 0 %>
<p class="">Last time rebate amount is <%= @payparcount %></p>
<% end %>
<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @food_prices %></span></p> -->
<p class="">You can rebate upto <span style="color:red;" id="food_prices"><%= @redeem_prices %></span></p> -->
</div>
<div class="col-lg-6 col-md-7 col-sm-7">
@@ -151,7 +151,7 @@ $("#redeem").click(function(){
}else if(valid_amount< redeem_amount){
alert(" Insufficient Amount!")
}else{
if(redeem_amount <= "<%= @food_prices %>"){
if(redeem_amount <= "<%= @redeem_prices %>"){
$.ajax({
type: "POST",
url: "<%=origami_payment_paypar_path%>",