From 1d0024c5382e5512613bae9d93388527f255fb87 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Tue, 21 Mar 2023 14:08:34 +0100
Subject: [PATCH] =?UTF-8?q?refs=20#5013=20feat:=20a=C3=B1adida=20observaci?=
 =?UTF-8?q?on=20para=20cada=20ticket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/changes/231201/00-observationType.sql        |  2 ++
 print/templates/reports/invoice/invoice.html    | 11 +++++++++++
 print/templates/reports/invoice/sql/tickets.sql |  9 ++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 db/changes/231201/00-observationType.sql

diff --git a/db/changes/231201/00-observationType.sql b/db/changes/231201/00-observationType.sql
new file mode 100644
index 000000000..20e3608e4
--- /dev/null
+++ b/db/changes/231201/00-observationType.sql
@@ -0,0 +1,2 @@
+INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
+VALUES ('Factura', 'invocieOut', '0');
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 2d180878a..2c37126fc 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -119,6 +119,16 @@
                             </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>
@@ -251,6 +261,7 @@
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
     <template v-slot:footer>
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index 162f043e2..8cd2fa042 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -1,8 +1,11 @@
 SELECT
     t.id,
     t.shipped,
-    t.nickname
-FROM invoiceOut io 
+    t.nickname,
+    tto.description
+FROM invoiceOut io
     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 = ?
-ORDER BY t.shipped
\ No newline at end of file
+ORDER BY t.shipped