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

update waiter view add order

Browse Source
This commit is contained in:
Aung Myo
2018-02-26 09:19:14 +06:30
parent ac47501e01
commit f4f5915532
12 changed files with 259 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,15 +734,11 @@ console.log("fffffffffffff")
url: ajax_url,
data: "remark="+ remark + "&sale_id=" + sale_id,
success: function () {
<<<<<<< HEAD
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
=======
window.location.href = '/origami/';
>>>>>>> 77a66d726bc48a7c5d8be7c12728c1d0a9a5621e
}
}
})
}
@@ -782,29 +778,6 @@ console.log("fffffffffffff")
var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total,'remark':remark };
if ($(this).attr('active')=== "true") {
<<<<<<< HEAD
$.ajax({
type: "POST",
url: "<%= origami_payment_foc_path %>",
data: params,
success:function(result){
//$( "#loading_wrapper" ).hide();
if (cash >= 0) {
swal({
title: "Information!",
text: 'Thank You !',
}, function () {
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
});
}
=======
swal({
title: "Alert",
text: "Are you sure want to FOC This Receipt?",
@@ -830,7 +803,6 @@ console.log("fffffffffffff")
}
}
});
>>>>>>> 77a66d726bc48a7c5d8be7c12728c1d0a9a5621e
}
});