Merge branch 'main' into 'feat/printer-labels'

Main

See merge request jjimenez/safekat!637

ci4/app/Controllers/Logistica/Logisticacontroller.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Controllers\Logistica;
+
+use App\Models\Sistema\SettingsModel;
+use CodeIgniter\Controller;
+
+
+use App\Models\Collection;
+
+class Logisticacontroller extends \App\Controllers\BaseResourceController
+{
+
+    protected $modelName = TicketModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectNameCc = 'logistica';
+    protected static $singularObjectName = 'Logistica';
+    protected static $pluralObjectName = 'Logistica';
+    protected static $controllerSlug = 'logistica';
+
+    protected static $viewPath = 'themes/vuexy/form/logistica/';
+
+    protected $indexRoute = 'panel';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Logistica.logistica');
+
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_logistica"), 'route' => "javascript:void(0);", 'active' => false],
+        ];
+
+        parent::initController($request, $response, $logger);
+    }
+
+    public function index()
+    {
+        //checkPermission('tickets.menu');
+
+        /*$viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tickets.tickets')]),
+            'usingServerSideDataTable' => true,
+            'userType' => auth()->user()->can('tickets.edit') ? 1 : 0,
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewTicketList', $viewData);*/
+    }
+
+    public function panel()
+    {
+        //checkPermission('tickets.menu');
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'boxTitle' => lang('Logistica.panel'),
+            'pageSubTitle' => 'Panel',
+            'usingServerSideDataTable' => true,
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewPanelLogistica', $viewData);
+    }
+}

ci4/app/Controllers/Presupuestos/Importadorpresupuestos.php

@@ -547,7 +547,7 @@ class Importadorpresupuestos extends \App\Controllers\BaseResourceController
                 "clienteId" => intval($this->request->getPost('cliente_id') ?? 0),
                 "isColor" => $isColor,
                 "isHq" => $isHq,
-                "papelDiferente" => $papel_interior_diferente,
+                "papelInteriorDiferente" => $papel_interior_diferente,
                 "paginasColor" => $paginas_color,
                 "paginasCuadernillo" => 32,