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

Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb'

Browse Source
This commit is contained in:
Michael RICOIS 2018-03-08 17:36:23 +01:00
commit 62139fe9fd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/labelgenerate/AdminLabelGenerate.php
View File

@ -505,7 +505,6 @@ class AdminLabelGenerate extends AdminTab
$quantity += ($od['product_quantity'] - $od['product_quantity_reinjected']);
}
if ($quantity > 0) {
print_r($combination);
$barcode->generateIdentification($combination['id_product'], $combination['id_product_attribute'], $product->reference, $combination['attribute_name']);
$barcode->assocProduct($combination['id_product'], $combination['id_product_attribute'], $quantity, $product->reference);
}

4
modules/labelgenerate/models/generatebarcode.php
View File

@ -131,12 +131,12 @@ class GenerateBarcode
$white = ImageColorAllocate($im, 0xff, 0xff, 0xff);
imagefilledrectangle($im, 0, 0, $width, $height, $white);
imagettftext($im, 30, 0, 10, 50, $black, $font, $ref);
imagettftext($im, 40, 0, 10, 40, $black, $font, $ref);
if ($id_product_attribute === null) {
$result = imagegif($im, $this->directory.'/id-'.$id_product.'-0.gif');
} else {
imagettftext($im, 12, 0, 65, 50 , $black, $font, $attribute_ref);
imagettftext($im, 12, 0, 110, 40 , $black, $font, $attribute_ref);
$result = imagegif($im, $this->directory.'/id-'.$id_product.'-'.$id_product_attribute.'.gif');
}