- Übernahme neuer Funktionen aus dem alten Zweig / Pfad / Einstellungen / Hilfe Icons / Berechnung

- Neuer Modulfilter im neuen Backend

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b

1 files changed, 18 insertions, 39 deletions

diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml
index 4e4b402..548438c 100644
--- a/views/mods/mod_rechnungen/rechnung_pdf.phtml
+++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml
@@ -6,7 +6,7 @@
 

 	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

 	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

-	require_once WPSG_PATH_MOD.'mod_rechnungen/wpsg_fpdf.class.php';

+	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

   

 	global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top;

 	 

@@ -139,9 +139,9 @@
 				{

 					

 					$pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10));

-					$pdf->SetTextColor($text['color']);

-					$pdf->MultiCell($text['x'], $text['y'], 5, utf8_encode($text['text'])); 

-					$pdf->SetTextColor("#000000");

+					$pdf->wpsg_SetTextColor($text['color']);

+					$pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']); 

+					$pdf->wpsg_SetTextColor("#000000");

 					

 				}

 				

@@ -151,7 +151,7 @@
 		

 	}

 	//wpsg_debug($this->view); die();

-	$pdf = new wpsg_fpdf();	 

+	$pdf = new wpsg_fpdf();	

 	$pdf->SetAutoPageBreak(true, 5);

 	AddRechnungPage($this, $pdf);

 				

@@ -264,7 +264,7 @@
 		$height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3;

 		

 		$height_y = $pdf->getY();

-		$height = 2 + $pdf->MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, utf8_encode($produkt_text), 0, 'L', 0, $produkt_text_cell_width);

+		$height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width);

 		

 		//$height += 3 + 5 + $pdf->getY() - $height_y;

 		//$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L');

@@ -279,28 +279,8 @@
 		

 		$pdf->setXY($prod_left + 112, $prod_top + $offset);

 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');

-		

-		// Preis eines Produktes

-		if ($this->view['basket']['noMwSt'] == '1')

-		{

-			

-			// Innergemeinschaftliche Lieferung, hier Netto Preis

-			$preis = $p['preis_netto'];

-			

-		}

-		else

-		{

-			

-			if ($this->getFrontendTaxview() == WPSG_BRUTTO || $this->get_option('wpsg_kleinunternehmer') == '1')

-			{

-				$preis = $p['preis_brutto'];

-			}

-			else

-			{

-				$preis = $p['preis_netto'];			

-			}

-			

-		}

+						

+		$preis = $p['preis'];

 		

 		$pdf->setXY($prod_left + 127, $prod_top + $offset);

 		$pdf->Cell(25, 8, wpsg_ff($preis, $this->get_option('wpsg_currency')), 0, 0, 'R');

@@ -325,7 +305,7 @@
 			$pdf->SetFont('Arial', 'I', 9);

 			

 			$cellY = $pdf->getY();

-			$pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, utf8_encode($produktBeschreibung), 0, 'L', 0, $produkt_text_cell_width);			

+			$pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width);			

 			$pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1;

 			$pdf->SetFont('Arial', '', 9);

 			

@@ -341,7 +321,7 @@
 			

 			$variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));

 

-			$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key'])), 0, 'L', 0, $produkt_text_cell_width);			

+			$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);			

 			

 			//$height += 5;

 			

@@ -360,7 +340,7 @@
 				if ($deliveryTimeProduct !== false)

 				{

 				

-					$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct))), 0, 'L', 0, $produkt_text_cell_width);

+					$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct)), 0, 'L', 0, $produkt_text_cell_width);

 					

 				}

 									

@@ -780,7 +760,7 @@
 	if ($this->get_option('wpsg_kleinunternehmer') == '1')

 	{

  

-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, utf8_encode($this->get_option('wpsg_kleinunternehmer_text'))); 

+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, $this->get_option('wpsg_kleinunternehmer_text')); 

 		$offset += 15;

 		

 	}

@@ -797,9 +777,7 @@
 			

 			$offset += 10; 

 			

-			$pdf->MultiCell($prod_left, $prod_top + $offset, 5, utf8_encode(

-				wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date))

-			));

+			$pdf->wpsg_MultiCell($prod_left, $prod_top + $offset, 5, wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date)));

 

 			$offset += 5;

 			

@@ -812,7 +790,8 @@
 	if ($this->view['fussText'] != "")

 	{

 	

-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));

+		//$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));		

+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']);

 		$pdf->SetFont('Arial', 'B', 9);

 		$offset += 10;	

 		

@@ -843,7 +822,7 @@
 		

 		

 		$start = $pdf->getY();

-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($shipping_adress), 0, 'L', 0, 100);

+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $shipping_adress, 0, 'L', 0, 100);

 		$offset += $pdf->getY() - $start;

 		

 		$shipping_adress = true;

@@ -864,7 +843,7 @@
 		foreach ($bvars as $bvars_id => $bvars_value)

 		{

 				

-			$bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."'");

+			$bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."' ORDER BY `pos` ASC, `id` ASC ");

 			

 			if ($bvars['typ'] == "1") // Auswahl

 			{

@@ -887,7 +866,7 @@
 		$pdf->SetFont('Arial', 'B', 9);	

 		$pdf->Text($prod_left, $prod_top + $offset, __("Angaben während der Bestellung", "wpsg").":");

 		$pdf->SetFont('Arial', '', 9);

-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($strBVars));

+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $strBVars);

 		

 	}