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 'feat/entidades_modelos_facturas'

Browse Source 
Instalada libreria de PHP para Excel y hecho primer ejemplo de creacion de...

See merge request jjimenez/safekat!282
This commit is contained in:
Jaime Jimenez Ortega
2024-07-06 15:12:47 +00:00
parent 1fb9977094 95ca383215
commit a06efc5736
27 changed files with 268 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class BaseController extends Controller
*
* @var array
*/
protected $helpers = ['general', 'go_common'];
protected $helpers = ['general', 'go_common', 'rbac'];
/**
* Constructor.

75
ci4/app/Controllers/BaseResourceController.php
View File

@ -43,23 +43,23 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
*/
protected static $pluralObjectName;
/**
/**
* Path for the views directory for the extending view controller
*
* @var string
*
* @var string
*/
protected static $viewPath;
/**
* JJO: Variable para indicar si el controlador hace soft_delete o no
*
*
* @var bool
*/
public $soft_delete = false;
/**
* JJO: Variable quién puede ver los registros borrados
*
*
* 0 -> Not Deleted
* 1 -> Soft Deleted, shows up in lists of deleted items for management users
* 2 -> Soft Deleted, does not show up for any user except admin users
@ -85,7 +85,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
*
* @var array
*/
protected $helpers = ['session', 'go_common', 'form', 'text', 'general']; //JJO
protected $helpers = ['session', 'go_common', 'form', 'text', 'general', 'rbac']; //JJO
/**
* Initializer method.
@ -123,7 +123,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
$this->viewData['usingSweetAlert'] = true;
$this->viewData['viewPath'] = static::$viewPath;
$this->viewData['currentLocale'] = $this->request->getLocale();
/* IMN */
@ -159,7 +159,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
}
if (!isset($this->viewData['formAction'])) {
$this->viewData['formAction'] = base_url(strtolower($this->viewData['currentModule']) . '/' . $formActionSuffix . '/' . $action );
$this->viewData['formAction'] = base_url(strtolower($this->viewData['currentModule']) . '/' . $formActionSuffix . '/' . $action);
}
if ((!isset($this->viewData['boxTitle']) || empty($this->viewData['boxTitle'])) && isset(static::$singularObjectName) && !empty(static::$singularObjectName)) {
@ -223,29 +223,28 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
public function delete($id = null)
{
if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
$objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
$objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc) . '.' . static::$singularObjectNameCc));
} else {
$objName = lang('Basic.global.record');
}
if (!$this->soft_delete){
if (!$this->soft_delete) {
if (!$this->model->delete($id)) {
return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
}
}
else{
} else {
$datetime = (new \CodeIgniter\I18n\Time("now"));
$rawResult = $this->model->where('id',$id)
->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),
'is_deleted' => $this->delete_flag])
$rawResult = $this->model->where('id', $id)
->set(['deleted_at' => $datetime->format('Y-m-d H:i:s'),
'is_deleted' => $this->delete_flag])
->update();
if (!$rawResult) {
return $this->failNotFound(lang('Basic.global.deleteError', [$objName]));
}
}
// $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented
$message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]);
$response = $this->respondDeleted(['id' => $id, 'msg' => $message]);
@ -261,20 +260,18 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
protected function canValidate($customValidationRules = null, $customValidationMessages = null)
{
if($customValidationRules == null){
if ($customValidationRules == null) {
$validationRules = $this->model->validationRules ?? $this->formValidationRules ?? null;
}
else{
} else {
$validationRules = $customValidationRules;
}
if ($validationRules == null) {
return true;
}
if($customValidationMessages == null){
$validationErrorMessages = $this->model->validationMessages ?? $this->formValidationErrorMessagess ?? null;;
}
else{
if ($customValidationMessages == null) {
$validationErrorMessages = $this->model->validationMessages ?? $this->formValidationErrorMessagess ?? null;;
} else {
$validationErrorMessages = $customValidationMessages;
}
@ -283,7 +280,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
} else {
$valid = $this->validate($validationRules);
}
$this->validationErrors = $valid ? '' : $this->validator->getErrors();
/*
@ -303,7 +300,8 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
* @param array|null $postData
* @return array
*/
protected function sanitized(array $postData = null, bool $nullIfEmpty = false) {
protected function sanitized(array $postData = null, bool $nullIfEmpty = false)
{
if ($postData == null) {
$postData = $this->request->getPost();
}
@ -317,7 +315,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
}
return $sanitizedData;
}
/**
* Custom fail method needed when CSRF token regeneration is on in security settings
* @param string|array $messages
@ -326,15 +324,15 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
* @param string $customMessage
* @return mixed
*/
protected function failWithNewToken($messages, int $status = 400, string $code = null, string $customMessage = '') {
protected function failWithNewToken($messages, int $status = 400, string $code = null, string $customMessage = '')
{
if (! is_array($messages))
{
if (!is_array($messages)) {
$messages = ['error' => $messages];
}
$response = [
'status' => $status,
'error' => $status,
'status' => $status,
'error' => $status,
'messages' => $messages,
csrf_token() => csrf_hash()
];
@ -360,7 +358,8 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
* Convenience method for common exception handling
* @param \Exception $e
*/
protected function dealWithException(\Exception $e) {
protected function dealWithException(\Exception $e)
{
// using another try / catch block to prevent to avoid CodeIgniter bug throwing trivial exceptions for querying DB errors
try {
$query = $this->model->db->getLastQuery();
@ -368,16 +367,16 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr
$dbError = $this->model->db->error();
$userFriendlyErrMsg = lang('Basic.global.persistErr1', [static::$singularObjectNameCc]);
if (isset($dbError['code']) && $dbError['code'] == 1062) :
$userFriendlyErrMsg .= PHP_EOL.lang('Basic.global.persistDuplErr', [static::$singularObjectNameCc]);
$userFriendlyErrMsg .= PHP_EOL . lang('Basic.global.persistDuplErr', [static::$singularObjectNameCc]);
endif;
// $userFriendlyErrMsg = str_replace("'", "\'", $userFriendlyErrMsg); // Uncomment if experiencing unescaped single quote errors
log_message('error', $userFriendlyErrMsg.PHP_EOL.$e->getMessage().PHP_EOL.$queryStr);
log_message('error', $userFriendlyErrMsg . PHP_EOL . $e->getMessage() . PHP_EOL . $queryStr);
if (isset($dbError['message']) && !empty($dbError['message'])) :
log_message('error', $dbError['code'].' : '.$dbError['message']);
log_message('error', $dbError['code'] . ' : ' . $dbError['message']);
endif;
$this->viewData['errorMessage'] = $userFriendlyErrMsg;
} catch (\Exception $e2) {
log_message('debug', 'You can probably safely ignore this: In attempt to check DB errors, CodeIgniter threw: '.PHP_EOL.$e2->getMessage());
log_message('debug', 'You can probably safely ignore this: In attempt to check DB errors, CodeIgniter threw: ' . PHP_EOL . $e2->getMessage());
}
}
}

82
ci4/app/Controllers/Excel/PrintGiros.php Normal file
View File

@ -0,0 +1,82 @@
<?php
namespace App\Controllers\Excel;
use App\Controllers\BaseController;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
class PrintGiros extends BaseController
{
public function generateExcel($factura_id = null)
{
// AQUI CREAR LAS CONSULTAS A LA BBDD, QUIZAS HAYA QUE CREARLO O COMO POST O COMO QUERY AJAX
// Crear un nuevo Spreadsheet
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
// Especificar encabezados
$headers = [
'BIC (SWIFT)*',
'FECHA FIRMA MANDATO*',
'IBAN*',
'IMPORTE*',
'NOMBRE*',
'PAIS*',
'REFERENCIA DEL ADEUDO (REFADEUDO)*',
'REFERENCIA*',
'REFERENCIA DEL MANDATO (REMANDATO)*',
'RESIDENTE*',
'TIPO DE ADEUDO*',
'FECHA DE COBRO*',
'DIAS*'
];
// Establecer los encabezados en la primera fila
$column = 'A';
foreach ($headers as $header) {
$sheet->setCellValue($column . '1', $header);
$column++;
}
// Generar datos dummy
$dummyData = [
['ABCDEF12', '2024-01-01', 'ES1234567890123456789012', 100.50, 'John Doe', 'Spain', 'REF001', '12345', 'MAND001', 'Yes', 'Type1', '2024-02-01', 30],
['GHIJKL34', '2024-02-01', 'ES9876543210987654321098', 200.75, 'Jane Smith', 'France', 'REF002', '67890', 'MAND002', 'No', 'Type2', '2024-03-01', 60],
// Añade más datos dummy según sea necesario
];
// Rellenar las filas con datos dummy
$rowNumber = 2; // Empezar en la segunda fila
foreach ($dummyData as $row) {
$column = 'A';
foreach ($row as $cell) {
$sheet->setCellValue($column . $rowNumber, $cell);
$column++;
}
$rowNumber++;
}
// Ajustar automáticamente el tamaño de las columnas
foreach (range('A', $column) as $col) {
$sheet->getColumnDimension($col)->setAutoSize(true);
}
// Crear un escritor para guardar el archivo
$writer = new Xlsx($spreadsheet);
// Configurar la respuesta para descarga
$fileName = 'giros_reporte.xlsx';
header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
header('Content-Disposition: attachment;filename="' . $fileName . '"');
header('Cache-Control: max-age=0');
// Escribir el archivo a la salida
$writer->save('php://output');
exit;
}
}

2
ci4/app/Controllers/GoBaseController.php
View File

@ -139,7 +139,7 @@ abstract class GoBaseController extends Controller {
*
* @var array
*/
protected $helpers = ['session', 'go_common', 'text', 'general','jwt']; //JJO
protected $helpers = ['session', 'go_common', 'text', 'general','jwt', 'rbac']; //JJO
public static $queries = [];

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

@ -17,7 +17,7 @@ class Home extends BaseController
public function index()
{
echo view(getenv('theme.path') . 'main/defaultlayout');
echo view(getenv('theme.path') . 'form/home/viewHome');
}

8
ci4/app/Controllers/Tarifas/Acabados/TarifaAcabados.php
View File

@ -48,6 +48,8 @@ class TarifaAcabados extends BaseResourceController
public function index()
{
checkPermission('tarifa-acabado.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tarifaacabado.tarifaacabado')]),
@ -64,6 +66,8 @@ class TarifaAcabados extends BaseResourceController
public function add()
{
checkPermission('tarifa-acabado.create', $this->indexRoute);
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@ -133,8 +137,10 @@ class TarifaAcabados extends BaseResourceController
return $this->displayForm(__METHOD__);
} // end function add()
public function edit($requestedId = null) {
public function edit($requestedId = null)
{
checkPermission('tarifa-acabado.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();

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

@ -40,6 +40,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
public function index()
{
checkPermission('tarifa-extra.menu');
$this->viewData['usingClientSideDataTable'] = true;
@ -51,8 +52,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
public function add()
{
checkPermission('tarifa-extra.create', $this->indexRoute);
if ($this->request->getPost()) :
@ -117,6 +117,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController
public function edit($requestedId = null)
{
checkPermission('tarifa-extra.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();
@ -129,14 +130,10 @@ class Tarifaextra extends \App\Controllers\GoBaseController
return $this->redirect2listView('errorMessage', $message);
endif;
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
$postData = $this->request->getPost();
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
$sanitizedData = $this->sanitized($postData, true);
// JJO
if (isset($this->model->user_updated_id)) {
@ -192,7 +189,6 @@ class Tarifaextra extends \App\Controllers\GoBaseController
return $this->displayForm(__METHOD__, $id);
} // end function edit(...)
public function allItemsSelect()
{
if ($this->request->isAJAX()) {

35
ci4/app/Controllers/Tarifas/Tarifaimpresion.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Tarifas;
use App\Controllers\BaseController;
class Tarifaimpresion extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tarifa impresion';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

35
ci4/app/Controllers/Tarifas/Tarifapapelcompra.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Tarifas;
use App\Controllers\BaseController;
class Tarifapapelcompra extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tarifa papel compra';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

35
ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Tarifas;
use App\Controllers\BaseController;
class Tarifapapeldefecto extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Tarifa papel defecto';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

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

@ -40,19 +40,17 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
public function index()
{
checkPermission('tarifa-preimpresion.menu');
$this->viewData['usingClientSideDataTable'] = true;
$this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifapreimpresion.tarifapreimpresion')]);
parent::index();
}
public function add()
{
checkPermission('tarifa-preimpresion.create', $this->indexRoute);
if ($this->request->getPost()) :
@ -117,6 +115,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController
public function edit($requestedId = null)
{
checkPermission('tarifa-preimpresion.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();

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

@ -55,6 +55,8 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
public function index()
{
// Check if the user is allowed to list items
checkPermission('tarifa-encuadernacion.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
@ -73,8 +75,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
public function add()
{
checkPermission('tarifa-encuadernacion.create', $this->indexRoute);
if ($this->request->getPost()) :
@ -157,6 +158,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
public function edit($requestedId = null)
{
checkPermission('tarifa-encuadernacion.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();
@ -248,6 +250,12 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController
return $this->displayForm(__METHOD__, $id);
} // end function edit(...)
/*public function delete($id =null){
if (!auth()->user()->can('tarifa-encuadernacion.delete')) {
return $this->fail('No tiene permisos');
}
parent::delete($id);
}*/
public function datatable()
{

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

@ -55,7 +55,10 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
public function index() {
// Check if the user is allowed to list items
checkPermission('tarifa-envio.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('TarifasEnvios.tarifaEnvio')]),
@ -71,9 +74,8 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
public function add() {
checkPermission('tarifa-envio.create', $this->indexRoute);
if ($this->request->getPost()) :
@ -142,6 +144,8 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
public function edit($requestedId = null) {
checkPermission('tarifa-envio.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();
@ -227,6 +231,10 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
// JJO
public function delete($id = null)
{
/*if (!auth()->user()->can('tarifa-envio.delete')) {
return $this->fail('Error');
}*/
if (!empty(static::$pluralObjectNameCc) && !empty(static::$singularObjectNameCc)) {
$objName = mb_strtolower(lang(ucfirst(static::$pluralObjectNameCc).'.'.static::$singularObjectNameCc));
} else {
@ -242,7 +250,6 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController {
else{
$datetime = (new \CodeIgniter\I18n\Time("now"));
$zonaModel = new TarifaEnvioZonaModel();
$zonaResult = $zonaModel->removeAllZonasLineas($id, $datetime, $this->delete_flag);

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

@ -51,6 +51,8 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
public function index()
{
// Check if the user is allowed to list items
checkPermission('tarifa-manipulado.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
@ -69,8 +71,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
public function add()
{
checkPermission('tarifa-manipulado.create', $this->indexRoute);
if ($this->request->getPost()) :
@ -140,6 +141,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
public function edit($requestedId = null)
{
checkPermission('tarifa-manipulado.edit', $this->indexRoute);
if ($requestedId == null) :
return $this->redirect2listView();
@ -151,16 +153,13 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController
$message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Tarifamanipulado.tarifamanipulado')), $id]);
return $this->redirect2listView('sweet-error', $message);
endif;
if ($this->request->getPost()) :
$nullIfEmpty = true; // !(phpversion() >= '8.1');
$postData = $this->request->getPost();
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
$sanitizedData = $this->sanitized($postData, true);
// JJO
if (isset($this->model->user_updated_id)) {