Index: /mods/wpsg_mod_paypal.class.php
===================================================================
--- /mods/wpsg_mod_paypal.class.php	(revision 6781)
+++ /mods/wpsg_mod_paypal.class.php	(revision 6782)
@@ -95,7 +95,5 @@
 			// Vor dem CreateWebHook
 			$this->shop->update_option('wpsg_mod_paypal_sandbox', $_REQUEST['wpsg_mod_paypal_sandbox']);
-			
-			$this->shop->update_option('wpsg_mod_paypal_mode', $_REQUEST['wpsg_mod_paypal_mode']);
-			
+						
 			// Classic API
 			$this->shop->update_option('wpsg_mod_paypal_email', $_REQUEST['wpsg_mod_paypal_email']);
@@ -156,37 +154,16 @@
 		{
 
-			if ($this->shop->get_option('wpsg_mod_paypal_mode') == '1')
-			{
-				
-				if (!wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypal_clientid')) && !wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypal_secret')))
-				{
-					
-					$this->shop->addBackendError('nohspc_'.wpsg_translate(
-						wpsg_translate(
-							__('Das Modul "PayPal" ist aktiviert und es wurden keine API Zugangsdatenhinterlegt. Gehen Sie in die <a href="#1#">Einstellungen</a> des Moduls um die API Daten zu hinterlegen.', 'wpsg'),
-							WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_paypal'
-						)
-					), 'wpsg_mod_paypal_apicheck', true);
-					
-				}
-				
-			}
-			else
-			{
-			
-				if (!wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypal_email')) && wpsg_isSizedInt($this->shop->get_option('wpsg_mod_paypal_aktiv')))
-				{
-					
-					$this->shop->addBackendError('nohspc_'.wpsg_translate(
-						wpsg_translate(
-							__('Das Modul "PayPal" ist aktiviert und es wurde kein PayPal Konto fÃŒr Zahlungen hinterlegt. Gehen Sie in die <a href="#1#">Einstellungen</a> des Moduls um das PayPal Konto anzugeben.', 'wpsg'),
-							WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_paypal'
-						)
-					));
-					
-				}
-				
-			}
-			
+			if (!wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypal_clientid')) && !wpsg_isSizedString($this->shop->get_option('wpsg_mod_paypal_secret')))
+            {
+                
+                $this->shop->addBackendError('nohspc_'.wpsg_translate(
+                    wpsg_translate(
+                        __('Das Modul "PayPal" ist aktiviert und es wurden keine API Zugangsdatenhinterlegt. Gehen Sie in die <a href="#1#">Einstellungen</a> des Moduls um die API Daten zu hinterlegen.', 'wpsg'),
+                        WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_paypal'
+                    )
+                ), 'wpsg_mod_paypal_apicheck', true);
+                
+            }
+						
 		} // public function checkGeneralBackendError()
 		
@@ -323,31 +300,20 @@
 			// Bestellungen mit 0 geben nix aus
 			if ($done_view['basket']['sum']['preis_gesamt_brutto'] <= 0 || $this->shop->view['basket']['checkout']['payment'] != $this->id) return;
-			
-			if ($this->shop->get_option('wpsg_mod_paypal_mode') === '1')
-			{
-				
-				$oOrder = wpsg_order::getInstance($order_id);
-				
-				if ($this->getPaymentState($order_id) === 'approved')
-				{
-						
-					$this->shop->view['wpsg_mod_paypal']['done'] = '1';
-				
-				}
-				else
-				{
-						
-					$this->shop->view['paypalLink'] = $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'startPayPalPayment', array('order_id' => $order_id));
-									
-				}
-					
-			}
-			else 
-			{
-				
-				$this->shop->view['paypalLink'] = $this->getPayPalLink($order_id);
-			
-			}
-			
+							
+            $oOrder = wpsg_order::getInstance($order_id);
+            
+            if ($this->getPaymentState($order_id) === 'approved')
+            {
+                    
+                $this->shop->view['wpsg_mod_paypal']['done'] = '1';
+            
+            }
+            else
+            {
+                    
+                $this->shop->view['paypalLink'] = $this->shop->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'startPayPalPayment', array('order_id' => $order_id));
+                                
+            }
+            			
 			echo $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_paypal/order_done.phtml', false);
 						
Index: /views/mods/mod_paypal/settings_edit.phtml
===================================================================
--- /views/mods/mod_paypal/settings_edit.phtml	(revision 6781)
+++ /views/mods/mod_paypal/settings_edit.phtml	(revision 6782)
@@ -11,57 +11,34 @@
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_paypal_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_paypal_hint'), array('help' => 'wpsg_shippay_hint')); ?>
 <br />
-<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_mode',	__('Integrationsmodus', 'wpsg'), array('1' => __('REST API', 'wpsg')), $this->get_option('wpsg_mod_paypal_mode'), array('help' => 'wpsg_mod_paypal_mode')); ?>
-
-<div class="wpsg_mod_paypal_mode_layer wpsg_mod_paypal_mode_0">
 	
-	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_email', __('E-Mail (PayPal Konto)', 'wpsg'), $this->get_option('wpsg_mod_paypal_email'), array('help' => 'wpsg_mod_paypal_email')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_clientid', __('Client ID', 'wpsg'), $this->get_option('wpsg_mod_paypal_clientid'), array('hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_clientid')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_secret', __('Secret', 'wpsg'), $this->get_option('wpsg_mod_paypal_secret'), array('hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_secret')); ?>
+		
+<div class="wpsg_form_field ">
+	<div class="wpsg_form_left">
+		<label for=""><?php echo __('Stornierung bei Statuswechsel', 'wpsg'); ?>:</label>
+	</div>
+	<div class="wpsg_form_right">
+		<a href="#" class="wpsg_mod_paypal_stornostate"><?php echo __('Bearbeiten', 'wpsg'); ?></a>
+	</div>
+	<div class="wpsg_clear"></div>
+</div>
+<div class="wpsg_mod_paypal_stornostate_layer" style="display:none;">
 	
-	<div class="wpsg_hinweis">
-		<?php echo __('Zur Anbindung an den PayPal Service wird <a href="https://www.paypalobjects.com/de_DE/html/IntegrationCenter/ic_pps_home.html">PayPal Starter</a> genutzt. FortfÃŒhrende Details finden Sie im <a href="https://www.paypalobjects.com/de_DE/pdf/PayPal-Starter-Integrationshandbuch.pdf">Paypal Starter Integrationshandbuch.</a>', 'wpsg'); ?>
-		<?php echo __('Im Integrationshandbuch erfahren Sie auch, wie Sie die Sandbox nutzen, um den Zahlungsverkehr zu testen.', 'wpsg'); ?>
-	</div>
+	<?php foreach ($this->arStatus as $status_id => $status_label) { $arStornoStatus = (array)$this->get_option('wpsg_mod_paypal_stornostate'); ?>
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_stornostate['.$status_id.']', __($status_label, 'wpsg'), $arStornoStatus[$status_id], array('labelright' => true)); ?>	
+	<?php } ?> 
+	
+	<br />
 	
 </div>
 
-<div class="wpsg_mod_paypal_mode_layer wpsg_mod_paypal_mode_1">
-	
-	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_clientid', __('Client ID', 'wpsg'), $this->get_option('wpsg_mod_paypal_clientid'), array('hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_clientid')); ?>
-	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_secret', __('Secret', 'wpsg'), $this->get_option('wpsg_mod_paypal_secret'), array('hint' => wpsg_translate('nohspc_'.__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_secret')); ?>
+<?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'webHook', array(), true), array('readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_createwebhook',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>
 			
-	<div class="wpsg_form_field ">
-		<div class="wpsg_form_left">
-			<label for=""><?php echo __('Stornierung bei Statuswechsel', 'wpsg'); ?>:</label>
-		</div>
-		<div class="wpsg_form_right">
-			<a href="#" class="wpsg_mod_paypal_stornostate"><?php echo __('Bearbeiten', 'wpsg'); ?></a>
-		</div>
-		<div class="wpsg_clear"></div>
-	</div>
-	<div class="wpsg_mod_paypal_stornostate_layer" style="display:none;">
-		
-		<?php foreach ($this->arStatus as $status_id => $status_label) { $arStornoStatus = (array)$this->get_option('wpsg_mod_paypal_stornostate'); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_stornostate['.$status_id.']', __($status_label, 'wpsg'), $arStornoStatus[$status_id], array('labelright' => true)); ?>	
-		<?php } ?> 
-		
-		<br />
-		
-	</div>
-	
-	<?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'webHook', array(), true), array('readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url')); ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_createwebhook',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>
-			
-</div>
-
 <script type="text/javascript">/* <![CDATA[ */
 
 	jQuery(document).ready(function() {
  
-		jQuery('#wpsg_mod_paypal_mode').bind('change', function() {
-
-			jQuery('.wpsg_mod_paypal_mode_layer').hide();
-			jQuery('.wpsg_mod_paypal_mode_' + jQuery(this).val()).show();
-			
-		} ).change();
-
 		jQuery('.wpsg_mod_paypal_stornostate').bind('click', function() {