Enhance getVatId logic in AddressHandler

Channable may supply this value under 'vat_number' or 'vat_id'

Author: Marvin-Magmodules

Service/Order/ImportSimulator.php

@@ -185,7 +185,8 @@ public function getTestData(array $params): array
                 "country_code" => $country,
                 "state" => $country == "US" ? "Texas" : "",
                 "state_code" => $country == "US" ? "TX" : "",
-                "vat_number" => "NL123456790B01"
+                "vat_number" => "",
+                "vat_id" => "NL123456790B01"
             ],
             "shipping" => [
                 "first_name" => "Test",

Service/Order/Quote/AddressHandler.php

@@ -161,7 +161,18 @@ private function getVatId(string $type, array $orderData, int $storeId): ?string
             return null;
         }
 
-        $vatId = !empty($orderData['billing']['vat_number']) ? $orderData['billing']['vat_number'] : null;
+        $vatId = null;
+
+        // Attempt to retrieve VAT ID from billing data:
+        // Channable may supply this value under 'vat_number' or 'vat_id'.
+        // We prefer 'vat_number' first, then fallback to 'vat_id'.
+        foreach (['vat_number', 'vat_id'] as $vatKey) {
+            if (isset($orderData['billing'][$vatKey]) && trim($orderData['billing'][$vatKey]) !== '') {
+                $vatId = $orderData['billing'][$vatKey];
+                break;
+            }
+        }
+
         if ($type == 'billing' || !$vatId) {
             return $vatId;
         }