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

terminada modificacion

Browse Source
This commit is contained in:
Jaime Jiménez
2025-04-04 17:03:08 +02:00
parent a0cb703991
commit cddf64b025
9 changed files with 129 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -239,7 +239,13 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
if(isset($sanitizedData['total_aceptado_revisado']) && $sanitizedData['total_aceptado_revisado'] != 0
&& $sanitizedData['total_aceptado_revisado'] != null && $sanitizedData['total_aceptado_revisado'] != ""){
$sanitizedData['aprobado_at'] = $sanitizedData['updated_at'];
$sanitizedData['aprobado_by'] = $sanitizedData['user_updated_id'];
$sanitizedData['aprobado_user_id'] = $sanitizedData['user_updated_id'];
}
if ($presupuestoEntity->estado_id == 1 && isset($postData['confirmar']) && $postData['confirmar'] == 1) {
$sanitizedData['aprobado_at'] = $sanitizedData['updated_at'];
$sanitizedData['aprobado_user_id'] = $sanitizedData['user_updated_id'];
$sanitizedData['total_aceptado_revisado'] = $sanitizedData['total_presupuesto'];
}
if ($this->request->getPost('is_duplicado') == null) {
@ -638,8 +644,9 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$data['resumen']['total_factor_ponderado'] = is_numeric($presupuesto->total_factor_ponderado) ? $presupuesto->total_factor_ponderado : 0;
$data['total_aceptado_revisado'] = $presupuesto->total_aceptado_revisado;
$data['aprobado_by_at'] = ($presupuesto->aprobado_user_id != null)?model('App\Models\UserModel')->getFullName($presupuesto->aprobado_user_id) . ', '
. date('d/m/Y', strtotime($presupuesto->aprobado_at)):'';
$data['aprobado_by_at'] = ($presupuesto->aprobado_user_id != null)?
model('App\Models\UserModel')->getFullName($presupuesto->aprobado_user_id) . ', '
. date('d/m/Y H:i:s', strtotime($presupuesto->aprobado_at)):'';
$data['resumen']['iva_reducido'] = $presupuesto->iva_reducido;