Merge branch '7355-accountMigration2' of https://gitea.verdnatura.es/verdnatura/salix into 7355-accountMigration2

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

@@ -24,6 +24,10 @@ module.exports = Self => {
                 arg: 'lang',
                 type: 'string',
                 description: 'The user lang'
+            }, {
+                arg: 'twoFactor',
+                type: 'string',
+                description: 'The user twoFactor'
             }
         ],
         http: {
@@ -32,8 +36,8 @@ module.exports = Self => {
         }
     });
 
-    Self.updateUser = async(ctx, id, name, nickname, email, lang) => {
+    Self.updateUser = async(ctx, id, name, nickname, email, lang, twoFactor) => {
         await Self.userSecurity(ctx, id);
-        await Self.upsertWithWhere({id}, {name, nickname, email, lang});
+        await Self.upsertWithWhere({id}, {name, nickname, email, lang, twoFactor});
     };
 };

back/models/vn-user.js

@@ -101,9 +101,10 @@ module.exports = function(Self) {
         const headers = httpRequest.headers;
         const origin = headers.origin;
 
-        const defaultHash = '/reset-password?access_token=$token$';
+        const defaultHash = '!/reset-password?access_token=$token$';
         const recoverHashes = {
-            hedera: 'verificationToken=$token$'
+            hedera: '!verificationToken=$token$',
+            lilium: '/resetPassword?access_token=$token$'
         };
 
         const app = info.options?.app;
@@ -115,7 +116,7 @@ module.exports = function(Self) {
         const params = {
             recipient: info.email,
             lang: user.lang,
-            url: origin + '/#!' + recoverHash
+            url: origin + '/#' + recoverHash
         };
 
         const options = Object.assign({}, info.options);

db/routines/salix/triggers/ACL_afterDelete.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_afterDelete`
 	AFTER DELETE ON `ACL`
 	FOR EACH ROW
 BEGIN
-	INSERT INTO ACL
+	INSERT INTO ACLLog
 		SET `action` = 'delete',
 			`changedModel` = 'Acl',
 			`changedModelId` = OLD.id,

db/routines/vn/procedures/item_getBalance.sql

@@ -189,7 +189,7 @@ BEGIN
 			SELECT * FROM sales
 			UNION ALL
 			SELECT * FROM orders
-			ORDER BY shipped,
+			ORDER BY shipped DESC,
 				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,

db/routines/vn/triggers/host_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeInsert`
+	BEFORE INSERT ON `host`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/host_beforeUpdate.sql

@@ -4,5 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeUpdate`
 	FOR EACH ROW
 BEGIN
     SET new.updated = util.VN_NOW();
+	SET NEW.editorFk = account.myUser_getId();
 END$$
 DELIMITER ;

db/versions/11185-maroonArborvitae/00-firstScript.sql

@@ -0,0 +1 @@
+DROP TABLE bi.Greuges_comercial_detail;

db/versions/11187-yellowErica/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.host ADD editorFk int(10) unsigned DEFAULT NULL NULL;

db/versions/11189-purplePaniculata/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.item
+    ADD CONSTRAINT item_itemPackingType_FK FOREIGN KEY (itemPackingTypeFk)
+        REFERENCES vn.itemPackingType(code) ON DELETE RESTRICT ON UPDATE CASCADE;

modules/worker/back/locale/worker-time-control/en.yml

@@ -0,0 +1,7 @@
+name: time control
+columns:
+    direction: direction
+    isSendMail: sent mail
+    logExclude: excluded log
+    manual: manual
+    timed: timed

modules/worker/back/locale/worker-time-control/es.yml

@@ -0,0 +1,7 @@
+name: control horario
+columns:
+    direction: dirección
+    isSendMail: correo enviado
+    logExclude: registro excluido
+    manual: manual
+    timed: fichada