verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

refs #5013 mostrar las observaciones del ticket
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2023-03-22 09:07:22 +01:00
parent 1d0024c538
commit 9ef5c0c560
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/changes/231201/00-observationType.sql
View File

@ -1,2 +1,2 @@
INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`) INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
VALUES ('Factura', 'invocieOut', '0'); VALUES ('Factura', 'invoiceOut', '0');

22
print/templates/reports/invoice/invoice.html
View File

@ -119,16 +119,6 @@
</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>
@ -250,18 +240,22 @@
</tfoot> </tfoot>
</table> </table>
</div> </div>
<div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer'"> <div class="columns vn-mt-xl" v-if="invoice.payMethodCode == 'wireTransfer' || ticketObservations">
<div class="size50 pull-left no-page-break"> <div class="size50 pull-left no-page-break">
<div class="panel"> <div class="panel">
<div class="header">{{$t('observations')}}</div> <div class="header">{{$t('observations')}}</div>
<div class="body"> <div class="body">
<div>{{$t('wireTransfer')}}</div> <div v-if="invoice.payMethodCode == 'wireTransfer'">
<div>{{$t('accountNumber', [invoice.iban])}}</div> <div>{{$t('wireTransfer')}}</div>
<div>{{$t('accountNumber', [invoice.iban])}}</div>
</div>
<div v-if="ticketObservations">
{{ticketObservations}}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<template v-slot:footer> <template v-slot:footer>

3
print/templates/reports/invoice/invoice.js
View File

@ -21,10 +21,13 @@ module.exports = {
const map = new Map(); const map = new Map();
this.ticketObservations = '';
for (let ticket of tickets) { for (let ticket of tickets) {
ticket.sales = []; ticket.sales = [];
map.set(ticket.id, ticket); map.set(ticket.id, ticket);
if (ticket.description) this.ticketObservations += ticket.description + ' ';
} }
for (let sale of sales) { for (let sale of sales) {

5
print/templates/reports/invoice/sql/tickets.sql
View File

@ -4,8 +4,9 @@ SELECT
t.nickname, t.nickname,
tto.description 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 observationType ot ON ot.code = 'invoiceOut'
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
AND tto.observationTypeFk = (SELECT id FROM observationType WHERE code = 'invocieOut') AND tto.observationTypeFk = ot.id
WHERE t.refFk = ? WHERE t.refFk = ?
ORDER BY t.shipped ORDER BY t.shipped