actualización core 2024.93

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;
     }
 

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;
     }
 

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,15 +365,15 @@ protected function setViewStatus($viewName, $view)
             $this->addButton($viewName, [
                 'action' => 'calculatecommission',
                 'confirm' => 'true',
-                'icon' => 'fas fa-percentage',
+                'icon' => 'fa-solid fa-percentage',
                 'label' => 'calculate'
             ]);
 
             $this->addButton($mainViewName, [
                 'action' => 'generateinvoice',
                 'color' => 'info',
                 'confirm' => true,
-                'icon' => 'fas fa-file-invoice',
+                'icon' => 'fa-solid fa-file-invoice',
                 'label' => 'generate-invoice'
             ]);
         }

Extension/Controller/EditAgente.php

@@ -21,6 +21,8 @@
 
 use Closure;
 use FacturaScripts\Core\Base\DataBase\DataBaseWhere;
+use FacturaScripts\Core\Tools;
+
 
 /**
  * Description of EditAgente
@@ -43,7 +45,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 +57,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 +72,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');
         };

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'
             ]);

Extension/XMLView/EditAlbaranCliente.xml

@@ -23,7 +23,7 @@
     <columns>
         <group name="commission">
             <column name="commission" numcolumns="6" order="110">
-                <widget type="money" fieldname="totalcomision" icon="fas fa-coins" readonly="true" />
+                <widget type="money" fieldname="totalcomision" icon="fa-solid fa-coins" readonly="true" />
             </column>
         </group>
     </columns>

Extension/XMLView/EditFacturaCliente.xml

@@ -23,7 +23,7 @@
     <columns>
         <group name="commission">
             <column name="commission" numcolumns="6" order="110">
-                <widget type="money" fieldname="totalcomision" icon="fas fa-coins" readonly="true" />
+                <widget type="money" fieldname="totalcomision" icon="fa-solid fa-coins" readonly="true" />
             </column>
         </group>
     </columns>

Extension/XMLView/EditPedidoCliente.xml

@@ -23,7 +23,7 @@
     <columns>
         <group name="commission">
             <column name="commission" numcolumns="6" order="110">
-                <widget type="money" fieldname="totalcomision" icon="fas fa-coins" readonly="true" />
+                <widget type="money" fieldname="totalcomision" icon="fa-solid fa-coins" readonly="true" />
             </column>
         </group>
     </columns>

Extension/XMLView/EditPresupuestoCliente.xml

@@ -23,7 +23,7 @@
     <columns>
         <group name="commission">
             <column name="commission" numcolumns="6" order="110">
-                <widget type="money" fieldname="totalcomision" icon="fas fa-coins" readonly="true" />
+                <widget type="money" fieldname="totalcomision" icon="fa-solid fa-coins" readonly="true" />
             </column>
         </group>
     </columns>

Mod/CalculatorMod.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of Comisiones plugin for FacturaScripts
- * Copyright (C) 2022 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2022-2024 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
@@ -19,12 +19,14 @@
 
 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;
 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;

Mod/SalesFooterHTMLMod.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of Comisiones plugin for FacturaScripts
- * Copyright (C) 2022-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2022-2024 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
@@ -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 [];
     }
 
-    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'}) ? '' : '<div class="col-sm">'
-            . '<div class="form-group">'
-            . $i18n->trans('commission')
+            . '<div class="mb-3">'
+            . Tools::lang()->trans('commission')
             . '<input type="number" name="totalcomision" value="' . $model->totalcomision . '" class="form-control" disabled />'
             . '</div>'
             . '</div>';

Mod/SalesLineHTMLMod.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of Comisiones plugin for FacturaScripts
- * Copyright (C) 2022-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2022-2024 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
@@ -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 '<div class="col-6">'
-            . '<div class="mb-2">' . $i18n->trans('percentage-commission')
+            . '<div class="mb-2">' . Tools::lang()->trans('percentage-commission')
             . '<input type="number" name="porcomision_' . $idlinea . '" value="' . $line->porcomision . '" class="form-control" disabled />'
             . '</div>'
             . '</div>';

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;

Test/main/ComisionTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of Comisiones plugin for FacturaScripts.
- * Copyright (C) 2023 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2023-2024 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

View/Block/PenaltyInfo.html.twig

@@ -19,16 +19,16 @@
 #}
 <div class="col-12 text-secondary" style="font-size: smaller">
     <div class="row text-info">
-        <div class="col-12"><h4>{{ i18n.trans('penalty-help-title') }}</h4></div>
+        <div class="col-12"><h4>{{ trans('penalty-help-title') }}</h4></div>
     </div>
     <div class="row mt-3">
         <div class="col-12">
-            <div class="row mb-2"><div class="col-12">{{ i18n.trans('penalty-help-info')|raw }}</div></div>
-            <div class="row"><div class="col-2"><b>{{ i18n.trans('company') }}</b></div><div class="col-10">{{ i18n.trans('company-penalty-info') }}</div></div>
-            <div class="row"><div class="col-2"><b>{{ i18n.trans('agent') }}</b></div><div class="col-10">{{ i18n.trans('agent-penalty-info') }}</div></div>
-            <div class="row"><div class="col-2"><b>{{ i18n.trans('from') }}</b></div><div class="col-10">{{ i18n.trans('from-penalty-info') }}</div></div>
-            <div class="row"><div class="col-2"><b>{{ i18n.trans('until') }}</b></div><div class="col-10">{{ i18n.trans('until-penalty-info') }}</div></div>
-            <div class="row"><div class="col-2"><b>{{ i18n.trans('penalty') }}</b></div><div class="col-10">{{ i18n.trans('penalty-penalty-info') }}</div></div>
+            <div class="row mb-2"><div class="col-12">{{ trans('penalty-help-info')|raw }}</div></div>
+            <div class="row"><div class="col-2"><b>{{ trans('company') }}</b></div><div class="col-10">{{ trans('company-penalty-info') }}</div></div>
+            <div class="row"><div class="col-2"><b>{{ trans('agent') }}</b></div><div class="col-10">{{ trans('agent-penalty-info') }}</div></div>
+            <div class="row"><div class="col-2"><b>{{ trans('from') }}</b></div><div class="col-10">{{ trans('from-penalty-info') }}</div></div>
+            <div class="row"><div class="col-2"><b>{{ trans('until') }}</b></div><div class="col-10">{{ trans('until-penalty-info') }}</div></div>
+            <div class="row"><div class="col-2"><b>{{ trans('penalty') }}</b></div><div class="col-10">{{ trans('penalty-penalty-info') }}</div></div>
         </div>
     </div>
 </div>

XMLView/EditComision.xml

@@ -34,10 +34,10 @@
                 <widget type="number" decimal="2" min="0.01" max="999.99" step="0.01" fieldname="porcentaje" icon="fas fa-percentage" required="true" />
             </column>
             <column name="priority" order="130">
-                <widget type="number" decimal="0" fieldname="prioridad" icon="fas fa-sort-numeric-down-alt" required="true" />
+                <widget type="number" decimal="0" fieldname="prioridad" icon="fa-solid fa-sort-numeric-down-alt" required="true" />
             </column>
         </group>
-        <group name="conditions" title="conditions" icon="fas fa-filter" numcolumns="12">
+        <group name="conditions" title="conditions" icon="fa-solid fa-filter" numcolumns="12">
             <column name="company" order="100">
                 <widget type="select" fieldname="idempresa" onclick="EditEmpresa" required="true" readonly="dinamic">
                     <values source="empresas" fieldcode="idempresa" fieldtitle="nombrecorto" />

XMLView/EditLiquidacionComision.xml

@@ -23,7 +23,7 @@
     <columns>
         <group name="data" numcolumns="12">
             <column name="company" titleurl="ListEmpresa" order="100">
-                <widget type="select" fieldname="idempresa" icon="fas fa-building" onclick="EditEmpresa"
+                <widget type="select" fieldname="idempresa" icon="fa-solid fa-building" onclick="EditEmpresa"
                         required="true">
                     <values source="empresas" fieldcode="idempresa" fieldtitle="nombrecorto"/>
                 </widget>