Added support for tax registration identifier (BT-32)

- Added Party::$taxRegistrationId attribute - Updated UblReader and UblWriter - Updated integration test
josemmo · Oct 27, 2021 · 30751aa · 30751aa
1 parent 0609b9c
commit 30751aa
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 4 deletions.
diff --git a/src/Party.php b/src/Party.php
@@ -10,6 +10,7 @@ class Party {
     protected $tradingName = null;
     protected $companyId = null;
     protected $vatNumber = null;
+    protected $taxRegistrationId = null;
     protected $contactName = null;
     protected $contactPhone = null;
     protected $contactEmail = null;
@@ -117,6 +118,26 @@ public function setVatNumber(?string $vatNumber): self {
     }
 
 
+    /**
+     * Get tax registration ID
+     * @return Identifier|null Tax registration ID
+     */
+    public function getTaxRegistrationId(): ?Identifier {
+        return $this->taxRegistrationId;
+    }
+
+
+    /**
+     * Set tax registration ID
+     * @param  Identifier|null $taxRegistrationId Tax registration ID
+     * @return self                               Party instance
+     */
+    public function setTaxRegistrationId(?Identifier $taxRegistrationId): self {
+        $this->taxRegistrationId = $taxRegistrationId;
+        return $this;
+    }
+
+
     /**
      * Get contact point name
      * @return string|null Contact name

diff --git a/src/Readers/UblReader.php b/src/Readers/UblReader.php
@@ -344,10 +344,20 @@ private function parseSellerOrBuyerNode(UXML $xml): Party {
             $this->parsePostalAddressFields($addressNode, $party);
         }
 
-        // VAT number
-        $vatNumberNode = $xml->get("{{$cac}}PartyTaxScheme/{{$cbc}}CompanyID");
-        if ($vatNumberNode !== null) {
-            $party->setVatNumber($vatNumberNode->asText());
+        // VAT number and tax registration identifier
+        foreach ($xml->getAll("{{$cac}}PartyTaxScheme") as $taxNode) {
+            $companyIdNode = $taxNode->get("{{$cbc}}CompanyID");
+            if ($companyIdNode === null) continue;
+            $companyId = $companyIdNode->asText();
+
+            $taxSchemeNode = $taxNode->get("{{$cac}}TaxScheme/{{$cbc}}ID");
+            $taxScheme = ($taxSchemeNode === null) ? null : $taxSchemeNode->asText();
+
+            if ($taxScheme === "VAT") {
+                $party->setVatNumber($companyId);
+            } else {
+                $party->setTaxRegistrationId(new Identifier($companyId, $taxScheme));
+            }
         }
 
         // Legal name

diff --git a/src/Writers/UblWriter.php b/src/Writers/UblWriter.php
@@ -379,6 +379,17 @@ private function addSellerOrBuyerNode(UXML $parent, Party $party) {
             $taxNode->add('cac:TaxScheme')->add('cbc:ID', 'VAT');
         }
 
+        // Tax registration identifier
+        $taxRegistrationId = $party->getTaxRegistrationId();
+        if ($taxRegistrationId !== null) {
+            $taxRegistrationNode = $xml->add('cac:PartyTaxScheme');
+            $taxRegistrationNode->add('cbc:CompanyID', $taxRegistrationId->getValue());
+            $taxRegistrationScheme = $taxRegistrationId->getScheme();
+            if ($taxRegistrationScheme !== null) {
+                $taxRegistrationNode->add('cac:TaxScheme')->add('cbc:ID', $taxRegistrationScheme);
+            }
+        }
+
         // Initial legal entity node
         $legalEntityNode = $xml->add('cac:PartyLegalEntity');
 

diff --git a/tests/Integration/peppol-allowance.xml b/tests/Integration/peppol-allowance.xml
@@ -42,6 +42,12 @@
                     <cbc:ID>VAT</cbc:ID>
                 </cac:TaxScheme>
             </cac:PartyTaxScheme>
+            <cac:PartyTaxScheme>
+                <cbc:CompanyID>SE555555555501</cbc:CompanyID>
+                <cac:TaxScheme>
+                    <cbc:ID>TAX</cbc:ID>
+                </cac:TaxScheme>
+            </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>SupplierOfficialName Ltd</cbc:RegistrationName>
                 <cbc:CompanyID>GB983294</cbc:CompanyID>