antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-14739-PackLogistic' into develop

Browse Source 
Conflicts:
	modules/ant_logistic/script.js
This commit is contained in:
Michael RICOIS 2018-01-30 12:27:52 +01:00
commit 5b2fb71241
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ant_logistic/script.js
View File

@ -129,9 +129,15 @@ function qtyDown(el) {
if(input.parent().parent().hasClass('pack_item')){
packQtyDown(input.attr('data-id_order_detail'));
} else {
<<<<<<< HEAD
if(parseInt(input.val()) > 0) {
$(input).trigger("change");
}
=======
if(parseInt(input.val()) > 0) {
$(input).trigger("change");
}
>>>>>>> refs/heads/ticket-14739-PackLogistic
}
changeCarrier();
@ -149,7 +155,11 @@ function checkQuantityPack(id_order_detail){
if(parseFloat(result)>=1){
quantity_ok[id_item] = parseInt(quantity / item_pack_quantity);
} else {
<<<<<<< HEAD
quantity_ok[id_item] = false;
=======
quantity_ok[id_item] = false;
>>>>>>> refs/heads/ticket-14739-PackLogistic
}
});