Merge branch 'dev' into 7648_dev_customerEntries

db/routines/vn/procedures/setParking.sql

@@ -22,40 +22,42 @@ proc: BEGIN
 		CALL util.throw('parkingNotExist');
 		LEAVE proc;
 	END IF;
+	
+	IF  vParam REGEXP '^[0-9]+$' THEN
+		-- Se comprueba si es una preparación previa
+		SELECT COUNT(*) INTO vIsSaleGroup
+			FROM vn.saleGroup sg
+			WHERE sg.id = vParam;
 
-	-- Se comprueba si es una preparación previa
-	SELECT COUNT(*) INTO vIsSaleGroup
-		FROM vn.saleGroup sg
-		WHERE sg.id = vParam;
+		IF vIsSaleGroup THEN
+			CALL vn.saleGroup_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
 
-	IF vIsSaleGroup THEN
-		CALL vn.saleGroup_setParking(vParam, vParkingFk);
-		LEAVE proc;
+		-- Se comprueba si es un ticket
+		SELECT COUNT(*) INTO vIsTicket
+			FROM vn.ticket t
+			WHERE t.id = vParam
+				AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+
+		IF vIsTicket THEN
+			CALL vn.ticket_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
+
+		-- Se comprueba si es una coleccion de tickets
+		SELECT COUNT(*) INTO vIsCollection
+			FROM vn.collection c
+			WHERE c.id = vParam
+				AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+
+		IF vIsCollection THEN
+			CALL vn.collection_setParking(vParam, vParkingFk);
+			LEAVE proc;
+		END IF;
+	ELSE
+		-- Por descarte, se considera una matrícula
+		CALL vn.shelving_setParking(vParam, vParkingFk);
 	END IF;
-
-	-- Se comprueba si es un ticket
-	SELECT COUNT(*) INTO vIsTicket
-		FROM vn.ticket t
-		WHERE t.id = vParam
-			AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-	IF vIsTicket THEN
-		CALL vn.ticket_setParking(vParam, vParkingFk);
-		LEAVE proc;
-	END IF;
-
-	-- Se comprueba si es una coleccion de tickets
-	SELECT COUNT(*) INTO vIsCollection
-		FROM vn.collection c
-		WHERE c.id = vParam
-			AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-	IF vIsCollection THEN
-		CALL vn.collection_setParking(vParam, vParkingFk);
-		LEAVE proc;
-	END IF;
-
-	-- Por descarte, se considera una matrícula
-	CALL vn.shelving_setParking(vParam, vParkingFk);
 END$$
 DELIMITER ;

modules/worker/back/models/operator.json

@@ -26,29 +26,33 @@
 		},
 		"labelerFk": {
 			"type": "number"
+		},
+		"isOnReservationMode": {
+			"type": "boolean",
+			"required": true
 		}
-    },
+	},
 	"relations": {
-        "sector": {
-            "type": "belongsTo",
-            "model": "Sector",
-            "foreignKey": "sectorFk"
-        },
+		"sector": {
+			"type": "belongsTo",
+			"model": "Sector",
+			"foreignKey": "sectorFk"
+		},
 		"train": {
-            "type": "belongsTo",
-            "model": "Train",
-            "foreignKey": "trainFk"
-        },
+			"type": "belongsTo",
+			"model": "Train",
+			"foreignKey": "trainFk"
+		},
 		"printer": {
-            "type": "belongsTo",
-            "model": "Printer",
-            "foreignKey": "labelerFk"
-        },
+			"type": "belongsTo",
+			"model": "Printer",
+			"foreignKey": "labelerFk"
+		},
 		"itemPackingType": {
-            "type": "belongsTo",
-            "model": "ItemPackingType",
-            "foreignKey": "itemPackingTypeFk",
+			"type": "belongsTo",
+			"model": "ItemPackingType",
+			"foreignKey": "itemPackingTypeFk",
 			"primaryKey": "code"
-        }
-    }
-}
+		}
+	}
+}