fix confilct

This commit is contained in:
Marion Muszynski 2016-03-22 17:38:33 +01:00
commit 5cc2da8f90

View File

@ -30,7 +30,7 @@ class GenerateBarcode {
$str = $ean;
$width = 320;
$height = 100;
$height = 80;
$im = imagecreatetruecolor($width, $height);
$black = ImageColorAllocate($im, 0x00, 0x00, 0x00);
$white = ImageColorAllocate($im, 0xff, 0xff, 0xff);
@ -94,38 +94,27 @@ class GenerateBarcode {
/*for ($i=0; $i < 30; $i++) {
$this->products[$i] = array(
'key' => "125415-322",
'label' => "03 mois (62 cm)- Lot de 2 bodies Ri"
'ref' => "FIX-05-2726"
'label' => "03 mois (62 cm)- Lot de 2 bodies Ri",
"ref" => "FIX-06-86763"
);
}
for ($i=31; $i < 80; $i++) {
$this->products[$i] = array(
'key' => "125416-332",
'label' => "03 mois (62 cm)- Ensemble grenouill"
'ref' => "FIX-01-2726"
'label' => "03 mois (62 cm)- Ensemble grenouill",
"ref" => "FIX-04-86763"
);
}*/
$this->products[0] = array(
'quantity' => 30,
'key' => "125415-322",
'label' => "03 mois (62 cm)- Lot de 2 bodies Ri"
) ;
$this->products[1] = array(
'quantity' => 150,
'key' => "125416-332",
'label' => "03 mois (62 cm)- Ensemble grenouill"
) ;
if (empty($this->products)) {
die('Tous les produits ont déjà un EAN');
}
$this->products = $this->_sortProducts($this->products, 'ref');
ob_start();
$pdf = new FPDF();
$pdf = new FPDF('P', 'mm', 'A4');
$nb_per_page = 0;
$pdf->SetMargins(8,15,8);
$pdf->SetMargins(9,12,9);
$pdf->SetAutoPageBreak(FALSE);
$pdf->AddPage();
$pdf->SetFont('Arial','',14);
@ -143,6 +132,7 @@ class GenerateBarcode {
$pdf->addPage();
$nb_per_page = 0;
}
foreach ($product_per_line as $key => $product) {
if (empty($product)) {
$pdf->Cell(48, 4, '', 0,0, 'C');