From ca796d394a1abaf848ef6e436121bfabad7f0c2e Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 11 Aug 2020 04:42:30 +0000
Subject: #4.2.6 - Bugfix: Falsche Bilder beim hinzufügen von Bilder im
 Warenkorblayer (Theme)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7756 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/warenkorb/checkout2.phtml | 2 ++
 views/warenkorb/index.phtml     | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'views/warenkorb')

diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml
index 4e5b205..442dafb 100644
--- a/views/warenkorb/checkout2.phtml
+++ b/views/warenkorb/checkout2.phtml
@@ -49,6 +49,8 @@
  			</div>
 		
 		</div>
+
+        <br /><br />
 						 
 		<?php if ($this->callMods('checkout_handlePayment') === true) { ?>
 				
diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
index 395411e..a9f5ee1 100644
--- a/views/warenkorb/index.phtml
+++ b/views/warenkorb/index.phtml
@@ -78,8 +78,11 @@
 				<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 (get_the_ID() !== intval($this->get_option('wpsg_page_basket'))) { ?>>
 		<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 } ?>
+
 	<?php } else { ?>
 		<?php echo __("Keine Artikel im Warenkorb", "wpsg"); ?><br />
 	<?php } ?>
@@ -96,7 +99,7 @@
 	<ul>
 		<?php if ($this->hasMod('wpsg_mod_request') == '1') { ?>
 			<?php if ($this->view['widget_settings']['wpsg_requestpage'] == 1) { ?>
-				<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_REQUEST); ?>"><?php echo get_the_title($this->get_option('wpsg_page_request')); ?></a></li>
+				<li class="page_item"><a href="<?php echo $this->f(wpsg_ShopController::URL_REQUEST); ?>"><?php echo get_the_title($this->get_option('wpsg_page_request')); ?></a></li>
 			<?php } ?>
 		<?php } ?>
 		<?php if ($this->view['widget_settings']['wpsg_agbpage'] == 1) { ?>
-- 
cgit v1.2.3