modules/ticket/back/methods/ticket/myLastModified.js

@@ -19,6 +19,7 @@ module.exports = Self => {
                 FROM ticketTracking tt 
                 WHERE tt.userFk = ?
                 GROUP BY ticketFk
+                ORDER BY created DESC
                 LIMIT 5;`;
         return await Self.rawSql(query, [userId]);
     };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.10.0",
+    "version": "24.12.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/reports/cmr/assets/css/style.css

@@ -3,7 +3,7 @@ html {
     margin: 10px;
     font-size: 22px;
 }
-.mainTable, .specialTable, .categoryTable {
+.mainTable, .specialTable, .categoryTable, .observationTable {
     width: 100%;
     border-collapse: collapse;
     font-size: inherit;
@@ -99,3 +99,18 @@ img {
     padding-bottom: 11px;
     max-width: 300px;
 }
+
+.observationTable tr td {
+    border: none;
+    padding: 5px;
+}
+
+#qrSection {
+    text-align: center;
+    width: 30%;
+}
+
+#truckPlateQr {
+    width: 125px;
+    margin-bottom: 10px;
+}

print/templates/reports/cmr/cmr.html

@@ -30,8 +30,11 @@
 				<span id="label">16. Transportista / Transporteur / Carrier</span>
 				<hr>
 				<b>{{data.carrierName}}</b><br>
-				{{data.carrierStreet}}<br>
-				{{data.carrierPostalCode}} {{data.carrierCity}} {{(data.carrierCountry) ? `(${data.carrierCountry})` : null}}
+				{{data.carrierStreet}} {{data.carrierPostalCode}}
+					{{data.carrierCity}} {{(data.carrierCountry)
+						? `(${data.carrierCountry})`
+						: null}}<br>
+				<b>CIF:</b> {{data.carrierCif}}
 			</td>
 		</tr>
 		<tr>
@@ -71,9 +74,20 @@
 					Carrier's reservations and observations
 				</span>
 				<hr>
-				<b>{{data.truckPlate}}</b><br>
+				<table class="observationTable">
+					<tr>
+						<td>
 							{{data.observations}}
 						</td>
+						<td id="qrSection">
+							<img id="truckPlateQr" v-bind:src="truckPlateQr"/>
+							<br>
+							<b>{{data.truckPlate}}</b>
+						</td>
+					</tr>
+				</table>
+
+			</td>
 		</tr>
 		<tr>
 			<td>

print/templates/reports/cmr/cmr.js

@@ -2,6 +2,7 @@ const config = require(`vn-print/core/config`);
 const vnReport = require('../../../core/mixins/vn-report.js');
 const md5 = require('md5');
 const fs = require('fs-extra');
+const qrcode = require('qrcode');
 
 const prefixBase64 = 'data:image/png;base64,';
 
@@ -22,6 +23,7 @@ module.exports = {
         this.deliveryStamp = (this.data.deliveryStamp)
             ? `${prefixBase64} ${this.data.deliveryStamp.toString('base64')}`
             : null;
+        this.truckPlateQr = await this.getQR(this.data.truckPlate);
     },
     props: {
         id: {
@@ -34,12 +36,17 @@ module.exports = {
         signPath() {
             if (!this.signature) return;
 
-			const signatureName = this.signature.signature
+            const signatureName = this.signature.signature;
             const hash = md5(signatureName.toString()).substring(0, 3);
             const file = `${config.storage.root}/${hash}/${signatureName}.png`;
             if (!fs.existsSync(file)) return null;
 
             return `${prefixBase64} ${Buffer.from(fs.readFileSync(file), 'utf8').toString('base64')}`;
         },
+    },
+    methods: {
+        getQR(id) {
+            return qrcode.toDataURL(String(id), {margin: 0});
+        },
     }
 };

print/templates/reports/cmr/sql/data.sql

@@ -10,6 +10,7 @@ SELECT c.id cmrFk,
 		c.merchandiseDetail,
 		c.ead,
 		s.name carrierName,
+		s.nif carrierCif,
 		s.street carrierStreet,
 		s.postCode carrierPostCode,
 		s.city carrierCity,