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

Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

Browse Source
This commit is contained in:
phyusin
2018-02-21 09:17:12 +06:30
parent c4c57680a1 4ebe353182
commit 28252e9e87
9 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/origami/orders/show.html.erb
View File

@@ -334,11 +334,16 @@
swal("Information!", result.error_message);
}
else{
if(type=='Table'){
window.location.href = '/origami/table/' + dining_id;
if (dining_id == 0) {
window.location.href = '/origami';
}else{
window.location.href = '/origami/room/' + dining_id;
if(type=='Table'){
window.location.href = '/origami/table/' + dining_id;
}else{
window.location.href = '/origami/room/' + dining_id;
}
}
}
}
});

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

@@ -497,7 +497,7 @@ console.log("fffffffffffff")
var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
var total = $('#amount_due').text();
var amt = parseFloat(total) - parseFloat(othertotal);
$('#cash').text(parseFloat(amt).toFixed(2));
$('#cash').text(parseFloat(amt).toFixed(1));
update_balance();
break;
}
@@ -587,7 +587,7 @@ console.log("fffffffffffff")
$( "#loading_wrapper" ).hide();
if($('#balance').text() < 0){
swal({
title: "Information!",
title: "Payment Successful!",
text: 'Changed amount ' + $('#balance').text() * (-1),
html: true,
closeOnConfirm: false,
@@ -603,7 +603,7 @@ console.log("fffffffffffff")
}else{
$('#pay').text("Pay");
swal({
title: "Information!",
title: "Payment Successful!",
text: 'Thank You !',
html: true,
closeOnConfirm: false,