Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6451_insomnia

.vscode/settings.json

@@ -16,6 +16,7 @@
     },
     "cSpell.words": [
         "salix",
-        "fdescribe"
+        "fdescribe",
+        "Loggable"
     ]
 }

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2404.01] - 2024-01-25
+
+### Added
+### Changed
+### Fixed
+
+
 ## [2402.01] - 2024-01-11
 
 ### Added

back/methods/vn-user/privileges.js

@@ -68,7 +68,7 @@ module.exports = Self => {
             userToUpdate.hasGrant = hasGrant;
 
         if (roleFk) {
-            const role = await models.Role.findById(roleFk, {fields: ['name']}, myOptions);
+            const role = await models.VnRole.findById(roleFk, {fields: ['name']}, myOptions);
             const hasRole = await Self.hasRole(userId, role.name, myOptions);
 
             if (!hasRole)

back/methods/vn-user/renew-token.js

@@ -1,14 +1,5 @@
-const UserError = require('vn-loopback/util/user-error');
 const {models} = require('vn-loopback/server/server');
 
-const handlePromiseLogout = (Self, {id}, courtesyTime) => {
-    new Promise(res => {
-        setTimeout(() => {
-            res(Self.logout(id));
-        }
-        , courtesyTime * 1000);
-    });
-};
 module.exports = Self => {
     Self.remoteMethodCtx('renewToken', {
         description: 'Checks if the token has more than renewPeriod seconds to live and if so, renews it',
@@ -28,14 +19,26 @@ module.exports = Self => {
         const {accessToken: token} = ctx.req;
 
         // Check if current token is valid
-        const isValid = await validateToken(token);
-        if (isValid)
+
+        const {renewPeriod, courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['renewPeriod', 'courtesyTime']
+        });
+        const now = Date.now();
+        const differenceMilliseconds = now - token.created;
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+        const isNotExceeded = differenceSeconds < renewPeriod - courtesyTime;
+        if (isNotExceeded)
             return token;
 
-        const {courtesyTime} = await models.AccessTokenConfig.findOne({fields: ['courtesyTime']});
-
         // Schedule to remove current token
-        handlePromiseLogout(Self, token, courtesyTime);
+        setTimeout(async() => {
+            try {
+                await Self.logout(token.id);
+            } catch (err) {
+                // eslint-disable-next-line no-console
+                console.error(err);
+            }
+        }, courtesyTime * 1000);
 
         // Create new accessToken
         const user = await Self.findById(token.userId);
@@ -43,14 +46,4 @@ module.exports = Self => {
 
         return {id: accessToken.id, ttl: accessToken.ttl};
     };
-
-    async function validateToken(token) {
-        const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod', 'courtesyTime']});
-        const now = Date.now();
-        const differenceMilliseconds = now - token.created;
-        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
-        const isValid = differenceSeconds < accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime;
-
-        return isValid;
-    }
 };

back/methods/vn-user/specs/privileges.spec.js

@@ -70,7 +70,7 @@ describe('VnUser privileges()', () => {
         const tx = await models.VnUser.beginTransaction({});
 
         const options = {transaction: tx};
-        const agency = await models.Role.findOne({
+        const agency = await models.VnRole.findOne({
             where: {
                 name: 'agency'
             }

back/model-config.json

@@ -139,9 +139,6 @@
     "Warehouse": {
         "dataSource": "vn"
     },
-    "VnUser": {
-        "dataSource": "vn"
-    },
     "OsTicket": {
         "dataSource": "osticket"
     },
@@ -156,6 +153,12 @@
     },
     "ViaexpressConfig": {
         "dataSource": "vn"
+    },
+    "VnUser": {
+        "dataSource": "vn"
+    },
+    "VnRole": {
+        "dataSource": "vn"
     }
 }
 

back/models/dms-type.json

@@ -29,12 +29,12 @@
     "relations": {
     	"readRole": {
       		"type": "belongsTo",
-      		"model": "Role",
+      		"model": "VnRole",
       		"foreignKey": "readRoleFk"
     	},
     	"writeRole": {
             "type": "belongsTo",
-            "model": "Role",
+            "model": "VnRole",
             "foreignKey": "writeRoleFk"
     	}
   	},

back/models/image-collection.json

@@ -46,12 +46,12 @@
         },
         "readRole": {
             "type": "belongsTo",
-            "model": "Role",
+            "model": "VnRole",
             "foreignKey": "readRoleFk"
         },
         "writeRole": {
             "type": "belongsTo",
-            "model": "Role",
+            "model": "VnRole",
             "foreignKey": "writeRoleFk"
         }
     },
@@ -64,4 +64,3 @@
         }
     ]
 }
-  

back/models/notificationAcl.json

@@ -24,7 +24,7 @@
         },
         "role": {
             "type": "belongsTo",
-            "model": "Role",
+            "model": "VnRole",
             "foreignKey": "roleFk"
         }
     }

back/models/specs/mailAliasAccount.spec.js

@@ -0,0 +1,73 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('loopback model MailAliasAccount', () => {
+    it('should fail to add a mail Alias if the worker doesnt have ACLs', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 57}};
+            await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toEqual('The alias cant be modified');
+    });
+
+    it('should add a mail Alias', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 9}};
+            await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should add a mail Alias of an inherit role', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 9}};
+            await models.MailAliasAccount.create({mailAlias: 3, account: 5}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should delete a mail Alias', async() => {
+        const tx = await models.MailAliasAccount.beginTransaction({});
+        let error;
+
+        try {
+            const options = {transaction: tx, accessToken: {userId: 1}};
+            const mailAclId = 2;
+            await models.MailAliasAccount.destroyAll({id: mailAclId}, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+    });
+});
+

back/models/vn-role.json

@@ -0,0 +1,13 @@
+{
+    "name": "VnRole",
+    "base": "Role",
+	"validateUpsert": true,
+    "options": {
+		"mysql": {
+			"table": "account.role"
+		}
+	},
+    "mixins": {
+        "Loggable": true
+    }
+}

back/models/vn-user.json

@@ -7,6 +7,9 @@
 			"table": "account.user"
 		}
 	},
+    "mixins": {
+        "Loggable": true
+    },
     "resetPasswordTokenTTL": "604800",
 	"properties": {
 		"id": {
@@ -63,7 +66,7 @@
 	"relations": {
 		"role": {
 			"type": "belongsTo",
-			"model": "Role",
+			"model": "VnRole",
 			"foreignKey": "roleFk"
 		},
 		"roles": {
@@ -95,27 +98,30 @@
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-        },
-        {
-            "property": "recoverPassword",
-            "accessType": "EXECUTE",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-        },
-		{
-            "property": "validateAuth",
+		}, {
+			"property": "recoverPassword",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-		},
-		{
+		}, {
+			"property": "validateAuth",
+			"accessType": "EXECUTE",
+			"principalType": "ROLE",
+			"principalId": "$everyone",
+			"permission": "ALLOW"
+		}, {
 			"property": "privileges",
 			"accessType": "*",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
+		}, {
+			"property": "renewToken",
+			"accessType": "WRITE",
+			"principalType": "ROLE",
+			"principalId": "$authenticated",
+			"permission": "ALLOW"
 		}
 	],
     "scopes": {

db/changes/235001/00-updateACL_Role_VnRole.sql

@@ -0,0 +1,6 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId) VALUES
+	 ('VnRole','*','READ','ALLOW','ROLE','employee'),
+	 ('VnRole','*','WRITE','ALLOW','ROLE','it');
+
+DELETE FROM`salix`.`ACL`  WHERE model='Role';
+

db/changes/235201/00-aclsMails.sql

@@ -0,0 +1,8 @@
+-- Definición de la tabla mailAliasACL
+
+CREATE OR REPLACE TABLE `account`.`mailAliasAcl` (
+  `mailAliasFk` int(10) unsigned NOT NULL,
+  `roleFk` int(10) unsigned NOT NULL,
+  FOREIGN KEY (`mailAliasFk`) REFERENCES `account`.`mailAlias` (`id`),
+  FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;

db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `cplusInvoiceTyoeFk`;
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrectionType_Fk33`;
+ALTER TABLE `vn`.`invoiceCorrection` DROP FOREIGN KEY `invoiceCorrection_ibfk_1`;
+
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `siiTypeInvoiceOut_FK` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `vn`.`siiTypeInvoiceOut`(id) ON UPDATE CASCADE;
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `invoiceCorrectionType_FK` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `vn`.`invoiceCorrectionType`(id) ON UPDATE CASCADE;
+ALTER TABLE `vn`.`invoiceCorrection` ADD CONSTRAINT `cplusRectificationType_FK` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType`(id) ON UPDATE CASCADE;

db/changes/240001/00-getTaxBases.sql

@@ -0,0 +1,33 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`getTaxBases`()
+BEGIN
+/**
+*   Calcula y devuelve en número de bases imponibles postivas y negativas
+*	Requiere la tabla temporal tmp.ticketToInvoice(id)
+*
+*	returns tmp.taxBases
+*/
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
+		(KEY (ticketFk))
+		ENGINE = MEMORY
+		SELECT id ticketFk
+			FROM tmp.ticketToInvoice;
+
+	CALL ticket_getTax(NULL);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.taxBases;
+	CREATE TEMPORARY TABLE tmp.taxBases
+		ENGINE = MEMORY
+		SELECT
+                SUM(taxableBase > 0) as positive,
+				SUM(taxableBase < 0) as negative
+			FROM(
+				SELECT SUM(taxableBase) taxableBase
+					FROM tmp.ticketTax
+					GROUP BY pgcFk
+				) t;
+
+END$$
+DELIMITER ;

db/changes/240001/01-newHasAnyPositiveBase.sql

@@ -0,0 +1,30 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyPositiveBase`() RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+
+/**
+*	Calcula si existe alguna base imponible positiva
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyPositiveBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT positive INTO hasAnyPositiveBase
+        FROM tmp.taxBases
+        LIMIT 1;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyPositiveBase;
+
+END$$
+DELIMITER ;

db/changes/240001/01-refactorHasAnyNegativeBase.sql

@@ -0,0 +1,32 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`hasAnyNegativeBase`() RETURNS tinyint(1)
+    DETERMINISTIC
+BEGIN
+
+/**
+*	Calcula si existe alguna base imponible negativa
+*	Requiere la tabla temporal tmp.ticketToInvoice(id) para getTaxBases()
+*
+*	returns BOOLEAN
+*/
+
+	DECLARE hasAnyNegativeBase BOOLEAN;
+
+    CALL getTaxBases();
+
+	SELECT negative INTO hasAnyNegativeBase
+        FROM tmp.taxBases
+        LIMIT 1;
+
+	DROP TEMPORARY TABLE
+        tmp.ticketTax,
+        tmp.ticket,
+        tmp.taxBases;
+
+	RETURN hasAnyNegativeBase;
+
+END$$
+DELIMITER ;
+
+

db/changes/240201/00-ticketSmsToClientSms.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`clientSms` ADD `ticketFk` int(11) NULL;
+ALTER TABLE `vn`.`clientSms` ADD CONSTRAINT `clientSms_FK_2` FOREIGN KEY (`ticketFk`) REFERENCES `vn`.`ticket`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+INSERT INTO`vn`.`clientSms` (`clientFk`, `smsFk`, `ticketFk`)
+	SELECT `t`.`clientFk`, `s`.`smsFk`, `s`.`ticketFk`
+		FROM `vn`.`clientSms` `s`
+			JOIN `vn`.`ticket` `t` ON `t`.`id` = `s`.`ticketFk`;
+
+RENAME TABLE `vn`.`ticketSms` TO `vn`.`ticketSms__`;

db/changes/240201/00-timecontrol.sql

@@ -0,0 +1,17 @@
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'VnUser' 
+        AND  property = 'renewToken';
+
+INSERT INTO `account`.`role` (name, description)
+	VALUES ('timeControl','Tablet para fichar');
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+    VALUES (127, 11);
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES 
+        ('WorkerTimeControl', 'login', 'READ', 'ALLOW', 'ROLE', 'timeControl'),
+        ('WorkerTimeControl', 'getClockIn', 'READ', 'ALLOW', 'ROLE', 'timeControl'),
+        ('WorkerTimeControl', 'clockIn', 'WRITE', 'ALLOW', 'ROLE', 'timeControl');
+
+CALL `account`.`role_sync`();

db/dump/fixtures.sql

@@ -602,18 +602,19 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
 
 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, 'quick'),
-        ('E', 'Exportación rápida',      0, 'WORLD',     0, 'quick');
+        ('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,  'quick'),
+        ('R', 'Rectificativa',              1, 'NATIONAL',  0,   NULL),
+        ('E', 'Exportación rápida',         0, 'WORLD',     0,  'quick');
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
         (1, 'T', 1026.24,   util.VN_CURDATE(),                              1101, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (2, 'T', 121.36,    util.VN_CURDATE(),                              1102, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (3, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
-        (4, 'T', 8.88,      util.VN_CURDATE(),                              1103, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
+        (4, 'T', 8.88,      util.VN_CURDATE(),                              1104, util.VN_CURDATE(),                              442, util.VN_CURDATE(),                              util.VN_CURDATE(), 1, 0),
         (5, 'A', 8.88,      DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 0);
 
 UPDATE `vn`.`invoiceOut` SET ref = 'T1111111' WHERE id = 1;
@@ -719,7 +720,7 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
 INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`)
     VALUES
         (1 , 3,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      121, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      1),
-        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2),
+        (2 , 1,     1,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave',                                      1,   NULL,     0, 1,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),      2),
         (3 , 1,     7,  1, 6,       DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 3,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),      NULL),
         (4 , 3,     2,  1, 2,       DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 9,      5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH),      NULL),
         (5 , 3,     3,  3, 3,       DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower',                                   124, NULL,     0, 10,     5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH),      NULL),
@@ -3010,7 +3011,27 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
         (2, 'Error in sales details'),
         (3, 'Error in customer data');
 
+INSERT INTO `account`.`mailAliasAcl` (`mailAliasFk`, `roleFk`)
+    VALUES
+        (1, 1),
+        (2, 9),
+        (3, 15);
+
 INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
 	VALUES
         ('Tablet1','Jarvis tablet'),
 	    ('Tablet2','Avengers tablet');
+
+INSERT INTO `vn`.`sms` (`id`, `senderFk`, `sender`, `destination`, `message`, `statusCode`, `status`, `created`) 
+    VALUES (1, 66, '111111111', '0001111111111', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()),
+        (2, 66, '222222222', '0002222222222', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'PENDING', util.VN_CURDATE()),
+        (3, 66, '333333333', '0003333333333', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'ERROR', util.VN_CURDATE()),
+        (4, 66, '444444444', '0004444444444', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE());
+
+INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`) 
+    VALUES(1, 1103, 1, NULL),
+        (2, 1103, 2, NULL),
+        (3, 1103, 3, 32),
+        (4, 1103, 4, 32),
+        (13, 1101, 1, NULL),
+        (14, 1101, 4, 27);

db/tests/vn/ticket_componentMakeUpdate.spec.js

@@ -1,123 +0,0 @@
-const app = require('vn-loopback/server/server');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-// 2277 solucionar problema al testear procedimiento con start transaction / rollback
-xdescribe('ticket_componentMakeUpdate()', () => {
-    it('should recalculate the ticket components without make modifications', async() => {
-        let stmts = [];
-        let stmt;
-
-        let params = {
-            ticketId: 11,
-            clientId: 1102,
-            agencyModeId: 2,
-            addressId: 122,
-            zoneId: 3,
-            warehouseId: 1,
-            companyId: 442,
-            isDeleted: 0,
-            hasToBeUnrouted: 0,
-            componentOption: 1
-        };
-
-        stmts.push('START TRANSACTION');
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [
-            params.ticketId
-        ]);
-        stmts.push(stmt);
-
-        let originalTicketIndex = stmts.push(stmt) - 1;
-
-        stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [
-            params.ticketId,
-            params.clientId,
-            params.agencyModeId,
-            params.addressId,
-            params.zoneId,
-            params.warehouseId,
-            params.companyId,
-            params.isDeleted,
-            params.hasToBeUnrouted,
-            params.componentOption
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [
-            params.ticketId
-        ]);
-        stmts.push(stmt);
-
-        let updatedTicketIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        let originalTicketData = result[originalTicketIndex];
-        let updatedTicketData = result[updatedTicketIndex];
-
-        expect(originalTicketData[0].isDeleted).toEqual(updatedTicketData[0].isDeleted);
-        expect(originalTicketData[0].routeFk).toEqual(updatedTicketData[0].routeFk);
-    });
-
-    it('should delete and unroute a ticket and recalculate the components', async() => {
-        let stmts = [];
-        let stmt;
-
-        let params = {
-            ticketId: 11,
-            clientId: 1102,
-            agencyModeId: 2,
-            addressId: 122,
-            zoneId: 3,
-            warehouseId: 1,
-            companyId: 442,
-            isDeleted: 1,
-            hasToBeUnrouted: 1,
-            componentOption: 1
-        };
-
-        stmts.push('START TRANSACTION');
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [
-            params.ticketId
-        ]);
-        stmts.push(stmt);
-
-        let originalTicketIndex = stmts.push(stmt) - 1;
-
-        stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [
-            params.ticketId,
-            params.clientId,
-            params.agencyModeId,
-            params.addressId,
-            params.zoneId,
-            params.warehouseId,
-            params.companyId,
-            params.isDeleted,
-            params.hasToBeUnrouted,
-            params.componentOption
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [
-            params.ticketId
-        ]);
-        stmts.push(stmt);
-
-        let updatedTicketIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        let originalTicketData = result[originalTicketIndex];
-        let updatedTicketData = result[updatedTicketIndex];
-
-        expect(originalTicketData[0].isDeleted).not.toEqual(updatedTicketData[0].isDeleted);
-        expect(originalTicketData[0].routeFk).not.toEqual(updatedTicketData[0].routeFk);
-    });
-});

e2e/paths/03-worker/04_time_control.spec.js

@@ -56,63 +56,6 @@ describe('Worker time control path', () => {
         expect(result).toContain(month);
     });
 
-    it(`should return error when insert 'out' of first entry`, async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
-        await page.pickTime(selectors.workerTimeControl.dialogTimeInput, eightAm);
-        await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'out');
-        await page.respondToDialog('accept');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toBeDefined();
-    });
-
-    it(`should insert 'in' monday`, async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
-        await page.pickTime(selectors.workerTimeControl.dialogTimeInput, eightAm);
-        await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'in');
-        await page.respondToDialog('accept');
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.firstEntryOfMonday, 'innerText');
-
-        expect(result).toEqual(eightAm);
-    });
-
-    it(`should insert 'out' monday`, async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
-        await page.pickTime(selectors.workerTimeControl.dialogTimeInput, fourPm);
-        await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'out');
-        await page.respondToDialog('accept');
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.secondEntryOfMonday, 'innerText');
-
-        expect(result).toEqual(fourPm);
-    });
-
-    it(`should check Hank Pym worked 8:20 hours`, async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        await page.waitForTextInElement(selectors.workerTimeControl.mondayWorkedHours, '08:20 h.');
-        await page.waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '08:20 h.');
-    });
-
-    it('should remove first entry of monday', async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        await page.waitForTextInElement(selectors.workerTimeControl.firstEntryOfMonday, eightAm);
-        await page.waitForTextInElement(selectors.workerTimeControl.secondEntryOfMonday, fourPm);
-        await page.waitToClick(selectors.workerTimeControl.firstEntryOfMondayDelete);
-        await page.respondToDialog('accept');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Entry removed');
-    });
-
-    it(`should be the 'out' the first entry of monday`, async() => {
-        pending('https://redmine.verdnatura.es/issues/4707');
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.firstEntryOfMonday, 'innerText');
-
-        expect(result).toEqual(fourPm);
-    });
-
     it('should change week of month', async() => {
         await page.click(selectors.workerTimeControl.thrirdWeekDay);
         const result = await page.getProperty(selectors.workerTimeControl.mondayWorkedHours, 'innerText');

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -188,17 +188,6 @@ describe('Ticket Edit sale path', () => {
         expect(result).toContain('22.50');
     });
 
-    it('should check in the history that logs has been added', async() => {
-        pending('https://redmine.verdnatura.es/issues/5455');
-        await page.reload({waitUntil: ['networkidle0', 'domcontentloaded']});
-        await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
-        await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
-        const result = await page.countElement(selectors.ticketSales.firstSaleHistory);
-
-        expect(result).toBeGreaterThan(0);
-        await page.waitToClick(selectors.ticketSales.closeHistory);
-    });
-
     it('should recalculate price of sales', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);

e2e/paths/05-ticket/11_diary.spec.js

@@ -1,31 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-// #2221 Local MySQL8 crashes when rest method Items/getBalance is called
-xdescribe('Ticket diary path', () => {
-    let page;
-
-    beforeAll(async() => {
-        page = (await getBrowser()).page;
-        await page.loginAndModule('employee', 'ticket');
-    });
-
-    afterAll(async() => {
-        await page.browser().close();
-    });
-
-    it(`should navigate to item diary from ticket sale and check the lines`, async() => {
-        await page.accessToSearchResult('1');
-        await page.waitToClick(selectors.ticketSummary.firstSaleItemId);
-        await page.waitToClick(selectors.ticketSummary.popoverDiaryButton);
-        await page.waitForState('item.card.diary');
-
-        const secondIdClass = await page.getClassName(selectors.itemDiary.secondTicketId);
-        const fourthBalanceClass = await page.getClassName(selectors.itemDiary.fourthBalance);
-        const firstBalanceClass = await page.getClassName(selectors.itemDiary.firstBalance);
-
-        expect(secondIdClass).toContain('message');
-        expect(fourthBalanceClass).toContain('message');
-        expect(firstBalanceClass).toContain('balance');
-    });
-});

e2e/paths/05-ticket/18_index_payout.spec.js

@@ -35,7 +35,7 @@ describe('Ticket index payout path', () => {
         await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton);
         await page.write(selectors.ticketsIndex.advancedSearchClient, '1101');
         await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 9);
+        await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 10);
         await page.waitToClick(selectors.ticketsIndex.firstTicketCheckbox);
         await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
 

e2e/paths/06-claim/02_detail.spec.js

@@ -1,114 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer.js';
-
-// #1528 e2e claim/detail
-xdescribe('Claim detail', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('salesPerson', 'claim');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('claim.card.detail');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should add the first claimable item from ticket to the claim', async() => {
-        await page.waitToClick(selectors.claimDetail.addItemButton);
-        await page.waitToClick(selectors.claimDetail.firstClaimableSaleFromTicket);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the claim contains now two items', async() => {
-        const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
-        expect(result).toEqual(2);
-    });
-
-    it('should edit de first item claimed quantity', async() => {
-        await page.clearInput(selectors.claimDetail.firstItemQuantityInput); // selector deleted, find new upon fixes
-        await page.write(selectors.claimDetail.firstItemQuantityInput, '4'); // selector deleted, find new upon fixes
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the first item quantity, and the claimed total were correctly edited', async() => {
-        const claimedQuantity = page
-            .waitToGetProperty(selectors.claimDetail.firstItemQuantityInput, 'value'); // selector deleted, find new upon fixes
-
-        const totalClaimed = page
-            .waitToGetProperty(selectors.claimDetail.totalClaimed, 'innerText');
-
-        expect(claimedQuantity).toEqual('4');
-        expect(totalClaimed).toContain('€47.62');
-    });
-
-    it('should login as salesAssistant and navigate to the claim.detail section', async() => {
-        await page.loginAndModule('salesAssistant', 'claim');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('claim.card.detail');
-        let url = await page.expectURL('/detail'); // replace with waitForState
-
-        expect(url).toBe(true);
-    });
-
-    it('should edit de second item claimed discount', async() => {
-        await page.waitToClick(selectors.claimDetail.secondItemDiscount);
-        await page.write(selectors.claimDetail.discount, '100');
-        await page.keyboard.press('Enter');
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should check the mana is the expected one', async() => {
-        await page.waitToClick(selectors.claimDetail.secondItemDiscount);
-        const result = await page.waitToGetProperty(selectors.claimDetail.discoutPopoverMana, 'innerText');
-
-        expect(result).toContain('MANÁ: €106');
-    });
-
-    it('should delete the second item from the claim', async() => {
-        await page.waitToClick(selectors.claimDetail.secondItemDeleteButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the claim contains now one item', async() => {
-        const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
-        expect(result).toEqual(1);
-    });
-
-    it('should add the deleted ticket from to the claim', async() => {
-        await page.waitToClick(selectors.claimDetail.addItemButton);
-        await page.waitToClick(selectors.claimDetail.firstClaimableSaleFromTicket);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should have been redirected to the next section in claims`, async() => {
-        let url = await page.expectURL('development'); // replace with waitForState
-
-        expect(url).toBe(true);
-    });
-
-    it('should navigate back to claim.detail to confirm the claim contains now two items', async() => {
-        await page.accessToSection('claim.card.detail');
-        await page.waitForSelector(selectors.claimDetail.claimDetailLine);
-        const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
-        expect(result).toEqual(2);
-    });
-});

e2e/paths/09-invoice-out/01_summary.spec.js

@@ -28,7 +28,6 @@ describe('InvoiceOut summary path', () => {
 
     it('should contain the tax breakdown', async() => {
         const firstTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxOne, 'innerText');
-
         const secondTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxTwo, 'innerText');
 
         expect(firstTax).toContain('10%');
@@ -37,10 +36,9 @@ describe('InvoiceOut summary path', () => {
 
     it('should contain the tickets info', async() => {
         const firstTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketOne, 'innerText');
-
         const secondTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketTwo, 'innerText');
 
         expect(firstTicket).toContain('Bat cave');
-        expect(secondTicket).toContain('Stark tower');
+        expect(secondTicket).toContain('Bat cave');
     });
 });

e2e/paths/10-travel/02_basic_data_and_log.spec.js

@@ -105,17 +105,4 @@ describe('Travel basic data path', () => {
     it(`should check the received checkbox was saved even tho it doesn't make sense`, async() => {
         await page.waitForClassPresent(selectors.travelBasicData.received, 'checked');
     });
-
-    it('should navigate to the travel logs', async() => {
-        pending('https://redmine.verdnatura.es/issues/5455');
-        await page.accessToSection('travel.card.log');
-        await page.waitForState('travel.card.log');
-    });
-
-    it('should check the 1st log contains details from the changes made', async() => {
-        pending('https://redmine.verdnatura.es/issues/5455');
-        const result = await page.waitToGetProperty(selectors.travelLog.firstLogFirstTD, 'innerText');
-
-        expect(result).toContain('new reference!');
-    });
 });

front/core/components/treeview/index.spec.js

@@ -33,18 +33,6 @@ describe('Component vnTreeview', () => {
         $element.remove();
     });
 
-    // See how to test DOM element in Jest
-    xdescribe('undrop()', () => {
-        it(`should reset all drop events and properties`, () => {
-            controller.dropping = angular.element(`<vn-treeview-child class="dropping"></vn-treeview-child>`);
-            jest.spyOn(controller.dropping.classList, 'remove');
-
-            controller.undrop();
-
-            expect(controller.dropping).toBeNull();
-        });
-    });
-
     describe('dragOver()', () => {
         it(`should set the dragClientY property`, () => {
             const event = new Event('dragover');

front/core/directives/rule.js

@@ -23,7 +23,6 @@ export function directive($translate, $window) {
         let rule = $attrs.rule.split('.');
         let modelName = rule.shift();
         let fieldName = rule.shift();
-
         let split = $attrs.ngModel.split('.');
         if (!fieldName) fieldName = split.pop() || null;
         if (!modelName) modelName = firstUpper(split.pop() || '');

front/core/locale/es.yml

@@ -68,3 +68,4 @@ Load more results: Cargar más resultados
 Send cau: Enviar cau
 By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
 ExplainReason: Explique el motivo por el que no deberia aparecer este fallo
+You already have the mailAlias: Ya tienes este alias de correo

loopback/common/mixins/loggable.js

@@ -0,0 +1,12 @@
+const LoopBackContext = require('loopback-context');
+async function handleObserve(ctx) {
+    ctx.options.httpCtx = LoopBackContext.getCurrentContext();
+}
+module.exports = function(Self) {
+    let Mixin = {
+        'before save': handleObserve,
+        'before delete': handleObserve,
+    };
+    for (const [listener, handler] of Object.entries(Mixin))
+        Self.observe(listener, handler);
+};

loopback/common/models/loggable.js

@@ -1,15 +0,0 @@
-const LoopBackContext = require('loopback-context');
-
-module.exports = function(Self) {
-    Self.setup = function() {
-        Self.super_.setup.call(this);
-    };
-
-    Self.observe('before save', async function(ctx) {
-        ctx.options.httpCtx = LoopBackContext.getCurrentContext();
-    });
-
-    Self.observe('before delete', async function(ctx) {
-        ctx.options.httpCtx = LoopBackContext.getCurrentContext();
-    });
-};

loopback/common/models/loggable.json

@@ -1,5 +0,0 @@
-{
-  "name": "Loggable",
-  "base": "VnModel",
-  "validateUpsert": true
-}

loopback/locale/en.json

@@ -45,6 +45,7 @@
 	"Extension format is invalid": "Extension format is invalid",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
 	"This client can't be invoiced": "This client can't be invoiced",
+	"You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
 	"The introduced hour already exists": "The introduced hour already exists",
 	"Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
 	"Concept cannot be blank": "Concept cannot be blank",
@@ -178,7 +179,8 @@
 	"The renew period has not been exceeded": "The renew period has not been exceeded",
 	"You can not use the same password": "You can not use the same password",
 	"Valid priorities": "Valid priorities: %d",
-	"Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
+	"hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
+	"hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
 	"This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
@@ -200,5 +202,6 @@
 	"Try again": "Try again",
 	"keepPrice": "keepPrice",
 	"Cannot past travels with entries": "Cannot past travels with entries",
-	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
+	"Incorrect pin": "Incorrect pin."
 }

loopback/locale/es.json

@@ -72,6 +72,7 @@
 	"The secret can't be blank": "La contraseña no puede estar en blanco",
 	"We weren't able to send this SMS": "No hemos podido enviar el SMS",
 	"This client can't be invoiced": "Este cliente no puede ser facturado",
+    "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
 	"This ticket can't be invoiced": "Este ticket no puede ser facturado",
 	"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
 	"This ticket can not be modified": "Este ticket no puede ser modificado",
@@ -305,7 +306,8 @@
 	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
 	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
 	"Valid priorities": "Prioridades válidas: %d",
-	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
+	"hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+	"hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
 	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
 	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
 	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
@@ -330,5 +332,9 @@
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
 	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
+	"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
+	"Incorrect pin": "Pin incorrecto.",
+	"You already have the mailAlias": "Ya tienes este alias de correo",
+	"The alias cant be modified": "Este alias de correo no puede ser modificado",
+	"No tickets to invoice": "No hay tickets para facturar"
 }

loopback/server/model-config.json

@@ -25,20 +25,19 @@
     "FieldAcl": {
         "dataSource": "vn"
     },
-    "Role": {
-        "dataSource": "vn",
-        "options": {
-            "mysql": {
-                "table": "salix.Role"
-            }
-        }
-    },
     "RoleMapping": {
         "dataSource": "vn",
         "options": {
             "mysql": {
                 "table": "salix.RoleMapping"
             }
+        },
+        "relations": {
+            "role": {
+                "type": "belongsTo",
+                "model": "VnRole",
+                "foreignKey": "roleId"
+            }
         }
     },
     "Schema": {

modules/account/back/model-config.json

@@ -14,6 +14,9 @@
     "MailAliasAccount": {
         "dataSource": "vn"
     },
+    "MailAliasAcl": {
+        "dataSource": "vn"
+    },
     "MailConfig": {
         "dataSource": "vn"
     },

modules/account/back/models/account.json

@@ -1,49 +1,49 @@
 {
-	"name": "Account",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "account.account"
-		}
-	},
-	"properties": {
-		"id": {
-			"id": true
-		}
-	},
-	"relations": {
-		"user": {
-			"type": "belongsTo",
-			"model": "VnUser",
-			"foreignKey": "id"
-		},
-		"aliases": {
-			"type": "hasMany",
-			"model": "MailAliasAccount",
-			"foreignKey": "account"
-		}
-	},
-	"acls": [
-		{
-			"property": "login",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
+    "name": "Account",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "account.account"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true
+        }
+    },
+    "relations": {
+        "user": {
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "id"
         },
-		{
+        "aliases": {
+            "type": "hasMany",
+            "model": "MailAliasAccount",
+            "foreignKey": "account"
+        }
+    },
+    "acls": [
+        {
+            "property": "login",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
+        {
             "property": "logout",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
-		},
-		{
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        },
+        {
             "property": "changePassword",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$everyone",
-			"permission": "ALLOW"
-		}
-	]
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
 }

modules/account/back/models/ldap-config.js

@@ -239,7 +239,7 @@ module.exports = Self => {
 
             // Prepare data
 
-            let roles = await $.Role.find({
+            let roles = await $.VnRole.find({
                 fields: ['id', 'name', 'description']
             });
             let roleRoles = await $.RoleRole.find({

modules/account/back/models/mail-alias-account.js

@@ -2,54 +2,44 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
+    Self.rewriteDbError(function(err) {
+        if (err.code === 'ER_DUP_ENTRY')
+            return new UserError(`You already have the mailAlias`);
+        return err;
+    });
+
     Self.observe('before save', async ctx => {
         const changes = ctx.currentInstance || ctx.instance;
 
-        await Self.hasGrant(ctx, changes.mailAlias);
+        await checkModifyPermission(ctx, changes.mailAlias);
     });
 
     Self.observe('before delete', async ctx => {
         const mailAliasAccount = await Self.findById(ctx.where.id);
 
-        await Self.hasGrant(ctx, mailAliasAccount.mailAlias);
+        await checkModifyPermission(ctx, mailAliasAccount.mailAlias);
     });
 
-    /**
-     * Checks if current user has
-     * grant to add/remove alias
-     *
-     * @param {Object} ctx - Request context
-     * @param {Interger} mailAlias - mailAlias id
-     * @return {Boolean} True for user with grant
-     */
-    Self.hasGrant = async function(ctx, mailAlias) {
+    async function checkModifyPermission(ctx, mailAliasFk) {
+        const userId = ctx.options.accessToken.userId;
         const models = Self.app.models;
-        const accessToken = {req: {accessToken: ctx.options.accessToken}};
-        const userId = accessToken.req.accessToken.userId;
 
-        const canEditAlias = await models.ACL.checkAccessAcl(accessToken, 'MailAliasAccount', 'canEditAlias', 'WRITE');
-        if (canEditAlias) return true;
+        const roles = await models.RoleMapping.find({
+            fields: ['roleId'],
+            where: {principalId: userId}
+        });
 
-        const user = await models.VnUser.findById(userId, {fields: ['hasGrant']});
-        if (!user.hasGrant)
-            throw new UserError(`You don't have grant privilege`);
-
-        const account = await models.Account.findById(userId, {
-            fields: ['id'],
-            include: {
-                relation: 'aliases',
-                scope: {
-                    fields: ['mailAlias']
-                }
+        const availableMailAlias = await models.MailAliasAcl.findOne({
+            fields: ['mailAliasFk'],
+            include: {relation: 'mailAlias'},
+            where: {
+                roleFk: {
+                    inq: roles.map(role => role.roleId),
+                },
+                mailAliasFk
             }
         });
 
-        const aliases = account.aliases().map(alias => alias.mailAlias);
-
-        const hasAlias = aliases.includes(mailAlias);
-        if (!hasAlias)
-            throw new UserError(`You cannot assign/remove an alias that you are not assigned to`);
-
-        return true;
-    };
+        if (!availableMailAlias) throw new UserError('The alias cant be modified');
+    }
 };

modules/account/back/models/mail-alias-acl.json

@@ -0,0 +1,31 @@
+{
+    "name": "MailAliasAcl",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "account.mailAliasAcl"
+        }
+    },
+    "properties": {
+        "mailAliasFk": {
+            "id": true,
+            "type": "number"
+        },
+        "roleFk": {
+            "id": true,
+            "type": "number"
+        }
+    },
+    "relations": {
+        "mailAlias": {
+            "type": "belongsTo",
+            "model": "MailAlias",
+            "foreignKey": "mailAliasFk"
+        },
+        "role": {
+            "type": "belongsTo",
+            "model": "Role",
+            "foreignKey": "roleFk"
+        }
+    }
+}

modules/account/back/models/role-inherit.json

@@ -15,12 +15,12 @@
 	"relations": {
 		"owner": {
 			"type": "belongsTo",
-			"model": "Role",
+			"model": "VnRole",
 			"foreignKey": "role"
 		},
 		"inherits": {
 			"type": "belongsTo",
-			"model": "Role",
+			"model": "VnRole",
 			"foreignKey": "inheritsFrom"
 		}
 	}

modules/account/back/models/role-role.json

@@ -14,12 +14,12 @@
 	"relations": {
 		"owner": {
 			"type": "belongsTo",
-			"model": "Role",
+			"model": "VnRole",
 			"foreignKey": "role"
 		},
 		"inherits": {
 			"type": "belongsTo",
-			"model": "Role",
+			"model": "VnRole",
 			"foreignKey": "inheritsFrom"
 		}
 	}

modules/account/front/acl/create/index.html

@@ -15,7 +15,7 @@
             <vn-autocomplete
                 label="Role"
                 ng-model="$ctrl.acl.principalId"
-                url="Roles"
+                url="VnRoles"
                 id-field="name"
                 value-field="name"
                 vn-focus>

modules/account/front/acl/search-panel/index.html

@@ -4,7 +4,7 @@
         <vn-autocomplete
             label="Role"
             ng-model="filter.principalId"
-            url="Roles"
+            url="VnRoles"
             value-field="name">
         </vn-autocomplete>
         <vn-autocomplete

modules/account/front/create/index.html

@@ -30,7 +30,7 @@
             <vn-autocomplete
                 label="Role"
                 ng-model="$ctrl.user.roleFk"
-                url="Roles"
+                url="VnRoles"
                 rule="VnUser">
             </vn-autocomplete>
             <vn-textfield

modules/account/front/privileges/index.html

@@ -22,7 +22,7 @@
             <vn-autocomplete
                 label="Role"
                 ng-model="$ctrl.user.roleFk"
-                url="Roles">
+                url="VnRoles">
             </vn-autocomplete>
         </vn-vertical>
     </vn-card>

modules/account/front/role/basic-data/index.html

@@ -1,25 +1,27 @@
 <vn-watcher
     vn-id="watcher"
-    url="Roles"
+    url="VnRoles"
     data="$ctrl.role"
     form="form">
 </vn-watcher>
 <form
     name="form"
     ng-submit="watcher.submit()"
+
     class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-vertical>
             <vn-textfield
                 label="Name"
                 ng-model="$ctrl.role.name"
-                rule
+                rule="VnRole.name"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
-                label="Description" 
-                ng-model="$ctrl.role.description"
-                rule>
+            label="Description"
+            ng-model="$ctrl.role.description"
+            rule="VnRole.description"
+               >
             </vn-textfield>
         </vn-vertical>
     </vn-card>

modules/account/front/role/card/index.js

@@ -3,7 +3,7 @@ import ModuleCard from 'salix/components/module-card';
 
 class Controller extends ModuleCard {
     reload() {
-        this.$http.get(`Roles/${this.$params.id}`)
+        this.$http.get(`VnRoles/${this.$params.id}`)
             .then(res => this.role = res.data);
     }
 }

modules/account/front/role/card/index.spec.js

@@ -1,6 +1,6 @@
 import './index';
 
-describe('component vnRoleCard', () => {
+fdescribe('component vnRoleCard', () => {
     let controller;
     let $httpBackend;
 
@@ -15,7 +15,7 @@ describe('component vnRoleCard', () => {
         it('should reload the controller data', () => {
             controller.$params.id = 1;
 
-            $httpBackend.expectGET('Roles/1').respond('foo');
+            $httpBackend.expectGET('VnRoles/1').respond('foo');
             controller.reload();
             $httpBackend.flush();
 

modules/account/front/role/create/index.html

@@ -1,6 +1,6 @@
 <vn-watcher
     vn-id="watcher"
-    url="Roles"
+    url="VnRoles"
     data="$ctrl.role"
     insert-mode="true"
     form="form">
@@ -14,13 +14,13 @@
             <vn-textfield
                 label="Name"
                 ng-model="$ctrl.role.name"
-                rule
+                rule="VnRole.name"
                 vn-focus>
             </vn-textfield>
             <vn-textfield
                 label="Description"
                 ng-model="$ctrl.role.description"
-                rule>
+                rule="VnRole.description">
             </vn-textfield>
         </vn-vertical>
     </vn-card>

modules/account/front/role/descriptor/index.js

@@ -11,7 +11,7 @@ class Controller extends Descriptor {
     }
 
     onDelete() {
-        return this.$http.delete(`Roles/${this.id}`)
+        return this.$http.delete(`VnRoles/${this.id}`)
             .then(() => this.$state.go('account.role'))
             .then(() => this.vnApp.showSuccess(this.$t('Role removed')));
     }

modules/account/front/role/descriptor/index.spec.js

@@ -1,6 +1,6 @@
 import './index';
 
-describe('component vnRoleDescriptor', () => {
+fdescribe('component vnRoleDescriptor', () => {
     let controller;
     let $httpBackend;
 
@@ -18,7 +18,7 @@ describe('component vnRoleDescriptor', () => {
             controller.$state.go = jest.fn();
             jest.spyOn(controller.vnApp, 'showSuccess');
 
-            $httpBackend.expectDELETE('Roles/1').respond();
+            $httpBackend.expectDELETE('VnRoles/1').respond();
             controller.onDelete();
             $httpBackend.flush();
 

modules/account/front/role/main/index.html

@@ -1,6 +1,6 @@
 <vn-crud-model
     vn-id="model"
-    url="Roles"
+    url="VnRoles"
     filter="::$ctrl.filter"
     limit="20">
 </vn-crud-model>

modules/account/front/role/subroles/index.html

@@ -40,7 +40,7 @@
         <vn-autocomplete
             label="Role"
             ng-model="$ctrl.addData.inheritsFrom"
-            url="Roles"
+            url="VnRoles"
             vn-focus>
         </vn-autocomplete>
     </tpl-body>

modules/account/front/role/summary/index.js

@@ -6,7 +6,7 @@ class Controller extends Component {
         this._role = value;
         this.$.summary = null;
         if (!value) return;
-        this.$http.get(`Roles/${value.id}`)
+        this.$http.get(`VnRoles/${value.id}`)
             .then(res => this.$.summary = res.data);
     }
 

modules/account/front/search-panel/index.html

@@ -19,7 +19,7 @@
                 vn-one
                 label="Role"
                 ng-model="filter.roleFk"
-                url="Roles"
+                url="VnRoles"
                 value-field="id"
                 show-field="name">
             </vn-autocomplete>

modules/claim/back/models/claim-beginning.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimBeginning",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimBeginning"

modules/claim/back/models/claim-development.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimDevelopment",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimDevelopment"

modules/claim/back/models/claim-dms.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimDms",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimDms"

modules/claim/back/models/claim-end.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimEnd",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimEnd"

modules/claim/back/models/claim-observation.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimObservation",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimObservation"

modules/claim/back/models/claim-state.json

@@ -1,6 +1,9 @@
 {
     "name": "ClaimState",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claimState"
@@ -32,7 +35,7 @@
     "relations": {
     	"writeRole": {
       		"type": "belongsTo",
-      		"model": "Role",
+      		"model": "VnRole",
       		"foreignKey": "roleFk"
         }
     },

modules/claim/back/models/claim.json

@@ -1,6 +1,9 @@
 {
     "name": "Claim",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "claim"

modules/client/back/methods/client/canBeInvoiced.js

@@ -1,7 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = function(Self) {
-    Self.remoteMethodCtx('canBeInvoiced', {
+    Self.remoteMethod('canBeInvoiced', {
         description: 'Change property isEqualizated in all client addresses',
         accessType: 'READ',
         accepts: [

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

@@ -16,7 +16,7 @@ describe('client consumption() filter', () => {
             };
             const result = await models.Client.consumption(ctx, filter, options);
 
-            expect(result.length).toEqual(10);
+            expect(result.length).toEqual(11);
 
             await tx.rollback();
         } catch (e) {
@@ -49,7 +49,7 @@ describe('client consumption() filter', () => {
             const thirdRow = result[2];
 
             expect(result.length).toEqual(3);
-            expect(firstRow.quantity).toEqual(10);
+            expect(firstRow.quantity).toEqual(11);
             expect(secondRow.quantity).toEqual(15);
             expect(thirdRow.quantity).toEqual(20);
 

modules/client/back/model-config.json

@@ -113,9 +113,6 @@
     "SageTransactionType": {
         "dataSource": "vn"
     },
-    "TicketSms": {
-        "dataSource": "vn"
-    },
     "TpvError": {
         "dataSource": "vn"
     },

modules/client/back/models/address.json

@@ -1,7 +1,10 @@
 {
     "name": "Address",
     "description": "Client addresses",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "address"

modules/client/back/models/client-contact.json

@@ -1,7 +1,10 @@
 {
     "name": "ClientContact",
     "description": "Client phone contacts",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "clientContact"

modules/client/back/models/client-dms.json

@@ -1,6 +1,9 @@
 {
     "name": "ClientDms",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "clientDms"

modules/client/back/models/client-informa.json

@@ -1,6 +1,9 @@
 {
 	"name": "ClientInforma",
-	"base": "Loggable",
+	"base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
 	"log": {
 		"model":"ClientLog",
 		"relation": "client",

modules/client/back/models/client-observation.json

@@ -1,7 +1,10 @@
 {
   	"name": "ClientObservation",
 	"description": "Client notes",
-	"base": "Loggable",
+	"base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
 	"options": {
 		"mysql": {
 			"table": "clientObservation"

modules/client/back/models/client-sample.json

@@ -1,6 +1,9 @@
 {
     "name": "ClientSample",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
         "table": "clientSample"

modules/client/back/models/client-sms.json

@@ -21,6 +21,11 @@
             "type": "belongsTo",
             "model": "Sms",
             "foreignKey": "smsFk"
+        },
+        "ticket": {
+            "type": "belongsTo",
+            "model": "Ticket",
+            "foreignKey": "ticketFk"
         }
     }
 }

modules/client/back/models/client.json

@@ -1,6 +1,9 @@
 {
 	"name": "Client",
-	"base": "Loggable",
+	"base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
 	"options": {
 		"mysql": {
 			"table": "client"

modules/client/back/models/greuge.json

@@ -1,6 +1,9 @@
 {
     "name": "Greuge",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "greuge"

modules/client/back/models/recovery.json

@@ -1,6 +1,9 @@
 {
     "name": "Recovery",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "recovery"

modules/client/back/models/role-credit-limit.json

@@ -19,7 +19,7 @@
     "relations": {
         "role": {
             "type": "belongsTo",
-            "model": "Role",
+            "model": "VnRole",
             "foreignKey": "roleFk"
         }
     }

modules/client/back/models/ticket-sms.json

@@ -1,28 +0,0 @@
-{
-    "name": "TicketSms",
-	"base": "VnModel",
-    "options": {
-        "mysql": {
-            "table": "ticketSms"
-        }
-    },
-    "properties": {
-        "smsFk": {
-            "type": "number",
-            "id": true,
-            "description": "Identifier"
-        }
-    },
-    "relations": {
-        "ticket": {
-            "type": "belongsTo",
-            "model": "Ticket",
-            "foreignKey": "ticketFk"
-        },
-        "sms": {
-            "type": "belongsTo",
-            "model": "Sms",
-            "foreignKey": "smsFk"
-        }
-    }
-}

modules/client/front/sms/index.html

@@ -1,40 +1,2 @@
-<vn-crud-model
-    vn-id="model"
-    url="ClientSms"
-    link="{clientFk: $ctrl.$params.id}"
-    filter="::$ctrl.filter"
-    data="clientSmsList"
-    limit="20"
-    auto-load="true">
-</vn-crud-model>
-<vn-data-viewer model="model">
-    <vn-card class="vn-w-lg">
-        <vn-table model="model" auto-load="false">
-            <vn-thead>
-                <vn-tr>
-                    <vn-th field="senderFk">Sender</vn-th>
-                    <vn-th field="destination" number>Destination</vn-th>
-                    <vn-th field="message">Message</vn-th>
-                    <vn-th field="status">Status</vn-th>
-                    <vn-th field="created" expand>Created</vn-th>
-                </vn-tr>
-            </vn-thead>
-            <vn-tbody>
-                <vn-tr ng-repeat="clientSms in clientSmsList">
-                    <vn-td>
-                        <span class="link" ng-click="workerDescriptor.show($event, clientSms.sms.senderFk)">
-                            {{::clientSms.sms.sender.name}}
-                        </span>
-                    </vn-td>
-                    <vn-td number expand>{{::clientSms.sms.destination}}</vn-td>
-                    <vn-td expand vn-tooltip="{{::clientSms.sms.message}}">{{::clientSms.sms.message}}</vn-td>
-                    <vn-td>{{::clientSms.sms.status}}</vn-td>
-                    <vn-td shrink-datetime>{{::clientSms.sms.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
-                </vn-tr>
-            </vn-tbody>
-        </vn-table>
-    </vn-card>
-</vn-data-viewer>
-<vn-worker-descriptor-popover
-    vn-id="worker-descriptor">
-</vn-worker-descriptor-popover>
+<vn-card>
+</vn-card>

modules/client/front/sms/index.js

@@ -1,32 +1,14 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
 
-export default class Controller extends Section {
+class Controller extends Section {
     constructor($element, $) {
         super($element, $);
+    }
 
-        this.filter = {
-            fields: ['id', 'smsFk'],
-            include: {
-                relation: 'sms',
-                scope: {
-                    fields: [
-                        'senderFk',
-                        'sender',
-                        'destination',
-                        'message',
-                        'statusCode',
-                        'status',
-                        'created'],
-                    include: {
-                        relation: 'sender',
-                        scope: {
-                            fields: ['name']
-                        }
-                    }
-                }
-            }
-        };
+    async $onInit() {
+        this.$state.go('client.card.summary', {id: this.$params.id});
+        window.location.href = await this.vnApp.getUrl(`Customer/${this.$params.id}/sms`);
     }
 }
 

modules/entry/back/models/buy.json

@@ -1,6 +1,9 @@
 {
     "name": "Buy",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
         "table": "buy"

modules/entry/back/models/entry-observation.json

@@ -1,6 +1,9 @@
 {
     "name": "EntryObservation",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "entryObservation"

modules/entry/back/models/entry.json

@@ -1,6 +1,9 @@
 {
     "name": "Entry",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "entry"

modules/invoiceIn/back/models/invoice-in-tax.json

@@ -1,6 +1,9 @@
 {
     "name": "InvoiceInTax",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "invoiceInTax"

modules/invoiceIn/back/models/invoice-in.json

@@ -1,6 +1,9 @@
 {
     "name": "InvoiceIn",
-    "base": "Loggable",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
         "mysql": {
             "table": "invoiceIn"

modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js

@@ -85,7 +85,7 @@ module.exports = Self => {
                     throw new UserError(`A ticket with an amount of zero can't be invoiced`);
 
                 // Validates ticket nagative base
-                const hasNegativeBase = await getNegativeBase(ticketId, myOptions);
+                const hasNegativeBase = await getNegativeBase(maxShipped, clientId, companyId, myOptions);
                 if (hasNegativeBase && company.code == 'VNL')
                     throw new UserError(`A ticket with a negative base can't be invoiced`);
             } else {
@@ -162,10 +162,13 @@ module.exports = Self => {
         return result.invoiceable;
     }
 
-    async function getNegativeBase(ticketId, options) {
+    async function getNegativeBase(maxShipped, clientId, companyId, options) {
         const models = Self.app.models;
-        const query = 'SELECT vn.hasSomeNegativeBase(?) AS base';
-        const [result] = await models.InvoiceOut.rawSql(query, [ticketId], options);
+        await models.InvoiceOut.rawSql('CALL invoiceOut_exportationFromClient(?,?,?)',
+            [maxShipped, clientId, companyId], options
+        );
+        const query = 'SELECT vn.hasAnyNegativeBase() AS base';
+        const [result] = await models.InvoiceOut.rawSql(query, [], options);
 
         return result.base;
     }

modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js

@@ -80,6 +80,7 @@ module.exports = Self => {
                 invoiceType,
                 args.companyFk,
                 args.invoiceDate,
+                null,
                 options
             );
 

modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js

@@ -10,13 +10,17 @@ module.exports = Self => {
                 type: 'date',
                 description: 'From date',
                 required: true
-            },
-            {
+            }, {
                 arg: 'to',
                 type: 'date',
                 description: 'To date',
                 required: true
-            }],
+            }, {
+                arg: 'filter',
+                type: 'object',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
+            },
+        ],
         returns: [
             {
                 arg: 'body',

modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js

@@ -2,7 +2,7 @@
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
-describe('InvoiceOut tranferInvoice()', () => {
+describe('InvoiceOut transferInvoice()', () => {
     const activeCtx = {
         accessToken: {userId: 5},
         http: {
@@ -23,20 +23,29 @@ describe('InvoiceOut tranferInvoice()', () => {
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
         const args = {
-            id: '1',
-            ref: 'T4444444',
+            id: '4',
+            refFk: 'T4444444',
             newClientFk: 1,
-            cplusRectificationId: 1,
-            siiTypeInvoiceOutId: 1,
-            invoiceCorrectionTypeId: 1
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
         };
         ctx.args = args;
         try {
+            const {clientFk: oldClient} = await models.InvoiceOut.findById(args.id, {fields: ['clientFk']});
+            const invoicesBefore = await models.InvoiceOut.find({}, options);
             const result = await models.InvoiceOut.transferInvoice(
                 ctx,
                 options);
+            const invoicesAfter = await models.InvoiceOut.find({}, options);
+            const rectificativeInvoice = invoicesAfter[invoicesAfter.length - 2];
+            const newInvoice = invoicesAfter[invoicesAfter.length - 1];
 
             expect(result).toBeDefined();
+            expect(invoicesAfter.length - invoicesBefore.length).toEqual(2);
+            expect(rectificativeInvoice.clientFk).toEqual(oldClient);
+            expect(newInvoice.clientFk).toEqual(args.newClientFk);
+
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -49,20 +58,44 @@ describe('InvoiceOut tranferInvoice()', () => {
         const options = {transaction: tx};
         const args = {
             id: '1',
-            ref: 'T1111111',
+            refFk: 'T1111111',
             newClientFk: 1101,
-            cplusRectificationId: 1,
-            siiTypeInvoiceOutId: 1,
-            invoiceCorrectionTypeId: 1
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
         };
         ctx.args = args;
         try {
             await models.InvoiceOut.transferInvoice(
                 ctx,
                 options);
+            await tx.rollback();
         } catch (e) {
             expect(e.message).toBe(`Select a different client`);
             await tx.rollback();
         }
     });
+
+    it('should throw an UserError when it is refund', async() => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+        const args = {
+            id: '1',
+            refFk: 'T1111111',
+            newClientFk: 1102,
+            cplusRectificationTypeFk: 1,
+            siiTypeInvoiceOutFk: 1,
+            invoiceCorrectionTypeFk: 1
+        };
+        ctx.args = args;
+        try {
+            await models.InvoiceOut.transferInvoice(
+                ctx,
+                options);
+            await tx.rollback();
+        } catch (e) {
+            expect(e.message).toContain(`This ticket is already a refund`);
+            await tx.rollback();
+        }
+    });
 });

modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js

@@ -12,7 +12,7 @@ module.exports = Self => {
                 description: 'Issued invoice id'
             },
             {
-                arg: 'ref',
+                arg: 'refFk',
                 type: 'string',
                 required: true
             },
@@ -22,17 +22,17 @@ module.exports = Self => {
                 required: true
             },
             {
-                arg: 'cplusRectificationId',
+                arg: 'cplusRectificationTypeFk',
                 type: 'number',
                 required: true
             },
             {
-                arg: 'siiTypeInvoiceOutId',
+                arg: 'siiTypeInvoiceOutFk',
                 type: 'number',
                 required: true
             },
             {
-                arg: 'invoiceCorrectionTypeId',
+                arg: 'invoiceCorrectionTypeFk',
                 type: 'number',
                 required: true
             },
@@ -50,14 +50,14 @@ module.exports = Self => {
     Self.transferInvoice = async(ctx, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
-        const args = ctx.args;
+        const {id, refFk, newClientFk, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
         let tx;
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const {clientFk} = await models.InvoiceOut.findById(args.id);
+        const {clientFk} = await models.InvoiceOut.findById(id);
 
-        if (clientFk == args.newClientFk)
+        if (clientFk == newClientFk)
             throw new UserError(`Select a different client`);
 
         if (!myOptions.transaction) {
@@ -65,10 +65,10 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
         try {
-            const filterRef = {where: {refFk: args.ref}};
+            const filterRef = {where: {refFk: refFk}};
             const tickets = await models.Ticket.find(filterRef, myOptions);
             const ticketsIds = tickets.map(ticket => ticket.id);
-            await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
+            const refundTickets = await models.Ticket.refund(ctx, ticketsIds, null, myOptions);
 
             const filterTicket = {where: {ticketFk: {inq: ticketsIds}}};
 
@@ -82,20 +82,16 @@ module.exports = Self => {
             const clonedTicketIds = [];
 
             for (const clonedTicket of clonedTickets) {
-                await clonedTicket.updateAttribute('clientFk', args.newClientFk, myOptions);
+                await clonedTicket.updateAttribute('clientFk', newClientFk, myOptions);
                 clonedTicketIds.push(clonedTicket.id);
             }
 
-            const invoiceIds = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, myOptions);
-            const [invoiceId] = invoiceIds;
+            const invoiceCorrection =
+                {correctedFk: id, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk};
+            const refundTicketIds = refundTickets.map(ticket => ticket.id);
 
-            await models.InvoiceCorrection.create({
-                correctingFk: invoiceId,
-                correctedFk: args.id,
-                cplusRectificationTypeFk: args.cplusRectificationId,
-                siiTypeInvoiceOutFk: args.siiTypeInvoiceOutId,
-                invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
-            }, myOptions);
+            await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
+            const [invoiceId] = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, null, myOptions);
 
             if (tx) {
                 await tx.commit();

modules/invoiceOut/back/models/invoice-correction.json

@@ -16,13 +16,43 @@
             "type": "number"
         },
         "cplusRectificationTypeFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "siiTypeInvoiceOutFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "invoiceCorrectionTypeFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
+        },
+        "relations": {
+            "correcting": {
+                "type": "belongsTo",
+                "model": "InvoiceOut",
+                "foreignKey": "correctingFk"
+            },
+            "corrected": {
+                "type": "belongsTo",
+                "model": "InvoiceOut",
+                "foreignKey": "correctedFk"
+            },
+            "cplusRectificationType": {
+                "type": "belongsTo",
+                "model": "cplusRectificationType",
+                "foreignKey": "cplusRectificationTypeFk"
+            },
+            "siiTypeInvoiceOut": {
+                "type": "belongsTo",
+                "model": "siiTypeInvoiceOut",
+                "foreignKey": "siiTypeInvoiceOutFk"
+            },
+            "invoiceCorrectionType": {
+                "type": "belongsTo",
+                "model": "invoiceCorrectionType",
+                "foreignKey": "invoiceCorrectionTypeFk"
+            }
         }
     }
 }

modules/invoiceOut/back/models/sii-type-invoice-out.json

@@ -12,6 +12,9 @@
             "type": "number",
             "description": "Identifier"
         },
+        "code": {
+            "type": "string"
+        },
         "description": {
             "type": "string"
         }

modules/invoiceOut/front/descriptor-menu/index.html

@@ -7,7 +7,8 @@
 <vn-crud-model
     auto-load="true"
     url="SiiTypeInvoiceOuts"
-    data="siiTypeInvoiceOut">
+    data="siiTypeInvoiceOuts"
+    where="{code: {like: 'R%'}}">
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"
@@ -185,64 +186,69 @@
     vn-id="transferInvoice"
     title="transferInvoice"
     on-accept="$ctrl.transferInvoice()">
+    <tpl-title translate>
+        transferInvoice
+    </tpl-title>
     <tpl-body>
         <section class="transferInvoice">
-        <vn-horizontal>
-            <vn-autocomplete
-                vn-one
-                vn-id="client"
-                required="true"
-                url="Clients"
-                label="Client"
-                show-field="name"
-                value-field="id"
-                search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
-                ng-model="$ctrl.invoiceOut.client.id"
-                initial-data="$ctrl.invoiceOut.client.id"
-                order="id">
-                <tpl-item>
-                    #{{id}} - {{::name}}
-                </tpl-item>
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                vn-id="cplusRectificationType"
-                required="true"
-                data="cplusRectificationTypes"
-                show-field="description"
-                value-field="id"
-                ng-model="$ctrl.cplusRectificationType"
-                search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
-                label="Cplus Type">
-                <tpl-item>
-                    {{::description}}
-                </tpl-item>
-            </vn-autocomplete>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-            vn-one
-            vn-id="cplusInvoiceType"
-            data="siiTypeInvoiceOut"
-            show-field="description"
-            value-field="id"
-            required="true"
-            ng-model="$ctrl.siiTypeInvoiceOut"
-            search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
-            label="Class">
-            </vn-autocomplete>
-            <vn-autocomplete
-                vn-one
-                vn-id="invoiceCorrectionType"
-                data="invoiceCorrectionTypes"
-                ng-model="$ctrl.invoiceCorrectionType"
-                show-field="description"
-                value-field="id"
-                required="true"
-                label="Type">
-            </vn-autocomplete>
-        </vn-horizontal>
-    </section>
+            <vn-horizontal>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="client"
+                    required="true"
+                    url="Clients"
+                    label="Client"
+                    show-field="name"
+                    value-field="id"
+                    search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
+                    ng-model="$ctrl.clientId"
+                    order="id">
+                    <tpl-item>
+                        #{{id}} - {{::name}}
+                    </tpl-item>
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="cplusRectificationType"
+                    required="true"
+                    data="cplusRectificationTypes"
+                    show-field="description"
+                    value-field="id"
+                    ng-model="$ctrl.cplusRectificationType"
+                    search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
+                    label="Rectificative type">
+                    <tpl-item>
+                        {{::description}}
+                    </tpl-item>
+                </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="siiTypeInvoiceOut"
+                    data="siiTypeInvoiceOuts"
+                    show-field="description"
+                    value-field="id"
+                    fields="['id','code','description']"
+                    required="true"
+                    ng-model="$ctrl.siiTypeInvoiceOut"
+                    label="Class">
+                    <tpl-item>
+                        {{::code}} - {{::description}}
+                    </tpl-item>
+                </vn-autocomplete>
+                <vn-autocomplete
+                    vn-one
+                    vn-id="invoiceCorrectionType"
+                    data="invoiceCorrectionTypes"
+                    ng-model="$ctrl.invoiceCorrectionType"
+                    show-field="description"
+                    value-field="id"
+                    required="true"
+                    label="Type">
+                </vn-autocomplete>
+            </vn-horizontal>
+        </section>
     </tpl-body>
     <tpl-buttons>
         <button response="accept" translate>Transfer client</button>

modules/invoiceOut/front/descriptor-menu/index.js

@@ -129,15 +129,15 @@ class Controller extends Section {
     transferInvoice() {
         const params = {
             id: this.invoiceOut.id,
-            ref: this.invoiceOut.ref,
-            newClientFk: this.invoiceOut.client.id,
-            cplusRectificationId: this.cplusRectificationType,
-            siiTypeInvoiceOutId: this.siiTypeInvoiceOut,
-            invoiceCorrectionTypeId: this.invoiceCorrectionType
+            refFk: this.invoiceOut.ref,
+            newClientFk: this.clientId,
+            cplusRectificationTypeFk: this.cplusRectificationType,
+            siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
+            invoiceCorrectionTypeFk: this.invoiceCorrectionType
         };
         this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
             const invoiceId = res.data;
-            this.vnApp.showSuccess(this.$t('Invoice trasfered!'));
+            this.vnApp.showSuccess(this.$t('Transferred invoice'));
             this.$state.go('invoiceOut.card.summary', {id: invoiceId});
         });
     }

modules/invoiceOut/front/descriptor-menu/locale/es.yml

@@ -22,4 +22,5 @@ The email can't be empty: El correo no puede estar vacío
 The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketIds}}"
 Refund...: Abono...
 Transfer invoice to...: Transferir factura a...
-Cplus Type: Cplus Tipo
+Rectificative type: Tipo rectificativa
+Transferred invoice: Factura transferida

modules/invoiceOut/front/index/manual/index.html

@@ -6,6 +6,7 @@
         auto-load="true"
         url="InvoiceOutSerials"
         data="invoiceOutSerials"
+        where="{code: {neq: 'R'}}"
         order="code">
     </vn-crud-model>
     <vn-crud-model