From 89abf40f6153291b47e2c04ad00d11a166e7fd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= Date: Wed, 16 Oct 2024 09:48:58 +0200 Subject: [PATCH 1/2] =?UTF-8?q?actualizaci=C3=B3n=20core=202024.93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/EditComision.php | 2 +- Controller/EditComisionPenalizacion.php | 2 +- Controller/EditLiquidacionComision.php | 10 +++++----- Extension/Controller/EditAgente.php | 6 +++--- Extension/Controller/ListAgente.php | 10 +++++----- Extension/XMLView/EditAlbaranCliente.xml | 2 +- Extension/XMLView/EditFacturaCliente.xml | 2 +- Extension/XMLView/EditPedidoCliente.xml | 2 +- Extension/XMLView/EditPresupuestoCliente.xml | 2 +- Init.php | 16 +++++++++------ Mod/CalculatorMod.php | 4 ++-- Mod/SalesFooterHTMLMod.php | 21 ++++++++++---------- Mod/SalesLineHTMLMod.php | 20 +++++++++---------- Test/main/ComisionTest.php | 2 +- View/Block/PenaltyInfo.html.twig | 14 ++++++------- XMLView/EditComision.xml | 6 +++--- XMLView/EditLiquidacionComision.xml | 2 +- XMLView/ListLiquidacionComision.xml | 2 +- XMLView/ListLiquidacionComisionFactura.xml | 2 +- facturascripts.ini | 2 +- 20 files changed, 66 insertions(+), 63 deletions(-) diff --git a/Controller/EditComision.php b/Controller/EditComision.php index 515b7e5..f7183ff 100644 --- a/Controller/EditComision.php +++ b/Controller/EditComision.php @@ -40,7 +40,7 @@ public function getPageData(): array $pagedata = parent::getPageData(); $pagedata['menu'] = 'admin'; $pagedata['title'] = 'commission'; - $pagedata['icon'] = 'fas fa-percentage'; + $pagedata['icon'] = 'fa-solid fa-percentage'; return $pagedata; } diff --git a/Controller/EditComisionPenalizacion.php b/Controller/EditComisionPenalizacion.php index f840adc..f48d4d0 100644 --- a/Controller/EditComisionPenalizacion.php +++ b/Controller/EditComisionPenalizacion.php @@ -40,7 +40,7 @@ public function getPageData(): array $pagedata = parent::getPageData(); $pagedata['menu'] = 'admin'; $pagedata['title'] = 'penalize'; - $pagedata['icon'] = 'fas fa-minus-circle'; + $pagedata['icon'] = 'fa-solid fa-minus-circle'; return $pagedata; } diff --git a/Controller/EditLiquidacionComision.php b/Controller/EditLiquidacionComision.php index b080ea4..668a527 100644 --- a/Controller/EditLiquidacionComision.php +++ b/Controller/EditLiquidacionComision.php @@ -20,8 +20,8 @@ namespace FacturaScripts\Plugins\Comisiones\Controller; use Exception; -use FacturaScripts\Core\Base\Calculator; use FacturaScripts\Core\Base\DataBase\DataBaseWhere; +use FacturaScripts\Core\Lib\Calculator; use FacturaScripts\Core\Lib\ExtendedController\BaseView; use FacturaScripts\Core\Lib\ExtendedController\EditController; use FacturaScripts\Core\Tools; @@ -54,7 +54,7 @@ public function getPageData(): array $data = parent::getPageData(); $data['menu'] = 'admin'; $data['title'] = 'settlement'; - $data['icon'] = 'fas fa-chalkboard-teacher'; + $data['icon'] = 'fa-solid fa-chalkboard-teacher'; return $data; } @@ -112,7 +112,7 @@ protected function calculateTotalCommission() */ protected function createSettledInvoiceView(string $viewName = self::VIEWNAME_SETTLEDINVOICE) { - $this->addListView($viewName, 'Join\LiquidacionComisionFactura', 'invoices', 'fas fa-file-invoice'); + $this->addListView($viewName, 'Join\LiquidacionComisionFactura', 'invoices', 'fa-solid fa-file-invoice'); $this->views[$viewName]->addOrderBy(['fecha', 'idfactura'], 'date', 2); $this->views[$viewName]->addOrderBy(['total'], 'amount'); $this->views[$viewName]->addOrderBy(['totalcomision'], 'commission'); @@ -365,7 +365,7 @@ protected function setViewStatus($viewName, $view) $this->addButton($viewName, [ 'action' => 'calculatecommission', 'confirm' => 'true', - 'icon' => 'fas fa-percentage', + 'icon' => 'fa-solid fa-percentage', 'label' => 'calculate' ]); @@ -373,7 +373,7 @@ protected function setViewStatus($viewName, $view) 'action' => 'generateinvoice', 'color' => 'info', 'confirm' => true, - 'icon' => 'fas fa-file-invoice', + 'icon' => 'fa-solid fa-file-invoice', 'label' => 'generate-invoice' ]); } diff --git a/Extension/Controller/EditAgente.php b/Extension/Controller/EditAgente.php index abe7fe5..352d8b4 100644 --- a/Extension/Controller/EditAgente.php +++ b/Extension/Controller/EditAgente.php @@ -43,7 +43,7 @@ public function createViews(): Closure protected function createCommissionsView(): Closure { return function (string $viewName = 'ListComision') { - $this->addListView($viewName, 'Comision', 'commissions', 'fas fa-percentage'); + $this->addListView($viewName, 'Comision', 'commissions', 'fa-solid fa-percentage'); $this->views[$viewName]->addOrderBy(['prioridad'], 'priority', 2); $this->views[$viewName]->addOrderBy(['porcentaje'], 'percentage'); @@ -55,7 +55,7 @@ protected function createCommissionsView(): Closure protected function createPenalizeView(): Closure { return function (string $viewName = 'EditComisionPenalizacion') { - $this->addEditListView($viewName, 'ComisionPenalizacion', 'penalize', 'fas fa-minus-circle'); + $this->addEditListView($viewName, 'ComisionPenalizacion', 'penalize', 'fa-solid fa-minus-circle'); $this->views[$viewName]->setInline(true); // disable company column if there is only one company @@ -70,7 +70,7 @@ protected function createPenalizeView(): Closure protected function createSettlementView(): Closure { return function (string $viewName = 'ListLiquidacionComision') { - $this->addListView($viewName, 'LiquidacionComision', 'settlements', 'fas fa-chalkboard-teacher'); + $this->addListView($viewName, 'LiquidacionComision', 'settlements', 'fa-solid fa-chalkboard-teacher'); $this->views[$viewName]->addOrderBy(['fecha'], 'date', 2); $this->views[$viewName]->addOrderBy(['total'], 'amount'); }; diff --git a/Extension/Controller/ListAgente.php b/Extension/Controller/ListAgente.php index fe55732..f78bba7 100644 --- a/Extension/Controller/ListAgente.php +++ b/Extension/Controller/ListAgente.php @@ -20,11 +20,11 @@ namespace FacturaScripts\Plugins\Comisiones\Extension\Controller; use Closure; -use FacturaScripts\Core\Base\Calculator; use FacturaScripts\Core\Base\DataBase\DataBaseWhere; use FacturaScripts\Core\DataSrc\Agentes; use FacturaScripts\Core\DataSrc\Empresas; use FacturaScripts\Core\DataSrc\Series; +use FacturaScripts\Core\Lib\Calculator; use FacturaScripts\Core\Tools; use FacturaScripts\Dinamic\Model\FacturaCliente; use FacturaScripts\Dinamic\Model\LiquidacionComision; @@ -50,7 +50,7 @@ public function createViews(): Closure protected function createCommissionView(): Closure { return function (string $viewName = 'ListComision') { - $this->addView($viewName, 'Comision', 'commissions', 'fas fa-percentage'); + $this->addView($viewName, 'Comision', 'commissions', 'fa-solid fa-percentage'); $this->addOrderBy($viewName, ['idcomision'], 'code'); $this->addOrderBy($viewName, ['prioridad'], 'priority', 2); $this->addOrderBy($viewName, ['idempresa', 'codagente', 'porcentaje'], 'company'); @@ -71,7 +71,7 @@ protected function createCommissionView(): Closure protected function createPenaltyView(): Closure { return function (string $viewName = 'ListComisionPenalizacion') { - $this->addView($viewName, 'ComisionPenalizacion', 'penalize', 'fas fa-minus-circle'); + $this->addView($viewName, 'ComisionPenalizacion', 'penalize', 'fa-solid fa-minus-circle'); $this->addOrderBy($viewName, ['id'], 'code'); $this->addOrderBy($viewName, ['idempresa', 'codagente', 'dto_desde'], 'company'); $this->addOrderBy($viewName, ['codagente', 'idempresa', 'dto_desde'], 'agent', 1); @@ -85,7 +85,7 @@ protected function createPenaltyView(): Closure protected function createSettlementView(): Closure { return function (string $viewName = 'ListLiquidacionComision') { - $this->addView($viewName, 'LiquidacionComision', 'settlements', 'fas fa-chalkboard-teacher'); + $this->addView($viewName, 'LiquidacionComision', 'settlements', 'fa-solid fa-chalkboard-teacher'); $this->addOrderBy($viewName, ['fecha', 'idliquidacion'], 'date', 2); $this->addOrderBy($viewName, ['codagente', 'fecha'], 'agent'); $this->addOrderBy($viewName, ['total', 'fecha'], 'amount'); @@ -99,7 +99,7 @@ protected function createSettlementView(): Closure $this->addButton($viewName, [ 'action' => 'gen-settlements', - 'icon' => 'fas fa-magic', + 'icon' => 'fa-solid fa-magic', 'label' => 'generate', 'type' => 'modal' ]); diff --git a/Extension/XMLView/EditAlbaranCliente.xml b/Extension/XMLView/EditAlbaranCliente.xml index 8085f6a..d5e6208 100644 --- a/Extension/XMLView/EditAlbaranCliente.xml +++ b/Extension/XMLView/EditAlbaranCliente.xml @@ -23,7 +23,7 @@ - + diff --git a/Extension/XMLView/EditFacturaCliente.xml b/Extension/XMLView/EditFacturaCliente.xml index 8085f6a..d5e6208 100644 --- a/Extension/XMLView/EditFacturaCliente.xml +++ b/Extension/XMLView/EditFacturaCliente.xml @@ -23,7 +23,7 @@ - + diff --git a/Extension/XMLView/EditPedidoCliente.xml b/Extension/XMLView/EditPedidoCliente.xml index 8085f6a..d5e6208 100644 --- a/Extension/XMLView/EditPedidoCliente.xml +++ b/Extension/XMLView/EditPedidoCliente.xml @@ -23,7 +23,7 @@ - + diff --git a/Extension/XMLView/EditPresupuestoCliente.xml b/Extension/XMLView/EditPresupuestoCliente.xml index 8085f6a..d5e6208 100644 --- a/Extension/XMLView/EditPresupuestoCliente.xml +++ b/Extension/XMLView/EditPresupuestoCliente.xml @@ -23,7 +23,7 @@ - + diff --git a/Init.php b/Init.php index fde289e..52b1a4f 100644 --- a/Init.php +++ b/Init.php @@ -19,10 +19,10 @@ namespace FacturaScripts\Plugins\Comisiones; -use FacturaScripts\Core\Base\AjaxForms\SalesFooterHTML; -use FacturaScripts\Core\Base\AjaxForms\SalesLineHTML; -use FacturaScripts\Core\Base\Calculator; -use FacturaScripts\Core\Base\InitClass; +use FacturaScripts\Core\Lib\AjaxForms\SalesFooterHTML; +use FacturaScripts\Core\Lib\AjaxForms\SalesLineHTML; +use FacturaScripts\Core\Lib\Calculator; +use FacturaScripts\Core\Template\InitClass; use FacturaScripts\Plugins\Comisiones\Model\LiquidacionComision; /** @@ -32,7 +32,7 @@ */ final class Init extends InitClass { - public function init() + public function init(): void { $this->loadExtension(new Extension\Controller\ListAgente()); $this->loadExtension(new Extension\Controller\EditAgente()); @@ -44,7 +44,11 @@ public function init() SalesLineHTML::addMod(new Mod\SalesLineHTMLMod()); } - public function update() + public function uninstall(): void + { + } + + public function update(): void { new LiquidacionComision(); } diff --git a/Mod/CalculatorMod.php b/Mod/CalculatorMod.php index ac8bcca..d4b2245 100644 --- a/Mod/CalculatorMod.php +++ b/Mod/CalculatorMod.php @@ -1,7 +1,7 @@ + * Copyright (C) 2022-2024 Carlos Garcia Gomez * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,8 +19,8 @@ namespace FacturaScripts\Plugins\Comisiones\Mod; -use FacturaScripts\Core\Base\Contract\CalculatorModInterface; use FacturaScripts\Core\Base\DataBase\DataBaseWhere; +use FacturaScripts\Core\Contract\CalculatorModInterface; use FacturaScripts\Core\Model\Base\BusinessDocument; use FacturaScripts\Core\Model\Base\BusinessDocumentLine; use FacturaScripts\Core\Model\Base\SalesDocument; diff --git a/Mod/SalesFooterHTMLMod.php b/Mod/SalesFooterHTMLMod.php index 298dc2a..cd6c28a 100644 --- a/Mod/SalesFooterHTMLMod.php +++ b/Mod/SalesFooterHTMLMod.php @@ -1,7 +1,7 @@ + * Copyright (C) 2022-2024 Carlos Garcia Gomez * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,18 +19,17 @@ namespace FacturaScripts\Plugins\Comisiones\Mod; -use FacturaScripts\Core\Base\Contract\SalesModInterface; -use FacturaScripts\Core\Base\Translator; +use FacturaScripts\Core\Contract\SalesModInterface; use FacturaScripts\Core\Model\Base\SalesDocument; -use FacturaScripts\Core\Model\User; +use FacturaScripts\Core\Tools; class SalesFooterHTMLMod implements SalesModInterface { - public function apply(SalesDocument &$model, array $formData, User $user) + public function apply(SalesDocument &$model, array $formData): void { } - public function applyBefore(SalesDocument &$model, array $formData, User $user) + public function applyBefore(SalesDocument &$model, array $formData): void { } @@ -53,19 +52,19 @@ public function newModalFields(): array return ['totalcomision']; } - public function renderField(Translator $i18n, SalesDocument $model, string $field): ?string + public function renderField(SalesDocument $model, string $field): ?string { if ($field === 'totalcomision') { - return $this->totalcomision($i18n, $model); + return $this->totalcomision($model); } return null; } - private function totalcomision(Translator $i18n, SalesDocument $model): string + private function totalcomision(SalesDocument $model): string { return empty($model->{'totalcomision'}) ? '' : '
' - . '
' - . $i18n->trans('commission') + . '
' + . Tools::lang()->trans('commission') . '' . '
' . '
'; diff --git a/Mod/SalesLineHTMLMod.php b/Mod/SalesLineHTMLMod.php index 2b0ceb1..87e69c8 100644 --- a/Mod/SalesLineHTMLMod.php +++ b/Mod/SalesLineHTMLMod.php @@ -1,7 +1,7 @@ + * Copyright (C) 2022-2024 Carlos Garcia Gomez * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,18 +19,18 @@ namespace FacturaScripts\Plugins\Comisiones\Mod; -use FacturaScripts\Core\Base\Contract\SalesLineModInterface; -use FacturaScripts\Core\Base\Translator; +use FacturaScripts\Core\Contract\SalesLineModInterface; use FacturaScripts\Core\Model\Base\SalesDocument; use FacturaScripts\Core\Model\Base\SalesDocumentLine; +use FacturaScripts\Core\Tools; class SalesLineHTMLMod implements SalesLineModInterface { - public function apply(SalesDocument &$model, array &$lines, array $formData) + public function apply(SalesDocument &$model, array &$lines, array $formData): void { } - public function applyToLine(array $formData, SalesDocumentLine &$line, string $id) + public function applyToLine(array $formData, SalesDocumentLine &$line, string $id): void { } @@ -70,23 +70,23 @@ public function newTitles(): array return []; } - public function renderField(Translator $i18n, string $idlinea, SalesDocumentLine $line, SalesDocument $model, string $field): ?string + public function renderField(string $idlinea, SalesDocumentLine $line, SalesDocument $model, string $field): ?string { if ($field === 'porcomision') { - return $this->porcomision($i18n, $idlinea, $line, $model); + return $this->porcomision($idlinea, $line, $model); } return null; } - public function renderTitle(Translator $i18n, SalesDocument $model, string $field): ?string + public function renderTitle(SalesDocument $model, string $field): ?string { return null; } - private function porcomision($i18n, $idlinea, $line, $model): string + private function porcomision($idlinea, $line, $model): string { return '
' - . '
' . $i18n->trans('percentage-commission') + . '
' . Tools::lang()->trans('percentage-commission') . '' . '
' . '
'; diff --git a/Test/main/ComisionTest.php b/Test/main/ComisionTest.php index 2d2584e..9567741 100644 --- a/Test/main/ComisionTest.php +++ b/Test/main/ComisionTest.php @@ -1,7 +1,7 @@ + * Copyright (C) 2023-2024 Carlos Garcia Gomez * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/View/Block/PenaltyInfo.html.twig b/View/Block/PenaltyInfo.html.twig index faa8430..2287259 100644 --- a/View/Block/PenaltyInfo.html.twig +++ b/View/Block/PenaltyInfo.html.twig @@ -19,16 +19,16 @@ #}
-

{{ i18n.trans('penalty-help-title') }}

+

{{ trans('penalty-help-title') }}

-
{{ i18n.trans('penalty-help-info')|raw }}
-
{{ i18n.trans('company') }}
{{ i18n.trans('company-penalty-info') }}
-
{{ i18n.trans('agent') }}
{{ i18n.trans('agent-penalty-info') }}
-
{{ i18n.trans('from') }}
{{ i18n.trans('from-penalty-info') }}
-
{{ i18n.trans('until') }}
{{ i18n.trans('until-penalty-info') }}
-
{{ i18n.trans('penalty') }}
{{ i18n.trans('penalty-penalty-info') }}
+
{{ trans('penalty-help-info')|raw }}
+
{{ trans('company') }}
{{ trans('company-penalty-info') }}
+
{{ trans('agent') }}
{{ trans('agent-penalty-info') }}
+
{{ trans('from') }}
{{ trans('from-penalty-info') }}
+
{{ trans('until') }}
{{ trans('until-penalty-info') }}
+
{{ trans('penalty') }}
{{ trans('penalty-penalty-info') }}
diff --git a/XMLView/EditComision.xml b/XMLView/EditComision.xml index c3708ee..f0829b0 100644 --- a/XMLView/EditComision.xml +++ b/XMLView/EditComision.xml @@ -31,13 +31,13 @@ - + - + - + diff --git a/XMLView/EditLiquidacionComision.xml b/XMLView/EditLiquidacionComision.xml index ac3a259..e2e9664 100644 --- a/XMLView/EditLiquidacionComision.xml +++ b/XMLView/EditLiquidacionComision.xml @@ -23,7 +23,7 @@ - diff --git a/XMLView/ListLiquidacionComision.xml b/XMLView/ListLiquidacionComision.xml index c5b7414..f5c8cbc 100644 --- a/XMLView/ListLiquidacionComision.xml +++ b/XMLView/ListLiquidacionComision.xml @@ -55,7 +55,7 @@ - + diff --git a/XMLView/ListLiquidacionComisionFactura.xml b/XMLView/ListLiquidacionComisionFactura.xml index 9967445..f018584 100644 --- a/XMLView/ListLiquidacionComisionFactura.xml +++ b/XMLView/ListLiquidacionComisionFactura.xml @@ -60,7 +60,7 @@ - + diff --git a/facturascripts.ini b/facturascripts.ini index edd1c70..dbee704 100644 --- a/facturascripts.ini +++ b/facturascripts.ini @@ -1,4 +1,4 @@ name = 'Comisiones' description = 'Añade comisiones y liquidaciones a los agentes.' version = 1.8 -min_version = 2023.07 \ No newline at end of file +min_version = 2024.93 \ No newline at end of file From 8a02c29b0066009483df99ec3eb92199e8feafba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= Date: Mon, 21 Oct 2024 10:31:34 +0200 Subject: [PATCH 2/2] =?UTF-8?q?peque=C3=B1as=20correcciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Extension/Controller/EditAgente.php | 2 ++ Mod/CalculatorMod.php | 2 ++ Model/LiquidacionComision.php | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Extension/Controller/EditAgente.php b/Extension/Controller/EditAgente.php index 352d8b4..ff334d8 100644 --- a/Extension/Controller/EditAgente.php +++ b/Extension/Controller/EditAgente.php @@ -21,6 +21,8 @@ use Closure; use FacturaScripts\Core\Base\DataBase\DataBaseWhere; +use FacturaScripts\Core\Tools; + /** * Description of EditAgente diff --git a/Mod/CalculatorMod.php b/Mod/CalculatorMod.php index d4b2245..7a873af 100644 --- a/Mod/CalculatorMod.php +++ b/Mod/CalculatorMod.php @@ -25,6 +25,8 @@ use FacturaScripts\Core\Model\Base\BusinessDocumentLine; use FacturaScripts\Core\Model\Base\SalesDocument; use FacturaScripts\Core\Model\Base\SalesDocumentLine; +use FacturaScripts\Core\Tools; + use FacturaScripts\Dinamic\Model\Comision; use FacturaScripts\Dinamic\Model\ComisionPenalizacion; use FacturaScripts\Dinamic\Model\Producto; diff --git a/Model/LiquidacionComision.php b/Model/LiquidacionComision.php index 64cd2e5..34d44d5 100644 --- a/Model/LiquidacionComision.php +++ b/Model/LiquidacionComision.php @@ -19,7 +19,7 @@ namespace FacturaScripts\Plugins\Comisiones\Model; -use FacturaScripts\Core\Base\Calculator; +use FacturaScripts\Core\Lib\Calculator; use FacturaScripts\Core\Model\Base; use FacturaScripts\Core\Tools; use FacturaScripts\Dinamic\Model\Agente;