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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-12-19 11:17:36 +06:30
parent 592f0e6529 d6b3c84397
commit c754421a0a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/foodcourt/payments/show.html.erb
View File

@@ -193,12 +193,18 @@
<%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %> <%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
</div> </div>
</div> </div>
<%else%>
<div class="col-md-4" id="cash" style="display:none;">
<%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
</div>
<%end%> <%end%>
<%if @credit_exist%> <%if @credit_exist%>
<div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" > <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
<div class="col-md-8">Credit</div> <div class="col-md-8">Credit</div>
<div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div> <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
</div> </div>
<%else%>
<div class="col-md-4" id="credit" style="display:none;"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
<%end%> <%end%>
<div class="row payment other-payment-color btn_paymal_member"> <div class="row payment other-payment-color btn_paymal_member">
<div class="col-md-8">Other Payments</div> <div class="col-md-8">Other Payments</div>
@@ -907,6 +913,7 @@ $(document).ready(function(){
} }
}); });
<% if @cash_exist%>
$(document).on('click', '.cashier_number', function(event){ $(document).on('click', '.cashier_number', function(event){
if(event.handled !== true) { if(event.handled !== true) {
var original_value; var original_value;
@@ -976,7 +983,7 @@ $(document).ready(function(){
return false; return false;
} }
}); });
<%end%>
function update_balance(){ function update_balance(){
var cash = $('#cash').text(); var cash = $('#cash').text();