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

id_order

Browse Source
This commit is contained in:
Michael RICOIS 2018-02-13 16:45:38 +01:00
parent 7a207b2010
commit fb61d8b1ad
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ant_logistic/AdminAntLogistic.php
View File

@ -346,7 +346,7 @@ class AdminAntLogistic extends AdminTab
$to_ship[(int) $p['id_order_detail']] = $p['product_quantity'] - ($p['product_quantity_refunded'] > 0? $p['product_quantity_refunded']: $p['product_quantity_return']) - (int) $p['quantity_sent'];
}
if(Validate::isLoadedObject($order)) {
if (Validate::isLoadedObject($order)) {
$parcel_carrier = Tools::getValue('parcel_carrier', 'laposte');
if(($weight = Tools::getValue('weight')) && ($products = Tools::getValue('shipped'))) {

1
modules/ant_logistic/ajax.php
View File

@ -577,6 +577,7 @@ if(($id_order = (int) Tools::getValue('id_order'))
<div class="input-group-addon">kg</div>
</div>
</div>
<input type="hidden" name="id_order" value="'.$id_order.'" />
<input id="button4" onclick="checkPrinting(); return false;" type="submit" class="pull-right btn btn-primary btn-sm" name="submitShip" value="[F1] Enregistrer le colis et imprimer l\'étiquette">
</div>';

4
modules/ant_logistic/script.js
View File

@ -47,7 +47,9 @@ function checkPrinting() {
});
if(!allok) {
prompt("Les quantités scannées sont inférieures aux quantités à envoyer. Confirmer l\'envoi ?", function() { $("#button4").attr("onclick", "").trigger("click"); });
prompt("Les quantités scannées sont inférieures aux quantités à envoyer. Confirmer l\'envoi ?", function() {
$("#button4").attr("onclick", "").trigger("click");
});
} else {
$("#button4").attr("onclick", "").trigger("click");
}