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

Implementacion de feedback JM sobre presupuestos

Browse Source
This commit is contained in:
imnavajas
2025-02-25 15:36:11 +01:00
parent c5f1f0e55a
commit fcd6adebb7
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ci4/app/Models/Presupuestos/PresupuestoLineaModel.php
View File

@ -556,9 +556,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
"t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
)
->where("t1.presupuesto_id", $presupuesto_id)
->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
->whereIn('t1.tipo', ['lp_bn', 'lp_bnhq', 'lp_rot_bn']);
return $builder;
@ -569,9 +570,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
"t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
)
->where("t1.presupuesto_id", $presupuesto_id)
->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
->whereIn('t1.tipo', ['lp_color', 'lp_colorhq', 'lp_rot_color']);
return $builder;
@ -582,9 +584,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
"t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
)
->where("t1.presupuesto_id", $presupuesto_id)
->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
->whereIn('t1.tipo', ['lp_cubierta']);
return $builder;
@ -595,9 +598,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
"t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
)
->where("t1.presupuesto_id", $presupuesto_id)
->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
->whereIn('t1.tipo', ['lp_sobrecubierta']);
return $builder;
@ -608,9 +612,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
"t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
)
->where("t1.presupuesto_id", $presupuesto_id)
->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
->whereIn('t1.tipo', ['lp_guardas']);
return $builder;

1
ci4/app/Models/Presupuestos/PresupuestoModel.php
View File

@ -324,6 +324,7 @@ class PresupuestoModel extends \App\Models\BaseModel
t1.comentarios_pdf AS comentarios_pdf, t1.tirada_alternativa_json_data AS tiradas_alternativas,
t1.total_presupuesto AS total_presupuesto, t1.total_precio_unidad AS total_precio_unidad,
t1.papel_formato_personalizado AS isPersonalizado, t1.envios_recoge_cliente AS recoge_cliente,
t1.solapas_ancho_faja_color AS ancho_solapas_faja,
CONCAT(t1.papel_formato_ancho, 'x', t1.papel_formato_alto) AS formatoPersonalizado,
t2.nombre AS cliente,
CONCAT(t3.first_name, ' ', t3.last_name) AS comercial, t5.secret AS email_comercial,

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>

4
httpdocs/themes/vuexy/css/pdf.presupuesto.css
View File

@ -286,6 +286,10 @@ body table.extras td.t {
border-right: 1px dotted black;
}
body table.extras td.v {
border-right: 1px dotted black;
}
body table.envio {
width: 100%;
font-size: 11px;