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 1/4] =?UTF-8?q?refs=20#5013=20feat:=20a=C3=B1adida=20obser?=
 =?UTF-8?q?vacion=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

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 2/4] 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

From c8eb6dfb3195524ed8a3d898f4bc55127202b2ee Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 22 Mar 2023 09:24:28 +0100
Subject: [PATCH 3/4] refs #5013 borrado changes sql, pq fallan los test de
 back

---
 db/changes/231201/00-observationType.sql | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 db/changes/231201/00-observationType.sql

diff --git a/db/changes/231201/00-observationType.sql b/db/changes/231201/00-observationType.sql
deleted file mode 100644
index c0e34c7b6..000000000
--- a/db/changes/231201/00-observationType.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`observationType` (`description`, `code`, `hasNewBornMessage`)
-VALUES ('Factura', 'invoiceOut', '0');

From cbe79a964cef8b53c273571aa8cbaf44ed176b35 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 24 Mar 2023 10:31:02 +0100
Subject: [PATCH 4/4] =?UTF-8?q?refs=20#5013=20eliminado=20espacio=20en=20b?=
 =?UTF-8?q?lanco=20al=20final=20de=20la=20cadena=20y=20a=C3=B1adidas=20fix?=
 =?UTF-8?q?tures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/dump/fixtures.sql                       | 7 +++++--
 print/templates/reports/invoice/invoice.js | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index f78313cc9..bc19b62dd 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -501,7 +501,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (3, 'Delivery',         'delivery'),
         (4, 'SalesPerson',      'salesPerson'),
         (5, 'Administrative',   'administrative'),
-        (6, 'Weight',           'weight');
+        (6, 'Weight',           'weight'),
+        (7, 'InvoiceOut',       'invoiceOut');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -738,7 +739,9 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des
         (9,  23, 5, 'care with the dog'),
         (10, 23, 4, 'Reclama ticket: 8'),
         (11, 24, 4, 'Reclama ticket: 7'),
-        (12, 11, 3, 'Delivery after 10am');
+        (12, 11, 3, 'Delivery after 10am'),
+        (13, 1, 7, 'observation of ticket one'),
+        (14, 2, 7, 'observation of ticket two');
 
 -- FIX for state hours on local, inter_afterInsert
 -- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index 5ee0224a9..42988113f 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -29,6 +29,7 @@ module.exports = {
 
             if (ticket.description) this.ticketObservations += ticket.description + ' ';
         }
+        this.ticketObservations = this.ticketObservations.trim();
 
         for (let sale of sales) {
             const ticket = map.get(sale.ticketFk);