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

Merge branch 'ticket-12379-updateLabelgenerateEan' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-17 15:24:15 +01:00
commit 7a8d6e5355
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/labelgenerate/AdminLabelGenerate.php
View File

@ -348,7 +348,7 @@ class AdminLabelGenerate extends AdminTab {
$this->_html .= $this->displayError('Pas de produit à générer !');
}
} else {
$message = 'Tous les produits de la vente ont déjà des EANS';
$message = 'Aucun ean trouvé ou généré !';
if (glob(_PS_MODULE_DIR_.'labelgenerate/img/'.$barcode->id_sale.'/barcode_all_initial.pdf')) {
$message .= '<br>Dernières étiquettes générées : <a class="btn btn-primary btn-xs" target="_blank" href="/modules/labelgenerate/img/'.$barcode->id_sale.'/barcode_all_initial.pdf">Télécharger le PDF</a>';
}

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

@ -95,7 +95,7 @@ class GenerateBarcode {
$white = ImageColorAllocate($im, 0xff, 0xff, 0xff);
imagefilledrectangle($im, 0, 0, $width, $height, $white);
Barcode::gd($im, $black, $width / 2, $height / 2 - 10 , 0, "code128", $str, 3, 50);
imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
//imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
if ($id_product_attribute) {
imagegif($im, $this->directory.'/ean-'.$id_product.'-'.$id_product_attribute.'.gif');
@ -154,16 +154,16 @@ class GenerateBarcode {
if($big_label){
// 52*30
$width = 52.7;
$height_label = 13;
$height_label = 14;
$height_text = 7;
$ln_label = 16;
$ln_label = 15;
$ln_text = 7;
$nb_per_line = self::_NB_PER_LINE_BIG_;
$total_per_page = self::_TOTAL_PER_PAGE_BIG_;
$font_size = 6;
$font_size_ref = 10;
$margin = 0;
$margin_top = 0;
$margin_top = 3;
} else {
// 48*17
$width = 48;