Index: /mods/wpsg_mod_paypalapi.class.php
===================================================================
--- /mods/wpsg_mod_paypalapi.class.php	(revision 5728)
+++ /mods/wpsg_mod_paypalapi.class.php	(revision 5731)
@@ -30,4 +30,7 @@
 			$this->desc = __('Ermöglicht die Zahlungsart PayPal und PayPal PLUS, Ìber die REST API Schnittstelle und Login mit PayPal Express.', 'wpsg');
 		
+			// Wenn WÀhrungscode in den Einstellungen gesetzt ist dann diesen nehmen, sonst bleibt alles wie bisher bei EUR
+			if (wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypalapi_currency'))) $this->currency = $this->shop->get_option('wpsg_mod_paypalapi_currency');
+			
 		} // public function __construct()
 				
@@ -41,4 +44,5 @@
 			$this->shop->checkDefault('wpsg_mod_paypalapi_paypalexpress_subject', 'O%order_id% - K%kunde_id%', false, true);
 			$this->shop->checkDefault('wpsg_mod_paypalapi_paypalexpress_details', '1');
+			$this->shop->checkDefault('wpsg_mod_paypalapi_currency', 'EUR');
 					 			
 			$this->shop->checkDefault('wpsg_mod_paypalapi_experience_label', '%shopinfo_name%', false, true);
@@ -79,4 +83,5 @@
 			$this->shop->update_option('wpsg_mod_paypalapi_sandbox_clientid', $_REQUEST['wpsg_mod_paypalapi_sandbox_clientid']);
 			$this->shop->update_option('wpsg_mod_paypalapi_sandbox_secret', $_REQUEST['wpsg_mod_paypalapi_sandbox_secret']);
+			$this->shop->update_option('wpsg_mod_paypalapi_currency', $_REQUEST['wpsg_mod_paypalapi_currency']);
 			$this->shop->update_option('wpsg_mod_paypalapi_webhook_log', $_REQUEST['wpsg_mod_paypalapi_webhook_log']);
 			$this->shop->update_option('wpsg_mod_paypalapi_webhook_logfile', $_REQUEST['wpsg_mod_paypalapi_webhook_logfile']);
@@ -95,4 +100,5 @@
 			$this->shop->update_option('wpsg_mod_paypalapi_paypalexpress_forceSSL', $_REQUEST['wpsg_mod_paypalapi_paypalexpress_forceSSL']);
 			$this->shop->update_option('wpsg_mod_paypalapi_paypalexpress_details', $_REQUEST['wpsg_mod_paypalapi_paypalexpress_details']);
+			$this->shop->update_option('wpsg_mod_paypalapi_autostart', $_REQUEST['wpsg_mod_paypalapi_autostart']);
 			
 			$this->shop->update_option('wpsg_mod_paypalapi_experience_label', $_REQUEST['wpsg_mod_paypalapi_experience_label'], false, true);
@@ -445,5 +451,5 @@
 				
 				//if ($amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')))
-				if (in_array($payment_info['state'], array('approved', 'created')) && $amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')))
+				if (in_array($payment_info['state'], array('approved')) && $amount_approved === floatval($oOrder->getAmount()) && !wpsg_isSizedString($oOrder->getMeta('wpsg_mod_paypalapi_saleid')))
 				{
 					
Index: /views/mods/mod_paypalapi/order_done.phtml
===================================================================
--- /views/mods/mod_paypalapi/order_done.phtml	(revision 5728)
+++ /views/mods/mod_paypalapi/order_done.phtml	(revision 5731)
@@ -17,15 +17,45 @@
 <?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 } ?>
Index: /views/mods/mod_paypalapi/settings_edit.phtml
===================================================================
--- /views/mods/mod_paypalapi/settings_edit.phtml	(revision 5728)
+++ /views/mods/mod_paypalapi/settings_edit.phtml	(revision 5731)
@@ -19,4 +19,8 @@
 	
 </div>
+
+<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 />
@@ -78,4 +82,9 @@
 </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')); ?>
 
@@ -121,6 +130,18 @@
 		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();