Revert "Merge branch 'feat/add-chat-presupuesto-cliente' into 'main'"

This reverts merge request !352

ci4/app/Controllers/Configuracion/ConfigErrores.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Controllers\Configuracion;
-
-use App\Controllers\BaseResourceController;
-use App\Models\Collection;
-use App\Models\Presupuestos\ErrorPresupuesto as ErrorPresupuestoModel;
-use CodeIgniter\HTTP\Response;
-use Hermawan\DataTables\DataTable;
-
-class ConfigErrores extends BaseResourceController
-{
-
-    protected ErrorPresupuestoModel $errorPresupuestoModel;
-    protected $format = 'json';
-    protected array $viewData = [];
-
-
-    protected static $viewPath = 'themes/vuexy/form/configuracion/error_presupuesto/';
-    protected static $controllerSlug = "errores-presupuesto";
-    protected $indexRoute = 'viewErrorPresupuestoList';
-
-
-    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
-    {
-        parent::initController($request, $response, $logger);
-        $this->errorPresupuestoModel = model(ErrorPresupuestoModel::class);
-    }
-
-
-    public function index()
-    {
-        $this->viewData['breadcrumb'] = [
-            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
-            ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true]
-        ];
-        return view(static::$viewPath . $this->indexRoute, $this->viewData);
-    }
-    public function viewForm(int $error_presupuesto_id)
-    {
-        $this->viewData['breadcrumb'] = [
-            ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false],
-            ['title' => lang("App.menu_error_presupuesto"), 'route' => site_url('configuracion/errores-presupuesto'), 'active' => true]
-        ];
-        $this->viewData["error_presupuesto_id"] = $error_presupuesto_id;
-        $this->errorPresupuestoModel->update($error_presupuesto_id, [
-            "last_user_id" => auth()->user()->id,
-            "visto" => true,
-        ]);
-        return view(static::$viewPath . 'viewErrorPresupuestoForm', $this->viewData);
-    }
-    public function store()
-    {
-        $data = [];
-        $variableCreated = $this->errorPresupuestoModel->store($data);
-        return $this->response->setJSON($variableCreated);
-    }
-    public function get_error_presupuesto(int $error_presupuesto_id)
-    {
-        $data = $this->errorPresupuestoModel->getErrorPresupuestoForm($error_presupuesto_id);
-        if(isset($data[0])){
-            return $this->response->setJSON(["data" => $data[0]]);
-        }else{
-            return $this->response->setJSON(["data" => []]);
-        }
-    }
-    public function update_error_presupuesto(int $error_presupuesto_id)
-    {
-        $bodyData = $this->request->getPost();
-        $this->errorPresupuestoModel->updateComment($error_presupuesto_id, $bodyData["comments"]);
-        return $this->response->setJSON(["message" => "Comentario actualizado", "status" => true]);
-    }
-
-    public function datatable()
-    {
-        $query = $this->errorPresupuestoModel->getQueryDatatable();
-        return DataTable::of($query)
-            ->add("action", fn($q) => $q->id)
-            ->toJson(true);
-    }
-}

ci4/app/Controllers/Configuracion/ConfigVariables.php

@@ -33,6 +33,7 @@ class ConfigVariables extends BaseResourceController
 
         parent::initController($request, $response, $logger);
         $this->configVariableModel = model(ConfigVariableModel::class);
+
     }
 
 
@@ -47,46 +48,45 @@ class ConfigVariables extends BaseResourceController
 
         return view(static::$viewPath . $this->indexRoute, $viewData);
     }
-    public function store()
-    {
+    public function store(){
         $data = [];
         $variableCreated = $this->configVariableModel->store($data);
         return $this->response->setJSON($variableCreated);
     }
-    public function get(int $config_variable_id)
-    {
+    public function get(int $config_variable_id){
         $data = $this->configVariableModel->find($config_variable_id);
         return $this->response->setJSON($data);
     }
-    public function updateVariable(int $config_variable_id)
-    {
+    public function updateVariable(int $config_variable_id){
         $reqData = [];
         if ($this->request->isAJAX()) {
             $reqData = $this->request->getPost();
-            $status = $this->configVariableModel->update($config_variable_id, $reqData);
+            $status = $this->configVariableModel->update($config_variable_id,$reqData);
             return $this->response->setJSON([
                 "message" => "Variable actualizada correctamente",
                 "status" => $status
             ]);
-        } else {
+        }
+        else {
             return $this->failUnauthorized('Invalid request', 403);
         }
     }
     public function deleteVariable(int $config_variable_id): Response
     {
         return $this->response->setJSON([]);
+
     }
-    public function datatable()
-    {
+    public function datatable(){
 
         $query = $this->configVariableModel->builder()->select([
             "id",
             "name",
             "value",
-            "description"
-        ])->orderBy("name", "asc");
+            "description"])->orderBy("name","asc");
         return DataTable::of($query)
-            ->add("action", fn($q) => $q->id)
-            ->toJson(true);
+        ->add("action",fn($q) => $q->id)
+        ->toJson(true);
     }
+
+
 }

ci4/app/Controllers/Configuracion/Papelformato.php

@@ -244,15 +244,23 @@ class Papelformato extends \App\Controllers\BaseResourceController {
 
     public function menuItems() {
         if ($this->request->isAJAX()) {
-            $papelFormatoModel = model('App\Models\Configuracion\PapelFormatoModel');
-            $searchStr = goSanitize($this->request->getPfgost('searchTerm'))[0];
-            $menu = $papelFormatoModel->getElementsForMenu2($searchStr);
-            if(empty(($searchStr)))
-                array_shift($menu);
-        
+            $searchStr = goSanitize($this->request->getPost('searchTerm'))[0];
+            $reqId = goSanitize($this->request->getPost('id'))[0];
+            $reqText = goSanitize($this->request->getPost('text'))[0];
+            $onlyActiveOnes = false;
+            $columns2select = [$reqId ?? 'id', $reqText ?? 'ancho'];
+            $onlyActiveOnes = false;
+            $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
+            $nonItem = new \stdClass;
+            $nonItem->id = '';
+            $nonItem->text = '- '.lang('Basic.global.None').' -';
+            array_unshift($menu , $nonItem);
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
             $data = [
                 'menu' => $menu,
-        
+                $csrfTokenName => $newTokenHash
             ];
             return $this->respond($data);
         } else {
@@ -260,15 +268,4 @@ class Papelformato extends \App\Controllers\BaseResourceController {
         }
     }
 
-
-    public function getSelect2()
-    {
-        if ($this->request->isAJAX()) {
-            $data = $this->model->getElementsForMenu2($this->request->getGet("q"));
-            
-            return $this->response->setJSON($data);
-        } else {
-            return $this->failUnauthorized('Invalid request', 403);
-        }
-    }
 }