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 'add/serv_acabado_desdoblados'

Browse Source 
Main

See merge request jjimenez/safekat!572
This commit is contained in:
Jaime Jimenez Ortega
2025-02-26 08:18:27 +00:00
parent 30e1561a0b 4bf8018c65
commit 3204d550b7
12 changed files with 227 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php
View File

@ -66,6 +66,7 @@
<?= $this->endSection() ?>
<?= $this->section("additionalExternalJs") ?>
<script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/FormValidation.js") ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/libs/popper/popper.js') ?>"></script>
<script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/Bootstrap5.min.js") ?>"></script>
<script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/AutoFocus.min.js") ?>"></script>
<script type="module" src="<?= site_url('assets/js/safekat/pages/configuracion/messages/index.js') ?>">

29
ci4/app/Views/themes/vuexy/pdfs/presupuesto.php
View File

@ -232,13 +232,40 @@
<td class="t">Guardas</td>
<td class="v" colspan="5"><?php echo (($lp_Guardas !== null) ? "SI" : "NO"); ?></td>
</tr>
<?php if ($lp_Sobrecubierta !== null && $presupuesto->solapas_sobrecubierta !== null): ?>
<tr>
<td class="t">Sobrecubierta</td>
<td class="v" colspan="1">SI</td>
<td class="t">Solapas</td>
<td class="v">
<?= $presupuesto->solapas_sobrecubierta !== null ? 'SI' : 'NO' ?>
</td>
<td class="t">Ancho</td>
<td class="v">
<?= $presupuesto->solapas_sobrecubierta_ancho !== null ?
number_format($presupuesto->solapas_sobrecubierta_ancho, 2, ",", ".") :
'0,00' ?> mm
</td>
</tr>
<?php endif; ?>
<tr>
<td class="t">Marcapáginas</td>
<td class="v" colspan="5"><?php echo (($presupuesto->marcapaginas == 1) ? "SI" : "NO"); ?></td>
</tr>
<tr>
<td class="t">Faja</td>
<td class="v" colspan="5"><?php echo (($lp_Faja !== null) ? "SI" : "NO"); ?></td>
<td class="v" colspan="1"><?php echo (($lp_Faja !== null) ? "SI" : "NO"); ?></td>
<td class="t">Solapas</td>
<td class="v">
<?= ($lp_Faja !== null && $presupuesto->ancho_solapas_faja !== null) ? 'SI' : 'NO' ?>
</td>
<td class="t">Ancho</td>
<td class="v">
<?= ($lp_Faja !== null && $presupuesto->ancho_solapas_faja !== null) ?
number_format($presupuesto->ancho_solapas_faja, 2, ",", ".") :
'0,00' ?> mm
</td>
</tr>
</tbody>
</table>