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

merged master

Browse Source
This commit is contained in:
Yan
2017-06-07 17:45:40 +06:30
parent 114c4ee14d 4323da6589
commit df138d94ba
25 changed files with 142 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,11 +223,3 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>
<!-- <script type="text/template" id="order-items-rows">
<tr>
<td class="item-name"></td>
<td class="item-qty"></td>
<td class="item-price"></td>
</tr>
</script> -->

0
app/views/origami/card_payments/index.html.erb → app/views/origami/others_payments/index.html.erb
View File

39
app/views/origami/request_bills/show.html.erb → app/views/origami/payments/show.html.erb
View File

@@ -4,12 +4,10 @@
<div class="card" >
<div class="card-header">
<div id="order-title">
<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
<span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
<span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
<span><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
<span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
</div>
</div>
<div class="card-block">
@@ -89,7 +87,7 @@
</div>
<hr>
<div class="row" id="card_payment">
<div class="col-md-8">CARD</div>
<div class="col-md-8">OTHERS PAYMENT</div>
<div class="col-md-4">0.0</div>
</div>
<hr>
@@ -152,8 +150,8 @@
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number">DEL</div>
<div class="col-md-3 cashier_number">CLR</div>
<div class="col-md-3 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
</div>
</div>
<div class="col-md-5">
@@ -174,6 +172,7 @@ $(document).on('click', '.cashier_number', function(event){
original_value = $('#cash').text();
var input_type = $(this).attr("data-type");
switch (input_type) {
case 'num':
var input_value = $(this).attr("data-value");
@@ -193,6 +192,10 @@ $(document).on('click', '.cashier_number', function(event){
update_balance();
break;
case 'clr':
$('#cash').text("0.0");
update_balance();
break;
}
event.handled = true;
} else {
@@ -209,16 +212,28 @@ $( document ).ready(function() {
$('#card_payment').click(function() {
var sale_id = $('#sale_id').text();
window.location.href = '/origami/sale/'+ sale_id + "/payment/card_payment"
window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment"
return false;
});
$('#pay').click(function() {
console.log("pay")
if($('#amount_due').text() > 0){
console.log("greater")
if($('#balance').text() > 0){
alert(" Insufficient Amount!")
}else{
console.log("less")
// payment
var cash = $('#cash').text();
var credit = $('#credit').text();
var card = $('#card').text();
var sale_id = $('#sale_id').text();
$.ajax({type: "POST",
url: "<%= origami_payment_process_path %>",
data: "cash="+ cash + "&sale_id=" + sale_id,
success:function(result){
alert("THANK YOU")
}
});
}
});