Merge pull request #812 from Suesswarendieb/feature/invoicer_contact

Add InvoicerContact for use with the extended profile

Author: stephanstapel

ZUGFeRD.Test/ZUGFeRD22Tests.cs

@@ -3623,5 +3623,52 @@ public void TestRSMInvoice()
             Assert.AreEqual(desc.InvoiceNo, "0815-99-1-a");
             Assert.AreEqual(desc.InvoiceDate, new DateTime(2020, 06, 21));
         } // !TestRSMInvoice()        
+
+        [TestMethod]
+        public void TestInvoicerContactWriteAndRead()
+        {
+            var desc = InvoiceDescriptor.CreateInvoice("12345", new DateTime(2025, 06, 01), CurrencyCodes.EUR);
+            desc.Invoicer = new Party
+            {
+                Name = "Invoicer Name",
+                Street = "Straße 1",
+                Postcode = "01234",
+                City = "Musterstadt",
+                Country = CountryCodes.DE,
+            };
+
+            desc.InvoicerContact = new Contact
+            {
+                EmailAddress = "invoiceremail@example.com",
+                FaxNo = "+49 12345",
+                PhoneNo = "+49 54321"
+            };
+
+            using var invoiceStream = new MemoryStream();
+            desc.Save(invoiceStream, ZUGFeRDVersion.Version23, Profile.Extended);
+
+            var invoiceString = Encoding.UTF8.GetString(invoiceStream.ToArray());
+
+            const string expectedInvoicePart = """
+                                               <ram:DefinedTradeContact>
+                                                         <ram:TelephoneUniversalCommunication>
+                                                           <ram:CompleteNumber>+49 54321</ram:CompleteNumber>
+                                                         </ram:TelephoneUniversalCommunication>
+                                                         <ram:FaxUniversalCommunication>
+                                                           <ram:CompleteNumber>+49 12345</ram:CompleteNumber>
+                                                         </ram:FaxUniversalCommunication>
+                                                         <ram:EmailURIUniversalCommunication>
+                                                           <ram:URIID>invoiceremail@example.com</ram:URIID>
+                                                         </ram:EmailURIUniversalCommunication>
+                                                       </ram:DefinedTradeContact>
+                                               """;
+            StringAssert.Contains(invoiceString, expectedInvoicePart);
+
+            var loadedInvoice = InvoiceDescriptor.Load(invoiceStream);
+
+            Assert.AreEqual("invoiceremail@example.com", loadedInvoice.InvoicerContact.EmailAddress);
+            Assert.AreEqual("+49 12345", loadedInvoice.InvoicerContact.FaxNo);
+            Assert.AreEqual("+49 54321", loadedInvoice.InvoicerContact.PhoneNo);
+        }
     }
 }

ZUGFeRD/InvoiceDescriptor.cs

@@ -219,6 +219,12 @@ public class InvoiceDescriptor
         /// </summary>
         public Party Invoicer { get; set; }
 
+        /// <summary>
+        /// Optional contact only used in Extended profile.
+        /// Detailed contact information of the invoicer BG-X-34
+        /// </summary>
+        public Contact InvoicerContact { get; set; }
+
         /// <summary>
         /// This party is optional and is written in most profiles except Minimum profile
         ///

ZUGFeRD/InvoiceDescriptor23CIIReader.cs

@@ -247,6 +247,18 @@ public override InvoiceDescriptor Load(Stream stream)
             }
 
             retval.Invoicer = _nodeAsParty(doc.DocumentElement, "//ram:ApplicableHeaderTradeSettlement/ram:InvoicerTradeParty", nsmgr);
+            if (doc.SelectSingleNode("//ram:InvoicerTradeParty/ram:DefinedTradeContact", nsmgr) != null)
+            {
+                retval.InvoicerContact = new Contact()
+                {
+                    Name = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:InvoicerTradeParty/ram:DefinedTradeContact/ram:PersonName", nsmgr),
+                    OrgUnit = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:InvoicerTradeParty/ram:DefinedTradeContact/ram:DepartmentName", nsmgr),
+                    PhoneNo = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:InvoicerTradeParty/ram:DefinedTradeContact/ram:TelephoneUniversalCommunication/ram:CompleteNumber", nsmgr),
+                    FaxNo = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:InvoicerTradeParty/ram:DefinedTradeContact/ram:FaxUniversalCommunication/ram:CompleteNumber", nsmgr),
+                    EmailAddress = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:InvoicerTradeParty/ram:DefinedTradeContact/ram:EmailURIUniversalCommunication/ram:URIID", nsmgr)
+                };
+            }
+
             retval.Payee = _nodeAsParty(doc.DocumentElement, "//ram:ApplicableHeaderTradeSettlement/ram:PayeeTradeParty", nsmgr);
 
             retval.PaymentReference = XmlUtils.NodeAsString(doc.DocumentElement, "//ram:ApplicableHeaderTradeSettlement/ram:PaymentReference", nsmgr);
@@ -299,7 +311,7 @@ public override InvoiceDescriptor Load(Stream stream)
                     bankleitzahl: i < creditorFinancialInstitutions.Count ? XmlUtils.NodeAsString(creditorFinancialInstitutions[i], ".//ram:GermanBankleitzahlID", nsmgr) : string.Empty,
                     bankName: i < creditorFinancialInstitutions.Count ? XmlUtils.NodeAsString(creditorFinancialInstitutions[i], ".//ram:Name", nsmgr) : string.Empty,
                     name: i < creditorFinancialAccountNodes.Count ? XmlUtils.NodeAsString(creditorFinancialAccountNodes[i], ".//ram:AccountName", nsmgr) : string.Empty);
-            } // !for(i) 
+            } // !for(i)
 
 
             var specifiedTradeSettlementPaymentMeansNodes = doc.SelectNodes("//ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans", nsmgr);

ZUGFeRD/InvoiceDescriptor23CIIWriter.cs

@@ -856,7 +856,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             _Writer.WriteOptionalElementString("ram", "InvoiceIssuerReference", this._Descriptor.SellerReferenceNo, Profile.Extended);
 
             //   6. InvoicerTradeParty (optional), BG-X-33
-            _writeOptionalParty(_Writer, PartyTypes.InvoicerTradeParty, this._Descriptor.Invoicer, Profile.Extended);
+            _writeOptionalParty(_Writer, PartyTypes.InvoicerTradeParty, this._Descriptor.Invoicer, Profile.Extended, this._Descriptor.InvoicerContact);
 
             //   7. InvoiceeTradeParty (optional), BG-X-36
             _writeOptionalParty(_Writer, PartyTypes.InvoiceeTradeParty, this._Descriptor.Invoicee, Profile.Extended, default, default, this._Descriptor.GetInvoiceeTaxRegistration());