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 mod/direcciones_ferro_prototipo

Browse Source
This commit is contained in:
Jaime Jimenez
2025-07-01 11:55:26 +02:00
parent 8a32e13eb4 055274d6df
commit 18b96f020b
4 changed files with 102 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/app/Language/es/Presupuestos.php
View File

@ -171,8 +171,8 @@ return [
'precioImpresionMargen' => 'Margen horas',
'precioPagNegro' => 'Precio pág. negro',
'precioPagColor' => 'Precio pág. color',
'totalTinta' => 'Total tinta',
'totalCorte' => 'Total corte',
'totalTinta' => 'Total tinta (C+M)',
'totalCorte' => 'Total corte (C+M)',
'total' => 'Total',
'totalLinea' => 'Total Precio Línea',
'aFavorFibra' => 'A favor de fibra',
@ -239,8 +239,6 @@ return [
'gTintaCG' => 'G. tinta CG',
'clicksPedido' => 'Clicks Pedido',
'totalClicks' => 'Total Clicks',
'totalTinta' => 'Total Tinta',
'totalCorte' => 'Total Corte',
'totalImpresion' => 'Total máquina',
'velocidadCorte' => 'Velocidad corte',
'precioHoraCorte' => 'Precio hora corte',

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

@ -24,14 +24,64 @@
<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">Coste impresión</dt>
<dt class="col-5 fw-normal text-end">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".costes-impresion" aria-expanded="false" 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>
<dt class="col-5 py-1 fw-normal text-end">Margen impresión</dt>
<!-- 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 horas</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteHoras" class="autonumeric-resumen-currency"></span>
</dd>
<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">
<span id="totalCosteTinta" class="autonumeric-resumen-currency" ></span>
</dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteCorte" class="autonumeric-resumen-currency"></span>
</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></d>
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>
<dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenHoras" class="autonumeric-resumen-currency"></span>
</dd>
<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">
<span id="totalMargenTinta" class="autonumeric-resumen-currency" ></span>
</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"
@ -48,9 +98,6 @@
<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>
<dt class="col-5 fw-normal text-end">Total envío base</dt>
<dd class="col-6 text-end py-1 "><span id="precioEnvios"
class="autonumeric-resumen-currency"></span></dd>
</dl>
<hr class="mx-n4">
@ -64,6 +111,9 @@
class="autonumeric-resumen-percent"></span></dd>
<dd class="col-3 text-end py-1"><span id="totalMargenes"
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Total envío base</dt>
<dd class="col-6 text-end py-1 "><span id="precioEnvios"
class="autonumeric-resumen-currency"></span></dd>
</dl>
<hr class="mx-n4">
@ -152,7 +202,7 @@
class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
</div>
</div>
<?php endif; */?>
<?php endif; */ ?>
<div class="row">
<p>
<span id="aprobado_by_at"></span>