Some additions to PostalAddress and ShipTo

src/CXml/Models/Messages/BillTo.php

@@ -28,19 +28,33 @@ class BillTo implements RequestInterface
     public function parse(\SimpleXMLElement $billToXml): void
     {
 
-        if ($data = (string) $billToXml->attributes()->isoCountryCode) {
+        if ($data = (string)$billToXml->attributes()->isoCountryCode) {
             $this->isoCountryCode = $data;
         }
-        if ($data = (string) $billToXml->attributes()->addressID) {
+        if ($data = (string)$billToXml->attributes()->addressID) {
             $this->addressId = $data;
         }
-        if ($data = (string) $billToXml->attributes()->addressIDDomain) {
+        if ($data = (string)$billToXml->attributes()->addressIDDomain) {
             $this->addressIdDomain = $data;
         }
 
-        $this->name = $billToXml->xpath('Name')[0];
+        $name = $billToXml->xpath('Name');
 
-        if ($postalAddressElement = current($billToXml->xpath('PostalAddress'))) {
+        if ($name) {
+            $this->name = (string)$name[0];
+        }
+
+        if (strlen($this->name) === 0) {
+            $this->name = (string)$billToXml->xpath('Address/Name')[0];
+        }
+
+        $postalAddressElement = current($billToXml->xpath('PostalAddress'));
+
+        if (!$postalAddressElement) {
+            $postalAddressElement = current($billToXml->xpath('Address/PostalAddress'));
+        }
+
+        if ($postalAddressElement) {
             $this->postalAddress = new PostalAddress();
             $this->postalAddress->parse($postalAddressElement);
         }

src/CXml/Models/Messages/Header.php

@@ -142,10 +142,18 @@ public function setSenderCredentials(array $senderCredentials): Header
         return $this;
     }
 
-    public function parse(\SimpleXMLElement $headerXml, $validate = false) : void
+    public function parse(\SimpleXMLElement $headerXml, $validate = false): void
     {
-        $this->senderIdentity = (string)$headerXml->xpath('Sender/Credential/Identity')[0];
-        $this->senderSharedSecret = (string)$headerXml->xpath('Sender/Credential/SharedSecret')[0];
+        $identity     = $headerXml->xpath('Sender/Credential/Identity');
+        $sharedSecret = $headerXml->xpath('Sender/Credential/SharedSecret');
+
+        if ($identity) {
+            $this->senderIdentity = (string)$identity[0];
+        }
+
+        if ($sharedSecret) {
+            $this->senderSharedSecret = (string)$sharedSecret[0];
+        }
 
 
         // cXml Spec as of January 2021
@@ -160,7 +168,7 @@ public function parse(\SimpleXMLElement $headerXml, $validate = false) : void
         // sends payload that violates this....
         if ($fromCredentials = $headerXml->xpath('From/Credential')) {
             $this->fromIdentity = (string)$fromCredentials[0]->xpath('Identity')[0];
-            $this->fromDomain = (string)$fromCredentials[0]->attributes()->domain;
+            $this->fromDomain   = (string)$fromCredentials[0]->attributes()->domain;
 
             $domainValidation = [];
             foreach ($fromCredentials as $fromCredential) {
@@ -198,7 +206,7 @@ public function parse(\SimpleXMLElement $headerXml, $validate = false) : void
         }
     }
 
-    public function render(\SimpleXMLElement $parentNode) : void
+    public function render(\SimpleXMLElement $parentNode): void
     {
         $headerNode = $parentNode->addChild('Header');
 
@@ -207,8 +215,7 @@ public function render(\SimpleXMLElement $parentNode) : void
             foreach ($this->fromCredentials as $fromCredential) {
                 $fromCredential->render($fromNode);
             }
-        }
-        else {
+        } else {
             $this->addNode($headerNode, 'From', htmlspecialchars($this->fromIdentity ?? 'Unknown', ENT_XML1 | ENT_COMPAT, 'UTF-8'));
         }
 
@@ -217,8 +224,7 @@ public function render(\SimpleXMLElement $parentNode) : void
             foreach ($this->toCredentials as $toCredential) {
                 $toCredential->render($toNode);
             }
-        }
-        else {
+        } else {
             $this->addNode($headerNode, 'To', 'Unknown');
         }
 
@@ -227,14 +233,13 @@ public function render(\SimpleXMLElement $parentNode) : void
             foreach ($this->senderCredentials as $senderCredential) {
                 $senderCredential->render($senderNode);
             }
-        }
-        else {
+        } else {
             $this->addNode($headerNode, 'Sender', $this->getSenderIdentity() ?? 'Unknown')
                 ->addChild('UserAgent', 'Unknown');
         }
     }
 
-    private function addNode(\SimpleXMLElement $parentNode, string $nodeName, string $identity) : \SimpleXMLElement
+    private function addNode(\SimpleXMLElement $parentNode, string $nodeName, string $identity): \SimpleXMLElement
     {
         $node = $parentNode->addChild($nodeName);
 

src/CXml/Models/Messages/ItemOut.php

@@ -63,6 +63,10 @@ class ItemOut implements RequestInterface
      * @var \CXml\Models\Messages\Contact
      */
     protected $contact;
+    protected $unitPrice;
+    protected $unitPriceCurrency;
+    protected $comments;
+    protected $description;
 
     public function parse(\SimpleXMLElement $requestNode): void
     {
@@ -106,16 +110,30 @@ public function parse(\SimpleXMLElement $requestNode): void
         }
 
         if ($node = current($requestNode->xpath('ItemID/SupplierPartID'))) {
-            $this->itemIdSupplierPartID = (string) $node;
+            $this->itemIdSupplierPartID = (string)$node;
         }
         if ($node = current($requestNode->xpath('ItemID/SupplierPartAuxiliaryID'))) {
-            $this->itemIdSupplierPartAuxiliaryID = (string) $node;
+            $this->itemIdSupplierPartAuxiliaryID = (string)$node;
         }
         if ($node = current($requestNode->xpath('ItemID/BuyerPartID'))) {
-            $this->itemIdBuyerPartID = (string) $node;
+            $this->itemIdBuyerPartID = (string)$node;
         }
         if ($node = current($requestNode->xpath('ItemID/IdReference'))) {
-            $this->itemIdIdReference = (string) $node;
+            $this->itemIdIdReference = (string)$node;
+        }
+        if ($node = current($requestNode->xpath('ItemDetail/UnitPrice/Money'))) {
+            $this->unitPrice = (string)$node;
+            $attrs           = $node->attributes();
+
+            if (isset($attrs['currency'])) {
+                $this->unitPriceCurrency = (string)$attrs['currency'];
+            }
+        }
+        if ($node = current($requestNode->xpath('Comments'))) {
+            $this->comments = (string)$node;
+        }
+        if ($node = current($requestNode->xpath('ItemDetail/Description'))) {
+            $this->description = (string)$node;
         }
     }
 
@@ -191,7 +209,8 @@ public function getItemIdSupplierPartAuxiliaryID()
      */
     public function setItemIdSupplierPartAuxiliaryID(
         $itemIdSupplierPartAuxiliaryID
-    ): self {
+    ): self
+    {
         $this->itemIdSupplierPartAuxiliaryID = $itemIdSupplierPartAuxiliaryID;
         return $this;
     }
@@ -747,4 +766,68 @@ public function setContact(Contact $contact): self
         return $this;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getUnitPrice()
+    {
+        return $this->unitPrice;
+    }
+
+    /**
+     * @param mixed $unitPrice
+     */
+    public function setUnitPrice($unitPrice): void
+    {
+        $this->unitPrice = $unitPrice;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUnitPriceCurrency()
+    {
+        return $this->unitPriceCurrency;
+    }
+
+    /**
+     * @param mixed $unitPriceCurrency
+     */
+    public function setUnitPriceCurrency($unitPriceCurrency): void
+    {
+        $this->unitPriceCurrency = $unitPriceCurrency;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getComments()
+    {
+        return $this->comments;
+    }
+
+    /**
+     * @param mixed $comments
+     */
+    public function setComments($comments): void
+    {
+        $this->comments = $comments;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @param mixed $description
+     */
+    public function setDescription($description): void
+    {
+        $this->description = $description;
+    }
+
 }

src/CXml/Models/Messages/PostalAddress.php

@@ -22,6 +22,8 @@ class PostalAddress implements RequestInterface, MessageInterface
      * Optional Properties
      */
 
+    private $isoCountryCode;
+
     /**
      * @var string[]
      */
@@ -38,6 +40,11 @@ public function getCountry()
         return $this->country;
     }
 
+    public function getISOCountryCode()
+    {
+        return $this->isoCountryCode;
+    }
+
     /**
      * @param string $country
      *
@@ -163,37 +170,45 @@ public function setPostalCode($postalCode)
         return $this;
     }
 
-    public function parse(\SimpleXMLElement $contactXml) : void
+    public function parse(\SimpleXMLElement $contactXml): void
     {
         if ($data = $contactXml->xpath('Country')) {
-            $this->country = (string) current($data);
+            $current = current($data);
+
+            $attr = $current->attributes();
+
+            if ($attr && isset($attr->isoCountryCode)) {
+                $this->isoCountryCode = (string)$attr->isoCountryCode;
+            }
+
+            $this->country = (string)$current;
         }
         if ($data = $contactXml->xpath('City')) {
-            $this->city = (string) current($data);
+            $this->city = (string)current($data);
         }
         if ($data = $contactXml->xpath('Street')) {
             foreach ($data as $street) {
-                $this->street[] = (string) $street;
+                $this->street[] = (string)$street;
             }
         }
 
         if ($data = $contactXml->xpath('DeliverTo')) {
             foreach ($data as $deliverTo) {
-                $this->deliverTo[] = (string) $deliverTo;
+                $this->deliverTo[] = (string)$deliverTo;
             }
         }
         if ($data = $contactXml->xpath('Municipality')) {
-            $this->municipality = (string) current($data);
+            $this->municipality = (string)current($data);
         }
         if ($data = $contactXml->xpath('State')) {
-            $this->state = (string) current($data);
+            $this->state = (string)current($data);
         }
         if ($data = $contactXml->xpath('PostalCode')) {
-            $this->postalCode = (string) current($data);
+            $this->postalCode = (string)current($data);
         }
     }
 
-    public function render(\SimpleXMLElement $parentNode) : void
+    public function render(\SimpleXMLElement $parentNode): void
     {
         if ($this->country) {
             $parentNode->addChild('Country', htmlspecialchars($this->country, ENT_XML1 | ENT_COMPAT, 'UTF-8'));

src/CXml/Models/Messages/ShipTo.php

@@ -20,30 +20,44 @@ class ShipTo implements RequestInterface
     /**
      * @var \CXml\Models\Messages\PostalAddress
      */
-    private $address;
+    private $postalAddress;
 
     protected $isoCountryCode;
     protected $addressId;
     protected $addressIdDomain;
 
-    public function parse(\SimpleXMLElement $billToXml) : void
+    public function parse(\SimpleXMLElement $billToXml): void
     {
 
-        if ($data = (string) $billToXml->attributes()->isoCountryCode) {
+        if ($data = (string)$billToXml->attributes()->isoCountryCode) {
             $this->isoCountryCode = $data;
         }
-        if ($data = (string) $billToXml->attributes()->addressID) {
+        if ($data = (string)$billToXml->attributes()->addressID) {
             $this->addressId = $data;
         }
-        if ($data = (string) $billToXml->attributes()->addressIDDomain) {
+        if ($data = (string)$billToXml->attributes()->addressIDDomain) {
             $this->addressIdDomain = $data;
         }
 
-        $this->name = $billToXml->xpath('Name')[0];
+        $name = $billToXml->xpath('Name');
 
-        if ($postalAddressElement = current($billToXml->xpath('PostalAddress'))) {
-            $this->address = new PostalAddress();
-            $this->address->parse($postalAddressElement);
+        if ($name) {
+            $this->name = (string)$name[0];
+        }
+
+        if (strlen($this->name) === 0 && $billToXml->xpath('Address/Name')) {
+            $this->name = (string)$billToXml->xpath('Address/Name')[0];
+        }
+
+        $postalAddressElement = current($billToXml->xpath('PostalAddress'));
+
+        if (!$postalAddressElement) {
+            $postalAddressElement = current($billToXml->xpath('Address/PostalAddress'));
+        }
+
+        if ($postalAddressElement) {
+            $this->postalAddress = new PostalAddress();
+            $this->postalAddress->parse($postalAddressElement);
         }
     }
 
@@ -69,7 +83,7 @@ public function setName($name)
     /**
      * @return \CXml\Models\Messages\PostalAddress
      */
-    public function getPostalAddress(): PostalAddress
+    public function getPostalAddress(): ?PostalAddress
     {
         return $this->postalAddress;
     }