From e7fc70a4b41b7a92925286b129e58409dd3ee5bd Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 26 May 2020 10:43:53 +0200
Subject: [PATCH 1/2] add column in ticket split

---
 modules/client/back/methods/client/lastActiveTickets.js | 3 ++-
 modules/ticket/front/sale/index.html                    | 8 +++++---
 modules/ticket/front/sale/locale/es.yml                 | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/client/back/methods/client/lastActiveTickets.js b/modules/client/back/methods/client/lastActiveTickets.js
index 0337857a9..5f8ef1393 100644
--- a/modules/client/back/methods/client/lastActiveTickets.js
+++ b/modules/client/back/methods/client/lastActiveTickets.js
@@ -26,11 +26,12 @@ module.exports = Self => {
     Self.lastActiveTickets = async(id, ticketId) => {
         const ticket = await Self.app.models.Ticket.findById(ticketId);
         const query = `
-            SELECT t.id, t.shipped, a.name AS agencyName, w.name AS warehouseName
+            SELECT t.id, t.shipped, a.name AS agencyName, w.name AS warehouseName, ad.city AS address
                 FROM vn.ticket t
                     JOIN vn.ticketState ts ON t.id = ts.ticketFk
                     JOIN vn.agencyMode a ON t.agencyModeFk = a.id
                     JOIN vn.warehouse w ON t.warehouseFk = w.id
+                    JOIN vn.address ad ON t.addressFk = ad.id
                 WHERE t.shipped >= CURDATE() AND t.clientFk = ? AND ts.alertLevel = 0 
                     AND t.id <> ? AND t.warehouseFk = ?
                 ORDER BY t.shipped
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 8cfe19451..fa569161e 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -306,9 +306,10 @@
                 <thead>
                     <tr>
                         <th number>Id</th>
-                        <th number>F. envio</th>
-                        <th number>Agencia</th>
-                        <th number>Almacen</th>
+                        <th number>Shipped</th>
+                        <th number>Agency</th>
+                        <th number>Warehouse</th>
+                        <th number>Address</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -323,6 +324,7 @@
                         <td number>{{::ticket.shipped | date: 'dd/MM/yyyy'}}</td>
                         <td number>{{::ticket.agencyName}}</td>
                         <td number>{{::ticket.warehouseName}}</td>
+                        <td number>{{::ticket.address}}</td>
                     </tr>
                 </tbody>
             </table>
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 8de8427b9..89189bf88 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -29,4 +29,8 @@ Product not available: "Verdnatura le comunica:\rPedido {{ticketFk}} día {{crea
 Continue anyway?: ¿Continuar de todas formas?
 This ticket is now empty: El ticket ha quedado vacio
 Do you want to delete it?: ¿Quieres eliminarlo?
-Recalculate price: Recalcular precio
\ No newline at end of file
+Recalculate price: Recalcular precio
+Address: Dirección
+Warehouse: Almacen
+Agency: Agencia
+F. envio: Shipped
\ No newline at end of file

From 60d50afb2eb7ec3ac0a53814663b0086cea3c1f8 Mon Sep 17 00:00:00 2001
From: Bernat Exposito Domenech <bernat.verdnatura@gmail.com>
Date: Tue, 26 May 2020 12:20:06 +0200
Subject: [PATCH 2/2] fix traduction

---
 modules/ticket/front/sale/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 89189bf88..908b76bc6 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -33,4 +33,4 @@ Recalculate price: Recalcular precio
 Address: Dirección
 Warehouse: Almacen
 Agency: Agencia
-F. envio: Shipped
\ No newline at end of file
+Shipped: F. envio
\ No newline at end of file