From e9cd93a5ba05b1f2b1216aba0fba86ac5977beaf Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Fri, 16 Sep 2016 14:27:47 +0000
Subject: - Lieferzeitanzeige korigiert - Produktattribute auf Rechnung und
 Lieferschein

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5765 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverynote/deliverynote_pdf.phtml | 17 +++++++++++++++++
 views/mods/mod_deliverynote/settings_edit.phtml    |  5 +++++
 2 files changed, 22 insertions(+)

(limited to 'views/mods/mod_deliverynote')

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 4bcf5c2..4905c8a 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -279,6 +279,23 @@
 			
 		$height += $pBeschreibungHeight;
 		
+		/**
+		 * Produktattribute ?
+		 */
+		if ($this->get_option('wpsg_rechnungen_produktattribute') == '1')
+		{
+				
+			$attributeInfo = $this->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->getProduktId($p['id'])));
+		
+			foreach ($attributeInfo as $pa)
+			{
+					
+				$pa_text = $pa['name'].': '.$pa['value'];
+				$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, $pa_text, 0, 'L', 0, $produkt_text_cell_width);
+					
+			}
+		}
+		
 		/**
 		 * Variante ?
 		 */
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index a1e63bb..5d1b654 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -129,6 +129,11 @@
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_nr', __('Start für Lieferscheinnummer', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_nr'), array('help' => 'wpsg_mod_deliverynote_nr')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_url', __('URL Für URL Benachrichtigung', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_url'), array('help' => 'wpsg_mod_deliverynote_url')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_url_standard', __('URL Benachrichtigung standardmäßig aktiv', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_url_standard'), array('help' => 'wpsg_mod_deliverynote_url_standard')); ?>
+			
+			<?php if ($this->hasMod('wpsg_mod_produktattribute') == '1') {?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_rechnungen_produktattribute', __('Produktattribute auf der Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_rechnungen_produktattribute'), array('help' => 'wpsg_rechnungen_produktattribute')); ?>			
+			<?php }?>
+			
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_hideCountry', __('Land auf Lieferschein verbergen', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_hideCountry'), array('help' => 'wpsg_mod_deliverynote_hideCountry')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_mod_deliverynote_anr', __('Artikelnummer anzeigen', 'wpsg'), array(
 				'0' => __('Nicht anzeigen', 'wpsg'),
-- 
cgit v1.2.3