Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

back/models/autonomy.json

@@ -16,6 +16,10 @@
         "name": {
             "type": "string",
             "required": true
+        },
+        "hasDailyInvoice": {
+            "type": "boolean",
+            "description": "Indicates if the autonomy has daily invoice enabled"
         }
     },
     "relations": {

back/models/country.json

@@ -28,6 +28,10 @@
         },
         "continentFk": {
             "type": "number"
+        },
+        "hasDailyInvoice": {
+            "type": "boolean",
+            "description": "Indicates if the autonomy has daily invoice enabled"
         }
     },
     "relations": {

back/models/province.json

@@ -16,6 +16,9 @@
         "name": {
             "type": "string",
             "required": true
+        },
+        "autonomyFk": {
+            "type": "number"
         }
     },
     "relations": {

db/dump/fixtures.before.sql

@@ -632,14 +632,21 @@ INSERT INTO vn.invoiceOutConfig
     SET id = 1,
         parallelism = 8;
 
-INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
+INSERT INTO `vn`.`invoiceOutSerial`
+        (`code`,`description`,                  `isTaxed`,  `taxAreaFk`, 	`isCEE`,   `type`)
     VALUES
         ('A',   'Global nacional',              1,          'NATIONAL',		0,         'global'),
         ('T',   'Española rapida',              1,          'NATIONAL',		0,         'quick'),
         ('V',   'Intracomunitaria global',      0,          'CEE',     		1,         'global'),
         ('M',   'Múltiple nacional',            1,          'NATIONAL',		0,         'multiple'),
         ('R',   'Rectificativa',                1,          'NATIONAL',		0,         NULL),
-        ('E', 'Exportación rápida',         0, 'WORLD',     0,  'quick');
+        ('E',   'Exportación rápida',           0,          'WORLD',   		0,         'quick'),
+        ('H',   'Intracomunitaria rápida',      0,          'CEE',     		1,         'quick'),
+        ('P',   'Factura simplificada',         1,          'NATIONAL',		0,         NULL),
+        ('PE',  'COOPERATIE FLORAHOLLAND UA',   0,          'CEE',     		1,          NULL),
+        ('S',   'Simplificada',                 1,          'NATIONAL',		0,         NULL),
+        ('X',   'Exportación global',           0,          'WORLD',   		0,         'global'),
+        ('N',   'Múltiple Intracomunitaria',	0,          'CEE',			1,         'multiple');
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
@@ -2911,7 +2918,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (6, 'book-entry-deleted', 'accounting entries deleted'),
         (7, 'zone-included','An email to notify zoneCollisions'),
         (8, 'backup-printer-selected','A backup printer has been selected'),
-        (9, 'mrw-deadline','The MRW deadline has passed');
+        (9, 'mrw-deadline','The MRW deadline has passed'),
+        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)

db/routines/bs/procedures/clientNewBorn_recalc.sql

@@ -6,8 +6,8 @@ BLOCK1: BEGIN
 	DECLARE vShipped DATE; 
 	DECLARE vPreviousShipped DATE;
 	DECLARE vDone boolean;  
-	DECLARE cur cursor for         
 
+	DECLARE cur CURSOR FOR  
 		SELECT clientFk, firstShipped  
 			FROM bs.clientNewBorn;    
         
@@ -17,14 +17,16 @@ BLOCK1: BEGIN
 	DELETE FROM	bs.clientNewBorn WHERE isModified = FALSE;
 
 	INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped)
-			SELECT  c.id, MAX(t.shipped), MAX(t.shipped)
+		SELECT  c.id, DATE(MAX(t.shipped)), DATE(MAX(t.shipped))
 			FROM vn.client c
-					JOIN vn.ticket t on t.clientFk =  c.id
+				JOIN vn.ticket t ON t.clientFk =  c.id
-                    LEFT JOIN clientNewBorn cb on cb.clientFk = c.id
+				LEFT JOIN clientNewBorn cb ON cb.clientFk = c.id
-				WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null
+			WHERE t.shipped BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR 
+					AND util.VN_CURDATE() 
+				AND cb.isModified IS NULL
 			GROUP BY c.id;
-	OPEN cur;
 
+	OPEN cur;
 	LOOP1: LOOP
 		SET vDone := FALSE;
 		FETCH cur INTO vClientFk, vShipped;

db/routines/vn/procedures/client_create.sql

@@ -34,22 +34,19 @@ BEGIN
 	DECLARE vIsTaxDataChecked TINYINT(1);
 	DECLARE vHasCoreVnl BOOLEAN;
 	DECLARE vMandateTypeFk INT;
-	DECLARE vHasDailyInvoice BOOLEAN;
 
 	SELECT cc.defaultPayMethodFk,
 			cc.defaultDueDay,
 			cc.defaultCredit,
 			cc.defaultIsTaxDataChecked,
 			cc.defaultHasCoreVnl,
-			cc.defaultMandateTypeFk,
+			cc.defaultMandateTypeFk
-			c.hasDailyInvoice
 		INTO vPayMethodFk,
 			vDueDay,
 			vDefaultCredit,
 			vIsTaxDataChecked,
 			vHasCoreVnl,
-			vMandateTypeFk,
+			vMandateTypeFk
-			vHasDailyInvoice
 		FROM clientConfig cc
 			LEFT JOIN province p ON p.id = vProvinceFk
 			LEFT JOIN country c ON c.id = p.countryFk;
@@ -70,8 +67,7 @@ BEGIN
 			credit = vDefaultCredit,
 			isTaxDataChecked = vIsTaxDataChecked,
 			hasCoreVnl = vHasCoreVnl,
-			isEqualizated = FALSE,
+			isEqualizated = FALSE
-			hasDailyInvoice = vHasDailyInvoice
 		ON duplicate KEY UPDATE
 			payMethodFk = vPayMethodFk,
 			dueDay = vDueDay,

db/routines/vn/procedures/item_getSimilar.sql

@@ -24,6 +24,7 @@ BEGIN
 
 	CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
 	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
+	CALL buy_getUltimate(NULL, vWarehouseFk, vDated);
 
 	WITH itemTags AS (
 		SELECT i.id,
@@ -74,14 +75,13 @@ BEGIN
 				AND a.calc_id = vAvailableCalcFk
 			LEFT JOIN cache.visible v ON v.item_id = i.id
 				AND v.calc_id = vVisibleCalcFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
-				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf
 			LEFT JOIN vn.itemTag it ON it.itemFk = i.id
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
-			LEFT JOIN vn.buy b ON b.id = lb.buy_id
+			LEFT JOIN vn.buy b ON b.id = bu.buyFk
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
@@ -98,5 +98,7 @@ BEGIN
 			(i.tag8 = its.tag8) DESC,
 			match8 DESC
 		LIMIT 100;
+
+	DROP TEMPORARY TABLE tmp.buyUltimate;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_close.sql

@@ -43,7 +43,7 @@ BEGIN
 				c.isTaxDataChecked,
 				t.companyFk,
 				t.shipped,
-				IFNULL(a.hasDailyInvoice, co.hasDailyInvoice),
+				c.hasDailyInvoice,
 				w.isManaged,
 				c.hasToInvoice
 			INTO vClientFk,
@@ -55,9 +55,6 @@ BEGIN
 				vHasToInvoice
 			FROM ticket t
 				JOIN `client` c ON c.id = t.clientFk
-				JOIN province p ON p.id = c.provinceFk
-				LEFT JOIN autonomy a ON a.id = p.autonomyFk
-				JOIN country co ON co.id = p.countryFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 			WHERE t.id = vCurTicketFk;
 

db/versions/11300-limeMedeola/00-firstScript.sql

@@ -0,0 +1,137 @@
+CREATE TABLE IF NOT EXISTS `vn`.`itemFarmingTag` (
+	`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`.`itemFarmingTag` (`name`) VALUES ('Enraizado');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemFarmingTag'
+	WHERE name= 'cultivo';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemWrappingTag` (
+	`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`.`itemWrappingTag` (`name`) VALUES ('Bolsa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja cartón');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Caja decorativa');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Celofán');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Papel kraft');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemWrappingTag` (`name`) VALUES ('Variable');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemWrappingTag'
+	WHERE name= 'Envoltorio';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemLanguageTag` (
+	`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`.`itemLanguageTag` (`name`) VALUES ('Castellano');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Catalán');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Euskera');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Francés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Gallego');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Inglés');
+INSERT IGNORE INTO `vn`.`itemLanguageTag` (`name`) VALUES ('Portugués');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemLanguageTag'
+	WHERE name= 'Idioma';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemStemTag` (
+	`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`.`itemStemTag` (`name`) VALUES ('Natural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Seminatural');
+INSERT IGNORE INTO `vn`.`itemStemTag` (`name`) VALUES ('Sintético');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemStemTag'
+	WHERE name= 'Tronco';
+
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBreederTag` (
+	`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`.`itemBreederTag` (`name`) VALUES ('David Austin');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemBreederTag'
+	WHERE name= 'Obtentor';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemBaseTag` (
+	`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`.`itemBaseTag` (`name`) VALUES ('Biodegradable');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Caballete');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cerámica');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Cristal');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico por inyección');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Madera');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Plástico');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Rígido');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Ruedas');
+INSERT IGNORE INTO `vn`.`itemBaseTag` (`name`) VALUES ('Sin soporte rígido');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemBaseTag'
+	WHERE name= 'Soporte';
+
+CREATE TABLE IF NOT EXISTS `vn`.`itemVatRateTag` (
+	`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`.`itemVatRateTag` (`name`) VALUES ('General');
+INSERT IGNORE INTO `vn`.`itemVatRateTag` (`name`) VALUES ('Reducido');
+
+UPDATE vn.tag 
+	SET isFree=0, 
+		sourceTable='itemVatRateTag'
+	WHERE name= 'Tipo de IVA';	
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemFarmingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemLanguageTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemStemTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemWrappingTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBaseTag TO logisticAssist;
+GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE vn.itemBreederTag TO logisticAssist;

db/versions/11302-limeTulip/00-firstScript.sql

@@ -0,0 +1,13 @@
+
+UPDATE `vn`.`client` c
+	JOIN `vn`.`country` co ON co.id=c.countryFk
+SET c.hasDailyInvoice = co.hasDailyInvoice
+WHERE co.hasDailyInvoice IS NOT NULL
+	AND c.hasDailyInvoice = FALSE;
+
+UPDATE `vn`.`client` c
+	JOIN `vn`.`province` p ON p.id=c.provinceFk
+	JOIN `vn`.`autonomy` a ON a.id = p.autonomyFk
+SET c.hasDailyInvoice = a.hasDailyInvoice
+WHERE a.hasDailyInvoice IS NOT NULL
+	AND c.hasDailyInvoice = FALSE;

loopback/locale/es.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "El archivo del cmr no existe",
 	"You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+	"No invoice series found for these parameters": "No se encontró una serie para estos parámetros",
 	"The line could not be marked": "La linea no puede ser marcada",
 	"Through this procedure, it is not possible to modify the password of users with verified email": "Mediante este procedimiento, no es posible modificar la contraseña de usuarios con correo verificado",
 	"They're not your subordinate": "No es tu subordinado/a.",

loopback/locale/fr.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "Le fichier cmr n'existe pas",
 	"You are not allowed to modify the alias": "Vous n'êtes pas autorisé à modifier l'alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "L'adresse du client doit contenir des informations sur les Incoterms et l'agent des douanes",
+	"No invoice series found for these parameters": "Aucune série de facture trouvée pour ces paramètres",
 	"The line could not be marked": "La ligne ne peut pas être marquée",
 	"This password can only be changed by the user themselves": "Ce mot de passe ne peut être modifié que par l'utilisateur lui-même",
 	"They're not your subordinate": "Ce n'est pas votre subordonné.",

loopback/locale/pt.json

@@ -350,6 +350,7 @@
 	"Cmr file does not exist": "O arquivo CMR não existe",
 	"You are not allowed to modify the alias": "Você não tem permissão para modificar o alias",
 	"The address of the customer must have information about Incoterms and Customs Agent": "O endereço do cliente deve ter informações sobre Incoterms e Agente Aduaneiro",
+	"No invoice series found for these parameters": "Nenhuma série de fatura encontrada para esses parâmetros",
 	"The line could not be marked": "A linha não pôde ser marcada",
 	"This password can only be changed by the user themselves": "Esta senha só pode ser alterada pelo próprio usuário",
 	"They're not your subordinate": "Eles não são seus subordinados.",

modules/claim/back/methods/claim/updateClaim.js

@@ -85,17 +85,12 @@ module.exports = Self => {
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
             const salesPerson = claim.client().salesPersonUser();
-            if (salesPerson) {
+            if (salesPerson && args.claimStateFk) {
-                if (changedPickup && updatedClaim.pickup)
-                    await notifyPickUp(ctx, salesPerson.id, claim);
-
-                if (args.claimStateFk) {
                 const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
                 await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
                 if (newState.code == 'canceled')
                     await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
             }
-            }
 
             if (tx) await tx.commit();
 
@@ -119,18 +114,4 @@ module.exports = Self => {
         });
         await models.Chat.sendCheckingPresence(ctx, workerId, message);
     }
-
-    async function notifyPickUp(ctx, workerId, claim) {
-        const models = Self.app.models;
-        const url = await models.Url.getUrl();
-        const $t = ctx.req.__; // $translate
-
-        const message = $t('Claim will be picked', {
-            claimId: claim.id,
-            clientName: claim.client().name,
-            claimUrl: `${url}claim/${claim.id}/summary`,
-            claimPickup: $t(claim.pickup)
-        });
-        await models.Chat.sendCheckingPresence(ctx, workerId, message);
-    }
 };

modules/client/back/methods/client/createWithUser.js

@@ -43,6 +43,23 @@ module.exports = function(Self) {
         };
 
         try {
+            const province = await models.Province.findOne({
+                where: {id: data.provinceFk},
+                fields: ['autonomyFk']
+            });
+
+            const autonomy = province ? await models.Autonomy.findOne({
+                where: {id: province.autonomyFk},
+                fields: ['hasDailyInvoice']
+            }) : null;
+
+            const country = await models.Country.findOne({
+                where: {id: data.countryFk},
+                fields: ['hasDailyInvoice']
+            });
+
+            const hasDailyInvoice = (autonomy?.hasDailyInvoice ?? country?.hasDailyInvoice) || false;
+
             const account = await models.VnUser.create(user, myOptions);
             const client = await Self.create({
                 id: account.id,
@@ -57,7 +74,8 @@ module.exports = function(Self) {
                 provinceFk: data.provinceFk,
                 countryFk: data.countryFk,
                 isEqualizated: data.isEqualizated,
-                businessTypeFk: data.businessTypeFk
+                businessTypeFk: data.businessTypeFk,
+                hasDailyInvoice: hasDailyInvoice
             }, myOptions);
 
             const address = await models.Address.create({

modules/client/back/methods/client/specs/createWithUser.spec.js

@@ -1,5 +1,54 @@
 const models = require('vn-loopback/server/server').models;
+
 describe('Client Create', () => {
+    let options;
+    let tx;
+
+    beforeAll.mockLoopBackContext();
+
+    beforeEach(async() => {
+        tx = await models.Client.beginTransaction({});
+        options = {transaction: tx};
+    });
+
+    afterEach(async() => await tx.rollback());
+
+    it('should not find deadpool as he is not created yet', async() => {
+        try {
+            const account = await models.VnUser.findOne({where: {name: 'deadpool'}}, options);
+            const client = await models.Client.findOne({where: {name: 'Wade'}}, options);
+
+            expect(account).toBeNull();
+            expect(client).toBeNull();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should throw an error when creating a new account without email', async() => {
+        let error;
+        const newAccountWithoutEmail = {
+            userName: 'deadpool',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 1
+        };
+
+        try {
+            await models.Client.createWithUser(newAccountWithoutEmail, options);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error.message).toEqual('An email is necessary');
+    });
+
+    it('should create a new account with dailyInvoice', async() => {
         const newAccount = {
             userName: 'deadpool',
             email: 'deadpool@marvel.com',
@@ -11,57 +60,19 @@ describe('Client Create', () => {
             businessTypeFk: 'florist',
             provinceFk: 1
         };
-    const newAccountWithoutEmail = JSON.parse(JSON.stringify(newAccount));
-    delete newAccountWithoutEmail.email;
-
-    beforeAll.mockLoopBackContext();
-
-    it(`should not find deadpool as he's not created yet`, async() => {
-        const tx = await models.Client.beginTransaction({});
 
         try {
-            const options = {transaction: tx};
+            const province = await models.Province.findById(newAccount.provinceFk, {
-
+                fields: ['id', 'name', 'autonomyFk'],
-            const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
+                include: {
-            const client = await models.Client.findOne({where: {name: newAccount.name}}, options);
+                    relation: 'autonomy'
-
-            expect(account).toEqual(null);
-            expect(client).toEqual(null);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
                 }
-    });
+            }, options);
-
-    it('should not create a new account', async() => {
-        const tx = await models.Client.beginTransaction({});
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            await models.Client.createWithUser(newAccountWithoutEmail, options);
-
-            await tx.rollback();
-        } catch (e) {
-            error = e.message;
-
-            await tx.rollback();
-        }
-
-        expect(error).toEqual(`An email is necessary`);
-    });
-
-    it('should create a new account', async() => {
-        const tx = await models.Client.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
 
             const client = await models.Client.createWithUser(newAccount, options);
             const account = await models.VnUser.findOne({where: {name: newAccount.userName}}, options);
 
+            expect(province.autonomy().hasDailyInvoice).toBeTruthy();
             expect(account.name).toEqual(newAccount.userName);
             expect(client.id).toEqual(account.id);
             expect(client.name).toEqual(newAccount.name);
@@ -69,8 +80,38 @@ describe('Client Create', () => {
             expect(client.fi).toEqual(newAccount.fi);
             expect(client.socialName).toEqual(newAccount.socialName);
             expect(client.businessTypeFk).toEqual(newAccount.businessTypeFk);
-
+            expect(client.hasDailyInvoice).toBeTruthy();
+        } catch (e) {
             await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should create a new account without dailyInvoice', async() => {
+        const newAccount = {
+            userName: 'deadpool',
+            email: 'deadpool@marvel.com',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 3
+        };
+
+        try {
+            const province = await models.Province.findById(newAccount.provinceFk, {
+                fields: ['id', 'name', 'autonomyFk'],
+                include: {
+                    relation: 'autonomy'
+                }
+            }, options);
+
+            const client = await models.Client.createWithUser(newAccount, options);
+
+            expect(province.autonomy.hasDailyInvoice).toBeFalsy();
+            expect(client.hasDailyInvoice).toBeFalsy();
         } catch (e) {
             await tx.rollback();
             throw e;
@@ -78,26 +119,25 @@ describe('Client Create', () => {
     });
 
     it('should not be able to create a user if exists', async() => {
-        const tx = await models.Client.beginTransaction({});
-
         let error;
-
+        const newAccount = {
+            userName: 'deadpool',
+            email: 'deadpool@marvel.com',
+            fi: '16195279J',
+            name: 'Wade',
+            socialName: 'DEADPOOL MARVEL',
+            street: 'WALL STREET',
+            city: 'New York',
+            businessTypeFk: 'florist',
+            provinceFk: 1
+        };
         try {
-            const options = {transaction: tx};
-
             await models.Client.createWithUser(newAccount, options);
-            const client = await models.Client.createWithUser(newAccount, options);
+            await models.Client.createWithUser(newAccount, options);
-
-            expect(client).toBeNull();
-
-            await tx.rollback();
         } catch (e) {
-            await tx.rollback();
             error = e;
         }
 
-        const errorName = error.details.codes.name[0];
+        expect(error.message).toContain('already exists');
-
-        expect(errorName).toEqual('uniqueness');
     });
 });

modules/client/back/methods/defaulter/filter.js

@@ -74,7 +74,8 @@ module.exports = Self => {
                         pm.name payMethod,
                         r.finished IS NULL hasRecovery,
                         dp.id departmentFk,
-                        dp.name departmentName
+                        dp.name departmentName,
+                        dp.notificationEmail departmentEmail
                     FROM defaulter d
                         JOIN client c ON c.id = d.clientFk
                         JOIN country cn ON cn.id = c.countryFk

modules/client/back/methods/defaulter/observationEmail.js

@@ -47,7 +47,7 @@ module.exports = Self => {
             await models.Mail.create({
                 subject: $t('Comment added to client', {clientFk: defaulter.clientFk}),
                 body: body,
-                receiver: `${defaulter.salesPersonName}@verdnatura.es`,
+                receiver: `${defaulter.departmentEmail}`,
                 replyTo: `${user.name}@verdnatura.es`
             }, myOptions);
         }

modules/invoiceOut/back/methods/invoiceOut/delete.js

@@ -57,11 +57,11 @@ module.exports = Self => {
                     const params = {
                         bookEntry: bookEntry.ASIEN,
                         invoiceOutRef: invoiceOut.ref
-                    }        
+                    };
                     await Self.rawSql(`SELECT util.notification_send('book-entry-deleted', ?, NULL)`,
                         [JSON.stringify(params)],
                         myOptions);
-                };
+                }
 
                 await models.Xdiario.destroyAll({
                     ASIEN: bookEntry.ASIEN

modules/invoiceOut/back/models/invoice-out.js

@@ -79,6 +79,8 @@ module.exports = Self => {
                 type
             ],
             myOptions);
+        if (!serial)
+            throw new UserError('No invoice series found for these parameters');
 
         const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
         if (invoiceOutSerial?.taxAreaFk == 'WORLD') {

modules/ticket/back/methods/sale/usesMana.js

@@ -31,6 +31,6 @@ module.exports = Self => {
 
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
-        return usesMana ? true : false;
+        return !!usesMana;
     };
 };

modules/ticket/back/methods/ticket-request/filter.js

@@ -59,6 +59,11 @@ module.exports = Self => {
                 arg: 'state',
                 type: 'string',
                 description: `Search request by request state`
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: `Team partners`
             }
         ],
         returns: {
@@ -75,6 +80,8 @@ module.exports = Self => {
         const conn = Self.dataSource.connector;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {};
+        const models = Self.app.models;
+        const args = ctx.args;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -82,6 +89,21 @@ module.exports = Self => {
         if (ctx.args.mine)
             ctx.args.attenderFk = userId;
 
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
+
         let where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
@@ -113,6 +135,11 @@ module.exports = Self => {
                 return {'w.id': value};
             case 'salesPersonFk':
                 return {'c.salesPersonFk': value};
+            case 'myTeam':
+                if (value)
+                    return {'tr.requesterFk': {inq: teamMembersId}};
+                else
+                    return {'tr.requesterFk': {nin: teamMembersId}};
             }
         });
 

modules/ticket/back/methods/ticket/closeAll.js

@@ -1,11 +1,17 @@
-const UserError = require('vn-loopback/util/user-error');
 const closure = require('./closure');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeAll', {
         description: 'Makes the closure process from all warehouses',
         accessType: 'WRITE',
-        accepts: [],
+        accepts: [
+            {
+                arg: 'options',
+                type: 'object',
+                http: {source: 'body'},
+                description: 'Optional parameters, including transaction.'
+            }
+        ],
         returns: {
             type: 'object',
             root: true
@@ -16,21 +22,20 @@ module.exports = Self => {
         }
     });
 
-    Self.closeAll = async ctx => {
+    Self.closeAll = async(ctx, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const myOptions = {userId};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        let tx;
+        // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
+
         const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
 
-        const todayMinDate = Date.vnNew();
-        todayMinDate.setHours(0, 0, 0, 0);
-
-        const todayMaxDate = Date.vnNew();
-        todayMaxDate.setHours(23, 59, 59, 59);
-
-        // Prevent closure for current day
-        if (toDate >= todayMinDate && toDate <= todayMaxDate)
-            throw new UserError('You cannot close tickets for today');
-
         const tickets = await Self.rawSql(`
             SELECT t.id,
                     t.clientFk,
@@ -41,7 +46,7 @@ module.exports = Self => {
                     c.salesPersonFk,
                     c.isToBeMailed,
                     c.hasToInvoice,
-                    co.hasDailyInvoice,
+                    c.hasDailyInvoice,
                     eu.email salesPersonEmail,
                     t.addressFk
                 FROM ticket t
@@ -58,12 +63,12 @@ module.exports = Self => {
                     AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
-        `, [toDate, toDate]);
+        `, [toDate, toDate], myOptions);
         const ticketIds = tickets.map(ticket => ticket.id);
         await Self.rawSql(`
             INSERT INTO util.debug (variable, value)
                 VALUES ('nightInvoicing', ?)
-        `, [ticketIds.join(',')]);
+        `, [ticketIds.join(',')], myOptions);
 
         await Self.rawSql(`
         WITH ticketNotInvoiceable AS(
@@ -120,7 +125,7 @@ module.exports = Self => {
                             WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
                                 AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                                 AND t.refFk IS NULL
-                                AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+                                AND c.hasDailyInvoice
                             GROUP BY ticketFk
                             HAVING hasErrorToInvoice
                                 OR hasErrorTaxDataChecked
@@ -133,9 +138,9 @@ module.exports = Self => {
             ) SELECT IF(errors = '{"tickets": null}',
                     'No errors',
                     util.notification_send('invoice-ticket-closure', errors, NULL))
-                FROM ticketNotInvoiceable`, [toDate, toDate]);
+                FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
 
-        await closure(ctx, Self, tickets);
+        await closure(ctx, Self, tickets, myOptions);
 
         await Self.rawSql(`
             UPDATE ticket t
@@ -150,7 +155,10 @@ module.exports = Self => {
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL
-                    AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
+                    AND t.routeFk`, [toDate, toDate], myOptions);
+
+        if (tx)
+            await tx.commit();
 
         return {
             message: 'Success'

modules/ticket/back/methods/ticket/closeByTicket.js

@@ -50,7 +50,7 @@ module.exports = Self => {
                 c.salesPersonFk,
                 c.isToBeMailed,
                 c.hasToInvoice,
-                co.hasDailyInvoice,
+                c.hasDailyInvoice,
                 eu.email salesPersonEmail,
                 t.addressFk
             FROM expedition e
@@ -58,8 +58,6 @@ module.exports = Self => {
                 JOIN ticketState ts ON ts.ticketFk = t.id
                 JOIN alertLevel al ON al.id = ts.alertLevel
                 JOIN client c ON c.id = t.clientFk
-                JOIN province p ON p.id = c.provinceFk
-                JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
             WHERE al.code = 'PACKED'
                 AND t.id = ?

modules/ticket/back/methods/ticket/closure.js

@@ -19,9 +19,14 @@ module.exports = async function(ctx, Self, tickets, options) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
-            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
+            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], myOptions);
 
-            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'quick');
+            await Self.app.models.InvoiceOut.getSerial(
+                ticket.clientFk,
+                ticket.companyFk,
+                ticket.addressFk,
+                'quick',
+                myOptions);
             await Self.rawSql(
                 `CALL vn.ticket_closeByTicket(?)`,
                 [ticket.id],

modules/ticket/back/methods/ticket/setDeleted.js

@@ -49,9 +49,12 @@ module.exports = Self => {
                 where: {originalTicketFk: id}
             }, myOptions);
 
+            const hasRefund = !!ticketRefunds?.length;
+
             const allDeleted = ticketRefunds.every(refund => refund.refundTicket().isDeleted);
 
-            if (ticketRefunds?.length && !allDeleted) {
+            if (!hasRefund) await models.TicketRefund.destroyAll({refundTicketFk: id}, myOptions);
+            if (hasRefund && !allDeleted) {
                 const notDeleted = [];
                 for (const refund of ticketRefunds)
                     if (!refund.refundTicket().isDeleted) notDeleted.push(refund.refundTicket().id);

modules/ticket/back/methods/ticket/specs/closeAll.spec.js

@@ -0,0 +1,54 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Ticket Closure - closeAll function', () => {
+    let ctx = {
+        req: {
+            getLocale: () => 'es',
+            accessToken: {userId: 1106},
+            headers: {origin: 'http://localhost'},
+            __: value => value,
+        },
+        args: {}
+    };
+    let options;
+    let tx;
+    let originalVnNew;
+
+    beforeEach(async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: ctx.req});
+
+        tx = await models.Ticket.beginTransaction({});
+        options = {transaction: tx};
+        originalVnNew = Date.vnNew;
+        spyOn(Date, 'vnNew').and.callFake(() => {
+            const mockDate = originalVnNew();
+            mockDate.setDate(mockDate.getDate() + 1);
+            return mockDate;
+        });
+    });
+
+    afterEach(async() => {
+        if (tx)
+            await tx.rollback();
+    });
+
+    it('should set routeFk to NULL when conditions are met', async() => {
+        const ticketsBefore = await models.Ticket.find({
+            where: {
+                routeFk: {neq: null}
+            }
+        }, options);
+
+        await models.Ticket.closeAll(ctx, options);
+
+        const ticketsAfter = await models.Ticket.find({
+            where: {
+                id: {inq: ticketsBefore.map(ticket => ticket.id)},
+                routeFk: {neq: null}
+            }
+        }, options);
+
+        expect(ticketsBefore.length).toBeGreaterThan(ticketsAfter.length);
+    });
+});

modules/ticket/back/methods/ticket/specs/setDeleted.spec.js

@@ -113,5 +113,27 @@ describe('ticket setDeleted()', () => {
 
             expect(error.message).not.toContain('Tickets with associated refunds');
         });
+
+        it('should delete the refund - original ticket relation', async() => {
+            const tx = await models.Ticket.beginTransaction({});
+            try {
+                const options = {transaction: tx};
+
+                const ticketId = 24;
+                const refundTicket = await models.TicketRefund.findOne({where: {refundTicketFk: ticketId}}, options);
+
+                expect(refundTicket).toBeTruthy();
+
+                await models.Ticket.setDeleted(ctx, ticketId, options);
+                const removedRefundTicket = await models.TicketRefund.findOne({
+                    where: {refundTicketFk: ticketId}},
+                options);
+
+                expect(removedRefundTicket).toBeNull();
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+            }
+        });
     });
 });

modules/ticket/back/models/expedition.json

@@ -26,6 +26,9 @@
     },
     "externalId": {
       "type": "string"
+    },
+    "stateTypeFk": {
+      "type": "number"
     }
   },
   "relations": {
@@ -60,4 +63,4 @@
       "foreignKey": "packagingFk"
     }
   }
-  }
+}