Update for Factur-X 1.0.07 - ZUGFeRD 2.3 (#62)

* Add new XSD files for factur-x 1.0.07 * Add new testcase for Reader * Move position of description of TradeParty up * Add missing property SellerOrderReferencedDocument to HeaderTradeAgreement * Add missing ReceivableSpecifiedTradeAccountingAccount to HeaderTradeSettlement * Add missing DespatchAdviceReferencedDocument to HeaderTradeDelivery * Add missing reason code for TradeAllowanceCharge * Add missing TaxCurrencyCode to HeaderTradeSettlement * Add missing ProductCharacteristic, ProductClassification and TradeCurrencyExchange * Add missing TestIndicator in ExchangedDocumentContext * Add missing TradePaymentDiscountTerms to TradePaymentTerms * Add missing IncludedReferencedProduct to ProductType * Fix TradePrice AppliedTradeAllowanceCharge cardinality
easybill · Sep 25, 2024 · 8a91257 · 8a91257
1 parent c18c19b
commit 8a91257
Show file tree

Hide file tree

Showing 97 changed files with 128,401 additions and 81,993 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,10 +1,13 @@
 <?php
 
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
 
-$finder = (new PhpCsFixer\Finder())
-    ->in([__DIR__ . '/src', __DIR__ . '/tests']);
+$finder = (new Finder())
+    ->in([__DIR__ . '/src', __DIR__ . '/tests'])
+;
 
-return (new PhpCsFixer\Config())
+return (new Config())
     ->setRiskyAllowed(false)
     ->setRules([
         '@PSR2' => true,
@@ -32,4 +35,4 @@
         'php_unit_test_class_requires_covers' => false,
         'php_unit_internal_class' => false,
     ])
-    ->setFinder($finder);
+    ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -30,7 +30,8 @@
     "ext-libxml": "*",
     "friendsofphp/php-cs-fixer": "^3.16",
     "phpstan/phpstan": "^1.10",
-    "rector/rector": "^1.0"
+    "rector/rector": "^1.0",
+    "symfony/finder": "^5.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/zugferd2/Model/ClassCode.php b/src/zugferd2/Model/ClassCode.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\XmlAttribute;
+use JMS\Serializer\Annotation\XmlValue;
+
+class ClassCode
+{
+    #[Type('string')]
+    #[XmlAttribute]
+    #[SerializedName('listID')]
+    public ?string $listID = null;
+
+    #[Type('string')]
+    #[XmlValue(cdata: false)]
+    public string $value;
+
+    public static function create(string $id, ?string $listID = null): self
+    {
+        $self = new self();
+        $self->value = $id;
+        $self->listID = $listID;
+        return $self;
+    }
+}
diff --git a/src/zugferd2/Model/ExchangedDocumentContext.php b/src/zugferd2/Model/ExchangedDocumentContext.php
@@ -10,6 +10,11 @@
 
 class ExchangedDocumentContext
 {
+    #[Type(Indicator::class)]
+    #[XmlElement(namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('TestIndicator')]
+    public ?Indicator $testIndicator = null;
+
     #[Type(DocumentContextParameter::class)]
     #[XmlElement(namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('BusinessProcessSpecifiedDocumentContextParameter')]

diff --git a/src/zugferd2/Model/HeaderTradeAgreement.php b/src/zugferd2/Model/HeaderTradeAgreement.php
@@ -18,6 +18,7 @@
     'buyerTaxRepresentativeTradeParty',
     'buyerOrderReferencedDocument',
     'contractReferencedDocument',
+    'sellerOrderReferencedDocument',
     'additionalReferencedDocuments',
     'specifiedProcuringProject',
 ])]
@@ -63,6 +64,11 @@ class HeaderTradeAgreement
     #[XmlList(entry: 'AdditionalReferencedDocument', inline: true, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     public array $additionalReferencedDocuments = [];
 
+    #[Type(ReferencedDocument::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('SellerOrderReferencedDocument')]
+    public ?ReferencedDocument $sellerOrderReferencedDocument;
+
     #[Type(ProcuringProject::class)]
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('SpecifiedProcuringProject')]

diff --git a/src/zugferd2/Model/HeaderTradeDelivery.php b/src/zugferd2/Model/HeaderTradeDelivery.php
@@ -24,4 +24,9 @@ class HeaderTradeDelivery
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('DeliveryNoteReferencedDocument')]
     public ?ReferencedDocument $deliveryNoteReferencedDocument = null;
+
+    #[Type(ReferencedDocument::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('DespatchAdviceReferencedDocument')]
+    public ?ReferencedDocument $despatchAdviceReferencedDocument = null;
 }
diff --git a/src/zugferd2/Model/HeaderTradeSettlement.php b/src/zugferd2/Model/HeaderTradeSettlement.php
@@ -21,16 +21,33 @@ class HeaderTradeSettlement
     #[SerializedName('PaymentReference')]
     public ?string $paymentReference = null;
 
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('TaxCurrencyCode')]
+    public string $taxCurrencyCode;
+
     #[Type('string')]
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('InvoiceCurrencyCode')]
     public string $currency;
 
+    #[Type(TradeParty::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('InvoiceeTradeParty')]
+    public ?TradeParty $invoiceeTradeParty = null;
+
     #[Type(TradeParty::class)]
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('PayeeTradeParty')]
     public ?TradeParty $payeeTradeParty = null;
 
+    /**
+     * @var TradeCurrencyExchange[]
+     */
+    #[Type('array<Easybill\ZUGFeRD2\Model\TradeCurrencyExchange>')]
+    #[XmlList(entry: 'TaxApplicableTradeCurrencyExchange', inline: true, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    public array $taxApplicableTradeCurrencyExchange = [];
+
     /**
      * @var TradeSettlementPaymentMeans[]
      */
@@ -80,4 +97,9 @@ class HeaderTradeSettlement
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('InvoiceReferencedDocument')]
     public ?ReferencedDocument $invoiceReferencedDocument = null;
+
+    /** @var TradeAccountingAccount[] */
+    #[Type('array<Easybill\ZUGFeRD2\Model\TradeAccountingAccount>')]
+    #[XmlList(entry: 'ReceivableSpecifiedTradeAccountingAccount', inline: true, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    public array $receivableSpecifiedTradeAccountingAccount = [];
 }
diff --git a/src/zugferd2/Model/LineTradeDelivery.php b/src/zugferd2/Model/LineTradeDelivery.php
@@ -15,6 +15,11 @@ class LineTradeDelivery
     #[SerializedName('BilledQuantity')]
     public Quantity $billedQuantity;
 
+    #[Type(Quantity::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('PackageQuantity')]
+    public ?Quantity $packageQuantity;
+
     #[Type(SupplyChainEvent::class)]
     #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[SerializedName('ActualDeliverySupplyChainEvent')]

diff --git a/src/zugferd2/Model/ProductCharacteristic.php b/src/zugferd2/Model/ProductCharacteristic.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\XmlElement;
+
+class ProductCharacteristic
+{
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('Description')]
+    public string $description;
+
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('Value')]
+    public string $value;
+}
diff --git a/src/zugferd2/Model/ProductClassification.php b/src/zugferd2/Model/ProductClassification.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\XmlElement;
+
+class ProductClassification
+{
+    #[Type(ClassCode::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('ClassCode')]
+    public ?ClassCode $classCode = null;
+}
diff --git a/src/zugferd2/Model/ProductType.php b/src/zugferd2/Model/ProductType.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\XmlElement;
+
+class ProductType
+{
+    #[Type(Id::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('GlobalID')]
+    public ?Id $id;
+
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('SellerAssignedID')]
+    public ?string $sellerAssignedID = null;
+
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('Name')]
+    public ?string $name = null;
+
+    #[Type(Quantity::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('UnitQuantity')]
+    public ?Quantity $unitQuantity = null;
+}
diff --git a/src/zugferd2/Model/TradeAllowanceCharge.php b/src/zugferd2/Model/TradeAllowanceCharge.php
@@ -31,6 +31,11 @@ class TradeAllowanceCharge
     #[JMS\SerializedName('ActualAmount')]
     public Amount $actualAmount;
 
+    #[JMS\Type('string')]
+    #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[JMS\SerializedName('ReasonCode')]
+    public ?string $reasonCode = null;
+
     #[JMS\Type('string')]
     #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[JMS\SerializedName('Reason')]

diff --git a/src/zugferd2/Model/TradeCurrencyExchange.php b/src/zugferd2/Model/TradeCurrencyExchange.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\XmlElement;
+
+class TradeCurrencyExchange
+{
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('SourceCurrencyCode')]
+    public string $sourceCurrencyCode;
+
+    #[Type('string')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('TargetCurrencyCode')]
+    public string $targetCurrencyCode;
+
+    #[Type('float')]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('ConversionRate')]
+    public float $conversionRate;
+
+    #[Type(DateTime::class)]
+    #[XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[SerializedName('ConversionRateDateTime')]
+    public ?DateTime $conversionRateDateTime = null;
+}
diff --git a/src/zugferd2/Model/TradeParty.php b/src/zugferd2/Model/TradeParty.php
@@ -10,7 +10,7 @@
 use JMS\Serializer\Annotation\XmlElement;
 use JMS\Serializer\Annotation\XmlList;
 
-#[AccessorOrder(order: 'custom', custom: ['id', 'globalID', 'name', 'definedTradeContact', 'postalTradeAddress', 'uriUniversalCommunication', 'taxRegistrations'])]
+#[AccessorOrder(order: 'custom', custom: ['id', 'globalID', 'name', 'description', 'definedTradeContact', 'postalTradeAddress', 'uriUniversalCommunication', 'taxRegistrations'])]
 class TradeParty
 {
     #[Type(Id::class)]

diff --git a/src/zugferd2/Model/TradePaymentDiscountTerms.php b/src/zugferd2/Model/TradePaymentDiscountTerms.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Easybill\ZUGFeRD2\Model;
+
+use JMS\Serializer\Annotation as JMS;
+
+class TradePaymentDiscountTerms
+{
+    #[JMS\Type(Quantity::class)]
+    #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[JMS\SerializedName('BasisPeriodMeasure')]
+    public ?Quantity $basisPeriodMeasure = null;
+
+    #[JMS\Type('string')]
+    #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[JMS\SerializedName('CalculationPercent')]
+    public ?string $calculationPercent = null;
+}
diff --git a/src/zugferd2/Model/TradePaymentTerms.php b/src/zugferd2/Model/TradePaymentTerms.php
@@ -13,6 +13,11 @@ class TradePaymentTerms
     #[JMS\SerializedName('Description')]
     public ?string $description = null;
 
+    #[JMS\Type(TradePaymentDiscountTerms::class)]
+    #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
+    #[JMS\SerializedName('ApplicableTradePaymentDiscountTerms')]
+    public ?TradePaymentDiscountTerms $applicableTradePaymentDiscountTerms = null;
+
     #[JMS\Type(DateTime::class)]
     #[JMS\XmlElement(cdata: false, namespace: 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100')]
     #[JMS\SerializedName('DueDateDateTime')]