Añadido soporte para el core 2025

Carlos Garcia · Carlos Garcia · commit 46e50ab0ed4b · 2025-08-18T13:18:34.000+02:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
         database: ['mysql', 'postgresql']
 
     env:
diff --git a/Init.php b/Init.php
@@ -22,11 +22,8 @@
 use FacturaScripts\Core\Lib\AjaxForms\PurchasesHeaderHTML;
 use FacturaScripts\Core\Lib\AjaxForms\SalesHeaderHTML;
 use FacturaScripts\Core\Template\InitClass;
-use FacturaScripts\Core\Tools;
-
 use FacturaScripts\Dinamic\Model\FacturaCliente;
 use FacturaScripts\Dinamic\Model\FacturaProveedor;
-use FacturaScripts\Dinamic\Model\User;
 
 /**
  * Description of Init
@@ -37,10 +34,13 @@ final class Init extends InitClass
 {
     public function init(): void
     {
+        // extensiones
         $this->loadExtension(new Extension\Model\Cliente());
         $this->loadExtension(new Extension\Model\FacturaCliente());
         $this->loadExtension(new Extension\Model\FacturaProveedor());
         $this->loadExtension(new Extension\Model\Proveedor());
+
+        // mods
         PurchasesHeaderHTML::addMod(new Mod\PurchasesHeaderHTMLMod());
         SalesHeaderHTML::addMod(new Mod\SalesHeaderHTMLMod());
     }
@@ -51,7 +51,6 @@ public function uninstall(): void
 
     public function update(): void
     {
-        new User();
         new FacturaCliente();
         new FacturaProveedor();
     }
diff --git a/Mod/PurchasesHeaderHTMLMod.php b/Mod/PurchasesHeaderHTMLMod.php
@@ -20,12 +20,9 @@
 namespace FacturaScripts\Plugins\Modelo347\Mod;
 
 use FacturaScripts\Core\Contract\PurchasesModInterface;
-use FacturaScripts\Core\Translator;
 use FacturaScripts\Core\Model\Base\PurchaseDocument;
-use FacturaScripts\Core\Model\User;
 use FacturaScripts\Core\Tools;
 
-
 /**
  * Add new fields in the modal window of the document header
  *   - excluir347: Allows the user to mark the invoice as excluded from the 347 calculation.
@@ -35,7 +32,7 @@
  */
 class PurchasesHeaderHTMLMod implements PurchasesModInterface
 {
-    public function apply(PurchaseDocument &$model, array $formData):void
+    public function apply(PurchaseDocument &$model, array $formData): void
     {
         if (property_exists($model, 'excluir347')) {
             $model->excluir347 = ($formData['excluir347'] ?? '') === 'true';
@@ -63,8 +60,7 @@ public function newFields(): array
     public function renderField(PurchaseDocument $model, string $field): ?string
     {
         if ($field == 'excluir347') {
-            $i18n = new Translator();
-            return $this->excluir347($i18n, $model);
+            return $this->excluir347($model);
         }
 
         return null;
@@ -75,7 +71,7 @@ public function newModalFields(): array
         return ['excluir347'];
     }
 
-    private static function excluir347(Translator $i18n, PurchaseDocument $model): string
+    private static function excluir347(PurchaseDocument $model): string
     {
         if (false === property_exists($model, 'excluir347')) {
             return '';
@@ -85,13 +81,13 @@ private static function excluir347(Translator $i18n, PurchaseDocument $model): s
         foreach (['false', 'true'] as $row) {
             $txt = ($row === 'true') ? 'yes' : 'no';
             $options[] = ($row == $model->excluir347) ?
-                '<option value="' . $row . '" selected>' . $i18n->trans($txt) . '</option>' :
-                '<option value="' . $row . '">' . $i18n->trans($txt) . '</option>';
+                '<option value="' . $row . '" selected>' . Tools::trans($txt) . '</option>' :
+                '<option value="' . $row . '">' . Tools::trans($txt) . '</option>';
         }
 
         $attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""';
         return '<div class="col-sm-6">'
-            . '<div class="mb-3">' . $i18n->trans('exclude-347')
+            . '<div class="mb-3">' . Tools::trans('exclude-347')
             . '<select ' . $attributes . ' class="form-select"/>' . implode('', $options) . '</select>'
             . '</div>'
             . '</div>';
diff --git a/Mod/SalesHeaderHTMLMod.php b/Mod/SalesHeaderHTMLMod.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of Modelo347 plugin for FacturaScripts
- * Copyright (C) 2020-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2020-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,12 +20,9 @@
 namespace FacturaScripts\Plugins\Modelo347\Mod;
 
 use FacturaScripts\Core\Contract\SalesModInterface;
-use FacturaScripts\Core\Translator;
 use FacturaScripts\Core\Model\Base\SalesDocument;
-use FacturaScripts\Core\Model\User;
 use FacturaScripts\Core\Tools;
 
-
 /**
  * Add new fields in the modal window of the document header
  *   - excluir347: Allows the user to mark the invoice as excluded from the 347 calculation.
@@ -68,14 +65,13 @@ public function newModalFields(): array
     public function renderField(SalesDocument $model, string $field): ?string
     {
         if ($field == 'excluir347') {
-            $i18n = new Translator();
-            return $this->excluir347($i18n, $model);
+            return $this->excluir347($model);
         }
 
         return null;
     }
 
-    private static function excluir347(Translator $i18n, SalesDocument $model): string
+    private static function excluir347(SalesDocument $model): string
     {
         if (false === property_exists($model, 'excluir347')) {
             return '';
@@ -85,13 +81,13 @@ private static function excluir347(Translator $i18n, SalesDocument $model): stri
         foreach (['false', 'true'] as $row) {
             $txt = ($row === 'true') ? 'yes' : 'no';
             $options[] = ($row == $model->excluir347) ?
-                '<option value="' . $row . '" selected>' . $i18n->trans($txt) . '</option>' :
-                '<option value="' . $row . '">' . $i18n->trans($txt) . '</option>';
+                '<option value="' . $row . '" selected>' . Tools::trans($txt) . '</option>' :
+                '<option value="' . $row . '">' . Tools::trans($txt) . '</option>';
         }
 
         $attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""';
         return '<div class="col-sm-6">'
-            . '<div class="mb-3">' . $i18n->trans('exclude-347')
+            . '<div class="mb-3">' . Tools::trans('exclude-347')
             . '<select ' . $attributes . ' class="form-select"/>' . implode('', $options) . '</select>'
             . '</div>'
             . '</div>';
diff --git a/Test/main/Extension/Table/FacturasTest.php b/Test/main/Extension/Table/FacturasTest.php
@@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void
         self::removeTaxRegularization();
     }
 
-    public function testExistsPropertyFacturaCliente()
+    public function testExistsPropertyFacturaCliente(): void
     {
         // crear el cliente
         $customer = new Cliente();
@@ -77,7 +77,7 @@ public function testExistsPropertyFacturaCliente()
         $this->assertTrue($customer->delete(), 'cant-delete-customer');
     }
 
-    public function testExistsPropertyFacturaProveedor()
+    public function testExistsPropertyFacturaProveedor(): void
     {
         // crear proveedor
         $suplier = new Proveedor();
diff --git a/Test/main/ModTest.php b/Test/main/ModTest.php
@@ -31,12 +31,12 @@ final class ModTest extends TestCase
 {
     use LogErrorsTrait;
 
-    public function testPurchasesHeaderHTMLMod()
+    public function testPurchasesHeaderHTMLMod(): void
     {
         new PurchasesHeaderHTMLMod();
     }
 
-    public function SalesHeaderHTMLMod()
+    public function SalesHeaderHTMLMod(): void
     {
         new SalesHeaderHTMLMod();
     }
diff --git a/facturascripts.ini b/facturascripts.ini
@@ -1,4 +1,4 @@
 name = 'Modelo347'
 description = 'Permite obtener los datos necesarios para el modelo 347 de la hacienda española.'
-version = 3.1
+version = 3.2
 min_version = 2025

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void`
`43`	`43`	`self::removeTaxRegularization();`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function testExistsPropertyFacturaCliente()`
	`46`	`+ public function testExistsPropertyFacturaCliente(): void`
`47`	`47`	`{`
`48`	`48`	`// crear el cliente`
`49`	`49`	`$customer = new Cliente();`
`@@ -77,7 +77,7 @@ public function testExistsPropertyFacturaCliente()`
`77`	`77`	`$this->assertTrue($customer->delete(), 'cant-delete-customer');`
`78`	`78`	`}`
`79`	`79`
`80`		`- public function testExistsPropertyFacturaProveedor()`
	`80`	`+ public function testExistsPropertyFacturaProveedor(): void`
`81`	`81`	`{`
`82`	`82`	`// crear proveedor`
`83`	`83`	`$suplier = new Proveedor();`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ final class ModTest extends TestCase`
`31`	`31`	`{`
`32`	`32`	`use LogErrorsTrait;`
`33`	`33`
`34`		`- public function testPurchasesHeaderHTMLMod()`
	`34`	`+ public function testPurchasesHeaderHTMLMod(): void`
`35`	`35`	`{`
`36`	`36`	`new PurchasesHeaderHTMLMod();`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function SalesHeaderHTMLMod()`
	`39`	`+ public function SalesHeaderHTMLMod(): void`
`40`	`40`	`{`
`41`	`41`	`new SalesHeaderHTMLMod();`
`42`	`42`	`}`