From 9ef5c0c56046ca40cab7bed37e3ff9b3f9426668 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 22 Mar 2023 09:07:22 +0100
Subject: [PATCH] refs #5013 mostrar las observaciones del ticket

---
 db/changes/231201/00-observationType.sql      |  2 +-
 print/templates/reports/invoice/invoice.html  | 22 +++++++------------
 print/templates/reports/invoice/invoice.js    |  3 +++
 .../templates/reports/invoice/sql/tickets.sql |  5 +++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/db/changes/231201/00-observationType.sql b/db/changes/231201/00-observationType.sql
index 20e3608e4..c0e34c7b6 100644
--- a/db/changes/231201/00-observationType.sql
+++ b/db/changes/231201/00-observationType.sql
@@ -1,2 +1,2 @@
 INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
-VALUES ('Factura', 'invocieOut', '0');
+VALUES ('Factura', 'invoiceOut', '0');
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 2c37126fc..7a1ed3319 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -119,16 +119,6 @@
                             </td>
                             <td class="number">{{ticketSubtotal(ticket) | currency('EUR', $i18n.locale)}}</td>
                         </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>
                 </table>
             </div>
@@ -250,18 +240,22 @@
                     </tfoot>
                 </table>
             </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="panel">
                         <div class="header">{{$t('observations')}}</div>
                         <div class="body">
-                            <div>{{$t('wireTransfer')}}</div>
-                            <div>{{$t('accountNumber', [invoice.iban])}}</div>
+                            <div v-if="invoice.payMethodCode == 'wireTransfer'">
+                                <div>{{$t('wireTransfer')}}</div>
+                                <div>{{$t('accountNumber', [invoice.iban])}}</div>
+                            </div>
+                            <div v-if="ticketObservations">
+                                {{ticketObservations}}
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-
         </div>
     </div>
     <template v-slot:footer>
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index b135e152b..5ee0224a9 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -21,10 +21,13 @@ module.exports = {
 
         const map = new Map();
 
+        this.ticketObservations = '';
         for (let ticket of tickets) {
             ticket.sales = [];
 
             map.set(ticket.id, ticket);
+
+            if (ticket.description) this.ticketObservations += ticket.description + ' ';
         }
 
         for (let sale of sales) {
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index 8cd2fa042..a8385599c 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -4,8 +4,9 @@ SELECT
     t.nickname,
     tto.description
 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
-        AND tto.observationTypeFk = (SELECT id FROM observationType WHERE code = 'invocieOut')
+        AND tto.observationTypeFk = ot.id
 WHERE t.refFk = ?
 ORDER BY t.shipped