Merge branch 'dev/plantillas_clientes' into 'main'

Dev/plantillas clientes

See merge request jjimenez/safekat!101

ci4/app/Controllers/Clientes/ClientePlantillaPrecios.php

@@ -0,0 +1,441 @@
+<?php namespace App\Controllers\Clientes;
+
+
+use App\Controllers\GoBaseResourceController;
+
+use App\Models\Collection;
+
+use App\Entities\Clientes\ClienteEntity;
+
+use App\Models\Clientes\ClienteModel;
+
+use App\Models\Configuracion\ProvinciaModel;
+
+use App\Models\Configuracion\UserModel;
+
+use App\Models\Configuracion\ComunidadAutonomaModel;
+
+use App\Models\Configuracion\FormaPagoModel;
+
+use App\Models\Configuracion\PaisModel;
+
+class Cliente extends \App\Controllers\GoBaseResourceController
+{
+
+    protected $modelName = ClienteModel::class;
+    protected $format = 'json';
+
+    protected static $singularObjectName = 'Cliente';
+    protected static $singularObjectNameCc = 'cliente';
+    protected static $pluralObjectName = 'Clientes';
+    protected static $pluralObjectNameCc = 'clientes';
+
+    protected static $controllerSlug = 'cliente';
+
+    protected static $viewPath = 'themes/backend/vuexy/form/clientes/cliente/';
+
+    protected $indexRoute = 'clienteList';
+
+
+    public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+    {
+        $this->viewData['pageTitle'] = lang('Clientes.moduleTitle');
+        $this->viewData['usingSweetAlert'] = true;
+
+        // Se indica que este controlador trabaja con soft_delete
+        $this->soft_delete = true;
+        // Se indica el flag para los ficheros borrados
+        $this->delete_flag = 1;
+
+        $this->viewData = ['usingServerSideDataTable' => true]; // JJO
+
+        // Breadcrumbs (IMN)
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("App.menu_clientes"), 'route' => "javascript:void(0);", 'active' => false],
+            ['title' => lang("App.menu_cliente"), 'route' => site_url('clientes/cliente'), 'active' => true]
+        ];
+
+        parent::initController($request, $response, $logger);
+    }
+
+
+    public function index()
+    {
+
+        $viewData = [
+            'currentModule' => static::$controllerSlug,
+            'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Clientes.cliente')]),
+            'clienteEntity' => new ClienteEntity(),
+            'usingServerSideDataTable' => true,
+
+        ];
+
+        $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
+
+        return view(static::$viewPath . 'viewClienteList', $viewData);
+    }
+
+
+    public function add()
+    {
+        // JJO
+        $session = session();
+
+        $requestMethod = $this->request->getMethod();
+
+        if ($requestMethod === 'post') :
+
+            $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+            $postData = $this->request->getPost();
+
+            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+
+            // JJO
+            $sanitizedData['user_created_id'] = $session->id_user;
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [lang('Basic.global.record')]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+                endif;
+
+                $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
+            endif;
+            if ($noException && $successfulResult) :
+
+                $id = $this->model->db->insertID();
+
+                $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+
+        endif; // ($requestMethod === 'post')
+
+        $this->viewData['clienteEntity'] = isset($sanitizedData) ? new ClienteEntity($sanitizedData) : new ClienteEntity();
+        $this->viewData['comunidadAutonomaList'] = $this->getComunidadAutonomaListItems($clienteEntity->comunidad_autonoma_id ?? null);
+        $this->viewData['provinciaList'] = $this->getProvinciaListItems($clienteEntity->provincia_id ?? null);
+        $this->viewData['paisList'] = $this->getPaisListItems($clienteEntity->pais_id ?? null);
+        $this->viewData['userList'] = $this->getUserListItems($clienteEntity->comercial_id ?? null);
+        $this->viewData['userList2'] = $this->getUserListItems2($clienteEntity->soporte_id ?? null);
+        $this->viewData['formaDePagoList'] = $this->getFormaDePagoListItems($clienteEntity->forma_pago_id ?? null);
+
+        $this->viewData['formAction'] = site_url('cliente/add'); // route_to('createCliente'); IMN
+
+        $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Clientes.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
+
+
+        return $this->displayForm(__METHOD__);
+    } // end function add()
+
+    public function edit($requestedId = null)
+    {
+
+        // JJO
+        $session = session();
+
+        if ($requestedId == null) :
+            return $this->redirect2listView();
+        endif;
+        $id = filter_var($requestedId, FILTER_SANITIZE_URL);
+        $clienteEntity = $this->model->find($id);
+
+        if ($clienteEntity == false) :
+            $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Clientes.cliente')), $id]);
+            return $this->redirect2listView('sweet-error', $message);
+        endif;
+
+        $requestMethod = $this->request->getMethod();
+
+        if ($requestMethod === 'post') :
+
+            $nullIfEmpty = true; // !(phpversion() >= '8.1');
+
+            $postData = $this->request->getPost();
+
+            $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
+            if ($this->request->getPost('credito_asegurado') == null) {
+                $sanitizedData['credito_asegurado'] = false;
+            }
+            if ($this->request->getPost('message_tracking') == null) {
+                $sanitizedData['message_tracking'] = false;
+            }
+            if ($this->request->getPost('message_production_start') == null) {
+                $sanitizedData['message_production_start'] = false;
+            }
+            if ($this->request->getPost('tirada_flexible') == null) {
+                $sanitizedData['tirada_flexible'] = false;
+            }
+
+            // JJO
+            $sanitizedData['user_updated_id'] = $session->id_user;
+
+            $noException = true;
+            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+
+
+                if ($this->canValidate()) :
+                    try {
+                        $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
+                    } catch (\Exception $e) {
+                        $noException = false;
+                        $this->dealWithException($e);
+                    }
+                else:
+                    $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Clientes.cliente'))]);
+                    $this->session->setFlashdata('formErrors', $this->model->errors());
+
+                endif;
+
+                $clienteEntity->fill($sanitizedData);
+
+                $thenRedirect = false;
+            endif;
+            if ($noException && $successfulResult) :
+                $id = $clienteEntity->id ?? $id;
+                $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
+
+                if ($thenRedirect) :
+                    if (!empty($this->indexRoute)) :
+                        return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
+                    else:
+                        return $this->redirect2listView('sweet-success', $message);
+                    endif;
+                else:
+                    $this->session->setFlashData('sweet-success', $message);
+                endif;
+
+            endif; // $noException && $successfulResult
+        endif; // ($requestMethod === 'post')
+
+        //var_dump($clienteEntity); dd();
+
+        $this->viewData['clienteEntity'] = $clienteEntity;
+        $this->viewData['comunidadAutonomaList'] = $this->getComunidadAutonomaListItems($clienteEntity->comunidad_autonoma_id ?? null);
+        $this->viewData['provinciaList'] = $this->getProvinciaListItems($clienteEntity->provincia_id ?? null);
+        $this->viewData['paisList'] = $this->getPaisListItems($clienteEntity->pais_id ?? null);
+        $this->viewData['ccaaList'] = $this->getCcaaListItems($clienteEntity->ccaa_id ?? null);
+        $this->viewData['userList'] = $this->getUserListItems($clienteEntity->comercial_id ?? null);
+        $this->viewData['userList2'] = $this->getUserListItems2($clienteEntity->soporte_id ?? null);
+        $this->viewData['formaDePagoList'] = $this->getFormaDePagoListItems($clienteEntity->forma_pago_id ?? null);
+
+        $this->viewData['formAction'] = route_to('updateCliente', $id);
+
+        $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Clientes.moduleTitle') . ' ' . lang('Basic.global.edit3');
+
+
+        return $this->displayForm(__METHOD__, $id);
+    } // end function edit(...)
+
+
+    public function datatable()
+    {
+        if ($this->request->isAJAX()) {
+            $reqData = $this->request->getPost();
+            if (!isset($reqData['draw']) || !isset($reqData['columns'])) {
+                $errstr = 'No data available in response to this specific request.';
+                $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr);
+                return $response;
+            }
+            $start = $reqData['start'] ?? 0;
+            $length = $reqData['length'] ?? 5;
+            $search = $reqData['search']['value'];
+            $requestedOrder = $reqData['order']['0']['column'] ?? 1;
+            $order = ClienteModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
+            $dir = $reqData['order']['0']['dir'] ?? 'asc';
+
+            $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
+            foreach ($resourceData as $item) :
+                if (isset($item->direccion) && strlen($item->direccion) > 100) :
+                    $item->direccion = character_limiter($item->direccion, 100);
+                endif;
+                if (isset($item->comentarios_tirada_flexible) && strlen($item->comentarios_tirada_flexible) > 100) :
+                    $item->comentarios_tirada_flexible = character_limiter($item->comentarios_tirada_flexible, 100);
+                endif;
+                if (isset($item->comentarios_produccion) && strlen($item->comentarios_produccion) > 100) :
+                    $item->comentarios_produccion = character_limiter($item->comentarios_produccion, 100);
+                endif;
+                if (isset($item->comentarios) && strlen($item->comentarios) > 100) :
+                    $item->comentarios = character_limiter($item->comentarios, 100);
+                endif;
+            endforeach;
+
+            return $this->respond(Collection::datatable(
+                $resourceData,
+                $this->model->getResource()->countAllResults(),
+                $this->model->getResource($search)->countAllResults()
+            ));
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function allItemsSelect()
+    {
+        if ($this->request->isAJAX()) {
+            $onlyActiveOnes = true;
+            $reqVal = $this->request->getPost('val') ?? 'id';
+            $menu = $this->model->getAllForMenu($reqVal . ', nombre', 'nombre', $onlyActiveOnes, false);
+            $nonItem = new \stdClass;
+            $nonItem->id = '';
+            $nonItem->nombre = '- ' . lang('Basic.global.None') . ' -';
+            array_unshift($menu, $nonItem);
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'menu' => $menu,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+    public function menuItems()
+    {
+        if ($this->request->isAJAX()) {
+            $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 ?? 'nombre'];
+            $onlyActiveOnes = false;
+            try{
+                $menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
+                $nonItem = new \stdClass;
+                $nonItem->id = '';
+                $nonItem->text = '- ' . lang('Basic.global.None') . ' -';
+                array_unshift($menu, $nonItem);
+            }
+            catch(Exception $e){
+                $menu = [];
+            }
+
+            $newTokenHash = csrf_hash();
+            $csrfTokenName = csrf_token();
+            $data = [
+                'menu' => $menu,
+                $csrfTokenName => $newTokenHash
+            ];
+            return $this->respond($data);
+        } else {
+            return $this->failUnauthorized('Invalid request', 403);
+        }
+    }
+
+
+    protected function getPaisListItems($selId = null)
+    {
+        $paisModel = model('App\Models\Configuracion\PaisModel');
+        $onlyActiveOnes = true;
+        $data = $paisModel->getAllForMenu('id, nombre', 'nombre', $onlyActiveOnes);
+
+        return $data;
+    }
+
+    protected function getCcaaListItems($selId = null)
+    {
+        $ccaaModel = model('App\Models\Configuracion\ComunidadAutonomaModel');
+        $onlyActiveOnes = true;
+        $data = $ccaaModel->getAllForMenu('id, nombre', 'nombre', $onlyActiveOnes);
+
+        return $data;
+    }
+
+    protected function getUserListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Users.user'))])];
+        if (!empty($selId)) :
+            $userModel = model('App\Models\Usuarios\UserModel');
+
+            $selOption = $userModel->where('id_user', $selId)->findColumn('first_name');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+
+    protected function getComunidadAutonomaListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('ComunidadesAutonomas.comunidadAutonoma'))])];
+        if (!empty($selId)) :
+            $comunidadAutonomaModel = model('App\Models\Configuracion\ComunidadAutonomaModel');
+
+            $selOption = $comunidadAutonomaModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+
+    protected function getUserListItems2($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Users.user'))])];
+        if (!empty($selId)) :
+            $userModel = model('App\Models\Configuracion\UserModel');
+
+            $selOption = $userModel->where('id_user', $selId)->findColumn('last_name');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+
+    protected function getFormaDePagoListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('FormasPagoes.formaDePago'))])];
+        if (!empty($selId)) :
+            $formaPagoModel = model('App\Models\Configuracion\FormaPagoModel');
+
+            $selOption = $formaPagoModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+
+    protected function getProvinciaListItems($selId = null)
+    {
+        $data = ['' => lang('Basic.global.pleaseSelectA', [mb_strtolower(lang('Provincias.provincia'))])];
+        if (!empty($selId)) :
+            $provinciaModel = model('App\Models\Configuracion\ProvinciaModel');
+
+            $selOption = $provinciaModel->where('id', $selId)->findColumn('nombre');
+            if (!empty($selOption)) :
+                $data[$selId] = $selOption[0];
+            endif;
+        endif;
+        return $data;
+    }
+
+}

ci4/app/Entities/Clientes/ClientePreciosEntity.php

@@ -8,6 +8,7 @@ class ClientePreciosEntity extends \CodeIgniter\Entity\Entity
     protected $attributes = [
         "id" => null,
         "cliente_id" => null,
+        "plantilla_id" => null,
         "tipo" => null,
         "tipo_maquina" => null,
         "tipo_impresion" => null,
@@ -23,6 +24,7 @@ class ClientePreciosEntity extends \CodeIgniter\Entity\Entity
     ];
     protected $casts = [
         "cliente_id" => "int",
+        "plantilla_id" => "int",
         "tiempo_min" => "float",
         "tiempo_max" => "float",
         "margen" => "float",

ci4/app/Language/en/App.php

@@ -672,6 +672,7 @@ return [
     "menu_dashboard" => "Control Panel",
 
     "menu_clientes" => "Customers",
+    "menu_plantillas_tarifas_clientes" => "Fee Templates",
     "menu_tarifacliente" => "Fees",
 
     "menu_configuration" => "Settings",

ci4/app/Language/es/App.php

@@ -672,6 +672,7 @@ return [
     "menu_dashboard" => "Panel de control",
 
     "menu_clientes" => "Clientes",
+    "menu_plantillas_tarifas_clientes" => "Plantillas Tarifas",
     "menu_cliente" => "Cliente",
     "menu_clientes_nuevo" => "Nuevo",
     "menu_tarifacliente" => "Tarifas",

ci4/app/Models/Clientes/ClientePreciosModel.php

@@ -16,6 +16,7 @@ class ClientePlantillaPreciosLineasModel extends \App\Models\GoBaseModel
 
     protected $allowedFields = [
         "cliente_id", 
+        "plantilla_id",
         "tipo", 
         "tipo_maquina", 
         "tipo_impresion", 

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php

@@ -1063,21 +1063,23 @@
 
 
 
-    $('#tipoImpresion').on("change", function () {
+    $('#tipoImpresion').on("change.select2", function () {
         updatePapelesComparador();
         $('#title_int_rot').html('<?= lang("Presupuestos.compInteriorRotativa") ?>');
         $('#title_int_plana').html('<?= lang("Presupuestos.compInteriorPlana") ?>');
-        $('#paginas').change();
-
-
         if (($('#tipoImpresion').select2('data')[0].id == 'negro' ||
             $('#tipoImpresion').select2('data')[0].id == 'color')){
 
             $('#tableCompIntRotativa').DataTable().clear().draw();
             $('#total_comp_rot').html("0.00");
 
+            if($('#tipoImpresion').select2('data')[0].id == 'negro'){
+                $('#compPaginasColor').val('0')
+                $('#compPaginasNegro').val($('#paginas').val())
+            }
+
             if( $('#tableCompIntPlana').DataTable().rows().count() > 0 &&
-            $('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
+                $('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
 
                 $('#tableCompIntPlana').DataTable().clear().draw();
                 $('#total_comp_plana').html("0.00");
@@ -1087,18 +1089,29 @@
         else if (($('#tipoImpresion').select2('data')[0].id == 'negrohq' ||
             $('#tipoImpresion').select2('data')[0].id == 'colorhq')){
 
-                $('#tableCompIntRotativa').DataTable().clear().draw();
-                $('#total_comp_rot').html("0.00");
+            $('#tableCompIntRotativa').DataTable().clear().draw();
+            $('#total_comp_rot').html("0.00");
 
-                if($('#tableCompIntPlana').DataTable().rows().count() > 0 &&
-                    !$('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
+            if($('#tipoImpresion').select2('data')[0].id == 'negrohq'){
+                $('#compPaginasColorhq').val('0')
+                $('#compPaginasNegrohq').val($('#paginas').val())
+                $('#compGramajeNegohq').change().trigger()
+            }
 
-                    $('#tableCompIntPlana').DataTable().clear().draw();
-                    $('#total_comp_plana').html("0.00");
-                }
+            if($('#tableCompIntPlana').DataTable().rows().count() > 0 &&
+                !$('#tableCompIntPlana').DataTable().cell(0, 0).data().includes('hq')) {
+
+                $('#tableCompIntPlana').DataTable().clear().draw();
+                $('#total_comp_plana').html("0.00");
+            }
         }
     });
 
+    $('#tipoImpresion').on("select2:close", function () {
+
+        $('#paginas').change(),trigger();
+    })
+
 
     function checkComparadorInt(is_color, is_hq, actualizarLinea=false) {
 

ci4/app/Views/themes/backend/vuexy/main/menu.php

@@ -40,6 +40,11 @@
                                         <div data-i18n="<?= lang("App.menu_clientes") ?>"><?= lang("App.menu_clientes") ?></div>
                                     </a>
                                 </li>
+                                <li class="menu-item">
+                                    <a href="<?= site_url("clientes/cliente") ?>" class="menu-link">
+                                        <div data-i18n="<?= lang("menu_plantillas_tarifas_clientes") ?>"><?= lang("menu_plantillas_tarifas_clientes") ?></div>
+                                    </a>
+                                </li>
                             <?php endif; ?>
                         <?php endif; ?>
                         <?php if (count($temp = getArrayItem($menus, 'name', 'Tarifacliente')) > 0): ?>

ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php

@@ -45,6 +45,11 @@
                                     <div data-i18n="<?= lang("App.menu_clientes") ?>"><?= lang("App.menu_clientes") ?></div>
                                 </a>
                             </li>
+                            <li class="menu-item">
+                                <a href="<?= site_url("clientes/cliente") ?>" class="menu-link">
+                                    <div data-i18n="<?= lang("App.menu_plantillas_tarifas_clientes") ?>"><?= lang("App.menu_plantillas_tarifas_clientes") ?></div>
+                                </a>
+                            </li>
                         <?php endif; ?>
                     <?php endif; ?>
                 </ul>