Plugin actualizado

Controller/EditTicketPrinter.php

@@ -8,6 +8,8 @@
 use FacturaScripts\Core\Base\DataBase\DataBaseWhere;
 use FacturaScripts\Core\Lib\ExtendedController\BaseView;
 use FacturaScripts\Core\Lib\ExtendedController\EditController;
+use FacturaScripts\Core\Tools;
+
 
 /**
  * @author Carlos Garcia Gomez <carlos@facturascripts.com>
@@ -86,7 +88,7 @@ protected function loadData($viewName, $view)
                 break;
 
             case 'ListTicket':
-                $id = $this->views[$mvn]->model->primaryColumnValue();
+                $id = $this->views[$mvn]->model->id();
                 $where = [new DataBaseWhere('idprinter', $id)];
                 $view->loadData('', $where);
                 break;

Controller/SendTicket.php

@@ -6,8 +6,8 @@
 namespace FacturaScripts\Plugins\Tickets\Controller;
 
 use FacturaScripts\Core\Base\Controller;
+use FacturaScripts\Core\Template\ModelClass;
 use FacturaScripts\Core\Base\DataBase\DataBaseWhere;
-use FacturaScripts\Core\Model\Base\ModelClass;
 use FacturaScripts\Core\Tools;
 use FacturaScripts\Dinamic\Lib\Tickets\Gift;
 use FacturaScripts\Dinamic\Lib\Tickets\Normal;
@@ -84,7 +84,7 @@ public function privateCore(&$response, $user, $permissions)
         }
 
         $model = new $modelClass();
-        if (false === $model->loadFromCode($this->modelCode)) {
+        if (false === $model->load($this->modelCode)) {
             $this->setTemplate('Error/SendTicket');
             return;
         }

Lib/Export/TicketExport.php

@@ -6,7 +6,9 @@
 namespace FacturaScripts\Plugins\Tickets\Lib\Export;
 
 use FacturaScripts\Core\Lib\Export\ExportBase;
-use Symfony\Component\HttpFoundation\Response;
+use FacturaScripts\Core\Response;
+use FacturaScripts\Core\Tools;
+
 
 /**
  * @author Carlos Garcia Gomez <carlos@facturascripts.com>

Lib/Tickets/BaseTicket.php

@@ -6,7 +6,7 @@
 namespace FacturaScripts\Plugins\Tickets\Lib\Tickets;
 
 use FacturaScripts\Core\Base\DataBase\DataBaseWhere;
-use FacturaScripts\Core\Model\Base\ModelClass;
+use FacturaScripts\Core\Template\ModelClass;
 use FacturaScripts\Core\Plugins;
 use FacturaScripts\Core\Tools;
 use FacturaScripts\Core\Translator;
@@ -39,7 +39,7 @@ abstract class BaseTicket
 
     private static $openDrawer = true;
 
-    abstract public static function print(ModelClass $model, TicketPrinter $printer, User $user, Agente $agent = null): bool;
+    abstract public static function print(ModelClass $model, TicketPrinter $printer, User $user, ?Agente $agent = null): bool;
 
     public static function setLines(?array $lines = null): void
     {
@@ -98,7 +98,7 @@ protected static function getPaymentMethods(ModelClass $model, TicketPrinter $pr
             // si no es una factura buscamos si tiene anticipos
             $prepagoModel = new PrePago();
             $where = [
-                new DataBaseWhere('modelid', $model->primaryColumnValue()),
+                new DataBaseWhere('modelid', $model->id()),
                 new DataBaseWhere('modelname', $model->modelClassName()),
             ];
             foreach ($prepagoModel->all($where, [], 0, 0) as $prepago) {
@@ -123,7 +123,7 @@ protected static function getPaymentMethods(ModelClass $model, TicketPrinter $pr
         // pintamos las formas de pago
         foreach ($paymentMethods as $codpago => $total) {
             $payment = new FormaPago();
-            if (false === $payment->loadFromCode($codpago)) {
+            if (false === $payment->load($codpago)) {
                 continue;
             }
 
@@ -214,7 +214,7 @@ protected static function getSubtotals(ModelClass $model, array $lines): array
                 ];
 
                 $impuesto = new Impuesto();
-                if ($line->codimpuesto && $impuesto->loadFromCode($line->codimpuesto)) {
+                if ($line->codimpuesto && $impuesto->load($line->codimpuesto)) {
                     $subtotals[$key]['tax'] = $impuesto->descripcion;
                 }
             }

Lib/Tickets/Gift.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Model\Base\ModelClass;
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Model\Ticket;
 use FacturaScripts\Dinamic\Model\TicketPrinter;
 

Lib/Tickets/Normal.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Model\Base\ModelClass;
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Model\Agente;
 use FacturaScripts\Dinamic\Model\Ticket;
 use FacturaScripts\Dinamic\Model\TicketPrinter;
@@ -17,7 +19,7 @@
  */
 class Normal extends BaseTicket
 {
-    public static function print(ModelClass $model, TicketPrinter $printer, User $user, Agente $agent = null): bool
+    public static function print(ModelClass $model, TicketPrinter $printer, User $user, ?Agente $agent = null): bool
     {
         static::init();
 

Lib/Tickets/PaymentReceipt.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Model\Base\ModelClass;
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Model\Agente;
 use FacturaScripts\Dinamic\Model\Ticket;
 use FacturaScripts\Dinamic\Model\TicketPrinter;
@@ -17,7 +19,7 @@
  */
 class PaymentReceipt extends BaseTicket
 {
-    public static function print(ModelClass $model, TicketPrinter $printer, User $user, Agente $agent = null): bool
+    public static function print(ModelClass $model, TicketPrinter $printer, User $user, ?Agente $agent = null): bool
     {
         static::init();
 

Model/Ticket.php

@@ -5,8 +5,8 @@
 
 namespace FacturaScripts\Plugins\Tickets\Model;
 
-use FacturaScripts\Core\Model\Base\ModelClass;
-use FacturaScripts\Core\Model\Base\ModelTrait;
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Template\ModelTrait;
 use FacturaScripts\Core\Tools;
 use FacturaScripts\Dinamic\Model\Agente;
 
@@ -72,7 +72,7 @@ class Ticket extends ModelClass
      */
     public $title;
 
-    public function clear()
+    public function clear(): void
     {
         parent::clear();
         $this->appversion = 0.0;
@@ -84,7 +84,7 @@ public function clear()
     public function getPrinter(): TicketPrinter
     {
         $printer = new TicketPrinter();
-        $printer->loadFromCode($this->idprinter);
+        $printer->load($this->idprinter);
         return $printer;
     }
 

Model/TicketPrinter.php

@@ -5,8 +5,8 @@
 
 namespace FacturaScripts\Plugins\Tickets\Model;
 
-use FacturaScripts\Core\Model\Base\ModelClass;
-use FacturaScripts\Core\Model\Base\ModelTrait;
+use FacturaScripts\Core\Template\ModelClass;
+use FacturaScripts\Core\Template\ModelTrait;
 use FacturaScripts\Core\Tools;
 use FacturaScripts\Dinamic\Model\ApiAccess;
 use FacturaScripts\Dinamic\Model\ApiKey;
@@ -111,7 +111,7 @@ class TicketPrinter extends ModelClass
     /** @var int */
     public $title_font_size;
 
-    public function clear()
+    public function clear(): void
     {
         parent::clear();
         $this->creationdate = Tools::date();
@@ -144,7 +144,7 @@ public function delete(): bool
     public function getApiKey(): ApiKey
     {
         $apikey = new ApiKey();
-        $apikey->loadFromCode($this->idapikey);
+        $apikey->load($this->idapikey);
         return $apikey;
     }
 

Test/main/Lib/Tickets/GiftTest.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Test\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Base\Calculator;
+use FacturaScripts\Core\Lib\Calculator;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Lib\Tickets\Gift;
 use FacturaScripts\Dinamic\Model\Cliente;
 use FacturaScripts\Dinamic\Model\FacturaCliente;

Test/main/Lib/Tickets/NormalTest.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Test\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Base\Calculator;
+use FacturaScripts\Core\Lib\Calculator;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Lib\Tickets\Normal;
 use FacturaScripts\Dinamic\Model\FacturaCliente;
 use FacturaScripts\Dinamic\Model\Ticket;

Test/main/Lib/Tickets/PaymentReceiptTest.php

@@ -5,7 +5,9 @@
 
 namespace FacturaScripts\Test\Plugins\Tickets\Lib\Tickets;
 
-use FacturaScripts\Core\Base\Calculator;
+use FacturaScripts\Core\Lib\Calculator;
+use FacturaScripts\Core\Tools;
+
 use FacturaScripts\Dinamic\Lib\Tickets\PaymentReceipt;
 use FacturaScripts\Dinamic\Model\Cliente;
 use FacturaScripts\Dinamic\Model\FacturaCliente;

View/SendTicket.html.twig

@@ -19,8 +19,8 @@
                             <h1 class="h2 mb-3">
                                 <i class="{{ fsc.getPageData().icon }}"></i> {{ fsc.title }}
                             </h1>
-                            <div class="form-group">
-                                <select name="format" class="form-control" required>
+                            <div class="mb-3">
+                                <select name="format" class="form-select" required>
                                     {% for format in fsc.getFormats(fsc.modelClassName) %}
                                         <option value="{{ format.className }}">{{ trans(format.label) }}</option>
                                     {% endfor %}
@@ -29,20 +29,20 @@
                             {% for printer in fsc.printers %}
                                 {% if printer.isActive() %}
                                     <button type="submit" name="printer" value="{{ printer.id }}"
-                                            class="btn btn-block btn-lg btn-success mt-3">
+                                            class="btn w-100 btn-lg btn-success mt-3">
                                         <i class="fa-solid fa-print"></i>&nbsp; {{ printer.name }}
                                     </button>
                                 {% else %}
                                     <button type="submit" name="printer" value="{{ printer.id }}"
-                                            class="btn btn-block btn-lg btn-warning">
+                                            class="btn w-100 btn-lg btn-warning">
                                         <i class="fa-solid fa-print"></i>&nbsp; {{ printer.name }}
                                     </button>
                                     <p class="text-muted">
                                         {{ trans('last-activity') }}: {{ printer.lastactivity }}
                                     </p>
                                 {% endif %}
                             {% else %}
-                                <div class="alert alert-warning mb-0">
+                                <div class="alert alert-dismissible alert-dismissible alert-dismissible alert-warning mb-0">
                                     {{ trans('no-printer-connected') }}
                                 </div>
                             {% endfor %}

View/Tab/DownloadPrinterApp.html.twig

@@ -5,29 +5,29 @@
 
 <div class="card shadow mb-3">
     <div class="card-body">
-        <div class="form-row">
+        <div class="row">
             <div class="col-sm">
                 <p>{{ trans('connect-a-printer-p') }}</p>
-                <div class="dropdown d-inline-block mr-1">
-                    <button class="btn btn-info dropdown-toggle" type="button" data-toggle="dropdown"
-                            aria-expanded="false"><i class="fa-solid fa-download mr-1"></i> {{ trans('download-app') }}
+                <div class="dropdown d-inline-block me-1">
+                    <button class="btn btn-info dropdown-toggle" type="button" data-bs-toggle="dropdown"
+                            aria-expanded="false"><i class="fa-solid fa-download me-1"></i> {{ trans('download-app') }}
                     </button>
                     <div class="dropdown-menu">
                         <a class="dropdown-item"
                            href="https://megacity20.fra1.digitaloceanspaces.com/software/mc20printer/mc20printer-1.0.0%20Setup.exe">
-                            <i class="fa-brands fa-windows fa-fw mr-1"></i> Windows 10/11 (64 bits)
+                            <i class="fa-brands fa-windows fa-fw me-1"></i> Windows 10/11 (64 bits)
                         </a>
                         <a class="dropdown-item"
                            href="https://megacity20.fra1.digitaloceanspaces.com/software/mc20printer/mc20printer-darwin-x64-1.1.0.zip">
-                            <i class="fa-brands fa-apple fa-fw mr-1"></i> Mac
+                            <i class="fa-brands fa-apple fa-fw me-1"></i> Mac
                         </a>
                         <a class="dropdown-item"
                            href="https://megacity20.fra1.digitaloceanspaces.com/software%2Fmc20printer%2Fmc20printer_1.1.0_amd64.deb">
-                            <i class="fa-brands fa-linux fa-fw mr-1"></i> Linux (.deb)
+                            <i class="fa-brands fa-linux fa-fw me-1"></i> Linux (.deb)
                         </a>
                         <a class="dropdown-item"
                            href="https://megacity20.fra1.digitaloceanspaces.com/software/mc20printer/mc20printer-1.0-1.x86_64.rpm">
-                            <i class="fa-brands fa-linux fa-fw mr-1"></i> Linux (.rpm)
+                            <i class="fa-brands fa-linux fa-fw me-1"></i> Linux (.rpm)
                         </a>
                     </div>
                 </div>

facturascripts.ini

@@ -1,5 +1,5 @@
 name = 'Tickets'
 description = 'Permite imprimir tickets de facturas, albaranes, pedidos, presupuestos y servicios.'
 version = 2.41
-min_version = 2024.5
+min_version = 2025
 compatible = 'PrePagos'