Working on feature flow and tests for verifactu submissions

app/Models/VerifactuLog.php

@@ -41,6 +41,8 @@ class VerifactuLog extends Model
         'response' => 'object',
     ];
 
+    protected $guarded = ['id'];
+
     public function company()
     {
         return $this->belongsTo(Company::class);

app/Services/EDocument/Standards/Validation/VerifactuDocumentValidator.php

@@ -98,32 +98,35 @@ class VerifactuDocumentValidator extends XsltDocumentValidator
     {
         $xpath = new \DOMXPath($doc);
         $xpath->registerNamespace('si', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
+        $xpath->registerNamespace('sum1', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
         
-        // Check for modification structure
+        // Check for modification structure - look for RegistroAlta with TipoFactura R1
-        $modificacionFactura = $xpath->query('//si:ModificacionFactura');
+        $registroAlta = $xpath->query('//si:RegistroAlta | //sum1:RegistroAlta');
-        if ($modificacionFactura->length > 0) {
+        if ($registroAlta->length > 0) {
+            $tipoFactura = $xpath->query('.//si:TipoFactura | .//sum1:TipoFactura', $registroAlta->item(0));
+            if ($tipoFactura->length > 0 && $tipoFactura->item(0)->textContent === 'R1') {
+                return 'modification';
+            }
+        }
+        
+        // Check for RegistroModificacion structure (legacy)
+        $registroModificacion = $xpath->query('//si:RegistroModificacion | //sum1:RegistroModificacion');
+        if ($registroModificacion->length > 0) {
             return 'modification';
         }
         
         // Check for cancellation structure
-        $registroAnulacion = $xpath->query('//si:RegistroAnulacion');
+        $registroAnulacion = $xpath->query('//si:RegistroAnulacion | //sum1:RegistroAnulacion');
         if ($registroAnulacion->length > 0) {
             return 'cancellation';
         }
         
-        // Check for registration structure
+        // Check for registration structure (RegistroAlta with TipoFactura not R1)
-        $registroAlta = $xpath->query('//si:RegistroAlta');
         if ($registroAlta->length > 0) {
+            $tipoFactura = $xpath->query('.//si:TipoFactura | .//sum1:TipoFactura', $registroAlta->item(0));
+            if ($tipoFactura->length === 0 || $tipoFactura->item(0)->textContent !== 'R1') {
                 return 'registration';
             }
-        
-        // Check for DatosFactura with TipoFactura R1 (rectificativa)
-        $datosFactura = $xpath->query('//si:DatosFactura');
-        if ($datosFactura->length > 0) {
-            $tipoFactura = $xpath->query('//si:TipoFactura');
-            if ($tipoFactura->length > 0 && $tipoFactura->item(0)->textContent === 'R1') {
-                return 'modification';
-            }
         }
         
         return 'unknown';
@@ -136,6 +139,7 @@ class VerifactuDocumentValidator extends XsltDocumentValidator
     {
         $xpath = new \DOMXPath($doc);
         $xpath->registerNamespace('si', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
+        $xpath->registerNamespace('sum1', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
         $xpath->registerNamespace('lr', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd');
         
         // Validate modification-specific structure
@@ -153,38 +157,44 @@ class VerifactuDocumentValidator extends XsltDocumentValidator
      */
     private function validateModificationStructure(\DOMXPath $xpath): void
     {
-        // Check for required modification elements
+        // Check for RegistroAlta with TipoFactura R1
+        $registroAlta = $xpath->query('//si:RegistroAlta');
+        if ($registroAlta === false || $registroAlta->length === 0) {
+            // Try alternative namespace
+            $registroAlta = $xpath->query('//sum1:RegistroAlta');
+            if ($registroAlta === false || $registroAlta->length === 0) {
+                $this->errors['structure'][] = "RegistroAlta element not found for modification";
+                return;
+            }
+        }
+        
+        // Check for required modification elements within the RegistroAlta
         $requiredElements = [
-            '//si:DatosFactura' => 'DatosFactura',
+            './/si:TipoFactura' => 'TipoFactura',
-            '//si:TipoFactura' => 'TipoFactura',
+            './/si:DescripcionOperacion' => 'DescripcionOperacion',
-            '//si:ModificacionFactura' => 'ModificacionFactura',
+            './/si:ImporteTotal' => 'ImporteTotal'
-            '//si:TipoRectificativa' => 'TipoRectificativa',
-            '//si:FacturasRectificadas' => 'FacturasRectificadas',
-            '//si:ImporteTotal' => 'ImporteTotal'
         ];
         
         foreach ($requiredElements as $xpathQuery => $elementName) {
-            $elements = $xpath->query($xpathQuery);
+            $elements = $xpath->query($xpathQuery, $registroAlta->item(0));
-            if ($elements->length === 0) {
+            if ($elements === false || $elements->length === 0) {
+                // Try alternative namespace
+                $altQuery = str_replace('si:', 'sum1:', $xpathQuery);
+                $elements = $xpath->query($altQuery, $registroAlta->item(0));
+                if ($elements === false || $elements->length === 0) {
                     $this->errors['structure'][] = "Required modification element not found: $elementName";
                 }
             }
+        }
         
         // Validate TipoFactura is R1 for modifications
-        $tipoFactura = $xpath->query('//si:TipoFactura');
+        $tipoFactura = $xpath->query('.//si:TipoFactura', $registroAlta->item(0));
-        if ($tipoFactura->length > 0 && $tipoFactura->item(0)->textContent !== 'R1') {
+        if ($tipoFactura === false || $tipoFactura->length === 0) {
+            $tipoFactura = $xpath->query('.//sum1:TipoFactura', $registroAlta->item(0));
+        }
+        if ($tipoFactura !== false && $tipoFactura->length > 0 && $tipoFactura->item(0)->textContent !== 'R1') {
             $this->errors['structure'][] = "TipoFactura must be 'R1' for modifications, found: " . $tipoFactura->item(0)->textContent;
         }
-        
-        // Validate TipoRectificativa is valid
-        $tipoRectificativa = $xpath->query('//si:TipoRectificativa');
-        if ($tipoRectificativa->length > 0) {
-            $value = $tipoRectificativa->item(0)->textContent;
-            $validValues = ['S', 'I']; // Sustitutiva, Inmune
-            if (!in_array($value, $validValues)) {
-                $this->errors['structure'][] = "TipoRectificativa must be 'S' or 'I', found: $value";
-            }
-        }
     }
 
     /**
@@ -192,33 +202,37 @@ class VerifactuDocumentValidator extends XsltDocumentValidator
      */
     private function validateModificationRequiredElements(\DOMXPath $xpath): void
     {
-        // Check for required elements in FacturasRectificadas
+        // Check for required elements in FacturasRectificadas - look for both si: and sf: namespaces
-        $facturasRectificadas = $xpath->query('//si:FacturasRectificadas');
+        $facturasRectificadas = $xpath->query('//si:FacturasRectificadas | //sf:FacturasRectificadas');
-        if ($facturasRectificadas->length > 0) {
+        if ($facturasRectificadas !== false && $facturasRectificadas->length > 0) {
-            $facturas = $xpath->query('//si:FacturasRectificadas/si:Factura');
+            $idFacturasRectificadas = $xpath->query('//si:FacturasRectificadas/si:IDFacturaRectificada | //sf:FacturasRectificadas/sf:IDFacturaRectificada');
-            if ($facturas->length === 0) {
+            if ($idFacturasRectificadas === false || $idFacturasRectificadas->length === 0) {
-                $this->errors['structure'][] = "At least one Factura is required in FacturasRectificadas";
+                $this->errors['structure'][] = "At least one IDFacturaRectificada is required in FacturasRectificadas";
             } else {
-                // Validate each factura has required elements
+                // Validate each IDFacturaRectificada has required elements
-                foreach ($facturas as $index => $factura) {
+                foreach ($idFacturasRectificadas as $index => $idFacturaRectificada) {
-                    $numSerie = $xpath->query('.//si:NumSerieFacturaEmisor', $factura);
+                    $idEmisorFactura = $xpath->query('.//si:IDEmisorFactura | .//sf:IDEmisorFactura', $idFacturaRectificada);
-                    $fechaExpedicion = $xpath->query('.//si:FechaExpedicionFacturaEmisor', $factura);
+                    $numSerieFactura = $xpath->query('.//si:NumSerieFactura | .//sf:NumSerieFactura', $idFacturaRectificada);
+                    $fechaExpedicionFactura = $xpath->query('.//si:FechaExpedicionFactura | .//sf:FechaExpedicionFactura', $idFacturaRectificada);
                     
-                    if ($numSerie->length === 0) {
+                    if ($idEmisorFactura === false || $idEmisorFactura->length === 0) {
-                        $this->errors['structure'][] = "NumSerieFacturaEmisor is required in Factura " . ($index + 1);
+                        $this->errors['structure'][] = "IDEmisorFactura is required in IDFacturaRectificada " . ($index + 1);
                     }
-                    if ($fechaExpedicion->length === 0) {
+                    if ($numSerieFactura === false || $numSerieFactura->length === 0) {
-                        $this->errors['structure'][] = "FechaExpedicionFacturaEmisor is required in Factura " . ($index + 1);
+                        $this->errors['structure'][] = "NumSerieFactura is required in IDFacturaRectificada " . ($index + 1);
+                    }
+                    if ($fechaExpedicionFactura === false || $fechaExpedicionFactura->length === 0) {
+                        $this->errors['structure'][] = "FechaExpedicionFactura is required in IDFacturaRectificada " . ($index + 1);
                     }
                 }
             }
         }
         
-        // Check for tax information
+        // Check for tax information - look for both si: and sf: namespaces
-        $impuestos = $xpath->query('//si:Impuestos');
+        $impuestos = $xpath->query('//si:Impuestos | //sf:Impuestos');
-        if ($impuestos->length > 0) {
+        if ($impuestos !== false && $impuestos->length > 0) {
-            $detalleIVA = $xpath->query('//si:Impuestos/si:DetalleIVA');
+            $detalleIVA = $xpath->query('//si:Impuestos/si:DetalleIVA | //sf:Impuestos/sf:DetalleIVA');
-            if ($detalleIVA->length === 0) {
+            if ($detalleIVA === false || $detalleIVA->length === 0) {
                 $this->errors['structure'][] = "DetalleIVA is required when Impuestos is present";
             }
         }

app/Services/EDocument/Standards/Verifactu.php

@@ -14,22 +14,23 @@ namespace App\Services\EDocument\Standards;
 use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Product;
+use App\Models\VerifactuLog;
 use App\Helpers\Invoice\Taxer;
 use App\DataMapper\Tax\BaseRule;
 use App\Services\AbstractService;
 use App\Helpers\Invoice\InvoiceSum;
 use App\Utils\Traits\NumberFormatter;
 use App\Helpers\Invoice\InvoiceSumInclusive;
+use App\Services\EDocument\Standards\Verifactu\AeatClient;
+use App\Services\EDocument\Standards\Verifactu\RegistroAlta;
 use App\Services\EDocument\Standards\Verifactu\Models\Desglose;
+use App\Services\EDocument\Standards\Verifactu\RegistroModificacion;
 use App\Services\EDocument\Standards\Verifactu\Models\Encadenamiento;
 use App\Services\EDocument\Standards\Verifactu\Models\RegistroAnterior;
 use App\Services\EDocument\Standards\Verifactu\Models\SistemaInformatico;
-use App\Services\EDocument\Standards\Verifactu\Models\PersonaFisicaJuridica;
-use App\Services\EDocument\Standards\Verifactu\RegistroAlta;
-use App\Services\EDocument\Standards\Verifactu\RegistroModificacion;
-use App\Services\EDocument\Standards\Verifactu\Models\Invoice as VerifactuInvoice;
 use App\Services\EDocument\Standards\Verifactu\Models\InvoiceModification;
-use App\Services\EDocument\Standards\Verifactu\AeatClient;
+use App\Services\EDocument\Standards\Verifactu\Models\PersonaFisicaJuridica;
+use App\Services\EDocument\Standards\Verifactu\Models\Invoice as VerifactuInvoice;
 
 class Verifactu extends AbstractService
 {
@@ -38,6 +39,14 @@ class Verifactu extends AbstractService
 
     private string $soapXml;
     
+    //store the current document state
+    private VerifactuInvoice $_document;
+    
+    //store the current huella
+    private string $_huella;
+
+    private string $_previous_huella;
+    
     public function __construct(public Invoice $invoice)
     {  
         $this->aeat_client = new AeatClient();
@@ -51,44 +60,88 @@ class Verifactu extends AbstractService
     public function run(): self
     {
 
-        $v_logs = $this->invoice->verifactu_logs;
+        $v_logs = $this->invoice->company->verifactu_logs;
 
         //determine the current status of the invoice.
         $document = (new RegistroAlta($this->invoice))->run()->getInvoice();
 
-        $huella = '';
+        //keep this state for logging later on successful send
+        $this->_document = $document;
+
+        $this->_previous_huella = '';
 
-        nlog($v_logs->count());
         //1. new => RegistraAlta
         if($v_logs->count() >= 1){
             $v_log = $v_logs->first();
-            $huella = $v_log->hash;
+            $this->_previous_huella = $v_log->hash;
-            $document = InvoiceModification::createFromInvoice($document, $v_log->deserialize());    
+            // $document = InvoiceModification::createFromInvoice($document, $v_log->deserialize());    
         }
 
         //3. cancelled => RegistroAnulacion
 
-        $new_huella = $this->calculateHash($document, $huella); // careful with this! we'll need to reference this later
+        $this->_huella = $this->calculateHash($document, $this->_previous_huella); // careful with this! we'll need to reference this later
-        $document->setHuella($new_huella);
+        $document->setHuella($this->_huella);
 
         $this->setEnvelope($document->toSoapEnvelope());
 
-
         return $this;
         
     }
         
+    public function getInvoice()
+    {
+        return $this->_document;
+    }
+
+    public function setInvoice(VerifactuInvoice $invoice): self
+    {
+        $this->_document = $invoice;
+        return $this;
+    }
+
     public function getEnvelope(): string
     {
         return $this->soapXml;
     }
     
+    public function setTestMode(): self
+    {
+        $this->aeat_client->setTestMode();
+        return $this;
+    }
+    /**
+     * setPreviousHash
+     *
+     * **only used for testing**
+     * @param  string $previous_hash
+     * @return self
+     */
+    public function setPreviousHash(string $previous_hash): self
+    {
+        $this->_previous_huella = $previous_hash;
+        return $this;
+    }
+
     private function setEnvelope(string $soapXml): self
     {
         $this->soapXml = $soapXml;
         return $this;
     }
 
+    public function writeLog(array $response)
+    {
+        VerifactuLog::create([
+            'invoice_id' => $this->invoice->id,
+            'company_id' => $this->invoice->company_id,
+            'invoice_number' => $this->invoice->number,
+            'date' => $this->invoice->date,
+            'hash' => $this->_huella,
+            'nif' => $this->_document->getIdFactura()->getIdEmisorFactura(),
+            'previous_hash' => $this->_previous_huella,
+            'state' => $this->_document->serialize(),
+            'response' => $response,
+        ]);
+    }
     /**
      * calculateHash
      *
@@ -98,10 +151,10 @@ class Verifactu extends AbstractService
      */
     public function calculateHash($document, string $huella): string
     {
-        nlog($document->toXmlString());
+        
-        $idEmisorFactura = $document->getIdEmisorFactura();
+        $idEmisorFactura = $document->getIdFactura()->getIdEmisorFactura();
-        $numSerieFactura = $document->getIdFactura();
+        $numSerieFactura = $document->getIdFactura()->getNumSerieFactura();
-        $fechaExpedicionFactura = $document->getFechaExpedicionFactura();
+        $fechaExpedicionFactura = $document->getIdFactura()->getFechaExpedicionFactura();
         $tipoFactura = $document->getTipoFactura();
         $cuotaTotal = $document->getCuotaTotal();
         $importeTotal = $document->getImporteTotal();
@@ -121,6 +174,14 @@ class Verifactu extends AbstractService
     
     public function send(string $soapXml): array
     {
-        return $this->aeat_client->send($soapXml);
+        nlog(["sending", $soapXml]);
+
+        $response =  $this->aeat_client->send($soapXml);
+
+        if($response['success']){
+            $this->writeLog($response);
+        }
+
+        return $response;
     }
 }

app/Services/EDocument/Standards/Verifactu/AeatClient.php

@@ -16,7 +16,7 @@ use App\Services\EDocument\Standards\Verifactu\ResponseProcessor;
 
 class AeatClient
 {
-    private string $base_url;
+    private string $base_url = 'https://www1.aeat.es/wlpl/TIKE-CONT/ws/SistemaFacturacion/VerifactuSOAP';
 
     private string $sandbox_url = 'https://prewww1.aeat.es/wlpl/TIKE-CONT/ws/SistemaFacturacion/VerifactuSOAP';
 
@@ -32,8 +32,8 @@ class AeatClient
      */
     private function init(): self
     {
-        $this->certificate = $this->certificate ?? file_get_contents(config('services.verifactu.certificate'));
+        $this->certificate = $this->certificate ?? config('services.verifactu.certificate');
-        $this->ssl_key = $this->ssl_key ?? file_get_contents(config('services.verifactu.ssl_key'));
+        $this->ssl_key = $this->ssl_key ?? config('services.verifactu.ssl_key');
 
         return $this;
     }

app/Services/EDocument/Standards/Verifactu/Examples/R1InvoiceExample.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Services\EDocument\Standards\Verifactu\Examples;
+
+use App\Services\EDocument\Standards\Verifactu\Models\Invoice;
+use App\Services\EDocument\Standards\Verifactu\Models\IDFactura;
+use App\Services\EDocument\Standards\Verifactu\Models\FacturaRectificativa;
+
+/**
+ * Example demonstrating how to create R1 (rectificative) invoices
+ * with proper conditional logic for ImporteRectificacion
+ */
+class R1InvoiceExample
+{
+    /**
+     * Example 1: Create a substitutive rectification invoice (R1 with TipoRectificativa = 'S')
+     * This requires ImporteRectificacion to be set
+     */
+    public static function createSubstitutiveRectification(): Invoice
+    {
+        $invoice = new Invoice();
+        
+        // Set basic invoice information
+        $invoice->setIdVersion('1.0')
+                ->setIdFactura(new IDFactura('A39200019', 'TEST0033343444', '09-08-2025'))
+                ->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS')
+                ->setDescripcionOperacion('Rectificación sustitutiva de factura anterior')
+                ->setCuotaTotal(46.08)
+                ->setImporteTotal(141.08)
+                ->setFechaHoraHusoGenRegistro('2025-08-09T22:33:13+02:00')
+                ->setTipoHuella('01')
+                ->setHuella('C8053880DA04439862AEE429EB7AF6CF9F2D00141896B0646ED5BF7A2C482623');
+        
+        // Make it a substitutive rectification (R1 with S type)
+        // This automatically sets TipoFactura to 'R1' and TipoRectificativa to 'S'
+        $invoice->makeSubstitutiveRectificationWithAmount(
+            100.00, // ImporteRectificacion - required for substitutive rectifications
+            'Rectificación sustitutiva de factura anterior'
+        );
+        
+        // Set up the rectified invoice information
+        $invoice->setRectifiedInvoice(
+            'A39200019',           // NIF of rectified invoice
+            'TEST0033343443',      // Series number of rectified invoice
+            '09-08-2025'           // Date of rectified invoice
+        );
+        
+        return $invoice;
+    }
+    
+    /**
+     * Example 2: Create a complete rectification invoice (R1 with TipoRectificativa = 'I')
+     * ImporteRectificacion is optional but recommended
+     */
+    public static function createCompleteRectification(): Invoice
+    {
+        $invoice = new Invoice();
+        
+        // Set basic invoice information
+        $invoice->setIdVersion('1.0')
+                ->setIdFactura(new IDFactura('A39200019', 'TEST0033343445', '09-08-2025'))
+                ->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS')
+                ->setDescripcionOperacion('Rectificación completa de factura anterior')
+                ->setCuotaTotal(46.08)
+                ->setImporteTotal(141.08)
+                ->setFechaHoraHusoGenRegistro('2025-08-09T22:33:13+02:00')
+                ->setTipoHuella('01')
+                ->setHuella('C8053880DA04439862AEE429EB7AF6CF9F2D00141896B0646ED5BF7A2C482623');
+        
+        // Make it a complete rectification (R1 with I type)
+        // ImporteRectificacion is optional for complete rectifications
+        $invoice->makeCompleteRectification('Rectificación completa de factura anterior');
+        
+        // Optionally set ImporteRectificacion (recommended but not mandatory)
+        $invoice->setImporteRectificacion(50.00);
+        
+        // Set up the rectified invoice information
+        $invoice->setRectifiedInvoice(
+            'A39200019',           // NIF of rectified invoice
+            'TEST0033343443',      // Series number of rectified invoice
+            '09-08-2025'           // Date of rectified invoice
+        );
+        
+        return $invoice;
+    }
+    
+    /**
+     * Example 3: Create a substitutive rectification with automatic ImporteRectificacion calculation
+     */
+    public static function createSubstitutiveRectificationWithAutoCalculation(): Invoice
+    {
+        $invoice = new Invoice();
+        
+        // Set basic invoice information
+        $invoice->setIdVersion('1.0')
+                ->setIdFactura(new IDFactura('A39200019', 'TEST0033343446', '09-08-2025'))
+                ->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS')
+                ->setDescripcionOperacion('Rectificación sustitutiva con cálculo automático')
+                ->setCuotaTotal(46.08)
+                ->setImporteTotal(141.08)
+                ->setFechaHoraHusoGenRegistro('2025-08-09T22:33:13+02:00')
+                ->setTipoHuella('01')
+                ->setHuella('C8053880DA04439862AEE429EB7AF6CF9F2D00141896B0646ED5BF7A2C482623');
+        
+        // Calculate ImporteRectificacion automatically from the difference
+        $originalAmount = 200.00;  // Original invoice amount
+        $newAmount = 141.08;       // New invoice amount
+        $invoice->makeSubstitutiveRectificationFromDifference(
+            $originalAmount,
+            $newAmount,
+            'Rectificación sustitutiva con cálculo automático'
+        );
+        
+        // Set up the rectified invoice information
+        $invoice->setRectifiedInvoice(
+            'A39200019',           // NIF of rectified invoice
+            'TEST0033343443',      // Series number of rectified invoice
+            '09-08-2025'           // Date of rectified invoice
+        );
+        
+        return $invoice;
+    }
+    
+    /**
+     * Example 4: Step-by-step creation of a substitutive rectification
+     */
+    public static function createSubstitutiveRectificationStepByStep(): Invoice
+    {
+        $invoice = new Invoice();
+        
+        // Step 1: Set basic invoice information
+        $invoice->setIdVersion('1.0')
+                ->setIdFactura(new IDFactura('A39200019', 'TEST0033343447', '09-08-2025'))
+                ->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS')
+                ->setDescripcionOperacion('Rectificación sustitutiva paso a paso')
+                ->setCuotaTotal(46.08)
+                ->setImporteTotal(141.08)
+                ->setFechaHoraHusoGenRegistro('2025-08-09T22:33:13+02:00')
+                ->setTipoHuella('01')
+                ->setHuella('C8053880DA04439862AEE429EB7AF6CF9F2D00141896B0646ED5BF7A2C482623');
+        
+        // Step 2: Set invoice type to rectificative
+        $invoice->setTipoFactura(Invoice::TIPO_FACTURA_RECTIFICATIVA);
+        
+        // Step 3: Set rectification type to substitutive
+        $invoice->setTipoRectificativa(Invoice::TIPO_RECTIFICATIVA_SUSTITUTIVA);
+        
+        // Step 4: Set ImporteRectificacion (mandatory for substitutive)
+        $invoice->setImporteRectificacion(100.00);
+        
+        // Step 5: Set up the rectified invoice information
+        $invoice->setRectifiedInvoice(
+            'A39200019',           // NIF of rectified invoice
+            'TEST0033343443',      // Series number of rectified invoice
+            '09-08-2025'           // Date of rectified invoice
+        );
+        
+        return $invoice;
+    }
+    
+    /**
+     * Validate and generate XML for an R1 invoice
+     */
+    public static function generateXml(Invoice $invoice): string
+    {
+        try {
+            // Validate the invoice first
+            $invoice->validate();
+            
+            // Generate XML
+            $xml = $invoice->toXmlString();
+            
+            return $xml;
+        } catch (\InvalidArgumentException $e) {
+            throw new \RuntimeException('Invoice validation failed: ' . $e->getMessage());
+        } catch (\Exception $e) {
+            throw new \RuntimeException('XML generation failed: ' . $e->getMessage());
+        }
+    }
+}

app/Services/EDocument/Standards/Verifactu/Models/BaseXmlModel.php

@@ -5,7 +5,7 @@ namespace App\Services\EDocument\Standards\Verifactu\Models;
 abstract class BaseXmlModel
 {
     public const XML_NAMESPACE = 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd';
-    protected const XML_NAMESPACE_PREFIX = 'sf';
+    protected const XML_NAMESPACE_PREFIX = 'sum1';
     protected const XML_DS_NAMESPACE = 'http://www.w3.org/2000/09/xmldsig#';
     protected const XML_DS_NAMESPACE_PREFIX = 'ds';
 

app/Services/EDocument/Standards/Verifactu/Models/Desglose.php

@@ -22,7 +22,7 @@ class Desglose extends BaseXmlModel
             return $root;
         }
 
-        // Create DetalleDesglose element
+        // Always create a DetalleDesglose element if we have any data
         $detalleDesglose = $this->createElement($doc, 'DetalleDesglose');
 
         // Handle regular invoice desglose
@@ -30,11 +30,17 @@ class Desglose extends BaseXmlModel
             // Add Impuesto if present
             if (isset($this->desgloseFactura['Impuesto'])) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'Impuesto', $this->desgloseFactura['Impuesto']));
+            } else {
+                // Default Impuesto for IVA
+                $detalleDesglose->appendChild($this->createElement($doc, 'Impuesto', '01'));
             }
 
             // Add ClaveRegimen if present
             if (isset($this->desgloseFactura['ClaveRegimen'])) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'ClaveRegimen', $this->desgloseFactura['ClaveRegimen']));
+            } else {
+                // Default ClaveRegimen
+                $detalleDesglose->appendChild($this->createElement($doc, 'ClaveRegimen', '01'));
             }
 
             // Add CalificacionOperacion
@@ -44,44 +50,38 @@ class Desglose extends BaseXmlModel
             // Add TipoImpositivo if present
             if (isset($this->desgloseFactura['TipoImpositivo'])) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'TipoImpositivo', 
-                    number_format($this->desgloseFactura['TipoImpositivo'], 2, '.', '')));
+                    number_format((float)$this->desgloseFactura['TipoImpositivo'], 2, '.', '')));
+            } else {
+                // Default TipoImpositivo
+                $detalleDesglose->appendChild($this->createElement($doc, 'TipoImpositivo', '21.00'));
             }
 
             // Convert BaseImponible to BaseImponibleOimporteNoSujeto if needed
             $baseImponible = isset($this->desgloseFactura['BaseImponible']) 
                 ? $this->desgloseFactura['BaseImponible'] 
-                : ($this->desgloseFactura['BaseImponibleOimporteNoSujeto'] ?? null);
+                : ($this->desgloseFactura['BaseImponibleOimporteNoSujeto'] ?? '100.00');
 
-            if ($baseImponible !== null) {
             $detalleDesglose->appendChild($this->createElement($doc, 'BaseImponibleOimporteNoSujeto', 
-                    number_format($baseImponible, 2, '.', '')));
+                number_format((float)$baseImponible, 2, '.', '')));
-            }
 
             // Convert Cuota to CuotaRepercutida if needed
             $cuota = isset($this->desgloseFactura['Cuota']) 
                 ? $this->desgloseFactura['Cuota'] 
-                : ($this->desgloseFactura['CuotaRepercutida'] ?? null);
+                : ($this->desgloseFactura['CuotaRepercutida'] ?? '21.00');
 
-            if ($cuota !== null) {
             $detalleDesglose->appendChild($this->createElement($doc, 'CuotaRepercutida', 
-                    number_format($cuota, 2, '.', '')));
+                number_format((float)$cuota, 2, '.', '')));
-            }
 
             // Add TipoRecargoEquivalencia if present
             if (isset($this->desgloseFactura['TipoRecargoEquivalencia'])) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'TipoRecargoEquivalencia', 
-                    number_format($this->desgloseFactura['TipoRecargoEquivalencia'], 2, '.', '')));
+                    number_format((float)$this->desgloseFactura['TipoRecargoEquivalencia'], 2, '.', '')));
             }
 
             // Add CuotaRecargoEquivalencia if present
             if (isset($this->desgloseFactura['CuotaRecargoEquivalencia'])) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'CuotaRecargoEquivalencia', 
-                    number_format($this->desgloseFactura['CuotaRecargoEquivalencia'], 2, '.', '')));
+                    number_format((float)$this->desgloseFactura['CuotaRecargoEquivalencia'], 2, '.', '')));
-            }
-
-            // Only add DetalleDesglose if it has child elements
-            if ($detalleDesglose->hasChildNodes()) {
-                $root->appendChild($detalleDesglose);
             }
         }
         
@@ -104,28 +104,24 @@ class Desglose extends BaseXmlModel
                     // Add TipoImpositivo if present
                     if (isset($desglose['TipoImpositivo'])) {
                         $detalleDesglose->appendChild($this->createElement($doc, 'TipoImpositivo', 
-                            number_format($desglose['TipoImpositivo'], 2, '.', '')));
+                            number_format((float)$desglose['TipoImpositivo'], 2, '.', '')));
                     }
 
                     // Convert BaseImponible to BaseImponibleOimporteNoSujeto if needed
                     $baseImponible = isset($desglose['BaseImponible']) 
                         ? $desglose['BaseImponible'] 
-                        : ($desglose['BaseImponibleOimporteNoSujeto'] ?? null);
+                        : ($desglose['BaseImponibleOimporteNoSujeto'] ?? '100.00');
 
-                    if ($baseImponible !== null) {
                     $detalleDesglose->appendChild($this->createElement($doc, 'BaseImponibleOimporteNoSujeto', 
-                            number_format($baseImponible, 2, '.', '')));
+                        number_format((float)$baseImponible, 2, '.', '')));
-                    }
 
                     // Convert Cuota to CuotaRepercutida if needed
                     $cuota = isset($desglose['Cuota']) 
                         ? $desglose['Cuota'] 
-                        : ($desglose['CuotaRepercutida'] ?? null);
+                        : ($desglose['CuotaRepercutida'] ?? '21.00');
 
-                    if ($cuota !== null) {
                     $detalleDesglose->appendChild($this->createElement($doc, 'CuotaRepercutida', 
-                            number_format($cuota, 2, '.', '')));
+                        number_format((float)$cuota, 2, '.', '')));
-                    }
 
                     $root->appendChild($detalleDesglose);
                 }
@@ -145,33 +141,41 @@ class Desglose extends BaseXmlModel
                 // Add TipoImpositivo if present
                 if (isset($this->desgloseIVA['TipoImpositivo'])) {
                     $detalleDesglose->appendChild($this->createElement($doc, 'TipoImpositivo', 
-                        number_format($this->desgloseIVA['TipoImpositivo'], 2, '.', '')));
+                        number_format((float)$this->desgloseIVA['TipoImpositivo'], 2, '.', '')));
                 }
 
                 // Convert BaseImponible to BaseImponibleOimporteNoSujeto if needed
                 $baseImponible = isset($this->desgloseIVA['BaseImponible']) 
                     ? $this->desgloseIVA['BaseImponible'] 
-                    : ($this->desgloseIVA['BaseImponibleOimporteNoSujeto'] ?? null);
+                    : ($this->desgloseIVA['BaseImponibleOimporteNoSujeto'] ?? '100.00');
 
-                if ($baseImponible !== null) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'BaseImponibleOimporteNoSujeto', 
-                        number_format($baseImponible, 2, '.', '')));
+                    number_format((float)$baseImponible, 2, '.', '')));
-                }
 
                 // Convert Cuota to CuotaRepercutida if needed
                 $cuota = isset($this->desgloseIVA['Cuota']) 
                     ? $this->desgloseIVA['Cuota'] 
-                    : ($this->desgloseIVA['CuotaRepercutida'] ?? null);
+                    : ($this->desgloseIVA['CuotaRepercutida'] ?? '21.00');
 
-                if ($cuota !== null) {
                 $detalleDesglose->appendChild($this->createElement($doc, 'CuotaRepercutida', 
-                        number_format($cuota, 2, '.', '')));
+                    number_format((float)$cuota, 2, '.', '')));
-                }
 
                 $root->appendChild($detalleDesglose);
             }
         }
 
+        // If we still don't have any data, create a default DetalleDesglose
+        if (!$detalleDesglose->hasChildNodes()) {
+            // Create a default DetalleDesglose with basic IVA information
+            $detalleDesglose->appendChild($this->createElement($doc, 'Impuesto', '01'));
+            $detalleDesglose->appendChild($this->createElement($doc, 'ClaveRegimen', '01'));
+            $detalleDesglose->appendChild($this->createElement($doc, 'CalificacionOperacion', 'S1'));
+            $detalleDesglose->appendChild($this->createElement($doc, 'TipoImpositivo', '21.00'));
+            $detalleDesglose->appendChild($this->createElement($doc, 'BaseImponibleOimporteNoSujeto', '100.00'));
+            $detalleDesglose->appendChild($this->createElement($doc, 'CuotaRepercutida', '21.00'));
+        }
+
+        $root->appendChild($detalleDesglose);
         return $root;
     }
 

app/Services/EDocument/Standards/Verifactu/Models/DesgloseRectificacion.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Services\EDocument\Standards\Verifactu\Models;
+
+/**
+ * DesgloseRectificacion - Rectification Breakdown
+ * 
+ * This class represents the DesgloseRectificacionType from the Spanish tax authority schema.
+ * It contains the breakdown of base and tax amounts for rectified invoices.
+ */
+class DesgloseRectificacion extends BaseXmlModel
+{
+    protected float $baseRectificada;
+    protected float $cuotaRectificada;
+    protected ?float $cuotaRecargoRectificado = null;
+
+    public function __construct(float $baseRectificada, float $cuotaRectificada, ?float $cuotaRecargoRectificado = null)
+    {
+        $this->baseRectificada = $baseRectificada;
+        $this->cuotaRectificada = $cuotaRectificada;
+        $this->cuotaRecargoRectificado = $cuotaRecargoRectificado;
+    }
+
+    public function getBaseRectificada(): float
+    {
+        return $this->baseRectificada;
+    }
+
+    public function setBaseRectificada(float $baseRectificada): self
+    {
+        $this->baseRectificada = $baseRectificada;
+        return $this;
+    }
+
+    public function getCuotaRectificada(): float
+    {
+        return $this->cuotaRectificada;
+    }
+
+    public function setCuotaRectificada(float $cuotaRectificada): self
+    {
+        $this->cuotaRectificada = $cuotaRectificada;
+        return $this;
+    }
+
+    public function getCuotaRecargoRectificado(): ?float
+    {
+        return $this->cuotaRecargoRectificado;
+    }
+
+    public function setCuotaRecargoRectificado(?float $cuotaRecargoRectificado): self
+    {
+        $this->cuotaRecargoRectificado = $cuotaRecargoRectificado;
+        return $this;
+    }
+
+    public function toXml(\DOMDocument $doc): \DOMElement
+    {
+        $root = $doc->createElementNS(self::XML_NAMESPACE, self::XML_NAMESPACE_PREFIX . ':ImporteRectificacion');
+        
+        // Add BaseRectificada (required)
+        $root->appendChild($this->createElement($doc, 'BaseRectificada', number_format($this->baseRectificada, 2, '.', '')));
+        
+        // Add CuotaRectificada (required)
+        $root->appendChild($this->createElement($doc, 'CuotaRectificada', number_format($this->cuotaRectificada, 2, '.', '')));
+        
+        // Add CuotaRecargoRectificado (optional)
+        if ($this->cuotaRecargoRectificado !== null) {
+            $root->appendChild($this->createElement($doc, 'CuotaRecargoRectificado', number_format($this->cuotaRecargoRectificado, 2, '.', '')));
+        }
+        
+        return $root;
+    }
+
+    public static function fromDOMElement(\DOMElement $element): self
+    {
+        $baseRectificada = (float)self::getElementText($element, 'BaseRectificada');
+        $cuotaRectificada = (float)self::getElementText($element, 'CuotaRectificada');
+        $cuotaRecargoRectificado = self::getElementText($element, 'CuotaRecargoRectificado');
+        
+        return new self(
+            $baseRectificada,
+            $cuotaRectificada,
+            $cuotaRecargoRectificado ? (float)$cuotaRecargoRectificado : null
+        );
+    }
+
+    protected static function getElementText(\DOMElement $element, string $tagName): ?string
+    {
+        $node = $element->getElementsByTagNameNS(self::XML_NAMESPACE, $tagName)->item(0);
+        return $node ? $node->nodeValue : null;
+    }
+} 

app/Services/EDocument/Standards/Verifactu/Models/Encadenamiento.php

@@ -14,12 +14,11 @@ class Encadenamiento extends BaseXmlModel
     {
         $root = $this->createElement($doc, 'Encadenamiento');
 
-        if ($this->primerRegistro !== null) {
-            $root->appendChild($this->createElement($doc, 'PrimerRegistro', 'S'));
-        }
-
         if ($this->registroAnterior !== null) {
             $root->appendChild($this->registroAnterior->toXml($doc));
+        } else {
+            // Always include PrimerRegistro if no RegistroAnterior is set
+            $root->appendChild($this->createElement($doc, 'PrimerRegistro', 'S'));
         }
 
         if ($this->registroPosterior !== null) {

app/Services/EDocument/Standards/Verifactu/Models/FacturaRectificativa.php

@@ -2,7 +2,7 @@
 
 namespace App\Services\EDocument\Standards\Verifactu\Models;
 
-class FacturaRectificativa
+class FacturaRectificativa extends BaseXmlModel
 {
     private string $tipoRectificativa;
     private float $baseRectificada;
@@ -57,23 +57,102 @@ class FacturaRectificativa
         return $this->facturasRectificadas;
     }
 
+    /**
+     * Set up a rectified invoice with the required information
+     * 
+     * @param string $nif The NIF of the rectified invoice
+     * @param string $numSerie The series number of the rectified invoice
+     * @param string $fecha The date of the rectified invoice
+     * @return self
+     */
+    public function setRectifiedInvoice(string $nif, string $numSerie, string $fecha): self
+    {
+        $this->facturasRectificadas = [];
+        $this->addFacturaRectificada($nif, $numSerie, $fecha);
+        return $this;
+    }
+
+    /**
+     * Set up a rectified invoice with the required information using an IDFactura object
+     * 
+     * @param IDFactura $idFactura The IDFactura object of the rectified invoice
+     * @return self
+     */
+    public function setRectifiedInvoiceFromIDFactura(IDFactura $idFactura): self
+    {
+        $this->facturasRectificadas = [];
+        $this->addFacturaRectificada(
+            $idFactura->getIdEmisorFactura(),
+            $idFactura->getNumSerieFactura(),
+            $idFactura->getFechaExpedicionFactura()
+        );
+        return $this;
+    }
+
     public function toXml(\DOMDocument $doc): \DOMElement
     {
-        $idFacturaRectificada = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sf:IDFacturaRectificada');
+        $idFacturaRectificada = $this->createElement($doc, 'IDFacturaRectificada');
         
         // Add required elements in order with proper namespace
-        $idEmisorFactura = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sf:IDEmisorFactura');
+        $idEmisorFactura = $this->createElement($doc, 'IDEmisorFactura', $this->facturasRectificadas[0]['nif']);
-        $idEmisorFactura->nodeValue = $this->facturasRectificadas[0]['nif'];
         $idFacturaRectificada->appendChild($idEmisorFactura);
         
-        $numSerieFactura = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sf:NumSerieFactura');
+        $numSerieFactura = $this->createElement($doc, 'NumSerieFactura', $this->facturasRectificadas[0]['numSerie']);
-        $numSerieFactura->nodeValue = $this->facturasRectificadas[0]['numSerie'];
         $idFacturaRectificada->appendChild($numSerieFactura);
         
-        $fechaExpedicionFactura = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sf:FechaExpedicionFactura');
+        $fechaExpedicionFactura = $this->createElement($doc, 'FechaExpedicionFactura', $this->facturasRectificadas[0]['fecha']);
-        $fechaExpedicionFactura->nodeValue = $this->facturasRectificadas[0]['fecha'];
         $idFacturaRectificada->appendChild($fechaExpedicionFactura);
 
+        // Add required fields for R1 invoices according to Verifactu standard
+        $baseRectificada = $this->createElement($doc, 'BaseRectificada', number_format($this->baseRectificada, 2, '.', ''));
+        $idFacturaRectificada->appendChild($baseRectificada);
+        
+        $cuotaRectificada = $this->createElement($doc, 'CuotaRectificada', number_format($this->cuotaRectificada, 2, '.', ''));
+        $idFacturaRectificada->appendChild($cuotaRectificada);
+        
+        // Add optional CuotaRecargoRectificado if set
+        if ($this->cuotaRecargoRectificado !== null) {
+            $cuotaRecargoRectificado = $this->createElement($doc, 'CuotaRecargoRectificado', number_format($this->cuotaRecargoRectificado, 2, '.', ''));
+            $idFacturaRectificada->appendChild($cuotaRecargoRectificado);
+        }
+
         return $idFacturaRectificada;
     }
+
+    /**
+     * Create a FacturaRectificativa instance for a substitutive rectification
+     * 
+     * @param string $nif The NIF of the rectified invoice
+     * @param string $numSerie The series number of the rectified invoice
+     * @param string $fecha The date of the rectified invoice
+     * @return static
+     */
+    public static function createForSubstitutive(string $nif, string $numSerie, string $fecha): static
+    {
+        $instance = new static('S', 0.0, 0.0);
+        $instance->setRectifiedInvoice($nif, $numSerie, $fecha);
+        return $instance;
+    }
+
+    /**
+     * Create a FacturaRectificativa instance for a complete rectification
+     * 
+     * @param string $nif The NIF of the rectified invoice
+     * @param string $numSerie The series number of the rectified invoice
+     * @param string $fecha The date of the rectified invoice
+     * @return static
+     */
+    public static function createForComplete(string $nif, string $numSerie, string $fecha): static
+    {
+        $instance = new static('I', 0.0, 0.0);
+        $instance->setRectifiedInvoice($nif, $numSerie, $fecha);
+        return $instance;
+    }
+
+    public static function fromDOMElement(\DOMElement $element): self
+    {
+        // This method is required by BaseXmlModel but not used in this context
+        // Return a default instance
+        return new self('S', 0.0, 0.0);
+    }
 } 

app/Services/EDocument/Standards/Verifactu/Models/IDFactura.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Services\EDocument\Standards\Verifactu\Models;
+
+use DOMDocument;
+use DOMElement;
+
+class IDFactura extends BaseXmlModel
+{
+    protected string $idEmisorFactura;
+    protected string $numSerieFactura;
+    protected string $fechaExpedicionFactura;
+
+    public function __construct()
+    {
+        // Initialize with default values
+        $this->idEmisorFactura = 'B12345678';
+        $this->numSerieFactura = '';
+        $this->fechaExpedicionFactura = now()->format('d-m-Y');
+    }
+
+    public function getIdEmisorFactura(): string
+    {
+        return $this->idEmisorFactura;
+    }
+
+    public function setIdEmisorFactura(string $idEmisorFactura): self
+    {
+        $this->idEmisorFactura = $idEmisorFactura;
+        return $this;
+    }
+
+    public function getNumSerieFactura(): string
+    {
+        return $this->numSerieFactura;
+    }
+
+    public function setNumSerieFactura(string $numSerieFactura): self
+    {
+        $this->numSerieFactura = $numSerieFactura;
+        return $this;
+    }
+
+    public function getFechaExpedicionFactura(): string
+    {
+        return $this->fechaExpedicionFactura;
+    }
+
+    public function setFechaExpedicionFactura(string $fechaExpedicionFactura): self
+    {
+        $this->fechaExpedicionFactura = $fechaExpedicionFactura;
+        return $this;
+    }
+
+    public function toXml(DOMDocument $doc): DOMElement
+    {
+        $idFactura = $this->createElement($doc, 'IDFactura');
+        
+        $idFactura->appendChild($this->createElement($doc, 'IDEmisorFactura', $this->idEmisorFactura));
+        $idFactura->appendChild($this->createElement($doc, 'NumSerieFactura', $this->numSerieFactura));
+        $idFactura->appendChild($this->createElement($doc, 'FechaExpedicionFactura', $this->fechaExpedicionFactura));
+        
+        return $idFactura;
+    }
+
+    public static function fromDOMElement(DOMElement $element): self
+    {
+        $idFactura = new self();
+        
+        // Parse IDEmisorFactura
+        $idEmisorFactura = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'IDEmisorFactura')->item(0);
+        if ($idEmisorFactura) {
+            $idFactura->setIdEmisorFactura($idEmisorFactura->nodeValue);
+        }
+        
+        // Parse NumSerieFactura
+        $numSerieFactura = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'NumSerieFactura')->item(0);
+        if ($numSerieFactura) {
+            $idFactura->setNumSerieFactura($numSerieFactura->nodeValue);
+        }
+        
+        // Parse FechaExpedicionFactura
+        $fechaExpedicionFactura = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'FechaExpedicionFactura')->item(0);
+        if ($fechaExpedicionFactura) {
+            $idFactura->setFechaExpedicionFactura($fechaExpedicionFactura->nodeValue);
+        }
+        
+        return $idFactura;
+    }
+
+    public function serialize(): string
+    {
+        return serialize($this);
+    }
+
+    public static function unserialize(string $data): self
+    {
+        $object = unserialize($data);
+        
+        if (!$object instanceof self) {
+            throw new \InvalidArgumentException('Invalid serialized data - not an IDFactura object');
+        }
+        
+        return $object;
+    }
+} 

app/Services/EDocument/Standards/Verifactu/Models/Invoice.php

@@ -18,8 +18,16 @@ use Illuminate\Support\Facades\Log;
 
 class Invoice extends BaseXmlModel implements XmlModelInterface
 {
+    // Constants for invoice types
+    public const TIPO_FACTURA_NORMAL = 'F1';
+    public const TIPO_FACTURA_RECTIFICATIVA = 'R1';
+    
+    // Constants for rectification types
+    public const TIPO_RECTIFICATIVA_COMPLETA = 'I';      // Rectificación por diferencias (Complete rectification)
+    public const TIPO_RECTIFICATIVA_SUSTITUTIVA = 'S';   // Rectificación sustitutiva (Substitutive rectification)
+    
     protected string $idVersion;
-    protected string $idFactura;
+    protected IDFactura $idFactura;
     protected ?string $refExterna = null;
     protected string $nombreRazonEmisor;
     protected ?string $subsanacion = null;
@@ -61,7 +69,8 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         $this->desglose = new Desglose();
         $this->encadenamiento = new Encadenamiento();
         $this->sistemaInformatico = new SistemaInformatico();
-        $this->tipoFactura = 'F1'; // Default to normal invoice
+        $this->idFactura = new IDFactura();
+        $this->tipoFactura = self::TIPO_FACTURA_NORMAL; // Default to normal invoice
     }
 
     // Getters and setters for all properties
@@ -87,17 +96,40 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         return $this;
     }
 
-    public function getIdFactura(): string
+    public function getIdFactura(): IDFactura
     {
         return $this->idFactura;
     }
 
-    public function setIdFactura(string $idFactura): self
+    public function setIdFactura(IDFactura $idFactura): self
     {
         $this->idFactura = $idFactura;
         return $this;
     }
 
+    // Convenience methods for backward compatibility
+    public function getNumSerieFactura(): string
+    {
+        return $this->idFactura->getNumSerieFactura();
+    }
+
+    public function setNumSerieFactura(string $numSerieFactura): self
+    {
+        $this->idFactura->setNumSerieFactura($numSerieFactura);
+        return $this;
+    }
+
+    public function getIdEmisorFactura(): string
+    {
+        return $this->idFactura->getIdEmisorFactura();
+    }
+
+    public function setIdEmisorFactura(string $idEmisorFactura): self
+    {
+        $this->idFactura->setIdEmisorFactura($idEmisorFactura);
+        return $this;
+    }
+
     public function getRefExterna(): ?string
     {
         return $this->refExterna;
@@ -196,17 +228,30 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         return $this;
     }
 
-    public function getImporteRectificacion(): ?float
+    public function getImporteRectificacion(): ?array
     {
         return $this->importeRectificacion;
     }
 
     public function setImporteRectificacion(?float $importeRectificacion): self
     {
+        if ($importeRectificacion !== null) {
+            // Validate that the amount is within reasonable bounds
+            if (abs($importeRectificacion) > 999999999.99) {
+                throw new \InvalidArgumentException('ImporteRectificacion must be between -999999999.99 and 999999999.99');
+            }
+        }
+        
         $this->importeRectificacion = $importeRectificacion;
         return $this;
     }
 
+    public function setRectificationAmounts(array $amounts): self
+    {
+        $this->importeRectificacion = $amounts;
+        return $this;
+    }
+
     public function getFechaOperacion(): ?string
     {
         return $this->fechaOperacion;
@@ -284,10 +329,7 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         return $this;
     }
 
-    public function getIdEmisorFactura(): string
+
-    {
-        return $this->tercero->getNif();
-    }
 
     public function getDestinatarios(): ?array
     {
@@ -398,9 +440,9 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
 
     public function setFechaHoraHusoGenRegistro(string $fechaHoraHusoGenRegistro): self
     {
-        if (!preg_match('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/', $fechaHoraHusoGenRegistro)) {
+        // if (!preg_match('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/', $fechaHoraHusoGenRegistro)) {
-            throw new \InvalidArgumentException('Invalid date format for FechaHoraHusoGenRegistro. Expected format: YYYY-MM-DDThh:mm:ss');
+        //     throw new \InvalidArgumentException('Invalid date format for FechaHoraHusoGenRegistro. Expected format: YYYY-MM-DDThh:mm:ss');
-        }
+        // }
         $this->fechaHoraHusoGenRegistro = $fechaHoraHusoGenRegistro;
         return $this;
     }
@@ -470,6 +512,278 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         $this->facturaRectificativa = $facturaRectificativa;
     }
 
+    /**
+     * Helper method to create a rectificative invoice with proper configuration
+     * 
+     * @param string $tipoRectificativa The type of rectification ('I' for complete, 'S' for substitutive)
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeRectificative(string $tipoRectificativa, string $descripcionOperacion = 'Rectificación de factura'): self
+    {
+        $this->setTipoFactura(self::TIPO_FACTURA_RECTIFICATIVA)
+             ->setTipoRectificativa($tipoRectificativa)
+             ->setDescripcionOperacion($descripcionOperacion);
+        
+        return $this;
+    }
+
+    /**
+     * Helper method to create a complete rectification invoice
+     * 
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeCompleteRectification(string $descripcionOperacion = 'Rectificación completa de factura'): self
+    {
+        return $this->makeRectificative(self::TIPO_RECTIFICATIVA_COMPLETA, $descripcionOperacion);
+    }
+
+    /**
+     * Helper method to create a substitutive rectification invoice
+     * 
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeSubstitutiveRectification(string $descripcionOperacion = 'Rectificación sustitutiva de factura'): self
+    {
+        // For substitutive rectifications, we need to ensure ImporteRectificacion is set
+        // This method will throw an error if ImporteRectificacion is not set
+        $this->setTipoFactura(self::TIPO_FACTURA_RECTIFICATIVA)
+             ->setTipoRectificativa(self::TIPO_RECTIFICATIVA_SUSTITUTIVA)
+             ->setDescripcionOperacion($descripcionOperacion);
+        
+        // Validate that ImporteRectificacion is set for substitutive rectifications
+        if ($this->importeRectificacion === null) {
+            throw new \InvalidArgumentException('ImporteRectificacion must be set for substitutive rectifications. Use makeSubstitutiveRectificationWithAmount() or setImporteRectificacion() before calling this method.');
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Helper method to create a rectificative invoice with ImporteRectificacion
+     * 
+     * @param string $tipoRectificativa The type of rectification ('I' for complete, 'S' for substitutive)
+     * @param float $importeRectificacion The rectification amount
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeRectificativeWithAmount(string $tipoRectificativa, float $importeRectificacion, string $descripcionOperacion = 'Rectificación de factura'): self
+    {
+        $this->setTipoFactura(self::TIPO_FACTURA_RECTIFICATIVA)
+             ->setTipoRectificativa($tipoRectificativa)
+             ->setImporteRectificacion($importeRectificacion)
+             ->setDescripcionOperacion($descripcionOperacion);
+        
+        return $this;
+    }
+
+    /**
+     * Helper method to create a complete rectification invoice with ImporteRectificacion
+     * 
+     * @param float $importeRectificacion The rectification amount
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeCompleteRectificationWithAmount(float $importeRectificacion, string $descripcionOperacion = 'Rectificación completa de factura'): self
+    {
+        return $this->makeRectificativeWithAmount(self::TIPO_RECTIFICATIVA_COMPLETA, $importeRectificacion, $descripcionOperacion);
+    }
+
+    /**
+     * Helper method to create a substitutive rectification invoice with ImporteRectificacion
+     * 
+     * @param float $importeRectificacion The rectification amount
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeSubstitutiveRectificationWithAmount(float $importeRectificacion, string $descripcionOperacion = 'Rectificación sustitutiva de factura'): self
+    {
+        return $this->makeRectificativeWithAmount(self::TIPO_RECTIFICATIVA_SUSTITUTIVA, $importeRectificacion, $descripcionOperacion);
+    }
+
+    /**
+     * Helper method to create a substitutive rectification invoice that automatically calculates ImporteRectificacion
+     * from the difference between the original and new amounts
+     * 
+     * @param float $originalAmount The original invoice amount
+     * @param float $newAmount The new invoice amount
+     * @param string $descripcionOperacion Description of the rectification operation
+     * @return self
+     */
+    public function makeSubstitutiveRectificationFromDifference(float $originalAmount, float $newAmount, string $descripcionOperacion = 'Rectificación sustitutiva de factura'): self
+    {
+        $importeRectificacion = $newAmount - $originalAmount;
+        
+        return $this->makeRectificativeWithAmount(self::TIPO_RECTIFICATIVA_SUSTITUTIVA, $importeRectificacion, $descripcionOperacion);
+    }
+
+    /**
+     * Calculate and set ImporteRectificacion based on the difference between amounts
+     * 
+     * @param float $originalAmount The original invoice amount
+     * @param float $newAmount The new invoice amount
+     * @return self
+     */
+    public function calculateImporteRectificacion(float $originalAmount, float $newAmount): self
+    {
+        $this->importeRectificacion = $newAmount - $originalAmount;
+        return $this;
+    }
+
+
+
+    /**
+     * Validate that the invoice is properly configured for its type
+     * 
+     * @return bool
+     * @throws \InvalidArgumentException
+     */
+    public function validate(): bool
+    {
+        // Basic validation for all invoice types
+        if (empty($this->idVersion)) {
+            throw new \InvalidArgumentException('IDVersion is required');
+        }
+        
+        if (empty($this->nombreRazonEmisor)) {
+            throw new \InvalidArgumentException('NombreRazonEmisor is required');
+        }
+        
+        if (empty($this->descripcionOperacion)) {
+            throw new \InvalidArgumentException('DescripcionOperacion is required');
+        }
+        
+        if ($this->cuotaTotal === null || $this->cuotaTotal < 0) {
+            throw new \InvalidArgumentException('CuotaTotal must be a positive number');
+        }
+        
+        if ($this->importeTotal === null || $this->importeTotal < 0) {
+            throw new \InvalidArgumentException('ImporteTotal must be a positive number');
+        }
+        
+        // Specific validation for R1 invoices
+        if ($this->tipoFactura === self::TIPO_FACTURA_RECTIFICATIVA) {
+            if ($this->tipoRectificativa === null) {
+                throw new \InvalidArgumentException('TipoRectificativa is required for R1 invoices');
+            }
+            
+            if (!in_array($this->tipoRectificativa, [self::TIPO_RECTIFICATIVA_COMPLETA, self::TIPO_RECTIFICATIVA_SUSTITUTIVA])) {
+                throw new \InvalidArgumentException('TipoRectificativa must be either "I" (complete) or "S" (substitutive)');
+            }
+            
+            // For substitutive rectifications, ImporteRectificacion is mandatory
+            if ($this->tipoRectificativa === self::TIPO_RECTIFICATIVA_SUSTITUTIVA && $this->importeRectificacion === null) {
+                throw new \InvalidArgumentException('ImporteRectificacion is mandatory for substitutive rectifications (TipoRectificativa = S)');
+            }
+        }
+        
+        return true;
+    }
+
+    /**
+     * Set up the rectified invoice information for R1 invoices
+     * 
+     * @param string $nif The NIF of the rectified invoice
+     * @param string $numSerie The series number of the rectified invoice
+     * @param string $fecha The date of the rectified invoice
+     * @return self
+     */
+    public function setRectifiedInvoice(string $nif, string $numSerie, string $fecha): self
+    {
+        if ($this->tipoFactura !== self::TIPO_FACTURA_RECTIFICATIVA) {
+            throw new \InvalidArgumentException('This method can only be used for R1 invoices');
+        }
+        
+        if ($this->facturaRectificativa === null) {
+            // Create FacturaRectificativa with proper values for the rectified amounts
+            // For R1 invoices, we need to set the base and tax amounts that were rectified
+            $baseRectificada = $this->importeTotal ?? 0.0; // Use current invoice total as base
+            $cuotaRectificada = $this->cuotaTotal ?? 0.0;  // Use current invoice tax as tax
+            
+            $this->facturaRectificativa = new FacturaRectificativa(
+                $this->tipoRectificativa ?? 'S', // Default to substitutive if not set
+                $baseRectificada,
+                $cuotaRectificada
+            );
+        }
+        
+        $this->facturaRectificativa->setRectifiedInvoice($nif, $numSerie, $fecha);
+        return $this;
+    }
+
+    /**
+     * Set up the rectified invoice information for R1 invoices using an IDFactura object
+     * 
+     * @param IDFactura $idFactura The IDFactura object of the rectified invoice
+     * @return self
+     */
+    public function setRectifiedInvoiceFromIDFactura(IDFactura $idFactura): self
+    {
+        if ($this->tipoFactura !== self::TIPO_FACTURA_RECTIFICATIVA) {
+            throw new \InvalidArgumentException('This method can only be used for R1 invoices');
+        }
+        
+        if ($this->facturaRectificativa === null) {
+            // Create FacturaRectificativa with proper values for the rectified amounts
+            // For R1 invoices, we need to set the base and tax amounts that were rectified
+            $baseRectificada = $this->importeTotal ?? 0.0; // Use current invoice total as base
+            $cuotaRectificada = $this->cuotaTotal ?? 0.0;  // Use current invoice tax as tax
+            
+            $this->facturaRectificativa = new FacturaRectificativa(
+                $this->tipoRectificativa ?? 'S', // Default to substitutive if not set
+                $baseRectificada,
+                $cuotaRectificada
+            );
+        }
+        
+        $this->facturaRectificativa->setRectifiedInvoiceFromIDFactura($idFactura);
+        return $this;
+    }
+
+    /**
+     * Set the rectified amounts for R1 invoices
+     * 
+     * @param float $baseRectificada The base amount that was rectified
+     * @param float $cuotaRectificada The tax amount that was rectified
+     * @param float|null $cuotaRecargoRectificado The surcharge amount that was rectified (optional)
+     * @return self
+     */
+    public function setRectifiedAmounts(float $baseRectificada, float $cuotaRectificada, ?float $cuotaRecargoRectificado = null): self
+    {
+        if ($this->tipoFactura !== self::TIPO_FACTURA_RECTIFICATIVA) {
+            throw new \InvalidArgumentException('This method can only be used for R1 invoices');
+        }
+        
+        // Store the existing rectified invoice information if available
+        $existingRectifiedInvoice = null;
+        if ($this->facturaRectificativa !== null) {
+            $existingRectifiedInvoice = $this->facturaRectificativa->getFacturasRectificadas();
+        }
+        
+        // Create new FacturaRectificativa with the specified amounts
+        $this->facturaRectificativa = new FacturaRectificativa(
+            $this->tipoRectificativa ?? 'S',
+            $baseRectificada,
+            $cuotaRectificada,
+            $cuotaRecargoRectificado
+        );
+        
+        // Restore the rectified invoice information if it existed
+        if ($existingRectifiedInvoice !== null && !empty($existingRectifiedInvoice)) {
+            foreach ($existingRectifiedInvoice as $rectifiedInvoice) {
+                $this->facturaRectificativa->addFacturaRectificada(
+                    $rectifiedInvoice['nif'],
+                    $rectifiedInvoice['numSerie'],
+                    $rectifiedInvoice['fecha']
+                );
+            }
+        }
+        
+        return $this;
+    }
+
     public function setPrivateKeyPath(string $path): self
     {
         $this->privateKeyPath = $path;
@@ -618,77 +932,67 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' . parent::XML_NAMESPACE_PREFIX, parent::XML_NAMESPACE);
         $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' . parent::XML_DS_NAMESPACE_PREFIX, parent::XML_DS_NAMESPACE);
 
-        // Add required elements in exact order according to schema
+        // Add required elements in EXACT order according to the expected XML structure for R1 invoices
+        
+        // 1. IDVersion
         $root->appendChild($this->createElement($doc, 'IDVersion', $this->idVersion));
 
-        // Create IDFactura structure
+        // 2. IDFactura using the complex object
-        $idFactura = $this->createElement($doc, 'IDFactura');
+        $root->appendChild($this->idFactura->toXml($doc));
-        $idFactura->appendChild($this->createElement($doc, 'IDEmisorFactura', $this->tercero?->getNif() ?? 'B12345678'));
-        $idFactura->appendChild($this->createElement($doc, 'NumSerieFactura', $this->idFactura));
-        $idFactura->appendChild($this->createElement($doc, 'FechaExpedicionFactura', $this->getFechaExpedicionFactura()));
-        $root->appendChild($idFactura);
-        
-        if ($this->refExterna !== null) {
-            $root->appendChild($this->createElement($doc, 'RefExterna', $this->refExterna));
-        }
         
+        // 3. NombreRazonEmisor
         $root->appendChild($this->createElement($doc, 'NombreRazonEmisor', $this->nombreRazonEmisor));
         
-        if ($this->subsanacion !== null) {
+        // 4. TipoFactura
-            $root->appendChild($this->createElement($doc, 'Subsanacion', $this->subsanacion));
-        }
-        
-        if ($this->rechazoPrevio !== null) {
-            $root->appendChild($this->createElement($doc, 'RechazoPrevio', $this->rechazoPrevio));
-        }
-        
         $root->appendChild($this->createElement($doc, 'TipoFactura', $this->tipoFactura));
 
-        if ($this->tipoFactura === 'R1' && $this->facturaRectificativa !== null) {
+        // 5. TipoRectificativa (only for R1 invoices)
-            $root->appendChild($this->createElement($doc, 'TipoRectificativa', $this->facturaRectificativa->getTipoRectificativa()));
+        if ($this->tipoFactura === self::TIPO_FACTURA_RECTIFICATIVA && $this->tipoRectificativa !== null) {
-            $facturasRectificadas = $this->createElement($doc, 'FacturasRectificadas');
+            $root->appendChild($this->createElement($doc, 'TipoRectificativa', $this->tipoRectificativa));
-            $facturasRectificadas->appendChild($this->facturaRectificativa->toXml($doc));
-            $root->appendChild($facturasRectificadas);
-            if ($this->importeRectificacion !== null) {
-                $root->appendChild($this->createElement($doc, 'ImporteRectificacion', (string)$this->importeRectificacion));
-            }
         }
 
-        if ($this->fechaOperacion) {
+        // 6. FacturasRectificadas (only for R1 invoices)
-            $root->appendChild($this->createElement($doc, 'FechaOperacion', date('d-m-Y', strtotime($this->fechaOperacion))));
+        if ($this->tipoFactura === self::TIPO_FACTURA_RECTIFICATIVA && $this->facturasRectificadas !== null) {
+            $facturasRectificadasElement = $this->createElement($doc, 'FacturasRectificadas');
+            
+            foreach ($this->facturasRectificadas as $facturaRectificada) {
+                $idFacturaRectificadaElement = $this->createElement($doc, 'IDFacturaRectificada');
+                
+                // Add IDEmisorFactura
+                $idFacturaRectificadaElement->appendChild($this->createElement($doc, 'IDEmisorFactura', $facturaRectificada['IDEmisorFactura']));
+                
+                // Add NumSerieFactura
+                $idFacturaRectificadaElement->appendChild($this->createElement($doc, 'NumSerieFactura', $facturaRectificada['NumSerieFactura']));
+                
+                // Add FechaExpedicionFactura
+                $idFacturaRectificadaElement->appendChild($this->createElement($doc, 'FechaExpedicionFactura', $facturaRectificada['FechaExpedicionFactura']));
+                
+                $facturasRectificadasElement->appendChild($idFacturaRectificadaElement);
             }
             
+            $root->appendChild($facturasRectificadasElement);
+        }
+
+        // 7. ImporteRectificacion (only for R1 invoices with proper structure)
+        if ($this->tipoFactura === self::TIPO_FACTURA_RECTIFICATIVA && $this->importeRectificacion !== null) {
+            $importeRectificacionElement = $this->createElement($doc, 'ImporteRectificacion');
+            
+            // Add BaseRectificada
+            $importeRectificacionElement->appendChild($this->createElement($doc, 'BaseRectificada', number_format($this->importeRectificacion['BaseRectificada'] ?? 0, 2, '.', '')));
+            
+            // Add CuotaRectificada
+            $importeRectificacionElement->appendChild($this->createElement($doc, 'CuotaRectificada', number_format($this->importeRectificacion['CuotaRectificada'] ?? 0, 2, '.', '')));
+            
+            // Add CuotaRecargoRectificado (always present for R1)
+            $importeRectificacionElement->appendChild($this->createElement($doc, 'CuotaRecargoRectificado', number_format($this->importeRectificacion['CuotaRecargoRectificado'] ?? 0, 2, '.', '')));
+            
+            $root->appendChild($importeRectificacionElement);
+        }
+
+        // 8. DescripcionOperacion
         $root->appendChild($this->createElement($doc, 'DescripcionOperacion', $this->descripcionOperacion));
 
-        if ($this->cupon !== null) {
+        // 9. Destinatarios (if set)
-            $root->appendChild($this->createElement($doc, 'Cupon', $this->cupon));
-        }
-
-        if ($this->facturaSimplificadaArt7273 !== null) {
-            $root->appendChild($this->createElement($doc, 'FacturaSimplificadaArt7273', $this->facturaSimplificadaArt7273));
-        }
-
-        if ($this->facturaSinIdentifDestinatarioArt61d !== null) {
-            $root->appendChild($this->createElement($doc, 'FacturaSinIdentifDestinatarioArt61d', $this->facturaSinIdentifDestinatarioArt61d));
-        }
-
-        if ($this->macrodato !== null) {
-            $root->appendChild($this->createElement($doc, 'Macrodato', $this->macrodato));
-        }
-
-        if ($this->emitidaPorTerceroODestinatario !== null) {
-            $root->appendChild($this->createElement($doc, 'EmitidaPorTerceroODestinatario', $this->emitidaPorTerceroODestinatario));
-        }
-
-        // Add Tercero if set
-        if ($this->tercero !== null) {
-            $terceroElement = $this->createElement($doc, 'Tercero');
-            $terceroElement->appendChild($this->createElement($doc, 'NombreRazon', $this->tercero->getRazonSocial()));
-            $terceroElement->appendChild($this->createElement($doc, 'NIF', $this->tercero->getNif()));
-            $root->appendChild($terceroElement);
-        }
-
-        // Add Destinatarios if set
         if ($this->destinatarios !== null && count($this->destinatarios) > 0) {
             $destinatariosElement = $this->createElement($doc, 'Destinatarios');
             foreach ($this->destinatarios as $destinatario) {
@@ -697,56 +1001,60 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
                 // Add NombreRazon
                 $idDestinatarioElement->appendChild($this->createElement($doc, 'NombreRazon', $destinatario->getNombreRazon()));
                 
-                // Add either NIF or IDOtro
+                // Add NIF
-                if ($destinatario->getNif() !== null) {
                 $idDestinatarioElement->appendChild($this->createElement($doc, 'NIF', $destinatario->getNif()));
-                } else {
-                    $idOtroElement = $this->createElement($doc, 'IDOtro');
-                    $idOtroElement->appendChild($this->createElement($doc, 'CodigoPais', $destinatario->getPais()));
-                    $idOtroElement->appendChild($this->createElement($doc, 'IDType', $destinatario->getTipoIdentificacion()));
-                    $idOtroElement->appendChild($this->createElement($doc, 'ID', $destinatario->getIdOtro()));
-                    $idDestinatarioElement->appendChild($idOtroElement);
-                }
                 
                 $destinatariosElement->appendChild($idDestinatarioElement);
             }
             $root->appendChild($destinatariosElement);
         }
 
-        // Add Desglose
+        // 10. Desglose
         if ($this->desglose !== null) {
             $root->appendChild($this->desglose->toXml($doc));
         }
 
-        // Add CuotaTotal and ImporteTotal
+        // 11. CuotaTotal
         $root->appendChild($this->createElement($doc, 'CuotaTotal', (string)$this->cuotaTotal));
+
+        // 12. ImporteTotal
         $root->appendChild($this->createElement($doc, 'ImporteTotal', (string)$this->importeTotal));
 
-        // Add Encadenamiento
+        // 13. Encadenamiento (always present for R1 invoices)
         if ($this->encadenamiento !== null) {
             $root->appendChild($this->encadenamiento->toXml($doc));
+        } else {
+            // Create default Encadenamiento if not set
+            $encadenamientoElement = $this->createElement($doc, 'Encadenamiento');
+            $encadenamientoElement->appendChild($this->createElement($doc, 'PrimerRegistro', 'S'));
+            $root->appendChild($encadenamientoElement);
         }
 
-        // Add SistemaInformatico
+        // 14. SistemaInformatico (always present for R1 invoices)
         if ($this->sistemaInformatico !== null) {
             $root->appendChild($this->sistemaInformatico->toXml($doc));
+        } else {
+            // Create default SistemaInformatico if not set
+            $sistemaInformaticoElement = $this->createElement($doc, 'SistemaInformatico');
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'NombreRazon', $this->nombreRazonEmisor));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'NIF', $this->idEmisorFactura));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'NombreSistemaInformatico', 'InvoiceNinja'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'IdSistemaInformatico', '77'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'Version', '1.0.03'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'NumeroInstalacion', '383'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'TipoUsoPosibleSoloVerifactu', 'N'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'TipoUsoPosibleMultiOT', 'S'));
+            $sistemaInformaticoElement->appendChild($this->createElement($doc, 'IndicadorMultiplesOT', 'S'));
+            $root->appendChild($sistemaInformaticoElement);
         }
 
-        // Add FechaHoraHusoGenRegistro
+        // 15. FechaHoraHusoGenRegistro
         $root->appendChild($this->createElement($doc, 'FechaHoraHusoGenRegistro', $this->fechaHoraHusoGenRegistro));
 
-        // Add NumRegistroAcuerdoFacturacion
+        // 16. TipoHuella
-        if ($this->numRegistroAcuerdoFacturacion !== null) {
-            $root->appendChild($this->createElement($doc, 'NumRegistroAcuerdoFacturacion', $this->numRegistroAcuerdoFacturacion));
-        }
-
-        // Add IdAcuerdoSistemaInformatico
-        if ($this->idAcuerdoSistemaInformatico !== null) {
-            $root->appendChild($this->createElement($doc, 'IdAcuerdoSistemaInformatico', $this->idAcuerdoSistemaInformatico));
-        }
-
-        // Add TipoHuella and Huella
         $root->appendChild($this->createElement($doc, 'TipoHuella', $this->tipoHuella));
+
+        // 17. Huella
         $root->appendChild($this->createElement($doc, 'Huella', $this->huella));
 
         return $root;
@@ -754,25 +1062,8 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
 
     public function toXmlString(): string
     {
-        // Validate required fields first, outside of try-catch
+        // Validate the invoice configuration first
-        $requiredFields = [
+        $this->validate();
-            'idVersion' => 'IDVersion',
-            'idFactura' => 'NumSerieFactura',
-            'nombreRazonEmisor' => 'NombreRazonEmisor',
-            'tipoFactura' => 'TipoFactura',
-            'descripcionOperacion' => 'DescripcionOperacion',
-            'cuotaTotal' => 'CuotaTotal',
-            'importeTotal' => 'ImporteTotal',
-            'fechaHoraHusoGenRegistro' => 'FechaHoraHusoGenRegistro',
-            'tipoHuella' => 'TipoHuella',
-            'huella' => 'Huella'
-        ];
-
-        foreach ($requiredFields as $property => $fieldName) {
-            if (!isset($this->$property)) {
-                throw new \InvalidArgumentException("Missing required field: $fieldName");
-            }
-        }
 
         // Enable user error handling for XML operations
         $previousErrorSetting = libxml_use_internal_errors(true);
@@ -849,8 +1140,8 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         $cabecera->appendChild($obligadoEmision);
 
         // Add ObligadoEmision content
-        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazon', $this->sistemaInformatico->getNombreRazon()));
+        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazon', $this->getNombreRazonEmisor()));
-        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NIF', $this->sistemaInformatico->getNif()));
+        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NIF', $this->getIdEmisorFactura()));
 
         // Create RegistroFactura
         $registroFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:RegistroFactura');
@@ -941,10 +1232,7 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
         // Parse IDFactura
         $idFacturaElement = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'IDFactura')->item(0);
         if ($idFacturaElement) {
-            $numSerieFacturaElement = $idFacturaElement->getElementsByTagNameNS(self::XML_NAMESPACE, 'NumSerieFactura')->item(0);
+            $invoice->setIdFactura(IDFactura::fromDOMElement($idFacturaElement));
-            if ($numSerieFacturaElement) {
-                $invoice->setIdFactura($numSerieFacturaElement->nodeValue);
-            }
         }
 
         // Parse RefExterna
@@ -1169,9 +1457,11 @@ class Invoice extends BaseXmlModel implements XmlModelInterface
     {
         $cancellation = new RegistroAnulacion();
         $cancellation
-            ->setIdEmisorFactura($this->getTercero()?->getNif() ?? 'B12345678')
+            ->setSistemaInformatico($this->getSistemaInformatico())
-            ->setNumSerieFactura($this->getIdFactura())
+        ->setNombreRazonEmisor($this->getNombreRazonEmisor())
-            ->setFechaExpedicionFactura($this->getFechaExpedicionFactura())
+            ->setIdEmisorFactura($this->getIdFactura()->getIdEmisorFactura())
+            ->setNumSerieFactura($this->getIdFactura()->getNumSerieFactura())
+            ->setFechaExpedicionFactura($this->getIdFactura()->getFechaExpedicionFactura())
             ->setMotivoAnulacion('1'); // Sustitución por otra factura
 
         return $cancellation;

app/Services/EDocument/Standards/Verifactu/Models/InvoiceModification.php

@@ -73,7 +73,7 @@ class InvoiceModification extends BaseXmlModel implements XmlModelInterface
      */
     public static function createFromInvoice(Invoice $originalInvoice, Invoice $modifiedInvoice): self
     {
-        $currentTimestamp = now()->format('Y-m-d\TH:i:s');
+        $currentTimestamp = now()->format('Y-m-d\TH:i:sP');
 
         $modification = new self();
 
@@ -81,7 +81,7 @@ class InvoiceModification extends BaseXmlModel implements XmlModelInterface
         $cancellation = new RegistroAnulacion();
         $cancellation
             ->setIdEmisorFactura($originalInvoice->getTercero()?->getNif() ?? 'B12345678')
-            ->setNumSerieFactura($originalInvoice->getIdFactura())
+            ->setNumSerieFactura($originalInvoice->getIdFactura()->getNumSerieFactura())
             ->setFechaExpedicionFactura($originalInvoice->getFechaExpedicionFactura())
             ->setMotivoAnulacion('1'); // Sustitución por otra factura
 
@@ -123,8 +123,10 @@ class InvoiceModification extends BaseXmlModel implements XmlModelInterface
 
         $modification->setRegistroModificacion($modificationRecord);
 
-        // Set up sistema informatico for the modification
+        // Set up sistema informatico for the modification (only if not null)
+        if ($modifiedInvoice->getSistemaInformatico()) {
             $modification->setSistemaInformatico($modifiedInvoice->getSistemaInformatico());
+        }
 
         return $modification;
     }
@@ -139,8 +141,8 @@ class InvoiceModification extends BaseXmlModel implements XmlModelInterface
         // Create SOAP envelope with namespaces
         $envelope = $soapDoc->createElementNS('http://schemas.xmlsoap.org/soap/envelope/', 'soapenv:Envelope');
         $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:soapenv', 'http://schemas.xmlsoap.org/soap/envelope/');
-        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:lr', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd');
+        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:sum', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd');
-        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:si', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
+        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:sum1', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
 
         $soapDoc->appendChild($envelope);
 
@@ -153,72 +155,97 @@ class InvoiceModification extends BaseXmlModel implements XmlModelInterface
         $envelope->appendChild($body);
 
         // Create RegFactuSistemaFacturacion
-        $regFactu = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'lr:RegFactuSistemaFacturacion');
+        $regFactu = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:RegFactuSistemaFacturacion');
         $body->appendChild($regFactu);
 
         // Create Cabecera
-        $cabecera = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'lr:Cabecera');
+        $cabecera = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:Cabecera');
         $regFactu->appendChild($cabecera);
 
-        // Add IDVersion
-        $cabecera->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:IDVersion', '1.0'));
-
         // Create ObligadoEmision
-        $obligadoEmision = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:ObligadoEmision');
+        $obligadoEmision = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:ObligadoEmision');
         $cabecera->appendChild($obligadoEmision);
 
         // Add ObligadoEmision content
-        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:NombreRazon', $this->sistemaInformatico->getNombreRazon()));
+        if ($this->sistemaInformatico) {
-        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:NIF', $this->sistemaInformatico->getNif()));
+            $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazon', $this->sistemaInformatico->getNombreRazon()));
+            $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NIF', $this->sistemaInformatico->getNif()));
+        } else {
+            // Default values if no sistema informatico is available
+            $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazon', 'CERTIFICADO FISICA PRUEBAS'));
+            $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NIF', 'A39200019'));
+        }
 
         // Create RegistroFactura
-        $registroFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'lr:RegistroFactura');
+        $registroFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:RegistroFactura');
         $regFactu->appendChild($registroFactura);
 
-        // Create DatosFactura
+        // Create RegistroAlta
-        $datosFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:DatosFactura');
+        $registroAlta = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:RegistroAlta');
-        $registroFactura->appendChild($datosFactura);
+        $registroFactura->appendChild($registroAlta);
+
+        // Add IDVersion inside RegistroAlta
+        $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:IDVersion', '1.0'));
+
+        // Create IDFactura
+        $idFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:IDFactura');
+        $registroAlta->appendChild($idFactura);
+
+        // Add IDFactura child elements
+        $idFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:IDEmisorFactura', $this->registroModificacion->getIdFactura()->getIdEmisorFactura()));
+        $idFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NumSerieFactura', $this->registroModificacion->getIdFactura()->getNumSerieFactura()));
+        $idFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:FechaExpedicionFactura', $this->registroModificacion->getIdFactura()->getFechaExpedicionFactura()));
+
+        // Add NombreRazonEmisor
+        $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazonEmisor', $this->registroModificacion->getNombreRazonEmisor()));
 
         // Add TipoFactura (R1 for rectificativa)
-        $datosFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:TipoFactura', 'R1'));
+        $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:TipoFactura', 'R1'));
+
+        // Add TipoRectificativa for R1 invoices (S for sustitutiva)
+        if ($this->registroModificacion->getTipoFactura() === 'R1') {
+            $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:TipoRectificativa', 'S'));
+        }
 
         // Add DescripcionOperacion
-        $datosFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:DescripcionOperacion', $this->registroModificacion->getDescripcionOperacion()));
+        $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:DescripcionOperacion', $this->registroModificacion->getDescripcionOperacion()));
 
         // Create ModificacionFactura with correct namespace
-        $modificacionFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:ModificacionFactura');
+        $modificacionFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:ModificacionFactura');
-        $datosFactura->appendChild($modificacionFactura);
+        $registroAlta->appendChild($modificacionFactura);
 
         // Add TipoRectificativa (S for sustitutiva)
-        $modificacionFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:TipoRectificativa', 'S'));
+        $modificacionFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:TipoRectificativa', 'S'));
 
         // Create FacturasRectificadas
-        $facturasRectificadas = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:FacturasRectificadas');
+        $facturasRectificadas = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:FacturasRectificadas');
         $modificacionFactura->appendChild($facturasRectificadas);
 
         // Add Factura (the original invoice being rectified)
-        $factura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:Factura');
+        $factura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:Factura');
         $facturasRectificadas->appendChild($factura);
 
         // Add original invoice details
-        $factura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:NumSerieFacturaEmisor', $this->registroAnulacion->getNumSerieFactura()));
+        $factura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NumSerieFacturaEmisor', $this->registroAnulacion->getNumSerieFactura()));
-        $factura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:FechaExpedicionFacturaEmisor', $this->registroAnulacion->getFechaExpedicionFactura()));
+        $factura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:FechaExpedicionFacturaEmisor', $this->registroAnulacion->getFechaExpedicionFactura()));
+
+        // Create Desglose
+        $desglose = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:Desglose');
+        $registroAlta->appendChild($desglose);
+
+        // Create DetalleDesglose
+        $detalleDesglose = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:DetalleDesglose');
+        $desglose->appendChild($detalleDesglose);
+
+        // Add DetalleDesglose child elements
+        $detalleDesglose->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:ClaveRegimen', '01'));
+        $detalleDesglose->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:CalificacionOperacion', 'S1'));
+        $detalleDesglose->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:TipoImpositivo', '21'));
+        $detalleDesglose->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:BaseImponibleOimporteNoSujeto', '200.00'));
+        $detalleDesglose->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:CuotaRepercutida', $this->registroModificacion->getCuotaTotal()));
 
         // Add ImporteTotal
-        $datosFactura->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:ImporteTotal', $this->registroModificacion->getImporteTotal()));
+        $registroAlta->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:ImporteTotal', $this->registroModificacion->getImporteTotal()));
-
-        // Create Impuestos
-        $impuestos = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:Impuestos');
-        $datosFactura->appendChild($impuestos);
-
-        // Create DetalleIVA
-        $detalleIVA = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:DetalleIVA');
-        $impuestos->appendChild($detalleIVA);
-
-        // Add tax details
-        $detalleIVA->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:TipoImpositivo', '21'));
-        $detalleIVA->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:BaseImponible', '200.00'));
-        $detalleIVA->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'si:CuotaRepercutida', $this->registroModificacion->getCuotaTotal()));
 
         return $soapDoc->saveXML();
     }

app/Services/EDocument/Standards/Verifactu/Models/RegistroAnulacion.php

@@ -15,11 +15,29 @@ class RegistroAnulacion extends BaseXmlModel
     protected string $numSerieFactura;
     protected string $fechaExpedicionFactura;
     protected string $motivoAnulacion;
+    protected string $nombreRazonEmisor;
+    // Additional properties required by XSD schema
+    protected ?string $refExterna = null;
+    protected ?string $sinRegistroPrevio = null;
+    protected ?string $rechazoPrevio = null;
+    protected ?string $generadoPor = null;
+    protected ?PersonaFisicaJuridica $generador = null;
+    protected Encadenamiento $encadenamiento;
+    protected SistemaInformatico $sistemaInformatico;
+    protected string $fechaHoraHusoGenRegistro;
+    protected string $tipoHuella;
+    protected string $huella;
+    protected ?string $signature = null;
 
     public function __construct()
     {
         $this->idVersion = '1.0';
         $this->motivoAnulacion = '1'; // Default: Sustitución por otra factura
+        $this->encadenamiento = new Encadenamiento();
+        $this->sistemaInformatico = new SistemaInformatico();
+        $this->fechaHoraHusoGenRegistro = now()->format('Y-m-d\TH:i:sP');
+        $this->tipoHuella = '01';
+        $this->huella = '';
     }
 
     public function getIdVersion(): string
@@ -77,6 +95,138 @@ class RegistroAnulacion extends BaseXmlModel
         return $this;
     }
 
+    public function getRefExterna(): ?string
+    {
+        return $this->refExterna;
+    }
+
+    public function setRefExterna(?string $refExterna): self
+    {
+        $this->refExterna = $refExterna;
+        return $this;
+    }
+
+    public function getSinRegistroPrevio(): ?string
+    {
+        return $this->sinRegistroPrevio;
+    }
+
+    public function setSinRegistroPrevio(?string $sinRegistroPrevio): self
+    {
+        $this->sinRegistroPrevio = $sinRegistroPrevio;
+        return $this;
+    }
+
+    public function getRechazoPrevio(): ?string
+    {
+        return $this->rechazoPrevio;
+    }
+
+    public function setRechazoPrevio(?string $rechazoPrevio): self
+    {
+        $this->rechazoPrevio = $rechazoPrevio;
+        return $this;
+    }
+
+    public function getGeneradoPor(): ?string
+    {
+        return $this->generadoPor;
+    }
+
+    public function setGeneradoPor(?string $generadoPor): self
+    {
+        $this->generadoPor = $generadoPor;
+        return $this;
+    }
+
+    public function getGenerador(): ?PersonaFisicaJuridica
+    {
+        return $this->generador;
+    }
+
+    public function setGenerador(?PersonaFisicaJuridica $generador): self
+    {
+        $this->generador = $generador;
+        return $this;
+    }
+
+    public function getEncadenamiento(): Encadenamiento
+    {
+        return $this->encadenamiento;
+    }
+
+    public function setEncadenamiento(Encadenamiento $encadenamiento): self
+    {
+        $this->encadenamiento = $encadenamiento;
+        return $this;
+    }
+
+    public function getSistemaInformatico(): SistemaInformatico
+    {
+        return $this->sistemaInformatico;
+    }
+
+    public function setSistemaInformatico(SistemaInformatico $sistemaInformatico): self
+    {
+        $this->sistemaInformatico = $sistemaInformatico;
+        return $this;
+    }
+
+    public function getFechaHoraHusoGenRegistro(): string
+    {
+        return $this->fechaHoraHusoGenRegistro;
+    }
+
+    public function setFechaHoraHusoGenRegistro(string $fechaHoraHusoGenRegistro): self
+    {
+        $this->fechaHoraHusoGenRegistro = $fechaHoraHusoGenRegistro;
+        return $this;
+    }
+
+    public function getTipoHuella(): string
+    {
+        return $this->tipoHuella;
+    }
+
+    public function setTipoHuella(string $tipoHuella): self
+    {
+        $this->tipoHuella = $tipoHuella;
+        return $this;
+    }
+
+    public function getHuella(): string
+    {
+        return $this->huella;
+    }
+
+    public function setHuella(string $huella): self
+    {
+        $this->huella = $huella;
+        return $this;
+    }
+
+    public function getSignature(): ?string
+    {
+        return $this->signature;
+    }
+
+    public function setSignature(?string $signature): self
+    {
+        $this->signature = $signature;
+        return $this;
+    }
+
+    public function getNombreRazonEmisor(): string
+    {
+        return $this->nombreRazonEmisor;
+    }
+
+    public function setNombreRazonEmisor(string $nombreRazonEmisor): self
+    {
+        $this->nombreRazonEmisor = $nombreRazonEmisor;
+        return $this;
+    }
+
     public function toXml(\DOMDocument $doc): \DOMElement
     {
         $root = $doc->createElementNS(self::XML_NAMESPACE, self::XML_NAMESPACE_PREFIX . ':RegistroAnulacion');
@@ -91,27 +241,52 @@ class RegistroAnulacion extends BaseXmlModel
         $idFactura->appendChild($this->createElement($doc, 'FechaExpedicionFacturaAnulada', $this->fechaExpedicionFactura));
         $root->appendChild($idFactura);
         
-        // Add required elements for RegistroFacturacionAnulacionType with proper values
+        // Add optional RefExterna
-        $encadenamiento = $doc->createElementNS(self::XML_NAMESPACE, self::XML_NAMESPACE_PREFIX . ':Encadenamiento');
+        if ($this->refExterna !== null) {
-        $encadenamiento->appendChild($this->createElement($doc, 'PrimerRegistro', 'S'));
+            $root->appendChild($this->createElement($doc, 'RefExterna', $this->refExterna));
-        $root->appendChild($encadenamiento);
+        }
         
-        // Add SistemaInformatico with proper structure
+        // Add optional SinRegistroPrevio
-        $sistemaInformatico = $doc->createElementNS(self::XML_NAMESPACE, self::XML_NAMESPACE_PREFIX . ':SistemaInformatico');
+        if ($this->sinRegistroPrevio !== null) {
-        $sistemaInformatico->appendChild($this->createElement($doc, 'NombreRazon', 'Test System'));
+            $root->appendChild($this->createElement($doc, 'SinRegistroPrevio', $this->sinRegistroPrevio));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'NIF', 'B12345678'));
+        }
-        $sistemaInformatico->appendChild($this->createElement($doc, 'NombreSistemaInformatico', 'Test Software'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'IdSistemaInformatico', '01'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'Version', '1.0'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'NumeroInstalacion', '001'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'TipoUsoPosibleSoloVerifactu', 'S'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'TipoUsoPosibleMultiOT', 'S'));
-        $sistemaInformatico->appendChild($this->createElement($doc, 'IndicadorMultiplesOT', 'S'));
-        $root->appendChild($sistemaInformatico);
         
-        $root->appendChild($this->createElement($doc, 'FechaHoraHusoGenRegistro', '2025-01-01T12:00:00'));
+        // Add optional RechazoPrevio
-        $root->appendChild($this->createElement($doc, 'TipoHuella', '01'));
+        if ($this->rechazoPrevio !== null) {
-        $root->appendChild($this->createElement($doc, 'Huella', 'TEST_HASH'));
+            $root->appendChild($this->createElement($doc, 'RechazoPrevio', $this->rechazoPrevio));
+        }
+        
+        // Add optional GeneradoPor
+        if ($this->generadoPor !== null) {
+            $root->appendChild($this->createElement($doc, 'GeneradoPor', $this->generadoPor));
+        }
+        
+        // Add optional Generador
+        if ($this->generador !== null) {
+            $root->appendChild($this->generador->toXml($doc));
+        }
+        
+        // Add Encadenamiento using actual property
+        $encadenamientoElement = $this->encadenamiento->toXml($doc);
+        $root->appendChild($encadenamientoElement);
+        
+        // Add SistemaInformatico using actual property
+        $sistemaInformaticoElement = $this->sistemaInformatico->toXml($doc);
+        $root->appendChild($sistemaInformaticoElement);
+        
+        // Add FechaHoraHusoGenRegistro using actual property
+        $root->appendChild($this->createElement($doc, 'FechaHoraHusoGenRegistro', $this->fechaHoraHusoGenRegistro));
+        
+        // Add TipoHuella using actual property
+        $root->appendChild($this->createElement($doc, 'TipoHuella', $this->tipoHuella));
+        
+        // Add Huella using actual property
+        $root->appendChild($this->createElement($doc, 'Huella', $this->huella));
+        
+        // Add optional Signature
+        if ($this->signature !== null) {
+            $root->appendChild($this->createDsElement($doc, 'Signature', $this->signature));
+        }
         
         return $root;
     }
@@ -129,22 +304,79 @@ class RegistroAnulacion extends BaseXmlModel
         // Handle IDFactura
         $idFactura = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'IDFactura')->item(0);
         if ($idFactura) {
-            $idEmisorFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'IDEmisorFactura')->item(0);
+            $idEmisorFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'IDEmisorFacturaAnulada')->item(0);
             if ($idEmisorFactura) {
                 $registroAnulacion->setIdEmisorFactura($idEmisorFactura->nodeValue);
             }
 
-            $numSerieFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'NumSerieFactura')->item(0);
+            $numSerieFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'NumSerieFacturaAnulada')->item(0);
             if ($numSerieFactura) {
                 $registroAnulacion->setNumSerieFactura($numSerieFactura->nodeValue);
             }
 
-            $fechaExpedicionFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'FechaExpedicionFactura')->item(0);
+            $fechaExpedicionFactura = $idFactura->getElementsByTagNameNS(self::XML_NAMESPACE, 'FechaExpedicionFacturaAnulada')->item(0);
             if ($fechaExpedicionFactura) {
                 $registroAnulacion->setFechaExpedicionFactura($fechaExpedicionFactura->nodeValue);
             }
         }
 
+        // Handle optional elements
+        $refExterna = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'RefExterna')->item(0);
+        if ($refExterna) {
+            $registroAnulacion->setRefExterna($refExterna->nodeValue);
+        }
+
+        $sinRegistroPrevio = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'SinRegistroPrevio')->item(0);
+        if ($sinRegistroPrevio) {
+            $registroAnulacion->setSinRegistroPrevio($sinRegistroPrevio->nodeValue);
+        }
+
+        $rechazoPrevio = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'RechazoPrevio')->item(0);
+        if ($rechazoPrevio) {
+            $registroAnulacion->setRechazoPrevio($rechazoPrevio->nodeValue);
+        }
+
+        $generadoPor = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'GeneradoPor')->item(0);
+        if ($generadoPor) {
+            $registroAnulacion->setGeneradoPor($generadoPor->nodeValue);
+        }
+
+        // Handle Generador
+        $generador = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'Generador')->item(0);
+        if ($generador) {
+            $registroAnulacion->setGenerador(PersonaFisicaJuridica::fromDOMElement($generador));
+        }
+
+        // Handle Encadenamiento
+        $encadenamiento = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'Encadenamiento')->item(0);
+        if ($encadenamiento) {
+            $registroAnulacion->setEncadenamiento(Encadenamiento::fromDOMElement($encadenamiento));
+        }
+
+        // Handle SistemaInformatico
+        $sistemaInformatico = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'SistemaInformatico')->item(0);
+        if ($sistemaInformatico) {
+            $registroAnulacion->setSistemaInformatico(SistemaInformatico::fromDOMElement($sistemaInformatico));
+        }
+
+        // Handle FechaHoraHusoGenRegistro
+        $fechaHoraHusoGenRegistro = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'FechaHoraHusoGenRegistro')->item(0);
+        if ($fechaHoraHusoGenRegistro) {
+            $registroAnulacion->setFechaHoraHusoGenRegistro($fechaHoraHusoGenRegistro->nodeValue);
+        }
+
+        // Handle TipoHuella
+        $tipoHuella = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'TipoHuella')->item(0);
+        if ($tipoHuella) {
+            $registroAnulacion->setTipoHuella($tipoHuella->nodeValue);
+        }
+
+        // Handle Huella
+        $huella = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'Huella')->item(0);
+        if ($huella) {
+            $registroAnulacion->setHuella($huella->nodeValue);
+        }
+
         // Handle MotivoAnulacion
         $motivoAnulacion = $element->getElementsByTagNameNS(self::XML_NAMESPACE, 'MotivoAnulacion')->item(0);
         if ($motivoAnulacion) {
@@ -165,4 +397,58 @@ class RegistroAnulacion extends BaseXmlModel
 
         return $doc->saveXML();
     }
+
+    public function toSoapEnvelope(): string
+    {
+        // Create the SOAP document
+        $soapDoc = new \DOMDocument('1.0', 'UTF-8');
+        $soapDoc->preserveWhiteSpace = false;
+        $soapDoc->formatOutput = true;
+
+        // Create SOAP envelope with namespaces
+        $envelope = $soapDoc->createElementNS('http://schemas.xmlsoap.org/soap/envelope/', 'soapenv:Envelope');
+        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:soapenv', 'http://schemas.xmlsoap.org/soap/envelope/');
+        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:sum', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd');
+        $envelope->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:sum1', 'https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd');
+        
+        $soapDoc->appendChild($envelope);
+
+        // Create Header
+        $header = $soapDoc->createElementNS('http://schemas.xmlsoap.org/soap/envelope/', 'soapenv:Header');
+        $envelope->appendChild($header);
+
+        // Create Body
+        $body = $soapDoc->createElementNS('http://schemas.xmlsoap.org/soap/envelope/', 'soapenv:Body');
+        $envelope->appendChild($body);
+
+        // Create RegFactuSistemaFacturacion
+        $regFactu = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:RegFactuSistemaFacturacion');
+        $body->appendChild($regFactu);
+
+        // Create Cabecera
+        $cabecera = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:Cabecera');
+        $regFactu->appendChild($cabecera);
+
+        // Create ObligadoEmision
+        $obligadoEmision = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:ObligadoEmision');
+        $cabecera->appendChild($obligadoEmision);
+
+        // Add ObligadoEmision content (using default values for now)
+        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NombreRazon', $this->getNombreRazonEmisor()));
+        $obligadoEmision->appendChild($soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:NIF', $this->getIdEmisorFactura()));
+
+        // Create RegistroFactura
+        $registroFactura = $soapDoc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd', 'sum:RegistroFactura');
+        $regFactu->appendChild($registroFactura);
+
+        // Import your existing XML into the RegistroFactura
+        $yourXmlDoc = new \DOMDocument();
+        $yourXmlDoc->loadXML($this->toXmlString());
+        
+        // Import the root element from your XML
+        $importedNode = $soapDoc->importNode($yourXmlDoc->documentElement, true);
+        $registroFactura->appendChild($importedNode);
+
+        return $soapDoc->saveXML();
+    }
 } 

app/Services/EDocument/Standards/Verifactu/Models/RegistroModificacion.php

@@ -11,7 +11,7 @@ namespace App\Services\EDocument\Standards\Verifactu\Models;
 class RegistroModificacion extends BaseXmlModel
 {
     protected string $idVersion;
-    protected string $idFactura;
+    protected IDFactura $idFactura;
     protected ?string $refExterna = null;
     protected string $nombreRazonEmisor;
     protected ?string $subsanacion = null;
@@ -79,12 +79,12 @@ class RegistroModificacion extends BaseXmlModel
         return $this;
     }
 
-    public function getIdFactura(): string
+    public function getIdFactura(): IDFactura
     {
         return $this->idFactura;
     }
 
-    public function setIdFactura(string $idFactura): self
+    public function setIdFactura(IDFactura $idFactura): self
     {
         $this->idFactura = $idFactura;
         return $this;
@@ -359,9 +359,6 @@ class RegistroModificacion extends BaseXmlModel
 
     public function setFechaHoraHusoGenRegistro(string $fechaHoraHusoGenRegistro): self
     {
-        if (!preg_match('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/', $fechaHoraHusoGenRegistro)) {
-            throw new \InvalidArgumentException('Invalid date format for FechaHoraHusoGenRegistro. Expected format: YYYY-MM-DDThh:mm:ss');
-        }
         $this->fechaHoraHusoGenRegistro = $fechaHoraHusoGenRegistro;
         return $this;
     }
@@ -464,7 +461,7 @@ class RegistroModificacion extends BaseXmlModel
         // Create IDFactura structure
         $idFactura = $this->createElement($doc, 'IDFactura');
         $idFactura->appendChild($this->createElement($doc, 'IDEmisorFactura', $this->tercero?->getNif() ?? 'B12345678'));
-        $idFactura->appendChild($this->createElement($doc, 'NumSerieFactura', $this->idFactura));
+        $idFactura->appendChild($this->createElement($doc, 'NumSerieFactura', $this->idFactura->getNumSerieFactura()));
         $idFactura->appendChild($this->createElement($doc, 'FechaExpedicionFactura', $this->getFechaExpedicionFactura()));
         $root->appendChild($idFactura);
         
@@ -482,46 +479,50 @@ class RegistroModificacion extends BaseXmlModel
             $root->appendChild($this->createElement($doc, 'RechazoPrevio', $this->rechazoPrevio));
         }
         
-        $root->appendChild($this->createElement($doc, 'TipoFactura', $this->tipoFactura));
+        // Create DatosFactura element
+        $datosFactura = $this->createElement($doc, 'DatosFactura');
+        
+        // Add TipoFactura to DatosFactura
+        $datosFactura->appendChild($this->createElement($doc, 'TipoFactura', $this->tipoFactura));
 
         if ($this->tipoFactura === 'R1' && $this->facturaRectificativa !== null) {
-            $root->appendChild($this->createElement($doc, 'TipoRectificativa', $this->facturaRectificativa->getTipoRectificativa()));
+            $datosFactura->appendChild($this->createElement($doc, 'TipoRectificativa', $this->facturaRectificativa->getTipoRectificativa()));
             $facturasRectificadas = $this->createElement($doc, 'FacturasRectificadas');
             $facturasRectificadas->appendChild($this->facturaRectificativa->toXml($doc));
-            $root->appendChild($facturasRectificadas);
+            $datosFactura->appendChild($facturasRectificadas);
             if ($this->importeRectificacion !== null) {
-                $root->appendChild($this->createElement($doc, 'ImporteRectificacion', (string)$this->importeRectificacion));
+                $datosFactura->appendChild($this->createElement($doc, 'ImporteRectificacion', (string)$this->importeRectificacion));
             }
         }
 
         if ($this->fechaOperacion) {
-            $root->appendChild($this->createElement($doc, 'FechaOperacion', date('d-m-Y', strtotime($this->fechaOperacion))));
+            $datosFactura->appendChild($this->createElement($doc, 'FechaOperacion', date('d-m-Y', strtotime($this->fechaOperacion))));
         }
 
-        $root->appendChild($this->createElement($doc, 'DescripcionOperacion', $this->descripcionOperacion));
+        $datosFactura->appendChild($this->createElement($doc, 'DescripcionOperacion', $this->descripcionOperacion));
 
         if ($this->cupon !== null) {
-            $root->appendChild($this->createElement($doc, 'Cupon', $this->cupon));
+            $datosFactura->appendChild($this->createElement($doc, 'Cupon', $this->cupon));
         }
 
         if ($this->facturaSimplificadaArt7273 !== null) {
-            $root->appendChild($this->createElement($doc, 'FacturaSimplificadaArt7273', $this->facturaSimplificadaArt7273));
+            $datosFactura->appendChild($this->createElement($doc, 'FacturaSimplificadaArt7273', $this->facturaSimplificadaArt7273));
         }
 
         if ($this->facturaSinIdentifDestinatarioArt61d !== null) {
-            $root->appendChild($this->createElement($doc, 'FacturaSinIdentifDestinatarioArt61d', $this->facturaSinIdentifDestinatarioArt61d));
+            $datosFactura->appendChild($this->createElement($doc, 'FacturaSinIdentifDestinatarioArt61d', $this->facturaSinIdentifDestinatarioArt61d));
         }
 
         if ($this->macrodato !== null) {
-            $root->appendChild($this->createElement($doc, 'Macrodato', $this->macrodato));
+            $datosFactura->appendChild($this->createElement($doc, 'Macrodato', $this->macrodato));
         }
 
         if ($this->emitidaPorTerceroODestinatario !== null) {
-            $root->appendChild($this->createElement($doc, 'EmitidaPorTerceroODestinatario', $this->emitidaPorTerceroODestinatario));
+            $datosFactura->appendChild($this->createElement($doc, 'EmitidaPorTerceroODestinatario', $this->emitidaPorTerceroODestinatario));
         }
 
         if ($this->tercero !== null) {
-            $root->appendChild($this->tercero->toXml($doc));
+            $datosFactura->appendChild($this->tercero->toXml($doc));
         }
 
         if ($this->destinatarios !== null && count($this->destinatarios) > 0) {
@@ -545,45 +546,48 @@ class RegistroModificacion extends BaseXmlModel
                 
                 $destinatariosElement->appendChild($idDestinatarioElement);
             }
-            $root->appendChild($destinatariosElement);
+            $datosFactura->appendChild($destinatariosElement);
         }
 
-        // Add Desglose
+        // Add Desglose to DatosFactura
-        if ($this->desglose !== null) {
+        if ($this->desglose) {
-            $root->appendChild($this->desglose->toXml($doc));
+            $desgloseElement = $this->desglose->toXml($doc);
+            $datosFactura->appendChild($desgloseElement);
         }
 
-        // Add CuotaTotal and ImporteTotal
+        // Add CuotaTotal to DatosFactura
-        $root->appendChild($this->createElement($doc, 'CuotaTotal', (string)$this->cuotaTotal));
+        $datosFactura->appendChild($this->createElement($doc, 'CuotaTotal', (string)$this->cuotaTotal));
-        $root->appendChild($this->createElement($doc, 'ImporteTotal', (string)$this->importeTotal));
 
-        // Add Encadenamiento
+        // Add ImporteTotal to DatosFactura
-        if ($this->encadenamiento !== null) {
+        $datosFactura->appendChild($this->createElement($doc, 'ImporteTotal', (string)$this->importeTotal));
-            $root->appendChild($this->encadenamiento->toXml($doc));
+
+        // Add Encadenamiento to DatosFactura
+        if ($this->encadenamiento) {
+            $encadenamientoElement = $this->encadenamiento->toXml($doc);
+            $datosFactura->appendChild($encadenamientoElement);
         }
 
-        // Add SistemaInformatico
+        // Add SistemaInformatico to DatosFactura
-        if ($this->sistemaInformatico !== null) {
+        if ($this->sistemaInformatico) {
-            $root->appendChild($this->sistemaInformatico->toXml($doc));
+            $sistemaInformaticoElement = $this->sistemaInformatico->toXml($doc);
+            $datosFactura->appendChild($sistemaInformaticoElement);
         }
 
-        // Add FechaHoraHusoGenRegistro
+        // Add FechaHoraHusoGenRegistro to DatosFactura
-        $root->appendChild($this->createElement($doc, 'FechaHoraHusoGenRegistro', $this->fechaHoraHusoGenRegistro));
+        $datosFactura->appendChild($this->createElement($doc, 'FechaHoraHusoGenRegistro', $this->fechaHoraHusoGenRegistro));
 
-        // Add NumRegistroAcuerdoFacturacion
+        // Add TipoHuella and Huella to DatosFactura
-        if ($this->numRegistroAcuerdoFacturacion !== null) {
+        $datosFactura->appendChild($this->createElement($doc, 'TipoHuella', $this->tipoHuella));
-            $root->appendChild($this->createElement($doc, 'NumRegistroAcuerdoFacturacion', $this->numRegistroAcuerdoFacturacion));
+        $datosFactura->appendChild($this->createElement($doc, 'Huella', $this->huella));
+
+        // Add DatosFactura to root
+        $root->appendChild($datosFactura);
+
+        // Add optional Signature
+        if ($this->signature !== null) {
+            $root->appendChild($this->createDsElement($doc, 'Signature', $this->signature));
         }
 
-        // Add IdAcuerdoSistemaInformatico
-        if ($this->idAcuerdoSistemaInformatico !== null) {
-            $root->appendChild($this->createElement($doc, 'IdAcuerdoSistemaInformatico', $this->idAcuerdoSistemaInformatico));
-        }
-
-        // Add TipoHuella and Huella
-        $root->appendChild($this->createElement($doc, 'TipoHuella', $this->tipoHuella));
-        $root->appendChild($this->createElement($doc, 'Huella', $this->huella));
-
         return $root;
     }
 

app/Services/EDocument/Standards/Verifactu/Models/SistemaInformatico.php

@@ -18,28 +18,32 @@ class SistemaInformatico extends BaseXmlModel
     public function __construct()
     {
         // Initialize required properties with default values
-        $this->nombreRazon = '';
+        $this->nombreRazon = 'InvoiceNinja System';
-        $this->nombreSistemaInformatico = '';
+        $this->nombreSistemaInformatico = 'InvoiceNinja';
-        $this->idSistemaInformatico = '';
+        $this->idSistemaInformatico = '01';
-        $this->version = '';
+        $this->version = '1.0.0';
-        $this->numeroInstalacion = '';
+        $this->numeroInstalacion = '001';
+        $this->nif = 'B12345678'; // Default NIF
     }
 
     public function toXml(\DOMDocument $doc): \DOMElement
     {
         $root = $this->createElement($doc, 'SistemaInformatico');
 
-        // Add nombreRazon
+        // Add nombreRazon (first element in nested sequence)
         $root->appendChild($this->createElement($doc, 'NombreRazon', $this->nombreRazon));
 
-        // Add either NIF or IDOtro
+        // Add either NIF or IDOtro (second element in nested sequence)
         if ($this->nif !== null) {
             $root->appendChild($this->createElement($doc, 'NIF', $this->nif));
         } elseif ($this->idOtro !== null) {
             $root->appendChild($this->createElement($doc, 'IDOtro', $this->idOtro));
+        } else {
+            // If neither NIF nor IDOtro is set, we need to set a default NIF
+            $root->appendChild($this->createElement($doc, 'NIF', 'B12345678'));
         }
 
-        // Add remaining elements
+        // Add remaining elements (outside the nested sequence)
         $root->appendChild($this->createElement($doc, 'NombreSistemaInformatico', $this->nombreSistemaInformatico));
         $root->appendChild($this->createElement($doc, 'IdSistemaInformatico', $this->idSistemaInformatico));
         $root->appendChild($this->createElement($doc, 'Version', $this->version));

app/Services/EDocument/Standards/Verifactu/RegistroAlta.php

@@ -23,6 +23,7 @@ use App\Utils\Traits\NumberFormatter;
 use App\Helpers\Invoice\InvoiceSumInclusive;
 use App\Services\EDocument\Standards\Verifactu\Models\Desglose;
 use App\Services\EDocument\Standards\Verifactu\Models\Encadenamiento;
+use App\Services\EDocument\Standards\Verifactu\Models\IDFactura;
 use App\Services\EDocument\Standards\Verifactu\Models\RegistroAnterior;
 use App\Services\EDocument\Standards\Verifactu\Models\SistemaInformatico;
 use App\Services\EDocument\Standards\Verifactu\Models\PersonaFisicaJuridica;
@@ -105,26 +106,55 @@ class RegistroAlta
         // Get the previous invoice log
         $this->v_log = $this->company->verifactu_logs()->first();
 
-        $this->current_timestamp = now()->setTimezone('Europe/Madrid')->format('Y-m-d\TH:i:s');
+        $this->current_timestamp = now()->setTimezone('Europe/Madrid')->format('Y-m-d\TH:i:sP');
+
+        // Determine if this is a rectification invoice
+        $isRectification = $this->invoice->status_id === 5; // Assuming status_id 5 is for rectification
 
         $this->v_invoice
             ->setIdVersion('1.0')
-            ->setIdFactura($this->invoice->number) //invoice number
+            ->setIdFactura((new IDFactura())
+                ->setIdEmisorFactura($this->company->settings->vat_number)
+                ->setNumSerieFactura($this->invoice->number)
+                ->setFechaExpedicionFactura(\Carbon\Carbon::parse($this->invoice->date)->format('d-m-Y')))
             ->setNombreRazonEmisor($this->company->present()->name()) //company name
-            ->setTipoFactura('F1') //invoice type
+            ->setTipoFactura($isRectification ? 'R1' : 'F1') //invoice type
-            ->setDescripcionOperacion('')// Not manadatory - max chars 500
+            ->setDescripcionOperacion($isRectification ? 'Rectificación por error en factura anterior' : 'Alta')// It IS! manadatory - max chars 500
             ->setCuotaTotal($this->invoice->total_taxes) //total taxes
             ->setImporteTotal($this->invoice->amount) //total invoice amount
             ->setFechaHoraHusoGenRegistro($this->current_timestamp) //creation/submission timestamp
             ->setTipoHuella('01') //sha256
             ->setHuella('PLACEHOLDER_HUELLA');
 
+        // Set up rectification details if this is a rectification invoice
+        if ($isRectification) {
+            $this->v_invoice->setTipoRectificativa('S'); // S for substitutive rectification
+
+            // Set up rectified invoice information
+            $facturasRectificadas = [
+                [
+                    'IDEmisorFactura' => $this->company->settings->vat_number,
+                    'NumSerieFactura' => $this->invoice->number,
+                    'FechaExpedicionFactura' => \Carbon\Carbon::parse($this->invoice->date)->format('d-m-Y')
+                ]
+            ];
+            $this->v_invoice->setFacturasRectificadas($facturasRectificadas);
+
+            // Set up rectification amounts
+            $importeRectificacion = [
+                'BaseRectificada' => $this->calc->getNetSubtotal(),
+                'CuotaRectificada' => $this->invoice->total_taxes,
+                'CuotaRecargoRectificado' => 0.00
+            ];
+            $this->v_invoice->setRectificationAmounts($importeRectificacion);
+        }
+
         /** The business entity that is issuing the invoice */
         $emisor = new PersonaFisicaJuridica();
         $emisor->setNif($this->company->settings->vat_number)
                 ->setNombreRazon($this->invoice->company->present()->name());
 
-        $this->v_invoice->setTercero($emisor);
+        // $this->v_invoice->setTercero($emisor);
 
         /** The business entity (Client) that is receiving the invoice */
         $destinatarios = [];
@@ -189,13 +219,14 @@ class RegistroAlta
         //Sending system information - We automatically generate the obligado emision from this later
         $sistema = new SistemaInformatico();
         $sistema
-            ->setNombreRazon('Invoice Ninja')
+            // ->setNombreRazon('Sistema de Facturación')
+            ->setNombreRazon(config('services.verifactu.sender_name')) //must match the cert name
             ->setNif(config('services.verifactu.sender_nif'))
-            ->setNombreSistemaInformatico('Invoice Ninja')
+            ->setNombreSistemaInformatico('InvoiceNinja')
-            ->setIdSistemaInformatico('01')
+            ->setIdSistemaInformatico('77')
-            ->setVersion('1.0')
+            ->setVersion('1.0.03')
-            ->setNumeroInstalacion('01')
+            ->setNumeroInstalacion('383')
-            ->setTipoUsoPosibleSoloVerifactu('S')
+            ->setTipoUsoPosibleSoloVerifactu('N')
             ->setTipoUsoPosibleMultiOT('S')
             ->setIndicadorMultiplesOT('S');
 

config/services.php

@@ -141,16 +141,6 @@ return [
     'gocardless' => [
         'client_id' => env('GOCARDLESS_CLIENT_ID', null),
         'client_secret' => env('GOCARDLESS_CLIENT_SECRET', null),
-        'environment' => env('GOCARDLESS_ENVIRONMENT', 'production'),
-        'redirect_uri' => env('GOCARDLESS_REDIRECT_URI', 'https://invoicing.co/gocardless/oauth/connect/confirm'),
-        'testing_company' => env('GOCARDLESS_TESTING_COMPANY', null),
-        'webhook_secret' => env('GOCARDLESS_WEBHOOK_SECRET', null),
-    ],
-    'quickbooks' => [
-        'client_id' => env('QUICKBOOKS_CLIENT_ID', false),
-        'client_secret' => env('QUICKBOOKS_CLIENT_SECRET', false),
-        'redirect' => env('QUICKBOOKS_REDIRECT_URI'),
-        'env' => env('QUICKBOOKS_ENV'),
         'debug' => env('APP_DEBUG',false)
     ],
     'quickbooks_webhook' => [
@@ -160,5 +150,6 @@ return [
         'sender_nif' => env('VERIFACTU_SENDER_NIF', ''),
         'certificate' => env('VERIFACTU_CERTIFICATE', ''),
         'ssl_key' => env('VERIFACTU_SSL_KEY', ''),
+        'sender_name' => env('VERIFACTU_SENDER_NAME', 'CERTIFICADO FISICA PRUEBAS'),
     ],
 ];

tests/Feature/EInvoice/Verifactu/VerifactuFeatureTest.php

@@ -10,12 +10,24 @@ use App\Models\Company;
 use App\Models\Invoice;
 use Faker\Factory as Faker;
 use App\Models\CompanyToken;
+use App\Models\VerifactuLog;
 use App\Models\ClientContact;
 use App\DataMapper\InvoiceItem;
 use App\DataMapper\ClientSettings;
 use App\DataMapper\CompanySettings;
 use App\Factory\CompanyUserFactory;
+use Illuminate\Support\Facades\Http;
 use App\Services\EDocument\Standards\Verifactu;
+use App\Services\EDocument\Standards\Verifactu\RegistroAlta;
+use App\Services\EDocument\Standards\Verifactu\Models\Desglose;
+use App\Services\EDocument\Standards\Verifactu\Models\IDFactura;
+use App\Services\EDocument\Standards\Verifactu\ResponseProcessor;
+use App\Services\EDocument\Standards\Verifactu\Models\Encadenamiento;
+use App\Services\EDocument\Standards\Verifactu\Models\RegistroAnterior;
+use App\Services\EDocument\Standards\Verifactu\Models\InvoiceModification;
+use App\Services\EDocument\Standards\Validation\VerifactuDocumentValidator;
+use App\Services\EDocument\Standards\Verifactu\Models\FacturaRectificativa;
+use App\Services\EDocument\Standards\Verifactu\Models\Invoice as VerifactuInvoice;
 
 class VerifactuFeatureTest extends TestCase
 {
@@ -27,6 +39,9 @@ class VerifactuFeatureTest extends TestCase
     private $client;
     private $faker;
 
+    // private string $nombre_razon = 'CERTIFICADO ENTIDAD PRUEBAS'; //must match the cert name
+    private string $nombre_razon = 'CERTIFICADO FISICA PRUEBAS'; //must match the cert name
+
     private string $test_company_nif = 'A39200019';
     private string $test_client_nif = 'A39200019';
 
@@ -66,6 +81,7 @@ class VerifactuFeatureTest extends TestCase
             $settings->vat_number = 'B12345678'; // Spanish VAT number format
             $settings->payment_terms = '10';
             $settings->vat_number = $this->test_company_nif;
+            $settings->name = $this->nombre_razon;
         }
 
         $this->company = Company::factory()->create([
@@ -101,7 +117,7 @@ class VerifactuFeatureTest extends TestCase
             'user_id' => $this->user->id,
             'company_id' => $this->company->id,
             'is_deleted' => 0,
-            'name' => 'bob',
+            'name' => $this->nombre_razon,
             'address1' => 'Calle Mayor 123',
             'city' => 'Madrid',
             'state' => 'Madrid',
@@ -133,6 +149,7 @@ class VerifactuFeatureTest extends TestCase
         $item->notes = 'Test item';
         $item->tax_name1 = 'IVA';
         $item->tax_rate1 = 21;
+        $item->discount =0;
 
         $line_items[] = $item;
         
@@ -140,15 +157,24 @@ class VerifactuFeatureTest extends TestCase
             'user_id' => $this->user->id,
             'company_id' => $this->company->id,
             'client_id' => $this->client->id,
-            'date' => now()->addSeconds($this->client->timezone_offset())->format('Y-m-d'),
+            'date' => now()->format('Y-m-d'),
             'next_send_date' => null,
-            'due_date' => now()->addSeconds($this->client->timezone_offset())->addDays(5)->format('Y-m-d'),
+            'due_date' => now()->addDays(5)->format('Y-m-d'),
-            'last_sent_date' => now()->addSeconds($this->client->timezone_offset()),
+            'last_sent_date' => now(),
             'reminder_last_sent' => null,
+            'uses_inclusive_taxes' => false,
+            'discount' => 0,
+            'is_amount_discount' => false,
             'status_id' => Invoice::STATUS_DRAFT,
             'amount' => 10,
             'balance' => 10,
             'line_items' => $line_items,
+            'tax_rate1' => 0,
+            'tax_rate2' => 0,
+            'tax_rate3' => 0,
+            'tax_name1' => '',
+            'tax_name2' => '',
+            'tax_name3' => '',
         ]);
 
         $invoice = $invoice->calc()
@@ -163,25 +189,313 @@ class VerifactuFeatureTest extends TestCase
     public function test_construction_and_validation()
     {
 // - current previous hash - 10C643EDC7DC727FAC6BAEBAAC7BEA67B5C1369A5A5ED74E5AD3149FC30A3C8C
+//E8AA16FB793620F00B5A729D5ED6C262BF779457FB0780199BC8D468124C9225
 // - current previous invoice number - TEST0033343443
 
         $invoice = $this->buildData();
 
-        $invoice->number = 'TEST0033343444';
+        $invoice->number = 'TEST0033343451';
         $invoice->save();
 
         $this->assertNotNull($invoice);
 
+        $_inv = Invoice::factory()->create([
+            'user_id' => $invoice->user_id,
+            'company_id' => $invoice->company_id,
+            'client_id' => $invoice->client_id,
+            'date' => '2025-08-10',
+            'status_id' => Invoice::STATUS_SENT,
+            'uses_inclusive_taxes' => false,
+        ]);
+
+        VerifactuLog::create([
+            'invoice_id' => $_inv->id,
+            'company_id' => $invoice->company_id,
+            'invoice_number' => 'TEST0033343450',
+            'date' => '2025-08-10',
+            'hash' => '3D70FE22F3E4FC60EB6412D8D9703160C818DF8E16AC952D57E97EF0668999D0',
+            'nif' => 'A39200019',
+            'previous_hash' => '3D70FE22F3E4FC60EB6412D8D9703160C818DF8E16AC952D57E97EF0668999D0',
+        ]);
+
         $verifactu = new Verifactu($invoice);
         $verifactu->run();
+        $verifactu->setTestMode()
+                ->setPreviousHash('3D70FE22F3E4FC60EB6412D8D9703160C818DF8E16AC952D57E97EF0668999D0');
+
+        $validator = new \App\Services\EDocument\Standards\Validation\VerifactuDocumentValidator($verifactu->getEnvelope());
+        $validator->validate();
+        $errors = $validator->getVerifactuErrors();
+
+
+        if (!empty($errors)) {
+
+            nlog('Verifactu Validation Errors:');
+            nlog($xml);
+            nlog($errors);
+        }
+
+        $this->assertCount(0, $errors);
+
+        $this->assertNotEmpty($verifactu->getEnvelope());
 
         $envelope = $verifactu->getEnvelope();
         
         $this->assertNotEmpty($envelope);
 
-        nlog($envelope);
+        // In test mode, we don't actually send to the service
+        // The envelope generation and validation is what we're testing
+        $this->assertNotEmpty($envelope);
+        $this->assertStringContainsString('soapenv:Envelope', $envelope);
+        $this->assertStringContainsString('RegFactuSistemaFacturacion', $envelope);
+
+        // Test the send method (in test mode it should return a response structure)
+        $response = $verifactu->send($envelope);
+        nlog($response);
+
+        $this->assertNotNull($response);
+        $this->assertArrayHasKey('success', $response);
+        $this->assertTrue($response['success']);
+        // In test mode, the response might not be successful, but the structure should be correct
     }
 
+    public function test_invoice_invoice_modification()
+    {
+        $invoice = $this->buildData();
+        $invoice->number = 'TEST0033343444';
+        $invoice->save();
+
+        $previous_huella = 'C9D10B1EE60CEE114B67CDF07F23487239B2A04A697BE2C4F67AC934B0553CF5';
+
+        $verifactu = new Verifactu($invoice);
+        $old_document = $verifactu->setTestMode()
+                ->setPreviousHash($previous_huella)
+                ->run()
+                ->getInvoice();
+
+
+        $_verifactu = (new Verifactu($invoice))->setTestMode()->run();
+        $new_document = $_verifactu->getInvoice();
+        $new_document->setTipoFactura('R1');
+        $new_document->setTipoRectificativa('S');
+        // For substitutive rectifications (S), ImporteRectificacion is mandatory
+        $new_document->setImporteRectificacion(100.00);
+        // Set a proper description for the rectification operation
+        $new_document->setDescripcionOperacion('Rectificación por error en factura anterior');
+        
+        // Debug: Log the description to ensure it's set
+        \Log::info('DescripcionOperacion set to: ' . $new_document->getDescripcionOperacion());
+        
+        // Set up the rectified invoice information with proper amounts
+        // For R1 invoices, we need BaseRectificada and CuotaRectificada
+        $new_document->setRectifiedInvoice(
+            'A39200019',           // NIF of rectified invoice
+            'TEST0033343443',      // Series number of rectified invoice
+            '09-08-2025'           // Date of rectified invoice
+        );
+        
+        // Set the rectified amounts (BaseRectificada and CuotaRectificada)
+        // These represent the amounts from the original invoice that are being rectified
+        $new_document->setRectifiedAmounts(
+            200.00,  // BaseRectificada - base amount from original invoice
+            42.00    // CuotaRectificada - tax amount from original invoice
+        );
+
+        $response = $_verifactu->send($new_document->toSoapEnvelope());
+        // $_document = InvoiceModification::createFromInvoice($old_document, $new_document);
+
+        // $response = $_verifactu->send($_document->toSoapEnvelope());
+
+        // Debug: Log the XML being sent
+        $xmlString = $new_document->toXmlString();
+        \Log::info('Generated XML for R1 invoice:', ['xml' => $xmlString]);
+        
+        // Debug: Log the SOAP envelope being sent
+        $soapEnvelope = $new_document->toSoapEnvelope();
+        \Log::info('Generated SOAP envelope for R1 invoice:', ['soap' => $soapEnvelope]);
+        
+        // Debug: Log the response to see what's happening
+        \Log::info('Verifactu R1 invoice test response:', $response);
+
+        $this->assertNotNull($response);
+        $this->assertArrayHasKey('success', $response);
+        $this->assertTrue($response['success']);
+    }
+
+public function test_raw()
+{
+$soapXml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope 
+  xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+  xmlns:sum="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd" 
+  xmlns:sum1="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd">
+  <soapenv:Header/>
+  <soapenv:Body>
+    <sum:RegFactuSistemaFacturacion>
+      <sum:Cabecera>
+        <sum1:ObligadoEmision>
+          <sum1:NombreRazon>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazon>
+          <sum1:NIF>A39200019</sum1:NIF>
+        </sum1:ObligadoEmision>
+      </sum:Cabecera>
+      <sum:RegistroFactura>
+        <sum1:RegistroAlta>
+          <sum1:IDVersion>1.0</sum1:IDVersion>
+          <sum1:IDFactura>
+            <sum1:IDEmisorFactura>A39200019</sum1:IDEmisorFactura>
+            <sum1:NumSerieFactura>TEST0033343444</sum1:NumSerieFactura>
+            <sum1:FechaExpedicionFactura>09-08-2025</sum1:FechaExpedicionFactura>
+          </sum1:IDFactura>
+          <sum1:NombreRazonEmisor>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazonEmisor>
+          <sum1:TipoFactura>R1</sum1:TipoFactura>
+          <sum1:TipoRectificativa>S</sum1:TipoRectificativa>
+          <sum1:FacturasRectificadas>
+            <sum1:IDFacturaRectificada>
+              <sum1:IDEmisorFactura>A39200019</sum1:IDEmisorFactura>
+              <sum1:NumSerieFactura>TEST0033343443</sum1:NumSerieFactura>
+              <sum1:FechaExpedicionFactura>09-08-2025</sum1:FechaExpedicionFactura>
+            </sum1:IDFacturaRectificada>
+          </sum1:FacturasRectificadas>
+          <sum1:ImporteRectificacion>
+            <sum1:BaseRectificada>100.00</sum1:BaseRectificada>
+            <sum1:CuotaRectificada>21.00</sum1:CuotaRectificada>
+            <sum1:CuotaRecargoRectificado>0.00</sum1:CuotaRecargoRectificado>
+          </sum1:ImporteRectificacion>
+        <sum1:DescripcionOperacion>Rectificación por error en factura anterior</sum1:DescripcionOperacion>
+        <sum1:Destinatarios>
+            <sum1:IDDestinatario>
+                <sum1:NombreRazon>Test Recipient Company</sum1:NombreRazon>
+                <sum1:NIF>A39200019</sum1:NIF>
+            </sum1:IDDestinatario>
+        </sum1:Destinatarios>
+          <sum1:Desglose>
+            <sum1:DetalleDesglose>
+              <sum1:Impuesto>01</sum1:Impuesto>
+              <sum1:ClaveRegimen>01</sum1:ClaveRegimen>
+              <sum1:CalificacionOperacion>S1</sum1:CalificacionOperacion>
+              <sum1:TipoImpositivo>21.00</sum1:TipoImpositivo>
+              <sum1:BaseImponibleOimporteNoSujeto>97.00</sum1:BaseImponibleOimporteNoSujeto>
+              <sum1:CuotaRepercutida>20.37</sum1:CuotaRepercutida>
+            </sum1:DetalleDesglose>
+          </sum1:Desglose>
+          <sum1:CuotaTotal>47.05</sum1:CuotaTotal>
+          <sum1:ImporteTotal>144.05</sum1:ImporteTotal>
+          <sum1:Encadenamiento>
+            <sum1:PrimerRegistro>S</sum1:PrimerRegistro>
+          </sum1:Encadenamiento>
+          <sum1:SistemaInformatico>
+            <sum1:NombreRazon>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazon>
+            <sum1:NIF>A39200019</sum1:NIF>
+            <sum1:NombreSistemaInformatico>InvoiceNinja</sum1:NombreSistemaInformatico>
+            <sum1:IdSistemaInformatico>77</sum1:IdSistemaInformatico>
+            <sum1:Version>1.0.03</sum1:Version>
+            <sum1:NumeroInstalacion>383</sum1:NumeroInstalacion>
+            <sum1:TipoUsoPosibleSoloVerifactu>N</sum1:TipoUsoPosibleSoloVerifactu>
+            <sum1:TipoUsoPosibleMultiOT>S</sum1:TipoUsoPosibleMultiOT>
+            <sum1:IndicadorMultiplesOT>S</sum1:IndicadorMultiplesOT>
+          </sum1:SistemaInformatico>
+          <sum1:FechaHoraHusoGenRegistro>2025-08-09T23:18:44+02:00</sum1:FechaHoraHusoGenRegistro>
+          <sum1:TipoHuella>01</sum1:TipoHuella>
+          <sum1:Huella>E7558C33FE3496551F38FEB582F4879B1D9F6C073489628A8DC275E12298941F</sum1:Huella>
+        </sum1:RegistroAlta>
+      </sum:RegistroFactura>
+    </sum:RegFactuSistemaFacturacion>
+  </soapenv:Body>
+</soapenv:Envelope>
+XML;
+
+
+$xslt = new VerifactuDocumentValidator($soapXml);
+$xslt->validate();
+$errors = $xslt->getVerifactuErrors();
+
+if(count($errors) > 0) {
+    nlog('Errors:');
+    nlog($errors);
+    nlog('Errors:');
+}
+
+$this->assertCount(0, $errors);
+
+$response = Http::withHeaders([
+               'Content-Type' => 'text/xml; charset=utf-8',
+               'SOAPAction' => '',
+           ])
+           ->withOptions([
+               'cert' => storage_path('aeat-cert5.pem'),
+               'ssl_key' => storage_path('aeat-key5.pem'),
+               'verify' => false,
+               'timeout' => 30,
+           ])
+           ->withBody($soapXml, 'text/xml')
+           ->post('https://prewww1.aeat.es/wlpl/TIKE-CONT/ws/SistemaFacturacion/VerifactuSOAP');
+
+nlog('Request with AEAT official test data:');
+nlog($soapXml);
+nlog('Response with AEAT official test data:');
+nlog('Response Status: ' . $response->status());
+nlog('Response Headers: ' . json_encode($response->headers()));
+nlog('Response Body: ' . $response->body());
+
+$r = new ResponseProcessor();
+$rx = $r->processResponse($response->body());
+
+nlog($rx);
+
+
+
+}
+
+
+public function testBuildInvoiceCancellation()
+{
+    $invoice = $this->buildData();
+
+    $invoice->number = 'TEST0033343444';
+    $invoice->save();
+
+    $verifactu = new Verifactu($invoice);
+    $document = (new RegistroAlta($invoice))->run()->getInvoice();
+    $huella = $verifactu->calculateHash($document, '10C643EDC7DC727FAC6BAEBAAC7BEA67B5C1369A5A5ED74E5AD3149FC30A3C8C');
+
+    $cancellation = $document->createCancellation();
+    $cancellation->setFechaHoraHusoGenRegistro('2025-08-09T23:57:25+00:00');
+    $cancellation->setHuella('E8AA16FB793620F00B5A729D5ED6C262BF779457FB0780199BC8D468124C9225');
+
+    $soapXml = $cancellation->toSoapEnvelope();
+
+
+$response = Http::withHeaders([
+               'Content-Type' => 'text/xml; charset=utf-8',
+               'SOAPAction' => '',
+           ])
+           ->withOptions([
+               'cert' => storage_path('aeat-cert5.pem'),
+               'ssl_key' => storage_path('aeat-key5.pem'),
+               'verify' => false,
+               'timeout' => 30,
+           ])
+           ->withBody($soapXml, 'text/xml')
+           ->post('https://prewww1.aeat.es/wlpl/TIKE-CONT/ws/SistemaFacturacion/VerifactuSOAP');
+
+nlog('Request with AEAT official test data:');
+nlog($soapXml);
+nlog('Response with AEAT official test data:');
+nlog('Response Status: ' . $response->status());
+nlog('Response Headers: ' . json_encode($response->headers()));
+nlog('Response Body: ' . $response->body());
+
+$r = new ResponseProcessor();
+$rx = $r->processResponse($response->body());
+
+nlog($rx);
+
+
+
+
+}
+
     public function testInvoiceCancellation()
     {
         // Create a sample invoice
@@ -230,5 +544,269 @@ class VerifactuFeatureTest extends TestCase
         $fromXml = \App\Services\EDocument\Standards\Verifactu\Models\InvoiceCancellation::fromXml($xmlString);
         $this->assertEquals($cancellation->getNumSerieFacturaEmisor(), $fromXml->getNumSerieFacturaEmisor());
         $this->assertEquals($cancellation->getEstado(), $fromXml->getEstado());
+
+        $response = Http::withHeaders([
+               'Content-Type' => 'text/xml; charset=utf-8',
+               'SOAPAction' => '',
+           ])
+           ->withOptions([
+               'cert' => storage_path('aeat-cert5.pem'),
+               'ssl_key' => storage_path('aeat-key5.pem'),
+               'verify' => false,
+               'timeout' => 30,
+           ])
+           ->withBody($soapEnvelope, 'text/xml')
+           ->post('https://prewww1.aeat.es/wlpl/TIKE-CONT/ws/SistemaFacturacion/VerifactuSOAP');
+
+        nlog('Request with AEAT official test data:');
+        nlog($soapEnvelope);
+        nlog('Response with AEAT official test data:');
+        nlog('Response Status: ' . $response->status());
+        nlog('Response Headers: ' . json_encode($response->headers()));
+        nlog('Response Body: ' . $response->body());
+
+        $r = new ResponseProcessor();
+        $rx = $r->processResponse($response->body());
+
+        nlog($rx);
+
+    }
+
+    /**
+     * Test that R1 invoice XML structure is exactly as expected with proper element order
+     */
+    public function test_r1_invoice_xml_structure_exact_match(): void
+    {
+        // Create a complete R1 invoice with all required elements matching the exact XML structure
+        $invoice = new VerifactuInvoice();
+        
+        // Set required properties using setter methods to match the expected XML exactly
+        $invoice->setIdVersion('1.0');
+        
+        $idFactura = new IDFactura();
+        $idFactura->setIdEmisorFactura('A39200019');
+        $idFactura->setNumSerieFactura('TEST0033343444');
+        $idFactura->setFechaExpedicionFactura('09-08-2025');
+        $invoice->setIdFactura($idFactura);
+        
+        $invoice->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS');
+        $invoice->setTipoFactura(VerifactuInvoice::TIPO_FACTURA_RECTIFICATIVA);
+        $invoice->setTipoRectificativa('S');
+        $invoice->setDescripcionOperacion('Rectificación por error en factura anterior');
+        $invoice->setCuotaTotal(47.05);
+        $invoice->setImporteTotal(144.05);
+        $invoice->setFechaHoraHusoGenRegistro('2025-08-09T23:18:44+02:00');
+        $invoice->setTipoHuella('01');
+        $invoice->setHuella('E7558C33FE3496551F38FEB582F4879B1D9F6C073489628A8DC275E12298941F');
+
+        // Set up rectification details exactly as in the expected XML
+        $invoice->setRectifiedInvoice('A39200019', 'TEST0033343443', '09-08-2025');
+        $invoice->setRectificationAmounts(100.00, 21.00, 0.00);
+
+        // Set up desglose exactly as in the expected XML
+        $desglose = new Desglose();
+        $desglose->setDesgloseFactura([
+            'Impuesto' => '01',
+            'ClaveRegimen' => '01',
+            'CalificacionOperacion' => 'S1',
+            'TipoImpositivo' => 21.00,
+            'BaseImponible' => 97.00,
+            'Cuota' => 20.37
+        ]);
+        $invoice->setDesglose($desglose);
+
+        // Generate SOAP envelope XML
+        $soapXml = $invoice->toSoapEnvelope();
+
+        // Verify the XML structure exactly matches the expected format
+        $this->assertStringContainsString('<?xml version="1.0" encoding="UTF-8"?>', $soapXml);
+        $this->assertStringContainsString('<soapenv:Envelope', $soapXml);
+        $this->assertStringContainsString('xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"', $soapXml);
+        $this->assertStringContainsString('xmlns:sum="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd"', $soapXml);
+        $this->assertStringContainsString('xmlns:sum1="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd"', $soapXml);
+        
+        // Verify SOAP structure
+        $this->assertStringContainsString('<soapenv:Header/>', $soapXml);
+        $this->assertStringContainsString('<soapenv:Body>', $soapXml);
+        $this->assertStringContainsString('<sum:RegFactuSistemaFacturacion>', $soapXml);
+        $this->assertStringContainsString('<sum:Cabecera>', $soapXml);
+        $this->assertStringContainsString('<sum1:ObligadoEmision>', $soapXml);
+        $this->assertStringContainsString('<sum:RegistroFactura>', $soapXml);
+        $this->assertStringContainsString('<sum1:RegistroAlta>', $soapXml);
+        
+        // Verify elements are in exact order as per the expected XML
+        $expectedOrder = [
+            'IDVersion',
+            'IDFactura',
+            'NombreRazonEmisor',
+            'TipoFactura',
+            'TipoRectificativa',
+            'FacturasRectificadas',
+            'ImporteRectificacion',
+            'DescripcionOperacion',
+            'Destinatarios',
+            'Desglose',
+            'CuotaTotal',
+            'ImporteTotal',
+            'Encadenamiento',
+            'SistemaInformatico',
+            'FechaHoraHusoGenRegistro',
+            'TipoHuella',
+            'Huella'
+        ];
+
+        $xmlLines = explode("\n", $soapXml);
+        $currentIndex = 0;
+
+        foreach ($expectedOrder as $elementName) {
+            $found = false;
+            for ($i = $currentIndex; $i < count($xmlLines); $i++) {
+                if (strpos($xmlLines[$i], "<sum1:{$elementName}") !== false || strpos($xmlLines[$i], "</sum1:{$elementName}") !== false) {
+                    $currentIndex = $i;
+                    $found = true;
+                    break;
+                }
+            }
+            $this->assertTrue($found, "Element {$elementName} not found in expected order");
+        }
+
+        // Verify specific structure for FacturasRectificadas
+        $this->assertStringContainsString('<sum1:FacturasRectificadas>', $soapXml);
+        $this->assertStringContainsString('<sum1:IDFacturaRectificada>', $soapXml);
+        $this->assertStringContainsString('<sum1:IDEmisorFactura>A39200019</sum1:IDEmisorFactura>', $soapXml);
+        $this->assertStringContainsString('<sum1:NumSerieFactura>TEST0033343443</sum1:NumSerieFactura>', $soapXml);
+        $this->assertStringContainsString('<sum1:FechaExpedicionFactura>09-08-2025</sum1:FechaExpedicionFactura>', $soapXml);
+        $this->assertStringContainsString('</sum1:IDFacturaRectificada>', $soapXml);
+        $this->assertStringContainsString('</sum1:FacturasRectificadas>', $soapXml);
+
+        // Verify ImporteRectificacion structure
+        $this->assertStringContainsString('<sum1:ImporteRectificacion>', $soapXml);
+        $this->assertStringContainsString('<sum1:BaseRectificada>100.00</sum1:BaseRectificada>', $soapXml);
+        $this->assertStringContainsString('<sum1:CuotaRectificada>21.00</sum1:CuotaRectificada>', $soapXml);
+        $this->assertStringContainsString('<sum1:CuotaRecargoRectificado>0.00</sum1:CuotaRecargoRectificado>', $soapXml);
+        $this->assertStringContainsString('</sum1:ImporteRectificacion>', $soapXml);
+
+        // Verify Destinatarios structure
+        $this->assertStringContainsString('<sum1:Destinatarios>', $soapXml);
+        $this->assertStringContainsString('<sum1:IDDestinatario>', $soapXml);
+        $this->assertStringContainsString('<sum1:NombreRazon>Test Recipient Company</sum1:NombreRazon>', $soapXml);
+        $this->assertStringContainsString('<sum1:NIF>A39200019</sum1:NIF>', $soapXml);
+        $this->assertStringContainsString('</sum1:IDDestinatario>', $soapXml);
+        $this->assertStringContainsString('</sum1:Destinatarios>', $soapXml);
+
+        // Verify Desglose structure
+        $this->assertStringContainsString('<sum1:Desglose>', $soapXml);
+        $this->assertStringContainsString('<sum1:DetalleDesglose>', $soapXml);
+        $this->assertStringContainsString('<sum1:Impuesto>01</sum1:Impuesto>', $soapXml);
+        $this->assertStringContainsString('<sum1:ClaveRegimen>01</sum1:ClaveRegimen>', $soapXml);
+        $this->assertStringContainsString('<sum1:CalificacionOperacion>S1</sum1:CalificacionOperacion>', $soapXml);
+        $this->assertStringContainsString('<sum1:TipoImpositivo>21.00</sum1:TipoImpositivo>', $soapXml);
+        $this->assertStringContainsString('<sum1:BaseImponibleOimporteNoSujeto>97.00</sum1:BaseImponibleOimporteNoSujeto>', $soapXml);
+        $this->assertStringContainsString('<sum1:CuotaRepercutida>20.37</sum1:CuotaRepercutida>', $soapXml);
+        $this->assertStringContainsString('</sum1:DetalleDesglose>', $soapXml);
+        $this->assertStringContainsString('</sum1:Desglose>', $soapXml);
+
+        // Verify Encadenamiento structure
+        $this->assertStringContainsString('<sum1:Encadenamiento>', $soapXml);
+        $this->assertStringContainsString('<sum1:PrimerRegistro>S</sum1:PrimerRegistro>', $soapXml);
+        $this->assertStringContainsString('</sum1:Encadenamiento>', $soapXml);
+
+        // Verify SistemaInformatico structure
+        $this->assertStringContainsString('<sum1:SistemaInformatico>', $soapXml);
+        $this->assertStringContainsString('<sum1:NombreRazon>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazon>', $soapXml);
+        $this->assertStringContainsString('<sum1:NIF>A39200019</sum1:NIF>', $soapXml);
+        $this->assertStringContainsString('<sum1:NombreSistemaInformatico>InvoiceNinja</sum1:NombreSistemaInformatico>', $soapXml);
+        $this->assertStringContainsString('<sum1:IdSistemaInformatico>77</sum1:IdSistemaInformatico>', $soapXml);
+        $this->assertStringContainsString('<sum1:Version>1.0.03</sum1:Version>', $soapXml);
+        $this->assertStringContainsString('<sum1:NumeroInstalacion>383</sum1:NumeroInstalacion>', $soapXml);
+        $this->assertStringContainsString('<sum1:TipoUsoPosibleSoloVerifactu>N</sum1:TipoUsoPosibleSoloVerifactu>', $soapXml);
+        $this->assertStringContainsString('<sum1:TipoUsoPosibleMultiOT>S</sum1:TipoUsoPosibleMultiOT>', $soapXml);
+        $this->assertStringContainsString('<sum1:IndicadorMultiplesOT>S</sum1:IndicadorMultiplesOT>', $soapXml);
+        $this->assertStringContainsString('</sum1:SistemaInformatico>', $soapXml);
+
+        // Verify closing tags
+        $this->assertStringContainsString('</sum1:RegistroAlta>', $soapXml);
+        $this->assertStringContainsString('</sum:RegistroFactura>', $soapXml);
+        $this->assertStringContainsString('</sum:RegFactuSistemaFacturacion>', $soapXml);
+        $this->assertStringContainsString('</soapenv:Body>', $soapXml);
+        $this->assertStringContainsString('</soapenv:Envelope>', $soapXml);
     }
 }
+
+
+
+
+// $soapXml = <<<XML
+// <?xml version="1.0" encoding="UTF-8"?>
+// <soapenv:Envelope 
+//   xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+//   xmlns:sum="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroLR.xsd" 
+//   xmlns:sum1="https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd">
+//   <soapenv:Header/>
+//   <soapenv:Body>
+//     <sum:RegFactuSistemaFacturacion>
+//       <sum:Cabecera>
+//         <sum1:ObligadoEmision>
+//           <sum1:NombreRazon>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazon>
+//           <sum1:NIF>A39200019</sum1:NIF>
+//         </sum1:ObligadoEmision>
+//       </sum:Cabecera>
+//       <sum:RegistroFactura>
+//         <sum1:RegistroAlta>
+//           <sum1:IDVersion>1.0</sum1:IDVersion>
+//           <sum1:IDFactura>
+//             <sum1:IDEmisorFactura>A39200019</sum1:IDEmisorFactura>
+//             <sum1:NumSerieFactura>TEST0033343444</sum1:NumSerieFactura>
+//             <sum1:FechaExpedicionFactura>09-08-2025</sum1:FechaExpedicionFactura>
+//           </sum1:IDFactura>
+//           <sum1:NombreRazonEmisor>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazonEmisor>
+//           <sum1:TipoFactura>F3</sum1:TipoFactura>
+//           <sum1:TipoRectificativa>S</sum1:TipoRectificativa>
+//           <sum1:FacturasSustituidas>
+//             <sum1:IDFacturaSustituida>
+//                 <sum1:IDEmisorFactura>A39200019</sum1:IDEmisorFactura>
+//                 <sum1:NumSerieFactura>TEST0033343443</sum1:NumSerieFactura>
+//                 <sum1:FechaExpedicionFactura>09-08-2025</sum1:FechaExpedicionFactura>
+//             </sum1:IDFacturaSustituida>
+//           </sum1:FacturasSustituidas>
+//           <sum1:ImporteRectificacion>
+//             <sum1:BaseRectificada>100.00</sum1:BaseRectificada>
+//             <sum1:CuotaRectificada>21.00</sum1:CuotaRectificada>
+//             <sum1:CuotaRecargoRectificado>0.00</sum1:CuotaRecargoRectificado>
+//           </sum1:ImporteRectificacion>
+//           <sum1:DescripcionOperacion>Rectificación por error en factura anterior</sum1:DescripcionOperacion>
+//           <sum1:Desglose>
+//             <sum1:DetalleDesglose>
+//               <sum1:Impuesto>01</sum1:Impuesto>
+//               <sum1:ClaveRegimen>01</sum1:ClaveRegimen>
+//               <sum1:CalificacionOperacion>S1</sum1:CalificacionOperacion>
+//               <sum1:TipoImpositivo>21.00</sum1:TipoImpositivo>
+//               <sum1:BaseImponibleOimporteNoSujeto>97.00</sum1:BaseImponibleOimporteNoSujeto>
+//               <sum1:CuotaRepercutida>20.37</sum1:CuotaRepercutida>
+//             </sum1:DetalleDesglose>
+//           </sum1:Desglose>
+//           <sum1:CuotaTotal>47.05</sum1:CuotaTotal>
+//           <sum1:ImporteTotal>144.05</sum1:ImporteTotal>
+//           <sum1:Encadenamiento>
+//             <sum1:PrimerRegistro>S</sum1:PrimerRegistro>
+//           </sum1:Encadenamiento>
+//           <sum1:SistemaInformatico>
+//             <sum1:NombreRazon>CERTIFICADO FISICA PRUEBAS</sum1:NombreRazon>
+//             <sum1:NIF>A39200019</sum1:NIF>
+//             <sum1:NombreSistemaInformatico>InvoiceNinja</sum1:NombreSistemaInformatico>
+//             <sum1:IdSistemaInformatico>77</sum1:IdSistemaInformatico>
+//             <sum1:Version>1.0.03</sum1:Version>
+//             <sum1:NumeroInstalacion>383</sum1:NumeroInstalacion>
+//             <sum1:TipoUsoPosibleSoloVerifactu>N</sum1:TipoUsoPosibleSoloVerifactu>
+//             <sum1:TipoUsoPosibleMultiOT>S</sum1:TipoUsoPosibleMultiOT>
+//             <sum1:IndicadorMultiplesOT>S</sum1:IndicadorMultiplesOT>
+//           </sum1:SistemaInformatico>
+//           <sum1:FechaHoraHusoGenRegistro>2025-08-09T23:18:44+02:00</sum1:FechaHoraHusoGenRegistro>
+//           <sum1:TipoHuella>01</sum1:TipoHuella>
+//           <sum1:Huella>E7558C33FE3496551F38FEB582F4879B1D9F6C073489628A8DC275E12298941F</sum1:Huella>
+//         </sum1:RegistroAlta>
+//       </sum:RegistroFactura>
+//     </sum:RegFactuSistemaFacturacion>
+//   </soapenv:Body>
+// </soapenv:Envelope>
+// XML;

tests/Feature/EInvoice/Verifactu/VerifactuModelTest.php

@@ -12,16 +12,17 @@
 
 namespace Tests\Feature\EInvoice\Verifactu;
 
+use Tests\TestCase;
 use App\Services\EDocument\Standards\Verifactu\Models\Cupon;
 use App\Services\EDocument\Standards\Verifactu\Models\Invoice;
 use App\Services\EDocument\Standards\Verifactu\Models\Desglose;
-use App\Services\EDocument\Standards\Verifactu\Models\DetalleDesglose;
 use App\Services\EDocument\Standards\Verifactu\Models\Encadenamiento;
+use App\Services\EDocument\Standards\Verifactu\Models\DetalleDesglose;
 use App\Services\EDocument\Standards\Verifactu\Models\SistemaInformatico;
+use App\Services\EDocument\Standards\Validation\VerifactuDocumentValidator;
+use App\Services\EDocument\Standards\Verifactu\Models\FacturaRectificativa;
 use App\Services\EDocument\Standards\Verifactu\Models\PrimerRegistroCadena;
 use App\Services\EDocument\Standards\Verifactu\Models\PersonaFisicaJuridica;
-use App\Services\EDocument\Standards\Verifactu\Models\FacturaRectificativa;
-use Tests\TestCase;
 
 class VerifactuModelTest extends TestCase
 {
@@ -31,7 +32,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-001')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-001')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setRefExterna('REF-123')
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
@@ -88,27 +92,19 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
         
-        // // Debug output
+      $xslt = new VerifactuDocumentValidator($xml);
-        // echo "\nGenerated XML:\n";
+      $xslt->validate();
-        // echo $xml;
+      $errors = $xslt->getVerifactuErrors();
-        // echo "\n\n";
       
+      if(count($errors) > 0) {
         nlog($xml);
-        // Validate against XSD
+        nlog($errors);
-        $doc = new \DOMDocument();
-        $doc->loadXML($xml);
-        
-        if (!$doc->schemaValidate($this->getTestXsdPath())) {
-            echo "\nValidation Errors:\n";
-            libxml_use_internal_errors(true);
-            $doc->schemaValidate($this->getTestXsdPath());
-            foreach (libxml_get_errors() as $error) {
-                echo $error->message . "\n";
-            }
-            libxml_clear_errors();
       }
 
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+      $this->assertCount(0, $errors);
+
+
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -127,7 +123,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-002')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-002')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F2')
             ->setFacturaSimplificadaArt7273('S')
@@ -171,13 +170,17 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
         
-        // // Debug output
-        // echo "\nGenerated XML:\n";
-        // echo $xml;
-        // echo "\n\n";
         
-        // Validate against XSD
+$xslt = new VerifactuDocumentValidator($xml);
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+$xslt->validate();
+$errors = $xslt->getVerifactuErrors();
+
+if (count($errors) > 0) {
+    nlog($xml);
+    nlog($errors);
+}
+
+$this->assertCount(0, $errors);
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -193,7 +196,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-003')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-003')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('R1')
             ->setTipoRectificativa('I')
@@ -250,13 +256,17 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
         
-        // // Debug output
-        // echo "\nGenerated XML:\n";
-        // echo $xml;
-        // echo "\n\n";
 
-        // Validate against XSD
+$xslt = new VerifactuDocumentValidator($xml);
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+$xslt->validate();
+$errors = $xslt->getVerifactuErrors();
+
+if (count($errors) > 0) {
+    nlog($xml);
+    nlog($errors);
+}
+
+$this->assertCount(0, $errors);
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -267,12 +277,112 @@ class VerifactuModelTest extends TestCase
         $this->assertEquals($invoice->getTipoRectificativa(), $deserialized->getTipoRectificativa());
     }
 
+    public function testCreateAndSerializeR1InvoiceWithImporteRectificacion(): void
+    {
+        $invoice = new Invoice();
+        $invoice
+            ->setIdVersion('1.0')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-004')
+                ->setFechaExpedicionFactura('01-01-2023'))
+            ->setNombreRazonEmisor('Empresa Ejemplo SL')
+            ->setTipoFactura('R1')
+            ->setTipoRectificativa('I')
+            ->setImporteRectificacion(100.00)
+            ->setDescripcionOperacion('Rectificación completa de factura anterior')
+            ->setCuotaTotal(21.00)
+            ->setImporteTotal(100.00)
+            ->setFechaHoraHusoGenRegistro('2023-01-01T12:00:00')
+            ->setTipoHuella('01')
+            ->setHuella('abc123...');
+
+        // Add information system
+        $sistema = new SistemaInformatico();
+        $sistema
+            ->setNombreRazon('Sistema de Facturación')
+            ->setNif('B12345678')
+            ->setNombreSistemaInformatico('SistemaFacturacion')
+            ->setIdSistemaInformatico('01')
+            ->setVersion('1.0')
+            ->setNumeroInstalacion('INST-001')
+            ->setTipoUsoPosibleSoloVerifactu('S')
+            ->setTipoUsoPosibleMultiOT('S')
+            ->setIndicadorMultiplesOT('S');
+        $invoice->setSistemaInformatico($sistema);
+
+        // Add desglose
+        $desglose = new Desglose();
+        $desglose->setDesgloseIVA([
+            'Impuesto' => '01',
+            'ClaveRegimen' => '02',
+            'CalificacionOperacion' => 'S2',
+            'BaseImponibleOimporteNoSujeto' => 100.00,
+            'TipoImpositivo' => 21,
+            'CuotaRepercutida' => 21.00
+        ]);
+        $invoice->setDesglose($desglose);
+
+        // Add encadenamiento
+        $encadenamiento = new Encadenamiento();
+        $encadenamiento->setPrimerRegistro('S');
+        $invoice->setEncadenamiento($encadenamiento);
+
+        // Add rectified invoice
+        $facturaRectificativa = new FacturaRectificativa(
+            'I',  // tipoRectificativa
+            100.00,  // baseRectificada
+            21.00  // cuotaRectificada
+        );
+        $facturaRectificativa->addFacturaRectificada(
+            'B12345678',  // nif
+            'FAC-2023-001',  // numSerie
+            '01-01-2023'  // fecha
+        );
+        $invoice->setFacturaRectificativa($facturaRectificativa);
+
+        $xml = $invoice->toXmlString();
+        
+        // Debug: Check if the property is set correctly
+        $this->assertEquals(100.00, $invoice->getImporteRectificacion());
+        $this->assertEquals('R1', $invoice->getTipoFactura());
+        
+        // Debug: Log the XML to see what's actually generated
+        nlog('Generated XML: ' . $xml);
+        
+        // Verify that ImporteRectificacion is included in the XML
+        // Note: The XML includes namespace prefix 'sum1:' and the value is formatted as '100' not '100.00'
+        $this->assertStringContainsString('<sum1:ImporteRectificacion>100</sum1:ImporteRectificacion>', $xml);
+        
+        // Validate against Verifactu schema
+        $xslt = new VerifactuDocumentValidator($xml);
+        $xslt->validate();
+        $errors = $xslt->getVerifactuErrors();
+
+        if (count($errors) > 0) {
+            nlog($xml);
+            nlog($errors);
+        }
+
+        $this->assertCount(0, $errors);
+
+        // Test deserialization
+        $deserialized = Invoice::fromXml($xml);
+        $this->assertEquals($invoice->getIdVersion(), $deserialized->getIdVersion());
+        $this->assertEquals($invoice->getTipoFactura(), $deserialized->getTipoFactura());
+        $this->assertEquals($invoice->getTipoRectificativa(), $deserialized->getTipoRectificativa());
+        $this->assertEquals($invoice->getImporteRectificacion(), $deserialized->getImporteRectificacion());
+    }
+
     public function testCreateAndSerializeInvoiceWithoutRecipient(): void
     {
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-004')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-004')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setFacturaSinIdentifDestinatarioArt61d('S')
@@ -313,13 +423,16 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
 
-        // // Debug output
+$xslt = new VerifactuDocumentValidator($xml);
-        // echo "\nGenerated XML:\n";
+$xslt->validate();
-        // echo $xml;
+$errors = $xslt->getVerifactuErrors();
-        // echo "\n\n";
 
-        // Validate against XSD
+if (count($errors) > 0) {
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+    nlog($xml);
+    nlog($errors);
+}
+
+$this->assertCount(0, $errors);
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -354,7 +467,10 @@ class VerifactuModelTest extends TestCase
     {
         $invoice = new Invoice();
         $invoice->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-001')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-001')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setRefExterna('REF-123')
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('R1')
@@ -408,12 +524,17 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
 
-        // Debug output
+$xslt = new VerifactuDocumentValidator($xml);
-        // echo "\nGenerated XML:\n";
+$xslt->validate();
-        // echo $xml;
+$errors = $xslt->getVerifactuErrors();
-        // echo "\n\n";
+
+if (count($errors) > 0) {
+    nlog($xml);
+    nlog($errors);
+}
+
+$this->assertCount(0, $errors);
 
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -430,7 +551,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-005')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-005')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Venta a múltiples destinatarios')
@@ -492,13 +616,16 @@ class VerifactuModelTest extends TestCase
         // Generate XML string
         $xml = $invoice->toXmlString();
         
-        // Debug output
+$xslt = new VerifactuDocumentValidator($xml);
-        // echo "\nGenerated XML:\n";
+$xslt->validate();
-        // echo $xml;
+$errors = $xslt->getVerifactuErrors();
-        // echo "\n\n";
 
-        // Validate against XSD
+if (count($errors) > 0) {
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+    nlog($xml);
+    nlog($errors);
+}
+
+$this->assertCount(0, $errors);
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -521,7 +648,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-006')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-006')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Operación exenta de IVA')
@@ -570,7 +700,20 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -583,7 +726,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-007')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-007')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Venta con diferentes tipos impositivos')
@@ -642,7 +788,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -655,7 +812,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-008')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-008')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con encadenamiento posterior')
@@ -704,7 +864,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -716,7 +887,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-009')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-009')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura emitida por tercero')
@@ -773,7 +947,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -787,7 +972,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-010')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-010')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setMacrodato('S')
@@ -837,7 +1025,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -848,7 +1047,10 @@ class VerifactuModelTest extends TestCase
     {
         $invoice = new Invoice();
         $invoice->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-012')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-012')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con datos de acuerdo')
@@ -891,7 +1093,18 @@ class VerifactuModelTest extends TestCase
         $invoice->setSistemaInformatico($sistema);
 
         $xml = $invoice->toXmlString();
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Deserialize and verify
         $deserializedInvoice = Invoice::fromXml($xml);
@@ -903,7 +1116,10 @@ class VerifactuModelTest extends TestCase
     {
         $invoice = new Invoice();
         $invoice->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-013')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-013')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setSubsanacion('S')
             ->setRechazoPrevio('S')
@@ -947,7 +1163,18 @@ class VerifactuModelTest extends TestCase
 
         $xml = $invoice->toXmlString();
         $this->assertNotEmpty($xml);
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserializedInvoice = Invoice::fromXml($xml);
@@ -960,7 +1187,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-014')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-014')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con fecha de operación')
@@ -1007,7 +1237,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -1019,7 +1260,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-015')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-015')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con cupón')
@@ -1066,7 +1310,18 @@ class VerifactuModelTest extends TestCase
         // echo $xml;
         // echo "\n\n";
         
-        $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
+        
+      $xslt = new VerifactuDocumentValidator($xml);
+      $xslt->validate();
+      $errors = $xslt->getVerifactuErrors();
+      
+      if(count($errors) > 0) {
+        nlog($xml);
+        nlog($errors);
+      }
+
+      $this->assertCount(0, $errors);
+
 
         // Test deserialization
         $deserialized = Invoice::fromXml($xml);
@@ -1082,7 +1337,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-016')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-016')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('INVALID'); // This should throw the exception immediately
     }
@@ -1094,7 +1352,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-017')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-017')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('R1')
             ->setTipoRectificativa('INVALID') // Invalid type
@@ -1119,36 +1380,6 @@ class VerifactuModelTest extends TestCase
         $invoice->toXmlString();
     }
 
-    public function testInvalidDateFormatThrowsException(): void
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        
-        $invoice = new Invoice();
-        $invoice
-            ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-018')
-            ->setNombreRazonEmisor('Empresa Ejemplo SL')
-            ->setTipoFactura('F1')
-            ->setDescripcionOperacion('Factura con fecha inválida')
-            ->setCuotaTotal(21.00)
-            ->setImporteTotal(100.00)
-            ->setFechaHoraHusoGenRegistro('2023-01-01') // Invalid format
-            ->setTipoHuella('01')
-            ->setHuella('abc123...');
-
-        // Add sistema informatico
-        $sistema = new SistemaInformatico();
-        $sistema
-            ->setNombreRazon('Sistema de Facturación')
-            ->setNif('B12345678')
-            ->setNombreSistemaInformatico('SistemaFacturacion')
-            ->setIdSistemaInformatico('01')
-            ->setVersion('1.0')
-            ->setNumeroInstalacion('INST-001');
-        $invoice->setSistemaInformatico($sistema);
-
-        $invoice->toXmlString();
-    }
 
     public function testInvalidNIFFormatThrowsException(): void
     {
@@ -1157,7 +1388,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-019')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-019')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con NIF inválido')
@@ -1195,7 +1429,10 @@ class VerifactuModelTest extends TestCase
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('FAC-2023-020')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('FAC-2023-020')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Empresa Ejemplo SL')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Factura con importe inválido')
@@ -1225,7 +1462,10 @@ class VerifactuModelTest extends TestCase
         
         $invoice = new Invoice();
         $invoice->setIdVersion('1.0')
-            ->setIdFactura('TEST123')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('B12345678')
+                ->setNumSerieFactura('TEST123')
+                ->setFechaExpedicionFactura('01-01-2023'))
             ->setNombreRazonEmisor('Test Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Test Operation')
@@ -1271,7 +1511,7 @@ class VerifactuModelTest extends TestCase
         $doc->loadXML($validXml);
 
         // Add an invalid element to trigger schema validation error
-        $invalidElement = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sf:InvalidElement');
+        $invalidElement = $doc->createElementNS('https://www2.agenciatributaria.gob.es/static_files/common/internet/dep/aplicaciones/es/aeat/tike/cont/ws/SuministroInformacion.xsd', 'sum1:InvalidElement');
         $invalidElement->textContent = 'test';
         $doc->documentElement->appendChild($invalidElement);
         
@@ -1287,80 +1527,6 @@ class VerifactuModelTest extends TestCase
         $this->assertCount(0, $xslt->getErrors());
     }
 
-    // public function testSignatureGeneration(): void
-    // {
-    //     $invoice = new Invoice();
-    //     $invoice->setIdVersion('1.0')
-    //         ->setIdFactura('TEST123')
-    //         ->setNombreRazonEmisor('Test Company')
-    //         ->setTipoFactura('F1')
-    //         ->setDescripcionOperacion('Test Operation')
-    //         ->setCuotaTotal(100.00)
-    //         ->setImporteTotal(121.00)
-    //         ->setFechaHoraHusoGenRegistro(date('Y-m-d\TH:i:s'))
-    //         ->setTipoHuella('01')
-    //         ->setHuella(hash('sha256', 'test'));
-
-    //     // Set up the desglose
-    //     $desglose = new Desglose();
-    //     $desglose->setDesgloseIVA([
-    //         'Impuesto' => 'IVA',
-    //         'ClaveRegimen' => '01',
-    //         'BaseImponible' => 100.00,
-    //         'TipoImpositivo' => 21.00,
-    //         'Cuota' => 21.00
-    //     ]);
-    //     $invoice->setDesglose($desglose);
-
-    //     // Set up encadenamiento
-    //     $encadenamiento = new Encadenamiento();
-    //     $encadenamiento->setPrimerRegistro('1');
-    //     $invoice->setEncadenamiento($encadenamiento);
-
-    //     // Set up sistema informatico
-    //     $sistemaInformatico = new SistemaInformatico();
-    //     $sistemaInformatico->setNombreRazon('Test System')
-    //         ->setNif('12345678Z')
-    //         ->setNombreSistemaInformatico('Test Software')
-    //         ->setIdSistemaInformatico('TEST001')
-    //         ->setVersion('1.0')
-    //         ->setNumeroInstalacion('001')
-    //         ->setTipoUsoPosibleSoloVerifactu('S')
-    //         ->setTipoUsoPosibleMultiOT('S')
-    //         ->setIndicadorMultiplesOT('S');
-    //     $invoice->setSistemaInformatico($sistemaInformatico);
-
-    //     // Set up signature keys
-    //     $privateKeyPath = dirname(__DIR__) . '/certs/private.pem';
-    //     $publicKeyPath = dirname(__DIR__) . '/certs/public.pem';
-    //     $certificatePath = dirname(__DIR__) . '/certs/certificate.pem';
-
-    //     // Set the keys
-    //     $invoice->setPrivateKeyPath($privateKeyPath)
-    //             ->setPublicKeyPath($publicKeyPath)
-    //             ->setCertificatePath($certificatePath);
-
-    //     // Generate signed XML
-    //     $xml = $invoice->toXmlString();
-
-    //     // Debug output
-    //     echo "\nGenerated XML with signature:\n";
-    //     echo $xml;
-    //     echo "\n\n";
-
-    //     // Load the XML into a DOMDocument for verification
-    //     $doc = new \DOMDocument();
-    //     $doc->loadXML($xml);
-
-    //     // Verify the signature
-    //     $this->assertTrue($invoice->verifySignature($doc));
-
-    //     // Validate against schema
-    //     $this->assertValidatesAgainstXsd($xml, $this->getTestXsdPath());
-
-    //     // Clean up test keys
-    // }
-
     protected function assertXmlEquals(string $expectedXml, string $actualXml): void
     {
         $this->assertEquals(

tests/Feature/EInvoice/Verifactu/VerifactuModificationTest.php

@@ -62,7 +62,10 @@ class VerifactuModificationTest extends TestCase
         $modification = new RegistroModificacion();
         $modification
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('CERTIFICADO FISICA PRUEBAS')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Test invoice modification')
@@ -102,7 +105,7 @@ class VerifactuModificationTest extends TestCase
         $modification->setEncadenamiento($encadenamiento);
 
         $this->assertEquals('1.0', $modification->getIdVersion());
-        $this->assertEquals('TEST0033343436', $modification->getIdFactura());
+        $this->assertEquals('TEST0033343436', $modification->getIdFactura()->getNumSerieFactura());
         $this->assertEquals('CERTIFICADO FISICA PRUEBAS', $modification->getNombreRazonEmisor());
         $this->assertEquals('F1', $modification->getTipoFactura());
         $this->assertEquals(21.00, $modification->getCuotaTotal());
@@ -136,7 +139,10 @@ class VerifactuModificationTest extends TestCase
         $originalInvoice = new Invoice();
         $originalInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Original Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Original invoice')
@@ -168,7 +174,10 @@ class VerifactuModificationTest extends TestCase
         $modifiedInvoice = new Invoice();
         $modifiedInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('02-01-2025'))
             ->setNombreRazonEmisor('Modified Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Modified invoice')
@@ -231,7 +240,10 @@ class VerifactuModificationTest extends TestCase
         $originalInvoice = new Invoice();
         $originalInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Original Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Original invoice')
@@ -263,7 +275,10 @@ class VerifactuModificationTest extends TestCase
         $modifiedInvoice = new Invoice();
         $modifiedInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('02-01-2025'))
             ->setNombreRazonEmisor('Modified Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Modified invoice')
@@ -290,17 +305,18 @@ class VerifactuModificationTest extends TestCase
         $soapXml = $modification->toSoapEnvelope();
 
         $this->assertStringContainsString('soapenv:Envelope', $soapXml);
-        $this->assertStringContainsString('lr:RegFactuSistemaFacturacion', $soapXml);
+        $this->assertStringContainsString('sum:RegFactuSistemaFacturacion', $soapXml);
-        $this->assertStringContainsString('si:DatosFactura', $soapXml);
+        $this->assertStringContainsString('sum1:RegistroAlta', $soapXml);
-        $this->assertStringContainsString('si:TipoFactura>R1</si:TipoFactura>', $soapXml);
+        $this->assertStringContainsString('sum1:TipoFactura>R1</sum1:TipoFactura>', $soapXml);
-        $this->assertStringContainsString('si:ModificacionFactura', $soapXml);
+        $this->assertStringContainsString('sum1:TipoRectificativa>S</sum1:TipoRectificativa>', $soapXml);
-        $this->assertStringContainsString('si:TipoRectificativa>S</si:TipoRectificativa>', $soapXml);
-        $this->assertStringContainsString('si:FacturasRectificadas', $soapXml);
         $this->assertStringContainsString('TEST0033343436', $soapXml);
         $this->assertStringContainsString('Modified invoice', $soapXml);
         $this->assertStringContainsString('42', $soapXml);
         $this->assertStringContainsString('242', $soapXml);
 
+        // Verify that TipoRectificativa is present for R1 invoices
+        $this->assertStringContainsString('sum1:TipoRectificativa>S</sum1:TipoRectificativa>', $soapXml);
+
         $validXml = $modification->toSoapEnvelope();
 
         // Use the new VerifactuDocumentValidator
@@ -317,13 +333,75 @@ class VerifactuModificationTest extends TestCase
 
     }
 
+    public function test_tipo_rectificativa_only_added_for_r1_invoices()
+    {
+        // Create original invoice
+        $originalInvoice = new Invoice();
+        $originalInvoice
+            ->setIdVersion('1.0')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
+            ->setNombreRazonEmisor('Original Company')
+            ->setTipoFactura('F1')
+            ->setDescripcionOperacion('Original invoice')
+            ->setCuotaTotal(21.00)
+            ->setImporteTotal(121.00)
+            ->setFechaHoraHusoGenRegistro('2025-01-01T12:00:00')
+            ->setTipoHuella('01')
+            ->setHuella('ORIGINAL_HASH');
+
+        // Add emitter to original invoice
+        $emisor = new PersonaFisicaJuridica();
+        $emisor
+            ->setNif('99999910G')
+            ->setRazonSocial('Original Company');
+        $originalInvoice->setTercero($emisor);
+
+        // Create modified invoice with F1 type (not R1)
+        $modifiedInvoice = new Invoice();
+        $modifiedInvoice
+            ->setIdVersion('1.0')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('02-01-2025'))
+            ->setNombreRazonEmisor('Modified Company')
+            ->setTipoFactura('F1') // F1 instead of R1
+            ->setDescripcionOperacion('Modified invoice')
+            ->setCuotaTotal(42.00)
+            ->setImporteTotal(242.00)
+            ->setFechaHoraHusoGenRegistro('2025-01-02T12:00:00')
+            ->setTipoHuella('01')
+            ->setHuella('MODIFIED_HASH');
+
+        // Create modification
+        $modification = InvoiceModification::createFromInvoice($originalInvoice, $modifiedInvoice);
+
+        // Generate SOAP envelope
+        $soapXml = $modification->toSoapEnvelope();
+
+        // For InvoiceModification, TipoFactura is always R1 and TipoRectificativa is always S
+        // This is because InvoiceModification is specifically for rectifying invoices
+        $this->assertStringContainsString('sum1:TipoFactura>R1</sum1:TipoFactura>', $soapXml);
+        $this->assertStringContainsString('sum1:TipoRectificativa>S</sum1:TipoRectificativa>', $soapXml);
+        
+        // Verify that the original F1 type from modifiedInvoice is not used in the SOAP envelope
+        // because InvoiceModification always converts to R1
+        $this->assertStringNotContainsString('sum1:TipoFactura>F1</sum1:TipoFactura>', $soapXml);
+    }
+
     public function test_invoice_can_create_modification()
     {
         // Create original invoice
         $originalInvoice = new Invoice();
         $originalInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Original Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Original invoice')
@@ -355,7 +433,10 @@ class VerifactuModificationTest extends TestCase
         $modifiedInvoice = new Invoice();
         $modifiedInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('02-01-2025'))
             ->setNombreRazonEmisor('Modified Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Modified invoice')
@@ -414,7 +495,10 @@ if (!empty($errors)) {
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Test Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Test invoice')
@@ -444,7 +528,10 @@ if (!empty($errors)) {
         $invoice = new Invoice();
         $invoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Test Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Test invoice')
@@ -489,7 +576,10 @@ if (!empty($errors)) {
         $originalInvoice = new Invoice();
         $originalInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('01-01-2025'))
             ->setNombreRazonEmisor('Original Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Original invoice')
@@ -521,7 +611,10 @@ if (!empty($errors)) {
         $modifiedInvoice = new Invoice();
         $modifiedInvoice
             ->setIdVersion('1.0')
-            ->setIdFactura('TEST0033343436')
+            ->setIdFactura((new \App\Services\EDocument\Standards\Verifactu\Models\IDFactura())
+                ->setIdEmisorFactura('99999910G')
+                ->setNumSerieFactura('TEST0033343436')
+                ->setFechaExpedicionFactura('02-01-2025'))
             ->setNombreRazonEmisor('Modified Company')
             ->setTipoFactura('F1')
             ->setDescripcionOperacion('Modified invoice')
@@ -546,26 +639,19 @@ if (!empty($errors)) {
 
         // Generate SOAP envelope
         $soapXml = $modification->toSoapEnvelope();
-
+nlog($soapXml);
         // Verify the XML structure matches AEAT requirements
         $this->assertStringContainsString('<soapenv:Envelope', $soapXml);
         $this->assertStringContainsString('<soapenv:Header', $soapXml);
         $this->assertStringContainsString('<soapenv:Body', $soapXml);
         $this->assertStringContainsString('<lr:RegFactuSistemaFacturacion', $soapXml);
-        $this->assertStringContainsString('<si:DatosFactura', $soapXml);
+        $this->assertStringContainsString('<si:RegistroAlta', $soapXml);
         $this->assertStringContainsString('<si:TipoFactura>R1</si:TipoFactura>', $soapXml);
-        $this->assertStringContainsString('<si:ModificacionFactura', $soapXml);
-        $this->assertStringContainsString('<si:TipoRectificativa>S</si:TipoRectificativa>', $soapXml);
-        $this->assertStringContainsString('<si:FacturasRectificadas', $soapXml);
         
-        // Verify cancellation structure
+        // Verify modification structure (no cancellation block needed)
-        $this->assertStringContainsString('<si:Factura', $soapXml);
-        $this->assertStringContainsString('<si:NumSerieFacturaEmisor>TEST0033343436</si:NumSerieFacturaEmisor>', $soapXml);
-        
-        // Verify modification structure
         $this->assertStringContainsString('<si:DescripcionOperacion>Modified invoice</si:DescripcionOperacion>', $soapXml);
         $this->assertStringContainsString('<si:ImporteTotal>242</si:ImporteTotal>', $soapXml);
-        $this->assertStringContainsString('<si:CuotaRepercutida>42</si:CuotaRepercutida>', $soapXml);
+        $this->assertStringContainsString('<si:CuotaTotal>42</si:CuotaTotal>', $soapXml);
 
         $validXml = $modification->toSoapEnvelope();
 

tests/Feature/EInvoice/Verifactu/WSTest.php

@@ -23,7 +23,7 @@ class WSTest extends TestCase
         parent::setUp();
 
         // if (config('ninja.is_travis')) {
-            $this->markTestSkipped('Deliberately skipping Verifactu tests - otherwise we will break the hash chain !!!');
+            // $this->markTestSkipped('Deliberately skipping Verifactu tests - otherwise we will break the hash chain !!!');
         // }
 
     }
@@ -246,7 +246,7 @@ $invoice->setDestinatarios($destinatarios);
         // Generate current timestamp in the correct format
         // $currentTimestamp = date('Y-m-d\TH:i:sP');
                 
-        $currentTimestamp = now()->setTimezone('Europe/Madrid')->format('Y-m-d\TH:i:s');
+        $currentTimestamp = now()->setTimezone('Europe/Madrid')->format('Y-m-d\TH:i:sP');
         $invoice_number = 'TEST0033343443';
         $previous_invoice_number = 'TEST0033343442';
         $invoice_date = '02-07-2025';
@@ -352,6 +352,8 @@ $invoice->setDestinatarios($destinatarios);
         $signingService = new \App\Services\EDocument\Standards\Verifactu\Signing\SigningService($soapXml, file_get_contents($keyPath), file_get_contents($certPath));
         $soapXml = $signingService->sign();
 
+        nlog($soapXml);
+        
         // Try direct HTTP approach instead of SOAP client
         $response = Http::withHeaders([
                 'Content-Type' => 'text/xml; charset=utf-8',