diff --git a/.idea/safekat.iml b/.idea/safekat.iml index 91d27d36..3e9830fc 100755 --- a/.idea/safekat.iml +++ b/.idea/safekat.iml @@ -2,8 +2,6 @@ - - diff --git a/ci4/app/Config/Routing.php b/ci4/app/Config/Routing.php index c0234da8..bd091a65 100644 --- a/ci4/app/Config/Routing.php +++ b/ci4/app/Config/Routing.php @@ -87,7 +87,7 @@ class Routing extends BaseRouting * * If FALSE, will stop searching and do NO automatic routing. */ - public bool $autoRoute = false; + public bool $autoRoute = true; /** * If TRUE, will enable the use of the 'prioritize' option diff --git a/ci4/app/Controllers/Activity.php b/ci4/app/Controllers/Activity.php deleted file mode 100755 index 1e909bcf..00000000 --- a/ci4/app/Controllers/Activity.php +++ /dev/null @@ -1,81 +0,0 @@ -user_model = new UserModel(); - $this->activity_model = new ActivityModel(); - } - - public function index() - { - $session = session(); - - $data['title'] = [ - 'module' => lang("App.activity_title"), - 'page' => lang("App.activity_subtitle"), - 'icon' => 'fas fa-list' - ]; - - $data['breadcrumb'] = [ - ['title' => lang("App.menu_activity"), 'route' => site_url('activity'), 'active' => true] - ]; - - $data['logs'] = $this->activity_model->select('SUM( IF( os LIKE "%Windows%", 1, 0 ) ) AS windows, - SUM( IF( os = "Mac OS X", 1, 0 ) ) AS mac, - SUM( IF( os = "Linux", 1, 0 ) ) AS linux, - SUM( IF( os = "Android", 1, 0 ) ) AS android, - SUM( IF( os = "iOS", 1, 0 ) ) AS iphone, - SUM( IF( browser LIKE "%Chrome%", 1, 0 ) ) AS chrome, - SUM( IF( browser LIKE "%Firefox%", 1, 0 ) ) AS firefox, - SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari, - SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie, - SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge, - SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('auth_activity.user',$session->get('token'))->first(); - $data['all'] = ""; - echo view(getenv('theme.path').'form/activity/index',$data); - } - - public function all() - { - $session = session(); - $dashboard = $session->get('dashboard')??'user'; - if($dashboard != 'admin'){ - return redirect()->to('/activity'); - } - - $data['title'] = [ - 'module' => lang("App.activity_title"), - 'page' => lang("App.activity_subtitle"), - 'icon' => 'fas fa-list' - ]; - - $data['breadcrumb'] = [ - ['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false], - ['title' => lang("App.activity_title"), 'route' => "", 'active' => true] - ]; - - $data['logs'] = $this->activity_model->select('SUM( IF( os LIKE "%Windows%", 1, 0 ) ) AS windows, - SUM( IF( os = "Mac OS X", 1, 0 ) ) AS mac, - SUM( IF( os = "Linux", 1, 0 ) ) AS linux, - SUM( IF( os = "Android", 1, 0 ) ) AS android, - SUM( IF( os = "iOS", 1, 0 ) ) AS iphone, - SUM( IF( browser LIKE "%Chrome%", 1, 0 ) ) AS chrome, - SUM( IF( browser LIKE "%Firefox%", 1, 0 ) ) AS firefox, - SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari, - SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie, - SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge, - SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->first(); - $data['all'] = "/all"; - echo view(getenv('theme.path').'form/activity/index',$data); - } -} diff --git a/ci4/app/Controllers/BaseResourceController.php b/ci4/app/Controllers/BaseResourceController.php index e7736796..f20fc524 100644 --- a/ci4/app/Controllers/BaseResourceController.php +++ b/ci4/app/Controllers/BaseResourceController.php @@ -48,7 +48,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr * * @var string */ - protected static string $viewPath; + protected static $viewPath; /** diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php index 699186a3..29b19977 100755 --- a/ci4/app/Controllers/Clientes/Cliente.php +++ b/ci4/app/Controllers/Clientes/Cliente.php @@ -78,12 +78,10 @@ class Cliente extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -92,7 +90,7 @@ class Cliente extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -151,8 +149,6 @@ class Cliente extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -165,9 +161,9 @@ class Cliente extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -188,7 +184,7 @@ class Cliente extends \App\Controllers\BaseResourceController } // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Clientes/Clientecontactos.php b/ci4/app/Controllers/Clientes/Clientecontactos.php index ed6baa6d..05eec982 100755 --- a/ci4/app/Controllers/Clientes/Clientecontactos.php +++ b/ci4/app/Controllers/Clientes/Clientecontactos.php @@ -60,9 +60,9 @@ class Clientecontactos extends \App\Controllers\BaseResourceController public function add() { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -134,9 +134,9 @@ class Clientecontactos extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php index b8579743..e8577d0d 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php @@ -70,9 +70,9 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController // plantilla desde la lista public function update($requestedId = null) { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : if ($requestedId == null) : return; @@ -94,12 +94,10 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -110,7 +108,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -172,8 +170,6 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -186,9 +182,9 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -197,7 +193,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php index 56dde1d7..23856445 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php @@ -49,9 +49,9 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl public function update($requestedId = null){ - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : if ($requestedId == null) : return; diff --git a/ci4/app/Controllers/Clientes/Clienteprecios.php b/ci4/app/Controllers/Clientes/Clienteprecios.php index e7cb4c85..d2d751ec 100755 --- a/ci4/app/Controllers/Clientes/Clienteprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteprecios.php @@ -47,9 +47,9 @@ class ClientePrecios extends \App\Controllers\BaseResourceController public function update($requestedId = null) { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : if ($requestedId == null) : return; diff --git a/ci4/app/Controllers/Compras/Proveedores.php b/ci4/app/Controllers/Compras/Proveedores.php index 4102eac0..fcbd1be3 100755 --- a/ci4/app/Controllers/Compras/Proveedores.php +++ b/ci4/app/Controllers/Compras/Proveedores.php @@ -69,9 +69,9 @@ class Proveedores extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -157,9 +157,9 @@ class Proveedores extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Compras/ProveedoresTipos.php b/ci4/app/Controllers/Compras/ProveedoresTipos.php index 0839c1da..5b245dbe 100755 --- a/ci4/app/Controllers/Compras/ProveedoresTipos.php +++ b/ci4/app/Controllers/Compras/ProveedoresTipos.php @@ -21,7 +21,7 @@ class ProveedoresTipos extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'proveedorestipos'; - protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; + protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; protected $indexRoute = 'proveedorTipoList'; @@ -54,9 +54,9 @@ class ProveedoresTipos extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -128,9 +128,9 @@ class ProveedoresTipos extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php index 8b7e3da8..05ed4593 100755 --- a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php +++ b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php @@ -58,9 +58,9 @@ class Comunidadesautonomas extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -132,9 +132,9 @@ class Comunidadesautonomas extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Formaspagos.php b/ci4/app/Controllers/Configuracion/Formaspagos.php index cd625a91..250ccc62 100755 --- a/ci4/app/Controllers/Configuracion/Formaspagos.php +++ b/ci4/app/Controllers/Configuracion/Formaspagos.php @@ -56,9 +56,9 @@ class Formaspagos extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -129,9 +129,9 @@ class Formaspagos extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Group.php b/ci4/app/Controllers/Configuracion/Group.php index 52b4b7d5..a475ba08 100755 --- a/ci4/app/Controllers/Configuracion/Group.php +++ b/ci4/app/Controllers/Configuracion/Group.php @@ -47,9 +47,9 @@ class Group extends \App\Controllers\GoBaseController public function add() { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -158,9 +158,9 @@ class Group extends \App\Controllers\GoBaseController return $this->redirect2listView('errorMessage', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Imposiciones.php b/ci4/app/Controllers/Configuracion/Imposiciones.php index d73923d0..aa7c6b5e 100755 --- a/ci4/app/Controllers/Configuracion/Imposiciones.php +++ b/ci4/app/Controllers/Configuracion/Imposiciones.php @@ -56,9 +56,9 @@ class Imposiciones extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -130,9 +130,9 @@ class Imposiciones extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Maquinas.php b/ci4/app/Controllers/Configuracion/Maquinas.php index 2d421b62..827c1ae4 100755 --- a/ci4/app/Controllers/Configuracion/Maquinas.php +++ b/ci4/app/Controllers/Configuracion/Maquinas.php @@ -69,12 +69,10 @@ class Maquinas extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -83,7 +81,7 @@ class Maquinas extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -139,8 +137,6 @@ class Maquinas extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -153,9 +149,9 @@ class Maquinas extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -173,7 +169,7 @@ class Maquinas extends \App\Controllers\BaseResourceController } // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php index e41626af..e798a228 100755 --- a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php +++ b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php @@ -63,12 +63,10 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -77,7 +75,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -140,8 +138,6 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -154,9 +150,9 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -165,7 +161,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : diff --git a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php index 2eb27e2f..56c08112 100755 --- a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php @@ -69,9 +69,9 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -145,9 +145,9 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Paises.php b/ci4/app/Controllers/Configuracion/Paises.php index a5511b8f..f88a1866 100755 --- a/ci4/app/Controllers/Configuracion/Paises.php +++ b/ci4/app/Controllers/Configuracion/Paises.php @@ -56,9 +56,9 @@ class Paises extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -129,9 +129,9 @@ class Paises extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php index e168c7be..623fd161 100755 --- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php +++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php @@ -72,9 +72,9 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -144,9 +144,9 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index dbcbb994..3669b7eb 100755 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -96,9 +96,9 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController public function add() { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = false; // !(phpversion() >= '8.1'); @@ -159,8 +159,6 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -173,9 +171,9 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -184,7 +182,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; if ($this->request->getPost('defecto') == null) { diff --git a/ci4/app/Controllers/Configuracion/Papelformato.php b/ci4/app/Controllers/Configuracion/Papelformato.php index a9438945..7541426d 100755 --- a/ci4/app/Controllers/Configuracion/Papelformato.php +++ b/ci4/app/Controllers/Configuracion/Papelformato.php @@ -54,9 +54,9 @@ class Papelformato extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -128,9 +128,9 @@ class Papelformato extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php index 494912a0..ec701b66 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php @@ -68,9 +68,9 @@ class Papelimpresiontipologias extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -154,9 +154,9 @@ class Papelimpresiontipologias extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Provincias.php b/ci4/app/Controllers/Configuracion/Provincias.php index a877b197..b599a641 100755 --- a/ci4/app/Controllers/Configuracion/Provincias.php +++ b/ci4/app/Controllers/Configuracion/Provincias.php @@ -58,9 +58,9 @@ class Provincias extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -132,9 +132,9 @@ class Provincias extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Tipologias.php b/ci4/app/Controllers/Configuracion/Tipologias.php index 5b28f92b..f4be0093 100755 --- a/ci4/app/Controllers/Configuracion/Tipologias.php +++ b/ci4/app/Controllers/Configuracion/Tipologias.php @@ -41,9 +41,9 @@ class Tipologias extends \App\Controllers\GoBaseController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -113,9 +113,9 @@ class Tipologias extends \App\Controllers\GoBaseController return $this->redirect2listView('errorMessage', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Configuracion/Users.php b/ci4/app/Controllers/Configuracion/Users.php index 7860b0c2..826bfe8d 100755 --- a/ci4/app/Controllers/Configuracion/Users.php +++ b/ci4/app/Controllers/Configuracion/Users.php @@ -56,9 +56,9 @@ class Users extends \App\Controllers\GoBaseController { public function add() { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -153,9 +153,9 @@ class Users extends \App\Controllers\GoBaseController { return $this->redirect2listView('errorMessage', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index 6ecdcc81..37471d33 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -83,12 +83,10 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController public function add($tipo_impresion_id = null) { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -97,7 +95,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; if (!isset($sanitizedData['papel_formato_id']) || $sanitizedData['papel_formato_id'] == null) { $sanitizedData['papel_formato_id'] = 0; @@ -170,8 +168,6 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -184,9 +180,9 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -197,7 +193,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; if ($this->request->getPost('is_duplicado') == null) { $sanitizedData['is_duplicado'] = 0; diff --git a/ci4/app/Controllers/Sistema/Actividad.php b/ci4/app/Controllers/Sistema/Actividad.php index 8b26615f..c6c6b2d3 100644 --- a/ci4/app/Controllers/Sistema/Actividad.php +++ b/ci4/app/Controllers/Sistema/Actividad.php @@ -14,7 +14,7 @@ class Actividad extends BaseResourceController protected static $controllerSlug = 'activity'; - protected static string $viewPath = 'themes/backend/vuexy/form/activity/'; + protected static $viewPath = 'themes/backend/vuexy/form/activity/'; protected static $indexRoute = 'activityList'; diff --git a/ci4/app/Controllers/Sistema/Ajustes.php b/ci4/app/Controllers/Sistema/Ajustes.php index 301d796b..b70769e7 100644 --- a/ci4/app/Controllers/Sistema/Ajustes.php +++ b/ci4/app/Controllers/Sistema/Ajustes.php @@ -13,10 +13,13 @@ class Ajustes extends BaseResourceController protected static $controllerSlug = 'settings'; - protected static string $viewPath = 'themes/vuexy/form/settings/'; + protected static $viewPath = 'themes/backend/vuexy/form/settings/'; protected static string $formViewName = 'settingsForm'; + protected static $singularObjectName = 'settings'; + protected static $singularObjectNameCc = 'settings'; + protected $indexRoute = 'settingForm'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index 95a7abd8..b887c0a2 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -22,7 +22,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifasacabado'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/'; + protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/'; protected $indexRoute = 'tarifaAcabadoList'; @@ -69,12 +69,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - - $requestMethod = $this->request->getMethod(); - - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -83,7 +78,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; @@ -149,8 +144,6 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -163,9 +156,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); - - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -174,7 +165,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); // JJO - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php index 6d17bf8d..e2dd423c 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php @@ -76,9 +76,9 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -150,9 +150,9 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index afd8314c..8790a749 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -73,9 +73,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -145,9 +145,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php index 29e98334..d6c14c06 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php @@ -71,9 +71,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr public function add() { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -145,9 +145,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifaextra.php b/ci4/app/Controllers/Tarifas/Tarifaextra.php index c7379197..83c3b2dc 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaextra.php +++ b/ci4/app/Controllers/Tarifas/Tarifaextra.php @@ -52,9 +52,9 @@ class Tarifaextra extends \App\Controllers\GoBaseController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -117,8 +117,6 @@ class Tarifaextra extends \App\Controllers\GoBaseController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -131,9 +129,9 @@ class Tarifaextra extends \App\Controllers\GoBaseController return $this->redirect2listView('errorMessage', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -142,7 +140,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php index 75997c21..211e1791 100755 --- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php @@ -74,9 +74,9 @@ class Tarifamanipuladolineas extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -147,9 +147,9 @@ class Tarifamanipuladolineas extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index 06de776c..259cf32c 100755 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -52,9 +52,9 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -117,8 +117,6 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -131,9 +129,9 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController return $this->redirect2listView('errorMessage', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -142,7 +140,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php index a5a03de2..be72c4d0 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php +++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php @@ -73,12 +73,10 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -88,7 +86,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; @@ -159,8 +157,6 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -173,9 +169,9 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -185,7 +181,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvios.php b/ci4/app/Controllers/Tarifas/Tarifasenvios.php index a83b783b..497343b3 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvios.php @@ -72,12 +72,10 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -87,7 +85,7 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; } $noException = true; @@ -144,8 +142,6 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -158,9 +154,9 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -170,7 +166,7 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; } $noException = true; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php index e2e11550..48454f0d 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php @@ -68,9 +68,9 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -145,9 +145,9 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php index 512379cf..834337c1 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php @@ -69,9 +69,9 @@ class Tarifasenvioszonas extends \App\Controllers\BaseResourceController { - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -144,9 +144,9 @@ class Tarifasenvioszonas extends \App\Controllers\BaseResourceController { return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index 8bfac1cc..07d706a0 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -69,12 +69,10 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController public function add() { - // JJO - $session = session(); - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -84,7 +82,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_created_id'] = $session->id_user; + $sanitizedData['user_created_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; @@ -142,8 +140,6 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - // JJO - $session = session(); if ($requestedId == null) : return $this->redirect2listView(); @@ -156,9 +152,9 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController return $this->redirect2listView('sweet-error', $message); endif; - $requestMethod = $this->request->getMethod(); + - if ($requestMethod === 'post') : + if ($this->request->getPost()) : $nullIfEmpty = true; // !(phpversion() >= '8.1'); @@ -168,7 +164,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController // JJO if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = $session->id_user; + $sanitizedData['user_updated_id'] = auth()->user()->id; } if ($this->request->getPost('mostrar_en_presupuesto') == null) { $sanitizedData['mostrar_en_presupuesto'] = false; diff --git a/ci4/app/Helpers/go_common_helper.php b/ci4/app/Helpers/go_common_helper.php index b5cf9e3b..7adcc2be 100755 --- a/ci4/app/Helpers/go_common_helper.php +++ b/ci4/app/Helpers/go_common_helper.php @@ -173,7 +173,7 @@ if (!function_exists('getSystemSettings')) { // Get Settings $session = session(); $settingsBase = new \App\Models\Sistema\SettingsModel(); - $settings = $settingsBase->first() ?? []; + $settings = $settingsBase->asArray()->first() ?? []; $session->set('settings', $settings); if (empty($session->get('lang'))) { $session->set('lang', 'es'); diff --git a/ci4/app/Models/ActivityModel.php b/ci4/app/Models/ActivityModel.php deleted file mode 100755 index 3a82f883..00000000 --- a/ci4/app/Models/ActivityModel.php +++ /dev/null @@ -1,20 +0,0 @@ -include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/datatables") ?> -extend('themes/vuexy/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section('content'); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php new file mode 100644 index 00000000..ce9083cc --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php @@ -0,0 +1,431 @@ +
+ + +
+
+ +
+
+ + + +
+
+ +
+ +
+
+
+ + + +
+
+

+ +

+
+
+
+
+ DETALLES ESPECIFICOS DEL ERP (TBD) +
+
+
+ + + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+ + + +
+
+ + " + value="email_smtp) ?>" + > +
+
+ + " + value="email_port) ?>" + > +
+
+ + email_cert : 'none';?> + +
+
+ + " + value="email_address) ?>" + > +
+
+ + " + value="email_pass) ?>" + > +
+ +
+ + " + value="email_name) ?>" + > +
+ + +
+
+ +
+ " + > +
+ +
+
+ +
+ */ ?> +
+
+
+ + + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + " + value="" + /> +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+ " + value="" + /> + +
+
+
+
+
+
+ + + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+
+ +
+ +
+

+ +
+
+

+
+
+ + + + + + + + + + + + +
+
+
+
+
+
+ + */ ?> + +
+
+ + + + +
+ +
+ + + diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php deleted file mode 100755 index 288c4dbb..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php +++ /dev/null @@ -1,1490 +0,0 @@ -include("themes/_commonPartialsBs/select2bs5") ?> -include("themes/_commonPartialsBs/datatables") ?> -extend('themes/backend/vuexy/main/general_settings_layout') ?> - -section('content'); ?> - -
- - -
-
- -
-
- - - -
-
" method="post"> - -
- -
-
-
- - - -
-
-

- -

-
-
-
-
-
- -
-
- - " - value="" - /> -
- - - - -
- */ ?> -
- - -
-
-
- - -
-
- -
- -
- -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
- - - -
- */ ?> -
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
- -
-
- - - -
-
- - " - value="" - > -
-
- - " - value="" - > -
-
- - - -
-
- - " - value="" - > -
-
- - " - value="" - > -
- -
- - " - value="" - > -
-
- -
-
- -
- " - > -
- -
-
- -
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
- -
-
- - - -
-
- - " - value="" - > -
-
- - " - value="" - > -
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
- -
-
-
- -
-
- -
-
-
- -
-
- - " - value="" - /> -
-
- -
- " - value="" - /> - -
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
- - - -
-
-
-
- -
-
- - " - value="" - /> -
-
- - " - value="" - /> -
-
- - " - value="" - /> -
-
- - " - value="" - /> -
-
- - " - value="" - /> -
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
- - - -
-
- - - -
-
- - - -
-
- - " - value="" - /> -
-
-
- -
-
-
- -
-
- -
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
- - -
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
-
- -
-
-
- -
-
- - " - value="" - /> -
-
- -
- " - value="" - /> - -
-
-
- - " - value="" - /> -
-
- - - -
-
- -
- -
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
-
-
- -
-
- -
- " - value="" - /> - -
-
-
-
-
-
- - -
-
-
- - - -
-
-

- -

-
-
-
-
-
-
- -
- -
-

- -
-
-

-
-
- - - - - - - - - - - - -
-
-
-
-
-
- -
-
- - - - -
- - - - - - -endSection() ?> - - - -section('additionalInlineJs') ?> - "use strict"; - $(document).ready(function () { - $('#first_name').focus(); - let configSummerNote = { - height: 150, // set editor height - minHeight: null, // set minimum height of editor - maxHeight: null, // set maximum height of editor - focus: true, // set focus to editable area after initializing summernote - toolbar: [ - ['style', ['style']], - ['font', ['bold', 'italic', 'underline', 'clear']], - ['fontname', ['fontname']], - ['color', ['color']], - ['para', ['ul', 'ol', 'paragraph']], - ['height', ['height']], - ['table', ['table']], - ['insert', ['link', 'picture', 'hr']], - ['view', ['codeview']] - ] - } - $("#terms_conditions_text").summernote(configSummerNote); - let dataFormat = [ - { - targets: 2, - render: $.fn.dataTable.render.moment('YYYY-MM-DD HH:mm:ss','') - } - ]; - let order = [[2, "desc"]]; - let translate = '/themes/vuexy/vendor/datatables/locales/.json'; - let button = ["","","",""]; - let columns = [{ data: 'routine' },{ data: 'error' },{ data: 'created_at' }]; - loadDataTableAjax('table-grid', '', translate, true, true, order, columns,dataFormat, button); - load_data_api(); - }); - $("#terms_conditions_text").on("summernote.enter", function(we, e) { - $(this).summernote("pasteHTML", "

"); - e.preventDefault(); - }); - function load_data_api(){ - let api_user_all = document.getElementById("api_user_all"); - let api_user_token = document.getElementById("api_user_token"); - let api_user_add = document.getElementById("api_user_add"); - let api_user_delete = document.getElementById("api_user_delete"); - let api_user_edit = document.getElementById("api_user_edit"); - let api_status = document.getElementById("api_status"); - let api_signin = document.getElementById("api_signin"); - api_user_all.innerText = '[\n' + - ' {\n' + - ' "token": "fdfa9b8b69e2a71f8a35fdaa226745cf",\n' + - ' "first_name": "Web",\n' + - ' "last_name": "Guard",\n' + - ' "date_birth": null,\n' + - ' "email": "test@eduardofiorini.com",\n' + - ' "mobile": "551190000000",\n' + - ' "picture": "/assets/img/default-user.png",\n' + - ' "language": "en",\n' + - ' "address": "",\n' + - ' "state": "",\n' + - ' "country": "BR",\n' + - ' "zip_code": null,\n' + - ' "status": "1",\n' + - ' "created_at": "2021-11-12 14:58:46",\n' + - ' "updated_at": "2021-11-30 16:44:05"\n' + - ' }\n' + - ']'; - api_user_token.innerText = '{\n' + - ' "token": "fdfa9b8b69e2a71f8a35fdaa226745cf",\n' + - ' "first_name": "Web",\n' + - ' "last_name": "Guard",\n' + - ' "date_birth": null,\n' + - ' "email": "test@eduardofiorini.com",\n' + - ' "mobile": "551190000000",\n' + - ' "picture": "/assets/img/default-user.png",\n' + - ' "language": "en",\n' + - ' "address": "",\n' + - ' "state": "",\n' + - ' "country": "BR",\n' + - ' "zip_code": null,\n' + - ' "status": "1",\n' + - ' "created_at": "2021-11-12 14:58:46",\n' + - ' "updated_at": "2021-11-30 16:44:05"\n' + - ' }\n'; - api_user_add.innerText = '{\n' + - ' "error": false,\n' + - ' "message": "Added successfully!",\n' + - ' "data": {\n' + - ' "token": "0c4e735f95425818d76d89d0837bbe9c",\n' + - ' "first_name": "Web",\n' + - ' "last_name": "Guard",\n' + - ' "date_birth": null,\n' + - ' "email": "test@eduardofiorini.com",\n' + - ' "mobile": "",\n' + - ' "picture": "/assets/img/default-user.png",\n' + - ' "language": "pt",\n' + - ' "address": null,\n' + - ' "state": "",\n' + - ' "country": "",\n' + - ' "zip_code": null,\n' + - ' "status": "1",\n' + - ' "created_at": "2021-12-10 14:30:35",\n' + - ' "updated_at": "2021-12-10 14:30:35"\n' + - ' }\n' + - '}'; - api_user_delete.innerText = '{\n' + - ' "error": false,\n' + - ' "message": "Successfully deleted!"\n' + - '}'; - api_user_edit.innerText = '{\n' + - ' "error": false,\n' + - ' "message": "Successfully Edited!",\n' + - ' "data": {\n' + - ' "token": "92f223f92f8d1f95298eba5dd09f53af",\n' + - ' "first_name": "Eduardo",\n' + - ' "last_name": "Fiorini",\n' + - ' "date_birth": "1989-06-19",\n' + - ' "email": "edupva@gmail.com",\n' + - ' "mobile": "556696000000",\n' + - ' "picture": "https://s.gravatar.com/avatar/60bc9eb71c6bc1e82f165ad587bd0947?s=150",\n' + - ' "language": "pt",\n' + - ' "address": "",\n' + - ' "state": "",\n' + - ' "country": "BR",\n' + - ' "zip_code": null,\n' + - ' "status": "1",\n' + - ' "created_at": "2021-11-07 17:04:49",\n' + - ' "updated_at": "2021-12-10 14:31:19"\n' + - ' }\n' + - '}'; - api_status.innerText = '{\n'+ - '"status": true,\n' + - '"message": "The system is running!"\n'+ - '}'; - api_signin.innerText = '{\n'+ - '"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJlbWFpbCI6ImFkbWluQGFkbWluLmNvbSIsImlhdCI6MTYzOTE1NTgyNiwiZXhwIjoxNjM5MTU2MTI2fQ.-gfpuC2jqWBqCiTUFMECbBR0nUqyfW1n8OyWqqNKqvE"\n'+ - '}'; - hljs.highlightBlock(api_user_all) - hljs.highlightBlock(api_user_token) - hljs.highlightBlock(api_user_add) - hljs.highlightBlock(api_user_delete) - hljs.highlightBlock(api_user_edit) - hljs.highlightBlock(api_status) - hljs.highlightBlock(api_signin) - } - function send_test(){ - let email = $("#send_email_test"); - let ajax = new XMLHttpRequest(); - document.getElementById('msg_email_test').style.display = 'block'; - ajax.open("GET", ""+email.val(), true); - ajax.send(); - ajax.onreadystatechange = function() { - if (ajax.readyState == 4 && ajax.status == 200) { - let data = JSON.parse(this.responseText); - document.getElementById('msg_email_test').style.display = 'none'; - if(data.return){ - swal({ - position: 'center', - type: 'success', - title: '', - showConfirmButton: false, - timer: 2000, - confirmButtonClass: 'btn btn-primary', - buttonsStyling: false - }); - }else{ - swal({ - position: 'center', - type: 'error', - title: '', - showConfirmButton: false, - timer: 2000, - confirmButtonClass: 'btn btn-primary', - buttonsStyling: false - }); - } - email.val(""); - } - } - } -endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php deleted file mode 100755 index 69c2d05b..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php +++ /dev/null @@ -1,1173 +0,0 @@ - -" rel="stylesheet"> -" rel="stylesheet"> - -
-
-
-
-
-

- -
-
-
- -
-
-
" method="post"> - -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
- -
-
-
- -
- "> -
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
- - -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- - " value=""> -
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - " value=""> -
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - - -
-
-
-
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- > - -
-
-
-
-
- - " value=""> -
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
- -
- -
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-

-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
- > - -
-
-
-
-
- -
- " value=""> -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-

- -
-
-

-
-
- - - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/template.php b/ci4/app/Views/themes/backend/vuexy/form/settings/template.php deleted file mode 100755 index 03a52c82..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/template.php +++ /dev/null @@ -1,182 +0,0 @@ - -" rel="stylesheet"> - -
-
-
-
-
-

- -
-
-
- -
-
-
" method="post"> - -
-
-
-
-
-
-

-
-
- -
-
-
-
-
- -
- - - -
-
-
-
- - " value=""> -
-
-
-
- - -
-
-
-
- - - -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- - - - -
-
-
-
-
- - -
-
-
- - - - - - - - - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php b/ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php new file mode 100644 index 00000000..c20f054a --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php @@ -0,0 +1,32 @@ +include("themes/_commonPartialsBs/select2bs5") ?> +include("themes/_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> +section("content") ?> +
+
+
+
+

+
+ +
+ + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+ + + +
+
+
+endSection() ?> + + +section("additionalInlineJs") ?> + + + +endSection() ?> diff --git a/getMethod( b/getMethod( new file mode 100644 index 00000000..e69de29b