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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2018-06-11 18:26:58 +06:30
parent 8de699a7ea 2b2b1d5090
commit 9f8bb1d3c8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/origami/junction_pay/index.html.erb
View File

@@ -242,12 +242,24 @@ $('#junction_pay').on('click',function(){
}; };
resJunctionPay = function(memberno,transactionNo,finalBillingAmt){ resJunctionPay = function(memberno,transactionNo,finalBillingAmt){
if(memberno != ''){ is_rebate = true; } if(memberno != ''){ is_rebate = true; }
}; };
resError = function(err_message){ resError = function(err_message){
$("#loading_wrapper").hide(); if(err_message != "ERROR: Verification cancelled"){
swal ( "Oops" , err_message , "error" ); $("#loading_wrapper").hide();
swal({
title: "Oops!",
text: err_message,
type: "error",
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type+"/payment/others_payment";
});
}
}; };
// $("#loading_wrapper").hide(); // $("#loading_wrapper").hide();
// $.ajax({type: "POST", // $.ajax({type: "POST",