back/methods/osticket/sendToSupport.js

@@ -33,52 +33,25 @@ module.exports = Self => {
         const emailUser =
             await Self.app.models.EmailUser.findById(userId, {fields: ['email']});
 
-        const tableStyle = 'width:100%; border-collapse: collapse; text-align: left;';
+        let html = `<h2>Motivo: ${reason}</h2>`;
-        const thStyle = 'padding: 8px; border: 1px solid #ddd; background-color: #f4f4f4;';
+        html += `<h3>Usuario: ${userId} ${emailUser.email}</h3>`;
-        const tdStyle = 'padding: 8px; border: 1px solid #ddd;';
+        html += `<h3>Additional Data:</h3>`;
-        const tdBoldStyle = 'padding: 8px; border: 1px solid #ddd; font-weight: bold;';
+        html += '<ul>';
-        const subTdStyle = 'padding: 6px; border: 1px solid #ddd;';
-        const subTdBoldStyle = 'padding: 6px; border: 1px solid #ddd; font-weight: bold;';
-
-        let html = `
-        <h2>Motivo: ${reason}</h2>
-        <h3>Usuario: ${userId} ${emailUser.email}</h3>
-        <h3>Additional Data:</h3>
-        <table style="${tableStyle}">
-            <thead>
-                <tr>
-                <th style="${thStyle}">Clave</th><th style="${thStyle}">Valor</th></tr>
-            </thead>
-            <tbody>`;
         for (const [key, val] of Object.entries(additionalData)) {
-            if (key !== 'config') {
+            if (key !== 'config') html += `<li>${key}: ${parse(val)}</li>`;
-                html += `<tr>
+            else {
-                            <td style="${tdBoldStyle}">${key}</td>
+                html += `<li>${key}:</li><ul style="list-style-type: square;">`;
-                            <td style="${tdStyle}">${parse(val)}</td>
+                for (const [confKey, confVal] of Object.entries(val))
-                        </tr>`;
+                    html += `<li>${confKey}: ${parse(confVal)}</li>`;
-            } else {
+                html += '</ul>';
-                html += `<tr>
-                            <td style="${tdBoldStyle}">${key}</td>
-                            <td style="${tdStyle}">
-                                <table style="${tableStyle}">
-                <tbody>`;
-                for (const [confKey, confVal] of Object.entries(val)) {
-                    html += `<tr>
-                                <td style="${subTdBoldStyle}">${confKey}</td>
-                                <td style="${subTdStyle}">${parse(confVal)}</td>
-                            </tr>`;
-                }
-                html += `</tbody></table></td></tr>`;
             }
         }
-        html += `</tbody></table>`;
+        html += '</ul>';
 
         const {message, path, name} = additionalData;
-        const err = name && message ? `${name}: ${message}` : name || message || '';
-
         await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
-            subject: `[Support-Salix] ${path.split('?')[0]} ${err}`,
+            subject: `[Support-Salix] ${path} ${name}: ${message}`,
             html
         });
     };

back/models/vn-user.json

@@ -54,8 +54,7 @@
             "type": "string"
         },
         "hasGrant": {
-            "type": "boolean",
+            "type": "boolean"
-            "default": false
         },
         "passExpired": {
             "type": "date"
@@ -169,7 +168,6 @@
                 "emailVerified",
                 "twoFactor"
             ]
-
         }
     }
 }

db/dump/fixtures.after.sql

@@ -77,8 +77,8 @@ INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
-    ('1', '1', 1, '1', '1', '1', '1', 'pc1', 'F', 0),
+    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
-    ('1', '1', 1, '2', '1', '1', '1', 'pc1', 'F', 0);
+    ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0);
 
 INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES
     (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01');

db/dump/fixtures.before.sql

@@ -924,18 +924,17 @@ INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerF
 		(5, 'CON', 'Container',      3, NULL,   35, 1, 'warm', 0),
 		(6, 'ALS', 'Alstroemeria',   1, 31,     16, 0, 'warm', 1);
 
-INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`, `hexJson`)
+INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
 	VALUES
-		('YEL', 'Yellow',         1, 1, 'F4D03F', '{"value": ["F4D03F"]}'),
+		('YEL', 'Yellow',       1, 1, 'F4D03F'),
-		('BLU', 'Blue',           1, 2, '5DADE2', '{"value": ["5DADE2"]}'),
+		('BLU', 'Blue',         1, 2, '5DADE2'),
-		('RED', 'Red',            1, 3, 'EC7063', '{"value": ["EC7063"]}'),
+		('RED', 'Red',          1, 3, 'EC7063'),
-		('SLV', 'Silver',         1, 4, 'CACFD2', '{"value": ["CACFD2"]}'),
+		('SLV', 'Silver',       1, 4, 'CACFD2'),
-		('BRW', 'Brown',          1, 5, 'DC7633', '{"value": ["DC7633"]}'),
+		('BRW', 'Brown',        1, 5, 'DC7633'),
-		('BLK', 'Black',          1, 6, '000000', '{"value": ["000000"]}'),
+		('BLK', 'Black',        1, 6, '000000'),
-		('BAS', 'Blue/Silver',    1, 7, '5DADE2', '{"value": ["5DADE2"]}'),
+		('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
-		('GRN', 'Green',          1, 8, '28A745', '{"value": ["28A745"]}'),
+		('GRN', 'Green',        1, 8, '28A745'),
-		('WHT', 'White',          1, 9, 'FFFFFF', '{"value": ["FFFFFF"]}'),
+		('WHT', 'White',        1, 9, 'FFFFFF');
-        ('RGB', 'Red/Green/Blue', 1, 9, 'FFFFFF', '{"value": ["EC7063","5DADE2","28A745"]}');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
 	VALUES
@@ -983,30 +982,29 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
 		('VT',  'Sales');
 
 INSERT INTO `vn`.`item`(
-	`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
+    `id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
-	`comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`,
+    `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`,
-	`itemPackingTypeFk`, `hasMinPrice`, `packingOut`, `weightByPiece`, `isCustomInspectionRequired`
+    `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`, `isCustomInspectionRequired`
 )
 VALUES
-	(1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, NULL,    3, 	1),
+    (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, 3, 		1),
-	(2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, NULL,    2, 	1),
+    (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, 2, 		1),
-	(3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,    5,  0),
+    (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, 5, 		0),
-	(4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL, NULL,	0),
+    (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL,	0),
-	(14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(72, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL, 1, 'VT',   0,  NULL,   NULL, 	1,    1, NULL, 	0),
+	(88, 1, 1, 2,     NULL,             NULL, 06021010, 4751000000, NULL, 0, '', 'Stark Industries', 10.0, 'VT', 0, NULL, NULL, 1, NULL, 0);
-	(88, 1,    1, 2, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL,10, 'VT',   0,  NULL,   NULL,   1, NULL, NULL,  0);
 
 
 -- Update the taxClass after insert of the items
@@ -1469,14 +1467,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (105,   88, 36, 'Stark Industries',         4),
         (106,   88, 1,  'White',                    5),
         (107,   88, 67, 'supply',                   6),
-        (108,   88, 23, '13',                       7),
+        (108,   88, 23, '13',                       7);
-		(109,   72, 56, 'Mistic weapon',            1),
-        (110,   72, 58, 'Stormbreaker',             2),
-        (111,   72, 27, '200cm',                    3),
-        (112,   72, 36, 'Stark Industries',         4),
-        (113,   72, 1,  'Red/Green/Blue',           5),
-        (114,   72, 67, '-1 precission',            6),
-        (115,   72, 23, '1',                        7);
 
 INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
 	VALUES
@@ -1546,8 +1537,7 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
         (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
         (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
-        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
+        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
-        (14, util.VN_CURDATE() - INTERVAL 1 DAY          ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
 	VALUES
@@ -1563,11 +1553,10 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
 		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2010', 'Movement 10',1,                  '', 'product'),
         (11,    4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1, 1, 442, 'IN2011', 'Movement 11',0,                  '', 'product'),
         (12,    4,  util.VN_CURDATE() - INTERVAL 1 MONTH,            13, 1, 442, 'IN2012', 'Movement 12',0,                 '', 'product'),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product'),
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product');
-        (100,    1, util.VN_CURDATE()                   ,           14, 0, 442, 'IN2009','Movement 100',0,                  '', 'product');
 
-INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `maxLockTime`, `defaultSupplierFk`)
+INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
-	VALUES (2, 4, 300, 1);
+	VALUES (2, 4, 1);
 
 INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
 	VALUES
@@ -1587,35 +1576,27 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
 		('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
 		('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-    INSERT INTO edi.supplier (supplier_id,company_name,entry_date,expiry_date,change_date_time,isAllowedDirectSales,isBanned)
+	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
-	    VALUES (1,'MV', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 0);
+	VALUES
-    INSERT INTO edi.ekt (id,`ref`,qty,pro,pri,ok,scanned)
+		(1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-        VALUES (1, 1234, 1, 1, 1.1, 1, 1);
+		(2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
-
+		(3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
-	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,ektFk,weight,created)
+		(4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    	VALUES
+		(5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 1,   1, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+		(6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 2,   2, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 1 MONTH),
+		(7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 3,   3, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,       NULL, NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
+		(8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 4,   2, 2,       5,  450, 3, 1, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+		(9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		( 5,   3, 3,      55,  500, 5, 1, 1.000, 1.000, 0.000,  1,  1,       NULL, NULL, 0.00,  78.3,  75.6, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+		(10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		( 6,   4, 8,      50, 1000, 4, 1, 1.000, 1.000, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+		(11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		( 7,   4, 9,      20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10,  'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+		(12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		( 8,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+		(13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		( 9,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+		(14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(10,   5, 1,      50,   10, 4, 1, 2.500, 2.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(11,   5, 4,    1.25,   10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000'),
-    		(12,   6, 4,    1.25,    0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (17, 11, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-    		(13,   7, 1,      50,    0, 3, 1, 2.000, 2.000, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (18, 12, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-    		(14,   7, 2,       5,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+		(10000002, 12, 88, 50.0000, 5000, '4', 1, 1.500, 1.500, 0.000, 1, 1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00, util.VN_CURDATE()  - INTERVAL 2 MONTH);
-            (15,   7, 4,    1.25,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
-            (16,  99, 1, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00, 99.60, 99.40, 0, 1, 0, NULL, 1.00,            '2024-07-30 08:13:51.000'),
-            (17,  11, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
-            (18,  12, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
-            (19, 100, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
-            (20, 100, 2,       5,  450, 3, 2, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
-            (21, 100,72,      55,  500, 5, 3, 1.000, 1.000, 0.000,  1,  1,  'packing', NULL, 0.00,  78.3,  75.6, 0, 1, 0,    1,    3,                    util.VN_CURDATE()),		
-	  (10000002,  12,88, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00,    1,util.VN_CURDATE()  - INTERVAL 2 MONTH);
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
 	VALUES
@@ -2785,11 +2766,11 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
 		(3),
 		(4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `eta`, `observations`, `editorFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(),                           'test observation',         1, 20, 'Robin'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 5 DAY),                           'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), 'observations...',          2, 25, 'Driverman');
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), DATE_ADD(util.VN_NOW(), INTERVAL 6 DAY), 'observations...',          2, 25, 'Driverman');
 
 INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `description`, `editorFk`)
     VALUES

db/routines/vn/procedures/collection_new.sql

@@ -160,11 +160,9 @@ BEGIN
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
-				OR pb.collectionA IS NOT NULL
 				OR pb.collectionN IS NOT NULL
-				OR (NOT pb.H AND pb.V + pb.A > 0 AND vItemPackingTypeFk = 'H')
+				OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
-				OR (NOT pb.A AND vItemPackingTypeFk = 'A')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit

db/routines/vn/procedures/item_getBalance.sql

@@ -30,7 +30,7 @@ BEGIN
 		WITH entriesIn AS (
 			SELECT 'entry' originType,
 					e.id originId,
-					IFNULL(tr.availabled, tr.landed) shipped,
+					tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
@@ -54,7 +54,7 @@ BEGIN
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				WHERE IFNULL(tr.availabled, tr.landed) >= vDateInventory
+				WHERE tr.landed >= vDateInventory
 					AND tr.warehouseInFk = vWarehouseFk
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
@@ -99,7 +99,7 @@ BEGIN
 		),
 		sales AS (
 			WITH itemSales AS (
-				SELECT DATE(t.shipped) + INTERVAL HOUR(z.`hour`) HOUR shipped,
+				SELECT DATE(t.shipped) shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,
@@ -114,7 +114,6 @@ BEGIN
 						cb.claimFk
 					FROM vn.sale s
 						JOIN vn.ticket t ON t.id = s.ticketFk
-						JOIN vn.`zone` z ON z.id = t.zoneFk
 						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
 						LEFT JOIN vn.state st ON st.code = ts.code
 						JOIN vn.client c ON c.id = t.clientFk
@@ -190,15 +189,14 @@ BEGIN
 			SELECT * FROM sales
 			UNION ALL
 			SELECT * FROM orders
-			ORDER BY DATE(shipped),
+			ORDER BY shipped,
 				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
 				isPicked DESC,
 				`in` DESC,
-				`out` DESC,
+				`out` DESC;
-				shipped;
 
 	IF vDated IS NULL THEN
 		SET @a := 0;
@@ -207,7 +205,7 @@ BEGIN
 
 		SELECT t.originType,
 			t.originId,
-			@shipped:= t.shipped,
+			DATE(@shipped:= t.shipped) shipped,
 			t.alertLevel,
 			t.stateName,
 			t.reference,

db/routines/vn/procedures/productionControl.sql

@@ -91,7 +91,6 @@ proc: BEGIN
 				pk.code parking,
 				0 H,
 				0 V,
-				0 A,
 				0 N,
 				st.isOk,
 				ag.isOwn,
@@ -139,7 +138,6 @@ proc: BEGIN
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,
 		ADD COLUMN `collectionV` INT,
-		ADD COLUMN `collectionA` INT,
 		ADD COLUMN `collectionN` INT;
 
 	-- Clientes Nuevos o Recuperados
@@ -180,14 +178,12 @@ proc: BEGIN
 		ENGINE = MEMORY
 		SELECT ticketFk,
 				SUM(sub.H) H,
-				SUM(sub.V) V,				
+				SUM(sub.V) V,
-				SUM(sub.A) A,
 				SUM(sub.N) N
 			FROM (
 				SELECT t.ticketFk,
 						SUM(i.itemPackingTypeFk = 'H') H,
 						SUM(i.itemPackingTypeFk = 'V') V,
-						SUM(i.itemPackingTypeFk = 'A') A,
 						SUM(i.itemPackingTypeFk IS NULL) N
 					FROM tmp.productionTicket t
 						JOIN sale s ON s.ticketFk = t.ticketFk
@@ -200,7 +196,6 @@ proc: BEGIN
 			JOIN tItemPackingType ti ON ti.ticketFk = pb.ticketFk
 		SET pb.H = ti.H,
 			pb.V = ti.V,
-			pb.A = ti.A,
 			pb.N = ti.N;
 
 	-- Colecciones segun tipo de encajado
@@ -208,7 +203,6 @@ proc: BEGIN
 			JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk
 		SET pb.collectionH = IF(pb.H, tc.collectionFk, NULL),
 			pb.collectionV = IF(pb.V, tc.collectionFk, NULL),
-			pb.collectionA = IF(pb.A, tc.collectionFk, NULL),
 			pb.collectionN = IF(pb.N, tc.collectionFk, NULL);
 
 	-- Previa pendiente

db/routines/vn/procedures/ticket_close.sql

@@ -9,12 +9,15 @@ BEGIN
  */
 	DECLARE vDone BOOL;
 	DECLARE vClientFk INT;
-	DECLARE vCurTicketFk INT;
+    DECLARE vCurTicketFk INT;
+	DECLARE vIsTaxDataChecked BOOL;
+	DECLARE vCompanyFk INT;
+	DECLARE vShipped DATE;
 	DECLARE vNewInvoiceId INT;
 	DECLARE vHasDailyInvoice BOOL;
 	DECLARE vWithPackage BOOL;
-	DECLARE vHasToInvoice BOOL;
+    DECLARE vHasToInvoice BOOL;
-	DECLARE vStateCode VARCHAR(45);
+	DECLARE vSerial VARCHAR(2);
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticket_close;
@@ -35,11 +38,18 @@ BEGIN
 			LEAVE proc;
 		END IF;
 
-		SELECT c.id,
+		SELECT
+				c.id,
+				c.isTaxDataChecked,
+				t.companyFk,
+				t.shipped,
 				c.hasDailyInvoice,
 				w.isManaged,
 				c.hasToInvoice
 			INTO vClientFk,
+				vIsTaxDataChecked,
+				vCompanyFk,
+				vShipped,
 				vHasDailyInvoice,
 				vWithPackage,
 				vHasToInvoice
@@ -49,7 +59,7 @@ BEGIN
 			WHERE t.id = vCurTicketFk;
 
 		INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
-			SELECT vCurTicketFk, p.id, COUNT(*)
+			(SELECT vCurTicketFk, p.id, COUNT(*)
 				FROM expedition e
 					JOIN packaging p ON p.id = e.packagingFk
 					JOIN ticket t ON t.id = e.ticketFk
@@ -58,35 +68,39 @@ BEGIN
 				WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
 					AND vWithPackage
 					AND NOT dm.`code`= 'PICKUP'
-				GROUP BY p.itemFk;
+				GROUP BY p.itemFk);
 
 		-- No retornables o no catalogados
-		INSERT INTO sale (
+		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
-				itemFk,
+			(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
-				ticketFk,
-				concept,
-				quantity,
-				price, isPriceFixed
-			)SELECT e.freightItemFk,
-					vCurTicketFk,
-					i.name,
-					COUNT(*) amount,
-					getSpecialPrice(e.freightItemFk, vClientFk),
-					TRUE
 				FROM expedition e
 					JOIN item i ON i.id = e.freightItemFk
 					LEFT JOIN packaging p ON p.itemFk = i.id
-				WHERE e.ticketFk = vCurTicketFk
+				WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
-					AND (p.isPackageReturnable = 0 OR p.isPackageReturnable IS NULL)
 					AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
-				GROUP BY e.freightItemFk;
+				GROUP BY e.freightItemFk);
 
-		IF vHasDailyInvoice AND vHasToInvoice THEN
+		IF(vHasDailyInvoice) AND vHasToInvoice THEN
-			SET vStateCode = 'DELIVERED';
+			SELECT invoiceSerial(vClientFk, vCompanyFk, 'quick') INTO vSerial;
+			IF vSerial IS NULL THEN
+				CALL util.throw('Cannot booking without a serial');
+			END IF;
+
+			CALL ticket_setState(vCurTicketFk, 'DELIVERED');
+
+			IF vIsTaxDataChecked THEN
+				CALL invoiceOut_newFromClient(
+					vClientFk,
+					vSerial,
+					vShipped,
+					vCompanyFk,
+					NULL,
+					NULL,
+					vNewInvoiceId);
+			END IF;
 		ELSE
-			SELECT getAlert3State(vCurTicketFk) INTO vStateCode;
+			CALL ticket_setState(vCurTicketFk, (SELECT vn.getAlert3State(vCurTicketFk)));
 		END IF;
-		CALL ticket_setState(vCurTicketFk, vStateCode);
 	END LOOP;
 
 	CLOSE cur;

db/routines/vn/procedures/ticket_doCmr.sql

@@ -1,7 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
-	vSelf INT
-)
 BEGIN
 /**
 * Crea u actualiza la información del CMR asociado con
@@ -21,7 +19,6 @@ BEGIN
 				a.id addressFk,
 				c2.defaultAddressFk,
 				IFNULL(sat.supplierFk, su.id) supplierFk,
-				t.packages,
 				t.landed
 			FROM ticket t
 				JOIN client c ON c.id = t.clientFk
@@ -55,10 +52,9 @@ BEGIN
 				c.addressToFk = t.addressFk,
 				c.addressFromFk = t.defaultAddressFk,
 				c.supplierFk = t.supplierFk,
-				c.packagesList = t.packages,
 				c.ead = t.landed
 			WHERE id = vCmrFk;
-	ELSE
+	ELSE		
 		INSERT INTO cmr (
 			senderInstruccions,
 			truckPlate,
@@ -66,7 +62,6 @@ BEGIN
 			addressToFk,
 			addressFromFk,
 			supplierFk,
-			packagesList,
 			ead
 		)
 			SELECT * FROM tTicket;

db/routines/vn/procedures/ticket_setState.sql

@@ -3,25 +3,21 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setState`(
 	vSelf INT,
 	vStateCode VARCHAR(255) COLLATE utf8_general_ci
 )
-proc:BEGIN
+BEGIN
 /**
  * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
  *
  * @param vSelf el id del ticket
  * @param vStateCode estado a modificar del ticket
  */
-	DECLARE vTicketAlertLevel INT;
+	DECLARE vticketAlertLevel INT;
-	DECLARE vTicketStateCode VARCHAR(255) COLLATE utf8_general_ci;
+	DECLARE vTicketStateCode VARCHAR(255);
 	DECLARE vCanChangeState BOOL;
 	DECLARE vPackedAlertLevel INT;
 	DECLARE vZoneFk INT;
-	DECLARE vOldWorkerFk INT;
-	DECLARE vNewWorkerFk INT;
 
-	SET vNewWorkerFk = account.myUser_getId();
+	SELECT s.alertLevel, s.`code`, t.zoneFk
-
+		INTO vticketAlertLevel, vTicketStateCode,  vZoneFk
-	SELECT s.alertLevel, s.`code`, t.zoneFk, tt.userFk
-		INTO vTicketAlertLevel, vTicketStateCode, vZoneFk, vOldWorkerFk
 		FROM state s
 			JOIN ticketTracking tt ON tt.stateFk = s.id
 			JOIN ticket t ON t.id = tt.ticketFk
@@ -37,27 +33,24 @@ proc:BEGIN
 
 	SET vCanChangeState = ((
 			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR 
-			vTicketAlertLevel < vPackedAlertLevel
+			vticketAlertLevel < vPackedAlertLevel
-		) AND NOT (
+		)AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
 			AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
 		);
 
 	IF vCanChangeState THEN
+		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
+			SELECT id, vSelf, account.myUser_getId()
+				FROM state
+				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
+				
 		IF vStateCode = 'PACKED' THEN
 			CALL ticket_doCmr(vSelf);
 		END IF;
-
-		IF vStateCode = vTicketStateCode AND vOldWorkerFk = vNewWorkerFk THEN
-			LEAVE proc;
-		END IF;
-
-		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
-			SELECT id, vSelf, vNewWorkerFk
-				FROM state
-				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
 	ELSE
 		CALL util.throw('INCORRECT_TICKET_STATE');
 	END IF;
+	
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeDelete.sql

@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeDelete`
+	BEFORE DELETE ON `roadmapStop`
+	FOR EACH ROW
+BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vRoadmapEta DATETIME;
+
+	IF OLD.roadmapFk IS NOT NULL THEN
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = OLD.roadmapFk
+				AND id <> OLD.id;
+
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = OLD.roadmapFk;
+
+		IF vMaxEta <> vRoadmapEta OR vMaxEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = OLD.roadmapFk;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vRoadmapEta DATETIME;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NEW.description IS NOT NULL THEN
@@ -14,5 +16,17 @@ BEGIN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
 	END IF;
+
+	IF NEW.roadmapFk IS NOT NULL AND NEW.eta IS NOT NULL THEN
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF vRoadmapEta < NEW.eta OR vRoadmapEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = NEW.eta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,17 +3,40 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vCurrentEta DATETIME;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.description <=> OLD.description) THEN
 		SET NEW.description = UCASE(NEW.description);
 	END IF;
 
-	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
+	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
+		OR (NOT (NEW.eta <=> OLD.eta)) THEN
 
 		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
+
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = NEW.roadmapFk
+				AND id <> OLD.id;
+
+		IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
+			SET vMaxEta = NEW.eta;
+		END IF;
+
+		SELECT eta INTO vCurrentEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = NEW.roadmapFk;
+		END IF;
 	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/roadmap_afterUpdate.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_afterUpdate`
+	AFTER UPDATE ON `roadmap`
+	FOR EACH ROW
+BEGIN
+	DECLARE vSeconds INT;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		IF vSeconds IS NOT NULL AND vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,8 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	DECLARE vSeconds INT;
-
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.name <=> OLD.name) THEN
@@ -39,15 +37,5 @@ BEGIN
 										FROM worker w
 										WHERE w.id = NEW.driverChangeFk);
 	END IF;
-
-	IF NOT (NEW.etd <=> OLD.etd) THEN
-		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
-		
-		IF vSeconds <> 0 THEN
-			UPDATE roadmapStop
-				SET eta = eta + INTERVAL vSeconds SECOND
-				WHERE roadmapFk = NEW.id;
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/roadmapEta.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`vn`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`roadmapEta`
-AS SELECT `roadmapFk` AS id,
-	MAX(`eta`) AS `eta`
-FROM `vn`.`roadmapStop`
-WHERE `roadmapFk` IS NOT NULL
-GROUP BY `roadmapFk`;

db/versions/11399-bronzeOak/00-firstScript.sql

@@ -1,90 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Entry','getBuyList','READ','ALLOW','ROLE','buyer'),
-		('Entry','getBuyUltimate','READ','ALLOW','ROLE','buyer'),
-		('Entry','search','READ','ALLOW','ROLE','buyer'),
-		('Entry','create','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','cloneEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','deleteEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','recalcEntryPrices','WRITE','ALLOW','ROLE','buyer'),
-		('EntryType','find','READ','ALLOW','ROLE','buyer'),
-		('EntryConfig','findOne','READ','ALLOW','ROLE','buyer');
-
-ALTER TABLE vn.ink ADD IF NOT EXISTS hexJson TEXT NOT NULL;
-
-UPDATE vn.ink
-	SET hexJson = CONCAT('{"value": ["',hex,'"]}');
-
-UPDATE vn.ink
-SET hexJson = CASE `name`
-    WHEN 'Blanco/Naranja' THEN '{"value": ["FFFFFF", "FFA500"]}'
-    WHEN 'Sin especificar' THEN '{"value": ["808080"]}'
-    WHEN '2 Colores' THEN '{"value": ["000000", "FFFFFF"]}'
-    WHEN 'Amarillo/Marrón' THEN '{"value": ["FFFF00", "8B4513"]}'
-    WHEN 'Amarillo/Naranja' THEN '{"value": ["FFFF00", "FFA500"]}'
-    WHEN 'Rosa/Blanco/Amarillo' THEN '{"value": ["FFC0CB", "FFFFFF", "FFFF00"]}'
-    WHEN 'Rosa/Amarillo' THEN '{"value": ["FFC0CB", "FFFF00"]}'
-    WHEN 'Antracita' THEN '{"value": ["2F2F2F"]}'
-    WHEN 'Azul/Amarillo' THEN '{"value": ["0000FF", "FFFF00"]}'
-    WHEN 'Azul Claro' THEN '{"value": ["ADD8E6"]}'
-    WHEN 'Azul/Marron' THEN '{"value": ["0000FF", "8B4513"]}'
-    WHEN 'Azul/Verde' THEN '{"value": ["0000FF", "008000"]}'
-    WHEN 'Blanco/Amarillo' THEN '{"value": ["FFFFFF", "FFFF00"]}'
-    WHEN 'Blaugrana' THEN '{"value": ["A50044", "004D98"]}'
-    WHEN 'Blanco/Negro' THEN '{"value": ["FFFFFF", "000000"]}'
-    WHEN 'Blanco/Verde' THEN '{"value": ["FFFFFF", "008000"]}'
-    WHEN 'Blanco/Azul' THEN '{"value": ["FFFFFF", "0000FF"]}'
-    WHEN 'Blanco/Rosa' THEN '{"value": ["FFFFFF", "FFC0CB"]}'
-    WHEN 'Cognac/Verde' THEN '{"value": ["9A463D", "008000"]}'
-    WHEN 'Champagne/Verde' THEN '{"value": ["F7E7CE", "008000"]}'
-    WHEN 'Camuflaje' THEN '{"value": ["6B8E23", "556B2F", "8B4513"]}'
-    WHEN 'Crema/Rosa' THEN '{"value": ["FFFDD0", "FFC0CB"]}'
-    WHEN 'Fucsia/Amarillo' THEN '{"value": ["FF00FF", "FFFF00"]}'
-    WHEN 'Fucsia/Blanco' THEN '{"value": ["FF00FF", "FFFFFF"]}'
-    WHEN 'Fucsia/Crema' THEN '{"value": ["FF00FF", "FFFDD0"]}'
-    WHEN 'Fucsia/Rosa' THEN '{"value": ["FF00FF", "FFC0CB"]}'
-    WHEN 'Fucsia/Verde' THEN '{"value": ["FF00FF", "008000"]}'
-    WHEN 'Granate/Blanco' THEN '{"value": ["800000", "FFFFFF"]}'
-    WHEN 'Gris Lila' THEN '{"value": ["808080", "C8A2C8"]}'
-    WHEN 'Lavanda/Amarillo' THEN '{"value": ["E6E6FA", "FFFF00"]}'
-    WHEN 'Lavanda/Gris' THEN '{"value": ["E6E6FA", "808080"]}'
-    WHEN 'Lividum' THEN '{"value": ["702963"]}'
-    WHEN 'Morado/Amarillo' THEN '{"value": ["800080", "FFFF00"]}'
-    WHEN 'Marrón/Blanco' THEN '{"value": ["8B4513", "FFFFFF"]}'
-    WHEN 'Marron/Gris' THEN '{"value": ["8B4513", "808080"]}'
-    WHEN 'Marron/Negro' THEN '{"value": ["8B4513", "000000"]}'
-    WHEN 'Marrón/Verde' THEN '{"value": ["8B4513", "008000"]}'
-    WHEN 'Matizado' THEN '{"value": ["D3D3D3", "808080", "FFFFFF"]}'
-    WHEN 'Mixto' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00"]}'
-    WHEN 'Marrón Oscuro' THEN '{"value": ["654321"]}'
-    WHEN 'Naranja/Marron' THEN '{"value": ["FFA500", "8B4513"]}'
-    WHEN 'Naranja/Rosa' THEN '{"value": ["FFA500", "FFC0CB"]}'
-    WHEN 'Ocre/Burgundi' THEN '{"value": ["CC7722", "800020"]}'
-    WHEN 'Oro/Plata' THEN '{"value": ["FFD700", "C0C0C0"]}'
-    WHEN 'Oro/Negro' THEN '{"value": ["FFD700", "000000"]}'
-    WHEN 'Oro/Verde' THEN '{"value": ["FFD700", "008000"]}'
-    WHEN 'Purpura/Blanco' THEN '{"value": ["800080", "FFFFFF"]}'
-    WHEN 'Purpura/Rosa' THEN '{"value": ["800080", "FFC0CB"]}'
-    WHEN 'Pastel' THEN '{"value": ["FFB6C1", "87CEFA", "98FB98"]}'
-    WHEN 'Plata' THEN '{"value": ["C0C0C0"]}'
-    WHEN 'Plata/Verde' THEN '{"value": ["C0C0C0", "008000"]}'
-    WHEN 'Rojo/Amarillo' THEN '{"value": ["FF0000", "FFFF00"]}'
-    WHEN 'Rojo/Blanco' THEN '{"value": ["FF0000", "FFFFFF"]}'
-    WHEN 'Rojo/Naranja' THEN '{"value": ["FF0000", "FFA500"]}'
-    WHEN 'Rojo/Oro' THEN '{"value": ["FF0000", "FFD700"]}'
-    WHEN 'Rojo/Verde' THEN '{"value": ["FF0000", "008000"]}'
-    WHEN 'Rosa/Lila' THEN '{"value": ["FFC0CB", "C8A2C8"]}'
-    WHEN 'Rosa/Naranja' THEN '{"value": ["FFC0CB", "FFA500"]}'
-    WHEN 'Rojo/Rosa' THEN '{"value": ["FF0000", "FFC0CB"]}'
-    WHEN 'Rosa empolvado' THEN '{"value": ["E6B8AF"]}'
-    WHEN 'Rosa/Verde' THEN '{"value": ["FFC0CB", "008000"]}'
-    WHEN 'Topo/Blanco' THEN '{"value": ["8B8589", "FFFFFF"]}'
-    WHEN 'Topo' THEN '{"value": ["8B8589"]}'
-    WHEN 'Transparente' THEN '{"value": ["00000000"]}'
-    WHEN 'Verde/Amarillo' THEN '{"value": ["008000", "FFFF00"]}'
-    WHEN 'Verde/Negro' THEN '{"value": ["008000", "000000"]}'
-    WHEN 'Variado' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00", "FFA500"]}'
-    WHEN 'Verde Claro/Morado' THEN '{"value": ["90EE90", "800080"]}'
-    WHEN 'Verde/Lila' THEN '{"value": ["008000", "C8A2C8"]}'
-    WHEN 'Vaquero Neon' THEN '{"value": ["1560BD", "FFFF00"]}'
-    ELSE hexJson 
-END;

db/versions/11436-bronzeMonstera/00-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.roadmap
-    MODIFY COLUMN dollyPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT
-        'Vehículo sin motor diseñado para conectarse a una unidad tractora, un camión o un vehículo tractor con fuerte potencia de tracción';

db/versions/11436-bronzeMonstera/01-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.volumeConfig ADD COLUMN id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
-
-GRANT UPDATE (palletM3) ON vn.volumeConfig TO deliveryBoss;

db/versions/11436-bronzeMonstera/02-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.vehicle
-    MODIFY COLUMN typeFk enum('car','van','truck','trailer','tug','dolly','trailerLink')
-        CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'van' NOT NULL;

db/versions/11436-bronzeMonstera/03-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.roadmap DROP COLUMN eta;

db/versions/11441-limeCyca/00-firstScript.sql

@@ -1,8 +0,0 @@
-UPDATE vn.expedition e
-        JOIN (
-            SELECT id
-            FROM vn.expedition
-            WHERE hostFk COLLATE utf8mb3_unicode_ci NOT IN 
-                (SELECT code COLLATE utf8mb3_unicode_ci FROM vn.host WHERE code IS NOT NULL)
-        ) s ON e.id = s.id
-    SET e.hostFk = 'pc336';

db/versions/11441-limeCyca/01-firstScript.sql

@@ -1,9 +0,0 @@
-ALTER TABLE vn.expedition
-    MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci;
-
-ALTER TABLE vn.expedition
-    ADD CONSTRAINT fk_expedition_host_code
-    FOREIGN KEY (hostFk)
-    REFERENCES host(code)
-    ON UPDATE CASCADE
-    ON DELETE CASCADE;

modules/entry/back/methods/entry-buys/getBuyList.js

@@ -1,303 +0,0 @@
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-const buildFilter = require('vn-loopback/util/filter').buildFilter;
-const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
-
-module.exports = Self => {
-    Self.remoteMethodCtx('getBuyList', {
-        description: 'Returns buys for editing of one entry',
-        accessType: 'READ',
-        accepts: [{
-            arg: 'entryFk',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        },
-        {
-            arg: 'filter',
-            type: 'object',
-            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
-        },
-        {
-            arg: 'isIgnored',
-            type: 'boolean',
-            description: 'check if the buy is ignored',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'itemFk',
-            type: 'number',
-            description: 'item id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'name',
-            type: 'string',
-            description: 'item name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'size',
-            type: 'number',
-            description: 'item size',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'stickers',
-            type: 'number',
-            description: 'sticker quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packagingFk',
-            type: 'number',
-            description: 'packaging id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'weight',
-            type: 'number',
-            description: 'weight',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packing',
-            type: 'number',
-            description: 'packing quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'grouping',
-            type: 'number',
-            description: 'grouping quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'quantity',
-            type: 'number',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'buyingValue',
-            type: 'number',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'amount',
-            type: 'number',
-            description: 'buying value * quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'price2',
-            type: 'number',
-            description: 'price for the package',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'price3',
-            type: 'number',
-            description: 'price for the box',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'minPrice',
-            type: 'number',
-            description: 'item minimum price',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packingOut',
-            type: 'number',
-            description: 'quantity of package on a vn box',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'comment',
-            type: 'string',
-            description: 'item comment',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'subName',
-            type: 'string',
-            description: 'supplier name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'subName',
-            type: 'string',
-            description: 'supplier name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'company_name',
-            type: 'string',
-            description: 'company name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'workerFk',
-            type: 'number',
-            description: 'buyer id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'itemTypeFk',
-            type: 'number',
-            description: 'item family id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'groupingMode',
-            type: 'string',
-            description: 'grouping mode',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'hasMinPrice',
-            type: 'boolean',
-            description: 'grouping mode',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'groupBy',
-            type: 'string',
-            description: 'group by',
-            http: {source: 'query'}
-        },
-        ],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/:entryFk/getBuyList`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getBuyList = async(ctx, entryFk, filter, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        let conn = Self.dataSource.connector;
-        let where = buildFilter(ctx.args, (param, value) => {
-            switch (param) {
-            case 'name':
-            case 'subName':
-            case 'company_name':
-            case 'comment':
-                return {[param]: {like: `%${value}%`}};
-            case 'size':
-            case 'isIgnored':
-            case 'itemFk':
-            case 'stickers':
-            case 'packagingFk':
-            case 'weight':
-            case 'packing':
-            case 'grouping':
-            case 'quantity':
-            case 'buyingValue':
-            case 'amount':
-            case 'price2':
-            case 'price3':
-            case 'packingOut':
-            case 'minPrice':
-            case 'workerFk':
-            case 'itemTypeFk':
-            case 'groupingMode':
-            case 'hasMinPrice':
-                return {[param]: value};
-            }
-        });
-
-        filter = mergeFilters(filter, {where});
-
-        let stmts = [];
-        let stmt;
-
-        const selectFields = `b.id,
-            b.isIgnored,
-            b.itemFk,
-            b.printedStickers,
-            b.stickers,
-            b.packagingFk,
-            b.weight,
-            b.packing,
-            b.groupingMode,
-            b.grouping,
-            b.quantity,
-            b.buyingValue,
-            ROUND(b.buyingValue * b.quantity, 2) amount,
-            b.isChecked,
-            b.price2,
-            b.price3,
-            i.name,
-            i.size,
-            i.minPrice,
-            i.hasMinPrice,
-            i.packingOut,
-            i.comment,
-            i.subName,
-            i.tag5,
-            i.value5,
-            i.tag6,
-            i.value6,
-            i.tag7,
-            i.value7,
-            i.tag8,
-            i.value8,
-            i.tag9,
-            i.value9,
-            i.tag10,
-            i.value10,
-            s.company_name,
-            ik.hexJson,
-            it.workerFk,
-            it.id itemTypeFk
-            `;
-
-        const groupByFields = `SUM(b.printedStickers) printedStickers,
-            SUM(b.packing) packing,
-            SUM(b.stickers) stickers,
-            SUM(b.weight) weight,
-            SUM(b.quantity) quantity,
-            SUM(ROUND(b.buyingValue * b.quantity, 2)) amount
-            `;
-
-        const groupBy = ctx.args.groupBy;
-
-        stmt = new ParameterizedSQL(
-            `SELECT *
-                FROM(
-                    SELECT 
-                        ${ groupBy ? groupByFields : selectFields}
-                    FROM item i
-                        LEFT JOIN ink ik ON ik.id = i.inkFk
-                        LEFT JOIN buy b ON b.itemFk = i.id
-                        LEFT JOIN edi.ekt e ON e.id = b.ektFk
-                        LEFT JOIN edi.supplier s ON e.pro = s.supplier_id
-                        LEFT JOIN itemType it ON it.id = i.typeFk
-                    WHERE b.entryFk = ?
-                    ${groupBy ?? ''}
-                ) sub`,
-            [entryFk]
-        );
-
-        stmt.merge(conn.makeSuffix(filter));
-        let itemsIndex = stmts.push(stmt) - 1;
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await conn.executeStmt(sql, myOptions);
-
-        if (groupBy && result.length) {
-            const buys = await Self.app.models.Buy.find({where: {entryFk}}, myOptions);
-            const buysChecked = buys.filter(buy => buy?.isChecked);
-            result[0].isChecked = buysChecked.length === buys.length;
-        }
-        return itemsIndex === 0 ? result : result[itemsIndex];
-    };
-};

modules/entry/back/methods/entry-buys/getBuyUltimate.js

@@ -1,46 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('getBuyUltimate', {
-        description: 'Returns the last buy of the item',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'itemFk',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'warehouseFk',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'date',
-                type: 'date',
-                required: true
-            }
-        ],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/getBuyUltimate`,
-            verb: 'GET'
-        }
-    });
-    Self.getBuyUltimate = async(ctx, itemFk, warehouseFk, date, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        await Self.rawSql('CALL vn.buy_getUltimate(?, ?, ?)', [itemFk, warehouseFk, date], myOptions);
-        return Self.rawSql(
-            `SELECT b.* 
-                FROM cache.last_buy lb 
-                    JOIN buy b ON b.id = lb.buy_id 
-                WHERE lb.item_id = ? 
-                ORDER BY (lb.warehouse_id = ?) desc 
-                LIMIT 1`,
-            [itemFk, warehouseFk], myOptions
-        );
-    };
-};

modules/entry/back/methods/entry/cloneEntry.js

@@ -1,46 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('cloneEntry', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/:id/cloneEntry`,
-            verb: 'POST'
-        }
-    });
-
-    Self.cloneEntry = async(ctx, id, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-        try {
-            await Self.rawSql('CALL entry_clone(?, @newEntryId)', [id], myOptions);
-            const result = await Self.rawSql('SELECT @newEntryId', [], myOptions);
-            const newEntryId = result[0]['@newEntryId'];
-
-            if (tx) await tx.commit();
-            return newEntryId;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/methods/entry/deleteEntry.js

@@ -1,48 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('deleteEntry', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        http: {
-            path: `/:id/deleteEntry`,
-            verb: 'POST'
-        }
-    });
-
-    Self.deleteEntry = async(ctx, id, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const entry = await Self.findById(id, null, myOptions);
-            await entry.updateAttribute('travelFk', null, myOptions);
-            await Self.rawSql('DELETE FROM vn.duaEntry WHERE entryFk = ?;', [id], myOptions);
-            await Self.rawSql(`
-                DELETE i.*
-                FROM vn.invoiceIn i
-                    JOIN vn.entry e ON e.invoiceInFk = i.id
-                WHERE e.id = ?`, [id], myOptions
-            );
-
-            if (tx) await tx.commit();
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/methods/entry/filter.js

@@ -129,68 +129,7 @@ module.exports = Self => {
                 arg: 'finalTemperature',
                 type: 'number',
                 description: 'Final temperature value'
-            },
+            }
-            {
-                arg: 'isExcludedFromAvailable',
-                type: 'boolean',
-                description: `landing date`
-            },
-            {
-                arg: 'isReceived',
-                type: 'boolean',
-                description: `travel received`
-            },
-            {
-                arg: 'isRaid',
-                type: 'boolean',
-                description: `travel isRaid`
-            },
-            {
-                arg: 'landed',
-                type: 'date',
-                description: `landing date`
-            },
-            {
-                arg: 'invoiceNumber',
-                type: 'string',
-                description: `entry invoice`
-            },
-            {
-                arg: 'reference',
-                type: 'string',
-                description: `entry reference`
-            },
-            {
-                arg: 'awbCode',
-                type: 'string',
-                description: `awb code`
-            },
-            {
-                arg: 'agencyModeId',
-                type: 'number',
-                description: `agency mode id`
-            },
-            {
-                arg: 'evaNotes',
-                type: 'string',
-                description: `observation`
-            },
-            {
-                arg: 'warehouseInFk',
-                type: 'number',
-                description: `warehouse in id`
-            },
-            {
-                arg: 'warehouseOutFk',
-                type: 'number',
-                description: `warehouse out id`
-            },
-            {
-                arg: 'entryTypeCode',
-                type: 'string',
-                description: 'entry type code'
-            },
-
         ],
         returns: {
             type: ['object'],
@@ -217,12 +156,19 @@ module.exports = Self => {
                         {'s.name': {like: `%${value}%`}},
                         {'s.nickname': {like: `%${value}%`}}
                     ]};
-            case 'invoiceNumber':
-            case 'reference':
             case 'ref':
-            case 'evaNotes':
                 param = `e.${param}`;
                 return {[param]: {like: `%${value}%`}};
+            case 'created':
+                return {'e.created': {gte: value}};
+            case 'from':
+                return {'t.landed': {gte: value}};
+            case 'fromShipped':
+                return {'t.shipped': {gte: value}};
+            case 'to':
+                return {'t.landed': {lte: value}};
+            case 'toShipped':
+                return {'t.shipped': {lte: value}};
             case 'id':
             case 'isBooked':
             case 'isConfirmed':
@@ -232,20 +178,8 @@ module.exports = Self => {
             case 'currencyFk':
             case 'supplierFk':
             case 'invoiceInFk':
-            case 'isExcludedFromAvailable':
+                param = `e.${param}`;
-                return {[`e.${param}`]: value};
+                return {[param]: value};
-            case 'isReceived':
-            case 'landed':
-            case 'isRaid':
-            case 'warehouseInFk':
-            case 'warehouseOutFk':
-                return {[`t.${param}`]: value};
-            case 'awbCode':
-                return {'a.code': {like: `%${value}%`}};
-            case 'agencyModeId':
-                return {[`am.id`]: value};
-            case 'entryTypeCode':
-                return {[`et.code`]: value};
             case 'initialTemperature':
                 return {'e.initialTemperature': {lte: value}};
             case 'finalTemperature':
@@ -263,14 +197,15 @@ module.exports = Self => {
         const stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(
-            `SELECT e.id,
+            `SELECT
+                    e.id,
                     e.supplierFk,
                     e.dated,
                     e.reference,
                     e.invoiceNumber,
                     e.isBooked,
                     e.isExcludedFromAvailable,
-                    e.evaNotes,
+                    e.evaNotes observation,
                     e.isConfirmed,
                     e.isOrdered,
                     t.isRaid,
@@ -292,27 +227,15 @@ module.exports = Self => {
                     cu.code currencyCode,
                     t.shipped,
                     t.landed,
-                    t.ref travelRef,
+                    t.ref AS travelRef,
                     t.warehouseInFk,
-                    w.name warehouseInName,
+                    w.name warehouseInName
-                    t.warehouseOutFk,
-                    w2.name warehouseOutName,
-                    a.code awbCode,
-                    am.id agencyModeId,
-                    am.name agencyModeName,
-                    et.code entryTypeCode,
-                    et.description entryTypeDescription,
-                    t.isReceived
                 FROM vn.entry e
                     JOIN vn.supplier s ON s.id = e.supplierFk
-                    LEFT JOIN vn.travel t ON t.id = e.travelFk
+                    JOIN vn.travel t ON t.id = e.travelFk
-                    LEFT JOIN vn.warehouse w ON w.id = t.warehouseInFk
+                    JOIN vn.warehouse w ON w.id = t.warehouseInFk
-                    LEFT JOIN vn.warehouse w2 ON w2.id = t.warehouseOutFk
+                    JOIN vn.company co ON co.id = e.companyFk
-                    LEFT JOIN vn.company co ON co.id = e.companyFk
+                    JOIN vn.currency cu ON cu.id = e.currencyFk`
-                    LEFT JOIN vn.currency cu ON cu.id = e.currencyFk
-                    LEFT JOIN vn.awb a ON a.id = t.awbFk
-                    LEFT JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-                    LEFT JOIN vn.entryType et ON et.code = e.typeFk`
         );
 
         stmt.merge(conn.makeWhere(filter.where));

modules/entry/back/methods/entry/recalcEntryPrices.js

@@ -1,49 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('recalcEntryPrices', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'entryFk',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/:entryFk/recalcEntryPrices`,
-            verb: 'POST'
-        }
-    });
-
-    Self.recalcEntryPrices = async(ctx, entryFk, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-        const entry = await Self.findById(entryFk, myOptions);
-        const entryConfig = await Self.app.models.EntryConfig.findOne({}, myOptions);
-
-        if (entry.supplierFk === entryConfig.inventorySupplierFk) return;
-
-        try {
-            const result = await Self.rawSql('CALL vn.buy_recalcPricesByEntry(?)', [entryFk], myOptions);
-
-            if (tx) await tx.commit();
-            return result[0];
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/model-config.json

@@ -31,8 +31,5 @@
     },
     "InventoryConfig": {
         "dataSource": "vn"
-    },
-    "EntryConfig": {
-        "dataSource": "vn"
     }
 }

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

@@ -1,30 +0,0 @@
-{
-    "name": "EntryConfig",
-    "base": "VnModel",
-    "mixins": {
-        "Loggable": true
-    },
-    "options": {
-        "mysql": {
-            "table": "entryConfig"
-        }
-    },
-    "properties": {
-        "defaultEntry": {
-            "type": "number",
-            "id": true
-        },
-        "mailToNotify": {
-            "type": "string"
-        },
-        "inventorySupplierFk": {
-            "type": "number"
-        },
-        "maxLockTime": {
-            "type": "number"
-        },
-        "defaultSupplierFk": {
-            "type": "number"
-        }
-    }
-}

modules/entry/back/models/entry.js

@@ -15,13 +15,8 @@ module.exports = Self => {
     require('../methods/entry/transfer')(Self);
     require('../methods/entry/labelSupplier')(Self);
     require('../methods/entry/buyLabelSupplier')(Self);
-    require('../methods/entry-buys/getBuyList')(Self);
-    require('../methods/entry-buys/getBuyUltimate')(Self);
-    require('../methods/entry/cloneEntry')(Self);
-    require('../methods/entry/deleteEntry')(Self);
-    require('../methods/entry/recalcEntryPrices')(Self);
 
-    Self.observe('before save', async(ctx, options) => {
+    Self.observe('before save', async function(ctx, options) {
         if (ctx.isNewInstance) return;
 
         const changes = ctx.data || ctx.instance;

modules/entry/back/models/entry.json

@@ -56,7 +56,8 @@
             "required": true
         },
         "travelFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "companyFk": {
             "type": "number",
@@ -73,12 +74,6 @@
         },
         "finalTemperature": {
             "type": "number"
-        },
-        "lockerUserFk":{
-            "type": "number"
-        },
-        "locked":{
-            "type": "date"
         }
     },
     "relations": {
@@ -112,16 +107,6 @@
             "type": "belongsTo",
             "model": "EntryType",
             "foreignKey": "typeFk"
-        },
+        }
-        "invoiceIn": {
-            "type": "belongsTo",
-            "model": "InvoiceIn",
-            "foreignKey": "invoiceInFk"
-        },
-        "user": {
-			"type": "belongsTo",
-			"model": "VnUser",
-			"foreignKey": "lockerUserFk"
-		}
     }
 }

modules/item/back/methods/item/getSimilar.js

@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethodCtx('getSimilar', {
+    Self.remoteMethod('getSimilar', {
         description: 'Returns list of items with similar item requested',
         accessType: 'READ',
         accepts: [

modules/item/back/methods/item/search.js

@@ -1,38 +0,0 @@
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-module.exports = Self => {
-    Self.remoteMethodCtx('search', {
-        description: 'Returns an array of search results for a specified item',
-        accepts: [{
-            arg: 'filter',
-            type: 'object',
-            description: 'Filter to define conditions and paginate the data.',
-            required: true
-        }],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/search`,
-            verb: 'GET'
-        }
-    });
-
-    Self.search = async(ctx, filter) => {
-        const conn = Self.dataSource.connector;
-
-        const stmt = new ParameterizedSQL(`
-            SELECT *
-                FROM(
-                    SELECT i.id, i.name, i.size, p.name producerName
-                        FROM item i
-                            LEFT JOIN producer p ON p.id = i.producerFk
-                ) sub
-        `);
-
-        stmt.merge(conn.makeSuffix(filter));
-
-        return conn.executeStmt(stmt);
-    };
-};

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

@@ -89,7 +89,7 @@ describe('item filter()', () => {
             const ctx = {args: {filter: filter, workerFk: 16}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(2);
             expect(result[0].id).toEqual(16);
             expect(result[1].id).toEqual(71);
 

modules/item/back/methods/tag/specs/filterValue.spec.js

@@ -26,7 +26,7 @@ describe('tag filterValue()', () => {
             const filter = {where: {value: 'Blue'}, limit: 5};
             const result = await models.Tag.filterValue(colorTagId, filter, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(2);
             expect(result[0].value).toEqual('Blue');
             expect(result[1].value).toEqual('Blue/Silver');
 

modules/item/back/models/ink.json

@@ -17,9 +17,6 @@
         },
         "showOrder": {
             "type": "number"
-        },
-        "hexJson": {
-            "type": "string"
         }
     },
     "acls": [

modules/item/back/models/item.js

@@ -18,7 +18,6 @@ module.exports = Self => {
     require('../methods/item/buyerWasteEmail')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
-    require('../methods/item/search')(Self);
 
     Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});
 

modules/route/back/models/roadmap.json

@@ -33,7 +33,7 @@
         "observations": {
             "type": "string"
         },
-        "editorFk": {
+        "userFk": {
             "type": "number"
         },
         "price": {

modules/route/back/models/roadmapStop.json

@@ -15,13 +15,16 @@
         "roadmapFk": {
             "type": "number"
         },
+        "addressFk": {
+            "type": "number"
+        },
         "eta": {
             "type": "date"
         },
         "description": {
             "type": "string"
         },
-        "editorFk": {
+        "userFk": {
             "type": "number"
         }
     },
@@ -34,7 +37,7 @@
         "address": {
             "type": "belongsTo",
             "model": "RoadmapAddress",
-            "foreignKey": "roadmapAddressFk"
+            "foreignKey": "addressFk"
         }
     }
 }

modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js

@@ -7,6 +7,6 @@ describe('Supplier getItemsPackaging()', () => {
         expect(item.id).toEqual(1);
         expect(item.name).toEqual('Ranged weapon longbow 200cm');
         expect(item.quantity).toEqual(5000);
-        expect(item.quantityTotal).toEqual(5200);
+        expect(item.quantityTotal).toEqual(5100);
     });
 });

modules/ticket/back/methods/boxing/getVideo.js

@@ -49,7 +49,7 @@ module.exports = Self => {
                     ps.monitorId,
                     e.created
                 FROM expedition e
-                    JOIN host h ON h.code = e.hostFk
+                    JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
                     JOIN packingSite ps ON  ps.hostFk = h.id
                 WHERE e.id = ?;`;
         const [expedition] = await models.Expedition.rawSql(query, [id]);

modules/ticket/back/methods/boxing/getVideoList.js

@@ -44,14 +44,12 @@ module.exports = Self => {
                 ps.monitorId,
                 e.created
             FROM expedition e
-                JOIN host h ON h.code = e.hostFk
+                JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
-                JOIN packingSite ps ON ps.hostFk = h.id
+                JOIN packingSite ps ON  ps.hostFk = h.id
             WHERE e.id = ?;`;
-
+        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]);
-        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id], myOptions);
 
         if (!from && !expedition) return [];
-
         let start = new Date(expedition.created);
         let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000));
 
@@ -59,13 +57,9 @@ module.exports = Self => {
             start.setHours(from, 0, 0);
             end.setHours(to, 0, 0);
         }
-
         const offset = start.getTimezoneOffset();
         start = new Date(start.getTime() - (offset * 60 * 1000));
         end = new Date(end.getTime() - (offset * 60 * 1000));
-        const minutes = start.getMinutes();
-        const roundedMinutes = minutes - (minutes % 15);
-        start.setMinutes(roundedMinutes, 0, 0);
 
         const videoUrl =
             `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${expedition.monitorId}`;
@@ -79,7 +73,6 @@ module.exports = Self => {
         } catch (e) {
             return [];
         }
-
         return response.data.videos.map(video => video.filename);
     };
 };

modules/ticket/back/methods/boxing/specs/getVideoList.spec.js

@@ -2,28 +2,35 @@ const models = require('vn-loopback/server/server').models;
 const axios = require('axios');
 
 describe('boxing getVideoList()', () => {
-    let tx;
+    it('should return video list', async() => {
-    let options;
+        const tx = await models.PackingSiteConfig.beginTransaction({});
 
-    beforeEach(async() => {
+        try {
-        tx = await models.PackingSiteConfig.beginTransaction({});
+            const options = {transaction: tx};
-        options = {transaction: tx};
-    });
 
-    afterEach(async() => {
+            const id = 1;
-        await tx.rollback();
+            const from = 1;
-    });
+            const to = 2;
 
-    it('should make the correct API call', async() => {
+            const response = {
-        const expedition = await models.Expedition.findById(15, null, options);
+                data: {
-        await expedition.updateAttribute('created', '2000-12-01 07:07:00', options);
+                    videos: [{
+                        id: 1,
+                        filename: 'video1.mp4'
+                    }]
+                }
+            };
 
-        const axiosSpy = spyOn(axios, 'get').and.callThrough();
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(response)));
-        await models.Boxing.getVideoList(expedition.id, undefined, undefined, options);
 
-        const expectedStartTime = '2000-12-01T07:00:00';
+            const result = await models.Boxing.getVideoList(id, from, to, options);
-        const calledUrl = axiosSpy.calls.mostRecent().args[0];
 
-        expect(calledUrl).toContain(`start=${expectedStartTime}`);
+            expect(result[0]).toEqual(response.data.videos[0].filename);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

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

@@ -1,5 +1,4 @@
-const smtp = require('vn-print/core/smtp');
+const closure = require('./closure');
-const config = require('vn-print/core/config');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeAll', {
@@ -26,62 +25,122 @@ module.exports = Self => {
     Self.closeAll = async(ctx, options) => {
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
-        let tx;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction) {
+        let tx;
-            tx = await Self.beginTransaction({});
+        // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
-            myOptions.transaction = tx;
+
-        }
         const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
-        const [{dateFrom, dateTo}] = await Self.rawSql(`
-            SELECT ? - INTERVAL closureDaysAgo DAY dateFrom,
-                    util.dayEnd(?) dateTo
-                FROM ticketConfig
-                LIMIT 1`, [toDate, toDate], myOptions);
 
-        await Self.rawSql(`
+        const tickets = await Self.rawSql(`
-            DROP TEMPORARY TABLE IF EXISTS tmp.ticket_close;
+            SELECT t.id,
-            CREATE TEMPORARY TABLE tmp.ticket_close
-                ENGINE = MEMORY
-            WITH wTickets AS(
-                SELECT t.id ticketFk
-                    FROM ticket t
-                        JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                    WHERE t.shipped BETWEEN ? AND ?
-                        AND t.refFk IS NULL
-            ), wTicketsTracking AS(
-            SELECT wt.ticketFk, MAX(tt.id) maxTracking
-                FROM wTickets wt
-                    JOIN ticketTracking tt ON tt.ticketFk = wt.ticketFk
-                GROUP BY tt.ticketFk
-            ), wTicketsLastState AS(
-                SELECT wt.ticketFk, tt.stateFk
-                    FROM wTicketsTracking wt
-                        JOIN ticketTracking tt ON tt.id = wt.maxTracking
-            ) SELECT tls.ticketFk,
                     t.clientFk,
+                    t.companyFk,
+                    c.id clientFk,
                     c.name clientName,
                     c.email recipient,
-                    eu.email salesPersonEmail,
+                    c.salesPersonFk,
-                    t.addressFk,
+                    c.isToBeMailed,
+                    c.hasToInvoice,
                     c.hasDailyInvoice,
-                    c.hasToInvoiceByAddress,
+                    eu.email salesPersonEmail,
-                    t.totalWithVat,
+                    t.addressFk
-                    t.companyFk
+                FROM ticket t
-                FROM wTicketsLastState tls
-                    JOIN ticket t ON t.id = tls.ticketFk
-                    JOIN state s ON s.id =tls.stateFk
-                    JOIN alertLevel al ON al.id = s.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                    JOIN ticketState ts ON ts.ticketFk = t.id
+                    JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN client c ON c.id = t.clientFk
+                    JOIN province p ON p.id = c.provinceFk
+                    JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'));
+                    JOIN ticketConfig tc ON TRUE
-            CALL ticket_close();
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-        `, [dateFrom, dateTo], myOptions);
+                    AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                    AND t.refFk IS NULL
+                GROUP BY t.id
+        `, [toDate, toDate], myOptions);
+        const ticketIds = tickets.map(ticket => ticket.id);
+        await Self.rawSql(`
+            INSERT INTO util.debug (variable, value)
+                VALUES ('nightInvoicing', ?)
+        `, [ticketIds.join(',')], myOptions);
+
+        await Self.rawSql(`
+        WITH ticketNotInvoiceable AS(
+            SELECT JSON_OBJECT(
+                'tickets',
+                JSON_ARRAYAGG(
+                    JSON_OBJECT(
+                        'ticketId', ticketFk,
+                        'reason', reason,
+                        'clientId', clientFk
+                    )
+                )
+            )errors
+            FROM (
+                SELECT ticketFk,
+                        CONCAT_WS(', ',
+                            IF(hasErrorToInvoice, 'Facturar', NULL),
+                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
+                            IF(hasErrorDeleted, 'Eliminado', NULL),
+                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
+                            IF(hasErrorAddress, 'Sin dirección', NULL),
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason,
+                        clientFk
+                    FROM (
+                        SELECT t.id ticketFk,
+                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
+                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
+                                SUM(t.isDeleted) hasErrorDeleted,
+                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
+                                SUM(a.id IS NULL) hasErrorAddress,
+                                SUM(ios.code IS NOT NULL
+                                    AND(ad.customsAgentFk IS NULL
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld,
+                                t.clientFk clientFk
+                            FROM ticket t
+                                LEFT JOIN address ad ON ad.id = t.addressFk
+                                JOIN sale s ON s.ticketFk = t.id
+                                JOIN item i ON i.id = s.itemFk
+                                JOIN supplier su ON su.id = t.companyFk
+                                JOIN agencyMode am ON am.id = t.agencyModeFk
+                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                                JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN alertLevel al ON al.id = ts.alertLevel
+                                JOIN client c ON c.id = t.clientFk
+                                JOIN province p ON p.id = c.provinceFk
+                                JOIN ticketConfig tc ON TRUE
+                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
+                                JOIN country co ON co.id = p.countryFk
+                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+                                    AND itc.countryFk = su.countryFk
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD'
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'multiple')
+                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                                AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                                AND t.refFk IS NULL
+                                AND c.hasDailyInvoice
+                            GROUP BY ticketFk
+                            HAVING hasErrorToInvoice
+                                OR hasErrorTaxDataChecked
+                                OR hasErrorDeleted
+                                OR hasErrorItemTaxCountry
+                                OR hasErrorAddress
+                                OR hasErrorInfoTaxAreaWorld
+                    )sub
+                )sub2
+            ) SELECT IF(errors = '{"tickets": null}',
+                    'No errors',
+                    util.notification_send('invoice-ticket-closure', errors, NULL))
+                FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
+
+        await closure(ctx, Self, tickets, myOptions);
 
         await Self.rawSql(`
             UPDATE ticket t
@@ -92,100 +151,17 @@ module.exports = Self => {
                     JOIN ticketConfig tc ON TRUE
                     LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                 SET t.routeFk = NULL
-                WHERE t.shipped BETWEEN ? AND ?
+                WHERE t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL
-                    AND t.routeFk`, [dateFrom, dateTo], myOptions);
+                    AND t.routeFk`, [toDate, toDate], myOptions);
-
-        const [clients] = await Self.rawSql(`
-            SELECT clientFk clientId,
-                    clientName,
-                    recipient,
-                    salesPersonEmail,
-                    addressFk addressId,
-                    companyFk,
-                    SUM(totalWithVat) total,
-                    'quick' serialType
-                FROM tmp.ticket_close
-                WHERE hasDailyInvoice
-                GROUP BY IF (hasToInvoiceByAddress, addressFk, clientFk), companyFk
-                HAVING total > 0;
-            DROP TEMPORARY TABLE tmp.ticket_close;
-        `, [], myOptions);
 
         if (tx)
             await tx.commit();
 
-        const failedClients = [];
-        const nestedTransaction = options?.transaction ? myOptions : {};
-        for (const client of clients) {
-            ctx.args = {
-                ...client,
-                invoiceDate: Date.vnNew(),
-                maxShipped: toDate
-            };
-            try {
-                const id = await Self.app.models.InvoiceOut.invoiceClient(ctx, nestedTransaction);
-                if (id)
-                    await Self.app.models.InvoiceOut.makePdfAndNotify(ctx, id, null, nestedTransaction);
-            } catch (error) {
-                await Self.rawSql(`
-                    INSERT INTO util.debug (variable, value)
-                        VALUES ('invoicingTicketError', ?)
-                `, [client.clientId + ' - ' + error]);
-
-                if (error.responseCode == 450) {
-                    await invalidEmail(client);
-                    continue;
-                }
-
-                failedClients.push({
-                    id: client.clientId,
-                    address: client.addressId,
-                    error
-                });
-            }
-        }
-
-        if (failedClients.length > 0) {
-            let body = 'This following tickets have failed:<br/><br/>';
-
-            for (const client of failedClients) {
-                body += `Client: <strong>${client.id}</strong>
-                        Address: <strong>${client.address}</strong>
-                            <br/> <strong>${client.error}</strong><br/><br/>`;
-            }
-
-            smtp.send({
-                to: config.app.reportEmail,
-                subject: '[API] Nightly ticket closure report',
-                html: body,
-            }).catch(err => console.error(err));
-        }
-
         return {
             message: 'Success'
         };
     };
-
-    async function invalidEmail(client) {
-        await Self.rawSql(
-            `UPDATE client SET email = NULL WHERE id = ?`,
-            [client.clientId],
-            myOptions
-        );
-
-        const body = `No se ha podido facturar al cliente <strong>${client.clientId} - ${client.clientName}</strong>
-            porque la dirección de email <strong>"${client.recipient}"</strong> no es correcta
-            o no está disponible.<br/><br/>
-            Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
-            Actualiza la dirección de email con una correcta.`;
-
-        smtp.send({
-            to: client.salesPersonEmail,
-            subject: 'No se ha podido enviar el albarán',
-            html: body,
-        }).catch(err => console.error(err));
-    }
 };

modules/worker/back/models/worker.json

@@ -284,6 +284,39 @@
                         }
                     }
                 },
+                {
+                    "relation": "business",
+                    "scope": {
+                        "fields": [
+                            "id",
+                            "started",
+                            "ended",
+                            "reasonEndFk",
+                            "departmentFk",
+                            "workerBusinessProfessionalCategoryFk"
+                        ],
+                        "include":[
+                            {
+                                "relation": "department",
+                                "scope": {
+                                    "fields": ["id", "name"]
+                                }
+                            },
+                            {
+                                "relation": "reasonEnd",
+                                "scope": {
+                                    "fields": ["id", "reason"]
+                                }
+                            },
+                            {
+                                "relation": "workerBusinessProfessionalCategory",
+                                "scope": {
+                                    "fields": ["id", "description"]
+                                }
+                            }
+                        ]
+                    }
+                },
                 {
                     "relation": "boss",
                     "scope": {

print/templates/reports/delivery-note/delivery-note.html

@@ -70,7 +70,7 @@
                         <td width="5%">{{sale.itemFk}}</td>
                         <td class="number">{{sale.quantity}}</td>
                         <td width="50%">{{sale.concept}}</td>
-                        <td width="5%" class="font light-gray">{{sale.subName}}</td>
+                        <td width="5%" class="font light-gray" v-if="sale.subName">{{sale.subName}}</td>
                         <td class="number" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
                         <td class="centered" width="5%" v-if="showPrices">{{(sale.discount / 100) | percentage}}</td>
                         <td class="centered" v-if="showPrices">{{sale.vatType}}</td>