Index: /mods/wpsg_mod_paypalapi.class.php
===================================================================
--- /mods/wpsg_mod_paypalapi.class.php	(revision 7212)
+++ /mods/wpsg_mod_paypalapi.class.php	(revision 7214)
@@ -114,5 +114,6 @@
 			$this->shop->update_option('wpsg_mod_paypalapi_experience_locale_code', $_REQUEST['wpsg_mod_paypalapi_experience_locale_code']);
 
-			$this->shop->update_option('wpsg_mod_paypalapi_plus_aktiv', $_REQUEST['wpsg_mod_paypalapi_plus_aktiv']);		
+			$this->shop->update_option('wpsg_mod_paypalapi_plus_aktiv', $_REQUEST['wpsg_mod_paypalapi_plus_aktiv']);
+			$this->shop->update_option('wpsg_mod_paypalapi_plus_basket', $_REQUEST['wpsg_mod_paypalapi_plus_basket']);
 			
 			// WebHook
@@ -545,5 +546,13 @@
 									
 			// PayPal oder PayPal Express ist deaktiviert
-			if (!wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_aktiv')) || !wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress'))) return false; 
+			if (!wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_aktiv')) || !wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress'))) return false;
+			
+			if (wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypalapi_plus_basket'))) {
+				
+				$this->setViewForPayPalPLus();
+				$this->shop->view['wpsg_mod_paypalapi']['disableContinue'] = 'wpsg_basket_submit';
+				$this->shop->view['wpsg_mod_paypalapi']['enableContinue'] = 'wpsg_basket_submit';
+				
+			}
 			
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/basket_inner_prebutton.phtml');
@@ -896,9 +905,12 @@
 				
 			}
-			
+			 
 			$this->shop->view['wpsg_mod_paypalapi']['ThirdPartyPayment'] = $arThirdPartyPayment;
 			$this->shop->view['wpsg_mod_paypalapi']['mode'] = (($this->isSandbox())?'sandbox':'live');
 			$this->shop->view['wpsg_mod_paypalapi']['approval_url'] = $approval_url;
-						
+			
+			$this->shop->view['wpsg_mod_paypalapi']['disableContinue'] = 'wpsg_checkout2button';
+			$this->shop->view['wpsg_mod_paypalapi']['enableContinue'] = 'wpsg_checkout2button';			
+			
 		}
 		
@@ -1149,4 +1161,7 @@
 		/**
 		 * Authorisiert eine Zahlung
+		 * https://developer.paypal.com/docs/api/payments/v1/#definition-transaction
+		 * https://developer.paypal.com/docs/api/payments/v1/#definition-payer
+		 * 
 		 */
 		private function api_startPayment($arBasket, $order_id = false, $express = true)
Index: /views/mods/mod_paypalapi/basket_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_paypalapi/basket_inner_prebutton.phtml	(revision 7212)
+++ /views/mods/mod_paypalapi/basket_inner_prebutton.phtml	(revision 7214)
@@ -8,9 +8,44 @@
 
 <?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_paypalexpress'))) { ?>
-<div class="wpsg_mod_paypalapi_button_wrap">
-	<button type="submit" name="wpsg_mod_submit" value="wpsg_mod_paypalapi" class="wpsg_mod_paypalapi_button">
-		<img src="<?php echo $this->getRessourceURL('mods/mod_paypalapi/gfx/checkout-logo-small-de.png'); ?>" alt="<?php echo __('Direkt zu PayPal', 'wpsg'); ?>" />
-	</button>
-	<div class="wpsg_clear"></div>
-</div>
+	
+	<div class="wpsg_mod_paypalapi_button_wrap">
+		<button type="submit" name="wpsg_mod_submit" value="wpsg_mod_paypalapi" class="wpsg_mod_paypalapi_button">
+			<img src="<?php echo $this->getRessourceURL('mods/mod_paypalapi/gfx/checkout-logo-small-de.png'); ?>" alt="<?php echo __('Direkt zu PayPal', 'wpsg'); ?>" />
+		</button>
+		<div class="wpsg_clear"></div>
+	</div>
+	
 <?php } ?>
+
+<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_plus_basket'))) { ?>
+
+	<h2><?php echo __('Zahlungsart wÀhlen', 'wpsg'); ?></h2>
+
+	<script src="https://www.paypalobjects.com/webstatic/ppplus/ppplus.min.js" type="text/javascript"></script>
+	<div id="wpsg_ppplus" style="padding-right:0px;"></div>
+
+	<script type="application/javascript">
+		
+		/**
+		 * Wird vom PayPal PLUS IFrame aufgerufen wenn fertig geladen
+		 */
+		function wpsg_mod_paypalapi_load()
+		{
+ 
+			jQuery('#wpsg_basket_submit').on('click', function(event) {
+
+				PAYPAL.apps.PPP.doCheckout();
+				
+				event.stopPropagation();
+				
+				return false;
+
+			} );
+
+		}
+		
+		<?php $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/paypalplus.phtml'); ?>
+
+	</script>
+
+<?php } ?>
Index: /views/mods/mod_paypalapi/paypalplus.phtml
===================================================================
--- /views/mods/mod_paypalapi/paypalplus.phtml	(revision 7212)
+++ /views/mods/mod_paypalapi/paypalplus.phtml	(revision 7214)
@@ -8,5 +8,5 @@
 
 ?>
-
+ 
 	var ppp = PAYPAL.apps.PPP({
 		"approvalUrl": "<?php echo $this->view['wpsg_mod_paypalapi']['approval_url']; ?>",
@@ -32,6 +32,6 @@
 		"onLoad": function() { if (typeof wpsg_mod_paypalapi_load == 'function') wpsg_mod_paypalapi_load(); }, 
 		"buttonLocation": "outside",
-		"disableContinue": "wpsg_checkout2button",
-		"enableContinue": "wpsg_checkout2button",
+		"disableContinue": "<?php echo $this->view['wpsg_mod_paypalapi']['disableContinue']; ?>",
+		"enableContinue": "<?php echo $this->view['wpsg_mod_paypalapi']['enableContinue']; ?>",
 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_paypalapi']['ThirdPartyPayment'])) { ?>
 		"thirdPartyPaymentMethods": <?php echo json_encode($this->view['wpsg_mod_paypalapi']['ThirdPartyPayment']); ?>,
Index: /views/mods/mod_paypalapi/settings_edit.phtml
===================================================================
--- /views/mods/mod_paypalapi/settings_edit.phtml	(revision 7212)
+++ /views/mods/mod_paypalapi/settings_edit.phtml	(revision 7214)
@@ -59,4 +59,9 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_aktiv', __('PayPal fÃŒr neue Bestellungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_aktiv'), array('help' => 'wpsg_shippay_activ')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_plus_aktiv', __('PayPal Plus aktivieren', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_plus_aktiv'), array('help' => 'wpsg_mod_paypalapi_plus_aktiv')); ?>
+
+<div class="wpsg_mod_paypalapi_plus_aktiv_layer wpsg_mod_paypalapi_plus_aktiv_layer_1">
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_plus_basket', __('Zahlungsauswahl im Warenkorb', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_plus_basket'), array('help' => 'wpsg_mod_paypalapi_plus_basket')); ?>
+</div>
+
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress', __('PayPal Express aktivieren (Button im Warenkorb)', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress'), array('help' => 'wpsg_mod_paypalapi_paypalexpress')); ?>
 <div class="wpsg_mod_paypalapi_plus_aktiv">
@@ -98,4 +103,11 @@
 	jQuery(document).ready(function() {
 
+		jQuery('#wpsg_mod_paypalapi_plus_aktiv').on('change', function() {
+			
+			jQuery('.wpsg_mod_paypalapi_plus_aktiv_layer').hide();
+			jQuery('.wpsg_mod_paypalapi_plus_aktiv_layer_' + jQuery(this).val()).show();
+			
+		} ).change();
+		
 		jQuery('#wpsg_mod_paypalapi_webhook_log').bind('change', function() {
 
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 7212)
+++ /views/warenkorb/basket.phtml	(revision 7214)
@@ -356,5 +356,5 @@
 			<br />
 			<div class="wpsg_spacer"></div>
-
+ 
 			<?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>
 
@@ -366,5 +366,5 @@
 		<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
 		<?php } else { ?>
-			<input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
+			<input type="submit" class="wpsg_button wpsg_checkoutbutton" id="wpsg_basket_submit" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
 
 			<br /><br />
@@ -382,5 +382,5 @@
 	<br />
 	<?php $this->callMods('basket_after', array(&$this->view)); ?>
-
+ 
 	<?php } else { ?>
 	<p><?php echo __('Keine Produkte im Warenkorb.', 'wpsg'); ?></p>