copiada la rama presu_cliente_v2 en esta para poder hacer el merge al main

ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php

@@ -39,10 +39,10 @@ class TarifaAcabados extends BaseResourceController
 
         $this->viewData = ['usingServerSideDataTable' => true];
 
-        // Breadcrumbs
+        // Breadcrumbs 
         $this->viewData['breadcrumb'] = [
             ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false],
-            ['title' => lang("App.menu_tarifaacabado"), 'route' => site_url('tarifas/tarifaacabado'), 'active' => true]
+            ['title' => lang("App.menu_tarifaacabado"), 'route' => site_url('tarifas/acabados'), 'active' => true]
         ];
 
         parent::initController($request, $response, $logger);
@@ -133,6 +133,8 @@ class TarifaAcabados extends BaseResourceController
 
         endif; // ($requestMethod === 'post')
 
+        $this->viewData['proveedores'] = $this->getProveedores(); 
+
         $this->viewData['tarifaacabadoEntity'] = isset($sanitizedData) ? new TarifaAcabadoEntity($sanitizedData) : new TarifaAcabadoEntity();
         $this->viewData['formAction'] = route_to('tarifaAcabadoAdd');
         $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaacabado.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');

ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -10,15 +11,15 @@ use App\Entities\Tarifas\TarifaEncuadernacionLinea;
 use App\Models\Tarifas\TarifaEncuadernacionLineaModel;
 
 use
-    DataTables\Editor,
-    DataTables\Database,
-    DataTables\Editor\Field,
-    DataTables\Editor\Format,
-    DataTables\Editor\Mjoin,
-    DataTables\Editor\Options,
-    DataTables\Editor\Upload,
-    DataTables\Editor\Validate,
-    DataTables\Editor\ValidateOptions;
+DataTables\Editor,
+DataTables\Database,
+DataTables\Editor\Field,
+DataTables\Editor\Format,
+DataTables\Editor\Mjoin,
+DataTables\Editor\Options,
+DataTables\Editor\Upload,
+DataTables\Editor\Validate,
+DataTables\Editor\ValidateOptions;
 
 
 class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
@@ -73,9 +74,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
     {
 
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -84,10 +85,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -101,14 +102,14 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
 
                 $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
 
                 $id = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -134,20 +135,20 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
     public function edit($requestedId = null)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $tarifaEncuadernacionLinea = $this->model->find($id);
 
-        if ($tarifaEncuadernacionLinea == false) :
+        if ($tarifaEncuadernacionLinea == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('TarifaEncuadernacionLineas.tarifaencuadernacionLinea')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -156,10 +157,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -176,12 +177,12 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $tarifaEncuadernacionLinea->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -214,45 +215,90 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
             $response = Editor::inst($db, 'tarifa_encuadernacion_lineas')
                 ->fields(
                     Field::inst('paginas_libro_min')
-                        ->validator('Validate::numeric', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal'))
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required')
+                            )
                         ),
                     Field::inst('paginas_libro_max')
-                        ->validator('Validate::numeric', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal'))
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required')
+                            )
                         ),
                     Field::inst('precio_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required')
+                            )
                         ),
                     Field::inst('precio_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_max.required')
+                            )
+                        ),
+                    Field::inst('total_min')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal')
+                            )
+                        )
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.required')
+                            )
                         ),
                     Field::inst('tirada_encuadernacion_id'),
                     Field::inst('user_created_id'),
@@ -322,10 +368,10 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
         if ($this->request->isAJAX()) {
 
             $reqData = $this->request->getPost();
-            
+
             $cleandatatable = $reqData['cleandatatable'] ?? 0;
-            
-            if($cleandatatable){
+
+            if ($cleandatatable) {
 
                 $tarifa_encuadernacion_id = $reqData['tarifa_encuadernacion_id'] ?? -1;
 
@@ -338,11 +384,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
                     $csrfTokenName => $newTokenHash
                 ];
                 return $this->respond($data);
-                
-            }
 
-            else{
-            
+            } else {
+
                 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);

ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php

@@ -1,4 +1,5 @@
-<?php namespace App\Controllers\Tarifas;
+<?php
+namespace App\Controllers\Tarifas;
 
 
 use App\Controllers\BaseResourceController;
@@ -10,15 +11,15 @@ use App\Entities\Tarifas\TarifaEncuadernacionLinea;
 use App\Models\Tarifas\TarifaEncuadernacionLineaHorasModel;
 
 use
-    DataTables\Editor,
-    DataTables\Database,
-    DataTables\Editor\Field,
-    DataTables\Editor\Format,
-    DataTables\Editor\Mjoin,
-    DataTables\Editor\Options,
-    DataTables\Editor\Upload,
-    DataTables\Editor\Validate,
-    DataTables\Editor\ValidateOptions;
+DataTables\Editor,
+DataTables\Database,
+DataTables\Editor\Field,
+DataTables\Editor\Format,
+DataTables\Editor\Mjoin,
+DataTables\Editor\Options,
+DataTables\Editor\Upload,
+DataTables\Editor\Validate,
+DataTables\Editor\ValidateOptions;
 
 
 class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceController
@@ -71,9 +72,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
     public function add()
     {
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -82,10 +83,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->save($sanitizedData);
                     } catch (\Exception $e) {
@@ -99,14 +100,14 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
                 $thenRedirect = true;  // Change this to false if you want your user to stay on the form after submission
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
 
                 $id = $this->model->db->insertID();
 
                 $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -134,20 +135,20 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
     public function edit($requestedId = null)
     {
 
-        if ($requestedId == null) :
+        if ($requestedId == null):
             return $this->redirect2listView();
         endif;
         $id = filter_var($requestedId, FILTER_SANITIZE_URL);
         $tarifaEncuadernacionLinea = $this->model->find($id);
 
-        if ($tarifaEncuadernacionLinea == false) :
+        if ($tarifaEncuadernacionLinea == false):
             $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('TarifaEncuadernacionLineas.tarifaencuadernacionLinea')), $id]);
             return $this->redirect2listView('sweet-error', $message);
         endif;
 
-        
 
-        if ($this->request->getPost()) :
+
+        if ($this->request->getPost()):
 
             $nullIfEmpty = true; // !(phpversion() >= '8.1');
 
@@ -156,10 +157,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $sanitizedData = $this->sanitized($postData, $nullIfEmpty);
 
             $noException = true;
-            if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
+            if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) :
 
 
-                if ($this->canValidate()) :
+                if ($this->canValidate()):
                     try {
                         $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData);
                     } catch (\Exception $e) {
@@ -176,12 +177,12 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
 
                 $thenRedirect = false;
             endif;
-            if ($noException && $successfulResult) :
+            if ($noException && $successfulResult):
                 $id = $tarifaEncuadernacionLinea->id ?? $id;
                 $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
 
-                if ($thenRedirect) :
-                    if (!empty($this->indexRoute)) :
+                if ($thenRedirect):
+                    if (!empty($this->indexRoute)):
                         return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
                     else:
                         return $this->redirect2listView('sweet-success', $message);
@@ -214,40 +215,79 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
             $response = Editor::inst($db, 'tarifa_encuadernacion_lineas_horas')
                 ->fields(
                     Field::inst('tiempo_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_min.required')
+                            )
                         ),
                     Field::inst('tiempo_max')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.paginas_libro_max.required')
+                            )
                         ),
                     Field::inst('precio_hora')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.precio_min.required')
+                            )
+                        ),
+                    Field::inst('total_min')
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
+                                "decimal" => ',',
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal')
+                            )
+                        )
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required')
+                            )
                         ),
                     Field::inst('margen')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
+                        ->getFormatter('Format::toDecimalChar')->setFormatter('Format::fromDecimalChar')
+                        ->validator(
+                            'Validate::numeric',
+                            array(
                                 "decimal" => ',',
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal'))
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.decimal')
+                            )
                         )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaAcabadoLineas.validation.margen.required'))
+                        ->validator(
+                            'Validate::notEmpty',
+                            array(
+                                'message' => lang('TarifaAcabadoLineas.validation.margen.required')
+                            )
                         ),
                     Field::inst('tirada_encuadernacion_id'),
                     Field::inst('user_created_id'),
@@ -314,10 +354,10 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
     {
         if ($this->request->isAJAX()) {
             $reqData = $this->request->getPost();
-            
+
             $cleandatatable = $reqData['cleandatatable'] ?? 0;
-            
-            if($cleandatatable){
+
+            if ($cleandatatable) {
 
                 $tarifa_encuadernacion_id = $reqData['tarifa_encuadernacion_id'] ?? -1;
 
@@ -330,9 +370,8 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr
                     $csrfTokenName => $newTokenHash
                 ];
                 return $this->respond($data);
-                
-            }
-            else{
+
+            } else {
                 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);

ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php

@@ -126,15 +126,6 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\BaseResourceControlle
                         ->validator('Validate::notEmpty', array(
                                 'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required'))
                         ),
-                    Field::inst('precio_min')
-                        ->getFormatter( 'Format::toDecimalChar')->setFormatter( 'Format::fromDecimalChar')
-                        ->validator('Validate::numeric', array(
-                                "decimal" => ',',
-                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.decimal'))
-                        )
-                        ->validator('Validate::notEmpty', array(
-                                'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_min.required'))
-                        ),
                     Field::inst('proveedor_id')
                         ->validator('Validate::notEmpty', array(
                             'message' => lang('TarifaEncuadernacionTiradas.validation.tirada_max.required'))