Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 5886)
+++ /controller/wpsg_BasketController.class.php	(revision 5888)
@@ -59,5 +59,5 @@
 			{
 				
-				$content = $this->shop->renderProdukt($_REQUEST['produkt_id']); return; 
+				$content = $this->shop->renderProdukt($_REQUEST['produkt_id']); return;
 				
 			}
@@ -211,5 +211,5 @@
 			$this->shop->view['basket'] = $this->shop->basket->toArray();
 			$this->shop->view['laender'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `name` ASC");			
-			
+			 
 			$content = $this->shop->render(WPSG_PATH_VIEW.'/warenkorb/checkout.phtml', false);
 						
@@ -431,5 +431,5 @@
 				if ($this->shop->get_option('wpsg_afterinsert') == '3')
 				{
-
+					
 					$this->shop->view['product_data'] = $product_data;
 					$this->shop->view['product_key'] = $_REQUEST['wpsg']['produkt_id'];
@@ -437,5 +437,5 @@
 					$this->shop->view['amount_basket'] = $this->shop->basket->getBasketAmount($_REQUEST['wpsg']['produkt_id']);
 					$this->shop->view['product_index'] = $GLOBALS['wpsg_lastInsertIndex'];	
-					
+
 				}
 				 
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5886)
+++ /controller/wpsg_ShopController.class.php	(revision 5888)
@@ -2536,7 +2536,8 @@
 			{
 			
-				$this->basket->initFromSession();			
-				$this->addShipPay();
-				
+			$this->basket->initFromSession();
+			
+			$this->addShipPay();
+			
 			}
 						
Index: /mods/wpsg_mod_autodebit.class.php
===================================================================
--- /mods/wpsg_mod_autodebit.class.php	(revision 5886)
+++ /mods/wpsg_mod_autodebit.class.php	(revision 5888)
@@ -170,68 +170,71 @@
 		{ 
 			
-			if (!is_admin() && $this->shop->get_option('wpsg_mod_autodebit_aktiv') != '1');
-			
-			$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_autodebit_mwst'), $this->shop->getDefaultCountry());			
-			
-			$arPayment[$this->id] = array(
-				'id' => $this->id,
-				'name' => __($this->shop->get_option('wpsg_mod_autodebit_bezeichnung'), 'wpsg'),
-				'preis' => $this->shop->get_option('wpsg_mod_autodebit_gebuehr'),
-				'mwst_key' => $this->shop->get_option('wpsg_mod_autodebit_mwst'),
-				'mwst_value' => $mwst_value,
-				'mwst_null' => $this->shop->get_option('wpsg_mod_autodebit_mwstland'),
-				'hint' => __($this->shop->get_option('wpsg_mod_autodebit_hint'))
-			);
-			
-			// Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann
-			// Sollte denk ich nicht zu problemen fÃŒhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet
-			if (	
-					isset($_REQUEST['wpsg_checkout2']) || 
-					(isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || 
-					true
-			)
-			{
-
-				$this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']);
-				$this->shop->view['wpsg_mod_autodebit']['name'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_name']);
-				$this->shop->view['wpsg_mod_autodebit']['blz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_blz']);
-				$this->shop->view['wpsg_mod_autodebit']['bic'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_bic']);
-				$this->shop->view['wpsg_mod_autodebit']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_inhaber']);
-				$this->shop->view['wpsg_mod_autodebit']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_knr']);
-				$this->shop->view['wpsg_mod_autodebit']['iban'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_iban']);
-				
-				$arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_autodebit/paymenthint.phtml', false);
-				
-				$arBasket = $this->shop->basket->toArray();
-				
-				if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
-				{
-						
-					$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']);
-					$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
-						
-				}
-				else
-				{
-												
-					$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']);																								
-					$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
-						
-				}
-				
-				// Entsprechenden Preis anzeigen
-				if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_netto;
-					
-				}
-				else 
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_brutto;
-					
-				}
-				
+			//if (!is_admin() && $this->shop->get_option('wpsg_mod_autodebit_aktiv') != '1') return;
+			if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1')
+			{
+				$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_autodebit_mwst'), $this->shop->getDefaultCountry());			
+				
+				$arPayment[$this->id] = array(
+					'id' => $this->id,
+					'name' => __($this->shop->get_option('wpsg_mod_autodebit_bezeichnung'), 'wpsg'),
+					'preis' => $this->shop->get_option('wpsg_mod_autodebit_gebuehr'),
+					'mwst_key' => $this->shop->get_option('wpsg_mod_autodebit_mwst'),
+					'mwst_value' => $mwst_value,
+					'mwst_null' => $this->shop->get_option('wpsg_mod_autodebit_mwstland'),
+					'hint' => __($this->shop->get_option('wpsg_mod_autodebit_hint'))
+				);
+				
+				// Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann
+				// Sollte denk ich nicht zu problemen fÃŒhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet
+				if (	
+						isset($_REQUEST['wpsg_checkout2']) || 
+						(isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || 
+						true
+				)
+				{
+	
+					$this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']);
+					$this->shop->view['wpsg_mod_autodebit']['name'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_name']);
+					$this->shop->view['wpsg_mod_autodebit']['blz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_blz']);
+					$this->shop->view['wpsg_mod_autodebit']['bic'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_bic']);
+					$this->shop->view['wpsg_mod_autodebit']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_inhaber']);
+					$this->shop->view['wpsg_mod_autodebit']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_knr']);
+					$this->shop->view['wpsg_mod_autodebit']['iban'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_iban']);
+					
+					$arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_autodebit/paymenthint.phtml', false);
+					
+					$arBasket = $this->shop->basket->toArray();
+					
+					if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
+					{
+							
+						$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']);
+						$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
+							
+					}
+					else
+					{
+													
+						$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']);																								
+						$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
+							
+					}
+					
+					// Entsprechenden Preis anzeigen
+					if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_netto;
+						
+					}
+					else 
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_brutto;
+						
+					}
+					
+				}
+			
 			}
 			
Index: /mods/wpsg_mod_creditcard.class.php
===================================================================
--- /mods/wpsg_mod_creditcard.class.php	(revision 5886)
+++ /mods/wpsg_mod_creditcard.class.php	(revision 5888)
@@ -78,68 +78,71 @@
 		{ 
 			
-			if (!is_admin() && $this->shop->get_option('wpsg_mod_creditcard_aktiv') != '1');
-			
-			$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_creditcard_mwst'), $this->shop->getDefaultCountry());			
-			
-			$arPayment[$this->id] = array(
-				'id' => $this->id,
-				'name' => __($this->shop->get_option('wpsg_mod_creditcard_bezeichnung'), 'wpsg'),
-				'preis' => $this->shop->get_option('wpsg_mod_creditcard_gebuehr'),
-				'mwst_key' => $this->shop->get_option('wpsg_mod_creditcard_mwst'),
-				'mwst_value' => $mwst_value,
-				'mwst_null' => $this->shop->get_option('wpsg_mod_creditcard_mwstland'),
-				'hint' => __($this->shop->get_option('wpsg_mod_creditcard_hint'))
-			);
-			
-			// Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann
-			// Sollte denk ich nicht zu problemen fÃŒhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet
-			if (	
-					isset($_REQUEST['wpsg_checkout2']) || 
-					(isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || 
-					true
-			)
-			{
-
-				$this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']);
-				$this->shop->view['wpsg_mod_creditcard']['typ'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_typ']);
-				$this->shop->view['wpsg_mod_creditcard']['pruefz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_pruefz']);
-				$this->shop->view['wpsg_mod_creditcard']['gueltigm'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigm']);
-				$this->shop->view['wpsg_mod_creditcard']['gueltigj'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigj']);
-				$this->shop->view['wpsg_mod_creditcard']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_inhaber']);
-				$this->shop->view['wpsg_mod_creditcard']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_knr']);
-				
-				$arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_creditcard/paymenthint.phtml', false);
-				
-				$arBasket = $this->shop->basket->toArray();
-				
-				if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
+			//if (!is_admin() && $this->shop->get_option('wpsg_mod_creditcard_aktiv') != '1') return;
+			if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1')
+			{
+				$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_creditcard_mwst'), $this->shop->getDefaultCountry());			
+				
+				$arPayment[$this->id] = array(
+					'id' => $this->id,
+					'name' => __($this->shop->get_option('wpsg_mod_creditcard_bezeichnung'), 'wpsg'),
+					'preis' => $this->shop->get_option('wpsg_mod_creditcard_gebuehr'),
+					'mwst_key' => $this->shop->get_option('wpsg_mod_creditcard_mwst'),
+					'mwst_value' => $mwst_value,
+					'mwst_null' => $this->shop->get_option('wpsg_mod_creditcard_mwstland'),
+					'hint' => __($this->shop->get_option('wpsg_mod_creditcard_hint'))
+				);
+				
+				// Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann
+				// Sollte denk ich nicht zu problemen fÃŒhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet
+				if (	
+						isset($_REQUEST['wpsg_checkout2']) || 
+						(isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || 
+						true
+				)
 				{
-						
-					$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']);
-					$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
-						
+	
+					$this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']);
+					$this->shop->view['wpsg_mod_creditcard']['typ'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_typ']);
+					$this->shop->view['wpsg_mod_creditcard']['pruefz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_pruefz']);
+					$this->shop->view['wpsg_mod_creditcard']['gueltigm'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigm']);
+					$this->shop->view['wpsg_mod_creditcard']['gueltigj'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigj']);
+					$this->shop->view['wpsg_mod_creditcard']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_inhaber']);
+					$this->shop->view['wpsg_mod_creditcard']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_knr']);
+					
+					$arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_creditcard/paymenthint.phtml', false);
+					
+					$arBasket = $this->shop->basket->toArray();
+					
+					if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
+					{
+							
+						$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']);
+						$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
+							
+					}
+					else
+					{
+													
+						$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']);																								
+						$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
+							
+					}
+					
+					// Entsprechenden Preis anzeigen
+					if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_netto;
+						
+					}
+					else 
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_brutto;
+						
+					}
+					
 				}
-				else
-				{
-												
-					$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']);																								
-					$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
-						
-				}
-				
-				// Entsprechenden Preis anzeigen
-				if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_netto;
-					
-				}
-				else 
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_brutto;
-					
-				}
-				
+			
 			}
 			
@@ -184,5 +187,5 @@
 		{ 
 	 
-			if(wpsg_isSizedArray($arCheckout['payment']))
+			if(wpsg_isSizedString($arCheckout['payment']))
 			{
 
Index: /mods/wpsg_mod_targo.class.php
===================================================================
--- /mods/wpsg_mod_targo.class.php	(revision 5886)
+++ /mods/wpsg_mod_targo.class.php	(revision 5888)
@@ -112,65 +112,69 @@
 			$this->shop->arStatus[self::STATUS_CREDIT_ACCEPTED] = __('Kreditvertrag angenommen', 'wpsg');
 			
-			if (!is_admin() && $this->shop->get_option('wpsg_mod_targo_aktiv') != '1') return;
-
-			$arBasket = $this->shop->basket->toArray();
-				
-			// Bestellungen außerhalb der Targo-Bestimmungen geben nix aus
-			$gesamt = $arBasket['sum']['preis_gesamt_brutto'];
-			$min = $this->shop->get_option('wpsg_mod_targo_summe_min');
-			$max = $this->shop->get_option('wpsg_mod_targo_summe_max');
-			if (($gesamt <= $min) || ($gesamt >= $max)) return;
-				
-			$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_targo_mwst'), $this->shop->getDefaultCountry());
-					
-			// Array umsortieren Targo als erstes
-			// bei Land != DE Targobank ausblenden
-			$land = $arBasket['land']['kuerzel'];
-			if ($land == "DE")
+			//if (!is_admin() && $this->shop->get_option('wpsg_mod_targo_aktiv') != '1') return;
+			if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1')
 			{
-			
-				$arPaymentTB[$this->id] = array(
-					'id' => $this->id,
-					'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'),
-					'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'),
-					'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'),
-					'mwst_value' => $mwst_value,
-					'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'),
-					'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')),
-					'logo' => $this->shop->getRessourceURL('gfx/targologo.png')
-				);
-				$arPayment = wpsg_array_merge($arPaymentTB, $arPayment);
-				
-			}
-			
-			if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
-			{
-
-				if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
-				{
-						
-					$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']);
-					$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
-						
-				}
-				else
-				{
-												
-					$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']);																								
-					$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
-						
-				}
-				
-				// Entsprechenden Preis anzeigen
-				if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_netto;
-					
-				}
-				else 
-				{
-					
-					$arPayment[$this->id]['price'] = $payment_brutto;
+				//$arBasket = $this->shop->basket->toArray();
+				$arBasket = $this->shop->cache->getShopBasketArray();
+					
+				// Bestellungen außerhalb der Targo-Bestimmungen geben nix aus
+				$gesamt = $arBasket['sum']['preis_gesamt_brutto'];
+				$min = $this->shop->get_option('wpsg_mod_targo_summe_min');
+				$max = $this->shop->get_option('wpsg_mod_targo_summe_max');
+				if ((!is_admin()) && (($gesamt <= $min) || ($gesamt >= $max))) return;
+				
+				$mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_targo_mwst'), $this->shop->getDefaultCountry());
+						
+				// Array umsortieren Targo als erstes
+				// bei Land != DE Targobank ausblenden
+				$land = wpsg_getStr($arBasket['land']['kuerzel']);
+				if (is_admin() || ($land == "DE"))
+				{
+				
+					$arPaymentTB[$this->id] = array(
+						'id' => $this->id,
+						'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'),
+						'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'),
+						'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'),
+						'mwst_value' => $mwst_value,
+						'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'),
+						'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')),
+						'logo' => $this->shop->getRessourceURL('gfx/targologo.png')
+					);
+					$arPayment = wpsg_array_merge($arPaymentTB, $arPayment);
+					
+				}
+				
+				if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout'])))
+				{
+	
+					if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt'])
+					{
+							
+						$payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']);
+						$payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value);
+							
+					}
+					else
+					{
+													
+						$payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']);																								
+						$payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value);						
+							
+					}
+					
+					// Entsprechenden Preis anzeigen
+					if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_netto;
+						
+					}
+					else 
+					{
+						
+						$arPayment[$this->id]['price'] = $payment_brutto;
+						
+					}
 					
 				}
Index: /views/mods/mod_targo/order_done.phtml
===================================================================
--- /views/mods/mod_targo/order_done.phtml	(revision 5886)
+++ /views/mods/mod_targo/order_done.phtml	(revision 5888)
@@ -7,9 +7,9 @@
 	if ($this->get_option('wpsg_mod_targo_url_use') == 0)
 	{
-		$url = $this->get_option('wpsg_mod_targo_url_test');
+		$url = $this->get_option('wpsg_mod_targo_url_live');
 	}
 	else
 	{
-		$url = $this->get_option('wpsg_mod_targo_url_live');
+		$url = $this->get_option('wpsg_mod_targo_url_test');
 	}
 ?>
@@ -58,5 +58,5 @@
 <input type="text" id="dealerID" name="dealerID" value="<?php echo $this->get_option('wpsg_mod_targo_dealerid');?>" placeholder="dealerID"><br />
 <input type="text" id="dealerText" name="dealerText" value="<?php echo $this->view['targoLink'];?>" placeholder="dealerText"><br />
-<input type="text" id="documentno" name="documentno" value="" placeholder="documentno"><br />
+<input type="text" id="documentno" name="documentno" value="<?php echo $this->view['o_id'];?>" placeholder="documentno"><br />
 
 
Index: /views/mods/mod_targo/settings_edit.phtml
===================================================================
--- /views/mods/mod_targo/settings_edit.phtml	(revision 5886)
+++ /views/mods/mod_targo/settings_edit.phtml	(revision 5888)
@@ -23,7 +23,7 @@
 <br />
 
-<?php echo wpsg_drawForm_Input('wpsg_mod_targo_url_test', __('Targo-URL-Testsystem', 'wpsg'), $this->get_option('wpsg_mod_targo_url_test'), array('help' => 'wpsg_mod_targo_url_test')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_targo_url_test', __('Targo-URL-Sandbox', 'wpsg'), $this->get_option('wpsg_mod_targo_url_test'), array('help' => 'wpsg_mod_targo_url_test')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_url_live', __('Targo-URL-Livesystem', 'wpsg'), $this->get_option('wpsg_mod_targo_url_live'), array('help' => 'wpsg_mod_targo_url_live')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_url_use', __('Targo-URL-Livesystem benutzen', 'wpsg'), $this->get_option('wpsg_mod_targo_url_use'), array('help' => 'wpsg_mod_targo_url_use')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_url_use', __('Targo-URL-Sandbox benutzen', 'wpsg'), $this->get_option('wpsg_mod_targo_url_use'), array('help' => 'wpsg_mod_targo_url_use')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_koop_id', __('Targo-Koop-ID', 'wpsg'), $this->get_option('wpsg_mod_targo_koop_id'), array('help' => 'wpsg_mod_targo_koop_id')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_dealerid', __('Targo-Dealer-ID', 'wpsg'), $this->get_option('wpsg_mod_targo_dealerid'), array('help' => 'wpsg_mod_targo_dealerid')); ?>