Version 2.6.3

Author: eclipxe13

composer.json

@@ -30,6 +30,7 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-soap": "*",
+        "ext-iconv": "*",
         "eclipxe/xmlresourceretriever": "^1.2",
         "eclipxe/xmlschemavalidator": "^2.0.1"
     },

docs/CHANGELOG.md

@@ -12,6 +12,19 @@
 - Remove `trigger_error` on `\CfdiUtils\Elements\Cfdi33\Comprobante::getCfdiRelacionados` when called with arguments.
 
 
+## Version 2.6.3 2018-08-21
+
+- Fix validations `COMPIMPUESTOSC02` and `COMPIMPUESTOSC03`
+    Previously both or any should exists (`xnor`): nodes `Traslado|Retencion` and attributes `TotalImpuestosTrasladados|TotalImpuestosRetenidos`
+    Now it allows to have `Impuestos` totals even when related nodes does not exists
+    This is because is not mandatory by Anexo 20
+    What is mandatory is that if nodes exists then totals must exists
+- Add helper method to create a `RequestParameters` from a `Cfdi`
+- Fix: add missing dependence `ext-iconv` into `composer.json`
+- Testing: add helper development script `tests/estadosat.php`
+- Testing: Change compareNames & castNombre visibility for direct testing
+
+
 ## Version 2.6.2 2018-07-17
 
 - Dependence on <https://github.com/eclipxe13/XmlSchemaValidator> has been set to `^2.0.1`

docs/componentes/estado-sat.md

@@ -89,8 +89,24 @@ N - 602  | No Encontrado | La consulta fue hecha pero el CFDI no existe
 El problema que encontré es que alterando solo 1 dato (el total) esperaba encontrar un estado de `N - 602`
 pero el estado devuelto fue `N - 601`.
 
+## Ejemplo de uso a partir de un archivo
 
-## Ejemplo de uso
+```php
+<?php
+
+use \CfdiUtils\Cfdi;
+use \CfdiUtils\ConsultaCfdiSat\WebService;
+use \CfdiUtils\ConsultaCfdiSat\RequestParameters;
+
+// los datos del cfdi que se van a consultar
+$cfdi = Cfdi::newFromString(file_get_contents('cfdi.xml'));
+$request = RequestParameters::createFromCfdi($cfdi);
+
+$service = new WebService();
+$response = $service->request($request); // $response contiene toda la información
+```
+
+## Ejemplo de uso a partir de datos conocidos
 
 ```php
 <?php

src/CfdiUtils/ConsultaCfdiSat/RequestParameters.php

@@ -1,6 +1,8 @@
 <?php
 namespace CfdiUtils\ConsultaCfdiSat;
 
+use CfdiUtils\Cfdi;
+
 class RequestParameters
 {
     /** @var string */
@@ -41,6 +43,19 @@ public function __construct(
         $this->sello = $sello;
     }
 
+    public static function createFromCfdi(Cfdi $cfdi): self
+    {
+        $qr = $cfdi->getQuickReader();
+        return new self(
+            $qr['version'],
+            $qr->{'emisor'}['rfc'],
+            $qr->{'receptor'}['rfc'],
+            $qr['total'],
+            $qr->{'complemento'}->{'timbrefiscaldigital'}['uuid'],
+            $qr['sello']
+        );
+    }
+
     public function getVersion(): string
     {
         return $this->version;

src/CfdiUtils/Validate/Cfdi33/Standard/ComprobanteImpuestos.php

@@ -50,13 +50,13 @@ public function validate(NodeInterface $comprobante, Asserts $asserts)
         $hasTraslados = (null !== $nodeImpuestos->searchNode('cfdi:Traslados', 'cfdi:Traslado'));
         $asserts->putStatus(
             'COMPIMPUESTOSC02',
-            Status::when(! ($hasTraslados xor $existsTotalTrasladados))
+            Status::when(! ($hasTraslados and ! $existsTotalTrasladados))
         );
 
         $hasRetenciones = (null !== $nodeImpuestos->searchNode('cfdi:Retenciones', 'cfdi:Retencion'));
         $asserts->putStatus(
             'COMPIMPUESTOSC03',
-            Status::when(! ($hasRetenciones xor $existsTotalRetenidos))
+            Status::when(! ($hasRetenciones and ! $existsTotalRetenidos))
         );
     }
 }

src/CfdiUtils/Validate/Cfdi33/Standard/SelloDigitalCertificado.php

@@ -177,12 +177,12 @@ private function obtainSello(string $selloBase64): string
         return (string) $sello;
     }
 
-    private function compareNames(string $first, string $second): bool
+    protected function compareNames(string $first, string $second): bool
     {
         return (0 === strcasecmp($this->castNombre($first), $this->castNombre($second)));
     }
 
-    private function castNombre(string $nombre): string
+    protected function castNombre(string $nombre): string
     {
         return str_replace([' ', '-', ',', '.', '#', '&', "'", '"'], '', iconv('UTF-8', 'ASCII//TRANSLIT', $nombre));
     }

tests/CfdiUtilsTests/ConsultaCfdiSat/RequestParametersTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace CfdiUtilsTests\ConsultaCfdiSat;
 
+use CfdiUtils\Cfdi;
 use CfdiUtils\ConsultaCfdiSat\RequestParameters;
 use CfdiUtilsTests\TestCase;
 
@@ -57,6 +58,32 @@ public function testConstructorWithWrongVersion()
         );
     }
 
+    public function testCreateFromCfdiVersion32()
+    {
+        $cfdi = Cfdi::newFromString(file_get_contents($this->utilAsset('cfdi32-real.xml')));
+        $parameters = RequestParameters::createFromCfdi($cfdi);
+
+        $this->assertSame('3.2', $parameters->getVersion());
+        $this->assertSame('CTO021007DZ8', $parameters->getRfcEmisor());
+        $this->assertSame('XAXX010101000', $parameters->getRfcReceptor());
+        $this->assertSame('80824F3B-323E-407B-8F8E-40D83FE2E69F', $parameters->getUuid());
+        $this->assertStringEndsWith('YRbgmmVYiA==', $parameters->getSello());
+        $this->assertEquals(4685.00, $parameters->getTotalFloat(), '', 0.001);
+    }
+
+    public function testCreateFromCfdiVersion33()
+    {
+        $cfdi = Cfdi::newFromString(file_get_contents($this->utilAsset('cfdi33-real.xml')));
+        $parameters = RequestParameters::createFromCfdi($cfdi);
+
+        $this->assertSame('3.3', $parameters->getVersion());
+        $this->assertSame('POT9207213D6', $parameters->getRfcEmisor());
+        $this->assertSame('DIM8701081LA', $parameters->getRfcReceptor());
+        $this->assertSame('CEE4BE01-ADFA-4DEB-8421-ADD60F0BEDAC', $parameters->getUuid());
+        $this->assertStringEndsWith('XmE4/OAgdg==', $parameters->getSello());
+        $this->assertEquals(2010.01, $parameters->getTotalFloat(), '', 0.001);
+    }
+
     /**
      * @param string $total
      * @param string $expected

tests/CfdiUtilsTests/Validate/Cfdi33/Standard/ComprobanteImpuestosTest.php

@@ -17,19 +17,12 @@ protected function setUp()
         $this->validator = new ComprobanteImpuestos();
     }
 
-    public function providerValidImpuestos()
-    {
-        return [
-            [true, false],
-            [false, true],
-            [true, true],
-        ];
-    }
-
     /**
      * @param bool $putTraslados
      * @param bool $putRetenciones
-     * @dataProvider providerValidImpuestos
+     * @testWith [true, false]
+     *           [false, true]
+     *           [true, true]
      */
     public function testValidImpuestos($putTraslados, $putRetenciones)
     {
@@ -70,15 +63,15 @@ public function testInvalidTrasladosNodesWithoutTotalTraslados()
         $this->assertStatusEqualsCode(Status::error(), 'COMPIMPUESTOSC02');
     }
 
-    public function testInvalidTotalTrasladosWithoutTrasladosNodes()
+    public function testValidTotalTrasladosWithoutTrasladosNodes()
     {
         $this->comprobante->addChild(new Node(
             'cfdi:Impuestos',
             ['TotalImpuestosTrasladados' => '']
         ));
 
         $this->runValidate();
-        $this->assertStatusEqualsCode(Status::error(), 'COMPIMPUESTOSC02');
+        $this->assertStatusEqualsCode(Status::ok(), 'COMPIMPUESTOSC02');
     }
 
     public function testInvalidRetencionesNodesWithoutTotalRetenciones()
@@ -93,15 +86,15 @@ public function testInvalidRetencionesNodesWithoutTotalRetenciones()
         $this->assertStatusEqualsCode(Status::error(), 'COMPIMPUESTOSC03');
     }
 
-    public function testInvalidTotalRetencionesWithoutRetencionesNodes()
+    public function testValidTotalRetencionesWithoutRetencionesNodes()
     {
         $this->comprobante->addChild(new Node(
             'cfdi:Impuestos',
             ['TotalImpuestosRetenidos' => '']
         ));
 
         $this->runValidate();
-        $this->assertStatusEqualsCode(Status::error(), 'COMPIMPUESTOSC03');
+        $this->assertStatusEqualsCode(Status::ok(), 'COMPIMPUESTOSC03');
     }
 
     public function testWithoutNodeImpuestos()

tests/CfdiUtilsTests/Validate/Cfdi33/Standard/SelloDigitalCertificadoTest.php

@@ -148,4 +148,23 @@ public function testValidateOk()
         }
         $this->assertCount(8, $this->asserts, 'All 8 were are tested');
     }
+
+    /**
+     * @param bool $expected
+     * @param string $first
+     * @param string $second
+     * @testWith [true, "ABC", "ABC"]
+     *           [true, "Empresa \"Equis\"", "Empresa Equis"]
+     *           [false, "Empresa Equis Sa de Cv", "Empresa Equis SA CV"]
+     */
+    public function testCompareNames(bool $expected, string $first, string $second)
+    {
+        $validator = new class() extends SelloDigitalCertificado {
+            public function testCompareNames(string $first, string $second): bool
+            {
+                return $this->compareNames($first, $second);
+            }
+        };
+        $this->assertSame($expected, $validator->testCompareNames($first, $second));
+    }
 }

tests/estadosat.php

@@ -0,0 +1,44 @@
+<?php
+
+use \CfdiUtils\ConsultaCfdiSat\WebService;
+
+require __DIR__ . '/bootstrap.php';
+
+exit(call_user_func(function (string $command, string ...$arguments): int {
+    $files = [];
+    $askForHelp = false;
+    foreach ($arguments as $argument) {
+        if (in_array($argument, ['-h', '--help'], true)) {
+            $askForHelp = true;
+            break; // no need to continue with other arguments
+        }
+        $files[] = $argument;
+    }
+    $files = array_filter($files);
+
+    if ($askForHelp || ! count($files)) {
+        echo implode(PHP_EOL, [
+            basename($command) . ' [-h|--help] cfdi.xml...',
+            '  -h, --help   Show this help',
+            "  cfdi.xml     Files to check, as many as needed, don't allow wilcards",
+            '  WARNING: This program can change at any time! Do not depend on this file or its results!',
+        ]), PHP_EOL;
+        return 0;
+    }
+
+    $webService = new WebService();
+
+    foreach ($files as $file) {
+        $cfdi = \CfdiUtils\Cfdi::newFromString(file_get_contents($file));
+        $request = \CfdiUtils\ConsultaCfdiSat\RequestParameters::createFromCfdi($cfdi);
+        $response = $webService->request($request);
+
+        print_r(array_filter([
+            'file' => $file,
+            'Status CFDI' => $response->getCfdi(),
+            'Code' => $response->getCode(),
+        ]));
+    }
+
+    return 0;
+}, ...$argv));