back/model-config.json

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

back/models/country.json

@@ -44,11 +44,6 @@
             "type": "belongsTo",
             "model": "Continent",
             "foreignKey": "continentFk"
-        },
-        "saySimpleCountry": {
-            "type": "hasOne",
-            "model": "SaySimpleCountry",
-            "foreignKey": "countryFk"
         }
     },
     "acls": [
@@ -59,4 +54,4 @@
             "permission": "ALLOW"
         }
     ]
-}
+}

back/models/say-simple-config.json

@@ -1,26 +0,0 @@
-{
-    "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

@@ -1,26 +0,0 @@
-{
-    "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,10 +4022,3 @@ 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) < 0
+							AND IFNULL(av.available, 0) < s.quantity
 							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) >= 0
+							AND IFNULL(av.available, 0) >= s.quantity
 							AND IFNULL(issw.visible, 0) < s.quantity
 							AND s.quantity > 0
 							AND NOT s.isPicked

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -14,7 +14,7 @@ proc:BEGIN
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vHasItemPackingType BOOL;
-	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
+	DECLARE vItemPackingTypeFk INT;
 	DECLARE vNewTicketFk INT;
 
 	DECLARE vItemPackingTypes CURSOR FOR 
@@ -36,10 +36,14 @@ proc:BEGIN
 	) 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 VARCHAR(1)
+		itemPackingTypeFk INT
 	) ENGINE=MEMORY;
 
 	INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
@@ -51,6 +55,7 @@ proc:BEGIN
 				AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
 
 	OPEN vItemPackingTypes;
+
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH vItemPackingTypes INTO vItemPackingTypeFk;
@@ -66,6 +71,7 @@ proc:BEGIN
 			WHERE itemPackingTypeFk = vItemPackingTypeFk;
 
 	END LOOP;
+
 	CLOSE vItemPackingTypes;
 
 	UPDATE sale s

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/11330-greenMoss/00-firstScript.sql

@@ -1,16 +0,0 @@
-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,10 +54,7 @@ module.exports = Self => {
                 {
                     relation: 'country',
                     scope: {
-                        fields: ['id', 'name'],
-                        include: {
-                            relation: 'saySimpleCountry',
-                        }
+                        fields: ['name']
                     }
                 },
                 {