added AssociatedDocumentLineDocument>IncludedNote element (#47)

* added AssociatedDocumentLineDocument>IncludedNote element added Note@ContentCode property * added LineTradeDelivery>ActualDeliverySupplyChainEvent element for extended format
easybill · Apr 25, 2023 · a927d84 · a927d84
1 parent 5803d08
commit a927d84
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 1 deletion.
diff --git a/src/zugferd211/Model/DocumentLineDocument.php b/src/zugferd211/Model/DocumentLineDocument.php
@@ -5,6 +5,7 @@
 use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\Type;
 use JMS\Serializer\Annotation\XmlElement;
+use JMS\Serializer\Annotation\XmlList;
 
 class DocumentLineDocument
 {
@@ -15,6 +16,13 @@ class DocumentLineDocument
      */
     public string $lineId;
 
+    /**
+     * @var Note[]
+     * @Type("array<Easybill\ZUGFeRD211\Model\Note>")
+     * @XmlList(inline=true, entry="IncludedNote", namespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100")
+     */
+    public array $notes = [];
+
     public static function create(string $lineId): self
     {
         $self = new self();

diff --git a/src/zugferd211/Model/LineTradeDelivery.php b/src/zugferd211/Model/LineTradeDelivery.php
@@ -14,4 +14,11 @@ class LineTradeDelivery
      * @SerializedName("BilledQuantity")
      */
     public Quantity $billedQuantity;
+
+    /**
+     * @Type("Easybill\ZUGFeRD211\Model\SupplyChainEvent")
+     * @XmlElement(cdata=false, namespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100")
+     * @SerializedName("ActualDeliverySupplyChainEvent")
+     */
+    public ?SupplyChainEvent $chainEvent = null;
 }
diff --git a/src/zugferd211/Model/Note.php b/src/zugferd211/Model/Note.php
@@ -8,6 +8,13 @@
 
 class Note
 {
+    /**
+     * @Type("string")
+     * @XmlElement(cdata=false, namespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100")
+     * @SerializedName("ContentCode")
+     */
+    public ?string $contentCode = null;
+
     /**
      * @Type("string")
      * @XmlElement(cdata=false, namespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100")
@@ -22,11 +29,12 @@ class Note
      */
     public ?string $subjectCode = null;
 
-    public static function create(string $content, ?string $subjectCode = null): self
+    public static function create(string $content, ?string $subjectCode = null, ?string $contentCode = null): self
     {
         $self = new self();
         $self->content = $content;
         $self->subjectCode = $subjectCode;
+        $self->contentCode = $contentCode;
         return $self;
     }
 }
diff --git a/tests/zugferd211/Tests/BuilderTest.php b/tests/zugferd211/Tests/BuilderTest.php
@@ -229,6 +229,7 @@ public function testBuildXRechnungExtendedExample(): void
         $invoice->supplyChainTradeTransaction = new SupplyChainTradeTransaction();
         $invoice->supplyChainTradeTransaction->lineItems[] = $item1 = new SupplyChainTradeLineItem();
         $item1->associatedDocumentLineDocument = DocumentLineDocument::create('1');
+        $item1->associatedDocumentLineDocument->notes[] = Note::create('Neutrale Umverpackung', 'AAI', 'Umverpackung');
 
         $item1->specifiedTradeProduct = new TradeProduct();
         $item1->specifiedTradeProduct->name = 'Trennblätter A4';
@@ -242,6 +243,8 @@ public function testBuildXRechnungExtendedExample(): void
 
         $item1->delivery = new LineTradeDelivery();
         $item1->delivery->billedQuantity = Quantity::create('20.0000', 'H87');
+        $item1->delivery->chainEvent = new SupplyChainEvent();
+        $item1->delivery->chainEvent->date = DateTime::create('102', '20180305');
 
         $item1->specifiedLineTradeSettlement = new LineTradeSettlement();
         $item1->specifiedLineTradeSettlement->tradeTax[] = $item1tax = new TradeTax();

diff --git a/tests/zugferd211/Tests/zugferd_2p1_XRECHNUNG_Extended.xml b/tests/zugferd211/Tests/zugferd_2p1_XRECHNUNG_Extended.xml
@@ -117,6 +117,11 @@ Handelsregisternummer: H A 123
     <ram:IncludedSupplyChainTradeLineItem>
       <ram:AssociatedDocumentLineDocument>
         <ram:LineID>1</ram:LineID>
+        <ram:IncludedNote>
+          <ram:ContentCode>Umverpackung</ram:ContentCode>
+          <ram:Content>Neutrale Umverpackung</ram:Content>
+          <ram:SubjectCode>AAI</ram:SubjectCode>
+        </ram:IncludedNote>
       </ram:AssociatedDocumentLineDocument>
       <ram:SpecifiedTradeProduct>
         <ram:GlobalID schemeID="0160">4012345001235</ram:GlobalID>
@@ -137,6 +142,11 @@ Handelsregisternummer: H A 123
       </ram:SpecifiedLineTradeAgreement>
       <ram:SpecifiedLineTradeDelivery>
         <ram:BilledQuantity unitCode="H87">20.0000</ram:BilledQuantity>
+        <ram:ActualDeliverySupplyChainEvent>
+          <ram:OccurrenceDateTime>
+            <udt:DateTimeString format="102">20180305</udt:DateTimeString>
+          </ram:OccurrenceDateTime>
+        </ram:ActualDeliverySupplyChainEvent>
       </ram:SpecifiedLineTradeDelivery>
       <ram:SpecifiedLineTradeSettlement>
         <ram:ApplicableTradeTax>