jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/presupuesto_cliente_2'

Browse Source 
Main

See merge request jjimenez/safekat!231
This commit is contained in:
Jaime Jimenez Ortega
2024-05-07 09:01:10 +00:00
parent 282f2274ca e92e7b93f5
commit 5ef1360565
266 changed files with 6544 additions and 10103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
ci4/app/Controllers/Activity.php
View File

@ -1,81 +0,0 @@
<?php
namespace App\Controllers;
use App\Models\ActivityModel;
use App\Models\Usuarios\UserModel;
class Activity extends BaseController
{
private $user_model;
private $activity_model;
function __construct()
{
$this->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);
}
}

16
ci4/app/Controllers/Ajax.php
View File

@ -5,8 +5,8 @@ namespace App\Controllers;
use App\Models\CronTabModel;
use App\Models\NotificationModel;
use App\Models\Usuarios\UserModel;
use App\Models\Usuarios\UserGroupModel;
use App\Models\Usuarios\GroupUserModel;
use App\Models\Usuarios\GroupModel;
use App\Models\Usuarios\GroupsUsersModel;
use App\Models\ActivityModel;
use CodeIgniter\RESTful\ResourceController;
@ -24,8 +24,8 @@ class Ajax extends ResourceController
function __construct()
{
$this->user_model = new UserModel();
$this->group_model = new UserGroupModel();
$this->group_user_model = new GroupUserModel();
$this->group_model = new GroupModel();
$this->group_user_model = new GroupsUsersModel();
$this->activity_model = new ActivityModel();
$this->crontab_model = new CronTabModel();
$this->notification_model = new NotificationModel();
@ -56,20 +56,20 @@ class Ajax extends ResourceController
//Total number of records without filtering
$totalRecords = $this->user_model->select('id_user')
//->join('auth_user_group','auth_user_group.token = auth_user.group')
//->join('auth_groups','auth_groups.token = auth_user.group')
->countAllResults();
//Total number of records with filtering
$totalRecordwithFilter = $this->user_model->select('id_user')
//->join('auth_user_group','auth_user_group.token = auth_user.group')
//->join('auth_groups','auth_groups.token = auth_user.group')
->orLike('first_name', $searchValue)
->orLike('email', $searchValue)
->countAllResults();
//Fetch records
//$records = $this->user_model->select('auth_user.*,auth_user_group.title')
//$records = $this->user_model->select('auth_user.*,auth_groups.title')
$records = $this->user_model->select('auth_user.*')
//->join('auth_user_group','auth_user_group.token = auth_user.group')
//->join('auth_groups','auth_groups.token = auth_user.group')
->orLike('first_name', $searchValue)
->orLike('email', $searchValue)
->orderBy($columnName,$columnSortOrder)

273
ci4/app/Controllers/Api.php
View File

@ -1,273 +0,0 @@
<?php
namespace App\Controllers;
use App\Libraries\PasswordHash;
use App\Models\SettingsModel;
use App\Models\Usuarios\UserModel;
use CodeIgniter\HTTP\IncomingRequest;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\RESTful\ResourceController;
use CodeIgniter\Validation\Exceptions\ValidationException;
use Config\Services;
class Api extends ResourceController
{
private $user_model;
private $settings_model;
private $data_format;
function __construct()
{
$this->user_model = new UserModel();
$this->settings_model = new SettingsModel();
$this->data_format = getenv('api.return')??'json';
}
public function index()
{
return $this->response->setJSON([
'message' => 'Welcome!'
]);
}
public function status()
{
return $this->response->setJSON([
'status' => true,
'message' => 'The system is running!'
]);
}
public function signIn()
{
$rules = [
'email' => 'required|valid_email|validateAuthPermission[email]',
'password' => 'required|validateAuthPassword[email, password]'
];
$errors = [
'email' => [
'required' => 'The email field is required.',
'valid_email' => 'Invalid email.',
'validateAuthPermission' => 'This user {value} does not have access permission.'
],
'password' => [
'required' => 'The password field is required.',
'validateAuthPassword' => 'Invalid password.'
]
];
$input = $this->baseRequest($this->request);
if (!$this->baseValidateRequest($input, $rules, $errors)) {
return $this->baseResponse($this->validator->getErrors(),ResponseInterface::HTTP_BAD_REQUEST);
}
return $this->generateCredential($input['email']);
}
private function generateCredential(string $email, int $responseCode = ResponseInterface::HTTP_OK){
try {
helper('jwt');
return $this->baseResponse([
'access_token' => jwtSignature($email)
]);
} catch (\Exception $exception) {
return $this->baseResponse(['error' => $exception->getMessage()], $responseCode);
}
}
private function baseResponse(array $responseBody, int $code = ResponseInterface::HTTP_OK)
{
if($this->data_format == 'json'){
return $this->response->setStatusCode($code)->setJSON($responseBody)??'';
}else{
return $this->response->setStatusCode($code)->setXML($responseBody)??'';
}
}
private function baseRequest(IncomingRequest $request){
return $request->getVar()??[];
}
private function baseValidateRequest(array $input, array $rules, array $messages = []){
$this->validator = Services::Validation()->setRules($rules);
if (is_string($rules)) {
$validation = config('Validation');
if (!isset($validation->$rules)) {
throw ValidationException::forRuleNotFound($rules);
}
if (!$messages) {
$errorName = $rules . '_errors';
$messages = $validation->$errorName ?? [];
}
$rules = $validation->$rules;
}
return $this->validator->setRules($rules, $messages)->run($input);
}
public function user($method = null, $key = null)
{
switch ($method):
/**
* Return all users.
*/
case 'all':
try {
$data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->findAll()??[];
return $this->setResponseFormat($this->data_format)->respond($data);
} catch (\Exception $exception) {
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => $exception->getMessage()
]);
}
/**
* Return user for token id.
*/
case 'id':
try {
$data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$key)->first()??[];
return $this->setResponseFormat($this->data_format)->respond($data);
} catch (\Exception $exception) {
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => $exception->getMessage()
]);
}
/**
* Return add user.
*/
case 'add':
try {
$body = $this->request->getVar() == [] ? (array) $this->request->getJSON() : $this->request->getVar();
if(empty($body["first_name"]??"")){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'The first name parameter is null or empty.'
]);
}
if(empty($body["last_name"]??"")){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'The last name parameter is null or empty.'
]);
}
if(empty($body["email"]??"")){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'The email parameter is null or empty.'
]);
}else{
$validate = $this->user_model->where('email',$body["email"]??"")->countAllResults();
if($validate > 0){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'Email already registered!'
]);
}
}
if(empty($body["password"]??"")){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'The password parameter is null or empty.'
]);
}else{
if(strlen($body["password"]??"") < 8){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'Password must be at least 8 characters long.'
]);
}
}
$settings = $this->settings_model->first()??[];
$phpass = new PasswordHash(8, true);
$token = md5(uniqid(rand(), true));
$this->user_model->save([
'group' => $settings['default_role'],
'first_name' => $body['first_name'],
'last_name' => $body['last_name'],
'mobile' => '',
'picture' => '/assets/img/default-user.png',
'email' => $body['email'],
'password' => $phpass->HashPassword($body['password']),
'last_access' => date('Y-m-d h:i:s'),
'last_ip' => '::1',
'language' => $settings['default_language'],
'token' => $token,
'status' => true
]);
$data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$token)->first()??[];
return $this->setResponseFormat($this->data_format)->respond([
'error' => false,
'message' => 'Added successfully!',
'data' => $data??[]
]);
} catch (\Exception $exception) {
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => $exception->getMessage()
]);
}
/**
* Return edit user.
*/
case 'edit':
try {
$data = $this->user_model->where('token',$key)->first()??[];
if($data == []){
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'User not found!'
]);
}
$body = $this->request->getVar() == [] ? (array) $this->request->getJSON() : $this->request->getVar();
$this->user_model->save([
'id_user' => $data['id_user'],
'first_name' => empty($body["first_name"]??"")?$data['first_name']:$body["first_name"]??"",
'last_name' => empty($body["last_name"]??"")?$data['last_name']:$body["last_name"]??"",
'date_birth' => empty($body["date_birth"]??"")?$data['date_birth']:$body["date_birth"]??"",
'address' => empty($body["address"]??"")?$data['address']:$body["address"]??"",
'city' => empty($body["city"]??"")?$data['city']:$body["city"]??"",
'state' => empty($body["state"]??"")?$data['state']:$body["state"]??"",
'country' => empty($body["country"]??"")?$data['country']:$body["country"]??"",
'zip_code' => empty($body["zip_code"]??"")?$data['zip_code']:$body["zip_code"]??"",
'mobile' => empty($body["mobile"]??"")?$data['mobile']:$body["mobile"]??"",
'status' => empty($body["status"]??"")?$data['status']:$body["status"]??""
]);
$data = $this->user_model->select('token,first_name,last_name,date_birth,email,mobile,picture,language,address,address,state,country,zip_code,status,created_at,updated_at')->where('token',$key)->first()??[];
return $this->setResponseFormat($this->data_format)->respond([
'error' => false,
'message' => 'Successfully Edited!',
'data' => $data??[]
]);
} catch (\Exception $exception) {
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => $exception->getMessage()
]);
}
/**
* Return delete user.
*/
case 'delete':
try {
$this->user_model->where('token', $key)->delete();
return $this->setResponseFormat($this->data_format)->respond([
'error' => false,
'message' => 'Successfully deleted!'
]);
} catch (\Exception $exception) {
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => $exception->getMessage()
]);
}
/**
* Return Default.
*/
default:
return $this->setResponseFormat($this->data_format)->respond([
'error' => true,
'message' => 'Method call is invalid.'
]);
endswitch;
}
}

21
ci4/app/Controllers/BaseController.php
View File

@ -37,7 +37,7 @@ class BaseController extends Controller
*
* @var array
*/
protected $helpers = ['general','jwt'];
protected $helpers = ['general', 'go_common'];
/**
* Constructor.
@ -57,24 +57,7 @@ class BaseController extends Controller
$language->setLocale($session->lang);
// Set TimeZone
if(empty($session->get('settings'))){
$settingsModel = new SettingsModel();
$settings = $settingsModel->select('default_timezone')->first()??[];
date_default_timezone_set($settings['default_timezone']??'America/Sao_Paulo');
}else{
date_default_timezone_set($session->get('settings')['default_timezone']??'America/Sao_Paulo');
}
date_default_timezone_set('Europe/Madrid');
// Get notification
if(!empty($session->get('token'))) {
$notificationModel = new NotificationModel();
$pulse = $notificationModel->where('user_recipient',$session->get('token'))->where('is_read',false)->countAllResults() ?? 0;
$notification = $notificationModel->select('token,title,is_read,created_at')->where('user_recipient',$session->get('token'))->orderBy('created_at','desc')->findAll(5) ?? [];
$session->set('notification', $notification);
$session->set('pulse', $pulse);
}else{
$session->set('notification', []);
$session->set('pulse', 0);
}
}
}

4
ci4/app/Controllers/GoBaseResourceController.php → ci4/app/Controllers/BaseResourceController.php Executable file → Normal file
View File

@ -8,7 +8,7 @@ use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use Psr\Log\LoggerInterface;
abstract class GoBaseResourceController extends \CodeIgniter\RESTful\ResourceController
abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceController
{
/**
*
@ -85,7 +85,7 @@ abstract class GoBaseResourceController extends \CodeIgniter\RESTful\ResourceCon
*
* @var array
*/
protected $helpers = ['session', 'go_common', 'form', 'text', 'general','jwt']; //JJO
protected $helpers = ['session', 'go_common', 'form', 'text', 'general']; //JJO
/**
* Initializer method.

25
ci4/app/Controllers/Clientes/Cliente.php
View File

@ -1,7 +1,6 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Models\Collection;
@ -9,17 +8,11 @@ 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
class Cliente extends \App\Controllers\BaseResourceController
{
protected $modelName = ClienteModel::class;
@ -78,12 +71,8 @@ class Cliente extends \App\Controllers\GoBaseResourceController
public function add()
{
// JJO
$session = session();
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@ -92,7 +81,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
$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 +140,6 @@ class Cliente extends \App\Controllers\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -165,9 +152,9 @@ class Cliente extends \App\Controllers\GoBaseResourceController
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 +175,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController
}
// 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) ) :

12
ci4/app/Controllers/Clientes/Clientecontactos.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -14,7 +14,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class Clientecontactos extends \App\Controllers\GoBaseResourceController
class Clientecontactos extends \App\Controllers\BaseResourceController
{
protected $modelName = ClienteContactoModel::class;
@ -60,9 +60,9 @@ class Clientecontactos extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

2
ci4/app/Controllers/Clientes/Clientedirecciones.php
View File

@ -10,7 +10,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class Clientedirecciones extends \App\Controllers\GoBaseResourceController
class Clientedirecciones extends \App\Controllers\BaseResourceController
{
protected $modelName = ClienteDireccionesModel::class;
protected $format = 'json';

24
ci4/app/Controllers/Clientes/Clienteplantillaprecios.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
use App\Entities\Clientes\ClientePlantillaPreciosEntity;
@ -9,7 +9,7 @@ use App\Entities\Clientes\ClientePlantillaPreciosEntity;
use App\Models\Clientes\ClientePlantillaPreciosModel;
class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
class Clienteplantillaprecios extends \App\Controllers\BaseResourceController
{
protected $modelName = ClientePlantillaPreciosModel::class;
@ -70,9 +70,9 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
// 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\GoBaseResourceController
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\GoBaseResourceController
$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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -186,9 +182,9 @@ class Clienteplantillaprecios extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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) ) :

8
ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
use App\Entities\Clientes\ClientePlantillaPreciosLineasEntity;
@ -13,7 +13,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class Clienteplantillaprecioslineas extends \App\Controllers\GoBaseResourceController
class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceController
{
protected $modelName = ClientePlantillaPreciosLineasModel::class;
@ -49,9 +49,9 @@ class Clienteplantillaprecioslineas extends \App\Controllers\GoBaseResourceContr
public function update($requestedId = null){
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
if ($requestedId == null) :
return;

8
ci4/app/Controllers/Clientes/Clienteprecios.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
use App\Entities\Clientes\ClientePreciosEntity;
@ -12,7 +12,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class ClientePrecios extends \App\Controllers\GoBaseResourceController
class ClientePrecios extends \App\Controllers\BaseResourceController
{
protected $modelName = ClientePreciosModel::class;
@ -47,9 +47,9 @@ class ClientePrecios extends \App\Controllers\GoBaseResourceController
public function update($requestedId = null)
{
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
if ($requestedId == null) :
return;

4
ci4/app/Controllers/Clientes/Clienteusuarios.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Clientes;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Clientes\ClienteUsuariosModel;
use App\Models\Collection;
@ -15,7 +15,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class Clienteusuarios extends \App\Controllers\GoBaseResourceController
class Clienteusuarios extends \App\Controllers\BaseResourceController
{
protected $modelName = ClienteUsuariosModel::class;

12
ci4/app/Controllers/Compras/Proveedores.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Compras;
use stdClass;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Compras\ProveedorEntity;
use App\Models\Compras\ProveedorModel;
class Proveedores extends \App\Controllers\GoBaseResourceController {
class Proveedores extends \App\Controllers\BaseResourceController {
protected $modelName = ProveedorModel::class;
protected $format = 'json';
@ -69,9 +69,9 @@ class Proveedores extends \App\Controllers\GoBaseResourceController {
$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\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

14
ci4/app/Controllers/Compras/ProveedoresTipos.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Compras;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Compras\ProveedorTipoEntity;
use App\Models\Compras\ProveedorTipoModel;
class ProveedoresTipos extends \App\Controllers\GoBaseResourceController {
class ProveedoresTipos extends \App\Controllers\BaseResourceController {
protected $modelName = ProveedorTipoModel::class;
protected $format = 'json';
@ -21,7 +21,7 @@ class ProveedoresTipos extends \App\Controllers\GoBaseResourceController {
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\GoBaseResourceController {
$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\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

25
ci4/app/Controllers/Configuracion/Calendario.php
View File

@ -1,25 +0,0 @@
<?php
namespace App\Controllers\Configuracion;
use App\Controllers\BaseController;
class Calendario extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Calendario';
}
public function edit()
{
}
}

12
ci4/app/Controllers/Configuracion/Comunidadesautonomas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -11,7 +11,7 @@ use App\Models\Configuracion\PaisModel;
use App\Models\Configuracion\ComunidadAutonomaModel;
class Comunidadesautonomas extends \App\Controllers\GoBaseResourceController
class Comunidadesautonomas extends \App\Controllers\BaseResourceController
{
protected $modelName = ComunidadAutonomaModel::class;
@ -58,9 +58,9 @@ class Comunidadesautonomas extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Configuracion/Formaspagos.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Configuracion\FormaPagoEntity;
use App\Models\Configuracion\FormaPagoModel;
class Formaspagos extends \App\Controllers\GoBaseResourceController
class Formaspagos extends \App\Controllers\BaseResourceController
{
protected $modelName = FormaPagoModel::class;
@ -56,9 +56,9 @@ class Formaspagos extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

138
ci4/app/Controllers/Configuracion/Group.php
View File

@ -1,17 +1,16 @@
<?php namespace App\Controllers\Configuracion;
use App\Entities\Usuarios\UserGroupEntity;
use App\Controllers\GoBaseResourceController;
use App\Models\Usuarios\UserGroupModel;
use App\Models\Usuarios\GroupUserModel;
use App\Models\Usuarios\GroupModel;
use App\Models\Usuarios\GroupsUsersModel;
use App\Models\Usuarios\PermisosModel;
class Group extends \App\Controllers\GoBaseController
{
use \CodeIgniter\API\ResponseTrait;
protected static $primaryModelName = 'App\Models\Usuarios\UserGroupModel';
protected $modelName = UserGroupModel::class;
protected static $primaryModelName = 'App\Models\Usuarios\GroupModel';
protected $modelName = GroupModel::class;
protected static $singularObjectNameCc = 'userGroup';
protected static $singularObjectName = 'Group';
@ -22,13 +21,16 @@ class Group extends \App\Controllers\GoBaseController
protected $indexRoute = 'userGroupList';
private $group_user_model;
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
{
$this->viewData['pageTitle'] = lang('Group.moduleTitle');
self::$viewPath = getenv('theme.path') . 'form/group/';
// Breadcrumbs
$this->viewData['breadcrumb'] = [
['title' => "Home", 'route' => "javascript:void(0);", 'active' => false],
['title' => lang("App.menu_permission_group"), 'route' => site_url("configuracion/group"), 'active' => true]
];
parent::initController($request, $response, $logger);
}
@ -38,8 +40,7 @@ class Group extends \App\Controllers\GoBaseController
$this->viewData['usingClientSideDataTable'] = true;
$this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Groups.group')]);
// IMN
$this->group_user_model = new GroupUserModel();
$this->viewData['model'] = $this->group_user_model;
$this->viewData['model'] = $this->model;
parent::index();
}
@ -47,54 +48,37 @@ class Group extends \App\Controllers\GoBaseController
public function add()
{
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
if ($this->request->getPost()) :
$postData = $this->request->getPost();
$temp_data['id'] = $groupEntity->id;
$temp_data['title'] = $postData['title'];
$temp_data['description'] = $postData['description'];
$title = $postData['title'];
$dashboard = $postData['dashboard'];
// Clear not rules fields
unset($postData['safekat_token']);
unset($postData['id']);
unset($postData['title']);
unset($postData['dashboard']);
unset($postData['id_group']);
unset($postData['description']);
unset($postData['save']);
unset($postData['selectAll']);
$controller = null;
$rules_access = null;
$rules_access = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
$controller[] = $exp[0];
}
if ($controller != null) {
foreach (array_unique($controller) as $item) {
$rules_access[$item] = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
if ($exp[0] == $item) {
array_push($rules_access[$item], str_replace($exp[0] . '_', '', $key));
}
}
if (!isset($rules_access[$exp[0]])) {
$rules_access[$exp[0]] = [];
}
array_push($rules_access[$exp[0]], str_replace($exp[0] . '_', '', $key));
}
$temp_data['rules'] = json_encode($rules_access ?? '{}');
$temp_data['token'] = md5(uniqid(rand(), true));;
$temp_data['title'] = $title;
$temp_data['dashboard'] = $dashboard;
$sanitizedData = $this->sanitized($temp_data, $nullIfEmpty);
$sanitizedData = $this->sanitized($temp_data, true);
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
if ($successfulResult = $this->canValidate()) :
if ($this->canValidate()) :
try {
@ -130,13 +114,10 @@ class Group extends \App\Controllers\GoBaseController
endif; // ($requestMethod === 'post')
$this->viewData['group'] = isset($sanitizedData) ? new UserGroupModel($sanitizedData) : new UserGroupModel();
$this->viewData['group'] = isset($sanitizedData) ? new GroupModel($sanitizedData) : new GroupModel();
$this->viewData['permisos'] = (new PermisosModel())->find();
$this->viewData['formAction'] = route_to('createGroup');
$this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Group.moduleTitle') . ' ' . lang('Basic.global.addNewSuffix');
return $this->displayForm(__METHOD__);
}
@ -145,7 +126,6 @@ class Group extends \App\Controllers\GoBaseController
{
helper('general');
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -158,56 +138,37 @@ class Group extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
if ($this->request->getPost()) :
$postData = $this->request->getPost();
$id_group = $groupEntity->id_group;
$token = $groupEntity->token;
$title = $postData['title'];
$dashboard = $postData['dashboard'];
$temp_data['id'] = $groupEntity->id;
$temp_data['title'] = $postData['title'];
$temp_data['description'] = $postData['description'];
unset($postData['id_group']);
// Clear not rules fields
unset($postData['safekat_token']);
unset($postData['id']);
unset($postData['title']);
unset($postData['dashboard']);
$controller = null;
$rules_access = null;
unset($postData['description']);
unset($postData['save']);
unset($postData['selectAll']);
$rules_access = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
$controller[] = $exp[0];
}
if ($controller != null) {
foreach (array_unique($controller) as $item) {
$rules_access[$item] = [];
foreach ($postData as $key => $value) {
$exp = explode('_', $key);
if ($exp[0] == $item) {
array_push($rules_access[$item], str_replace($exp[0] . '_', '', $key));
}
}
if (!isset($rules_access[$exp[0]])) {
$rules_access[$exp[0]] = [];
}
array_push($rules_access[$exp[0]], str_replace($exp[0] . '_', '', $key));
}
$temp_data['id_group'] = $id_group;
$temp_data['rules'] = json_encode($rules_access ?? '{}');
$temp_data['token'] = $token;
$temp_data['title'] = $title;
$temp_data['dashboard'] = $dashboard;
$sanitizedData = $this->sanitized($temp_data, $nullIfEmpty);
$sanitizedData = $this->sanitized($temp_data, true);
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
if ($successfulResult = $this->canValidate()) :
if ($this->canValidate()) :
try {
@ -226,13 +187,11 @@ class Group extends \App\Controllers\GoBaseController
$thenRedirect = false;
endif;
if ($noException && $successfulResult) :
$id = $groupEntity->id ?? $id;
$message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.';
if ($session->get('group') == $this->request->getPost('token')) {
$session->set('rules', $temp_data['rules']);
}
if ($thenRedirect) :
if (!empty($this->indexRoute)) :
return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message);
@ -247,12 +206,9 @@ class Group extends \App\Controllers\GoBaseController
endif; // ($requestMethod === 'post')
$this->viewData['group'] = $groupEntity;
$this->viewData['permisos'] = (new PermisosModel())->find();
$this->viewData['formAction'] = route_to('updateGroup', $id);
$this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Group.userGroup') . ' ' . lang('Basic.global.edit3');
return $this->displayForm(__METHOD__, $id);
} // end function edit(...)

12
ci4/app/Controllers/Configuracion/Imposiciones.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Configuracion\Imposicion;
use App\Models\Configuracion\ImposicionModel;
class Imposiciones extends \App\Controllers\GoBaseResourceController
class Imposiciones extends \App\Controllers\BaseResourceController
{
protected $modelName = ImposicionModel::class;
@ -56,9 +56,9 @@ class Imposiciones extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

20
ci4/app/Controllers/Configuracion/Maquinas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Configuracion\Maquina;
use App\Models\Configuracion\MaquinaModel;
class Maquinas extends \App\Controllers\GoBaseResourceController
class Maquinas extends \App\Controllers\BaseResourceController
{
protected $modelName = MaquinaModel::class;
@ -69,12 +69,10 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -153,9 +149,9 @@ class Maquinas extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
}
// 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) ) :

4
ci4/app/Controllers/Configuracion/Maquinascalles.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -13,7 +13,7 @@ use
DataTables\Editor\Field;
class Maquinascalles extends \App\Controllers\GoBaseResourceController
class Maquinascalles extends \App\Controllers\BaseResourceController
{
protected static $controllerSlug = 'maquinascalles';

20
ci4/app/Controllers/Configuracion/Maquinasdefecto.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -11,7 +11,7 @@ use App\Models\Configuracion\MaquinaModel;
use App\Models\Configuracion\MaquinasDefectoModel;
class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
class Maquinasdefecto extends \App\Controllers\BaseResourceController
{
protected $modelName = MaquinasDefectoModel::class;
@ -63,12 +63,10 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -154,9 +150,9 @@ class Maquinasdefecto extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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) ) :

4
ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -24,7 +24,7 @@ use
DataTables\Editor\Validate,
DataTables\Editor\ValidateOptions;
class Maquinaspapelesimpresion extends \App\Controllers\GoBaseResourceController {
class Maquinaspapelesimpresion extends \App\Controllers\BaseResourceController {
protected $modelName = MaquinasPapelesImpresionModel::class;

12
ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -15,7 +15,7 @@ use
DataTables\Editor,
DataTables\Editor\Field;
class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController
class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController
{
protected $modelName = MaquinasTarifasImpresionModel::class;
@ -69,9 +69,9 @@ class Maquinastarifasimpresion extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Configuracion/Paises.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Configuracion\PaisEntity;
use App\Models\Configuracion\PaisModel;
class Paises extends \App\Controllers\GoBaseResourceController
class Paises extends \App\Controllers\BaseResourceController
{
protected $modelName = PaisModel::class;
@ -56,9 +56,9 @@ class Paises extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Configuracion/Papelesgenericos.php
View File

@ -3,7 +3,7 @@
namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -11,7 +11,7 @@ use App\Entities\Configuracion\PapelGenerico;
use App\Models\Configuracion\PapelGenericoModel;
class Papelesgenericos extends \App\Controllers\GoBaseResourceController
class Papelesgenericos extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelGenericoModel::class;
@ -72,9 +72,9 @@ class Papelesgenericos extends \App\Controllers\GoBaseResourceController
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

16
ci4/app/Controllers/Configuracion/Papelesimpresion.php
View File

@ -3,7 +3,7 @@
namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
// DataTables PHP library
@ -36,7 +36,7 @@ use App\Models\Configuracion\MaquinasPapelesImpresionModel;
use App\Models\Configuracion\MaquinaModel;
class Papelesimpresion extends \App\Controllers\GoBaseResourceController
class Papelesimpresion extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelImpresionModel::class;
@ -96,9 +96,9 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -173,9 +171,9 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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) {

12
ci4/app/Controllers/Configuracion/Papelformato.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Configuracion\PapelFormatoEntity;
use App\Models\Configuracion\PapelFormatoModel;
class Papelformato extends \App\Controllers\GoBaseResourceController {
class Papelformato extends \App\Controllers\BaseResourceController {
protected $modelName = PapelFormatoModel::class;
protected $format = 'json';
@ -54,9 +54,9 @@ class Papelformato extends \App\Controllers\GoBaseResourceController {
$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\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

2
ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php
View File

@ -19,7 +19,7 @@ use
DataTables\Editor\ValidateOptions;
class Papelimpresionmargenes extends \App\Controllers\GoBaseResourceController
class Papelimpresionmargenes extends \App\Controllers\BaseResourceController
{
protected $modelName = PapelImpresionMargenModel::class;

12
ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -23,7 +23,7 @@ use
DataTables\Editor\ValidateOptions;
class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController {
class Papelimpresiontipologias extends \App\Controllers\BaseResourceController {
protected $modelName = PapelImpresionTipologiaModel::class;
protected $format = 'json';
@ -68,9 +68,9 @@ class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Configuracion/Provincias.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Configuracion;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -11,7 +11,7 @@ use App\Models\Configuracion\PaisModel;
use App\Models\Configuracion\ProvinciaModel;
class Provincias extends \App\Controllers\GoBaseResourceController
class Provincias extends \App\Controllers\BaseResourceController
{
protected $modelName = ProvinciaModel::class;
@ -58,9 +58,9 @@ class Provincias extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

8
ci4/app/Controllers/Configuracion/Tipologias.php
View File

@ -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');

22
ci4/app/Controllers/Configuracion/Users.php
View File

@ -3,11 +3,9 @@
use App\Entities\Usuarios\UserEntity;
use App\Models\Usuarios\UserGroupModel;
use App\Models\Usuarios\GroupUserModel;
use App\Models\Usuarios\UserModel;
use App\Libraries\PasswordHash;
use App\Models\Usuarios\GroupModel;
use App\Models\Usuarios\GroupsUsersModel;
use App\Models\UserModel;
class Users extends \App\Controllers\GoBaseController {
@ -18,7 +16,7 @@ class Users extends \App\Controllers\GoBaseController {
use \CodeIgniter\API\ResponseTrait;
protected static $primaryModelName = 'App\Models\Usuarios\UserModel';
protected static $primaryModelName = 'App\Models\UserModel';
protected static $singularObjectNameCc = 'user';
protected static $singularObjectName = 'User';
@ -33,8 +31,8 @@ class Users extends \App\Controllers\GoBaseController {
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) {
$this->group_model = new UserGroupModel();
$this->group_user_model = new GroupUserModel();
$this->group_model = new GroupModel();
$this->group_user_model = new GroupsUsersModel();
$this->user_model = new UserModel();
$this->viewData['pageTitle'] = lang('Users.moduleTitle');
@ -56,9 +54,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 +151,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');

88
ci4/app/Controllers/Cron.php
View File

@ -1,88 +0,0 @@
<?php
namespace App\Controllers;
use App\Models\ActivityModel;
use App\Models\BackupModel;
use App\Models\CronTabModel;
use App\Models\NotificationModel;
use App\Models\SettingsModel;
use App\Models\Usuarios\UserModel;
class Cron extends BaseController
{
private $integration;
private $user_model;
private $notification_model;
private $crontab_model;
private $settings_model;
private $activity_model;
private $backup_model;
function __construct()
{
$this->integration = new Integration();
$this->user_model = new UserModel();
$this->notification_model = new NotificationModel();
$this->settings_model = new SettingsModel();
$this->crontab_model = new CronTabModel();
$this->activity_model = new ActivityModel();
$this->backup_model = new BackupModel();
}
public function index()
{
$settings = $this->settings_model->first()??[];
// Cron Notification E-mail
try {
$email_list = $this->notification_model
->select('notification.id_notification, recipient.email, notification.title, notification.body')
->join('user AS recipient','notification.user_recipient = recipient.token','left')
->where('send_email_notification',true)
->where('is_send_email',false)
->orderBy('notification.id_notification','desc')
->findAll(25);
foreach ($email_list as $item){
if($this->integration->send_email($item['email'],$item['title'],$item['body'])){
$this->notification_model->save(['id_notification' => $item['id_notification'],'is_send_email' => true]);
}
}
}catch (\Exception $e){
$this->crontab_model->save(['routine'=>'Notification Email','error'=>$e->getMessage()]);
}
// Cron Backup
if(date('Y-m-d') > date('Y-m-d',strtotime($settings['backup_latest']))){
if(date('H:i:s') >= date('H:i:s',strtotime($settings['backup_time']))){
try {
$this->settings_model->save([
'id_settings' => $settings['id_settings'],
'backup_latest' => date('Y-m-d H:i:s')
]);
$this->integration->create_backup();
}catch (\Exception $e){
$this->crontab_model->save(['routine'=>'Backup','error'=>$e->getMessage()]);
}
}
}
// Cron Log Delete
if(date('Y-m-d') >= date('Y-m-d',strtotime(date($settings['remove_log_latest']) . ' +'.$settings['remove_log_time'].' day'))){
try {
$this->settings_model->save([
'id_settings' => $settings['id_settings'],
'remove_log_latest' => date('Y-m-d H:i:s')
]);
$dateStart = date('Y-m-d H:i:s',strtotime(date('Y-m-d H:i:s') . ' -5 year'));
$dateEnd = date('Y-m-d H:i:s',strtotime(date('Y-m-d H:i:s') . ' -30 day'));
$this->crontab_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
$this->activity_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
$this->backup_model->where('created_at between "'.$dateStart.'" and "'.$dateEnd.'"')->delete();
}catch (\Exception $e){
$this->crontab_model->save(['routine'=>'Delete Log','error'=>$e->getMessage()]);
}
}
}
}

129
ci4/app/Controllers/Home.php
View File

@ -19,134 +19,7 @@ class Home extends BaseController
public function index()
{
$session = session();
echo view(getenv('theme.path').'main/defaultlayout');
/*
//echo view(getenv('theme.path').'main/header');
//echo view(getenv('theme.path').'main/menu');
//echo view(getenv('theme.path').'form/dashboard/index');
//echo view(getenv('theme.path').'main/footer');
/*switch ($session->get('dashboard')):
case 'admin':
$data['title'] = [
'module' => lang("App.dashboard_hello").' '.$name,
'page' => lang("App.dashboard_indicators"),
'icon' => ''
];
$data['breadcrumb'] = [
['title' => lang("App.menu_dashboard"), 'route' => "", 'active' => true]
];
//Cards Top
$initialDate = date('Y-m-d H:i:s', strtotime('-1 day', time()));
$finalDate = date('Y-m-d H:i:s');
$data['total_user'] = $this->user_model->countAllResults();
$data['total_new'] = $this->user_model->where('created_at between \''.$initialDate.'\' and \''.$finalDate.'\'')->countAllResults();
$data['total_enabled'] = $this->user_model->where('status',true)->countAllResults();
$data['total_disabled'] = $this->user_model->where('status',false)->countAllResults();
//Char Bar
$titles_char_bar["labels"] = explode(',',lang("App.dashboard_chart_months"));
$value_char_bar["series"] = [];
$return_char_bar_geral = $this->user_model->select("DATE_FORMAT(created_at,'%m') AS month,COUNT(DATE_FORMAT(created_at,'%m')) AS total")
->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(created_at,'%Y')")
->groupBy("DATE_FORMAT(created_at,'%Y-%m')")
->findAll();
$return_char_bar_enabled = $this->user_model->select("DATE_FORMAT(created_at,'%m') AS month,COUNT(DATE_FORMAT(created_at,'%m')) AS total")
->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(created_at,'%Y') AND status = true")
->groupBy("DATE_FORMAT(created_at,'%Y-%m')")
->findAll();
$return_char_bar_disabled = $this->user_model->select("DATE_FORMAT(updated_at,'%m') AS month,COUNT(DATE_FORMAT(updated_at,'%m')) AS total")
->where("DATE_FORMAT(NOW(),'%Y') = DATE_FORMAT(updated_at,'%Y') AND status = false")
->groupBy("DATE_FORMAT(updated_at,'%Y-%m')")
->findAll();
$year = [];
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_geral as $item){
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
}
if($notFound){
array_push($year,0);
}
}
array_push($value_char_bar["series"],$year);
$year = [];
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_enabled as $item){
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
}
if($notFound){
array_push($year,0);
}
}
array_push($value_char_bar["series"],$year);
$year = [];
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_disabled as $item){
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
}
if($notFound){
array_push($year,0);
}
}
array_push($value_char_bar["series"],$year);
$data['data_char_bar'] = json_encode(array_merge($titles_char_bar,$value_char_bar));
$data['data_user'] = $this->user_model->select('picture,first_name,last_name,email,created_at')
->orderBy('id_user','DESC')
->findAll(15);
$data['data_activity'] = $this->activity_model
->select('auth_user.first_name,auth_user.email,auth_activity.detail,auth_activity.created_at')
->join('auth_user','auth_user.token=auth_activity.user')
->orderBy('auth_activity.id_activity','DESC')
->findAll(30);
echo view(getenv('theme.path').'main/header');
//echo view(getenv('theme.path').'form/dashboard/admin',$data);
echo view(getenv('theme.path').'main/footer');
break;
case 'user':
$data['title'] = [
'module' => lang("App.dashboard_hello").' '.$name,
'page' => lang("App.dashboard_indicators"),
'icon' => ''
];
$data['breadcrumb'] = [
['title' => lang("App.menu_dashboard"), 'route' => "", 'active' => true]
];
echo view(getenv('theme.path').'main/header');
//echo view(getenv('theme.path').'form/dashboard/user',$data);
echo view(getenv('theme.path').'main/footer');
break;
default:
echo view(getenv('theme.path').'main/header');
//echo view(getenv('theme.path').'form/dashboard/index');
echo view(getenv('theme.path').'main/footer');
endswitch;
*/
echo view(getenv('theme.path') . 'main/defaultlayout');
}

627
ci4/app/Controllers/Login.php
View File

@ -1,627 +0,0 @@
<?php
namespace App\Controllers;
use App\Libraries\Authenticator;
use App\Libraries\PasswordHash;
use App\Models\ActivityModel;
use App\Models\ConfirmationTokenModel;
use App\Models\NotificationModel;
use App\Models\PasswordRecoveryModel;
use App\Models\SettingsModel;
use App\Models\TemplateModel;
use App\Models\Usuarios\UserModel;
use App\Models\Usuarios\UserGroupModel;
use App\Models\Usuarios\GroupUserModel;
class login extends BaseController
{
private $user_model;
private $group_model;
private $settings_model;
private $pass_recovery_model;
private $activity_model;
private $notification_model;
private $template_model;
private $confirmation_model;
private $integration;
private $group_user_model;
function __construct()
{
$this->user_model = new UserModel();
$this->group_model = new UserGroupModel();
$this->settings_model = new SettingsModel();
$this->pass_recovery_model = new PasswordRecoveryModel();
$this->activity_model = new ActivityModel();
$this->notification_model = new NotificationModel();
$this->template_model = new TemplateModel();
$this->confirmation_model = new ConfirmationTokenModel();
$this->integration = new Integration();
// Get Settings
$loginAuthFilter = new \App\Filters\LoginAuthFilter();
$loginAuthFilter->getSettings();
$this->group_user_model = new GroupUserModel();
}
public function index()
{
$session = session();
$data['settings'] = $session->get('settings');
$header['title'] = lang("App.login_title");
echo view(getenv('theme.path').'login/header',$header);
echo view(getenv('theme.path').'form/login/index',$data);
echo view(getenv('theme.path').'login/footer');
}
public function forgot_password()
{
$session = session();
if($session->get('settings')['forgot_password']??false){
$data['settings'] = $session->get('settings');
$header['title'] = lang("App.login_title_forgot_password");
echo view(getenv('theme.path').'login/header',$header);
echo view(getenv('theme.path').'form/login/forgot_password',$data);
echo view(getenv('theme.path').'login/footer');
}else{
return redirect()->to('/login');
}
}
public function authenticate()
{
$session = session();
$settings = $session->get('settings');
if(!empty($session->get('oauth'))){
// Data obtained by oAuth
$login = $this->user_model->where('email', $session->get('oauth')->email)->first();
} else {
// Data obtained by Form
$getVar = $this->request->getvar();
$login = $this->user_model->where('email', $getVar['email']??'')->first();
// Captcha Validation
if($settings['captcha_login']??false){
if($settings['captcha_gateway'] == 'recaptcha'){
if(isset($getVar['g-recaptcha-response'])){
$captcha = $getVar['g-recaptcha-response'];
$url = 'https://www.google.com/recaptcha/api/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha);
$response = file_get_contents($url);
$responseKeys = json_decode($response,true);
if(!$responseKeys["success"]) {
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
return redirect()->to('login');
}
}else{
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
return redirect()->to('login');
}
}
if($settings['captcha_gateway'] == 'hcaptcha'){
if(isset($getVar['h-captcha-response'])){
$captcha = $getVar['h-captcha-response'];
$url = 'https://hcaptcha.com/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha).'&remoteip='.$_SERVER['REMOTE_ADDR'];
$response = file_get_contents($url);
$responseKeys = json_decode($response,true);
if(!$responseKeys["success"]) {
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
return redirect()->to('login');
}
}else{
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
return redirect()->to('login');
}
}
}
// Remember Me Validation
if($settings['remember_me']??false){
if($getVar['remember']??'' == 'on') {
$params = session_get_cookie_params();
setcookie(session_name(), $_COOKIE[session_name()], time() + 60*60*24*30, $params["path"], $params["domain"], $params["secure"], $params["httponly"]);
}
}
}
if(!empty($login))
{
// Blocked Validation
if($login->blocked!=null){
$dateBlocked = date($login->blocked);
$dateNow = date('Y-m-d H:i:s');
if($dateBlocked > $dateNow){
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_blocked").$settings['throttle_auth_lockour_time'].' '.lang("App.global_hours")]);
return redirect()->to('login');
}else{
$this->user_model->save([
'id_user' => $login->id_user,
'blocked' => null
]);
}
}
// Get Ip Address
$request = \Config\Services::request();
$last_ip = $request->getIPAddress();
if(empty($session->get('oauth'))){
// Check user password
$phpass = new PasswordHash(8, true);
if(!$phpass->CheckPassword($getVar['password']??'', $login->password)){
// Throttling Validation
if($settings['throttle_auth']??false){
$initialDate = date('Y-m-d H:i:s', strtotime('-12 hour', time()));
$finalDate = date('Y-m-d H:i:s');
$amount = $this->activity_model->where('user',$login->token)->where('level','throttling')->where('created_at between \''.$initialDate.'\' and \''.$finalDate.'\'')->countAllResults();
if($amount >= intval($settings['throttle_auth_max_attempts']??'')){
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_blocked").$settings['throttle_auth_lockour_time'].' '.lang("App.global_hours")]);
$blocked = date('Y-m-d H:i:s', strtotime('+'.$settings['throttle_auth_lockour_time'].' hour', time()));
$this->user_model->save([
'id_user' => $login->id_user,
'blocked' => $blocked
]);
return redirect()->to('login');
}else{
// Register Throttling Log
$this->integration->setLog('throttling','login-authenticate',$login->token);
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_pass_invalid_2"). ($amount+1) .lang("App.login_alert_pass_attempt"). $settings['throttle_auth_max_attempts']??0]);
return redirect()->to('login');
}
}
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_pass_invalid")]);
return redirect()->to('login');
}
// Check email confirmed
if($settings['email_confirmation']??false){
if(!$login->email_confirmed){
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.user_alert_email_confirmed")]);
return redirect()->to('login');
}
}
}
// Check user status
if(!$login->status){
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_disabled_access")]);
return redirect()->to('/login');
}
// Get access rules
#$rules = $this->group_model->where('token', $login->'group'])->first();
$groups = $this->group_user_model
->select('token_group')
->where('token_user',$login->token)->findAll();
if (sizeof($groups)>1){
$rules = $this->group_model->select('rules')->where('token',$groups[0])->first()->rules;
$rules = json_decode(html_entity_decode($rules), true);
if($rules==null){
// group doesn't exists now -> then delete from group-user
$groups = $this->group_user_model
->where('token_group',$groups[0])
->delete();
}
for ($i=1; $i<sizeof($groups); $i++){
$temp_rules = $this->group_model->select('rules')->where('token',$groups[$i])->first();
if($temp_rules==null){
// group doesn't exists now -> then delete from group-user
$groups = $this->group_user_model
->where('token_group',$groups[$i])
->delete();
}
else{
$temp_rules=$temp_rules->rules;
foreach ($rules as $key => $value){
if (array_key_exists($key, json_decode(html_entity_decode($temp_rules), true))){
$value2 = json_decode(html_entity_decode($temp_rules), true)[$key];
$rules[$key] = array_unique(array_merge($value, $value2));
}
else{
$rules[$key]= $value;
}
}
foreach (json_decode(html_entity_decode($temp_rules), true) as $key2 => $value2){
if (!array_key_exists($key2, $rules)){
$rules[$key2] = $value2;
}
}
}
}
}
else{
$rules = json_decode($this->group_model->select('rules')->where('token',$groups[0])->first()->rules);
}
// Save data in session
$session->set('id_user', $login->id_user);
//$session->set('group', $login->'group']);
$session->set('first_name', $login->first_name);
$session->set('last_name', $login->last_name);
$session->set('email', $login->email);
$session->set('token', $login->token);
// JJO
$dashboard = 'user';
foreach ($groups as $group){
if($this->group_model->select('dashboard')->where('token',$group)->first()->dashboard == 'admin')
$dashboard = 'admin';
}
$session->set('dashboard', $dashboard);
$session->set('rules', html_entity_decode(json_encode($rules)));
$session->set('picture', $login->picture);
$session->set('tfa', $login->tfa);
$session->set('tfa_secret', $login->tfa_secret);
$session->set('tfa_code', $login->tfa_code);
$session->set('lang', $login->language ?? 'en');
// Update last access
$last_access = date('Y-m-d H:i:s');
$this->user_model->set('last_access', $last_access)->set('last_ip', $last_ip)->where('id_user', $session->get('id_user'))->update();
// Register Access Log
$integration = new \App\Controllers\Integration;
$integration->setLog('information','login-authenticate');
// Check if it has two factors
if($login->tfa??false){
return redirect()->to('/login/authentication');
}else{
return redirect()->to('home');
}
}
else
{
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_user_not_found")]);
return redirect()->to('login');
}
}
public function logout()
{
// Destroy the session
$session = session();
$lang = $session->get('lang');
$session->destroy();
return redirect()->to('/lang/'.$lang);
}
public function signup()
{
$session = session();
helper('form');
$data['settings'] = $session->get('settings');
$header['title'] = lang("App.login_title_signup");
echo view(getenv('theme.path').'login/header',$header);
echo view(getenv('theme.path').'form/login/signup',$data);
echo view(getenv('theme.path').'login/footer');
}
public function authentication()
{
$session = session();
if($session->get('tfa')??false){
$header['title'] = lang("App.login_title_otp");
echo view(getenv('theme.path').'login/header',$header);
echo view(getenv('theme.path').'form/login/authentication');
echo view(getenv('theme.path').'login/footer');
}else{
return redirect()->to('/login');
}
}
public function otp()
{
$session = session();
$tfa_secret = $session->get('tfa_secret');
$tfa_code = $session->get('tfa_code');
$pin = $this->request->getVar();
$otp = "";
foreach ($pin as $key=>$value){
if(strpos($key, 'pin') !== false){
$otp .= $value;
}
}
$tfa = new Authenticator();
$backup_pass = false;
$checkResult = $tfa->verify($tfa_secret??'', $otp);
if($tfa_code??'') {
$backup_codes = explode(',' , $tfa_code??'');
if (in_array($otp, $backup_codes)) {
$backup_pass = true;
$key = array_search($otp, $backup_codes);
unset($backup_codes[$key]);
}
}
if($checkResult || $backup_pass == true) {
$session->set('tfa',false);
$session->set('tfa_secret','');
$session->set('tfa_code','');
return redirect()->to('/home');
} else {
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_code_invalid")]);
return redirect()->to('/login/authentication');
}
}
public function store()
{
$session = session();
$settings = $session->get('settings');
helper('form');
helper('text');
$rules = [
'first_name' => 'required',
'last_name' => 'required',
'email' => 'required|valid_email|is_unique[auth_user.email]',
'password' => 'required|min_length[8]'
];
$rules_error = [
'first_name' => [
'required' => lang("App.login_rules_first_name_r")
],
'last_name' => [
'required' => lang("App.login_rules_last_name_r")
],
'email' => [
'required' => lang("App.login_rules_email_r"),
'is_unique' => lang("App.login_rules_email_i"),
'valid_email' => lang("App.login_rules_email_v"),
],
'password' => [
'required' => lang("App.login_rules_password_r"),
'min_length' => lang("App.login_rules_password_m")
]
];
if ($this->validate($rules,$rules_error)){
if($listPost = $this->request->getPost()) {
if($settings['captcha_register']??false){
if($settings['captcha_gateway'] == 'recaptcha'){
if(isset($listPost['g-recaptcha-response'])){
$captcha = $listPost['g-recaptcha-response'];
$url = 'https://www.google.com/recaptcha/api/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha);
$response = file_get_contents($url);
$responseKeys = json_decode($response,true);
if(!$responseKeys["success"]) {
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
$this->signup();
die();
}
}else{
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
$this->signup();
die();
}
}
if($settings['captcha_gateway'] == 'hcaptcha'){
if(isset($listPost['h-captcha-response'])){
$captcha = $listPost['h-captcha-response'];
$url = 'https://hcaptcha.com/siteverify?secret='.urlencode($settings['captcha_secret_key']??'').'&response='.urlencode($captcha).'&remoteip='.$_SERVER['REMOTE_ADDR'];
$response = file_get_contents($url);
$responseKeys = json_decode($response,true);
if(!$responseKeys["success"]) {
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_invalid")]);
$this->signup();
die();
}
}else{
$session->setFlashdata('toast', ['error',lang("App.login_alert"),lang("App.login_alert_captcha_not_found")]);
$this->signup();
die();
}
}
}
$phpass = new PasswordHash(8, true);
$userToken = md5(uniqid(rand(), true));
$this->user_model->skipValidation(true)->save([
//'group' => $settings['default_role'],
'first_name' => $listPost['first_name'],
'last_name' => $listPost['last_name'],
'mobile' => '',
'picture' => '/assets/img/default-user.png',
'email' => $listPost['email'],
'password' => $phpass->HashPassword($listPost['password']),
'last_access' => date('Y-m-d h:i:s'),
'last_ip' => '::1',
'language' => $settings['default_language'],
'token' => $userToken,
'status' => 1,
'address' => '',
'city' => '',
'state' => '',
'country' => '',
'zip_code' => '',
]);
//Get Data Template
$templates = $this->template_model->findAll();
//Notification E-mail User Welcome
if($settings['send_email_welcome']??false){
$template = templateSelect($templates,'template_label_welcome','email');
if($template != null){
try {
$this->integration->send_email($listPost['email'],$template['subject'],$template['body'],$phpass->HashPassword(MD5($listPost['email'])));
}catch (\Exception $e){
}
}
}
//E-mail Account Confirmation
if($settings['email_confirmation']??false){
$template = templateSelect($templates,'template_label_confirmation_email','email');
if($template != null){
$token = random_string("alnum", 50);
$url = base_url().'/login/confirmation/'.$token;
$body = str_replace('[link_confirmation]',$url,$template['body']);
try {
$this->integration->send_email($listPost['email'],$template['subject'],$body,$phpass->HashPassword(MD5($listPost['email'])));
$this->confirmation_model->save([
'id_confirmation' => null,
'user' => $userToken,
'token' => $token,
'confirmed' => false,
'type' => 'email'
]);
}catch (\Exception $e){
}
}
}
//Notification New Register
if($settings['send_notification_register']??false){
$template = templateSelect($templates,'template_label_notification','email');
if($template != null){
if(!empty($settings['send_user_register']??null)){
$data = [
'id_notification' => null,
'user_sender' => $settings['send_user_register']??null,
'user_recipient' => $settings['send_user_register']??null,
'title' => $template['subject'],
'body' => $template['body'],
'is_read' => false,
'is_send_email' => false,
'send_email_notification' => $settings['send_email_register']??false,
'token' => md5(uniqid(rand(), true))
];
$this->notification_model->save($data);
}
}
}else{
$userAdm = $this->user_model->where('token',$settings['send_user_register']??null)->first();
if($settings['send_email_register']??false){
$template = templateSelect($templates,'template_label_notification','email');
if($template != null){
try {
$this->integration->send_email($userAdm['email'],$template['subject'],$template['body'],$phpass->HashPassword(MD5($listPost['email'])));
}catch (\Exception $e){
}
}
}
}
$session = session();
$session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_register")]);
return redirect()->to('/login');
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"),lang("App.login_alert_parameter_invalid")]);
$this->signup();
}
}else{
$session = session();
$session->setFlashdata('error','error');
$this->signup();
}
}
public function recovery($token=null)
{
$session = session();
if(!empty($token) && $session->get('settings')['forgot_password']??false){
$pass_recovery = $this->pass_recovery_model->where('token',$token)->where('changed',false)->first();
if($pass_recovery != null){
$data['token'] = $token;
$data['user'] = $pass_recovery['user'];
$header['title'] = lang("App.login_title_recovery");
echo view(getenv('theme.path').'login/header',$header);
echo view(getenv('theme.path').'form/login/password_recovery',$data);
echo view(getenv('theme.path').'login/footer');
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_invalid_token")]);
return redirect()->to('/login');
}
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_empty_token")]);
return redirect()->to('/login');
}
}
public function recovery_store()
{
$session = session();
helper('form');
$rules = [
'password' => 'required|min_length[8]'
];
$rules_error = [
'password' => [
'required' => lang("App.login_rules_password_r"),
'min_length' => lang("App.login_rules_password_m")
]
];
if ($this->validate($rules,$rules_error)){
if($listPost = $this->request->getPost()) {
$pass_recovery = $this->pass_recovery_model->where('user',$listPost['user'])->where('token',$listPost['token'])->where('changed',false)->first();
if($pass_recovery != null){
$user = $this->user_model->select('id_user')->where('token',$listPost['user'])->first();
if($user != null){
$phpass = new PasswordHash(8, true);
$this->user_model->save([
'id_user' => $user->id_user,
'password' => $phpass->HashPassword($listPost['password'])
]);
$this->pass_recovery_model->save([
'id_pass_recovery' => $pass_recovery['id_pass_recovery'],
'changed' => true
]);
$session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_recovery")]);
}
}
return redirect()->to('/login');
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_parameter_invalid")]);
$this->recovery($this->request->getVar('token'));
}
}else{
$session->setFlashdata('error','error');
$this->recovery($this->request->getVar('token'));
}
}
public function confirmation($token=null)
{
$session = session();
if(!empty($token)){
$confirmation = $this->confirmation_model->where('token',$token)->where('confirmed',false)->first();
if($confirmation != null){
$user = $this->user_model->select('id_user')->where('token',$confirmation['user'])->first();
if($confirmation['type'] == 'email'){
$this->user_model->save([
'id_user'=>$user['id_user'],
'email_confirmed'=>true
]);
}
$this->confirmation_model->save([
'id_confirmation'=>$confirmation['id_confirmation'],
'confirmed'=>true
]);
$session->setFlashdata('toast', ['success', lang("App.login_alert_success"), lang("App.login_alert_success_confirmation")]);
return redirect()->to('/login');
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_invalid_token")]);
return redirect()->to('/login');
}
}else{
$session->setFlashdata('toast', ['error', lang("App.login_alert"), lang("App.login_alert_empty_token")]);
return redirect()->to('/login');
}
}
}

24
ci4/app/Controllers/Migrate.php
View File

@ -1,24 +0,0 @@
<?php
namespace App\Controllers;
use CodeIgniter\Controller;
use Throwable;
class Migrate extends Controller
{
public function index()
{
$migrate = \Config\Services::migrations();
$file = 'Database\\Migrations\\2023-04-25-161753_RemoveGroupFromUser.php';
try {
$migrate->force($file);
} catch (\Exception $e) {
echo $e->getMessage();
}
}
}

190
ci4/app/Controllers/Notification.php
View File

@ -1,190 +0,0 @@
<?php
namespace App\Controllers;
use App\Models\CountriesModel;
use App\Models\Usuarios\UserModel;
use App\Models\NotificationModel;
class Notification extends BaseController
{
private $user_model;
private $countries_model;
private $id_user;
private $token_user;
private $notification_model;
function __construct()
{
$this->user_model = new UserModel();
$this->countries_model = new CountriesModel();
$this->id_user = session()->get('id_user');
$this->token_user = session()->get('token');
$this->notification_model = new NotificationModel();
}
public function index()
{
$data['title'] = [
'module' => lang("App.notification_title"),
'page' => lang("App.notification_subtitle"),
'icon' => 'fas fa-bell'
];
$data['breadcrumb'] = [
['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
['title' => lang("App.notification_title"), 'route' => "", 'active' => true]
];
$data['btn_add'] = [
'title' => lang("App.notification_btn_add"),
'route' => '/notification/add',
'class' => 'btn btn-lg btn-primary float-md-right',
'icon' => 'fas fa-plus'
];
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/notification/index',$data);
echo view(getenv('theme.path').'main/footer');
}
public function add()
{
helper('form');
$data['title'] = [
'module' => lang("App.notification_add_title"),
'page' => lang("App.notification_add_subtitle"),
'icon' => 'far fa-plus-square'
];
$data['breadcrumb'] = [
['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
['title' => lang("App.notification_title"), 'route' => "/user", 'active' => false],
['title' => lang("App.notification_add_title"), 'route' => "", 'active' => true]
];
$data['btn_return'] = [
'title' => lang("App.global_come_back"),
'route' => '/notification',
'class' => 'btn btn-dark mr-1',
'icon' => 'fas fa-angle-left'
];
$data['btn_submit'] = [
'title' => lang("App.global_save"),
'route' => '',
'class' => 'btn btn-primary mr-1',
'icon' => 'fas fa-save'
];
$data['user'] = $this->user_model->where('status',true)->findAll();
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/notification/form',$data);
echo view(getenv('theme.path').'main/footer');
}
public function store()
{
//Demo Mode
if(env('demo.mode')??false){
session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
return redirect()->to('/notification');
}
$session = session();
helper('form');
$rules = [
'title' => 'required',
'body' => 'required'
];
$rules_error = [
'title' => [
'required' => lang("App.notification_rules_title_r"),
],
'body' => [
'required' => lang("App.notification_rules_body_r"),
]
];
if ($this->validate($rules,$rules_error)){
if($listPost = $this->request->getPost()){
$listPost['send_email_notification'] = isset($listPost['send_email_notification']) && $listPost['send_email_notification'] == 'on';
if(!empty($listPost['user_recipient'])){
$user = $this->user_model->where('token',$session->get('token'))->first();
foreach (keywordEmail()??[] as $item){
$field = str_replace(['[','user_',']'],'',$item);
$listPost['title'] = str_replace('['.$item.']',$user[$field],$listPost['title']);
$listPost['body'] = str_replace('['.$item.']',$user[$field],$listPost['body']);
}
$listPost['token'] = md5(uniqid(rand(), true));
$listPost['user_sender'] = $session->get('token');
$this->notification_model->save($listPost);
}else{
$users = $this->user_model->where('status',true)->findAll();
$data = [];
foreach ($users as $user){
$title = $listPost['title'];
$template = $listPost['body'];
foreach (keywordEmail()??[] as $item){
$field = str_replace(['[','user_',']'],'',$item);
$title = str_replace('['.$item.']',$user[$field],$title);
$template = str_replace('['.$item.']',$user[$field],$template);
}
array_push($data,[
'id_notification' => null,
'user_sender' => $session->get('token'),
'user_recipient' => $user['token'],
'title' => $title,
'body' => $template,
'is_read' => false,
'is_send_email' => false,
'send_email_notification' => $listPost['send_email_notification'],
'token' => md5(uniqid(rand(), true)),
'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s')
]);
}
if(count($data)>0){
$this->notification_model->insertBatch($data);
}
}
if(empty($this->request->getPost('id_notification'))){
$session->setFlashdata('sweet', ['success',lang("App.notification_alert_add")]);
return redirect()->to('/notification');
}else{
$session->setFlashdata('sweet', ['success',lang("App.notification_alert_edit")]);
return redirect()->to('/notification');
}
}
}else{
$session->setFlashdata('error','error');
$this->add();
}
}
public function delete($token)
{
//Demo Mode
if(env('demo.mode')??false){
session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
return redirect()->to('/notification');
}
$session = session();
if(!empty($session->get('token'))){
$this->notification_model->where('token', $token)->delete();
$session->setFlashdata('sweet', ['success',lang("App.notification_alert_delete")]);
return redirect()->to('/notification');
}else{
return redirect()->to('/login');
}
}
}

4
ci4/app/Controllers/Presupuestos/Buscador.php
View File

@ -2,7 +2,7 @@
namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Entities\Configuracion\Maquina;
use App\Models\Collection;
@ -19,7 +19,7 @@ use App\Models\Configuracion\PapelImpresionModel;
use App\Models\Configuracion\MaquinaModel;
use Exception;
class Buscador extends \App\Controllers\GoBaseResourceController
class Buscador extends \App\Controllers\BaseResourceController
{
protected $modelName = "BuscadorModel";

20
ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
View File

@ -2,7 +2,7 @@
namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Entities\Configuracion\Maquina;
use App\Models\Collection;
@ -24,7 +24,7 @@ use App\Models\Configuracion\PapelImpresionModel;
use App\Models\Configuracion\MaquinaModel;
use Exception;
class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
class Cosidotapablanda extends \App\Controllers\BaseResourceController
{
protected $modelName = "PresupuestoModel";
@ -83,12 +83,10 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -184,9 +180,9 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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;

4
ci4/app/Controllers/Presupuestos/Presupuestoacabados.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -10,7 +10,7 @@ use App\Models\Presupuestos\PresupuestoAcabadosModel;
class Presupuestoacabados extends \App\Controllers\GoBaseResourceController
class Presupuestoacabados extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoAcabadosModel::class;

4
ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -10,7 +10,7 @@ use App\Models\Presupuestos\PresupuestoDireccionesModel;
class Presupuestodirecciones extends \App\Controllers\GoBaseResourceController
class Presupuestodirecciones extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoDireccionesModel::class;

4
ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -10,7 +10,7 @@ use DataTables\Editor;
use DataTables\Editor\Field;
use DataTables\Editor\Validate;
class Presupuestoencuadernaciones extends \App\Controllers\GoBaseResourceController
class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoEncuadernacionesModel::class;

4
ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -11,7 +11,7 @@ use App\Models\Clientes\ClienteModel;
use App\Models\Presupuestos\PresupuestoManipuladosModel;
class Presupuestomanipulados extends \App\Controllers\GoBaseResourceController
class Presupuestomanipulados extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoManipuladosModel::class;

2
ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php
View File

@ -6,7 +6,7 @@ use App\Models\Collection;
use App\Models\Presupuestos\PresupuestoPreimpresionesModel;
class Presupuestopreimpresiones extends \App\Controllers\GoBaseResourceController
class Presupuestopreimpresiones extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoPreimpresionesModel::class;

2
ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php
View File

@ -6,7 +6,7 @@ use App\Models\Collection;
use App\Models\Presupuestos\PresupuestoServiciosExtraModel;
class Presupuestoserviciosextra extends \App\Controllers\GoBaseResourceController
class Presupuestoserviciosextra extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoServiciosExtraModel::class;

4
ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php
View File

@ -3,13 +3,13 @@
namespace App\Controllers\Presupuestos;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
use App\Services\PresupuestoService;
class Presupuestotiradasalternativas extends \App\Controllers\GoBaseResourceController
class Presupuestotiradasalternativas extends \App\Controllers\BaseResourceController
{
protected $modelName = PresupuestoManipuladosModel::class;

204
ci4/app/Controllers/Settings.php
View File

@ -1,204 +0,0 @@
<?php
namespace App\Controllers;
use App\Models\CountriesModel;
use App\Models\CronTabModel;
use App\Models\CurrencyModel;
use App\Models\SettingsModel;
use App\Models\TemplateModel;
use App\Models\ThemeModel;
use App\Models\TimezoneModel;
use App\Models\Usuarios\UserGroupModel;
use App\Models\Usuarios\UserModel;
class Settings extends BaseController
{
private $settings_model;
private $countries_model;
private $theme_model;
private $currency_model;
private $timezone_model;
private $group_model;
private $template_model;
private $user_model;
private $crontab_model;
private $integration;
function __construct()
{
$this->settings_model = new SettingsModel();
$this->countries_model = new CountriesModel();
$this->theme_model = new ThemeModel();
$this->currency_model = new CurrencyModel();
$this->timezone_model = new TimezoneModel();
$this->group_model = new UserGroupModel();
$this->template_model = new TemplateModel();
$this->user_model = new UserModel();
$this->crontab_model = new CronTabModel();
$this->integration = new Integration();
}
public function index()
{
helper('form');
$data['title'] = [
'module' => lang("App.settings_title"),
'page' => lang("App.settings_subtitle"),
'icon' => 'fas fa-sliders-h'
];
$data['breadcrumb'] = [
['title' => lang("App.menu_settings"), 'route' => site_url('settings'), 'active' => true]
];
$data['obj'] = $this->settings_model->first();
$data['countries'] = $this->countries_model->select('id_country,code,name')->where('data_lang',session()->get('lang')??'en')->findAll();
$data['theme'] = $this->theme_model->select('id_theme,type,name')->findAll();
$data['currency'] = $this->currency_model->select('id_currency,code,name')->findAll();
$data['timezone'] = $this->timezone_model->select('id_timezone,timezone,description')->findAll();
$data['group'] = $this->group_model->select('token,title')->findAll();
$db = db_connect('default');
$data['tables'] = $db->listTables();
$data['user'] = $this->user_model->select('token,first_name,email')->where('status',true)->findAll();
echo view(getenv('theme.path').'form/settings/index', $data);
}
public function store()
{
//Demo Mode
if(env('demo.mode')??false){
session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
return redirect()->to('/settings');
}
helper('form');
$session = session();
if($listPost = $this->request->getPost()){
$listPost['id_settings'] = 1;
$listPost['captcha_register'] = isset($listPost['captcha_register']) && $listPost['captcha_register'] == 'on';
$listPost['captcha_login'] = isset($listPost['captcha_login']) && $listPost['captcha_login'] == 'on';
$listPost['captcha_recovery'] = isset($listPost['captcha_recovery']) && $listPost['captcha_recovery'] == 'on';
$listPost['registration'] = isset($listPost['registration']) && $listPost['registration'] == 'on';
$listPost['terms_conditions'] = isset($listPost['terms_conditions']) && $listPost['terms_conditions'] == 'on';
$listPost['email_confirmation'] = isset($listPost['email_confirmation']) && $listPost['email_confirmation'] == 'on';
$listPost['send_email_register'] = isset($listPost['send_email_register']) && $listPost['send_email_register'] == 'on';
$listPost['send_notification_register'] = isset($listPost['send_notification_register']) && $listPost['send_notification_register'] == 'on';
$listPost['send_email_welcome'] = isset($listPost['send_email_welcome']) && $listPost['send_email_welcome'] == 'on';
$listPost['remember_me'] = isset($listPost['remember_me']) && $listPost['remember_me'] == 'on';
$listPost['forgot_password'] = isset($listPost['forgot_password']) && $listPost['forgot_password'] == 'on';
$listPost['two_factor_auth'] = isset($listPost['two_factor_auth']) && $listPost['two_factor_auth'] == 'on';
$listPost['throttle_auth'] = isset($listPost['throttle_auth']) && $listPost['throttle_auth'] == 'on';
$listPost['enable_api'] = isset($listPost['enable_api']) && $listPost['enable_api'] == 'on';
$listPost['block_external_api'] = isset($listPost['block_external_api']) && $listPost['block_external_api'] == 'on';
$listPost['remove_log'] = isset($listPost['remove_log']) && $listPost['remove_log'] == 'on';
$listPost['backup_notification_email'] = isset($listPost['backup_notification_email']) && $listPost['backup_notification_email'] == 'on';
$listPost['backup_automatic'] = isset($listPost['backup_automatic']) && $listPost['backup_automatic'] == 'on';
$listPost['backup_table'] = implode(",",$listPost['backup_table']??[]);
$this->settings_model->save($listPost);
$settings = $this->settings_model->first()??[];
$session->set('settings', $settings);
$session->set('lang', $settings['default_language'] ?? 'es');
$session->setFlashdata('sweet', ['success',lang("App.settings_alert_add")]);
return redirect()->to('/settings');
} else{
$session->setFlashdata('sweet', ['error',lang("App.settings_alert_error")]);
return redirect()->to('/settings');
}
}
public function template()
{
helper('form');
$data['title'] = [
'module' => lang("App.template_title"),
'page' => lang("App.template_subtitle"),
'icon' => 'fas fa-mail-bulk'
];
$data['breadcrumb'] = [
['title' => lang("App.menu_dashboard"), 'route' => "/home", 'active' => false],
['title' => lang("App.menu_settings"), 'route' => "/settings", 'active' => false],
['title' => lang("App.template_title"), 'route' => "", 'active' => true]
];
$data['btn_return'] = [
'title' => lang("App.global_come_back"),
'route' => '/home',
'class' => 'btn btn-dark mr-1',
'icon' => 'fas fa-angle-left'
];
$data['btn_submit'] = [
'title' => lang("App.global_save"),
'route' => '',
'class' => 'btn btn-primary mr-1',
'icon' => 'fas fa-save'
];
$data['template'] = $this->template_model->findAll();
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/settings/template', $data);
echo view(getenv('theme.path').'main/footer');
}
public function template_store()
{
//Demo Mode
if(env('demo.mode')??false){
session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
return redirect()->to('/settings/template');
}
$session = session();
helper('form');
if($field = $this->request->getPost()){
$ids = [];
$template = [];
unset($field['files']);
foreach ($field as $key=>$value){
$id = explode('_',$key);
array_push($ids,$id[2]);
}
foreach (array_unique($ids) as $item){
$template[$item] = [];
foreach ($field as $key=>$value){
$id = explode('_',$key);
if($id[2] == $item){
if(empty($template[$item])){
$template[$item] = array_merge( $template[$item],['id_template' => intval($id[2])]);
$template[$item] = array_merge( $template[$item],['subject' => ""]);
$template[$item] = array_merge( $template[$item],['body' => ""]);
}
switch($id[1])
{
case 'email';
switch($id[0])
{
case 'title';
$template[$item] = array_merge( $template[$item],['subject' => $value]);
break;
default;
$template[$item] = array_merge( $template[$item],[$id[0] => $value]);
break;
}
break;
}
}
}
}
$this->template_model->updateBatch($template,'id_template');
$session->setFlashdata('sweet', ['success',lang("App.template_alert_add")]);
return redirect()->to('/settings/template');
} else{
$session->setFlashdata('sweet', ['error',lang("App.template_alert_error")]);
return redirect()->to('/settings/template');
}
}
}

83
ci4/app/Controllers/Sistema/Actividad.php Normal file
View File

@ -0,0 +1,83 @@
<?php namespace App\Controllers\Sistema;
use App\Controllers\BaseResourceController;
use App\Entities\Sistema\ActivityEntity;
use App\Models\CollectionModel;
use App\Models\Sistema\ActivityModel;
class Actividad extends BaseResourceController
{
protected $modelName = ActivityModel::class;
protected $format = 'json';
protected static $controllerSlug = 'activity';
protected static $viewPath = 'themes/backend/vuexy/form/activity/';
protected static $indexRoute = 'activityList';
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
{
$this->viewData['pageTitle'] = lang('Paises.moduleTitle');
// Breadcrumbs
$this->viewData['breadcrumb'] = [
['title' => "Home", 'route' => "javascript:void(0);", 'active' => false],
['title' => lang("App.menu_activity"), 'route' => route_to('activityList'), 'active' => true]
];
parent::initController($request, $response, $logger);
}
public function index()
{
$viewData = [
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Paises.pais')]),
'activityEntity' => new ActivityEntity(),
'usingServerSideDataTable' => true,
'logs' => $this->model->getLogs()->get()->getResultArray()[0] // MEJORAR!!!
];
$viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class
return view(static::$viewPath . static::$indexRoute, $viewData);
}
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(CollectionModel::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 = ActivityModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
return $this->respond(CollectionModel::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource($search)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);
}
}
}

103
ci4/app/Controllers/Sistema/Ajustes.php Normal file
View File

@ -0,0 +1,103 @@
<?php namespace App\Controllers\Sistema;
use App\Controllers\BaseResourceController;
use App\Models\Sistema\SettingsModel;
class Ajustes extends BaseResourceController
{
protected $modelName = SettingsModel::class;
protected $format = 'json';
protected static $controllerSlug = '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';
public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
{
$this->viewData['pageTitle'] = lang('Provincias.moduleTitle');
$this->viewData['usingSweetAlert'] = true;
parent::initController($request, $response, $logger);
}
public function settings()
{
$id = 1;
$settingsEntity = $this->model->find($id);
if (!$settingsEntity) :
$message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Provincias.provincia')), $id]);
return $this->redirect2listView('sweet-error', $message);
endif;
if ($this->request->is('post')) :
$postData = $this->request->getPost();
$sanitizedData = $this->sanitized($postData, true);
$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('Provincias.provincia'))]);
$this->session->setFlashdata('formErrors', $this->model->errors());
endif;
$settingsEntity->fill($sanitizedData);
$thenRedirect = false;
endif;
if ($noException && $successfulResult) :
$id = $settingsEntity->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')
$this->viewData['settingsEntity'] = $settingsEntity;
$this->viewData['formAction'] = route_to('settingsEdit');
$this->viewData['tables'] = db_connect()->listTables();
return $this->displayForm(__METHOD__, $id);
} // end function settings(...)
}

23
ci4/app/Controllers/Tarifas/Tarifaacabado.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Tarifas\TarifaacabadoEntity;
use App\Models\Tarifas\TarifaacabadoModel;
class Tarifaacabado extends \App\Controllers\GoBaseResourceController
class Tarifaacabado extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaacabadoModel::class;
@ -22,7 +22,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
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\GoBaseResourceController
$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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -163,9 +156,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
$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;

12
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -24,7 +24,7 @@ use
use function PHPUnit\Framework\isEmpty;
class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController
class Tarifaacabadolineas extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaAcabadoLineaModel::class;
@ -76,9 +76,9 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -21,7 +21,7 @@ use
DataTables\Editor\ValidateOptions;
class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceController
class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaEncuadernacionLineaModel::class;
@ -73,9 +73,9 @@ class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceControll
{
$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\GoBaseResourceControll
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -21,7 +21,7 @@ use
DataTables\Editor\ValidateOptions;
class Tarifaencuadernacionlineashoras extends \App\Controllers\GoBaseResourceController
class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaEncuadernacionLineaHorasModel::class;
@ -71,9 +71,9 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\GoBaseResourceCon
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\GoBaseResourceCon
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

4
ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -25,7 +25,7 @@ use
DataTables\Editor\ValidateOptions;
class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceController
class Tarifaencuadernaciontiradas extends \App\Controllers\BaseResourceController
{
protected static $controllerSlug = 'tarifaencuadernaciontiradas';

12
ci4/app/Controllers/Tarifas/Tarifaextra.php
View File

@ -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;

12
ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -21,7 +21,7 @@ use
DataTables\Editor\ValidateOptions;
class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController
class Tarifamanipuladolineas extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaManipuladoLineaModel::class;
@ -74,9 +74,9 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController
{
$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\GoBaseResourceController
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
View File

@ -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;

20
ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -13,7 +13,7 @@ use App\Models\Compras\ProveedorTipoModel;
use App\Models\Tarifas\TarifaEncuadernacionDimensionesModel;
class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaEncuadernacionModel::class;
@ -73,12 +73,10 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
// 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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -173,9 +169,9 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
// 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;

20
ci4/app/Controllers/Tarifas/Tarifasenvios.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -15,7 +15,7 @@ use App\Models\Tarifas\TarifaEnvioModel;
use App\Models\Tarifas\TarifaEnvioPrecioModel;
use App\Models\Tarifas\TarifaEnvioZonaModel;
class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
class Tarifasenvios extends \App\Controllers\BaseResourceController {
protected $modelName = TarifaEnvioModel::class;
protected $format = 'json';
@ -72,12 +72,10 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
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\GoBaseResourceController {
// 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\GoBaseResourceController {
public function edit($requestedId = null) {
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -158,9 +154,9 @@ class Tarifasenvios extends \App\Controllers\GoBaseResourceController {
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\GoBaseResourceController {
// JJO
if (isset($this->model->user_updated_id)) {
$sanitizedData['user_updated_id'] = $session->id_user;
$sanitizedData['user_updated_id'] = auth()->user()->id;
}
$noException = true;

12
ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -17,7 +17,7 @@ use
DataTables\Editor,
DataTables\Editor\Field;
class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
class Tarifasenviosprecios extends \App\Controllers\BaseResourceController {
protected $modelName = TarifaEnvioPrecioModel::class;
protected $format = 'json';
@ -68,9 +68,9 @@ class Tarifasenviosprecios extends \App\Controllers\GoBaseResourceController {
$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\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

12
ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -18,7 +18,7 @@ use
DataTables\Editor\Validate,
DataTables\Editor\Field;
class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
class Tarifasenvioszonas extends \App\Controllers\BaseResourceController {
protected $modelName = TarifaEnvioZonaModel::class;
protected $format = 'json';
@ -69,9 +69,9 @@ class Tarifasenvioszonas extends \App\Controllers\GoBaseResourceController {
$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\GoBaseResourceController {
return $this->redirect2listView('sweet-error', $message);
endif;
$requestMethod = $this->request->getMethod();
if ($requestMethod === 'post') :
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');

20
ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
View File

@ -1,7 +1,7 @@
<?php namespace App\Controllers\Tarifas;
use App\Controllers\GoBaseResourceController;
use App\Controllers\BaseResourceController;
use App\Models\Collection;
@ -9,7 +9,7 @@ use App\Entities\Tarifas\TarifaManipuladoEntity;
use App\Models\Tarifas\TarifaManipuladoModel;
class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
class Tarifasmanipulado extends \App\Controllers\BaseResourceController
{
protected $modelName = TarifaManipuladoModel::class;
@ -69,12 +69,10 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
// 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\GoBaseResourceController
public function edit($requestedId = null)
{
// JJO
$session = session();
if ($requestedId == null) :
return $this->redirect2listView();
@ -156,9 +152,9 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController
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\GoBaseResourceController
// 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;

18
ci4/app/Controllers/Test.php
View File

@ -7,6 +7,8 @@ use App\Models\Configuracion\MaquinasTarifasImpresionModel;
use App\Models\Configuracion\PapelGenericoModel;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Presupuestos\PresupuestoModel;
use App\Models\Usuarios\GroupModel;
use App\Models\Usuarios\PermisosModel;
use App\Services\PresupuestoService;
class Test extends BaseController
@ -17,9 +19,19 @@ class Test extends BaseController
public function index()
{
$status = PresupuestoService::checkMaquina(1995);
var_dump($status);
echo xdebug_info();
helper('rbac');
//$user = auth()->user();
//echo generate_php_permissions_matrix_constant();
//$user->syncGroups('admin');
//var_dump($user->can('token.menu'));
}

31
ci4/app/Controllers/ViewMode.php Executable file
View File

@ -0,0 +1,31 @@
<?php
namespace App\Controllers;
use App\Controllers\BaseController;
/**
* Class ViewMode
*
* This class extends the BaseController class and provides functionality to set the session variable 'view_mode'
* to the specified view mode and redirect the user to the previous URL.
*/
class ViewMode extends BaseController
{
/**
* This method sets the session variable 'view_mode' to the provided $view_mode parameter and redirects
* the user to the previous URL.
*
* @param string $view_mode (optional) The view mode to set. Defaults to VIEW_MODE_IMPRESION.
* @return \CodeIgniter\HTTP\ResponseInterface|null The redirect response or null if no previous URL is set.
*/
public function index($view_mode = VIEW_MODE_IMPRESION)
{
$session = session();
$viewMode = $view_mode;
$session->remove('view_mode');
$session->set('view_mode', $viewMode);
$url = previous_url();
return redirect()->to($url);
}
}

18
ci4/app/Controllers/Viewmode.php
View File

@ -1,18 +0,0 @@
<?php
namespace App\Controllers;
use App\Controllers\BaseController;
class Viewmode extends BaseController
{
public function index($view_mode = VIEW_MODE_IMPRESION)
{
$session = session();
$viewMode = $view_mode;
$session->remove('view_mode');
$session->set('view_mode', $viewMode);
$url = previous_url();
return redirect()->to($url);
}
}