From 5b1ca9301a829a2657e1686b7495ed23ed27ff03 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Tue, 23 Jan 2018 14:32:35 +0000
Subject: Ticket #506 Kundendaten-Abfrage ausblenden von Feldern

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6872 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_onepagecheckout/onepage.phtml       | 26 ++++++++++++++++++
 .../checkout_inner_prebutton.phtml                 | 16 +++++++++++
 views/warenkorb/checkout.phtml                     | 32 ++++++++++++++++++++--
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index 3f12539..adf38fe 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -116,13 +116,16 @@
 			
 			<div class="wpsg_inner">
 		
+				<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<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>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
 					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>
@@ -133,27 +136,34 @@
 					<?php } ?>						
 					</select>
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[checkout][vname]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['vname']); ?>" />		
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['name'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['name']); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['email']); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
 				<div class="wpsg_checkoutblock">
@@ -164,47 +174,59 @@
 				</div>
 				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<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>
+				<?php } ?>
 						
+				<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<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>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<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>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['strasse']); ?>" />		
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['plz']); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ort']); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php
 					$lhidden = '';
@@ -213,6 +235,7 @@
 					}
 				?>
 				
+				<?php if ($this->view['pflicht']['land'] != '2') { ?>
 				<div class="wpsg_checkoutblock" <?php echo $lhidden;?>>
 					<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
@@ -224,13 +247,16 @@
 						<?php } ?>
 					</select>
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
 				<?php if ($this->get_option('wpsg_kundenvariablen_show') == '1') { ?>
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index 7209b59..a506c92 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -17,13 +17,16 @@
 		
 		<div class="checkout_shippingadress" style="display:none;"> 
 		
+			<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="firma" class="wpsg_checkout"><?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("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_firma'])); ?>" />
 			</div>
+			<?php } ?>
 		
+			<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="title" class="wpsg_checkout"><?php echo __("Anrede:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
@@ -35,42 +38,54 @@
 				<?php } ?>
 				</select>
 			</div>
+			<?php } ?>
 			
+			<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_vname'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['name'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_name'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />		
 			</div>
+			<?php } ?>
 			
+			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_plz'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_ort'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['land'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="shipping_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
@@ -82,6 +97,7 @@
 					<?php } ?>
 				</select>
 			</div>
+			<?php } ?>
 		 
 			<script type="text/javascript">/* <![CDATA[ */
 					
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml
index 73feeb0..2df4ea2 100644
--- a/views/warenkorb/checkout.phtml
+++ b/views/warenkorb/checkout.phtml
@@ -70,7 +70,7 @@
 		
 	<form id="form-step2" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">
 
-		<?php /* Einbindung des Logins im Checokut */ ?>	
+		<?php /* Einbindung des Logins im Checkout */ ?>	
 		<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>
 	
 		<div class="wpsg_box" id="wpsg_box_kundendaten">
@@ -86,13 +86,16 @@
 		
 			<div class="wpsg_inner">
 		
+				<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 				<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(wpsg_getStr($this->view['basket']['checkout']['firma'])); ?>" />
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 				<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>
@@ -103,28 +106,36 @@
 					<?php } ?>						
 					</select>
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_vorname">
 					<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[checkout][vname]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['vname'])); ?>" />		
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['name'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_name">
 					<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
 					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['name'])); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_email">
 					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['email'])); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_email2">
 					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung:)", "wpsg"); ?> 
@@ -133,49 +144,63 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email2" name="wpsg[checkout][email2]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['email2'])); ?>" />
 				</div>
 				<?php } ?>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 				<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(wpsg_getStr($this->view['basket']['checkout']['geb'])); ?>" />
 				</div>
+				<?php } ?>
 						
+				<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 				<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(wpsg_getStr($this->view['basket']['checkout']['fax'])); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 				<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(wpsg_getStr($this->view['basket']['checkout']['tel'])); ?>" />
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_strasse">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />		
 				</div>
+				<?php } ?>
 			
+				<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">
 					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['plz'])); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_ort">
 					<label for="ort" class="wpsg_checkout"><?php echo __("Ort:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ort'])); ?>" />
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['land'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_land">
 					<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
@@ -187,13 +212,16 @@
 						<?php } ?>
 					</select>
 				</div>
+				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_ustidnr">
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.:", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
 				<?php if ($this->get_option('wpsg_kundenvariablen_show') == '1') { ?>
@@ -208,7 +236,7 @@
                     <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>
+                        <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 ?>
-- 
cgit v1.2.3