refs #5013 feat: añadida observacion para cada ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
d209b35071
commit
1d0024c538
|
@ -0,0 +1,2 @@
|
||||||
|
INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
|
||||||
|
VALUES ('Factura', 'invocieOut', '0');
|
|
@ -119,6 +119,16 @@
|
||||||
</td>
|
</td>
|
||||||
<td class="number">{{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}</td>
|
<td class="number">{{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="columns vn-mt-xl" v-if="ticket.description">
|
||||||
|
<div class="size50 pull-left no-page-break">
|
||||||
|
<div class="panel">
|
||||||
|
<div class="header">{{$t('observations')}}</div>
|
||||||
|
<div class="body">
|
||||||
|
<div>{{ticket.description}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
@ -251,6 +261,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<template v-slot:footer>
|
<template v-slot:footer>
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
SELECT
|
SELECT
|
||||||
t.id,
|
t.id,
|
||||||
t.shipped,
|
t.shipped,
|
||||||
t.nickname
|
t.nickname,
|
||||||
|
tto.description
|
||||||
FROM invoiceOut io
|
FROM invoiceOut io
|
||||||
JOIN ticket t ON t.refFk = io.ref
|
JOIN ticket t ON t.refFk = io.ref
|
||||||
|
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
|
||||||
|
AND tto.observationTypeFk = (SELECT id FROM observationType WHERE code = 'invocieOut')
|
||||||
WHERE t.refFk = ?
|
WHERE t.refFk = ?
|
||||||
ORDER BY t.shipped
|
ORDER BY t.shipped
|
Loading…
Reference in New Issue