Index: /changelog
===================================================================
--- /changelog	(revision 6671)
+++ /changelog	(revision 6673)
@@ -14,2 +14,3 @@
 - Bug - Rechtschreibfehler
 - Bugfix - Bestellverwaltung FÃŒllmenge nicht in WPSG_TBL_ORDERPRODUCT
+- Buffix - PayPal nimmt jezt Daten aus der Versandadresse (shipping_address) und nicht mehr die Rechnungsadresse (billing_address)
Index: /mods/wpsg_mod_paypalapi.class.php
===================================================================
--- /mods/wpsg_mod_paypalapi.class.php	(revision 6671)
+++ /mods/wpsg_mod_paypalapi.class.php	(revision 6673)
@@ -743,5 +743,11 @@
 			
 			$_SESSION['wpsg']['checkout']['payment'] = $this->id;
-			
+
+            // billing_address scheint es nicht mehr zu geben (Aktuell steht es aber noch in der Doku)
+            // In der Doku steht aber auch, dass shipping_address DEPRECATED ist :?
+            // Wir haben hier billing_address durch shipping_address ersetzt
+            // https://developer.paypal.com/docs/api/payments/#payment_get
+            // https://stackoverflow.com/questions/44968561/how-to-get-billing-address-in-getexpresscheckoutdetails-api-nvp
+
 			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['vname'])) $_SESSION['wpsg']['checkout']['vname'] = $json_data['payer']['payer_info']['first_name'];
 			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['name'])) $_SESSION['wpsg']['checkout']['name'] = $json_data['payer']['payer_info']['last_name'];
@@ -752,8 +758,8 @@
 			}				
 			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['tel'])) $_SESSION['wpsg']['checkout']['tel'] = $json_data['payer']['payer_info']['phone'];
-			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['strasse'])) $_SESSION['wpsg']['checkout']['strasse'] =  $json_data['payer']['payer_info']['billing_address']['line1'];
-			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['ort'])) $_SESSION['wpsg']['checkout']['ort'] = $json_data['payer']['payer_info']['billing_address']['city'];
-			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['plz'])) $_SESSION['wpsg']['checkout']['plz'] = $json_data['payer']['payer_info']['billing_address']['postal_code'];
-			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['land'])) $_SESSION['wpsg']['checkout']['land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper($json_data['payer']['payer_info']['billing_address']['country_code']))."'");
+			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['strasse'])) $_SESSION['wpsg']['checkout']['strasse'] =  $json_data['payer']['payer_info']['shipping_address']['line1'];
+			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['ort'])) $_SESSION['wpsg']['checkout']['ort'] = $json_data['payer']['payer_info']['shipping_address']['city'];
+			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['plz'])) $_SESSION['wpsg']['checkout']['plz'] = $json_data['payer']['payer_info']['shipping_address']['postal_code'];
+			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['land'])) $_SESSION['wpsg']['checkout']['land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper($json_data['payer']['payer_info']['shipping_address']['country_code']))."'");
 			
 			/*