- Ticket 617: Nicht anzeigen in Overview

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

1 files changed, 79 insertions, 22 deletions

diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 932adfb..d0ee170 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -2,7 +2,7 @@
 

 	/**

 	 * Template für die Zusammenfassung der Bestellung

-	 * Anzeige vor dem Abschluß einer Bestellung

+	 * Anzeige vor dem Abschluss einer Bestellung

 	 */

 

 	//wpsg_debug($this->view['basket']);

@@ -54,14 +54,33 @@
 			<div class="subtitle"><?php echo __('Rechnungsanschrift', 'wpsg'); ?>&nbsp;

 				<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 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 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']['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>

 		<div class="wpsg_clear"></div><br />

@@ -70,14 +89,33 @@
 			<div class="subtitle"><?php echo __('Lieferanschrift', 'wpsg'); ?>&nbsp;

 				<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 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 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']['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>

 		<div class="wpsg_clear"></div><br />

@@ -92,14 +130,33 @@
 				<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>

 				<?php } ?>

 			</div>

-			<?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>

-			<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />

+			<?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 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']['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>

 		<div class="wpsg_clear"></div><br />