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/tipo_papel_presup_cliente

Browse Source
This commit is contained in:
Jaime Jiménez
2025-07-18 17:57:19 +02:00
parent ad8e0ac75b df21b5ba05
commit 7bb6329783
11 changed files with 140 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -3686,21 +3686,30 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
public function download_zip() public function download_zip()
{ {
$presupuesto_id = $this->request->getPost('presupuesto_id'); $presupuesto_id = $this->request->getPost('presupuesto_id');
$ot_id = $this->request->getPost('ot_id');
if (!$presupuesto_id) { if (!$presupuesto_id) {
return $this->response->setStatusCode(400)->setBody('Presupuesto ID requerido'); return $this->response->setStatusCode(400)->setBody('Presupuesto ID requerido');
} }
// Definir prefijo si se recibió un ot_id válido
$prefijo = (!empty($ot_id) && is_numeric($ot_id)) ? "OT_{$ot_id}" : null;
$ftpClient = new \App\Libraries\SafekatFtpClient(); $ftpClient = new \App\Libraries\SafekatFtpClient();
try { try {
$zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id); $zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id, $prefijo);
if ($zipPath === null || !file_exists($zipPath)) { if ($zipPath === null || !file_exists($zipPath)) {
return $this->response->setStatusCode(404)->setBody('No se encontraron archivos'); return $this->response->setStatusCode(404)->setBody('No se encontraron archivos');
} }
$nombreArchivo = $prefijo
? "{$prefijo}_PRESUPUESTO_{$presupuesto_id}.zip"
: "archivos_presupuesto_{$presupuesto_id}.zip";
return $this->response return $this->response
->download($zipPath, null) // null = usar nombre original del archivo ->download($zipPath, null)
->setFileName('archivos_presupuesto_' . $presupuesto_id . '.zip'); ->setFileName($nombreArchivo);
} catch (\Throwable $e) { } catch (\Throwable $e) {
log_message('error', $e->getMessage()); log_message('error', $e->getMessage());
return $this->response->setStatusCode(500)->setBody('Error interno'); return $this->response->setStatusCode(500)->setBody('Error interno');
@ -3708,4 +3717,5 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
} }
} }

35
ci4/app/Controllers/Produccion/Ordenmaquina.php
View File

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

35
ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Produccion;
use App\Controllers\BaseController;
class Ordentrabajomaquetacion extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Orden maquetación';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

35
ci4/app/Controllers/Produccion/Pedidoproduccion.php
View File

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

8
ci4/app/Libraries/SafekatFtpClient.php
View File

@ -115,7 +115,7 @@ class SafekatFtpClient
return implode('/', [$this->base_dir, 'pedidos_files', $rootIdExtern]); return implode('/', [$this->base_dir, 'pedidos_files', $rootIdExtern]);
} }
public function downloadZipPresupuesto(int $presupuesto_id): ?string public function downloadZipPresupuesto(int $presupuesto_id, ?string $prefijo = null): ?string
{ {
$modelPedidoLinea = model(PedidoLineaModel::class); $modelPedidoLinea = model(PedidoLineaModel::class);
$model = model(PresupuestoFicheroModel::class); $model = model(PresupuestoFicheroModel::class);
@ -143,8 +143,11 @@ class SafekatFtpClient
foreach ($files as $file) { foreach ($files as $file) {
$originalName = $file->nombre ?? basename($file->file_path); $originalName = $file->nombre ?? basename($file->file_path);
$localFile = $localTempDir . '/' . $originalName; $prefixedName = $prefijo ? $prefijo . '_' . $originalName : $originalName;
$localFile = $localTempDir . '/' . $prefixedName;
$remoteFile = $remotePath . '/' . basename($file->file_path); $remoteFile = $remotePath . '/' . basename($file->file_path);
$this->ftp->get($remoteFile, $localFile); $this->ftp->get($remoteFile, $localFile);
} }
@ -167,4 +170,5 @@ class SafekatFtpClient
} }
} }

2
ci4/app/Views/themes/vuexy/components/dropzone.php
View File

@ -12,7 +12,7 @@
data-bs-parent="#accordionPresupuestoFiles"> data-bs-parent="#accordionPresupuestoFiles">
<div class="accordion-body"> <div class="accordion-body">
<div class="col-12"> <div class="col-12">
<div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>"> <div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>" data-ot-id="<?= $otId ?? '' ?>">
<div class="dz-message needsclick"> <div class="dz-message needsclick">
Arrastre aquí los ficheros o haga click Arrastre aquí los ficheros o haga click

195
ci4/app/Views/themes/vuexy/form/presupuestos/admin/_resumenPresupuestoItems.php
View File

@ -13,92 +13,110 @@
<div class="col-xl-12"> <div class="col-xl-12">
<div class="border rounded p-4 mb-3 pb-3"> <div class="border rounded p-4 mb-3 pb-3">
<!-- Price Details --> <div class="d-flex justify-content-between align-items-center mb-4">
<dl class="row mb-0"> <h5 class="mb-0">Costes detallados</h5>
<dt class="col-5 py-1 fw-normal text-end">Coste papel</dt> <button class="btn btn-sm btn-link p-0" type="button" data-bs-toggle="collapse"
<dd class="py-1 col-6 text-end"><span id="totalCostePapel" data-bs-target="#detallesCostes" aria-expanded="true"
class="autonumeric-resumen-currency"></span></dd> aria-controls="detallesCostes" title="Mostrar/ocultar detalle de precios">
<dt class="col-5 py-1 fw-normal text-end">Margen papel</dt> <i class="ti ti-chevron-down"></i>
<dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel" </button>
class="autonumeric-resumen-percent"></span></dd> </div>
<dd class="col-3 text-end py-1"><span id="margenPapel"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end"> <div id="detallesCostes" class="collapse">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".costes-impresion" aria-expanded="false" aria-controls="costes-impresion"> <!-- Price Details -->
<i class="ti ti-list ti-sm mx-2"></i> <dl class="row mb-0">
</a> <dt class="col-5 py-1 fw-normal text-end">Coste papel</dt>
Coste impresión <dd class="py-1 col-6 text-end"><span id="totalCostePapel"
</dt> class="autonumeric-resumen-currency"></span></dd>
<dd class="col-6 text-end py-1"><span id="totalCosteImpresion" <dt class="col-5 py-1 fw-normal text-end">Margen papel</dt>
class="autonumeric-resumen-currency"></span></dd> <dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel"
<!-- Bloque colapsable, sin <div>, solo usando clases --> class="autonumeric-resumen-percent"></span></dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste clicks</dt> <dd class="col-3 text-end py-1"><span id="margenPapel"
<dd class="col-6 text-end py-1 collapse costes-impresion"> class="autonumeric-resumen-currency"></span></dd>
<span id="totalCosteClicks" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste horas</dt> <dt class="col-5 fw-normal text-end">
<dd class="col-6 text-end py-1 collapse costes-impresion"> <a href="javascript:void(0);" data-bs-toggle="collapse"
<span id="totalCosteHoras" class="autonumeric-resumen-currency"></span> data-bs-target=".costes-impresion" aria-expanded="false"
</dd> aria-controls="costes-impresion">
<i class="ti ti-list ti-sm mx-2"></i>
</a>
Coste impresión
</dt>
<dd class="col-6 text-end py-1"><span id="totalCosteImpresion"
class="autonumeric-resumen-currency"></span></dd>
<!-- Bloque colapsable, sin <div>, solo usando clases -->
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste clicks</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteClicks" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste tinta</dt> <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste horas</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion"> <dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteTinta" class="autonumeric-resumen-currency" ></span> <span id="totalCosteHoras" class="autonumeric-resumen-currency"></span>
</dd> </dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt> <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste tinta</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion"> <dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteCorte" class="autonumeric-resumen-currency"></span> <span id="totalCosteTinta" class="autonumeric-resumen-currency"></span>
</dd> </dd>
<dt class="col-5 py-1 fw-normal text-end">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".margen-impresion" aria-expanded="false" aria-controls="margen-impresion">
<i class="ti ti-list ti-sm mx-2"></i>
</a>
Margen impresión
</dt>
<dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion"
class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1"><span id="margenImpresion"
class="autonumeric-resumen-currency"></span></dd>
<!-- Bloque colapsable, sin <div>, solo usando clases -->
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen clicks</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenClicks" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen horas</dt> <dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion"> <dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalMargenHoras" class="autonumeric-resumen-currency"></span> <span id="totalCosteCorte" class="autonumeric-resumen-currency"></span>
</dd> </dd>
<dt class="col-5 py-1 fw-normal text-end">
<a href="javascript:void(0);" data-bs-toggle="collapse"
data-bs-target=".margen-impresion" aria-expanded="false"
aria-controls="margen-impresion">
<i class="ti ti-list ti-sm mx-2"></i>
</a>
Margen impresión
</dt>
<dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion"
class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1"><span id="margenImpresion"
class="autonumeric-resumen-currency"></span></dd>
<!-- Bloque colapsable, sin <div>, solo usando clases -->
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen clicks</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenClicks" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen tinta</dt> <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen horas</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion"> <dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenTinta" class="autonumeric-resumen-currency" ></span> <span id="totalMargenHoras" class="autonumeric-resumen-currency"></span>
</dd> </dd>
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen corte</dt> <dt class="col-5 fw-normal text-end collapse margen-impresion">Margen tinta</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion"> <dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenCorte" class="autonumeric-resumen-currency"></span> <span id="totalMargenTinta" class="autonumeric-resumen-currency"></span>
</dd> </dd>
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen corte</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenCorte" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end">Coste servicios</dt>
<dd class="col-6 text-end py-1 "><span id="totalServicios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Margen servicios</dt>
<dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios"
class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1 "><span id="margenServicios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Coste de envío</dt>
<dd class="col-6 text-end py-1 "><span id="costeEnvios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Margen envío</dt>
<dd class="col-6 text-end py-1 "><span id="margenEnvios"
class="autonumeric-resumen-currency"></span></dd>
</dl>
</div>
<dt class="col-5 fw-normal text-end">Coste servicios</dt>
<dd class="col-6 text-end py-1 "><span id="totalServicios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Margen servicios</dt>
<dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios"
class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1 "><span id="margenServicios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Coste de envío</dt>
<dd class="col-6 text-end py-1 "><span id="costeEnvios"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Margen envío</dt>
<dd class="col-6 text-end py-1 "><span id="margenEnvios"
class="autonumeric-resumen-currency"></span></dd>
</dl>
<hr class="mx-n4"> <hr class="mx-n4">
@ -111,7 +129,7 @@
class="autonumeric-resumen-percent"></span></dd> class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1"><span id="totalMargenes" <dd class="col-3 text-end py-1"><span id="totalMargenes"
class="autonumeric-resumen-currency"></span></dd> class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Total envío base</dt> <dt class="col-5 fw-normal text-end">Total envío base</dt>
<dd class="col-6 text-end py-1 "><span id="precioEnvios" <dd class="col-6 text-end py-1 "><span id="precioEnvios"
class="autonumeric-resumen-currency"></span></dd> class="autonumeric-resumen-currency"></span></dd>
</dl> </dl>
@ -168,7 +186,8 @@
<div class="col-xl-12 mt-3"> <div class="col-xl-12 mt-3">
<div class="card border border-secondary-subtle rounded-3"> <div class="card border border-secondary-subtle rounded-3">
<div class="card-body"> <div class="card-body">
<div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none" role="alert"> <div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none"
role="alert">
<span class="alert-icon alert-icon-lg text-primary me-2"> <span class="alert-icon alert-icon-lg text-primary me-2">
<i class="ti ti-ban ti-sm"></i> <i class="ti ti-ban ti-sm"></i>
</span> </span>
@ -194,15 +213,15 @@
</div> </div>
</div> </div>
<?php /*if ($presupuestoEntity->estado_id == 2): ?> <?php /*if ($presupuestoEntity->estado_id == 2): ?>
<div class="row"> <div class="row">
<div class="col-sm-6 mb-1"> <div class="col-sm-6 mb-1">
<label for="totalAceptado" <label for="totalAceptado"
class="form-label"><?= lang('Presupuestos.totalAceptado') ?></label> class="form-label"><?= lang('Presupuestos.totalAceptado') ?></label>
<input disabled type="text" id="totalAceptado" name="totalAceptado" <input disabled type="text" id="totalAceptado" name="totalAceptado"
class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>> class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
</div> </div>
</div> </div>
<?php endif; */ ?> <?php endif; */ ?>
<div class="row"> <div class="row">
<p> <p>
<span id="aprobado_by_at"></span> <span id="aprobado_by_at"></span>

6
ci4/app/Views/themes/vuexy/form/produccion/ot/otFiles.php
View File

@ -1,5 +1,9 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<?= view("themes/vuexy/components/dropzone",data: ['id' => 'dropzone-ot-files','modelId' => $presupuesto->id]) ?> <?= view("themes/vuexy/components/dropzone", data: [
'id' => 'dropzone-ot-files',
'modelId' => $presupuesto->id,
'otId' => $ot->id
]) ?>
</div><!--//.col --> </div><!--//.col -->
</div><!--//.row --> </div><!--//.row -->

10
httpdocs/assets/js/safekat/components/forms/fileUploadDropzone.js
View File

@ -1,6 +1,6 @@
import Ajax from '../ajax.js'; import Ajax from '../ajax.js';
import { alertSuccessMessage } from '../alerts/sweetAlert.js' import { alertSuccessMessage, alertWarningMessage } from '../alerts/sweetAlert.js'
const PREVIEW_TEMPLATE = ` const PREVIEW_TEMPLATE = `
<div class="dz-preview dz-file-preview"> <div class="dz-preview dz-file-preview">
@ -25,7 +25,7 @@ const PREVIEW_TEMPLATE = `
class FileUploadDropzone { class FileUploadDropzone {
constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos" }) { constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos", otId = null }) {
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
this.domElement = domElement this.domElement = domElement
this.jqElement = $(domElement) this.jqElement = $(domElement)
@ -35,6 +35,7 @@ class FileUploadDropzone {
this.btnDownloadFiles = $(`#${domElement.replace('#', '')}_btnDownloadFiles`); this.btnDownloadFiles = $(`#${domElement.replace('#', '')}_btnDownloadFiles`);
this.dataPost = {} this.dataPost = {}
this.nameId = nameId; this.nameId = nameId;
this.otId = otId;
this.getUri = getUri this.getUri = getUri
this.postUri = postUri this.postUri = postUri
this.dataPost[nameId] = this.modelId; this.dataPost[nameId] = this.modelId;
@ -160,7 +161,8 @@ class FileUploadDropzone {
url: `/presupuestoadmin/download_zip`, url: `/presupuestoadmin/download_zip`,
type: 'POST', type: 'POST',
data: { data: {
[this.nameId]: this.modelId [this.nameId]: this.modelId,
'ot_id': this.otId
}, },
xhrFields: { xhrFields: {
responseType: 'blob' responseType: 'blob'
@ -185,7 +187,7 @@ class FileUploadDropzone {
window.URL.revokeObjectURL(url); window.URL.revokeObjectURL(url);
}, },
error: () => { error: () => {
alertWarningMessage("Error al descargar el archivo ZIP."); alertWarningMessage("Error", "Error al descargar el archivo ZIP.");
}, },
complete: () => { complete: () => {
$("#loader").modal('hide'); $("#loader").modal('hide');

2
httpdocs/assets/js/safekat/pages/produccion/ot.js
View File

@ -10,6 +10,7 @@ class OrdenTrabajo {
this.otForm = this.item.find("#ot-edit-form") this.otForm = this.item.find("#ot-edit-form")
this.block = document.querySelector('.section-block'); this.block = document.querySelector('.section-block');
this.modelId = this.item.data("id"); this.modelId = this.item.data("id");
this.otId = parseInt($("#dropzone-ot-files").data("ot-id")) || null;
this.tareasTableItem = this.item.find("#ot-task-table"); this.tareasTableItem = this.item.find("#ot-task-table");
this.tareasId = [] this.tareasId = []
this.summaryData = {} this.summaryData = {}
@ -70,6 +71,7 @@ class OrdenTrabajo {
this.configUploadDropzone = { this.configUploadDropzone = {
domElement: '#dropzone-ot-files', domElement: '#dropzone-ot-files',
nameId: "presupuesto_id", nameId: "presupuesto_id",
otId: this.otId,
getUri: '/presupuestos/presupuestocliente/get_files', getUri: '/presupuestos/presupuestocliente/get_files',
postUri: '/presupuestos/presupuestocliente/upload_files' postUri: '/presupuestos/presupuestocliente/upload_files'
} }

BIN
log.json Normal file
View File

Binary file not shown.