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

Merge branch 'ticket-10169' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-08-31 16:26:10 +02:00
commit 51f7b39a4d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/logistics/AdminLogistics.php
View File

@ -230,10 +230,10 @@ class AdminLogistics extends AdminTab {
&& (
($id_order = Tools::getValue('id_order'))
&& ($products = Tools::getValue('products'))
&& ($weight = Tools::getValue('weight'))
&& ($parcel_carrier = Tools::getValue('carrier'))
)
) {
$weight = 0.24;
$order = new Order((int) $id_order);
if(Validate::isLoadedObject($order)) {
$parcel_carrier == 'laposte'? $weight = 0.24: TRUE;
@ -745,7 +745,6 @@ class AdminLogistics extends AdminTab {
<legend>'.$this->l('Print another Label').'</legend>\
<p> <label>'.$this->l('Product:').'</label> <span id="product-name"></span></p>\
<p> <label>'.$this->l('Ref:').'</label> <span id="product-ref"></span></p>\
<p> <label for="weight">'.$this->l('Weight:').'</label> <input type="text" value="\' + \'0\' + \'" name="weight" id="weight-reprint" /> kg </p>\
<p> <label for="products">'.$this->l('Quantity:').'</label> <input type="text" value="\' + \'1\' + \'" name="products[]" id="quantity-reprint" /></p>\
<input type="hidden" value="laposte" name="carrier" id="carrier-reprint" />\
<input type="hidden" value="0" name="id_order" id="id_order-reprint" />\
@ -835,8 +834,7 @@ class AdminLogistics extends AdminTab {
$(".reprint").each(function(){
$(this).click(function(e){
e.preventDefault();
$("span#product-name").text($(this).data("product"));
$("span#product-name").html($(this).data("product"));
$("span#product-ref").text($(this).data("ref"));
$("#carrier-reprint").val($(this).data("carrier"));
$("#id_order-reprint").val($(this).data("id_order"));