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 +
 views/mods/mod_rechnungen/rechnung_pdf.phtml       |  17 ++++
 views/mods/mod_rechnungen/settings_edit.phtml      |   5 +
 views/produkttemplates/standard.phtml              |  38 ++++---
 views/warenkorb/checkout.phtml                     | 110 ++++++++++++---------
 6 files changed, 136 insertions(+), 56 deletions(-)

(limited to 'views')

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'),
diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml
index 768895d..cc9197f 100644
--- a/views/mods/mod_rechnungen/rechnung_pdf.phtml
+++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml
@@ -317,7 +317,24 @@
 		} 
 					
 		$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_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml
index 433e0de..c1d3c1e 100644
--- a/views/mods/mod_rechnungen/settings_edit.phtml
+++ b/views/mods/mod_rechnungen/settings_edit.phtml
@@ -194,6 +194,11 @@
 			<?php echo wpsg_drawForm_Input('wpsg_rechnungen_faelligkeit', __('Fälligkeit in Tagen', 'wpsg'), $this->get_option('wpsg_rechnungen_faelligkeit'), array('help' => 'wpsg_rechnungen_faelligkeit')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_rechnungen_pdfperpage', __('Anzahl an Produkten pro Seite (PDF)', 'wpsg'), $this->get_option('wpsg_rechnungen_pdfperpage'), array('help' => 'wpsg_rechnungen_pdfperpage')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_rechnungen_pbeschreibung', __('Produktbeschreibung auf Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_rechnungen_pbeschreibung'), array('help' => 'wpsg_rechnungen_pbeschreibung')); ?>
+			
+			<?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_rechnungen_showgutschriftrechnung', __('Rechnungsnummer auf Rechnungskorrektur anzeigen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showgutschriftrechnung'), array('help' => 'wpsg_mod_rechnungen_showgutschriftrechnung')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showpv', __('Produktvariablen auf Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showpv'), array('help' => 'wpsg_mod_rechnungen_showpv')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_rechnungen_showov', __('Bestellvariablen auf Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_rechnungen_showov'), array('help' => 'wpsg_mod_rechnungen_showov')); ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 78645fa..e361bfd 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -133,29 +133,43 @@
 				<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
 				<?php if ($this->view['data']['storeproduct'] >= '1') {?>
 					
-					<span class="wpsg_product_only_store"><?php  echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span><br />
+					<span class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></span>
+                    <?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>
+                    &nbsp;<a href="<?php echo get_permalink($this->get_option('wpsg_page_mod_deliverytime_storelink')); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+                    <?php } ?>
+                    <br />
 				
 				<?php } else {?>
-				
 					<div class="wpsg_mod_deliverytime">
-						<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
-							<?php echo $this->view['data']['wpsg_mod_deliverytime_deliverytime']; ?>
-						<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
-						 	<?php echo wpsg_translate(__('Lieferzeit: #1# Tage(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
-						<?php } else { /* Sonst sofort lieferbar */ ?>
-							<?php echo wpsg_translate(__('Das Produkt ist sofort lieferbar', 'wpsg')); ?>
+						<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
+						
+							<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
+								<?php echo $this->view['data']['wpsg_mod_deliverytime_deliverytime']; ?>
+							<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
+							 	<?php echo wpsg_translate(__('Lieferzeit: #1# Tage(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
+							<?php } else { /* Sonst sofort lieferbar */ ?>
+								<?php echo wpsg_translate(__('Das Produkt ist sofort lieferbar', 'wpsg')); ?>
+							<?php } ?>
+						
+						<?php } else {?>						
+						
+							<?php if (wpsg_isSizedString($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { ?>
+								<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->view['data']['wpsg_mod_deliverytime_deliverytime']); ?>
+							<?php } else { ?>
+								<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_select_values')); ?>
+							<?php } ?>	
+						
 						<?php } ?>
+						
 					</div>
 					
-					<?php /* Hinweistext f�r Verz�gerung in der Lieferzeit */ ?>
+					<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
 					<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 						<div class="wpsg_mod_deliverytime_delay">
-							<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verz�gerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+							<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
 						</div>
 					<?php } ?>
-				
 				<?php } ?>
-				
 			<?php } ?>
 			<?php /* Lieferzeit Anzeige ENDE */ ?>
 						
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
index 8935b5c..7c2c5b1 100644
--- a/views/warenkorb/checkout.phtml
+++ b/views/warenkorb/checkout.phtml
@@ -1,13 +1,12 @@
 <?php
 
 	/**
-	 * Template für den ersten Schritt der Kasse
+	 * Template für den ersten Schritt der Kasse
 	 * Kundendaten etc.
 	 */
-	
+ 
 	//wpsg_debug($this->view);
-
-?>
+?>	
 <script type="text/javascript">/* <![CDATA[ */
 
 	jQuery(document).ready(function() {
@@ -60,6 +59,21 @@
 		} );
 		
 	} );
+
+	/* Checkout aktiv, wird Passwortabfrage für Kundenkonto angezeigt */
+	function setVisibility2(id) {
+		
+		if(document.getElementById('bt2').value=='Hide Layer'){
+
+			document.getElementById('bt2').value = 'Show Layer';
+			document.getElementById(id).style.display = 'none';
+
+		}else{
+			
+			document.getElementById('bt2').value = 'Hide Layer';
+			document.getElementById(id).style.display = 'inline';
+		}
+	} 
 		
 /* ]]> */</script>
 
@@ -78,20 +92,27 @@
 			
 			<?php /*Wenn Kunden eingeloggt, oder wenn Kunde nicht eingeloggt */ ?>
 			<?php if ($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn')) { ?>
-				<h2><?php echo __('Bitte überprüfen Sie Ihre Kundendaten','wpsg');?></h2>
+				<h2><?php echo __('Bitte überprüfen Sie Ihre Kundendaten','wpsg');?></h2>
 			<?php } else { ?>		
 				<h2><?php echo __('Bitte geben Sie Ihre Kundendaten ein', 'wpsg'); ?></h2>
 			<?php } ?>
-			
+					
 			<div class="wpsg_spacer"></div>
 		
 			<div class="wpsg_inner">
-					
+		
+				<div class="wpsg_checkoutblock" id="wpsg_firma">
+					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />
+				</div>
+			
 				<div class="wpsg_checkoutblock" id="wpsg_anrede">
 					<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
 					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>
 					<select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_title" name="wpsg[checkout][title]">
-						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
+						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
 						<?php foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
 						<option value="<?php echo wpsg_hspc($t); ?>" <?php echo (($this->view['basket']['checkout']['title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option>
 					<?php } ?>						
@@ -128,27 +149,27 @@
 				</div>
 				<?php } ?>
 				
-				<div class="wpsg_checkoutblock" id="wpsg_telefon">
-					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-					</label>
-					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />
-				</div>
-				
 				<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
 					<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>
 					<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[checkout][geb]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['geb']); ?>" />
 				</div>
+						
+				<div class="wpsg_checkoutblock" id="wpsg_fax">
+					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					</label>
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />
+				</div>
 				
-				<div class="wpsg_checkoutblock" id="wpsg_firma">
-					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<div class="wpsg_checkoutblock" id="wpsg_telefon">
+					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
+					<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
-					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />
 				</div>
-								
+			
 				<div class="wpsg_checkoutblock" id="wpsg_strasse">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Strasse Nr.", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
@@ -175,19 +196,12 @@
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>					
 					<select name="wpsg[checkout][land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_land">
-						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
+						<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
 						<?php foreach ($this->view['laender'] as $l) { ?>
 						<option value="<?php echo wpsg_hspc($l['id']); ?>" <?php echo (($l['id'] == $this->view['basket']['checkout']['land'])?'selected="selected"':((!wpsg_isSizedInt($this->view['basket']['checkout']['land']) && $this->get_option('wpsg_defaultland') == $l['id'])?'selected="selected"':'')); ?>><?php echo wpsg_hspc(__($l['name'], 'wpsg')); ?></option>
 						<?php } ?>
 					</select>
 				</div>
-						
-				<div class="wpsg_checkoutblock" id="wpsg_fax">
-					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
-					</label>
-					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />
-				</div>		
 				
 				<div class="wpsg_checkoutblock" id="wpsg_ustidnr">
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
@@ -202,20 +216,20 @@
 				<div class="wpsg_checkoutblock">
 					<label class="wpsg_cv wpsg_checkout" for="wpsg_cv_<?php echo $c_id; ?>">
 						<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
-						<?php if ($c['typ'] == '0') { // Textfeld ?>
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
-						<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
-						<select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]">
-							<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
-							<?php foreach ((array)$arAuswahl as $a) { ?>
-							<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
-							<?php } ?>
-						</select>
-						<?php } else if ($c['typ'] == '2') { // Checkbox ?>
-						<input type="hidden" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="0" />
-						<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
-						<?php } ?>
-					</label>
+                    </label>
+                    <?php if ($c['typ'] == '0') { // Textfeld ?>
+                    <input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['basket']['checkout']['custom'][$c_id]); ?>" />
+                    <?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
+                    <select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[checkout][custom][<?php echo $c_id; ?>]">
+                        <option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
+                        <?php foreach ((array)$arAuswahl as $a) { ?>
+                        <option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+                        <?php } ?>
+                    </select>
+                    <?php } else if ($c['typ'] == '2') { // Checkbox ?>
+                    <input type="hidden" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="0" />
+                    <input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[checkout][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['basket']['checkout']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
+                    <?php } ?>
 				</div>
 				<?php } } ?>
 				<?php } ?>
@@ -225,7 +239,15 @@
 				<?php /* $this->callMods('checkout_customer_inner'); START */ ?>
 				
 				<?php /* Passwortabfrage für Neuregistrierung */ ?>
-				<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); ?>
+
+				<label for="checkout_login"><br />
+		       		<input type=checkbox name=type id='bt2' value='Show Layer' onclick="setVisibility2('sub4')">
+            		<span class="wpsg-checkbox-label">Ich möchte ein Kundenkonto anlegen.</span>
+       			</label>         
+				<div id="sub4" class="wpsg_checkout_login_aktiv">    
+    				<?php echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); ?>
+       			</div>
+				<?php /*echo $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_customer_inner'); */ ?>
 				
 				<?php /* Abfrage Satollo-Newsletter */ ?>
 				<?php echo $this->callMod('wpsg_mod_nlsatolo', 'checkout_customer_inner'); ?>
@@ -262,7 +284,7 @@
 			 
 		<?php $this->ClearSessionErrors(); ?>
 			 		
-		<input type="submit" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>'; return false;" class="wpsg_button wpsg_basketbutton" value="<?php echo __('zurück zum Warenkorb', 'wpsg'); ?>" name="wpsg_redirect_basket" />
+		<input type="submit" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>'; return false;" class="wpsg_button wpsg_basketbutton" value="<?php echo __('zurück zum Warenkorb', 'wpsg'); ?>" name="wpsg_redirect_basket" />
 		<input type="submit" id="wpsg_checkout2button" class="wpsg_button wpsg_checkout2button" value="<?php echo __('weiter', 'wpsg'); ?>" name="wpsg_checkout" />
 		
 		<div class="wpsg_clear"></div>
-- 
cgit v1.2.3