From b2b88e83f3fc509a0fe65ac48ca5b6c2af20f9b6 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 1 Sep 2016 06:32:06 +0000
Subject: - Ticket #481 - Feature - PayPal PLUS - Währungscode in den
 Moduleinstellungen definierbar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5731 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_paypalapi/order_done.phtml    | 52 ++++++++++++++++++++++------
 views/mods/mod_paypalapi/settings_edit.phtml | 25 +++++++++++--
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/views/mods/mod_paypalapi/order_done.phtml b/views/mods/mod_paypalapi/order_done.phtml
index 871da98..1e232e9 100644
--- a/views/mods/mod_paypalapi/order_done.phtml
+++ b/views/mods/mod_paypalapi/order_done.phtml
@@ -16,16 +16,46 @@
 
 <?php } else { ?>
 
-	<?php echo __('Zahlung mittels der folgenden Zahlungsoption abschließen','wpsg'); ?>
-
-	<script src="https://www.paypalobjects.com/webstatic/ppplus/ppplus.min.js" type="text/javascript"></script>
-	<div id="wpsg_ppplus"></div>
-	    
-	<script type="application/javascript">/* <![CDATA[ */
-
-		<?php $this->view['wpsg_order_done'] = true; ?>
-		<?php $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/paypalplus.phtml'); ?>
-			
-	/* ]]> */</script> 
+    <div class="wpsg_clear"></div><br />
+    
+    <?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_plus_aktiv'))) { ?>
+        
+        <?php echo __('Zahlung mittels der folgenden Zahlungsoption abschließen','wpsg'); ?>
+            
+        <br />
+    
+        <script src="https://www.paypalobjects.com/webstatic/ppplus/ppplus.min.js" type="text/javascript"></script>
+        <div id="wpsg_ppplus"></div>
+            
+        <script type="application/javascript">/* <![CDATA[ */
+    
+            <?php $this->view['wpsg_order_done'] = true; ?>
+            <?php $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/paypalplus.phtml'); ?>
+                
+        /* ]]> */</script> 
 	
+    <?php } else { ?>
+    
+        <?php echo __('Um die Zahlung zu starten, klicken Sie bitte auf das PayPal Logo','wpsg'); ?>
+            
+        <div class="wpsg_clear"></div><br />
+            
+        <a href="<?php echo $this->view['wpsg_mod_paypalapi']['approval_url']; ?>">
+            <img src="<?php echo $this->getRessourceURL('gfx/pp-logo-big.png'); ?>" align="left" alt="<?php echo __('Mit PayPal bezahlen', 'wpsg'); ?>">
+        </a>
+    
+        <?php if ($this->get_option('wpsg_mod_paypalapi_autostart') == '1') { ?>
+        <script type="text/javascript">/* <![CDATA[ */
+         
+            jQuery(document).ready(function() { 
+                window.setTimeout(function() {
+                    location.href = "<?php echo $this->view['wpsg_mod_paypalapi']['approval_url']; ?>";
+                }, 1000);
+            } );
+        
+        /* ]]> */</script>
+        <?php } ?>
+            
+    <?php } ?>
+        
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml
index 55e15de..24a0cf0 100644
--- a/views/mods/mod_paypalapi/settings_edit.phtml
+++ b/views/mods/mod_paypalapi/settings_edit.phtml
@@ -21,6 +21,10 @@
 
 <br />
 
+<?php echo wpsg_drawForm_Input('wpsg_mod_paypalapi_currency', __('Währungscode (Standard: EUR)'), $this->get_option('wpsg_mod_paypalapi_currency'), array('help' => 'wpsg_mod_paypal_currency')); ?>
+
+<br />
+
 <?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypalapi', 'webHook', array(), true), array('readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_create',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_webhook_log', __('WebHook Anfragen protokollieren', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_webhook_log'), array('labelright' => true)); ?>
@@ -77,6 +81,11 @@
 	<br />
 </div>
 
+<div class="wpsg_mod_paypalapi_plus_inaktiv">
+-    <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_autostart'), array('help' => 'wpsg_shippay_paystart')); ?>
+-    
+-</div>
+
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress_details', __('Warenkorbdetails übertragen', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress_details'), array('help' => 'wpsg_mod_paypalapi_paypalexpress_details')); ?>
 
 <br />
@@ -120,8 +129,20 @@
 		
 		jQuery('#wpsg_mod_paypalapi_plus_aktiv').bind('change', function() {
 
-			if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_paypalapi_plus_aktiv').show();
-			else jQuery('.wpsg_mod_paypalapi_plus_aktiv').hide();
+			if (jQuery(this).is(':checked'))
+-            {
+-                
+-                jQuery('.wpsg_mod_paypalapi_plus_aktiv').show();
+-                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').hide();
+-                
+-            }
+-			else 
+-            {
+-             
+-                jQuery('.wpsg_mod_paypalapi_plus_aktiv').hide();
+-                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').show();
+-                
+-            }
 			
 		} ).change();
 		
-- 
cgit v1.2.3