Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

back/methods/postcode/specs/filter.spec.js

@@ -29,7 +29,7 @@ describe('Postcode filter()', () => {
                 }
             }, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -63,7 +63,7 @@ describe('Postcode filter()', () => {
                 search: 'one',
             }}, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

back/methods/vn-user/update-user.js

@@ -26,7 +26,7 @@ module.exports = Self => {
                 description: 'The user lang'
             }, {
                 arg: 'twoFactor',
-                type: 'string',
+                type: 'any',
                 description: 'The user twoFactor'
             }
         ],

back/models/vn-user.json

@@ -165,7 +165,8 @@
                 "hasGrant",
                 "realm",
                 "email",
-                "emailVerified"
+                "emailVerified",
+                "twoFactor"
             ]
         }
     }

db/dump/fixtures.before.sql

@@ -361,11 +361,12 @@ INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
 
 INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
     VALUES
-        ('46000', 		1, 6),
-        ('46460', 		2, 6),
-        ('46680', 		3, 6),
-        ('46600', 		4, 7),
-        ('EC170150', 	5, 8);
+        ('46000', 1, 6),
+        ('46460', 2, 6),
+        ('46680', 3, 6),
+        ('46600', 4, 7),
+        ('46600',1, 6),
+        ('EC170150', 5, 8);
 
 INSERT INTO `vn`.`clientType`(`code`, `type`)
     VALUES
@@ -3936,7 +3937,7 @@ INSERT INTO vn.medicalReview
 (id, workerFk, centerFk, `date`, `time`, isFit, amount, invoice, remark)
 VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);
 
-INSERT INTO vn.stockBought (workerFk, bought, reserve, dated) 
+INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)
     VALUES(35, 1.00, 1.00, '2001-01-01');
 
 INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)

db/routines/vn/functions/MIDNIGHT.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`MIDNIGHT`(vDate DATE)
-	RETURNS datetime
-	DETERMINISTIC
-BEGIN
-	RETURN TIMESTAMP(vDate,'23:59:59');
-END$$
-DELIMITER ;

db/routines/vn/functions/routeProposal_.sql

@@ -1,30 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`routeProposal_`(vTicketFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-
-	DECLARE vRouteFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vShipped DATETIME;
-    
-    SELECT addressFk, date(shipped) INTO vAddressFk, vShipped
-		FROM vn.ticket 
-        WHERE id = vTicketFk;
-
-	SELECT routeFk INTO vRouteFk
-		FROM
-			(SELECT t.routeFk, sum(af.friendship) friendshipSum
-				FROM vn.ticket t
-					JOIN cache.addressFriendship af ON af.addressFk2 = t.addressFk AND af.addressFk1 = vAddressFk
-				WHERE t.shipped BETWEEN vShipped and MIDNIGHT(vShipped)
-					AND t.routeFk
-				GROUP BY routeFk
-				ORDER BY friendshipSum DESC
-        ) sub
-        LIMIT 1;
-	
-	RETURN vRouteFk;
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemShelvingProblem.sql

@@ -38,7 +38,7 @@ BEGIN
 			AND IFNULL(sub3.transit,0) < s.quantity
 			AND s.isPicked = FALSE 
 			AND s.reserved = FALSE
-			AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) 
+			AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
 			AND tst.isPreviousPreparable = TRUE
 			AND t.warehouseFk = vWarehouseFk
             AND iss.sectorFk = vSectorFk

db/routines/vn/views/ticketStateToday.sql

@@ -13,4 +13,4 @@ FROM (
 		`vn`.`ticketState` `ts`
 		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
 	)
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `util`.`midnight`()

modules/account/back/model-config.json

@@ -1,4 +1,7 @@
 {
+    "Account": {
+        "dataSource": "vn"
+    },
     "AccountConfig": {
         "dataSource": "vn"
     },
@@ -47,9 +50,6 @@
     "SipConfig": {
         "dataSource": "vn"
     },
-    "Account": {
-        "dataSource": "vn"
-    },
     "UserLog": {
         "dataSource": "vn"
     },

modules/client/back/models/address.js

@@ -43,8 +43,14 @@ module.exports = Self => {
             include: [{
                 relation: 'province',
                 scope: {
-                    fields: ['id', 'name']
-                }
+                    fields: ['id', 'name', 'countryFk'],
+                    include: [
+                        {
+                            relation: 'country',
+                            scope: {fields: ['id', 'name']},
+                        },
+                    ],
+                },
             }, {
                 relation: 'agencyMode',
                 scope: {

myt.config.yml

@@ -394,4 +394,4 @@ localFixtures:
     - zoneExclusionGeo
     - zoneGeo
     - zoneIncluded
-    - zoneWarehouse
+    - zoneWarehouse