back/model-config.json

@@ -139,6 +139,12 @@
     "StarredModule": {
         "dataSource": "vn"
     },
+    "SaySimpleCountry": {
+        "dataSource": "vn"
+    },
+    "SaySimpleConfig": {
+        "dataSource": "vn"
+    },
     "TempContainer": {
         "dataSource": "tempStorage"
     },

back/models/country.json

@@ -44,6 +44,11 @@
             "type": "belongsTo",
             "model": "Continent",
             "foreignKey": "continentFk"
+        },
+        "saySimpleCountry": {
+            "type": "hasOne",
+            "model": "SaySimpleCountry",
+            "foreignKey": "countryFk"
         }
     },
     "acls": [

back/models/say-simple-config.json

@@ -0,0 +1,26 @@
+{
+    "name": "SaySimpleConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saySimpleConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/say-simple-country.json

@@ -0,0 +1,26 @@
+{
+    "name": "SaySimpleCountry",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "saySimpleCountry"
+        }
+    },
+    "properties": {
+        "countryFk": {
+            "type": "number",
+            "id": true
+        },
+        "channel": {
+            "type": "number"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

db/dump/fixtures.before.sql

@@ -4022,3 +4022,10 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
             (10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
 
 
+INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel) 
+	VALUES (19, 1169),
+			(8, 1183),
+            (NULL, 1320);
+
+INSERT IGNORE INTO vn.saySimpleConfig (url) 
+	VALUES ('saysimle-url-mock');

db/routines/vn/procedures/sale_getProblems.sql

@@ -127,7 +127,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) < s.quantity
+							AND IFNULL(av.available, 0) < 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND NOT s.isPicked
 							AND NOT s.reserved
@@ -190,7 +190,7 @@ BEGIN
 							LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
 								AND issw.warehouseFk = t.warehouseFk 
 						WHERE IFNULL(v.visible, 0) < s.quantity
-							AND IFNULL(av.available, 0) >= s.quantity
+							AND IFNULL(av.available, 0) >= 0
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -3,62 +3,83 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-proc:BEGIN
+BEGIN
 /**
- * Clona y reparte las líneas de ventas de un ticket en funcion del tipo de empaquetado.
+ * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
- * Respeta el id de ticket original para el tipo de empaquetado propuesto.
+ * Respeta el id inicial para el tipo propuesto.
  *
  * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo empaquetado que se mantiene el ticket original
+ * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
  * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
-	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
-	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk INT;
 	DECLARE vNewTicketFk INT;
+	DECLARE vPackingTypesToSplit INT;
+	DECLARE vDone INT DEFAULT FALSE;
 
-	DECLARE vItemPackingTypes CURSOR FOR 
+	DECLARE vSaleGroup CURSOR FOR
-		SELECT DISTINCT itemPackingTypeFk 
+		SELECT itemPackingTypeFk
-			FROM tSalesToMove;
+			FROM tSaleGroup
+			WHERE itemPackingTypeFk IS NOT NULL
+			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	SELECT COUNT(*) INTO vHasItemPackingType
+	START TRANSACTION;
-			FROM ticket t	
+
-				JOIN sale s ON s.ticketFk = t.id
+	SELECT id
+		FROM sale
+		WHERE ticketFk = vSelf
+			AND NOT quantity
+		FOR UPDATE;
+
+	DELETE FROM sale
+		WHERE NOT quantity
+		AND ticketFk = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSale
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
+		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
+			FROM sale s
 				JOIN item i ON i.id = s.itemFk
-			WHERE t.id = vSelf
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
-				AND i.itemPackingTypeFk = vOriginalItemPackingTypeFk;
+			WHERE s.ticketFk = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
+		ENGINE = MEMORY
+		SELECT itemPackingTypeFk, SUM(litros) totalLitros
+			FROM tSale
+			GROUP BY itemPackingTypeFk;
+
+	SELECT COUNT(*) INTO vPackingTypesToSplit
+		FROM tSaleGroup
+		WHERE itemPackingTypeFk IS NOT NULL;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
-	) ENGINE=MEMORY
-		SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
-
-	IF NOT vHasItemPackingType THEN
-		LEAVE proc;
-	END IF;
-
-	CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
-		ticketFk INT,
-		saleFk INT,
-		itemPackingTypeFk INT
 	) ENGINE = MEMORY;
 
-	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
+	CASE vPackingTypesToSplit
-		SELECT s.id, i.itemPackingTypeFk 
+		WHEN 0 THEN
-			FROM ticket t	
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				JOIN sale s ON s.ticketFk = t.id
+				VALUES(vSelf, vItemPackingTypeFk);
-				JOIN item i ON i.id = s.itemFk 
+		WHEN 1 THEN
-			WHERE t.id = vSelf
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
+				SELECT vSelf, itemPackingTypeFk
+					FROM tSaleGroup
+					WHERE itemPackingTypeFk IS NOT NULL;
+		ELSE
+			OPEN vSaleGroup;
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
 
-	OPEN vItemPackingTypes;
+			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
+				VALUES(vSelf, vItemPackingTypeFk);
 
 			l: LOOP
 				SET vDone = FALSE;
-		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
 
 				IF vDone THEN
 					LEAVE l;
@@ -66,24 +87,40 @@ proc:BEGIN
 
 				CALL ticket_Clone(vSelf, vNewTicketFk);
 
-		UPDATE tSalesToMove
+				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-			SET ticketFk = vNewTicketFk
+					VALUES(vNewTicketFk, vItemPackingTypeFk);
-			WHERE itemPackingTypeFk = vItemPackingTypeFk;
-
 			END LOOP;
 
-	CLOSE vItemPackingTypes;
+			CLOSE vSaleGroup;
+
+			SELECT s.id
+				FROM sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+				FOR UPDATE;
 
 			UPDATE sale s
-			JOIN tSalesToMove stm ON stm.saleFk = s.id
+					JOIN tSale ts ON ts.id = s.id
-		SET s.ticketFk = stm.ticketFk
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
-		WHERE stm.ticketFk;
+				SET s.ticketFk = t.ticketFk;
 
-	INSERT INTO tmp.ticketIPT (ticketFk, itemPackingTypeFk)
+			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-		SELECT ticketFk, itemPackingTypeFk
+				FROM tSaleGroup sg
-			FROM tSalesToMove
+				WHERE sg.itemPackingTypeFk IS NOT NULL
-			GROUP BY ticketFk;
+				ORDER BY sg.itemPackingTypeFk
+				LIMIT 1;
 
-	DROP TEMPORARY TABLE tSalesToMove;
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
+				SET s.ticketFk = t.ticketFk
+				WHERE ts.itemPackingTypeFk IS NULL;
+	END CASE;
+
+	COMMIT;
+
+	DROP TEMPORARY TABLE
+		tSale,
+		tSaleGroup;
 END$$
 DELIMITER ;

db/versions/11251-navyChrysanthemum/01-firstScript.sql

@@ -1 +1 @@
--- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';
+ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';

db/versions/11324-salmonCataractarum/00-firstScript.sql

@@ -0,0 +1,71 @@
+CREATE TABLE IF NOT EXISTS `vn`.`itemTextureTag` (
+	`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, 
+	`name` varchar(50) DEFAULT NULL, 
+	PRIMARY KEY (`id`), 
+	UNIQUE KEY `name_UNIQUE` (`name`) 
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT 
+	CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural y encerado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural y esponjoso');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural y foam');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural y látex');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Arenosa');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Aterciopelado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Engomado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Flocado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Foam');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Gasa');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Goma');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Látex');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Latón');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Mate');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Metálico');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Natural y engomado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Plastificado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Plastificado y engomado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Plastificado y rugoso');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Pluma');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Plástico engomado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Poliéster');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Poliéster texturizado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Rugoso');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Rígido');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Seminatural');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Silicona');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Suave');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela con brillo');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela con texturas');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela dura');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela engomada');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela escarchada');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela flocada');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela flocada engomada');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela foam');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela micro peach');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela plastificada');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela plástico engomado');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela poliéster');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela PVC');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela ratan');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela rigida');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela rugosa');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela rústica');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela sintética');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y cristal');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y foam');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y goma');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y látex');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y madera');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y plástico');
+INSERT IGNORE INTO `vn`.`itemTextureTag` (`name`) VALUES ('Tela y seco');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemTextureTag'
+	WHERE name= 'Textura';	
+	
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemTextureTag TO logisticAssist;

db/versions/11330-greenMoss/00-firstScript.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS vn.saySimpleCountry(
+	countryFk MEDIUMINT(8) UNSIGNED,
+	channel INT(4) COMMENT 'channel de whatsapp de saySimple',
+	PRIMARY KEY (countryFk),
+	CONSTRAINT `saySimpleCountry_FK` FOREIGN KEY (`countryFk`) REFERENCES vn.country (`id`) ON UPDATE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS vn.saySimpleConfig(
+	id INT AUTO_INCREMENT PRIMARY KEY,
+	url VARCHAR(255) NOT NULL
+);
+
+INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel) 
+	VALUES (19, 1169),
+			(8, 1183),
+			(NULL, 1320);

modules/client/back/methods/client/summary.js

@@ -54,7 +54,10 @@ module.exports = Self => {
                 {
                     relation: 'country',
                     scope: {
-                        fields: ['name']
+                        fields: ['id', 'name'],
+                        include: {
+                            relation: 'saySimpleCountry',
+                        }
                     }
                 },
                 {