From ad89a305b97f363ce505fd4d09813e450766ce2b Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Wed, 17 Oct 2018 08:34:28 +0000
Subject: - fehlender Warenkorbbutton im Widget, nachdem ein Produkt in den
 Warenkorb gelegt wurde

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7187 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/index.phtml | 138 ++++++++++++++++++++++----------------------
 1 file changed, 68 insertions(+), 70 deletions(-)

diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
index e8a178a..2bcccf1 100644
--- a/views/warenkorb/index.phtml
+++ b/views/warenkorb/index.phtml
@@ -10,80 +10,78 @@
 	<br />
  
 	<?php if ($this->view['countArtikel'] > 0) { ?> 
-	<?php echo $this->view['countArtikel']; ?> <?php echo __("Artikel für", "wpsg"); ?> <?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?> <?php echo __("im Warenkorb", "wpsg"); ?>
-	<br /><br />
-	<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
-	
-		<input type="hidden" name="subaction" value="index" />
-	
-		<table>		
-			<?php foreach ($this->view['basket']['produkte'] as $p) { ?>
-			<tr> 
-				<td class="wpsg_cell_name"><a href="<?php echo $this->getProduktLink($p); ?>">
-					<?php 
-					
-						echo $p['menge'].' x '.((strlen($p['name']) > 13)?mb_substr($p['name'], 0, 30).'..':$p['name']);
+		<?php echo $this->view['countArtikel']; ?> <?php echo __("Artikel für", "wpsg"); ?> <?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?> <?php echo __("im Warenkorb", "wpsg"); ?>
+		<br /><br />
+		<form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
+		
+			<input type="hidden" name="subaction" value="index" />
+		
+			<table>		
+				<?php foreach ($this->view['basket']['produkte'] as $p) { ?>
+				<tr> 
+					<td class="wpsg_cell_name"><a href="<?php echo $this->getProduktLink($p); ?>">
+						<?php 
 						
-					?></a>
-				</td>
-				<td class="wpsg_cell_amount">
-					<?php
-					 
-						echo wpsg_ff(($p['preis'] * $p['menge']), $this->get_option('wpsg_currency'));
+							echo $p['menge'].' x '.((strlen($p['name']) > 13)?mb_substr($p['name'], 0, 30).'..':$p['name']);
+							
+						?></a>
+					</td>
+					<td class="wpsg_cell_amount">
+						<?php
 						 
-					?>
-				</td>
-			</tr>
-			<?php } ?>
-			<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
-			<tr>
-				<td class="wpsg_cell_name">
-					<?php echo __('Rabatt', 'wpsg'); ?>	
-				</td>
-				<td class="wpsg_cell_amount">
-					<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
-				</td>
-			</tr>
-			<?php } ?>
-			<?php if (isset($this->view['basket']['gs'])) { // Gutschein vorhanden ?>
-			<tr>
-				<td class="wpsg_cell_name">
-					<?php echo __('Gutschein', 'wpsg'); ?>
-					<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
-					(<?php echo $this->view['basket']['gs']['value']; ?>%)
-					<?php } ?>
-				</td>
-				<td class="wpsg_cell_amount">
-					<?php 
-						
-						echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
-						
-					?>
-				</td>
-			</tr>
+							echo wpsg_ff(($p['preis'] * $p['menge']), $this->get_option('wpsg_currency'));
+							 
+						?>
+					</td>
+				</tr>
+				<?php } ?>
+				<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+				<tr>
+					<td class="wpsg_cell_name">
+						<?php echo __('Rabatt', 'wpsg'); ?>	
+					</td>
+					<td class="wpsg_cell_amount">
+						<?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+					</td>
+				</tr>
+				<?php } ?>
+				<?php if (isset($this->view['basket']['gs'])) { // Gutschein vorhanden ?>
+				<tr>
+					<td class="wpsg_cell_name">
+						<?php echo __('Gutschein', 'wpsg'); ?>
+						<?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
+						(<?php echo $this->view['basket']['gs']['value']; ?>%)
+						<?php } ?>
+					</td>
+					<td class="wpsg_cell_amount">
+						<?php 
+							
+							echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+							
+						?>
+					</td>
+				</tr>
+				<?php } ?>
+				<tr class="wpsg_row_summary">
+					<td class="wpsg_cell_name"><?php echo __("Gesamt", "wpsg"); ?>:</td>
+					<td class="wpsg_cell_amount"><?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?></td>
+				</tr>
+			</table>
+		</form> 
+			
+		<span class="wpsg_tax_note">
+			<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
+				<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
+			<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
+				<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
+			<?php } else { ?>
+				<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
 			<?php } ?>
-			<tr class="wpsg_row_summary">
-				<td class="wpsg_cell_name"><?php echo __("Gesamt", "wpsg"); ?>:</td>
-				<td class="wpsg_cell_amount"><?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?></td>
-			</tr>
-		</table>
-	</form> 
-		
-	<span class="wpsg_tax_note">
-		<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
-		<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
-		<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
-		<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
-		<?php } else { ?>
-		<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
-		<?php } ?>
-	</span>
-		
-	<?php if ($this->get_option('wpsg_page_basket') != wpsg_get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
-	<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
-	<?php } ?>
+		</span>
+			
+		<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
 	<?php } else { ?>
-	<?php echo __("Keine Artikel im Warenkorb", "wpsg"); ?><br />
+		<?php echo __("Keine Artikel im Warenkorb", "wpsg"); ?><br />
 	<?php } ?>
 	
 	<div class="wpsg_clear"></div><br />
-- 
cgit v1.2.3