Merge branch 'master' into feature/PLUG-5038

Author: woutse

includes/classes/PPMFWC/Hooks/FastCheckout/Exchange.php

@@ -33,7 +33,7 @@ public static function addAddressToOrder(array $checkoutData, object $order)
             'company' => $customerData['company'] ?? '',
             'email' => $customerData['email'] ?? '',
             'phone' => $customerData['phone'] ?? '',
-            'address_1' => $billingAddressData['streetName'] . ' ' . $shippingAddressData['streetNumber'] . $shippingAddressData['streetNumberAddition'],
+            'address_1' => ($billingAddressData['streetName'] ?? '') . ' ' . ($billingAddressData['streetNumber'] ?? '') . ($billingAddressData['streetNumberAddition'] ?? ''),
             'address_2' => '',
             'city' => $billingAddressData['city'] ?? '',
             'state' => '',
@@ -47,7 +47,7 @@ public static function addAddressToOrder(array $checkoutData, object $order)
             'company' => $customerData['company'] ?? '',
             'email' => $customerData['email'] ?? '',
             'phone' => $customerData['phone'] ?? '',
-            'address_1' => $shippingAddressData['streetName'] . ' ' . $shippingAddressData['streetNumber'] . $shippingAddressData['streetNumberAddition'],
+            'address_1' => ($shippingAddressData['streetName'] ?? '') . ' ' . ($shippingAddressData['streetNumber'] ?? '') . ($shippingAddressData['streetNumberAddition'] ?? ''),
             'address_2' => '',
             'city' => $shippingAddressData['city'] ?? '',
             'state' => '',