avoid BC

mvorisek · Jan 14, 2021 · 111747e · 111747e
1 parent 9306df4
commit 111747e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -260,15 +260,15 @@ public function getOrderShippingAddress(Order $order): OrderShippingAddressForVi
             $address->firstname,
             $address->lastname,
             $address->company,
-            $address->vat_number,
             $address->address1,
             $address->address2,
             $stateName,
             $address->city,
             $country->name[$order->id_lang],
             $address->postcode,
             $address->phone,
-            $address->phone_mobile
+            $address->phone_mobile,
+            $address->vat_number
         );
     }
 
@@ -294,15 +294,15 @@ private function getOrderInvoiceAddress(Order $order): OrderInvoiceAddressForVie
             $address->firstname,
             $address->lastname,
             $address->company,
-            $address->vat_number,
             $address->address1,
             $address->address2,
             $stateName,
             $address->city,
             $country->name[$order->id_lang],
             $address->postcode,
             $address->phone,
-            $address->phone_mobile
+            $address->phone_mobile,
+            $address->vat_number
         );
     }
 

diff --git a/src/Core/Domain/Order/QueryResult/OrderInvoiceAddressForViewing.php b/src/Core/Domain/Order/QueryResult/OrderInvoiceAddressForViewing.php
@@ -49,7 +49,7 @@ class OrderInvoiceAddressForViewing
     private $companyName;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $vatNumber;
 
@@ -112,15 +112,15 @@ public function __construct(
         string $firstName,
         string $lastName,
         string $companyName,
-        string $vatNumber,
         string $address1,
         string $address2,
         string $stateName,
         string $cityName,
         string $countryName,
         string $postCode,
         string $phone,
-        string $phoneMobile
+        string $phoneMobile,
+        ?string $vatNumber = null
     ) {
         $this->addressId = $addressId;
         $this->firstName = $firstName;
@@ -162,9 +162,9 @@ public function getCompanyName(): string
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getVatNumber(): string
+    public function getVatNumber(): ?string
     {
         return $this->vatNumber;
     }

diff --git a/src/Core/Domain/Order/QueryResult/OrderShippingAddressForViewing.php b/src/Core/Domain/Order/QueryResult/OrderShippingAddressForViewing.php
@@ -49,7 +49,7 @@ class OrderShippingAddressForViewing
     private $companyName;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $vatNumber;
 
@@ -98,15 +98,15 @@ public function __construct(
         string $firstName,
         string $lastName,
         string $companyName,
-        string $vatNumber,
         string $address1,
         string $address2,
         string $stateName,
         string $cityName,
         string $countryName,
         string $postCode,
         string $phone,
-        string $phoneMobile
+        string $phoneMobile,
+        ?string $vatNumber = null
     ) {
         $this->addressId = $addressId;
         $this->firstName = $firstName;
@@ -148,9 +148,9 @@ public function getCompanyName(): string
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getVatNumber(): string
+    public function getVatNumber(): ?string
     {
         return $this->vatNumber;
     }