Merge pull request '2847 - Driver route now shows item packaging type' (#671) from 2847-driver_route into dev

Reviewed-on: #671
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

loopback/server/datasources.json

@@ -18,13 +18,8 @@
         "acquireTimeout": 20000
     },
     "osticket": {
-        "connector": "vn-mysql",
+        "connector": "memory",
-        "database": "vn",
+        "timezone": "local"
-        "debug": false,
-        "host": "localhost",
-        "port": "3306",
-        "username": "root",
-        "password": "root"
     },
     "tempStorage": {
         "name": "tempStorage",

print/templates/reports/driver-route/driver-route.html

@@ -91,6 +91,7 @@
                                                 <th width="50%">{{$t('client')}}</th>
                                                 <th class="number">{{$t('address')}}</th>
                                                 <th class="number">{{$t('packages')}}</th>
+                                                <th>{{$t('packagingType')}}</th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -99,12 +100,14 @@
                                                 <td class="number">{{ticket.id}}</td>
                                                 <td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
                                                 <td v-if="ticket.addressFk" class="number">
-                                                        {{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}}
+                                                    {{ticket.addressFk.toString().substr(0,
+                                                    ticket.addressFk.toString().length - 3)}}
                                                     <span class="black-container">
                                                         {{ticket.addressFk.toString().substr(-3, 3)}}
                                                     </span>
                                                 </td>
                                                 <td class="number">{{ticket.packages}}</td>
+                                                <td>{{ticket.itemPackingTypes}}</td>
                                             </tr>
                                         </tbody>
                                     </table>

print/templates/reports/driver-route/driver-route.js

@@ -30,7 +30,7 @@ module.exports = {
             return this.rawSqlFromDef('routes', [routesId]);
         },
         fetchTickets(routesId) {
-            return this.rawSqlFromDef('tickets', [routesId]);
+            return this.rawSqlFromDef('tickets', [routesId, routesId]);
         }
     },
     components: {

print/templates/reports/driver-route/locale/es.yml

@@ -10,6 +10,7 @@ order: Orden
 client: Cliente
 address: Consignatario
 packages: Bultos
+packagingType: Encajado
 street: Dirección
 postcode: Código Postal
 city: Ciudad

print/templates/reports/driver-route/sql/tickets.sql

@@ -18,7 +18,8 @@ SELECT
     am.name ticketAgency,
     tob.description,
     s.shipFk,
-    u.nickName salesPersonName
+    u.nickName salesPersonName,
+    ipkg.itemPackingTypes
 FROM route r
     LEFT JOIN ticket t ON t.routeFk = r.id
     LEFT JOIN address a ON a.id = t.addressFk
@@ -30,5 +31,15 @@ FROM route r
     LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
     LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
     LEFT JOIN stowaway s ON s.id = t.id
+    LEFT JOIN (
+        SELECT t.id AS ticketFk, 
+               GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
+        FROM route r
+            JOIN ticket t ON t.routeFk = r.id
+            JOIN sale s ON s.ticketFk = t.id
+            JOIN item i ON i.id = s.itemFk
         WHERE r.id IN (?)
-ORDER BY t.priority, t.id
+        GROUP BY t.id
+    ) ipkg ON ipkg.ticketFk = t.id
+WHERE r.id IN (?)
+ORDER BY t.priority, t.id;