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/mods/mod_amazon/order_done.phtml             | 17 +++++++--------
 .../mods/mod_amazon/order_view_afterpayment.phtml  | 24 ++++++++++++++++++++++
 .../mod_micropayment_paywindow/settings_edit.phtml |  2 +-
 views/warenkorb/checkout2.phtml                    |  2 ++
 views/warenkorb/index.phtml                        |  7 +++++--
 5 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 views/mods/mod_amazon/order_view_afterpayment.phtml

diff --git a/views/mods/mod_amazon/order_done.phtml b/views/mods/mod_amazon/order_done.phtml
index a0eb843..80665c9 100644
--- a/views/mods/mod_amazon/order_done.phtml
+++ b/views/mods/mod_amazon/order_done.phtml
@@ -20,7 +20,7 @@
 
 <div id="PayWithAmazon" style="<?php echo (($this->view['wpsg_mod_amazon']['state'] === wpsg_mod_amazon::ORDER_DONE_GO)?'display:none':''); ?>"></div>
 
-<script type="text/javascript">/* <![CDATA[ */
+<script type="text/javascript">
  
 	var authRequest; 
 
@@ -52,8 +52,7 @@
 
 	var autoRun = setInterval(function(){ 
 
-		if (jQuery('#PayWithAmazon img').length > 0)
-		{
+		if (jQuery('#PayWithAmazon img').length > 0) {
 
 			//setTimeout(function(){ jQuery('#PayWithAmazon img').click(); }, 1000);
 			clearInterval(autoRun);
@@ -62,7 +61,7 @@
 
 	}, 100);
 
-/* ]]> */</script>
+</script>
 	
 <?php } ?>
 
@@ -74,15 +73,17 @@
 	<input type="hidden" name="wpsg_done" value="<?php echo $_REQUEST['wpsg_done']; ?>" />	
 	<input type="hidden" name="amazon[OrderReference]" id="wpsg_mod_amazon_OrderReference" value="" />
 	
-	<div id="walletWidgetDiv"></div>
+	<div id="walletWidgetDiv"></div><br />
 	
 	<input type="submit" class="wpsg_button" name="submit" value="<?php echo __('Zahlung durchführen', 'wpsg'); ?>" id="wpsg_mod_amazon_doPayment" style="display:none;" />
 	<div class="wpsg_clear"></div>
 	
 </form>
 
-<script type="text/javascript">/* <![CDATA[ */
-                                            
+<script>
+
+    jQuery('#walletWidgetDiv').show();
+
 	new OffAmazonPayments.Widgets.Wallet( {
 
 		sellerId: '<?php echo $this->get_option('wpsg_mod_amazon_seller_id'); ?>',
@@ -117,5 +118,5 @@
 	    	    
 	} ).bind("walletWidgetDiv");
 	    	
-/* ]]> */</script>
+</script>
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_amazon/order_view_afterpayment.phtml b/views/mods/mod_amazon/order_view_afterpayment.phtml
new file mode 100644
index 0000000..5033df6
--- /dev/null
+++ b/views/mods/mod_amazon/order_view_afterpayment.phtml
@@ -0,0 +1,24 @@
+<?php
+
+	/**
+	 * Template für die Integration der Amazon Zahlungsart in die Bestellverwaltung
+	 */
+
+	/** @var wpsg_order $oOrder */
+	$oOrder = $this->view['oOrder'];
+
+	$amazon_capture_id = $oOrder->getMeta('amazon_capture_id');
+	$amazon_refund_id = $oOrder->getMeta('amazon_refund_id');
+
+?>
+
+<?php if (wpsg_isSizedString($amazon_refund_id)) { ?>
+
+	<?php echo wpsg_drawForm_Input(false, __('Refund ID', 'wpsg'), $amazon_refund_id, ['readonly' => true]); ?>
+
+<?php } else if (wpsg_isSizedString($amazon_capture_id)) { ?>
+
+	<?php echo wpsg_drawForm_Input(false, __('Capture ID', 'wpsg'), $amazon_capture_id, ['readonly' => true]); ?>
+
+<?php }
+
diff --git a/views/mods/mod_micropayment_paywindow/settings_edit.phtml b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
index 2fa7eb5..224f120 100644
--- a/views/mods/mod_micropayment_paywindow/settings_edit.phtml
+++ b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
@@ -13,7 +13,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_notification_password', __('Benachrichtigungs-Kennwort (notification_password)', 'wpsg'), $view['notification_password'], ['readonly' => true]); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_paywindow_page_error', __('Fehlerseite', 'wpsg'), $view['arPages'], $this->get_option('wpsg_mod_micropayment_paywindow_page_error'), array('help' => 'wpsg_mod_micropayment_paywindow_page_error')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_paytitle', __('Titel der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_paytitle'), ['placeholder' => $view['default_pay_title'], 'hint' => __('Maximal 150 Zeichen', 'wpsg')]); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_paytext', __('Titel der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_paytext'), ['placeholder' => $view['default_pay_text'], 'hint' => __('Maximal 250 Zeichen', 'wpsg')]); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_paytext', __('Text der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_paytext'), ['placeholder' => $view['default_pay_text'], 'hint' => __('Maximal 250 Zeichen', 'wpsg')]); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paywindow_sandbox', __('Testmodus', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_sandbox')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_autorun', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_micropayment_autorun')); ?>
 
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