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

fixed conflit

Browse Source
This commit is contained in:
NyanLinHtut
2019-12-13 10:09:25 +06:30
parent c6c605bb01 79598c0126
commit afe3c995ae
317 changed files with 17947 additions and 3204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/addorder.js
View File

@@ -623,7 +623,7 @@ $(function() {
row = "<h5>"+attributes[field]["type"]+"</h5>";
$(value).each(function(i){
disabled = ""
disabled = "false";
status ="";
if(parseInt(jQuery.inArray(value[i], selected_item)) !== -1){
status = "selected-attribute";
@@ -1041,7 +1041,12 @@ $(function() {
}else if(result.data == 'OK'){
window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text();
}else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment";
if(result.current_user_role == 'foodcourt_cashier'){
window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment";
}
else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment";
}
}
}
}