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

SQA feedback

Browse Source
This commit is contained in:
phyusin
2018-03-19 19:34:34 +06:30
parent 25b6458450
commit bf84392ef8
13 changed files with 289 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/origami.js
View File

@@ -249,7 +249,7 @@ function setCommPorts(comPortLists) {
closeOnCancel: false,
allowOutsideClick: false
}, function () {
window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment";
window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type+"/payment/others_payment";
});
}
}
@@ -342,6 +342,8 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
}else{
if(payment_type!="master"){
payment_type = payment_type.toUpperCase();
}else{
payment_type = "Master";
}
swal({
title: 'Oops',