Merge branch 'dev' into 8370-WorkerTimeControl

db/routines/vn/procedures/item_getBalance.sql

@@ -1,5 +1,4 @@
 DELIMITER $$
-$$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getBalance`(
 	vItemFk INT,
 	vWarehouseFk INT,
@@ -100,7 +99,7 @@ BEGIN
 		),
 		sales AS (
 			WITH itemSales AS (
-				SELECT DATE(t.shipped) + INTERVAL HOUR(IFNULL(z.`hour`,0)) HOUR shipped,
+                SELECT DATE(t.shipped) + INTERVAL HOUR(IFNULL(z.`hour`,0)) HOUR shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,

db/routines/vn/procedures/item_getSimilar.sql

@@ -82,8 +82,6 @@ BEGIN
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = bu.buyFk
-			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
-				AND iss.warehouseFk = vWarehouseFk
 			LEFT JOIN vn.ink ink ON ink.id = i.tag5
 			JOIN itemTags its
 		WHERE a.available > 0

db/routines/vn/procedures/item_getStock.sql

@@ -1,5 +1,4 @@
 DELIMITER $$
-$$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getStock`(
 	vWarehouseFk SMALLINT,
 	vAvailabled DATETIME,
@@ -55,6 +54,5 @@ BEGIN
 			) sub
 			GROUP BY itemFk
 			HAVING stock;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/ticket_beforeInsert.sql

@@ -7,11 +7,11 @@ BEGIN
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	SELECT TIME(hour) INTO vTime
+	/* SELECT TIME(hour) INTO vTime
 		FROM zone
 		WHERE id = NEW.zoneFk;
-/*	IF vTime IS NOT NULL THEN
+	IF vTime IS NOT NULL THEN
 		SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vTime);
-	END IF;*/
+	END IF; */
 END$$
 DELIMITER ;

db/routines/vn/triggers/ticket_beforeUpdate.sql

@@ -86,6 +86,6 @@ BEGIN
 		IF vZoneTime IS NOT NULL THEN
 			SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vZoneTime);
 		END IF;
-	END IF;*/
+	END IF;  */
 END$$
 DELIMITER ;

db/versions/11476-chocolateEucalyptus/00-firstScript.sql

@@ -0,0 +1,19 @@
+UPDATE vn.town
+    SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
+    WHERE name IS NOT NULL
+        AND BINARY name = UPPER(name);
+
+UPDATE vn.province
+    SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
+    WHERE name IS NOT NULL
+        AND BINARY name = UPPER(name);
+
+UPDATE vn.autonomy
+    SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
+    WHERE name IS NOT NULL
+        AND BINARY name = UPPER(name);
+
+UPDATE vn.country
+    SET name = CONCAT(UPPER(SUBSTRING(name, 1, 1)), LOWER(SUBSTRING(name, 2)))
+    WHERE name IS NOT NULL
+        AND BINARY name = UPPER(name);

db/versions/11477-maroonCarnation/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.priceDelta MODIFY COLUMN itemTypeFk smallint(5) unsigned NULL;
+

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -262,10 +262,7 @@ module.exports = Self => {
                     (INDEX (ticketFk))
                     ENGINE = MEMORY
                     SELECT f.id ticketFk
-                        FROM tmp.filter f
+                        FROM tmp.filter f`);
-                            LEFT JOIN alertLevel al ON al.id = f.alertLevel
-                        WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
-                            AND f.shipped >= ?`, [date]);
         stmts.push(stmt);
 
         stmts.push('CALL ticket_getProblems(FALSE)');
@@ -288,7 +285,7 @@ module.exports = Self => {
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(`
-            SELECT *
+            SELECT f.*, tp.*
                 FROM tmp.filter f
                     LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
                     LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id

modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js

@@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => {
             const filter = {};
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
 
-            expect(result.length).toEqual(5);
+            expect(result.length).toEqual(8);
 
             await tx.rollback();
         } catch (e) {
@@ -254,8 +254,8 @@ describe('SalesMonitor salesFilter()', () => {
             const firstTicket = result.shift();
             const secondTicket = result.shift();
 
-            expect(firstTicket.totalProblems).toEqual(null);
+            expect(firstTicket.totalProblems).toEqual(0);
-            expect(secondTicket.totalProblems).toEqual(null);
+            expect(secondTicket.totalProblems).toEqual(0);
 
             await tx.rollback();
         } catch (e) {