add phone field and children (#26)

* add phone field and children * Address parameter issue in billTo
FriendsOfCXML · Jan 26, 2024 · 77a13a1 · 77a13a1
1 parent 4d4d14e
commit 77a13a1
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 4 deletions.
diff --git a/src/CXml/Builder/OrderRequestBuilder.php b/src/CXml/Builder/OrderRequestBuilder.php
@@ -15,6 +15,7 @@
 use CXml\Model\Message\PunchOutOrderMessage;
 use CXml\Model\MoneyWrapper;
 use CXml\Model\MultilanguageString;
+use CXml\Model\Phone;
 use CXml\Model\PostalAddress;
 use CXml\Model\Request\OrderRequest;
 use CXml\Model\Request\OrderRequestHeader;
@@ -103,7 +104,7 @@ public function billTo(
         string $addressId = null,
         string $addressIdDomain = null,
         string $email = null,
-        string $phone = null,
+        Phone $phone = null,
         string $fax = null,
         string $url = null
     ): self {

diff --git a/src/CXml/Model/Address.php b/src/CXml/Model/Address.php
@@ -39,7 +39,7 @@ class Address
      * @Ser\SerializedName("Phone")
      * @Ser\XmlElement (cdata=false)
      */
-    private ?string $phone = null;
+    private ?Phone $phone = null;
 
     /**
      * @Ser\SerializedName("Fax")
@@ -53,7 +53,7 @@ class Address
      */
     private ?string $url = null;
 
-    public function __construct(MultilanguageString $name, PostalAddress $postalAddress = null, string $addressId = null, string $addressIdDomain = null, string $email = null, string $phone = null, string $fax = null, string $url = null)
+    public function __construct(MultilanguageString $name, PostalAddress $postalAddress = null, string $addressId = null, string $addressIdDomain = null, string $email = null, Phone $phone = null, string $fax = null, string $url = null)
     {
         $this->addressId = $addressId;
         $this->addressIdDomain = $addressIdDomain;
@@ -90,7 +90,7 @@ public function getEmail(): ?string
         return $this->email;
     }
 
-    public function getPhone(): ?string
+    public function getPhone(): ?Phone
     {
         return $this->phone;
     }

diff --git a/src/CXml/Model/CountryCode.php b/src/CXml/Model/CountryCode.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace CXml\Model;
+
+use JMS\Serializer\Annotation as Ser;
+
+class CountryCode
+{
+    /**
+     * @Ser\XmlAttribute
+     * @Ser\SerializedName("isoCountryCode")
+     */
+    private string $isoCountryCode;
+
+    /**
+     * @Ser\XmlValue(cdata=false)
+     */
+    private ?string $name = null;
+
+    public function __construct(string $isoCountryCode, string $name = null)
+    {
+        $this->isoCountryCode = $isoCountryCode;
+        $this->name = $name;
+    }
+
+    public function getIsoCountryCode(): string
+    {
+        return $this->isoCountryCode;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+}
diff --git a/src/CXml/Model/Phone.php b/src/CXml/Model/Phone.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace CXml\Model;
+
+use JMS\Serializer\Annotation as Ser;
+
+class Phone
+{
+    /**
+     * @Ser\SerializedName("TelephoneNumber")
+     * @Ser\XmlElement (cdata=false)
+     */
+    private TelephoneNumber $telephoneNumber;
+
+    /**
+     * @Ser\XmlAttribute
+     * @Ser\SerializedName("name")
+     */
+    private ?string $name = null;
+
+    public function __construct(TelephoneNumber $telephoneNumber, string $name = null)
+    {
+        $this->telephoneNumber = $telephoneNumber;
+        $this->name = $name;
+    }
+
+    public function getTelephoneNumber(): TelephoneNumber
+    {
+        return $this->telephoneNumber;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+}
diff --git a/src/CXml/Model/TelephoneNumber.php b/src/CXml/Model/TelephoneNumber.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace CXml\Model;
+
+use JMS\Serializer\Annotation as Ser;
+
+class TelephoneNumber
+{
+    /**
+     * @Ser\SerializedName("CountryCode")
+     * @Ser\XmlElement (cdata=false)
+     */
+    private CountryCode $countryCode;
+
+    /**
+     * @Ser\SerializedName("AreaOrCityCode")
+     * @Ser\XmlElement (cdata=false)
+     */
+    private ?string $areaOrCityCode = null;
+
+    /**
+     * @Ser\SerializedName("Number")
+     * @Ser\XmlElement (cdata=false)
+     */
+    private ?string $number = null;
+
+    public function __construct(CountryCode $countryCode, string $areaOrCityCode = null, string $number = null)
+    {
+        $this->countryCode = $countryCode;
+        $this->areaOrCityCode = $areaOrCityCode;
+        $this->number = $number;
+    }
+
+    public function getCountryCode(): CountryCode
+    {
+        return $this->countryCode;
+    }
+
+    public function getAreaOrCityCode(): ?string
+    {
+        return $this->areaOrCityCode;
+    }
+
+    public function getNumber(): ?string
+    {
+        return $this->number;
+    }
+}
diff --git a/tests/CXmlTest/Model/OrderRequestTest.php b/tests/CXmlTest/Model/OrderRequestTest.php
@@ -8,6 +8,7 @@
 use CXml\Model\Classification;
 use CXml\Model\Comment;
 use CXml\Model\Country;
+use CXml\Model\CountryCode;
 use CXml\Model\Credential;
 use CXml\Model\Description;
 use CXml\Model\ItemDetail;
@@ -16,11 +17,13 @@
 use CXml\Model\MoneyWrapper;
 use CXml\Model\MultilanguageString;
 use CXml\Model\PayloadIdentity;
+use CXml\Model\Phone;
 use CXml\Model\PostalAddress;
 use CXml\Model\Request\OrderRequest;
 use CXml\Model\Request\OrderRequestHeader;
 use CXml\Model\Request\Request;
 use CXml\Model\ShipTo;
+use CXml\Model\TelephoneNumber;
 use CXml\Payload\PayloadIdentityFactoryInterface;
 use CXml\Serializer;
 use CXml\Validation\DtdValidator;
@@ -75,6 +78,17 @@ public function testMinimumExample(): void
                         'CA',
                         '90489',
                         'default'
+                    ),
+                    null,
+                    null,
+                    null,
+                    new Phone(
+                        new TelephoneNumber(
+                            new CountryCode('US', '1'),
+                            '800',
+                            '5551212'
+                        ),
+                        'personal'
                     )
                 )
             ),
@@ -92,6 +106,17 @@ public function testMinimumExample(): void
                         null,
                         '42699',
                         'default'
+                    ),
+                    null,
+                    null,
+                    null,
+                    new Phone(
+                        new TelephoneNumber(
+                            new CountryCode('DE', '49'),
+                            '761',
+                            '1234567'
+                        ),
+                        'company'
                     )
                 )
             ),

diff --git a/tests/CXmlTest/Model/PunchOutSetupRequestTest.php b/tests/CXmlTest/Model/PunchOutSetupRequestTest.php
@@ -6,6 +6,7 @@
 use CXml\Model\Address;
 use CXml\Model\Classification;
 use CXml\Model\Country;
+use CXml\Model\CountryCode;
 use CXml\Model\Credential;
 use CXml\Model\Description;
 use CXml\Model\Extrinsic;
@@ -15,10 +16,12 @@
 use CXml\Model\MoneyWrapper;
 use CXml\Model\MultilanguageString;
 use CXml\Model\PayloadIdentity;
+use CXml\Model\Phone;
 use CXml\Model\PostalAddress;
 use CXml\Model\Request\PunchOutSetupRequest;
 use CXml\Model\SelectedItem;
 use CXml\Model\ShipTo;
+use CXml\Model\TelephoneNumber;
 use CXml\Payload\PayloadIdentityFactoryInterface;
 use CXml\Serializer;
 use CXml\Validation\DtdValidator;
@@ -75,6 +78,17 @@ public function testMinimumExample(): void
                         'CA',
                         '90489',
                         'default'
+                    ),
+                    null,
+                    null,
+                    null,
+                    new Phone(
+                        new TelephoneNumber(
+                            new CountryCode('US', '1'),
+                            '800',
+                            '5551212'
+                        ),
+                        'personal'
                     )
                 )
             ),

diff --git a/tests/CXmlTest/Model/QuoteMessageTest.php b/tests/CXmlTest/Model/QuoteMessageTest.php
@@ -6,15 +6,18 @@
 use CXml\Model\Address;
 use CXml\Model\Contact;
 use CXml\Model\Country;
+use CXml\Model\CountryCode;
 use CXml\Model\Credential;
 use CXml\Model\Message\QuoteMessage;
 use CXml\Model\Message\QuoteMessageHeader;
 use CXml\Model\MoneyWrapper;
 use CXml\Model\MultilanguageString;
 use CXml\Model\OrganizationId;
 use CXml\Model\PayloadIdentity;
+use CXml\Model\Phone;
 use CXml\Model\PostalAddress;
 use CXml\Model\ShipTo;
+use CXml\Model\TelephoneNumber;
 use CXml\Payload\PayloadIdentityFactoryInterface;
 use CXml\Serializer;
 use CXml\Validation\DtdValidator;
@@ -83,6 +86,17 @@ public function testMinimumExample(): void
                     null,
                     'CA',
                     '90489'
+                ),
+                null,
+                null,
+                null,
+                new Phone(
+                    new TelephoneNumber(
+                        new CountryCode('US', '1'),
+                        '800',
+                        '1234567'
+                    ),
+                    'company'
                 )
             )
         );

diff --git a/tests/metadata/cxml/samples/OrderRequest.xml b/tests/metadata/cxml/samples/OrderRequest.xml
@@ -41,6 +41,13 @@
                              <PostalCode>90489</PostalCode>
                              <Country isoCountryCode="US">United States</Country>
                          </PostalAddress>
+                         <Phone name="personal">
+                             <TelephoneNumber>
+                                 <CountryCode isoCountryCode="US">1</CountryCode>
+                                 <AreaOrCityCode>800</AreaOrCityCode>
+                                 <Number>5551212</Number>
+                             </TelephoneNumber>
+                         </Phone>
                      </Address>
                  </ShipTo>
                  <BillTo>
@@ -52,6 +59,13 @@
                              <PostalCode>42699</PostalCode>
                              <Country isoCountryCode="DE">Deutschland</Country>
                          </PostalAddress>
+                         <Phone name="company">
+                             <TelephoneNumber>
+                                 <CountryCode isoCountryCode="DE">49</CountryCode>
+                                 <AreaOrCityCode>761</AreaOrCityCode>
+                                 <Number>1234567</Number>
+                             </TelephoneNumber>
+                         </Phone>
                      </Address>
                  </BillTo>
                  <Comments>

diff --git a/tests/metadata/cxml/samples/PunchOutSetupRequest.xml b/tests/metadata/cxml/samples/PunchOutSetupRequest.xml
@@ -42,6 +42,13 @@
                         <PostalCode>90489</PostalCode>
                         <Country isoCountryCode="US">United States</Country>
                     </PostalAddress>
+                    <Phone name="personal">
+                        <TelephoneNumber>
+                            <CountryCode isoCountryCode="US">1</CountryCode>
+                            <AreaOrCityCode>800</AreaOrCityCode>
+                            <Number>5551212</Number>
+                        </TelephoneNumber>
+                    </Phone>
                 </Address>
             </ShipTo>
             <SelectedItem>

diff --git a/tests/metadata/cxml/samples/QuoteMessage.xml b/tests/metadata/cxml/samples/QuoteMessage.xml
@@ -45,6 +45,13 @@
                             <PostalCode>90489</PostalCode>
                             <Country isoCountryCode="US">United States</Country>
                         </PostalAddress>
+                        <Phone name="company">
+                            <TelephoneNumber>
+                                <CountryCode isoCountryCode="US">1</CountryCode>
+                                <AreaOrCityCode>800</AreaOrCityCode>
+                                <Number>1234567</Number>
+                            </TelephoneNumber>
+                        </Phone>
                     </Address>
                 </ShipTo>