back/methods/chat/notifyIssues.js

@@ -8,7 +8,7 @@ module.exports = Self => {
         },
         http: {
             path: `/notifyIssues`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 

back/methods/chat/sendQueued.js

@@ -10,7 +10,7 @@ module.exports = Self => {
         },
         http: {
             path: `/sendQueued`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 

back/methods/collection/spec/getCollection.spec.js

@@ -2,10 +2,10 @@ const models = require('vn-loopback/server/server').models;
 
 describe('ticket getCollection()', () => {
     it('should return a list of collections', async() => {
-        let ctx = {req: {accessToken: {userId: 1106}}};
+        let ctx = {req: {accessToken: {userId: 1107}}};
         let response = await models.Collection.getCollection(ctx);
 
         expect(response.length).toBeGreaterThan(0);
-        expect(response[0].collectionFk).toEqual(1);
+        expect(response[0].collectionFk).toEqual(3);
     });
 });

back/methods/dms/deleteTrashFiles.js

@@ -12,7 +12,7 @@ module.exports = Self => {
         },
         http: {
             path: `/deleteTrashFiles`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 
@@ -53,8 +53,12 @@ module.exports = Self => {
                 const pathHash = DmsContainer.getHash(dms.id);
                 const dmsContainer = await DmsContainer.container(pathHash);
                 const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
-                const dstFolder = path.join(dmsContainer.client.root, pathHash);
+                try {
                     await fs.unlink(dstFile);
+                } catch (err) {
+                    continue;
+                }
+                const dstFolder = path.join(dmsContainer.client.root, pathHash);
                 try {
                     await fs.rmdir(dstFolder);
                     await dms.destroy(myOptions);

back/methods/edi/updateData.js

@@ -12,7 +12,7 @@ module.exports = Self => {
         },
         http: {
             path: `/updateData`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 
@@ -20,7 +20,11 @@ module.exports = Self => {
         const models = Self.app.models;
 
         // Get files checksum
-        const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig');
+        const tx = await Self.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
 
             const updatableFiles = [];
             for (const file of files) {
@@ -51,13 +55,11 @@ module.exports = Self => {
             const tables = await Self.rawSql(`
                 SELECT fileName, toTable, file
                     FROM edi.tableConfig
-            WHERE file IN (?)`, [fileNames]);
+                WHERE file IN (?)`, [fileNames], options);
 
             for (const table of tables) {
                 const fileName = table.file;
 
-            console.debug(`Downloading file ${fileName}...`);
-
                 remoteFile = `codes/${fileName}.ZIP`;
                 tempDir = `${tempPath}/${fileName}`;
                 tempFile = `${tempPath}/${fileName}.zip`;
@@ -66,30 +68,34 @@ module.exports = Self => {
                     await fs.readFile(tempFile);
                 } catch (error) {
                     if (error.code === 'ENOENT') {
+                        console.debug(`Downloading file ${fileName}...`);
                         const downloadOutput = await downloadFile(remoteFile, tempFile);
                         if (downloadOutput.error)
                             continue;
                     }
                 }
 
-            console.debug(`Extracting file ${fileName}...`);
-            await extractFile(tempFile, tempDir);
+                await extractFile(fileName, tempFile, tempDir);
 
                 console.debug(`Updating table ${table.toTable}...`);
-            await dumpData(tempDir, table);
+                await dumpData(tempDir, table, options);
             }
 
             // Update files checksum
             for (const file of updatableFiles) {
+                console.log(`Updating file ${file.name} checksum...`);
                 await Self.rawSql(`
                         UPDATE edi.fileConfig
                             SET checksum = ?
                         WHERE name = ?`,
-            [file.checksum, file.name]);
+                [file.checksum, file.name], options);
             }
 
+            await tx.commit();
+
             // Clean files
             try {
+                console.debug(`Cleaning files...`);
                 await fs.remove(tempPath);
             } catch (error) {
                 if (error.code !== 'ENOENT')
@@ -97,6 +103,10 @@ module.exports = Self => {
             }
 
             return true;
+        } catch (error) {
+            await tx.rollback();
+            throw error;
+        }
     };
 
     let ftpClient;
@@ -126,9 +136,9 @@ module.exports = Self => {
 
         const response = await new Promise((resolve, reject) => {
             ftpClient.exec((err, response) => {
-                if (response.error) {
+                if (err || response.error) {
                     console.debug(`Error downloading checksum file... ${response.error}`);
-                    reject(err);
+                    return reject(err);
                 }
 
                 resolve(response);
@@ -159,9 +169,9 @@ module.exports = Self => {
 
         return new Promise((resolve, reject) => {
             ftpClient.exec((err, response) => {
-                if (response.error) {
+                if (err || response.error) {
                     console.debug(`Error downloading file... ${response.error}`);
-                    reject(err);
+                    return reject(err);
                 }
 
                 resolve(response);
@@ -169,11 +179,12 @@ module.exports = Self => {
         });
     }
 
-    async function extractFile(tempFile, tempDir) {
+    async function extractFile(fileName, tempFile, tempDir) {
         const JSZip = require('jszip');
 
         try {
             await fs.mkdir(tempDir);
+            console.debug(`Extracting file ${fileName}...`);
         } catch (error) {
             if (error.code !== 'EEXIST')
                 throw e;
@@ -196,42 +207,13 @@ module.exports = Self => {
         }
     }
 
-    async function dumpData(tempDir, table) {
+    async function dumpData(tempDir, table, options) {
         const toTable = table.toTable;
         const baseName = table.fileName;
 
-        const firstEntry = entries[0];
-        const entryName = firstEntry.entryName;
-        const startIndex = (entryName.length - 10);
-        const endIndex = (entryName.length - 4);
-        const dateString = entryName.substring(startIndex, endIndex);
-
-        const lastUpdated = new Date();
-
-        let updated = null;
-        if (file.updated) {
-            updated = new Date(file.updated);
-            updated.setHours(0, 0, 0, 0);
-        }
-
-        // Format string date to a date object
-        lastUpdated.setFullYear(`20${dateString.substring(4, 6)}`);
-        lastUpdated.setMonth(parseInt(dateString.substring(2, 4)) - 1);
-        lastUpdated.setDate(dateString.substring(0, 2));
-        lastUpdated.setHours(0, 0, 0, 0);
-
-        if (updated && lastUpdated <= updated) {
-            console.debug(`Table ${toTable} already updated, skipping...`);
-            return;
-        }
-
-        const tx = await Self.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-
+        console.log(`Emptying table ${toTable}...`);
         const tableName = `edi.${toTable}`;
-            await Self.rawSql(`DELETE FROM ??`, [tableName], options);
+        await Self.rawSql(`DELETE FROM ??`, [tableName]);
 
         const dirFiles = await fs.readdir(tempDir);
         const files = dirFiles.filter(file => file.startsWith(baseName));
@@ -251,11 +233,6 @@ module.exports = Self => {
                 `, [new Date(), baseName], options);
         }
 
-            tx.commit();
-        } catch (error) {
-            tx.rollback();
-            throw error;
-        }
         console.log(`Updated table ${toTable}\n`);
     }
 };

back/methods/osticket/closeTicket.js

@@ -0,0 +1,118 @@
+const jsdom = require('jsdom');
+const mysql = require('mysql');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('closeTicket', {
+        description: 'Close tickets without response from the user',
+        accessType: 'READ',
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: `/closeTicket`,
+            verb: 'POST'
+        }
+    });
+
+    Self.closeTicket = async ctx => {
+        const models = Self.app.models;
+        const config = await models.OsTicketConfig.findOne();
+        const ostUri = `${config.host}/login.php`;
+
+        if (!config.user || !config.password || !config.userDb || !config.passwordDb)
+            return false;
+
+        const con = mysql.createConnection({
+            host: `${config.hostDb}`,
+            user: `${config.userDb}`,
+            password: `${config.passwordDb}`,
+            port: `${config.portDb}`
+        });
+
+        const sql = `SELECT ot.ticket_id, ot.number
+                        FROM osticket.ost_ticket ot
+                            JOIN osticket.ost_ticket_status ots ON ots.id = ot.status_id 
+                            JOIN osticket.ost_thread ot2 ON ot2.object_id = ot.ticket_id AND ot2.object_type = 'T'
+                            JOIN (
+                                SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
+                                    FROM osticket.ost_thread_entry ote
+                                    WHERE ote.staff_id != 0 AND ote.type = 'R'
+                                    GROUP BY ote.thread_id
+                            ) sub ON sub.thread_id = ot2.id 
+                        WHERE ot.isanswered = 1
+                            AND ots.state = '${config.oldStatus}'
+                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ${config.day} DAY)`;
+
+        let ticketsId = [];
+        con.connect(err => {
+            if (err) throw err;
+            con.query(sql, (err, results) => {
+                if (err) throw err;
+                for (const result of results)
+                    ticketsId.push(result.ticket_id);
+            });
+        });
+
+        await requestToken();
+
+        async function requestToken() {
+            const response = await fetch(ostUri);
+
+            const result = response.headers.get('set-cookie');
+            const [firtHeader] = result.split(' ');
+            const firtCookie = firtHeader.substring(0, firtHeader.length - 1);
+            const body = await response.text();
+            const dom = new jsdom.JSDOM(body);
+            const token = dom.window.document.querySelector('[name="__CSRFToken__"]').value;
+
+            await login(token, firtCookie);
+        }
+
+        async function login(token, firtCookie) {
+            const data = {
+                __CSRFToken__: token,
+                do: 'scplogin',
+                userid: config.user,
+                passwd: config.password,
+                ajax: 1
+            };
+            const params = {
+                method: 'POST',
+                body: new URLSearchParams(data),
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+                    'Cookie': firtCookie
+                }
+            };
+            const response = await fetch(ostUri, params);
+            const result = response.headers.get('set-cookie');
+            const [firtHeader] = result.split(' ');
+            const secondCookie = firtHeader.substring(0, firtHeader.length - 1);
+
+            await close(token, secondCookie);
+        }
+
+        async function close(token, secondCookie) {
+            for (const ticketId of ticketsId) {
+                const ostUri = `${config.host}/ajax.php/tickets/${ticketId}/status`;
+                const data = {
+                    status_id: config.newStatusId,
+                    comments: config.comment,
+                    undefined: config.action
+                };
+                const params = {
+                    method: 'POST',
+                    body: new URLSearchParams(data),
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+                        'X-CSRFToken': token,
+                        'Cookie': secondCookie
+                    }
+                };
+
+                return fetch(ostUri, params);
+            }
+        }
+    };
+};

back/model-config.json

@@ -116,6 +116,9 @@
     "OsTicket": {
         "dataSource": "osticket"
     },
+    "OsTicketConfig": {
+        "dataSource": "vn"
+    },
     "Edi": {
         "dataSource": "vn"
     }

back/models/osticket-config.json

@@ -0,0 +1,52 @@
+{
+	"name": "OsTicketConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "osTicketConfig"
+		}
+	},
+	"properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "host": {
+            "type": "string"
+        },
+        "user": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "oldStatus": {
+            "type": "string"
+        },
+        "newStatusId": {
+            "type": "number"
+        },
+        "action": {
+            "type": "string"
+        },
+        "day": {
+            "type": "number"
+        },
+        "comment": {
+            "type": "string"
+        },
+        "hostDb": {
+            "type": "string"
+        },
+        "userDb": {
+            "type": "string"
+        },
+        "passwordDb": {
+            "type": "string"
+        },
+        "portDb": {
+            "type": "number"
+        }
+    }
+}

back/models/osticket.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/osticket/closeTicket')(Self);
+};

db/changes/10480-june/00-itemType.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`itemType` CHANGE `transaction` transaction__ tinyint(4) DEFAULT 0 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE location location__ varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE `vn`.`itemType` CHANGE hasComponents hasComponents__ tinyint(1) DEFAULT 1 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE warehouseFk warehouseFk__ smallint(6) unsigned DEFAULT 60 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NULL;

db/changes/10481-june/00-aclOsTicket.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('OsTicket', '*', '*', 'ALLOW', 'ROLE', 'employee');

db/changes/10481-june/00-aclOsTicketConfig.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('OsTicketConfig', '*', '*', 'ALLOW', 'ROLE', 'it');

db/changes/10481-june/00-osTicketConfig.sql

@@ -0,0 +1,20 @@
+CREATE TABLE `vn`.`osTicketConfig` (
+  `id` int(11) NOT NULL,
+  `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `newStatusId` int(11) DEFAULT NULL,
+  `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `day` int(11) DEFAULT NULL,
+  `comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `hostDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `userDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `portDb` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `vn`.`osTicketConfig`(`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `action`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`)
+      VALUES
+      (0, 'https://cau.verdnatura.es/scp', NULL, NULL, 'open', 3, 'Cerrar', 60, 'Este CAU se ha cerrado automáticamente', NULL, NULL, NULL, NULL);

db/changes/10490-august/00-ACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Sector','*','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Sector','*','WRITE','ALLOW','ROLE','employee');

db/changes/10490-august/00-sale_afterUpdate.sql

@@ -0,0 +1,100 @@
+DROP TRIGGER IF EXISTS vn.sale_afterUpdate;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate`
+	AFTER UPDATE ON `sale`
+	FOR EACH ROW
+BEGIN
+	DECLARE vIsToSendMail BOOL;
+	DECLARE vPickedLines INT;
+	DECLARE vCollectionFk INT;
+	DECLARE vUserRole VARCHAR(255);
+    
+	IF !(NEW.id <=> OLD.id)
+	OR !(NEW.ticketFk <=> OLD.ticketFk)
+	OR !(NEW.itemFk <=> OLD.itemFk)
+	OR !(NEW.quantity <=> OLD.quantity)
+	OR !(NEW.created <=> OLD.created)
+	OR !(NEW.isPicked <=> OLD.isPicked) THEN
+		CALL stock.log_add('sale', NEW.id, OLD.id);
+	END IF;
+
+	IF !(NEW.price <=> OLD.price)
+	OR !(NEW.ticketFk <=> OLD.ticketFk)
+	OR !(NEW.itemFk <=> OLD.itemFk)
+	OR !(NEW.quantity <=> OLD.quantity)
+	OR !(NEW.discount <=> OLD.discount) THEN
+		CALL ticket_requestRecalc(NEW.ticketFk);
+		CALL ticket_requestRecalc(OLD.ticketFk);
+	END IF;
+
+	IF !(OLD.ticketFk <=> NEW.ticketFk) THEN
+		UPDATE ticketRequest SET ticketFk = NEW.ticketFk
+			WHERE saleFk = NEW.id;
+	END IF;
+	
+	SELECT account.myUser_getName() INTO vUserRole;
+	SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole;
+
+	IF !(OLD.quantity <=> NEW.quantity) THEN
+		SELECT COUNT(*) INTO vIsToSendMail 
+			FROM vncontrol.inter i
+				JOIN vn.state s ON s.id = i.state_id
+			WHERE s.code='PACKED' 
+				AND i.Id_Ticket = OLD.ticketFk
+				AND vUserRole IN ('salesPerson', 'salesTeamBoss')
+			LIMIT 1;
+		    
+		IF vIsToSendMail THEN 
+			CALL vn.mail_insert('jefesventas@verdnatura.es',
+								'noreply@verdnatura.es',
+								CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'),
+								CONCAT('Ticket <a href="https://salix.verdnatura.es/#!/ticket/', OLD.ticketFk ,'/log">', OLD.ticketFk ,'</a>. <br>',
+									'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, 
+									' del artículo ', OLD.itemFk, ' tras estado encajado del ticket. <br>',
+									'Este email se ha generado automáticamente' )
+								);
+		END IF; 
+		IF (OLD.quantity > NEW.quantity) THEN
+			INSERT INTO saleComponent(saleFk, componentFk, value)
+				SELECT NEW.id, cm.id, sc.value 
+					FROM saleComponent sc
+						JOIN component cd ON cd.id = sc.componentFk
+						JOIN component cm ON cm.code = 'mana'
+					WHERE saleFk = NEW.id AND cd.code = 'lastUnitsDiscount'
+				ON DUPLICATE KEY UPDATE value = sc.value + VALUES(value);
+			
+			DELETE sc.* 
+				FROM vn.saleComponent sc
+					JOIN component c ON c.id = sc.componentFk
+				WHERE saleFk = NEW.id AND c.code = 'lastUnitsDiscount';
+		END IF;	
+		INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
+			SELECT r.id 
+				FROM  vn.sale s
+					JOIN vn.ticket t ON t.id = s.ticketFk
+					JOIN vn.route r ON r.id = t.routeFk
+				WHERE r.isOk = FALSE 
+					AND s.id = NEW.id
+					AND r.created >= CURDATE()
+				GROUP BY r.id;
+	END IF;
+
+	IF !(ABS(NEW.isPicked) <=> ABS(OLD.isPicked)) AND NEW.quantity > 0 THEN
+	
+		UPDATE vn.collection c
+			JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk
+			SET c.salePickedCount = c.salePickedCount + IF(NEW.isPicked != 0, 1, -1);
+		
+	END IF;
+
+	IF !(NEW.quantity <=> OLD.quantity) AND (NEW.quantity = 0 OR OLD.quantity = 0) THEN
+	
+		UPDATE vn.collection c
+			JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk
+			SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1);
+	END IF;
+END$$
+DELIMITER ;

db/dump/fixtures.sql

@@ -146,7 +146,9 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
         (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
         (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (13, 'Inventory',       NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
+        (13, 'Inventory',       NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0),
+        (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
+
 
 INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPreparedByPacking`, `code`)
     VALUES
@@ -795,14 +797,14 @@ INSERT INTO `vn`.`temperature`(`code`, `name`, `description`)
         ('warm', 'Warm', 'Warm'),
         ('cool', 'Cool', 'Cool');
 
-INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `warehouseFk`, `life`,`workerFk`, `isPackaging`, `temperatureFk`)
+INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerFk`, `isPackaging`, `temperatureFk`)
     VALUES
-        (1, 'CRI', 'Crisantemo',     2, 1, 31,     35, 0, 'cool'),
-        (2, 'ITG', 'Anthurium',      1, 1, 31,     35, 0, 'cool'),
-        (3, 'WPN', 'Paniculata',     2, 1, 31,     35, 0, 'cool'),
-        (4, 'PRT', 'Delivery ports', 3, 1, NULL,   35, 1, 'warm'),
-        (5, 'CON', 'Container',      3, 1, NULL,   35, 1, 'warm'),
-        (6, 'ALS', 'Alstroemeria',   1, 1, 31,     16, 0, 'warm');
+        (1, 'CRI', 'Crisantemo',     2, 31,     35, 0, 'cool'),
+        (2, 'ITG', 'Anthurium',      1, 31,     35, 0, 'cool'),
+        (3, 'WPN', 'Paniculata',     2, 31,     35, 0, 'cool'),
+        (4, 'PRT', 'Delivery ports', 3, NULL,   35, 1, 'warm'),
+        (5, 'CON', 'Container',      3, NULL,   35, 1, 'warm'),
+        (6, 'ALS', 'Alstroemeria',   1, 31,     16, 0, 'warm');
 
 INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
     VALUES
@@ -1763,11 +1765,6 @@ INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
         (4, 'Reclam.PRAG',  12),
         (5, 'Corregido',    11);
 
-INSERT INTO `vn`.`claimResponsible`(`id`, `description`, `responsability`)
-    VALUES
-        (1, 'Buyers', 0),
-        (7, 'Quality', 0);
-
 INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
     VALUES
         (1, 1, 1, 21, 1,  1, 2, 5),
@@ -1875,50 +1872,40 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
         (5, 1102),
         (9, 1201);
 
-INSERT INTO `postgresql`.`profile`(`profile_id`, `workerFk`, `profile_type_id`)
-        SELECT w.id, w.id, 1
+DROP TEMPORARY TABLE IF EXISTS tmp.worker;
+CREATE TEMPORARY TABLE tmp.worker
+    (PRIMARY KEY (id))
+    ENGINE = MEMORY
+    SELECT w.id, w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +1 YEAR)), '-12-25'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
 		FROM `vn`.`worker` `w`;
 
-INSERT INTO `postgresql`.`business`(`business_id`, `client_id`, `companyCodeFk`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
-        SELECT p.profile_id, p.profile_id, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL +1 YEAR)), '-01-25'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
-			FROM `postgresql`.`profile` `p`;
+INSERT INTO `vn`.`business`(`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`,  `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
+	SELECT * FROM tmp.worker;
 
-INSERT INTO `postgresql`.`business_labour`(`business_id`, `notes`, `department_id`, `professional_category_id`, `incentivo`, `calendar_labour_type_id`, `porhoras`, `labour_agreement_id`, `workcenter_id`)
-        SELECT b.business_id, NULL, 23, 1, 0, 1, 1, 1, 1
-			FROM `postgresql`.`business` `b`;
+DROP TEMPORARY TABLE IF EXISTS tmp.worker;
+CREATE TEMPORARY TABLE tmp.worker
+    (PRIMARY KEY (id))
+    ENGINE = MEMORY
+    SELECT '1111' as 'id', w.id as `workerFk`, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-', RPAD(CONCAT(w.id, 9), 8, w.id)), NULL as `notes`, NULL as `departmentFk`, 23, 1 as `workerBusinessProfessionalCategoryFk`, 1 as `calendarTypeFk`, 1 as `isHourlyLabor`, 1 as `workerBusinessAgreementFk`, 1 as `workcenterFk`
+		FROM `vn`.`worker` `w`
+			WHERE `w`.`id` = 1109;
 
-INSERT INTO `postgresql`.`business` (`client_id`, `companyCodeFk`, `date_start`, `date_end`, `workerBusiness`, `reasonEndFk`)
-    SELECT p.profile_id, 'VNL', CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -2 YEAR)), '-12-25'), CONCAT(YEAR(DATE_ADD(CURDATE(), INTERVAL -1 YEAR)), '-12-24'), CONCAT('E-46-',RPAD(CONCAT(p.profile_id,9),8,p.profile_id)), NULL
-			FROM `postgresql`.`profile` `p`
-			WHERE `p`.`profile_id` = 1109;
+INSERT INTO `vn`.`business` (`id`, `workerFk`, `companyCodeFk`, `started`, `ended`, `workerBusiness`, `reasonEndFk`,  `notes`, `departmentFk`, `workerBusinessProfessionalCategoryFk`, `calendarTypeFk`, `isHourlyLabor`, `workerBusinessAgreementFk`, `workcenterFk`)
+    SELECT * FROM tmp.worker;
 
-UPDATE `postgresql`.`business`
+DROP TEMPORARY TABLE IF EXISTS tmp.worker;
+
+UPDATE `vn`.`business`
     SET `payedHolidays`= 8
-    WHERE `business_id`= 1106;
+    WHERE `id`= 1106;
 
-INSERT INTO `postgresql`.`business_labour` (`business_id`, `notes`, `department_id`, `professional_category_id`, `incentivo`, `calendar_labour_type_id`, `porhoras`, `labour_agreement_id`, `workcenter_id`)
-    VALUES
-        (1111, NULL, 23, 1, 0.0, 1, 1, 1, 1);
+UPDATE `vn`.`business` b
+    SET b.`workerBusinessProfessionalCategoryFk` = 31
+    WHERE b.`workerFk` = 1110;
 
-UPDATE `postgresql`.`business_labour` bl
-        JOIN `postgresql`.`business` b ON b.business_id = bl.business_id
-        JOIN `postgresql`.`profile` pr ON pr.profile_id = b.client_id
-    SET bl.`professional_category_id` = 31
-    WHERE pr.`workerFk` = 1110;
-
-UPDATE `postgresql`.`business_labour` bl
-    SET bl.`department_id` = 43
-WHERE business_id IN(18, 19);
-
-INSERT INTO `postgresql`.`media`(`media_id`, `media_type_id`, `value`, `sort`)
-    VALUES
-        (1, 10, 600123321, 0),
-        (2, 10, 700987987, 0);
-
-INSERT INTO `postgresql`.`profile_media`(`profile_media_id`, `profile_id`, `media_id`)
-    VALUES
-        (1, 1106, 1),
-        (2, 1107, 2);
+UPDATE `vn`.`business` b
+    SET b.`departmentFk` = 43
+    WHERE b.id IN(18, 19);
 
 INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
     VALUES
@@ -1927,20 +1914,39 @@ INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`)
         ('1', '24.5',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR))),
         ('5', '23',     YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR)));
 
-ALTER TABLE `postgresql`.`business_labour_payroll` DROP FOREIGN KEY `business_labour_payroll_cod_categoria`;
-
 INSERT INTO `vn`.`workerBusinessType` (`id`, `name`, `isFullTime`, `isPermanent`, `hasHolidayEntitlement`)
     VALUES
         (1,     'CONTRATO HOLANDA',                                 1, 0, 1),
         (100,   'INDEFINIDO A TIEMPO COMPLETO',                     1, 1, 1),
         (109,   'CONVERSION DE TEMPORAL EN INDEFINIDO T.COMPLETO',  1, 1, 1);
 
-INSERT INTO `postgresql`.`business_labour_payroll` (`business_id`, `cod_tarifa`, `cod_categoria`, `cod_contrato`, `importepactado`)
-    VALUES
-        (1, 7, 12, 100, 900.50),
-        (1106, 7, 12, 100, 1263.03),
-        (1107, 7, 12, 100, 2000),
-        (1108, 7, 12, 100, 1500);
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 900.50
+    WHERE b.id = 1;
+
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 1263.03
+    WHERE b.id = 1106;
+
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 2000
+    WHERE b.id = 1107;
+
+UPDATE `vn`.`business` b
+    SET `rate` = 7,
+        `workerBusinessCategoryFk` = 12,
+        `workerBusinessTypeFk` = 100,
+        `amount` = 1500
+    WHERE b.id = 1108;
 
 INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlementRate`, `discountRate`)
     VALUES
@@ -1951,7 +1957,7 @@ INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlement
         (20, 'Furlough',            '#97B92F', 'furlough',      1,      1),
         (21, 'Furlough half day',   '#778899', 'halfFurlough',  0.5,    1);
 
-INSERT INTO `postgresql`.`calendar_employee` (`business_id`, `calendar_state_id`, `date`)
+INSERT INTO `postgresql`.`calendar_employee` (`businessFk`, `calendar_state_id`, `date`)
     VALUES
         (1,    6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
         (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))),
@@ -2446,11 +2452,11 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`)
 
 INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `foreignValue`, `taxTypeSageFk`, `transactionTypeSageFk`)
     VALUES
-        (1, 99.99, '2000000000', null, null, null),
-        (2, 999.99, '2000000000', null, null, null),
-        (3, 1000.50, '2000000000', null, null, null),
-        (4, 0.50, '2000000000', null, null, null),
-        (5, 150.50, '2000000000', null, null, null),
+        (1, 99.99,      '2000000000', NULL, NULL, NULL),
+        (2, 999.99,     '2000000000', NULL, NULL, NULL),
+        (3, 1000.50,    '2000000000', NULL, NULL, NULL),
+        (4, 0.50,       '2000000000', NULL, NULL, NULL),
+        (5, 150.50,     '2000000000', NULL, NULL, NULL),
         (1, 252.25,     '4751000000', NULL, 7, 61),
         (2, 223.17,     '6210000567', NULL, 8, 20),
         (3, 95.60,      '7001000000', NULL, 8, 35),
@@ -2587,7 +2593,7 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`
         (1106, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),    DATE_ADD(util.VN_CURDATE(), INTERVAL +1 DAY));
 
 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
-    VALUES
+VALUES
     (1, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
     (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);
 
@@ -2641,3 +2647,15 @@ INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`)
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
+
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+    VALUES
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+
+INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
+    VALUES
+        (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
+
+INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
+    VALUES
+        (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);

db/tests/vn/workerTimeControlCheck.spec.js

@@ -239,7 +239,7 @@ xdescribe('worker workerTimeControl_check()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmt = new ParameterizedSQL(`INSERT INTO postgresql.calendar_employee(business_id,calendar_state_id,date)
+        stmt = new ParameterizedSQL(`INSERT INTO postgresql.calendar_employee(businessFk,calendar_state_id,date)
             VALUES
                 (?,1,CURDATE())`, [
             workerId
@@ -282,7 +282,7 @@ xdescribe('worker workerTimeControl_check()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmt = new ParameterizedSQL(`UPDATE postgresql.business SET date_end=DATE_ADD(CURDATE(), INTERVAL -1 DAY) WHERE business_id=?`, [
+        stmt = new ParameterizedSQL(`UPDATE vn.business SET ended = DATE_ADD(CURDATE(), INTERVAL -1 DAY) WHERE id = ?`, [
             workerId
         ]);
         stmts.push(stmt);

e2e/helpers/selectors.js

@@ -1014,9 +1014,9 @@ export default {
         save: 'vn-travel-create vn-submit > button'
     },
     travelExtraCommunity: {
-        anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr',
-        firstTravelReference: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="reference"]',
-        firstTravelLockedKg: 'vn-travel-extra-community vn-tbody:nth-child(2) vn-td-editable[name="lockedKg"]',
+        anySearchResult: 'vn-travel-extra-community > vn-card div > tbody > tr[ng-attr-id="{{::travel.id}}"]',
+        firstTravelReference: 'vn-travel-extra-community tbody:nth-child(2) vn-textfield[ng-model="travel.ref"]',
+        firstTravelLockedKg: 'vn-travel-extra-community tbody:nth-child(2) vn-input-number[ng-model="travel.kg"]',
         removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i'
     },
     travelBasicData: {

e2e/paths/09-invoice-out/03_manualInvoice.spec.js

@@ -22,7 +22,7 @@ describe('InvoiceOut manual invoice path', () => {
     });
 
     it('should create an invoice from a ticket', async() => {
-        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTicket, '7');
+        await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTicket, '15');
         await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceSerial, 'Global nacional');
         await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTaxArea, 'national');
         await page.waitToClick(selectors.invoiceOutIndex.saveInvoice);

e2e/paths/10-travel/04_extra_community.spec.js

@@ -19,18 +19,22 @@ describe('Travel extra community path', () => {
     it('should edit the travel reference and the locked kilograms', async() => {
         await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter);
         await page.waitForSpinnerLoad();
-        await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
-        await page.waitForSpinnerLoad();
-        await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelLockedKg, '1500');
+        await page.clearInput(selectors.travelExtraCommunity.firstTravelReference);
+        await page.write(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
+        await page.clearInput(selectors.travelExtraCommunity.firstTravelLockedKg);
+        await page.write(selectors.travelExtraCommunity.firstTravelLockedKg, '1500');
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Data saved!');
     });
 
     it('should reload the index and confirm the reference and locked kg were edited', async() => {
         await page.accessToSection('travel.index');
         await page.accessToSection('travel.extraCommunity');
         await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter);
-        await page.waitForTextInElement(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
-        const reference = await page.getProperty(selectors.travelExtraCommunity.firstTravelReference, 'innerText');
-        const lockedKg = await page.getProperty(selectors.travelExtraCommunity.firstTravelLockedKg, 'innerText');
+
+        const reference = await page.waitToGetProperty(selectors.travelExtraCommunity.firstTravelReference, 'value');
+        const lockedKg = await page.waitToGetProperty(selectors.travelExtraCommunity.firstTravelLockedKg, 'value');
 
         expect(reference).toContain('edited reference');
         expect(lockedKg).toContain(1500);

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -150,10 +150,12 @@ describe('Account create and basic data path', () => {
 
         describe('Set password', () => {
             it('should set the password using the descriptor menu', async() => {
+                const newPassword = 'quantum.12345';
+
                 await page.waitToClick(selectors.accountDescriptor.menuButton);
                 await page.waitToClick(selectors.accountDescriptor.setPassword);
-                await page.write(selectors.accountDescriptor.newPassword, 'quantum.crypt0graphy');
-                await page.write(selectors.accountDescriptor.repeatPassword, 'quantum.crypt0graphy');
+                await page.write(selectors.accountDescriptor.newPassword, newPassword);
+                await page.write(selectors.accountDescriptor.repeatPassword, newPassword);
                 await page.waitToClick(selectors.accountDescriptor.acceptButton);
                 const message = await page.waitForSnackbar();
 

front/core/components/smart-table/index.html

@@ -40,7 +40,8 @@
                 </vn-button>
             </div>
             <vn-button icon="refresh"
-                ng-click="$ctrl.model.refresh()"
+                ng-click="$ctrl.refresh()"
+                disabled="$ctrl.isRefreshing"
                 vn-tooltip="Refresh">
             </vn-button>
         </div>

front/core/components/smart-table/index.js

@@ -511,6 +511,12 @@ export default class SmartTable extends Component {
         return this.model.save()
             .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }
+
+    refresh() {
+        this.isRefreshing = true;
+        this.model.refresh()
+            .then(() => this.isRefreshing = false);
+    }
 }
 
 SmartTable.$inject = ['$element', '$scope', '$transclude'];

loopback/locale/en.json

@@ -130,5 +130,6 @@
 	"Descanso diario 12h.": "Daily rest 12h.",
 	"Fichadas impares": "Odd signs",
 	"Descanso diario 9h.": "Daily rest 9h.",
-	"Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h."
+	"Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
+	"Password does not meet requirements": "Password does not meet requirements"
 }

loopback/locale/es.json

@@ -146,7 +146,7 @@
 	"Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
 	"ORDER_ALREADY_CONFIRMED": "ORDER_ALREADY_CONFIRMED",
 	"Invalid password": "Invalid password",
-	"Password does not meet requirements": "Password does not meet requirements",
+	"Password does not meet requirements": "La contraseña no cumple los requisitos",
 	"Role already assigned": "Role already assigned",
 	"Invalid role name": "Invalid role name",
 	"Role name must be written in camelCase": "Role name must be written in camelCase",
@@ -208,7 +208,7 @@
 	"Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
 	"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
 	"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
-	"You can't change the credit set to zero from a manager": "No puedes cambiar el cŕedito establecido a cero por un gerente",
+	"You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
 	"Amounts do not match": "Las cantidades no coinciden",
 	"The PDF document does not exists": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
 	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",

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

@@ -28,7 +28,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}"
+                where="{role: {inq: ['salesTeamBoss', 'salesPerson', 'officeBoss']}}"
                 label="Salesperson">
                 <tpl-item>{{firstName}} {{name}}</tpl-item>
             </vn-autocomplete>
@@ -38,7 +38,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                where="{role: {inq: ['salesBoss', 'salesPerson']}}"
+                where="{role: {inq: ['salesTeamBoss', 'salesPerson']}}"
                 label="Attended by">
                 <tpl-item>{{firstName}} {{name}}</tpl-item>
             </vn-autocomplete>

modules/client/back/models/client.js

@@ -402,8 +402,8 @@ module.exports = Self => {
         const models = Self.app.models;
         const userId = ctx.options.accessToken.userId;
 
-        const isManager = await models.Account.hasRole(userId, 'manager', ctx.options);
-        if (!isManager) {
+        const isFinancialBoss = await models.Account.hasRole(userId, 'financialBoss', ctx.options);
+        if (!isFinancialBoss) {
             const lastCredit = await models.ClientCredit.findOne({
                 where: {
                     clientFk: finalState.id
@@ -413,10 +413,10 @@ module.exports = Self => {
 
             const lastAmount = lastCredit && lastCredit.amount;
             const lastWorkerId = lastCredit && lastCredit.workerFk;
-            const lastWorkerIsManager = await models.Account.hasRole(lastWorkerId, 'manager', ctx.options);
+            const lastWorkerIsFinancialBoss = await models.Account.hasRole(lastWorkerId, 'financialBoss', ctx.options);
 
-            if (lastAmount == 0 && lastWorkerIsManager)
-                throw new UserError(`You can't change the credit set to zero from a manager`);
+            if (lastAmount == 0 && lastWorkerIsFinancialBoss)
+                throw new UserError(`You can't change the credit set to zero from a financialBoss`);
 
             const creditLimits = await models.ClientCreditLimit.find({
                 fields: ['roleFk'],

modules/client/back/models/specs/client.spec.js

@@ -53,7 +53,7 @@ describe('Client Model', () => {
     });
 
     describe('changeCredit()', () => {
-        it('should fail to change the credit as a salesAssistant set to zero by a manager', async() => {
+        it('should fail to change the credit as a salesAssistant set to zero by a financialBoss', async() => {
             const tx = await models.Client.beginTransaction({});
 
             let error;
@@ -62,7 +62,7 @@ describe('Client Model', () => {
                 const options = {transaction: tx};
                 const context = {options};
 
-                // Set credit to zero by a manager
+                // Set credit to zero by a financialBoss
                 const financialBoss = await models.Account.findOne({
                     where: {name: 'financialBoss'}
                 }, options);
@@ -83,7 +83,7 @@ describe('Client Model', () => {
                 await tx.rollback();
             }
 
-            expect(error.message).toEqual(`You can't change the credit set to zero from a manager`);
+            expect(error.message).toEqual(`You can't change the credit set to zero from a financialBoss`);
         });
 
         it('should fail to change to a high credit amount as a salesAssistant', async() => {

modules/client/front/billing-data/index.html

@@ -16,7 +16,7 @@
             <vn-autocomplete
                 vn-one
                 label="Billing data"
-                vn-acl="salesAssistant"
+                vn-acl="salesAssistant, hr"
                 ng-model="$ctrl.client.payMethodFk"
                 data="paymethods"
                 fields="['isIbanRequiredForClients']"
@@ -28,7 +28,7 @@
                 step="1"
                 label="Due day"
                 ng-model="$ctrl.client.dueDay"
-                vn-acl="salesAssistant"
+                vn-acl="salesAssistant, hr"
                 rule>
             </vn-input-number>
         </vn-horizontal>
@@ -39,7 +39,7 @@
                 ng-model="$ctrl.client.iban"
                 rule
                 on-change="$ctrl.autofillBic()"
-                vn-acl="salesAssistant">
+                vn-acl="salesAssistant, hr">
             </vn-textfield>
             <vn-autocomplete
                 vn-one
@@ -52,7 +52,7 @@
                 search-function="{or: [{bic: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
                 value-field="id"
                 show-field="bic"
-                vn-acl="salesAssistant"
+                vn-acl="salesAssistant, hr"
                 disabled="$ctrl.ibanCountry == 'ES'">
                 <tpl-item>{{bic}} {{name}}</tpl-item>
                 <append>
@@ -61,7 +61,7 @@
                         icon="add_circle"
                         vn-click-stop="bankEntity.show({countryFk: $ctrl.client.countryFk})"
                         vn-tooltip="New bank entity"
-                        vn-acl="salesAssistant">
+                        vn-acl="salesAssistant, hr">
                     </vn-icon-button>
                 </append>
             </vn-autocomplete>
@@ -71,19 +71,19 @@
                 vn-one
                 label="Received LCR"
                 ng-model="$ctrl.client.hasLcr"
-                vn-acl="salesAssistant">
+                vn-acl="salesAssistant, hr">
             </vn-check>
             <vn-check
                 vn-one
                 label="Received core VNL"
                 ng-model="$ctrl.client.hasCoreVnl"
-                vn-acl="salesAssistant">
+                vn-acl="salesAssistant, hr">
             </vn-check>
             <vn-check
                 vn-one
                 label="Received B2B VNL"
                 ng-model="$ctrl.client.hasSepaVnl"
-                vn-acl="salesAssistant">
+                vn-acl="salesAssistant, hr">
             </vn-check>
         </vn-horizontal>
     </vn-card>

modules/entry/back/methods/entry/importBuysPreview.js

@@ -20,7 +20,7 @@ module.exports = Self => {
         },
         http: {
             path: `/:id/importBuysPreview`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 

modules/entry/back/methods/entry/latestBuysFilter.js

@@ -148,6 +148,8 @@ module.exports = Self => {
         stmt = new ParameterizedSQL(`CALL cache.visible_refresh(@calc_id, FALSE, ?)`, [warehouse.id]);
         stmts.push(stmt);
 
+        const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
+
         const date = new Date();
         date.setHours(0, 0, 0, 0);
         stmt = new ParameterizedSQL(`
@@ -201,7 +203,7 @@ module.exports = Self => {
                 LEFT JOIN cache.visible v ON v.item_id = lb.item_id
                     AND v.calc_id = @calc_id
                 JOIN item i ON i.id = lb.item_id
-                JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = it.warehouseFk
+                JOIN itemType it ON it.id = i.typeFk AND lb.warehouse_id = ?
                 JOIN buy b ON b.id = lb.buy_id
                 LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
                 LEFT JOIN itemType t ON t.id = i.typeFk
@@ -209,7 +211,7 @@ module.exports = Self => {
                 LEFT JOIN origin ori ON ori.id = i.originFk
                 LEFT JOIN entry e ON e.id = b.entryFk AND e.created >= DATE_SUB(? ,INTERVAL 1 YEAR) 
                 LEFT JOIN supplier s ON s.id = e.supplierFk`
-        , [date]);
+        , [userConfig.warehouseFk, date]);
 
         if (ctx.args.tags) {
             let i = 1;

modules/entry/back/methods/entry/specs/editLatestBuys.spec.js

@@ -9,7 +9,8 @@ describe('Buy editLatestsBuys()', () => {
             const ctx = {
                 args: {
                     search: 'Ranged weapon longbow 2m'
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const [original] = await models.Buy.latestBuysFilter(ctx, null, options);
@@ -36,11 +37,12 @@ describe('Buy editLatestsBuys()', () => {
         const options = {transaction: tx};
 
         try {
-            const filter = {typeFk: 1};
+            const filter = {'i.typeFk': 1};
             const ctx = {
                 args: {
                     filter: filter
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const field = 'size';

modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js

@@ -9,7 +9,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     search: 'Ranged weapon longbow 2m'
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -33,7 +34,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     id: 1
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -57,7 +59,8 @@ describe('Entry latests buys filter()', () => {
                     tags: [
                         {tagFk: 27, value: '2m'}
                     ]
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -79,7 +82,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     categoryFk: 1
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -101,7 +105,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     typeFk: 2
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -123,7 +128,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     active: true
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -145,7 +151,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     active: false
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -167,7 +174,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     visible: true
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -189,7 +197,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     visible: false
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -211,7 +220,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     floramondo: true
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -233,7 +243,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     floramondo: false
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -255,7 +266,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     salesPersonFk: 35
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -277,7 +289,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     description: 'Increases block'
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -299,7 +312,8 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     supplierFk: 1
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);
@@ -328,7 +342,8 @@ describe('Entry latests buys filter()', () => {
                 args: {
                     from: from,
                     to: to
-                }
+                },
+                req: {accessToken: {userId: 1}}
             };
 
             const results = await models.Buy.latestBuysFilter(ctx, options);

modules/entry/front/buy/import/index.js

@@ -58,7 +58,7 @@ class Controller extends Section {
     fetchBuys(buys) {
         const params = {buys};
         const query = `Entries/${this.$params.id}/importBuysPreview`;
-        this.$http.get(query, {params}).then(res => {
+        this.$http.post(query, params).then(res => {
             this.import.buys = res.data;
         });
     }

modules/entry/front/buy/import/index.spec.js

@@ -111,9 +111,8 @@ describe('Entry', () => {
                         'volume': 1125}
                 ];
 
-                const serializedParams = $httpParamSerializer({buys});
-                const query = `Entries/1/importBuysPreview?${serializedParams}`;
-                $httpBackend.expectGET(query).respond(200, buys);
+                const query = `Entries/1/importBuysPreview`;
+                $httpBackend.expectPOST(query).respond(200, buys);
                 controller.fetchBuys(buys);
                 $httpBackend.flush();
 

modules/entry/front/latest-buys/index.html

@@ -4,6 +4,7 @@
     order="itemFk DESC"
     limit="20"
     data="$ctrl.buys"
+    on-data-change="$ctrl.reCheck()"
     auto-load="true">
 </vn-crud-model>
 <vn-portal slot="topbar">
@@ -129,6 +130,7 @@
                         <td>
                             <vn-check
                                 ng-model="buy.checked"
+                                on-change="$ctrl.saveChecked(buy.id)"
                                 vn-click-stop>
                             </vn-check>
                         </td>

modules/entry/front/latest-buys/index.js

@@ -7,6 +7,7 @@ export default class Controller extends Section {
         super($element, $);
         this.editedColumn;
         this.checkAll = false;
+        this.checkedBuys = [];
 
         this.smartTableOptions = {
             activeButtons: {
@@ -139,6 +140,7 @@ export default class Controller extends Section {
 
     uncheck() {
         this.checkAll = false;
+        this.checkedBuys = [];
     }
 
     get totalChecked() {
@@ -148,6 +150,23 @@ export default class Controller extends Section {
         return this.checked.length;
     }
 
+    saveChecked(buyId) {
+        const index = this.checkedBuys.indexOf(buyId);
+        if (index !== -1)
+            return this.checkedBuys.splice(index, 1);
+        return this.checkedBuys.push(buyId);
+    }
+
+    reCheck() {
+        if (!this.$.model.data) return;
+        if (!this.checkedBuys.length) return;
+
+        this.$.model.data.forEach(buy => {
+            if (this.checkedBuys.includes(buy.id))
+                buy.checked = true;
+        });
+    }
+
     onEditAccept() {
         const rowsToEdit = [];
         for (let row of this.checked)

modules/entry/front/latest-buys/index.spec.js

@@ -57,5 +57,44 @@ describe('Entry', () => {
                 expect(result.length).toEqual(0);
             });
         });
+
+        describe('reCheck()', () => {
+            it(`should recheck buys`, () => {
+                controller.$.model.data = [
+                    {checked: false, id: 1},
+                    {checked: false, id: 2},
+                    {checked: false, id: 3},
+                    {checked: false, id: 4},
+                ];
+                controller.checkedBuys = [1, 2];
+
+                controller.reCheck();
+
+                expect(controller.$.model.data[0].checked).toEqual(true);
+                expect(controller.$.model.data[1].checked).toEqual(true);
+                expect(controller.$.model.data[2].checked).toEqual(false);
+                expect(controller.$.model.data[3].checked).toEqual(false);
+            });
+        });
+
+        describe('saveChecked()', () => {
+            it(`should check buy`, () => {
+                const buyCheck = 3;
+                controller.checkedBuys = [1, 2];
+
+                controller.saveChecked(buyCheck);
+
+                expect(controller.checkedBuys[2]).toEqual(buyCheck);
+            });
+
+            it(`should uncheck buy`, () => {
+                const buyUncheck = 3;
+                controller.checkedBuys = [1, 2, 3];
+
+                controller.saveChecked(buyUncheck);
+
+                expect(controller.checkedBuys[2]).toEqual(undefined);
+            });
+        });
     });
 });

modules/item/back/methods/item-image-queue/downloadImages.js

@@ -12,7 +12,7 @@ module.exports = Self => {
         },
         http: {
             path: `/downloadImages`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 

modules/item/back/methods/item/filter.js

@@ -86,6 +86,7 @@ module.exports = Self => {
 
     Self.filter = async(ctx, filter, options) => {
         const conn = Self.dataSource.connector;
+        const models = Self.app.models;
         const myOptions = {};
 
         if (typeof options == 'object')
@@ -140,6 +141,8 @@ module.exports = Self => {
 
         filter = mergeFilters(filter, {where});
 
+        const userConfig = await models.UserConfig.getUserConfig(ctx, myOptions);
+
         const stmts = [];
         const stmt = new ParameterizedSQL(
             `SELECT 
@@ -179,11 +182,11 @@ module.exports = Self => {
                     LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
                     LEFT JOIN producer pr ON pr.id = i.producerFk
                     LEFT JOIN origin ori ON ori.id = i.originFk
-                    LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = it.warehouseFk
+                    LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = ?
                     LEFT JOIN buy b ON b.id = lb.buy_id
                     LEFT JOIN entry e ON e.id = b.entryFk
                     LEFT JOIN supplier s ON s.id = e.supplierFk`
-        );
+            , [userConfig.warehouseFk]);
 
         if (ctx.args.tags) {
             let i = 1;

modules/item/back/methods/item/getCard.js

@@ -30,7 +30,7 @@ module.exports = Self => {
                 {
                     relation: 'itemType',
                     scope: {
-                        fields: ['id', 'name', 'workerFk', 'warehouseFk'],
+                        fields: ['id', 'name', 'workerFk'],
                         include: [{
                             relation: 'worker',
                             scope: {

modules/item/back/methods/item/getSummary.js

@@ -34,7 +34,7 @@ module.exports = Self => {
             include: [
                 {relation: 'itemType',
                     scope: {
-                        fields: ['id', 'name', 'workerFk', 'warehouseFk'],
+                        fields: ['id', 'name', 'workerFk'],
                         include: [{
                             relation: 'worker',
                             scope: {

modules/item/back/methods/item/getWasteByWorker.js

@@ -35,6 +35,19 @@ module.exports = Self => {
                 ) sub
                 ORDER BY percentage DESC`, [date, date], myOptions);
 
+        const wastesTotal = await Self.rawSql(`
+            SELECT *, 100 * dwindle / total AS percentage
+                FROM (
+                    SELECT  buyer,
+                            sum(ws.saleTotal) AS total,
+                            sum(ws.saleWaste) AS dwindle
+                        FROM bs.waste ws
+                        WHERE year = YEAR(TIMESTAMPADD(WEEK,-1, ?))
+                            AND week = WEEK(TIMESTAMPADD(WEEK,-1, ?), 1)
+                        GROUP BY buyer
+                    ) sub
+                    ORDER BY percentage DESC`, [date, date], myOptions);
+
         const details = [];
 
         for (let waste of wastes) {
@@ -55,6 +68,14 @@ module.exports = Self => {
             buyerDetail.lines.push(waste);
         }
 
+        for (let waste of details) {
+            let buyerTotal = wastesTotal.find(totals => {
+                return waste.buyer == totals.buyer;
+            });
+
+            Object.assign(waste, buyerTotal);
+        }
+
         return details;
     };
 };

modules/item/back/methods/item/specs/filter.spec.js

@@ -7,7 +7,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, search: 1}};
+            const ctx = {args: {filter: filter, search: 1}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(1);
@@ -26,7 +26,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, search: 4444444444}};
+            const ctx = {args: {filter: filter, search: 4444444444}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(1);
@@ -49,7 +49,7 @@ describe('item filter()', () => {
                 limit: 8
             };
             const tags = [{value: 'medical box', tagFk: 58}];
-            const ctx = {args: {filter: filter, typeFk: 5, tags: tags}};
+            const ctx = {args: {filter: filter, typeFk: 5, tags: tags}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(2);
@@ -67,7 +67,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, isFloramondo: true}};
+            const ctx = {args: {filter: filter, isFloramondo: true}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(3);
@@ -86,7 +86,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, buyerFk: 16}};
+            const ctx = {args: {filter: filter, buyerFk: 16}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(2);
@@ -106,7 +106,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, supplierFk: 1}};
+            const ctx = {args: {filter: filter, supplierFk: 1}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(2);

modules/item/back/methods/item/specs/getWasteByWorker.spec.js

@@ -12,6 +12,7 @@ describe('Item getWasteByWorker()', () => {
             const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
 
             expect(anyResult.buyer).toMatch(/(CharlesXavier|HankPym|DavidCharlesHaller)/);
+            expect(anyResult.total).toBeGreaterThanOrEqual(1000);
             expect(anyResult.lines.length).toBeGreaterThanOrEqual(3);
 
             await tx.rollback();

modules/item/back/models/item-type.json

@@ -34,11 +34,6 @@
             "model": "Worker",
             "foreignKey": "workerFk"
         },
-        "warehouse": {
-            "type": "belongsTo",
-            "model": "Warehouse",
-            "foreignKey": "warehouseFk"
-        },
         "category": {
             "type": "belongsTo",
             "model": "ItemCategory",

modules/item/front/waste/index/index.html

@@ -4,39 +4,46 @@
     data="details">
 </vn-crud-model>
 <vn-data-viewer model="model">
-    <section ng-repeat="detail in details" class="vn-pa-md">
-        <vn-horizontal class="header">
-            <h5><span translate>{{detail.buyer}}</span></h5>
-            <vn-none>
-                <vn-icon
+    <vn-card>
+        <vn-table>
+            <vn-thead>
+                <vn-tr class="header">
+                    <vn-th class="waste-family">Buyer</vn-th>
+                    <vn-th class="waste-family">Family</vn-th>
+                    <vn-th number>Percentage</vn-th>
+                    <vn-th number>Dwindle</vn-th>
+                    <vn-th number>Total</vn-th>
+                    <vn-th shrink></vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody ng-repeat="detail in details" class="vn-mb-md">
+                <vn-tr class="header">
+                    <vn-td>{{::detail.buyer}}</vn-td>
+                    <vn-td>{{::detail.family}}</vn-td>
+                    <vn-td number>{{::(detail.percentage / 100) | percentage: 2}}</vn-td>
+                    <vn-td number>{{::detail.dwindle | currency: 'EUR'}}</vn-td>
+                    <vn-td number>{{::detail.total | currency: 'EUR'}}</vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
                             ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}"
                             class="arrow pointer"
                             icon="keyboard_arrow_up"
                             vn-tooltip="Minimize/Maximize"
                             ng-click="$ctrl.toggleHidePanel(detail)">
-                </vn-icon>
-            </vn-none>
-        </vn-horizontal>
-        <vn-card ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}">
-            <vn-table>
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th class="waste-family">Family</vn-th>
-                        <vn-th number>Percentage</vn-th>
-                        <vn-th number>Dwindle</vn-th>
-                        <vn-th number>Total</vn-th>
+                        </vn-icon-button>
+                    </vn-td>
                 </vn-tr>
-                </vn-thead>
-                <vn-tbody>
-                    <a ng-repeat="waste in detail.lines" class="clickable vn-tr"
-                        ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})">
-                        <vn-td class="waste-family">{{::waste.family}}</vn-td>
+                <vn-tr ng-repeat="waste in detail.lines" class="clickable vn-tr"
+                    ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})"
+                    ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}">
+                    <vn-td></vn-td>
+                    <vn-td>{{::waste.family}}</vn-td>
                     <vn-td number>{{::(waste.percentage / 100) | percentage: 2}}</vn-td>
                     <vn-td number>{{::waste.dwindle | currency: 'EUR'}}</vn-td>
                     <vn-td number>{{::waste.total | currency: 'EUR'}}</vn-td>
+                    <vn-td shrink></vn-td>
                 </vn-tr>
             </vn-tbody>
         </vn-table>
     </vn-card>
-    </section>
 </vn-data-viewer>

modules/item/front/waste/index/style.scss

@@ -5,20 +5,9 @@ vn-item-waste-index,
 vn-item-waste-detail {
     .header {
         padding: 12px 0 5px 0;
-        color: gray;
+        background-color: $color-bg;
         font-size: 1.2rem;
-        border-bottom: $border;
         margin-bottom: 10px;
-
-        & > vn-none > vn-icon {
-            @extend %clickable-light;
-            color: $color-button;
-            font-size: 1.4rem;
-        }
-
-        vn-none > .arrow {
-            transition: transform 200ms;
-        }
     }
 
     vn-table vn-th.waste-family,
@@ -26,11 +15,12 @@ vn-item-waste-detail {
         max-width: 64px;
         width: 64px
     }
+
     .hidden {
         display: none;
-                
     }
-    .header > vn-none > .arrow.hidden {
+
+    .arrow.hidden {
         display: block;
         transform: rotate(180deg);
     }

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

@@ -164,6 +164,10 @@ module.exports = Self => {
         let stmt;
 
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
+
+        stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
+        stmts.push(`SET SESSION optimizer_search_depth = 0`);
+
         stmt = new ParameterizedSQL(
             `CREATE TEMPORARY TABLE tmp.filter
                 (PRIMARY KEY (id))
@@ -207,7 +211,7 @@ module.exports = Self => {
                         LEFT JOIN province p ON p.id = a.provinceFk
                         LEFT JOIN warehouse w ON w.id = t.warehouseFk
                         LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                        LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+                        STRAIGHT_JOIN ticketState ts ON ts.ticketFk = t.id
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
@@ -224,6 +228,8 @@ module.exports = Self => {
         stmt.merge(conn.makeWhere(filter.where));
         stmts.push(stmt);
 
+        stmts.push(`SET SESSION optimizer_search_depth = @_optimizer_search_depth`);
+
         // Get client debt balance
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt');
         stmts.push(`

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

@@ -147,16 +147,12 @@ describe('SalesMonitor salesFilter()', () => {
             const options = {transaction: tx};
 
             const ctx = {req: {accessToken: {userId: 9}}, args: {pending: false}};
-            const filter = {};
+            const filter = {order: 'alertLevel ASC'};
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
             const firstRow = result[0];
-            const secondRow = result[1];
-            const thirdRow = result[2];
 
             expect(result.length).toEqual(12);
-            expect(firstRow.state).toEqual('Entregado');
-            expect(secondRow.state).toEqual('Entregado');
-            expect(thirdRow.state).toEqual('Entregado');
+            expect(firstRow.alertLevel).not.toEqual(0);
 
             await tx.rollback();
         } catch (e) {

modules/route/back/models/vehicle.json

@@ -50,7 +50,9 @@
     },
     "scope": {
         "where": {
-            "isActive": true
+            "isActive": {
+                    "neq": false
+                }
             }
     },
     "acls": [

modules/shelving/back/model-config.json

@@ -7,5 +7,8 @@
     },
     "ShelvingLog": {
         "dataSource": "vn"
+    },
+    "Sector": {
+        "dataSource": "vn"
     }
 }

modules/shelving/back/models/sector.json

@@ -0,0 +1,72 @@
+{
+    "name": "Sector",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "sector"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "description": {
+            "type": "string",
+            "required": true
+        },
+        "warehouseFk": {
+            "type": "number",
+            "required": true
+        },
+        "isPreviousPreparedByPacking": {
+            "type": "boolean",
+            "required": true
+        },
+        "code": {
+            "type": "string",
+            "required": false
+        },
+        "isPreviousPrepared": {
+            "type": "boolean",
+            "required": true
+        },
+        "isPackagingArea": {
+            "type": "boolean",
+            "required": true
+        },
+        "reportFk": {
+            "type": "number",
+            "required": false
+        },
+        "sonFk": {
+            "type": "number",
+            "required": false
+        },
+        "isMain": {
+            "type": "boolean",
+            "required": true
+        },
+        "itemPackingTypeFk": {
+            "type": "string",
+            "required": false
+        },
+        "workerFk": {
+            "type": "number",
+            "required": false
+        },
+        "printerFk": {
+            "type": "number",
+            "required": false
+        },
+        "isHideForPickers": {
+            "type": "boolean",
+            "required": true
+        },
+        "isReserve": {
+            "type": "boolean",
+            "required": true
+        }
+    }
+}

modules/ticket/back/methods/packaging/specs/listPackaging.spec.js

@@ -1,7 +1,6 @@
 const models = require('vn-loopback/server/server').models;
 
-// 4376
-xdescribe('ticket listPackaging()', () => {
+describe('ticket listPackaging()', () => {
     it('should return the packaging', async() => {
         const tx = await models.Packaging.beginTransaction({});
 

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

@@ -82,6 +82,9 @@ describe('ticket setDeleted()', () => {
             ctx.req.__ = value => {
                 return value;
             };
+            const [ticketCollectionOld] = await models.Ticket.rawSql(
+                `SELECT COUNT(*) numberRows
+                    FROM vn.ticketCollection`, [], options);
             const ticketId = 23;
 
             await models.Ticket.setDeleted(ctx, ticketId, options);
@@ -90,7 +93,7 @@ describe('ticket setDeleted()', () => {
                 `SELECT COUNT(*) numberRows
                     FROM vn.ticketCollection`, [], options);
 
-            expect(ticketCollection.numberRows).toEqual(3);
+            expect(ticketCollection.numberRows).toBeLessThan(ticketCollectionOld.numberRows);
 
             await tx.rollback();
         } catch (e) {

modules/travel/back/methods/travel/extraCommunityFilter.js

@@ -128,7 +128,7 @@ module.exports = Self => {
                     w.name AS warehouseInFk,
                     w.name AS warehouseInName,
                     SUM(b.stickers) AS stickers,
-                    s.id AS supplierFk,
+                    s.id AS cargoSupplierFk,
                     s.nickname AS cargoSupplierNickname,
                     CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as loadedKg,
                     CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as volumeKg
@@ -160,6 +160,7 @@ module.exports = Self => {
                     e.travelFk,
                     e.ref,
                     e.loadPriority,
+                    s.id AS supplierFk,
                     s.name AS supplierName,
                     SUM(b.stickers) AS stickers,
                     e.evaNotes,

modules/travel/front/extra-community-search-panel/index.html

@@ -50,15 +50,15 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete vn-one
-                label="Warehouse In"
-                ng-model="filter.warehouseInFk"
+                label="Warehouse Out"
+                ng-model="filter.warehouseOutFk"
                 url="Warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>
             <vn-autocomplete vn-one
-                label="Warehouse Out"
-                ng-model="filter.warehouseOutFk"
+                label="Warehouse In"
+                ng-model="filter.warehouseInFk"
                 url="Warehouses"
                 show-field="name"
                 value-field="id">

modules/travel/front/extra-community/index.html

@@ -1,6 +1,7 @@
 <vn-crud-model
     vn-id="model"
     url="Travels/extraCommunityFilter"
+    filter="::$ctrl.filter"
     data="travels"
     order="shipped ASC, landed ASC, travelFk, loadPriority, agencyModeFk, evaNotes"
     limit="20"
@@ -18,112 +19,174 @@
         model="model">
     </vn-searchbar>
 </vn-portal>
-<vn-data-viewer model="model" class="travel-list">
-    <vn-card>
-        <section class="vn-pa-md">
+<vn-card class="travel-list scrollable">
+    <smart-table
+        model="model"
+        options="$ctrl.smartTableOptions">
+        <slot-actions>
+            <section>
                 <vn-tool-bar class="vn-mb-md">
-                <vn-button disabled="!$ctrl.hasDateRange"
+                    <vn-button
+                        disabled="!$ctrl.hasDateRange"
                         icon="picture_as_pdf"
                         ng-click="$ctrl.showReport()"
                         vn-tooltip="Open as PDF">
                     </vn-button>
                 </vn-tool-bar>
-            <vn-table>
-                <vn-thead>
-                    <vn-tr>
-                        <vn-th shrink>Id</vn-th>
-                        <vn-th expand>Supplier</vn-th>
-                        <vn-th expand>Freighter</vn-th>
-                        <vn-th>Reference</vn-th>
-                        <vn-th number>Packages</vn-th>
-                        <vn-th number>Bl. KG</vn-th>
-                        <vn-th number>Phy. KG</vn-th>
-                        <vn-th number>Vol. KG</vn-th>
-                        <vn-th expand translate-attr="{title: 'Warehouse Out'}">
-                            Wh. Out
-                        </vn-th>
-                        <vn-th expand>W. Shipped</vn-th>
-                        <vn-th expand translate-attr="{title: 'Warehouse In'}">
-                            Wh. In
-                        </vn-th>
-                        <vn-th expand>W. Landed</vn-th>
-                    </vn-tr>
-                </vn-thead>
-                <vn-tbody ng-repeat="travel in travels" class="vn-mb-md" vn-droppable="$ctrl.onDrop($event)" ng-attr-id="{{::travel.id}}">
-                    <vn-tr class="header">
-                        <vn-td>
-                            <span class="link"
+            </section>
+        </slot-actions>
+        <slot-table>
+            <table>
+                <thead>
+                    <tr>
+                        <th field="id" shrink>
+                            <span translate>Id</span>
+                        </th>
+                        <th field="cargoSupplierFk" expand>
+                            <span translate>Supplier</span>
+                        </th>
+                        <th field="agencyModeFk" expand>
+                            <span translate>Agency</span>
+                        </th>
+                        <th field="ref">
+                            <span translate>Reference</span>
+                        </th>
+                        <th field="stickers" number>
+                            <span translate>Packages</span>
+                        </th>
+                        <th field="kg" number>
+                            <span translate>Bl. KG</span>
+                        </th>
+                        <th field="loadedKg" number>
+                            <span translate>Phy. KG</span>
+                        </th>
+                        <th field="volumeKg" number>
+                            <span translate>Vol. KG</span>
+                        </th>
+                        <th
+                            field="warehouseOutFk"
+                            translate-attr="{title: 'Warehouse Out'}">
+                            <span translate>Wh. Out</span>
+                        </th>
+                        <th field="shipped">
+                            <span translate>W. Shipped</span>
+                        </th>
+                        <th
+                            field="warehouseInFk"
+                            translate-attr="{title: 'Warehouse In'}">
+                            <span translate>Wh. In</span>
+                        </th>
+                        <th field="landed">
+                            <span translate>W. Landed</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody
+                    ng-repeat="travel in travels"
+                    class="vn-mb-md"
+                    vn-droppable="$ctrl.onDrop($event)"
+                    ng-attr-id="{{::travel.id}}"
+                    vn-stop-click>
+                    <tr
+                        class="header"
+                        vn-anchor="::{
+                            state: 'travel.card.basicData',
+                            params: {id: travel.id}
+                        }">
+                        <td vn-click-stop>
+                            <span
+                                class="link"
                                 ng-click="travelDescriptor.show($event, travel.id)">
                                 {{::travel.id}}
                             </span>
-                        </vn-td>
-                        <vn-td expand>{{::travel.agencyModeName}}</vn-td>
-                        <vn-td expand>{{::travel.cargoSupplierNickname}}</vn-td>
-                        <vn-td-editable name="reference" expand>
-                            <text>{{travel.ref}}</text>
-                            <field>
-                                <vn-textfield class="dense" vn-focus
+                        </td>
+                        <td expand vn-click-stop>
+                            <span
+                                class="link"
+                                ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)">
+                                {{::travel.cargoSupplierNickname}}
+                            </span>
+                        </td>
+                        <td expand>{{::travel.agencyModeName}}</td>
+                        <td
+                            name="reference"
+                            expand
+                            vn-click-stop>
+                            <vn-textfield
+                                class="dense td-editable"
                                 ng-model="travel.ref"
                                 on-change="$ctrl.save(travel.id, {ref: value})">
                             </vn-textfield>
-                            </field>
-                        </vn-td-editable>
-                        <vn-td number>{{::travel.stickers}}</vn-td>
-                        <vn-td-editable name="lockedKg" expand style="text-align: right">
-                            <text number>{{travel.kg}}</text>
-                            <field>
-                                <vn-input-number class="dense" vn-focus
+                        </vn-icon>
+                        </td>
+                        <td number>{{::travel.stickers}}</td>
+                        <td
+                            name="lockedKg"
+                            expand
+                            vn-click-stop>
+                            <vn-input-number
+                                number
+                                class="td-editable number"
                                 ng-model="travel.kg"
                                 on-change="$ctrl.save(travel.id, {kg: value})"
                                 min="0">
                             </vn-input-number>
-                            </field>
-                        </vn-td-editable>
-                        <vn-td number>{{::travel.loadedKg}}</vn-td>
-                        <vn-td number>{{::travel.volumeKg}}</vn-td>
-                        <vn-td expand>{{::travel.warehouseOutName}}</vn-td>
-                        <vn-td expand>{{::travel.shipped | date: 'dd/MM/yyyy'}}</vn-td>
-                        <vn-td expand>{{::travel.warehouseInName}}</vn-td>
-                        <vn-td expand>{{::travel.landed | date: 'dd/MM/yyyy'}}</vn-td>
-                    </vn-tr>
-                    <a href="#" ng-repeat="entry in travel.entries" class="vn-tr" draggable
+                        </td>
+                        <td number>{{::travel.loadedKg}}</td>
+                        <td number>{{::travel.volumeKg}}</td>
+                        <td expand>{{::travel.warehouseOutName}}</td>
+                        <td expand>{{::travel.shipped | date: 'dd/MM/yyyy'}}</td>
+                        <td expand>{{::travel.warehouseInName}}</td>
+                        <td expand>{{::travel.landed | date: 'dd/MM/yyyy'}}</td>
+                    </tr>
+                    <tr
+                        ng-repeat="entry in travel.entries"
+                        draggable
                         ng-attr-id="{{::entry.id}}"
                         ng-click="$event.preventDefault()">
-                        <vn-td>
+                        <td>
                             <span class="link"
                                 ng-click="entryDescriptor.show($event, entry.id)">
                                 {{::entry.id}}
                             </span>
-                        </vn-td>
-                        <vn-td>{{::entry.supplierName}}</vn-td>
-                        <vn-td></vn-td>
-                        <vn-td expand>{{::entry.ref}}</vn-td>
-                        <vn-td number>{{::entry.stickers}}</vn-td>
-                        <vn-td number></vn-td>
-                        <vn-td number>{{::entry.loadedkg}}</vn-td>
-                        <vn-td number>{{::entry.volumeKg}}</vn-td>
-                        <vn-td>
+                        </td>
+                        <td>
+                            <span
+                                class="link"
+                                ng-click="supplierDescriptor.show($event, entry.supplierFk)">
+                                {{::entry.supplierName}}
+                            </span>
+                        </td>
+                        <td></td>
+                        <td expand>{{::entry.ref}}</td>
+                        <td number>{{::entry.stickers}}</td>
+                        <td number></td>
+                        <td number>{{::entry.loadedkg}}</td>
+                        <td number>{{::entry.volumeKg}}</td>
+                        <td>
                             <span ng-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
                                 {{::entry.notes}}
                             </span>
-                        </vn-td>
-                        <vn-td>
+                        </td>
+                        <td>
                             <span ng-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
                                 {{::entry.evaNotes}}
                             </span>
-                        </vn-td>
-                        <vn-td></vn-td>
-                        <vn-td></vn-td>
-                    </a>
-                </vn-tbody>
-            </vn-table>
-        </section>
-    </vn-card>
-</vn-data-viewer>
+                        </td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                </tbody>
+            </table>
+        </slot-table>
+    </smart-table>
+</vn-card>
 <vn-travel-descriptor-popover
     vn-id="travelDescriptor">
 </vn-travel-descriptor-popover>
 <vn-entry-descriptor-popover
     vn-id="entryDescriptor">
 </vn-entry-descriptor-popover>
-
+<vn-supplier-descriptor-popover
+    vn-id="supplierDescriptor">
+</vn-supplier-descriptor-popover>

modules/travel/front/extra-community/index.js

@@ -14,8 +14,15 @@ class Controller extends Section {
         draggable.addEventListener('dragend',
             event => this.dragEnd(event));
 
-        this.draggableElement = 'a[draggable]';
-        this.droppableElement = 'vn-tbody[vn-droppable]';
+        draggable.addEventListener('dragover',
+            event => this.dragOver(event));
+        draggable.addEventListener('dragenter',
+            event => this.dragEnter(event));
+        draggable.addEventListener('dragleave',
+            event => this.dragLeave(event));
+
+        this.draggableElement = 'tr[draggable]';
+        this.droppableElement = 'tbody[vn-droppable]';
 
         const twoDays = 2;
         const shippedFrom = new Date();
@@ -32,6 +39,8 @@ class Controller extends Section {
             landedTo: landedTo,
             continent: 'AM'
         };
+
+        this.smartTableOptions = {};
     }
 
     get hasDateRange() {
@@ -44,6 +53,15 @@ class Controller extends Section {
         return hasLanded || hasShipped || hasContinent || hasWarehouseOut;
     }
 
+    onDragInterval() {
+        if (this.dragClientY > 0 && this.dragClientY < 75)
+            this.$window.scrollTo(0, this.$window.scrollY - 10);
+
+        const maxHeight = window.screen.availHeight - (window.outerHeight - window.innerHeight);
+        if (this.dragClientY > maxHeight - 75 && this.dragClientY < maxHeight)
+            this.$window.scrollTo(0, this.$window.scrollY + 10);
+    }
+
     findDraggable($event) {
         const target = $event.target;
         const draggable = target.closest(this.draggableElement);
@@ -65,6 +83,7 @@ class Controller extends Section {
         const id = parseInt(draggable.id);
         this.entryId = id;
         this.entry = draggable;
+        this.interval = setInterval(() => this.onDragInterval(), 50);
     }
 
     dragEnd($event) {
@@ -72,6 +91,8 @@ class Controller extends Section {
         draggable.classList.remove('dragging');
         this.entryId = null;
         this.entry = null;
+
+        clearInterval(this.interval);
     }
 
     onDrop($event) {
@@ -91,6 +112,37 @@ class Controller extends Section {
         }
     }
 
+    undrop() {
+        if (!this.dropping) return;
+        this.dropping.classList.remove('dropping');
+        this.dropping = null;
+    }
+
+    dragOver($event) {
+        this.dragClientY = $event.clientY;
+        $event.preventDefault();
+    }
+
+    dragEnter($event) {
+        let element = this.findDroppable($event);
+        if (element) this.dropCount++;
+
+        if (element != this.dropping) {
+            this.undrop();
+            if (element) element.classList.add('dropping');
+            this.dropping = element;
+        }
+    }
+
+    dragLeave($event) {
+        let element = this.findDroppable($event);
+
+        if (element) {
+            this.dropCount--;
+            if (this.dropCount == 0) this.undrop();
+        }
+    }
+
     save(id, data) {
         const endpoint = `Travels/${id}`;
         this.$http.patch(endpoint, data)

modules/travel/front/extra-community/index.spec.js

@@ -27,7 +27,7 @@ describe('Travel Component vnTravelExtraCommunity', () => {
 
     describe('findDraggable()', () => {
         it('should find the draggable element', () => {
-            const draggable = document.createElement('a');
+            const draggable = document.createElement('tr');
             draggable.setAttribute('draggable', true);
 
             const $event = new Event('dragstart');
@@ -43,7 +43,7 @@ describe('Travel Component vnTravelExtraCommunity', () => {
 
     describe('findDroppable()', () => {
         it('should find the droppable element', () => {
-            const droppable = document.createElement('vn-tbody');
+            const droppable = document.createElement('tbody');
             droppable.setAttribute('vn-droppable', true);
 
             const $event = new Event('drop');
@@ -60,7 +60,7 @@ describe('Travel Component vnTravelExtraCommunity', () => {
     describe('dragStart()', () => {
         it(`should add the class "dragging" to the draggable element
             and then set the entryId controller property`, () => {
-            const draggable = document.createElement('a');
+            const draggable = document.createElement('tr');
             draggable.setAttribute('draggable', true);
             draggable.setAttribute('id', 3);
 
@@ -80,7 +80,7 @@ describe('Travel Component vnTravelExtraCommunity', () => {
     describe('dragEnd()', () => {
         it(`should remove the class "dragging" from the draggable element
             and then set the entryId controller property to null`, () => {
-            const draggable = document.createElement('a');
+            const draggable = document.createElement('tr');
             draggable.setAttribute('draggable', true);
             draggable.setAttribute('id', 3);
             draggable.classList.add('dragging');
@@ -100,13 +100,13 @@ describe('Travel Component vnTravelExtraCommunity', () => {
 
     describe('onDrop()', () => {
         it('should make an HTTP patch query', () => {
-            const droppable = document.createElement('vn-tbody');
+            const droppable = document.createElement('tbody');
             droppable.setAttribute('vn-droppable', true);
             droppable.setAttribute('id', 1);
 
             jest.spyOn(controller, 'findDroppable').mockReturnValue(droppable);
 
-            const oldDroppable = document.createElement('vn-tbody');
+            const oldDroppable = document.createElement('tbody');
             oldDroppable.setAttribute('vn-droppable', true);
             const entry = document.createElement('div');
             oldDroppable.appendChild(entry);

modules/travel/front/extra-community/style.scss

@@ -15,41 +15,44 @@ vn-travel-extra-community {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        cursor: pointer;
     }
 
-    vn-td-editable text {
-        background-color: transparent;
-        padding: 0;
-        border: 0;
-        border-bottom: 1px dashed $color-active;
-        border-radius: 0;
-        color: $color-active
-    }
-
-    vn-td-editable:hover text:after {
-        font-family: 'Material Icons';
-        content: 'edit';
-        position: absolute;
-        right: -15px;
-        color: $color-spacer
-    }
-
-    vn-table[vn-droppable] {
+    table[vn-droppable] {
         border-radius: 0;
     }
 
-    a[draggable] {
+    tr[draggable] {
         transition: all .5s;
         cursor: move;
+        overflow: auto;
         outline: 0;
+        height: 65px;
+        pointer-events: fill;
+        user-select:all;
     }
 
-    a[draggable]:hover {
-        background-color: $color-hover-cd
+    tr[draggable] *::selection{
+        background-color: transparent;
     }
 
-    a[draggable].dragging {
-        background-color: $color-success-light;
-        font-weight:bold
+    tr[draggable]:hover {
+        background-color: $color-hover-cd;
+    }
+
+    tr[draggable].dragging {
+        background-color: $color-primary-light;
+        color: $color-font-light;
+        font-weight:bold;
+    }
+
+    .td-editable{
+        input{
+            font-size: 1.25rem!important;
+        }
+    }
+
+    .number *{
+        text-align: right;
     }
 }

modules/worker/back/methods/calendar/specs/absences.spec.js

@@ -33,7 +33,7 @@ describe('Worker absences()', () => {
             const worker = await app.models.WorkerLabour.findById(businessId, null, options);
 
             await app.models.WorkerLabour.rawSql(
-                `UPDATE postgresql.business SET date_end = ? WHERE business_id = ?`,
+                `UPDATE vn.business SET ended = ? WHERE id = ?`,
                 [null, worker.businessFk], options);
 
             const [absences] = await app.models.Calendar.absences(ctx, worker.id, businessId, year, options);
@@ -98,7 +98,7 @@ describe('Worker absences()', () => {
             startingContract.setDate(1);
 
             await app.models.WorkerLabour.rawSql(
-                `UPDATE postgresql.business SET date_start = ?, date_end = ? WHERE business_id = ?`,
+                `UPDATE vn.business SET started = ?, ended = ? WHERE id = ?`,
                 [startingContract, yearEnd, contract.businessFk], options
             );
 

modules/worker/back/methods/worker-time-control-mail/checkInbox.js

@@ -11,7 +11,7 @@ module.exports = Self => {
             },
         http: {
             path: `/checkInbox`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 
@@ -58,8 +58,8 @@ module.exports = Self => {
                                 emailBody = bufferCopy.toUpperCase().trim();
 
                                 const bodyPositionOK = emailBody.match(/\bOK\b/i);
-
-                                if (bodyPositionOK != null && (bodyPositionOK.index == 0 || bodyPositionOK.index == 122))
+                                const bodyPositionIndex = (bodyPositionOK.index == 0 || bodyPositionOK.index == 122);
+                                if (bodyPositionOK != null && bodyPositionIndex)
                                     isEmailOk = true;
                                 else
                                     isEmailOk = false;

modules/worker/back/methods/worker/createAbsence.js

@@ -86,10 +86,9 @@ module.exports = Self => {
             const [result] = await Self.rawSql(
                 `SELECT COUNT(*) halfHolidayCounter
                     FROM vn.calendar c
-                        JOIN postgresql.business b ON b.business_id = c.businessFk 
-                        JOIN postgresql.profile p ON p.profile_id = b.client_id 
+                        JOIN vn.business b ON b.id = c.businessFk
                     WHERE c.dayOffTypeFk = 6
-                        AND p.workerFk = ? 
+                        AND b.workerFk = ?
                         AND c.dated BETWEEN util.firstDayOfYear(?)
                         AND LAST_DAY(DATE_ADD(?, INTERVAL 12 - MONTH(?) MONTH))`, [id, date, now, now]);
 

modules/worker/back/model-config.json

@@ -20,9 +20,6 @@
     "EducationLevel": {
         "dataSource": "vn"
     },
-    "Sector": {
-        "dataSource": "vn"
-    },
     "WorkCenter": {
         "dataSource": "vn"
     },

modules/worker/back/models/sector.json

@@ -1,20 +0,0 @@
-{
-    "name": "Sector",
-	"base": "VnModel",
-	"options": {
-		"mysql": {
-			"table": "sector"
-		}
-	},
-    "properties": {
-        "id": {
-            "type": "number",
-            "id": true,
-            "description": "Identifier"
-        },
-        "description": {
-            "type": "string",
-            "required": true
-        }
-    }
-}

modules/zone/back/models/zone-exclusion.json

@@ -1,6 +1,10 @@
 {
 	"name": "ZoneExclusion",
-	"base": "VnModel",
+	"base": "Loggable",
+	"log": {
+		"model":"ZoneLog",
+        "relation": "zone"
+	},
 	"options": {
 		"mysql": {
 			"table": "zoneExclusion"

modules/zone/front/events/index.html

@@ -91,7 +91,7 @@
     </vn-data-viewer>
 </vn-side-menu>
 <vn-float-button
-    ng-click="$ctrl.create('weekday')"
+    ng-click="$ctrl.createInclusion('weekday')"
     icon="add"
     vn-tooltip="Add event"
     vn-bind="+"

package.json

@@ -22,6 +22,7 @@
         "i18n": "^0.8.4",
         "image-type": "^4.1.0",
         "imap": "^0.8.19",
+        "jsdom": "^16.7.0",
         "jszip": "^3.10.0",
         "ldapjs": "^2.2.0",
         "loopback": "^3.26.0",

print/methods/closure/closeAll.js

@@ -3,13 +3,22 @@ const closure = require('./closure');
 
 module.exports = async function(request, response, next) {
     try {
-        const reqArgs = request.query;
-        if (!reqArgs.to)
-            throw new Error('The argument to is required');
+        const reqArgs = request.body;
 
-        response.status(200).json({
-            message: 'Success'
-        });
+        let toDate = new Date();
+        toDate.setDate(toDate.getDate() - 1);
+
+        if (reqArgs.to) toDate = reqArgs.to;
+
+        const todayMinDate = new Date();
+        minDate.setHours(0, 0, 0, 0);
+
+        const todayMaxDate = new Date();
+        maxDate.setHours(23, 59, 59, 59);
+
+        // Prevent closure for current day
+        if (toDate >= todayMinDate && toDate <= todayMaxDate)
+            throw new Error('You cannot close tickets for today');
 
         const tickets = await db.rawSql(`
             SELECT 
@@ -36,7 +45,7 @@ module.exports = async function(request, response, next) {
                 AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) 
                     AND util.dayEnd(?)
                 AND t.refFk IS NULL
-            GROUP BY t.id`, [reqArgs.to, reqArgs.to]);
+            GROUP BY t.id`, [toDate, toDate]);
 
         await closure.start(tickets, response.locals);
 
@@ -52,7 +61,11 @@ module.exports = async function(request, response, next) {
                     AND util.dayEnd(?)
                     AND al.code NOT IN('DELIVERED','PACKED')
                     AND t.routeFk
-                    AND z.name LIKE '%MADRID%'`, [reqArgs.to, reqArgs.to]);
+                    AND z.name LIKE '%MADRID%'`, [toDate, toDate]);
+
+        response.status(200).json({
+            message: 'Success'
+        });
     } catch (error) {
         next(error);
     }

print/methods/closure/closeByAgency.js

@@ -3,7 +3,7 @@ const closure = require('./closure');
 
 module.exports = async function(request, response, next) {
     try {
-        const reqArgs = request.query;
+        const reqArgs = request.body;
 
         if (!reqArgs.agencyModeId)
             throw new Error('The argument agencyModeId is required');
@@ -14,10 +14,6 @@ module.exports = async function(request, response, next) {
         if (!reqArgs.to)
             throw new Error('The argument to is required');
 
-        response.status(200).json({
-            message: 'Success'
-        });
-
         const agencyIds = reqArgs.agencyModeId.split(',');
         const tickets = await db.rawSql(`
             SELECT 
@@ -53,6 +49,10 @@ module.exports = async function(request, response, next) {
         ]);
 
         await closure.start(tickets, response.locals);
+
+        response.status(200).json({
+            message: 'Success'
+        });
     } catch (error) {
         next(error);
     }

print/methods/closure/closeByRoute.js

@@ -4,15 +4,11 @@ const closure = require('./closure');
 
 module.exports = async function(request, response, next) {
     try {
-        const reqArgs = request.query;
+        const reqArgs = request.body;
 
         if (!reqArgs.routeId)
             throw new Error('The argument routeId is required');
 
-        response.status(200).json({
-            message: 'Success'
-        });
-
         const tickets = await db.rawSql(`
             SELECT 
                 t.id,
@@ -56,6 +52,10 @@ module.exports = async function(request, response, next) {
             const email = new Email('driver-route', args);
             await email.send();
         }
+
+        response.status(200).json({
+            message: 'Success'
+        });
     } catch (error) {
         next(error);
     }

print/methods/closure/closeByTicket.js

@@ -3,15 +3,11 @@ const closure = require('./closure');
 
 module.exports = async function(request, response, next) {
     try {
-        const reqArgs = request.query;
+        const reqArgs = request.body;
 
         if (!reqArgs.ticketId)
             throw new Error('The argument ticketId is required');
 
-        response.status(200).json({
-            message: 'Success'
-        });
-
         const tickets = await db.rawSql(`
             SELECT 
                 t.id,
@@ -38,6 +34,10 @@ module.exports = async function(request, response, next) {
             GROUP BY e.ticketFk`, [reqArgs.ticketId]);
 
         await closure.start(tickets, response.locals);
+
+        response.status(200).json({
+            message: 'Success'
+        });
     } catch (error) {
         next(error);
     }

print/methods/closure/index.js

@@ -1,9 +1,9 @@
 const express = require('express');
 const router = new express.Router();
 
-router.get('/all', require('./closeAll'));
-router.get('/by-ticket', require('./closeByTicket'));
-router.get('/by-agency', require('./closeByAgency'));
-router.get('/by-route', require('./closeByRoute'));
+router.post('/all', require('./closeAll'));
+router.post('/by-ticket', require('./closeByTicket'));
+router.post('/by-agency', require('./closeByAgency'));
+router.post('/by-route', require('./closeByRoute'));
 
 module.exports = router;

print/templates/email/letter-debtor-nd/sql/client.sql

@@ -5,6 +5,7 @@ SELECT
     be.name AS bankName
 FROM client c
     JOIN company AS cny 
-    JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk 
+      JOIN supplierAccount AS sa ON
+        IF (ct.code = 'PT',  sa.id = 907,  sa.id = cny.supplierAccountFk)
     JOIN bankEntity be ON be.id = sa.bankEntityFk
 WHERE c.id = ? AND cny.id = ?

print/templates/email/letter-debtor-st/sql/client.sql

@@ -5,6 +5,7 @@ SELECT
     be.name AS bankName
 FROM client c
     JOIN company AS cny 
-    JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk 
+      JOIN supplierAccount AS sa ON
+        IF (ct.code = 'PT',  sa.id = 907,  sa.id = cny.supplierAccountFk)
     JOIN bankEntity be ON be.id = sa.bankEntityFk
 WHERE c.id = ? AND cny.id = ?

print/templates/reports/invoice/sql/taxes.sql

@@ -7,6 +7,5 @@ SELECT
         JOIN pgc ON pgc.code = iot.pgcFk
         LEFT JOIN pgcEqu pe ON pe.equFk = pgc.code
         JOIN invoiceOut io ON io.id = iot.invoiceOutFk
-        LEFT JOIN ticket t ON t.refFk = io.ref
-    WHERE t.refFk = ?
+    WHERE io.ref = ?
     ORDER BY iot.id

print/templates/reports/vehicle-event-expired/assets/css/import.js

@@ -0,0 +1,9 @@
+const Stylesheet = require(`${appPath}/core/stylesheet`);
+
+module.exports = new Stylesheet([
+    `${appPath}/common/css/spacing.css`,
+    `${appPath}/common/css/misc.css`,
+    `${appPath}/common/css/layout.css`,
+    `${appPath}/common/css/report.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();

print/templates/reports/vehicle-event-expired/assets/css/style.css

@@ -0,0 +1,19 @@
+.column-oriented {
+    margin-top: 50px !important;
+}
+
+.bottom-line > tr {
+    border-bottom: 1px solid #ccc;
+}
+
+.bottom-line tr:nth-last-child() {
+    border-bottom: none;
+}
+
+.report-info {
+    font-size: 20px
+}
+
+.description strong {
+    text-transform: uppercase;
+}

print/templates/reports/vehicle-event-expired/locale/es.yml

@@ -0,0 +1,4 @@
+title: Expiración Tarjetas Vehículos
+Plate: Matrícula
+Concept: Concepto
+expirationDate: Fecha caducidad

print/templates/reports/vehicle-event-expired/sql/vehicleEvents.sql

@@ -0,0 +1,7 @@
+SELECT 
+    v.numberPlate, 
+    ve.description, 
+    ve.finished
+FROM vehicleEvent ve 
+    JOIN vehicle v ON v.id = ve.vehicleFk	
+WHERE ve.id IN (?)

print/templates/reports/vehicle-event-expired/vehicle-event-expired.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html v-bind:lang="$i18n.locale">
+    <body>
+        <table class="grid">
+            <tbody>
+                <tr>
+                    <td>
+                        <!-- Header block -->
+                        <report-header v-bind="$props"></report-header>
+                        <!-- Block -->
+                        <div class="grid-row">
+                            <div class="grid-block">
+                                    <div class="content">
+                                        <h1 class="title centered uppercase">{{$t('title')}}</h1>
+                                    </div>
+                                <table class="column-oriented">
+                                    <thead>
+                                        <tr>
+                                            <th>{{$t('Plate')}}</th>
+                                            <th>{{$t('Concept')}}</th>
+                                            <th>{{$t('expirationDate')}}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody v-for="vehicleEvent in vehicleEvents">
+                                        <tr>
+                                            <td>{{vehicleEvent.numberPlate}}</td>
+                                            <td>{{vehicleEvent.description}}</td>
+                                            <td>{{vehicleEvent.finished | date('%d-%m-%Y')}}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>

print/templates/reports/vehicle-event-expired/vehicle-event-expired.js

@@ -0,0 +1,28 @@
+const Component = require(`${appPath}/core/component`);
+const reportHeader = new Component('report-header');
+const reportFooter = new Component('report-footer');
+
+module.exports = {
+    name: 'vehicle-event-expired',
+    async serverPrefetch() {
+        this.vehicleEvents = await this.fetchVehicleEvent(this.eventIds);
+
+        if (!this.vehicleEvents)
+            throw new Error('Something went wrong');
+    },
+    methods: {
+        fetchVehicleEvent(vehicleEventIds) {
+            return this.rawSqlFromDef('vehicleEvents', [vehicleEventIds]);
+        },
+    },
+    components: {
+        'report-header': reportHeader.build(),
+        'report-footer': reportFooter.build()
+    },
+    props: {
+        eventIds: {
+            type: [Array],
+            required: true
+        }
+    }
+};