Fix SpecifiedTradePaymentTerms in HeaderTradeSettlement cardinality (#9)

Signed-off-by: Jan Nöhles <jan.noehles@easybill.de>
easybill · Sep 20, 2024 · 148b287 · 148b287
1 parent b436e92
commit 148b287
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "easybill/e-invoicing",
-    "version": "0.2.2",
-    "description": "A package to read and create the formats: factur-x, Peppol BIS Billing, XRechnung (CII/UBL)",
+    "version": "0.2.3",
+    "description": "A package to read and create EN16931 e-invoices or CIUS like: XRechnung, ZUGFeRD etc.",
     "type": "library",
     "license": "MIT",
     "keywords": [

diff --git a/composer.lock b/composer.lock
diff --git a/src/CII/Models/HeaderTradeSettlement.php b/src/CII/Models/HeaderTradeSettlement.php
@@ -70,12 +70,10 @@ final class HeaderTradeSettlement
     #[XmlList(entry: 'SpecifiedLogisticsServiceCharge', inline: true, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     public array $specifiedLogisticsServiceCharge = [];
 
-    /**
-     * @var TradePaymentTerms[]
-     */
-    #[Type('array<easybill\eInvoicing\CII\Models\TradePaymentTerms>')]
-    #[XmlList(entry: 'SpecifiedTradePaymentTerms', inline: true, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
-    public array $specifiedTradePaymentTerms = [];
+    #[Type(TradePaymentTerms::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('SpecifiedTradePaymentTerms')]
+    public ?TradePaymentTerms $specifiedTradePaymentTerms = null;
 
     #[Type(TradeSettlementHeaderMonetarySummation::class)]
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]

diff --git a/tests/Integration/CIITest.php b/tests/Integration/CIITest.php
@@ -143,7 +143,7 @@ function () {
         $headerTax2->calculatedAmount = Amount::create('37.62');
         $headerTax2->rateApplicablePercent = '19.00';
 
-        $invoice->supplyChainTradeTransaction->applicableHeaderTradeSettlement->specifiedTradePaymentTerms[] = $paymentTerms = new TradePaymentTerms();
+        $invoice->supplyChainTradeTransaction->applicableHeaderTradeSettlement->specifiedTradePaymentTerms = $paymentTerms = new TradePaymentTerms();
         $paymentTerms->description = 'Zahlbar innerhalb 30 Tagen netto bis 04.04.2018, 3% Skonto innerhalb 10 Tagen bis 15.03.2018';
 
         $invoice->supplyChainTradeTransaction->applicableHeaderTradeSettlement->specifiedTradeSettlementHeaderMonetarySummation = $summation = new TradeSettlementHeaderMonetarySummation();