Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking

db/routines/vn/procedures/expedition_getFromRoute.sql

@@ -15,7 +15,8 @@ BEGIN
 			t.addressFk,
 			a.nickname,
 			sub2.itemPackingTypeConcat,
-			est.code
+			est.code,
+			es.isScanned
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@@ -33,6 +34,10 @@ BEGIN
 						GROUP BY sub.ticketFk
 						) sub2 ON sub2.ticketFk = t.id
 			LEFT JOIN expeditionStateType est ON est.id  = e.stateTypeFk
+			LEFT JOIN expeditionState es ON es.id = (
+				    SELECT MAX(id)
+				    	FROM expeditionState es
+				    	WHERE expeditionFk = e.id)
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END$$

db/versions/11089-blueMastic/00-firstScript.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+USE vn;
+
+ALTER TABLE vn.expeditionState ADD isScanned tinyint(1) DEFAULT false NOT NULL;

modules/ticket/back/methods/expedition-state/addExpeditionState.js

@@ -44,11 +44,13 @@ module.exports = Self => {
 
                 const typeFk = expeditionStateType.id;
                 expeditionId = expedition.expeditionFk;
+                const isScannedExpedition = expedition.isScanned ?? false;
 
                 await models.ExpeditionState.create({
                     expeditionFk: expedition.expeditionFk,
                     typeFk,
                     userFk: userId,
+                    isScanned: isScannedExpedition,
                 }, myOptions);
             }
 

modules/ticket/back/models/expedition-state.json

@@ -3,7 +3,7 @@
     "base": "VnModel",
     "options": {
         "mysql": {
-        "table": "expeditionState"
+            "table": "expeditionState"
         }
     },
     "properties": {
@@ -23,13 +23,16 @@
         },
         "userFk": {
             "type": "number"
+        },
+        "isScanned": {
+            "type": "boolean"
         }
     },
     "relations": {
-      "expeditionStateType": {
+        "expeditionStateType": {
-        "type": "belongsTo",
+            "type": "belongsTo",
-        "model": "ExpeditionStateType",
+            "model": "ExpeditionStateType",
-        "foreignKey": "typeFk"
+            "foreignKey": "typeFk"
-      }
+        }
     }
 }