Index: /changelog
===================================================================
--- /changelog	(revision 7128)
+++ /changelog	(revision 7130)
@@ -142,4 +142,6 @@
 - Bugfix: Speicherprobleme bei Profildaten (Frontend) 
 - Bugfix: Darstellungsfehler Versandkostenfrei
+- Bugfix: Kundendatenoption "nicht anzeigen" greift auf Overview
+- Bugfix: Versand per Mail wird nicht mehr von Versandkostenfrei und Selbstabholung unterdrÃŒckt
 - Feature: Satolo Newsletter-Registrierung mittels Double-OptIn
 - Feature: Satolo Newsletter-Abonnenten in gewÀhlte Liste integrieren
Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7128)
+++ /controller/wpsg_BasketController.class.php	(revision 7130)
@@ -320,4 +320,6 @@
 				
 			}
+			
+			$this->shop->view['pflicht'] = $this->shop->loadPflichtFeldDaten();
 			
 			$this->shop->view['error'] = $_SESSION['wpsg']['errorFields'];
Index: /views/warenkorb/overview.phtml
===================================================================
--- /views/warenkorb/overview.phtml	(revision 7128)
+++ /views/warenkorb/overview.phtml	(revision 7130)
@@ -3,5 +3,5 @@
 	/**
 	 * Template fÃŒr die Zusammenfassung der Bestellung
-	 * Anzeige vor dem Abschluß einer Bestellung
+	 * Anzeige vor dem Abschluss einer Bestellung
 	 */
 
@@ -55,12 +55,31 @@
 				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
 			</div>
-			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
-			<?php } ?>
-			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
-			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
-			<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+			<?php if ($this->view['pflicht']['firma'] != '2') { ?>
+				<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
+					<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
+				<?php } ?>
+			<?php } ?>
+			<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
+				<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> 		
+			<?php } ?>
+			<?php if ($this->view['pflicht']['vname'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> 
+			<?php } ?>
+			<?php if ($this->view['pflicht']['name'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> 
+			<?php } ?>
+			<?php if ($this->view['pflicht']['ort'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
+			<?php }?>
+			<?php if ($this->view['pflicht']['land'] != '2') { ?>
+				<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
+					<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+				<?php } ?>
 			<?php } ?>
 		</div>
@@ -71,12 +90,31 @@
 				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
 			</div>
-			<?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_firma']); ?><br />
-			<?php } ?>
-			<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['shipping_title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_ort']); ?><br />
-			<?php if (wpsg_isSizedArray($this->view['basket']['shipping_land'])) { ?>
-			<?php echo wpsg_hspc($this->view['basket']['shipping_land']['name']); ?>
+			<?php if ($this->view['pflicht']['firma'] != '2') { ?>
+				<?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>
+					<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_firma']); ?><br />
+				<?php } ?>
+			<?php } ?>
+			<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
+				<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['shipping_title']]:''); ?> 
+			<?php } ?>
+			<?php if ($this->view['pflicht']['vname'] != '2') { ?>	
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> 
+			<?php } ?>
+			<?php if ($this->view['pflicht']['name'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_strasse']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?> 
+			<?php } ?>
+			<?php if ($this->view['pflicht']['ort'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_ort']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['land'] != '2') { ?>
+				<?php if (wpsg_isSizedArray($this->view['basket']['shipping_land'])) { ?>
+					<?php echo wpsg_hspc($this->view['basket']['shipping_land']['name']); ?>
+				<?php } ?>
 			<?php } ?>
 		</div>
@@ -93,12 +131,31 @@
 				<?php } ?>
 			</div>
-			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
-			<?php } ?>
-			<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
-			<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
-			<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
-			<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+			<?php if ($this->view['pflicht']['firma'] != '2') { ?>
+				<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
+					<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
+				<?php } ?>
+			<?php } ?>
+			<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
+				<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?>
+			<?php } ?> 
+			<?php if ($this->view['pflicht']['vname'] != '2') { ?>
+				<?php echo $this->view['basket']['checkout']['vname']; ?>
+			<?php } ?>
+			<?php if ($this->view['pflicht']['name'] != '2') { ?>
+				<?php echo $this->view['basket']['checkout']['name']; ?><br />
+			<?php } ?>	
+			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?>
+			<?php } ?>
+			<?php if ($this->view['pflicht']['ort'] != '2') { ?>
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
+			<?php } ?>
+			<?php if ($this->view['pflicht']['land'] != '2') { ?>
+				<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
+					<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
+				<?php } ?>
 			<?php } ?>
 		</div>